From ccc64c0050478dc0567ce9bb22dc75d541f8477e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Thu, 26 Jun 2014 10:26:59 +0200
Subject: [PATCH 0001/1650] forward alternate_nick to Irc::Server attributes

add the missing alternate_nick in Irc::Server by making an additional
call to the Irc::Connect filler. this is not quite ideal but might
need bigger refactoring otherwise.
---
 src/perl/irc/Irc.xs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 22a87384..601ba852 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -11,6 +11,7 @@ static void perl_irc_connect_fill_hash(HV *hv, IRC_SERVER_CONNECT_REC *conn)
 
 static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 {
+       	perl_irc_connect_fill_hash(hv, server->connrec);
        	perl_server_fill_hash(hv, (SERVER_REC *) server);
 
        	hv_store(hv, "real_address", 12, new_pv(server->real_address), 0);

From 7099ae0466a6003f789393f3494c28980ddb0103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 22 Jul 2014 19:55:44 +0200
Subject: [PATCH 0002/1650] Disable -nolinks for lynx-generated text FAQ

This way lynx also emits URLs for references at the bottom,
like elinks does.

The formating is a little different though (word wrapping),
and elinks adds a "Visible links" line as well.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index cf4b9798..d65bdede 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -28,7 +28,7 @@ cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!
 # .html -> .txt with lynx or elinks
 echo "Documentation: html -> txt..."
 if type lynx >/dev/null 2>&1 ; then
-  lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+  lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 elif type elinks >/dev/null 2>&1 ; then
   elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 else

From 103b0e22eb7a463ee22398132449a05de96cada3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 22 Jul 2014 19:58:51 +0200
Subject: [PATCH 0003/1650] Force default locale when calling lynx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Else it ends up saying "Références" or other translation for the word.

Might want to do the same for elinks...
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index d65bdede..b0bd2159 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -28,7 +28,7 @@ cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!
 # .html -> .txt with lynx or elinks
 echo "Documentation: html -> txt..."
 if type lynx >/dev/null 2>&1 ; then
-  lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+  LC_ALL=C lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 elif type elinks >/dev/null 2>&1 ; then
   elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 else

From 9af3df4e9d1ecfc070fe79d0cd20e035986b33b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 22 Jul 2014 21:59:31 +0200
Subject: [PATCH 0004/1650] Simplify network libraries detection with
 AC_SEARCH_LIBS

AC_SEARCH_LIBS first tries to link without any lib, then tries each
library, and sets $LIBS correctly in any case.

cf.
https://www.flameeyes.eu/autotools-mythbuster/autoconf/finding.html
---
 configure.ac | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2a7bee0d..360af621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,17 +197,9 @@ case "$host_os" in
 esac
 
 
-AC_CHECK_FUNC(socket, [], [
-	AC_CHECK_LIB(socket, socket, [
-		LIBS="$LIBS -lsocket"
-	])
-])
+AC_SEARCH_LIBS([socket], [socket])
 
-AC_CHECK_FUNC(inet_addr, [], [
-	AC_CHECK_LIB(nsl, inet_addr, [
-		LIBS="$LIBS -lnsl"
-	])
-])
+AC_SEARCH_LIBS([inet_addr], [nsl])
 
 dnl * gcc specific options
 if test "x$ac_cv_prog_gcc" = "xyes"; then

From 1f9ad64ee559b05463c09796ef20b4dbe0daa37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 22 Jul 2014 22:36:49 +0200
Subject: [PATCH 0005/1650] Simplify socklen_t type detection

The previous version of AC_CHECK_TYPE() which didn't accept passing headers
is obsolete anyway. The new one can be told which headers to include.

Also test for sys/socket.h just for sanity.

cf.
https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html
https://www.gnu.org/software/autoconf/manual/autoconf-2.64/html_node/Generic-Types.html
https://svn.opendnssec.org/home/jerry/memory-usage/ldns-1.6.10/acx_nlnetlabs.m4
---
 configure.ac | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 360af621..f587b93c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PATH_PROG(perlpath, perl)
 AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h)
 
 # check posix headers..
-AC_CHECK_HEADERS(sys/time.h sys/utsname.h regex.h)
+AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/utsname.h regex.h)
 
 AC_SYS_LARGEFILE
 
@@ -206,21 +206,13 @@ if test "x$ac_cv_prog_gcc" = "xyes"; then
   CFLAGS="$CFLAGS -Wall"
 fi
 
-dnl * socklen_t - AC_CHECK_TYPE() would be _really_ useful if it only would
-dnl * accept header files where to find the typedef..
-AC_MSG_CHECKING([for socklen_t])
-AC_CACHE_VAL(irssi_cv_type_socklen_t,
-[AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>],
-[socklen_t t = 0; return((int)t); ],
-irssi_cv_type_socklen_t=yes,
-irssi_cv_type_socklen_t=no,
-)])
-if test $irssi_cv_type_socklen_t = no; then
-AC_DEFINE(socklen_t, int, Define to 'int' if <sys/socket.h> doesn't define.)
-fi
-AC_MSG_RESULT($irssi_cv_type_socklen_t)
+AC_CHECK_TYPE(socklen_t, ,
+	[AC_DEFINE([socklen_t], [int], [Define to 'int' if <sys/socket.h> doesn't define.])], [
+AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+])
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)

From c855fef06405e720cb1ceea98665af74136b61ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 22 Jul 2014 23:14:12 +0200
Subject: [PATCH 0006/1650] Drop AC_ISC_POSIX which is obsolete

It's actually a NOOP in latest autoconf.

cf.
https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html#index-AC_005fISC_005fPOSIX-2084
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f587b93c..047ffbbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,6 @@ AM_INIT_AUTOMAKE([1.9 no-define foreign])
 
 AM_MAINTAINER_MODE
 
-AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_CPP
 AM_PROG_LIBTOOL

From 9d4ea891b91b6cf514a3c70dc68a22feafb17d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 22 Jul 2014 01:38:13 +0200
Subject: [PATCH 0007/1650] Also try links for docs generation

Haiku has links (links2) but not elinks.

Links doesn't seem to generate references however,
but it's the 2nd fallback so it's better than nothing.
---
 autogen.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index b0bd2159..466a5a05 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,6 +31,8 @@ if type lynx >/dev/null 2>&1 ; then
   LC_ALL=C lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 elif type elinks >/dev/null 2>&1 ; then
   elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+elif type links >/dev/null 2>&1 ; then
+  links -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 else
   echo "**Error**: No lynx or elinks present"
   exit 1

From 09f23d06b5262c53b65fa04d4f83cfd170d919c5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Mon, 28 Jul 2014 13:58:13 +0200
Subject: [PATCH 0008/1650] Modify escape of ^ key so it can be used as well as
 Ctrl+^

Fixes FS#721

This makes Ctrl+^ and ^ bindable again as different keys. We do this
by escaping single `^` as `^-`, which is not a valid control character
(unlike `^^`)

The original approach suggested in FS#721 is insufficient, it will
break bindings such as `meta-^` because Irssi is convinced that `^`
introduces a Control-key ("key combo") so it is waiting for what may
follow.
---
 src/fe-common/core/keyboard.c | 16 +++++++++++-----
 src/fe-text/gui-readline.c    |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index 00454401..bec1502e 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -292,12 +292,18 @@ static int expand_key(const char *key, GSList **out)
 			}
 			last_hyphen = !last_hyphen;
 		} else if (*key == '^') {
-                        /* ctrl-code */
-			if (key[1] != '\0')
-				key++;
-
 			expand_out_char(*out, '^');
-			expand_out_char(*out, *key);
+
+                        /* ctrl-code */
+			if (key[1] != '\0' && key[1] != '-') {
+				key++;
+				expand_out_char(*out, *key);
+			}
+			else {
+				/* escaped syntax for ^, see gui-readline.c */
+				expand_out_char(*out, '-');
+			}
+
 			expand_out_char(*out, '-');
                         last_hyphen = FALSE; /* optional */
 		} else if (last_hyphen && i_isalpha(*key)) {
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 476a798b..e93f2293 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -393,8 +393,8 @@ static void sig_gui_key_pressed(gpointer keyp)
 	}
 
 	if (strcmp(str, "^") == 0) {
-		/* change it as ^^ */
-		str[1] = '^';
+		/* change it as ^-, that is an invalid control char */
+		str[1] = '-';
 		str[2] = '\0';
 	}
 

From a057cfecf7687caa658ed1be240c22f81a2f27a5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Wed, 9 Jul 2014 22:05:52 +0200
Subject: [PATCH 0009/1650] test newer perls now available on travis

---
 .travis.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04c19d88..35226645 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,22 @@
-language: c
-compiler:
-    - gcc
-    - clang
+language: perl
+perl:
+    - "5.20-shrplib"
+    - "5.18-shrplib"
+    - "system-perl"
+env:
+    - CC=clang
+    - CC=gcc
 
 before_install:
     - sudo apt-get update -qq
+    - perl -V
     - sudo apt-get build-dep -qq irssi
     - sudo apt-get install -qq lynx
 
+install: true
+
 script:
-    - ./autogen.sh --with-proxy --with-bot
+    - ./autogen.sh --with-proxy --with-bot --with-perl=module
     - cat config.log
     - make
     - sudo make install

From 1b3e74645af996a3ec46a72bfb098f1506515f8a Mon Sep 17 00:00:00 2001
From: David Leadbeater <dgl@dgl.cx>
Date: Sat, 9 Aug 2014 12:05:28 +0100
Subject: [PATCH 0010/1650] Include commit and if the tree is dirty in builds
 of -head versions

---
 Makefile.am      |  3 ++-
 irssi-version.sh | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 4cebd112..6ca69fc7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,8 @@ default-theme.h: $(srcdir)/default.theme
 	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h
 
 irssi-version.h:
-	$(srcdir)/irssi-version.sh $(srcdir) | cmp -s - $@ || $(srcdir)/irssi-version.sh $(srcdir) >$@
+	VERSION="$(VERSION)" $(srcdir)/irssi-version.sh $(srcdir) | \
+		cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/irssi-version.sh $(srcdir) >$@
 
 SUBDIRS = src docs scripts
 
diff --git a/irssi-version.sh b/irssi-version.sh
index 49abc55e..7588182d 100755
--- a/irssi-version.sh
+++ b/irssi-version.sh
@@ -7,3 +7,15 @@ VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`
 
 echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
 echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
+
+if echo "${VERSION}" | grep -q -- -head; then
+  # -head version, get extra details from git if we can
+  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --always --tags)
+  if [ $? = 0 ]; then
+    new_version="$(echo "${VERSION}" | sed 's/-head//')"
+    # Because the git tag won't yet include the next release we modify the git
+    # describe output using the version defined from configure.ac.
+    version="${new_version}-$(echo "${git_version}" | sed 's/^.*-[0-9]\+-//')"
+    echo "#define PACKAGE_VERSION \"${version}\""
+  fi
+fi

From d9deafe57ccf2fc2191f48c989859e87b7daab06 Mon Sep 17 00:00:00 2001
From: Paul Johnson <paul@pjcj.net>
Date: Sat, 23 Aug 2014 21:08:17 +0200
Subject: [PATCH 0011/1650] Speed up /reload when there are many ignores.

With many ignores (a few thousand) /reload could take so long that connections
were dropped.  The problem is that nickmatch_rebuild() was being called for
every ignore.  The easy solution is to only call it once at the end.
---
 src/core/ignore.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 3c45967c..68fae11f 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -360,8 +360,6 @@ static void ignore_destroy(IGNORE_REC *rec, int send_signal)
 	g_free_not_null(rec->servertag);
 	g_free_not_null(rec->pattern);
 	g_free(rec);
-
-	nickmatch_rebuild(nickmatch);
 }
 
 void ignore_update_rec(IGNORE_REC *rec)
@@ -380,8 +378,8 @@ void ignore_update_rec(IGNORE_REC *rec)
 
                 ignore_init_rec(rec);
 		signal_emit("ignore changed", 1, rec);
-		nickmatch_rebuild(nickmatch);
 	}
+        nickmatch_rebuild(nickmatch);
 }
 
 static int unignore_timeout(void)

From 98435fb4649367c182e35aea8c89ce7a4cf8d4d3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Thu, 11 Sep 2014 18:15:06 +0200
Subject: [PATCH 0012/1650] support storing and replaying the monospace
 attribute in textbuffer

---
 src/fe-text/textbuffer-view.c | 3 +++
 src/fe-text/textbuffer.c      | 8 ++++++++
 src/fe-text/textbuffer.h      | 1 +
 3 files changed, 12 insertions(+)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 3099ee3e..ad4c00b8 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -146,6 +146,9 @@ static void update_cmd_color(unsigned char cmd, int *color)
 	case LINE_CMD_ITALIC:
 		*color ^= ATTR_ITALIC;
 		break;
+	case LINE_CMD_MONOSPACE:
+		/* ignored */
+		break;
 	case LINE_CMD_COLOR0:
 		*color &= BGATTR;
 		*color &= ~ATTR_FGCOLOR24;
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 24ee62bc..561fdabd 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -326,6 +326,10 @@ void textbuffer_line_add_colors(TEXT_BUFFER_REC *buffer, LINE_REC **line,
 		data[pos++] = 0;
 		data[pos++] = LINE_CMD_ITALIC;
 	}
+	if ((flags & GUI_PRINT_FLAG_MONOSPACE) != (buffer->last_flags & GUI_PRINT_FLAG_MONOSPACE)) {
+		data[pos++] = 0;
+		data[pos++] = LINE_CMD_MONOSPACE;
+	}
 	if (flags & GUI_PRINT_FLAG_INDENT) {
 		data[pos++] = 0;
 		data[pos++] = LINE_CMD_INDENT;
@@ -509,6 +513,10 @@ void textbuffer_line2text(LINE_REC *line, int coloring, GString *str)
 			g_string_append_printf(str, "\004%c",
 					  FORMAT_STYLE_ITALIC);
 			break;
+		case LINE_CMD_MONOSPACE:
+			g_string_append_printf(str, "\004%c",
+					  FORMAT_STYLE_MONOSPACE);
+			break;
 		case LINE_CMD_COLOR0:
 			g_string_append_printf(str, "\004%c%c",
 					  '0', FORMAT_COLOR_NOCHANGE);
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index eacfd447..303789a3 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -18,6 +18,7 @@ enum {
 	LINE_CMD_BLINK,		/* enable/disable blink */
 	LINE_CMD_BOLD,		/* enable/disable bold */
 	LINE_CMD_ITALIC,	/* enable/disable italic */
+	LINE_CMD_MONOSPACE,	/* enable/disable monospace (gui only) */
 	LINE_COLOR_EXT,		/* extended color */
 	LINE_COLOR_EXT_BG,	/* extended bg */
 #ifdef TERM_TRUECOLOR

From d9ea224628af1a4394fec20610e136a3c6817f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 28 Sep 2014 15:48:48 +0200
Subject: [PATCH 0013/1650] Fix use-after-free bug with cached settings values

This patch fixes a couple of use-after-free bugs when caching various
string related setting values.

Fixes: #143
---
 src/core/expandos.c                  | 22 ++++++++++++++--------
 src/core/log.c                       | 20 ++++++++++++--------
 src/fe-common/core/chat-completion.c | 14 +++++++++++---
 src/fe-common/core/fe-log.c          | 24 +++++++++++++++++-------
 4 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/src/core/expandos.c b/src/core/expandos.c
index bed6c5eb..1fc517af 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -57,7 +57,7 @@ static char *last_sent_msg, *last_sent_msg_body;
 static char *last_privmsg_from, *last_public_from;
 static char *sysname, *sysrelease, *sysarch;
 
-static const char *timestamp_format;
+static char *timestamp_format;
 static int timestamp_seconds;
 static time_t last_timestamp;
 
@@ -567,7 +567,9 @@ static int sig_timer(void)
 
 static void read_settings(void)
 {
-	timestamp_format = settings_get_str("timestamp_format");
+	g_free_not_null(timestamp_format);
+	timestamp_format = g_strdup(settings_get_str("timestamp_format"));
+
 	timestamp_seconds =
 		strstr(timestamp_format, "%r") != NULL ||
 		strstr(timestamp_format, "%s") != NULL ||
@@ -708,14 +710,18 @@ void expandos_deinit(void)
 		g_free_not_null(char_expandos[n]);
 
 	g_hash_table_foreach_remove(expandos, free_expando, NULL);
-        g_hash_table_destroy(expandos);
+	g_hash_table_destroy(expandos);
 
-	g_free_not_null(last_sent_msg); g_free_not_null(last_sent_msg_body);
-	g_free_not_null(last_privmsg_from); g_free_not_null(last_public_from);
-	g_free_not_null(sysname); g_free_not_null(sysrelease);
-        g_free_not_null(sysarch);
+	g_free_not_null(last_sent_msg);
+	g_free_not_null(last_sent_msg_body);
+	g_free_not_null(last_privmsg_from);
+	g_free_not_null(last_public_from);
+	g_free_not_null(sysname);
+	g_free_not_null(sysrelease);
+	g_free_not_null(sysarch);
+	g_free_not_null(timestamp_format);
 
-        g_source_remove(timer_tag);
+	g_source_remove(timer_tag);
 	signal_remove("message public", (SIGNAL_FUNC) sig_message_public);
 	signal_remove("message private", (SIGNAL_FUNC) sig_message_private);
 	signal_remove("message own_private", (SIGNAL_FUNC) sig_message_own_private);
diff --git a/src/core/log.c b/src/core/log.c
index 263b3526..d4d3853e 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -41,7 +41,7 @@ static const char *log_item_types[] = {
 	NULL
 };
 
-const char *log_timestamp;
+static char *log_timestamp;
 static int log_file_create_mode;
 static int log_dir_create_mode;
 static int rotate_tag;
@@ -558,13 +558,15 @@ static void log_read_config(void)
 
 static void read_settings(void)
 {
-	log_timestamp = settings_get_str("log_timestamp");
+	g_free_not_null(log_timestamp);
+	log_timestamp = g_strdup(settings_get_str("log_timestamp"));
+
 	log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
 
-        log_dir_create_mode = log_file_create_mode;
-        if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
-        if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
-        if (log_file_create_mode & 0004) log_dir_create_mode |= 0001;
+	log_dir_create_mode = log_file_create_mode;
+	if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
+	if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
+	if (log_file_create_mode & 0004) log_dir_create_mode |= 0001;
 }
 
 void log_init(void)
@@ -595,7 +597,9 @@ void log_deinit(void)
 	while (logs != NULL)
 		log_close(logs->data);
 
+	g_free_not_null(log_timestamp);
+
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
-        signal_remove("setup reread", (SIGNAL_FUNC) log_read_config);
-        signal_remove("irssi init finished", (SIGNAL_FUNC) log_read_config);
+	signal_remove("setup reread", (SIGNAL_FUNC) log_read_config);
+	signal_remove("irssi init finished", (SIGNAL_FUNC) log_read_config);
 }
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index aba76b9d..c37c77cd 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -40,7 +40,7 @@
 
 static int keep_privates_count, keep_publics_count;
 static int completion_lowercase;
-static const char *completion_char, *cmdchars;
+static char *completion_char, *cmdchars;
 static GSList *global_lastmsgs;
 static int completion_auto, completion_strict;
 
@@ -1126,11 +1126,16 @@ static void read_settings(void)
 	keep_privates_count = settings_get_int("completion_keep_privates");
 	keep_publics_count = settings_get_int("completion_keep_publics");
 	completion_lowercase = settings_get_bool("completion_nicks_lowercase");
-	completion_char = settings_get_str("completion_char");
-	cmdchars = settings_get_str("cmdchars");
+
 	completion_auto = settings_get_bool("completion_auto");
 	completion_strict = settings_get_bool("completion_strict");
 
+	g_free_not_null(completion_char);
+	completion_char = g_strdup(settings_get_str("completion_char"));
+
+	g_free_not_null(cmdchars);
+	cmdchars = g_strdup(settings_get_str("cmdchars"));
+
 	if (*completion_char == '\0') {
                 /* this would break.. */
 		completion_auto = FALSE;
@@ -1220,4 +1225,7 @@ void chat_completion_deinit(void)
 	signal_remove("server disconnected", (SIGNAL_FUNC) sig_server_disconnected);
 	signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+
+	g_free_not_null(completion_char);
+	g_free_not_null(cmdchars);
 }
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 5ee72d8b..9d68faf9 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -43,11 +43,11 @@
 
 static int autolog_level;
 static int autoremove_tag;
-static const char *autolog_path;
+static char *autolog_path;
 
 static THEME_REC *log_theme;
 static int skip_next_printtext;
-static const char *log_theme_name;
+static char *log_theme_name;
 
 static int log_dir_create_mode;
 
@@ -675,9 +675,11 @@ static void sig_theme_destroyed(THEME_REC *theme)
 static void read_settings(void)
 {
 	int old_autolog = autolog_level;
-        int log_file_create_mode;
+	int log_file_create_mode;
+
+	g_free_not_null(autolog_path);
+	autolog_path = g_strdup(settings_get_str("autolog_path"));
 
-	autolog_path = settings_get_str("autolog_path");
 	autolog_level = !settings_get_bool("autolog") ? 0 :
 		settings_get_level("autolog_level");
 
@@ -687,9 +689,14 @@ static void read_settings(void)
 	/* write to log files with different theme? */
 	if (log_theme_name != NULL)
 		signal_remove("print format", (SIGNAL_FUNC) sig_print_format);
-	log_theme_name = settings_get_str("log_theme");
-	if (*log_theme_name == '\0')
+
+	g_free_not_null(log_theme_name);
+	log_theme_name = g_strdup(settings_get_str("log_theme"));
+
+	if (*log_theme_name == '\0') {
+		g_free(log_theme_name);
 		log_theme_name = NULL;
+	}
 	else
 		signal_add("print format", (SIGNAL_FUNC) sig_print_format);
 
@@ -752,7 +759,7 @@ void fe_log_deinit(void)
 {
 	g_source_remove(autoremove_tag);
 	if (log_theme_name != NULL)
-                signal_remove("print format", (SIGNAL_FUNC) sig_print_format);
+		signal_remove("print format", (SIGNAL_FUNC) sig_print_format);
 
 	command_unbind("log", (SIGNAL_FUNC) cmd_log);
 	command_unbind("log open", (SIGNAL_FUNC) cmd_log_open);
@@ -776,4 +783,7 @@ void fe_log_deinit(void)
 
 	if (autolog_ignore_targets != NULL)
 		g_strfreev(autolog_ignore_targets);
+
+	g_free_not_null(autolog_path);
+	g_free_not_null(log_theme_name);
 }

From 0236ee5eaabac05e21cede2ee9b68db70019f1b7 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Tue, 26 Feb 2008 17:29:10 +0100
Subject: [PATCH 0014/1650] PROXY: implemented native proxy support

This patch creates a hook into the net_connect*() methods which call a
method to connect to a proxy.

Previous solution to send certain strings in the normal IRC dialog was
some kind of hack as most proxies require some kind of negotation.

E.g. HTTP proxies sent a 'HTTP/1.0 200 Connection established' HTTP header
and clients have to wait for it.  Else, sent bytes of the following IRC
login will be dropped silently.

With old method, it is also impossible to tunnel SSL IRC connections
through the proxy as proxy speaks plain text or a special protocol while
e.g. 'CONNECT ... HTTP/1.0' will be encrypted with key of IRC server.

There are further enhancements possible: the whole net_connect stuff
should be made asynchronously. Currently, only the hostname is resolved
in the background (which makes little sense of local proxies usually).
---
 src/core/Makefile.am          |   3 +
 src/core/network-openssl.c    |   4 +-
 src/core/network-proxy-priv.h | 128 ++++++++++++++++++++++++++++++++++
 src/core/network-proxy.c      |  30 ++++++++
 src/core/network-proxy.h      |  81 +++++++++++++++++++++
 src/core/network.c            |  15 +++-
 src/core/network.h            |   6 +-
 src/core/server-connect-rec.h |   5 +-
 src/core/servers-reconnect.c  |   7 +-
 src/core/servers-setup.c      |  15 ++--
 src/core/servers.c            |  23 +++---
 src/irc/core/irc-servers.c    |  28 +++-----
 12 files changed, 297 insertions(+), 48 deletions(-)
 create mode 100644 src/core/network-proxy-priv.h
 create mode 100644 src/core/network-proxy.c
 create mode 100644 src/core/network-proxy.h

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index fc32e17e..ce4b4bb6 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -31,6 +31,9 @@ libcore_a_SOURCES = \
 	net-sendbuffer.c \
 	network.c \
 	network-openssl.c \
+	network-proxy.c \
+	network-proxy.h \
+	network-proxy-priv.h \
 	nicklist.c \
 	nickmatch-cache.c \
 	pidwait.c \
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 768fd540..1ef2c99c 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -552,11 +552,11 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	return gchan;
 }
 
-GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server)
+GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify)
 {
 	GIOChannel *handle, *ssl_handle;
 
-	handle = net_connect_ip(ip, port, my_ip);
+	handle = net_connect_proxy(proxy, host, port, ip, my_ip);
 	if (handle == NULL)
 		return NULL;
 	ssl_handle  = irssi_ssl_get_iochannel(handle, port, server);
diff --git a/src/core/network-proxy-priv.h b/src/core/network-proxy-priv.h
new file mode 100644
index 00000000..0a8f2449
--- /dev/null
+++ b/src/core/network-proxy-priv.h
@@ -0,0 +1,128 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef H_IRSSI_SRC_CORE_PROXY_PRIV_H
+#define H_IRSSI_SRC_CORE_PROXY_PRIV_H
+
+#include "settings.h"
+#include <stdbool.h>
+
+/* stolen from linux kernel */
+#define container_of(ptr, type, member)  __extension__ ({	    \
+	const __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+
+inline static void
+_network_proxy_create(struct network_proxy *dst)
+{
+	dst->port  = settings_get_int("proxy_port");
+	dst->host  = g_strdup(settings_get_str("proxy_address"));
+}
+
+inline static void
+_network_proxy_clone(struct network_proxy *dst, struct network_proxy const *src)
+{
+	dst->host  = g_strdup(src->host);
+	dst->port  = src->port;
+
+	dst->destroy = src->destroy;
+	dst->connect = src->connect;
+	dst->clone   = src->clone;
+}
+
+inline static void
+_network_proxy_destroy(struct network_proxy *proxy)
+{
+	g_free((void *)proxy->host);
+}
+
+
+
+inline static bool
+_network_proxy_send_all(GIOChannel *ch, void const *buf, ssize_t len)
+{
+	GError				*err = NULL;
+	gsize				written;
+	GIOStatus			status;
+
+	while ((status=g_io_channel_write_chars(ch, buf, len, &written,
+						&err))==G_IO_STATUS_AGAIN)
+		continue;
+
+	if (status==G_IO_STATUS_NORMAL)
+		return true;
+
+	if (err) {
+		g_warning("failed to send proxy request: %s", err->message);
+		g_error_free(err);
+	}
+
+	return false;
+}
+
+inline static bool
+_network_proxy_recv_all(GIOChannel *ch, void *buf_v, size_t len)
+{
+	GError				*err = NULL;
+	gchar				*buf = buf_v;
+
+	while (len>0) {
+		GIOStatus		status;
+		gsize			l;
+
+		status = g_io_channel_read_chars(ch, buf, len, &l, &err);
+		if (status==G_IO_STATUS_AGAIN)
+			continue;
+		if (status!=G_IO_STATUS_NORMAL)
+			break;
+
+		buf += l;
+		len -= l;
+	}
+
+	if (len==0)
+		return true;
+
+	if (err) {
+		g_warning("failed to send proxy request: %s", err->message);
+		g_error_free(err);
+	}
+
+	return false;
+}
+
+inline static bool
+_network_proxy_flush(GIOChannel *ch)
+{
+	GError			*err = NULL;
+	GIOStatus		status;
+
+	while ((status=g_io_channel_flush(ch, &err))==G_IO_STATUS_AGAIN)
+		continue;
+
+	if (status==G_IO_STATUS_NORMAL)
+		return true;
+
+	if (err) {
+		g_warning("failed to flush proxy channel: %s", err->message);
+		g_error_free(err);
+	}
+
+	return false;
+}
+
+#endif	/* H_IRSSI_SRC_CORE_PROXY_PRIV_H */
diff --git a/src/core/network-proxy.c b/src/core/network-proxy.c
new file mode 100644
index 00000000..cedf96b5
--- /dev/null
+++ b/src/core/network-proxy.c
@@ -0,0 +1,30 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "module.h"
+
+#include "network-proxy.h"
+#include <string.h>
+
+struct network_proxy *
+network_proxy_create(char const *type)
+{
+	if (type==NULL)
+		return NULL;
+
+	g_error("unsupported proxy type '%s'", type);
+	return NULL;
+}
diff --git a/src/core/network-proxy.h b/src/core/network-proxy.h
new file mode 100644
index 00000000..cdc3d057
--- /dev/null
+++ b/src/core/network-proxy.h
@@ -0,0 +1,81 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef H_IRSSI_SRC_CORE_PROXY_H
+#define H_IRSSI_SRC_CORE_PROXY_H
+
+#include <glib.h>
+#include <stdint.h>
+
+/* helper structure for the send_string*() functions of the network_proxy
+ * class */
+struct network_proxy_send_string_info
+{
+	char const		*host;	/* hostname of the IRC server */
+	uint16_t		port;	/* portnumber of the IRC server */
+
+	/* function which is used to send string; usually irc_send_cmd_now() */
+	void			(*func)(void *obj, char const *);
+
+	/* object for func */
+	void			*obj;
+};
+
+struct network_proxy {
+	/* destroys the network_proxy structure which must not be used anymore
+	 * after; this memberfunction is mandatory */
+	void			(*destroy)(struct network_proxy *);
+
+	/* connects through the proxy; this memberfunction is mandatory
+	 *
+	 * \arg hint_ip   the asynchronously resolved ip of the proxy; when
+	 *                NULL, method will resolve it itself
+	 * \arg address   the hostname where proxy shall connect to
+	 * \arg port      port address where proxy shall connect to
+	 */
+	GIOChannel *		(*connect)(struct network_proxy const *, IPADDR const *hint_ip,
+					   char const *address, int port);
+
+	/* clones the given network_proxy object; this memberfunction is
+	 * mandatory */
+	struct network_proxy *	(*clone)(struct network_proxy const *);
+
+
+	/* sends a string after connection has been established but before IRC
+	 * authentication begins; this memberfunction is optional
+	 */
+	void			(*send_string)(struct network_proxy const *,
+					       struct network_proxy_send_string_info const *);
+
+	/* sends a string after connection IRC authentication suceeded; this
+	 * memberfunction is optional
+	 */
+	void			(*send_string_after)(struct network_proxy const *,
+						     struct network_proxy_send_string_info const *);
+
+
+	/* hostname of proxy host */
+	char const		*host;
+
+	/* portnumber of proxy */
+	int			port;
+};
+
+/* factory method to create a proxy object based upon value of 'type' */
+struct network_proxy *		network_proxy_create(char const *type);
+
+
+#endif	/* H_IRSSI_SRC_CORE_PROXY_H */
diff --git a/src/core/network.c b/src/core/network.c
index 3659ab36..b65c376d 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include "network.h"
+#include "network-proxy.h"
 
 #include <sys/un.h>
 
@@ -169,7 +170,7 @@ GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
 }
 
 /* Connect to socket with ip address */
-GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
+GIOChannel *net_connect_ip(IPADDR const *ip, int port, IPADDR *my_ip)
 {
 	union sockaddr_union so;
 	int handle, ret, opt = 1;
@@ -226,6 +227,18 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 	return g_io_channel_new(handle);
 }
 
+/* Connect to socket */
+GIOChannel *net_connect_proxy(struct network_proxy const *proxy,
+			      char const *host, int port, IPADDR *ip, IPADDR *my_ip)
+{
+
+	if (proxy)
+		return proxy->connect(proxy, ip, host, port);
+	else
+		return net_connect_ip(ip, port, my_ip);
+}
+
+
 /* Connect to named UNIX socket */
 GIOChannel *net_connect_unix(const char *path)
 {
diff --git a/src/core/network.h b/src/core/network.h
index fa7e9675..af9c6983 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -39,6 +39,7 @@ struct _IPADDR {
 
 #define IPADDR_IS_V6(ip) ((ip)->family != AF_INET)
 
+struct network_proxy;
 extern IPADDR ip4_any;
 
 GIOChannel *g_io_channel_new(int handle);
@@ -49,10 +50,11 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
-GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server);
+GIOChannel *net_connect_ip(IPADDR const *ip, int port, IPADDR *my_ip);
+GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify);
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
-GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
+GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip);
 /* Connect to named UNIX socket */
 GIOChannel *net_connect_unix(const char *path);
 /* Disconnect socket */
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 17537508..ac99df8d 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -5,10 +5,7 @@ int chat_type; /* chat_protocol_lookup(xx) */
 
 int refcount;
 
-/* if we're connecting via proxy, or just NULLs */
-char *proxy;
-int proxy_port;
-char *proxy_string, *proxy_string_after, *proxy_password;
+struct network_proxy	*proxy;
 
 unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */
 char *tag; /* try to keep this tag when connected to server */
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 0a08b461..3ee498ed 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -29,6 +29,7 @@
 #include "servers-reconnect.h"
 
 #include "settings.h"
+#include "network-proxy.h"
 
 GSList *reconnects;
 static int last_reconnect_tag;
@@ -157,11 +158,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
         server_connect_ref(dest);
 	dest->type = module_get_uniq_id("SERVER CONNECT", 0);
 	dest->reconnection = src->reconnection;
-	dest->proxy = g_strdup(src->proxy);
-        dest->proxy_port = src->proxy_port;
-	dest->proxy_string = g_strdup(src->proxy_string);
-	dest->proxy_string_after = g_strdup(src->proxy_string_after);
-	dest->proxy_password = g_strdup(src->proxy_password);
+	dest->proxy = src->proxy ? src->proxy->clone(src->proxy) : NULL;
 
 	dest->tag = g_strdup(src->tag);
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 0819ff1a..87470266 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -28,6 +28,7 @@
 #include "chatnets.h"
 #include "servers.h"
 #include "servers-setup.h"
+#include "network-proxy.h"
 
 GSList *setupservers;
 
@@ -126,15 +127,6 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
 	conn->username = g_strdup(settings_get_str("user_name"));
 	conn->realname = g_strdup(settings_get_str("real_name"));
 
-	/* proxy settings */
-	if (settings_get_bool("use_proxy")) {
-		conn->proxy = g_strdup(settings_get_str("proxy_address"));
-		conn->proxy_port = settings_get_int("proxy_port");
-		conn->proxy_string = g_strdup(settings_get_str("proxy_string"));
-		conn->proxy_string_after = g_strdup(settings_get_str("proxy_string_after"));
-		conn->proxy_password = g_strdup(settings_get_str("proxy_password"));
-	}
-
 	/* source IP */
 	if (source_host_ip4 != NULL) {
 		conn->own_ip4 = g_new(IPADDR, 1);
@@ -145,6 +137,10 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
 		memcpy(conn->own_ip6, source_host_ip6, sizeof(IPADDR));
 	}
 
+	/* proxy settings */
+	if (settings_get_bool("use_proxy"))
+		conn->proxy = network_proxy_create(settings_get_str("proxy_type"));
+
 	signal_emit("server setup fill connect", 1, conn);
 }
 
@@ -546,6 +542,7 @@ void servers_setup_init(void)
 	settings_add_str("proxy", "proxy_string", "CONNECT %s %d");
 	settings_add_str("proxy", "proxy_string_after", "");
 	settings_add_str("proxy", "proxy_password", "");
+	settings_add_str("proxy", "proxy_type", "simple");
 
         setupservers = NULL;
 	source_host_ip4 = source_host_ip6 = NULL;
diff --git a/src/core/servers.c b/src/core/servers.c
index 06f82d4d..39b54f9a 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -34,6 +34,7 @@
 #include "servers-setup.h"
 #include "channels.h"
 #include "queries.h"
+#include "network-proxy.h"
 
 GSList *servers, *lookup_servers;
 
@@ -221,10 +222,18 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		own_ip = ip == NULL ? NULL :
 			(IPADDR_IS_V6(ip) ? server->connrec->own_ip6 :
 			 server->connrec->own_ip4);
-		port = server->connrec->proxy != NULL ?
-			server->connrec->proxy_port : server->connrec->port;
+		port = server->connrec->port;
 		handle = server->connrec->use_ssl ?
-			net_connect_ip_ssl(ip, port, own_ip, server) : net_connect_ip(ip, port, own_ip);
+			net_connect_proxy_ssl(server->connrec->proxy,
+					      server->connrec->address, port,
+					      ip, own_ip,
+					      server->connrec->ssl_cert,
+					      server->connrec->ssl_pkey,
+					      server->connrec->ssl_cafile,
+					      server->connrec->ssl_capath, server->connrec->ssl_verify) :
+			net_connect_proxy(server->connrec->proxy,
+					  server->connrec->address, port,
+					  ip, own_ip);
 	} else {
 		handle = net_connect_unix(unix_socket);
 	}
@@ -421,7 +430,7 @@ int server_start_connect(SERVER_REC *server)
 		server->connect_pipe[1] = g_io_channel_new(fd[1]);
 
 		connect_address = server->connrec->proxy != NULL ?
-			server->connrec->proxy : server->connrec->address;
+			server->connrec->proxy->host : server->connrec->address;
 		server->connect_pid =
 			net_gethostbyname_nonblock(connect_address,
 						   server->connect_pipe[1],
@@ -616,10 +625,8 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	if (conn->connect_handle != NULL)
 		net_disconnect(conn->connect_handle);
 
-	g_free_not_null(conn->proxy);
-	g_free_not_null(conn->proxy_string);
-	g_free_not_null(conn->proxy_string_after);
-	g_free_not_null(conn->proxy_password);
+	if (conn->proxy)
+		conn->proxy->destroy(conn->proxy);
 
 	g_free_not_null(conn->tag);
 	g_free_not_null(conn->address);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 27878989..1bf67ac3 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -37,6 +37,7 @@
 #include "servers-reconnect.h"
 #include "servers-redirect.h"
 #include "modes.h"
+#include "network-proxy.h"
 
 #include "settings.h"
 #include "recode.h"
@@ -195,23 +196,19 @@ static void server_init(IRC_SERVER_REC *server)
 	IRC_SERVER_CONNECT_REC *conn;
 	char *address, *ptr, *username, *cmd;
 	GTimeVal now;
+	struct network_proxy_send_string_info const	send_info = {
+		.host	=  server->connrec->address,
+		.port	=  server->connrec->port,
+		.func	=  irc_send_cmd_now_wrapper,
+		.obj    =  server
+	};
 
 	g_return_if_fail(server != NULL);
 
 	conn = server->connrec;
 
-	if (conn->proxy != NULL && conn->proxy_password != NULL &&
-	    *conn->proxy_password != '\0') {
-		cmd = g_strdup_printf("PASS %s", conn->proxy_password);
-		irc_send_cmd_now(server, cmd);
-		g_free(cmd);
-	}
-
-	if (conn->proxy != NULL && conn->proxy_string != NULL) {
-		cmd = g_strdup_printf(conn->proxy_string, conn->address, conn->port);
-		irc_send_cmd_now(server, cmd);
-		g_free(cmd);
-	}
+	if (conn->proxy && conn->proxy->send_string)
+		conn->proxy->send_string(conn->proxy, &send_info);
 
 	if (conn->password != NULL && *conn->password != '\0') {
                 /* send password */
@@ -245,11 +242,8 @@ static void server_init(IRC_SERVER_REC *server)
 	g_free(cmd);
 	g_free(username);
 
-	if (conn->proxy != NULL && conn->proxy_string_after != NULL) {
-		cmd = g_strdup_printf(conn->proxy_string_after, conn->address, conn->port);
-		irc_send_cmd_now(server, cmd);
-		g_free(cmd);
-	}
+	if (conn->proxy && conn->proxy->send_string_after)
+		conn->proxy->send_string_after(conn->proxy, &send_info);
 
 	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
 					    (GCompareFunc) g_istr_equal);

From 3300e07f290f1e483419730bd070ae5d66d782d1 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Tue, 26 Feb 2008 17:06:58 +0100
Subject: [PATCH 0015/1650] PROXY/SIMPLE: added simple proxy method

This method implements the string + string_after mechanism implemented by
previous irssi versions.

To use, set
* proxy_type to 'simple' or keep it empty
* string + string_after in the known ways
---
 src/core/network-proxy-simple.c | 121 ++++++++++++++++++++++++++++++++
 src/core/network-proxy-simple.h |  32 +++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 src/core/network-proxy-simple.c
 create mode 100644 src/core/network-proxy-simple.h

diff --git a/src/core/network-proxy-simple.c b/src/core/network-proxy-simple.c
new file mode 100644
index 00000000..a7ac1fac
--- /dev/null
+++ b/src/core/network-proxy-simple.c
@@ -0,0 +1,121 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "module.h"
+#include "network-proxy-simple.h"
+
+#include "network-proxy-priv.h"
+#include "network.h"
+
+static void
+network_proxy_simple_destroy(struct network_proxy *proxy)
+{
+	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
+
+	g_free((void *)self->password);
+	g_free((void *)self->string_after);
+	g_free((void *)self->string);
+
+	_network_proxy_destroy(proxy);
+
+	g_free(self);
+}
+
+static struct network_proxy *
+network_proxy_simple_clone(struct network_proxy const *proxy)
+{
+	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
+	struct _network_proxy_simple	*res;
+
+	res = g_malloc0(sizeof *res);
+
+	_network_proxy_clone(&res->proxy, &self->proxy);
+
+	res->string       = g_strdup(self->string);
+	res->string_after = g_strdup(self->string_after);
+	res->password     = g_strdup(self->password);
+	return &res->proxy;
+}
+
+static GIOChannel *
+network_proxy_simple_connect(struct network_proxy const *proxy, IPADDR const *hint_ip,
+			     char const *address, int port)
+{
+	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
+
+	(void)address;
+	(void)port;
+	if (hint_ip)
+		return net_connect_ip(hint_ip, self->proxy.port, NULL);
+	else
+		return net_connect(self->proxy.host, self->proxy.port, NULL);
+}
+
+static void
+network_proxy_simple_send_string(struct network_proxy const *proxy,
+				 struct network_proxy_send_string_info const *info)
+{
+	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
+	char				*cmd;
+
+	if (self->password && self->password[0]) {
+		cmd = g_strdup_printf("PASS %s", self->password);
+		info->func(info->obj, cmd);
+		g_free(cmd);
+	}
+
+	if (self->string && self->string[0]) {
+		cmd = g_strdup_printf(self->string, info->host, info->port);
+		info->func(info->obj, cmd);
+		g_free(cmd);
+	}
+}
+
+static void
+network_proxy_simple_send_string_after(struct network_proxy const *proxy,
+				 struct network_proxy_send_string_info const *info)
+{
+	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
+	char				*cmd;
+
+	if (self->string_after && self->string_after[0]) {
+		cmd = g_strdup_printf(self->string_after, info->host, info->port);
+		info->func(info->obj, cmd);
+		g_free(cmd);
+	}
+}
+
+struct network_proxy *
+_network_proxy_simple_create(void)
+{
+	struct _network_proxy_simple	*res;
+
+	res = g_malloc0(sizeof *res);
+
+	_network_proxy_create(&res->proxy);
+	res->string        = g_strdup(settings_get_str("proxy_string"));
+	res->string_after  = g_strdup(settings_get_str("proxy_string_after"));
+	res->password      = g_strdup(settings_get_str("proxy_password"));
+
+	res->proxy.destroy = network_proxy_simple_destroy;
+	res->proxy.connect = network_proxy_simple_connect;
+	res->proxy.clone   = network_proxy_simple_clone;
+
+	res->proxy.send_string       = network_proxy_simple_send_string;
+	res->proxy.send_string_after = network_proxy_simple_send_string_after;
+
+	return &res->proxy;
+}
diff --git a/src/core/network-proxy-simple.h b/src/core/network-proxy-simple.h
new file mode 100644
index 00000000..b2132cf2
--- /dev/null
+++ b/src/core/network-proxy-simple.h
@@ -0,0 +1,32 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef H_IRSSI_SRC_CORE_PROXY_SIMPLE_H
+#define H_IRSSI_SRC_CORE_PROXY_SIMPLE_H
+
+#include "network-proxy.h"
+
+struct _network_proxy_simple {
+	struct network_proxy	proxy;
+
+	char const		*string_after;
+	char const		*string;
+	char const		*password;
+};
+
+struct network_proxy *		_network_proxy_simple_create(void);
+
+#endif	/* H_IRSSI_SRC_CORE_PROXY_SIMPLE_H */

From 47419298ef0f7f88ea8345726754a68ec66ad39d Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Tue, 26 Feb 2008 17:57:14 +0100
Subject: [PATCH 0016/1650] PROXY/HTTP: added methods for HTTP proxies

This patch adds code for connecting through HTTP proxies. Open issues are:

* support of proxy authentication
* a possible DOS due to the usage of g_io_channel_read_line_string() which
  does not allow to specify a maximum length of line.

To use this method:
* set 'proxy_type' to 'http'
---
 src/core/network-proxy-http.c | 193 ++++++++++++++++++++++++++++++++++
 src/core/network-proxy-http.h |  29 +++++
 2 files changed, 222 insertions(+)
 create mode 100644 src/core/network-proxy-http.c
 create mode 100644 src/core/network-proxy-http.h

diff --git a/src/core/network-proxy-http.c b/src/core/network-proxy-http.c
new file mode 100644
index 00000000..3e79d784
--- /dev/null
+++ b/src/core/network-proxy-http.c
@@ -0,0 +1,193 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "module.h"
+#include "network-proxy-http.h"
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "network.h"
+#include "network-proxy-priv.h"
+
+static void
+network_proxy_http_destroy(struct network_proxy *proxy)
+{
+	struct _network_proxy_http	*self = container_of(proxy, struct _network_proxy_http, proxy);
+
+	g_free((void *)self->password);
+	_network_proxy_destroy(proxy);
+
+	g_free(self);
+}
+
+static struct network_proxy *
+network_proxy_http_clone(struct network_proxy const *proxy)
+{
+	struct _network_proxy_http	*self = container_of(proxy, struct _network_proxy_http, proxy);
+	struct _network_proxy_http	*res;
+
+	res = g_malloc0(sizeof *res);
+
+	_network_proxy_clone(&res->proxy, &self->proxy);
+	res->password = g_strdup(self->password);
+	return &res->proxy;
+}
+
+static bool
+send_connect(struct _network_proxy_http *proxy, GIOChannel *ch, char const *address, uint16_t port)
+{
+	char				port_str[6];
+
+	(void)proxy;
+	sprintf(port_str, "%u", port);
+
+	if (!_network_proxy_send_all(ch, "CONNECT ", -1) ||
+	    !_network_proxy_send_all(ch, address,    -1) ||
+	    !_network_proxy_send_all(ch, ":",        -1) ||
+	    !_network_proxy_send_all(ch, port_str,   -1) ||
+	    !_network_proxy_send_all(ch, " HTTP/1.0\r\n\r\n", -1) ||
+	    !_network_proxy_flush(ch))
+		return -1;
+
+	return true;
+}
+
+static int
+read_response(struct _network_proxy_http *proxy, GIOChannel *ch)
+{
+	GIOStatus			status;
+	GString				line = { .str = NULL };
+	gsize				term_pos;
+	GError				*err = NULL;
+	int				state = 0;
+	int				rc = 0;
+	gchar				*resp = NULL;
+
+	(void)proxy;
+	for (;;) {
+		/* TODO: a malicious proxy can DOS us by sending much data
+		 * without a line break */
+		while ((status=g_io_channel_read_line_string(ch, &line, &term_pos,
+							     &err))==G_IO_STATUS_AGAIN)
+		{
+			/* noop */
+		}
+
+		if (status!=G_IO_STATUS_NORMAL) {
+			g_warning("failed to read HTTP response: %s", err->message);
+			goto err;
+		}
+
+		if (state==0) {
+			if (g_str_has_prefix(line.str, "HTTP/1.0 ")) {
+				resp = g_strndup(line.str+9, line.len-9-2);
+				rc   = g_ascii_strtoull(resp, NULL, 10);
+			} else {
+				g_warning("unexpected HTTP response: '%s'", line.str);
+				goto err;
+			}
+
+			/* state=1 ... read additional response headers
+			 *             (ignored for now) */
+			state=1;
+		}
+
+		if (line.len==2)	/* only the \r\n terminators */
+			break;
+	}
+
+	if (rc!=200)
+		g_warning("unexpected HTTP response code: %s", resp);
+
+	g_free(resp);
+	g_free(line.str);
+	return rc;
+
+err:
+	g_free(resp);
+	g_free(line.str);
+	return -1;
+}
+
+static GIOChannel *
+network_proxy_http_connect(struct network_proxy const *proxy, IPADDR const *hint_ip,
+			   char const *address, int port)
+{
+	struct _network_proxy_http	*self = container_of(proxy, struct _network_proxy_http, proxy);
+	GIOChannel			*ch;
+	GIOFlags			old_flags;
+	GError				*err = NULL;
+	gchar const			*line_term;
+	gint				line_term_sz;
+
+	if (hint_ip)
+		ch = net_connect_ip(hint_ip, self->proxy.port, NULL);
+	else
+		ch = net_connect(self->proxy.host, self->proxy.port, NULL);
+
+	if (!ch)
+		return NULL;
+
+	/* set \r\n line delims */
+	line_term = g_io_channel_get_line_term(ch, &line_term_sz);
+	g_io_channel_set_line_term(ch, "\r\n", 2);
+
+	/* set to non-blocking */
+	old_flags = g_io_channel_get_flags(ch);
+	if (g_io_channel_set_flags(ch, old_flags & ~G_IO_FLAG_NONBLOCK, &err)!=G_IO_STATUS_NORMAL)
+		goto err;
+
+	if (!send_connect(self, ch, address, port) ||
+	    read_response(self, ch)!=200)
+		goto err;
+
+	if (g_io_channel_set_flags(ch, old_flags, &err)!=G_IO_STATUS_NORMAL)
+		goto err;
+
+	g_io_channel_set_line_term(ch, line_term, line_term_sz);
+	return ch;
+err:
+	if (err) {
+		g_warning("something went wrong while preparing HTTP proxy request: %s",
+			  err->message);
+		g_error_free(err);
+	}
+
+	net_disconnect(ch);
+	return NULL;
+
+}
+
+
+struct network_proxy *
+_network_proxy_http_create(void)
+{
+	struct _network_proxy_http	*res;
+
+	res = g_malloc0(sizeof *res);
+
+	_network_proxy_create(&res->proxy);
+	res->password    = g_strdup(settings_get_str("proxy_password"));
+
+	res->proxy.destroy = network_proxy_http_destroy;
+	res->proxy.connect = network_proxy_http_connect;
+	res->proxy.clone   = network_proxy_http_clone;
+
+	return &res->proxy;
+}
diff --git a/src/core/network-proxy-http.h b/src/core/network-proxy-http.h
new file mode 100644
index 00000000..92405fa6
--- /dev/null
+++ b/src/core/network-proxy-http.h
@@ -0,0 +1,29 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef H_IRSSI_SRC_CORE_PROXY_HTTP_H
+#define H_IRSSI_SRC_CORE_PROXY_HTTP_H
+
+#include "network-proxy.h"
+
+struct _network_proxy_http {
+	struct network_proxy	proxy;
+	char const		*password;
+};
+
+struct network_proxy *		_network_proxy_http_create(void);
+
+#endif	/* H_IRSSI_SRC_CORE_PROXY_HTTP_H */

From bb276c0b8023ae31805b06ba5e993125b2a27e28 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Tue, 26 Feb 2008 18:04:40 +0100
Subject: [PATCH 0017/1650] PROXY/SOCKS5: added methods for SOCKS5 proxies

This patch adds code for connecting through SOCKS5 proxies. It was
primarily written for use with TOR, so there are some open issues:

* it only allows to make proxy requests with full hostnames; ipv4/ipv6 is
  not supported

* GSSAPI authentication (which is mentioned as mandatory in RFC 1928) is
  not implemented

* plaintext authentication is untested

To use it
* set 'proxy_type' to 'socks5'
---
 src/core/network-proxy-socks5.c | 338 ++++++++++++++++++++++++++++++++
 src/core/network-proxy-socks5.h |  31 +++
 2 files changed, 369 insertions(+)
 create mode 100644 src/core/network-proxy-socks5.c
 create mode 100644 src/core/network-proxy-socks5.h

diff --git a/src/core/network-proxy-socks5.c b/src/core/network-proxy-socks5.c
new file mode 100644
index 00000000..64a8f510
--- /dev/null
+++ b/src/core/network-proxy-socks5.c
@@ -0,0 +1,338 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "module.h"
+#include "network-proxy-socks5.h"
+
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "network.h"
+#include "network-proxy-priv.h"
+
+/* RFC 1928 */
+struct client_greeting
+{
+	uint8_t		ver;
+	uint8_t		nmethods;
+	uint8_t		methods[];
+} __attribute__((__packed__));
+
+struct server_greeting
+{
+	uint8_t		ver;
+	uint8_t		method;
+} __attribute__((__packed__));
+
+struct server_response_plain
+{
+	uint8_t		ver;
+	uint8_t		status;
+} __attribute__((__packed__));
+
+struct client_request
+{
+	uint8_t		ver;
+	uint8_t		cmd;
+	uint8_t		rsv;
+	uint8_t		atyp;
+	uint8_t		dst[];
+} __attribute__((__packed__));
+
+struct server_response
+{
+	uint8_t		ver;
+	uint8_t		rep;
+	uint8_t		res;
+	uint8_t		atyp;
+	uint8_t		bnd[];
+} __attribute__((__packed__));
+
+static void
+network_proxy_socks5_destroy(struct network_proxy *proxy)
+{
+	struct _network_proxy_socks5	*self = container_of(proxy, struct _network_proxy_socks5, proxy);
+
+	g_free((void *)self->password);
+	g_free((void *)self->username);
+	_network_proxy_destroy(proxy);
+	g_free(self);
+}
+
+static struct network_proxy *
+network_proxy_socks5_clone(struct network_proxy const *proxy)
+{
+	struct _network_proxy_socks5	*self = container_of(proxy, struct _network_proxy_socks5, proxy);
+	struct _network_proxy_socks5	*res;
+
+	res = g_malloc0(sizeof *res);
+
+	_network_proxy_clone(&res->proxy, &self->proxy);
+	res->username = g_strdup(self->username);
+	res->password = g_strdup(self->password);
+	return &res->proxy;
+}
+
+static bool
+socks5_connect_unauthorized(GIOChannel *ch)
+{
+	/* nothing to do here */
+	(void)ch;
+	return true;
+}
+
+/* TODO: test this method! */
+static bool
+socks5_connect_plain(struct _network_proxy_socks5 const *proxy, GIOChannel *ch)
+{
+	uint8_t				ver  = 0x01;
+	uint8_t				ulen = strlen(proxy->username);
+	uint8_t				plen = proxy->password ? strlen(proxy->password) : 0;
+	struct server_response_plain	resp;
+
+	if (ulen==0 ||
+	    !_network_proxy_send_all(ch, &ver, sizeof ver) ||
+	    !_network_proxy_send_all(ch, &ulen, sizeof ulen) ||
+	    !_network_proxy_send_all(ch, proxy->username, ulen) ||
+	    !_network_proxy_send_all(ch, &plen, sizeof plen) ||
+	    (plen>0 && !_network_proxy_send_all(ch, proxy->password, plen)) ||
+	    !_network_proxy_flush(ch) ||
+	    !_network_proxy_recv_all(ch, &resp, sizeof resp))
+		return false;
+
+	if (resp.ver!=0x01) {
+		g_warning("unexpected plaintext response version %#04x", resp.ver);
+		return false;
+	}
+
+	if (resp.status!=0x00) {
+		g_warning("socks5 authentication error (%#04x)", resp.status);
+		return false;
+	}
+
+	return true;
+}
+
+static bool
+socks5_connect(struct _network_proxy_socks5 const *proxy, GIOChannel *ch,
+	       char const *address, uint16_t port)
+{
+	bool				rc;
+
+	struct server_greeting		s_greeting;
+	struct server_response		s_response;
+
+
+	/* Phase 1: exchange greeting */
+	{
+		struct client_greeting		c_greeting = {
+			.ver      = 0x05,
+			.nmethods = proxy->username && proxy->username[0] ? 2 : 1
+		};
+		/* HACK: order is important because it depends upon
+		 * c_greeting.nmethods  */
+		char const			methods[] = {
+			0x00,			/* no authentication */
+			0x02			/* username/password */
+		};
+		if (!_network_proxy_send_all(ch, &c_greeting, sizeof c_greeting) ||
+		    !_network_proxy_send_all(ch, methods,     c_greeting.nmethods) ||
+		    !_network_proxy_flush(ch) ||
+		    !_network_proxy_recv_all(ch, &s_greeting, sizeof s_greeting))
+			goto err;
+
+		if (s_greeting.ver!=5) {
+			g_warning("version mismatch during initial socks5 greeting; got version %#04x",
+				  s_greeting.ver);
+			goto err;
+		}
+	}
+
+	/* Phase 2: authentication */
+	{
+		switch (s_greeting.method) {
+		case 0x00: rc = socks5_connect_unauthorized(ch); break;
+		case 0x02: rc = socks5_connect_plain(proxy, ch); break;
+		default:
+			g_warning("unsupported authentication method %#04x", s_greeting.method);
+			rc = false;
+		}
+
+		if (!rc)
+			goto err;
+	}
+
+	/* Phase 3: connection request */
+	{
+		struct client_request		c_request = {
+			.ver	  = 0x05,
+			.cmd	  = 0x01,	/* CONNECT */
+			.atyp     = 0x03,	/* domain name */
+		};
+		uint8_t				address_len = strlen(address);
+		uint16_t			dst_port = htons(port);
+		uint16_t			bnd_port;
+		char				bnd_address[257];
+
+		if (!_network_proxy_send_all(ch, &c_request,   sizeof c_request) ||
+		    !_network_proxy_send_all(ch, &address_len, sizeof address_len) ||
+		    !_network_proxy_send_all(ch, address,      address_len) ||
+		    !_network_proxy_send_all(ch, &dst_port,    sizeof dst_port) ||
+		    !_network_proxy_flush(ch) ||
+		    !_network_proxy_recv_all(ch, &s_response,  sizeof s_response))
+			goto err;
+
+		if (s_response.ver != 0x05) {
+			g_warning("version mismatch in socks5 response; got version %#04x",
+				  s_response.ver);
+			goto err;
+		}
+
+		rc = false;
+		switch (s_response.rep) {
+		case 0x00: rc = true; break;	/* succeeded */
+		case 0x01: g_warning("SOCKS5: general SOCKS server failure"); break;
+		case 0x02: g_warning("SOCKS5: connection not allowed by ruleset"); break;
+		case 0x03: g_warning("SOCKS5: Network unreachable"); break;
+		case 0x04: g_warning("SOCKS5: Host unreachable"); break;
+		case 0x05: g_warning("SOCKS5: Connection refused"); break;
+		case 0x06: g_warning("SOCKS5: TTL expired"); break;
+		case 0x07: g_warning("SOCKS5: Command not supported"); break;
+		case 0x08: g_warning("SOCKS5: Address type not supported"); break;
+		default:   g_warning("SOCKS5: unknown error %#04x", s_response.rep); break;
+		}
+
+		if (!rc)
+			goto err;
+
+		switch(s_response.atyp) {
+		case 0x01: {
+			struct in_addr	ip;
+			if (!_network_proxy_recv_all(ch, &ip,     sizeof ip) ||
+			    !inet_ntop(AF_INET, &ip, bnd_address, sizeof bnd_address))
+				rc = false;
+			break;
+		}
+
+		case 0x04: {
+			struct in6_addr	ip;
+			if (!_network_proxy_recv_all(ch, &ip,      sizeof ip) ||
+			    !inet_ntop(AF_INET6, &ip, bnd_address, sizeof bnd_address))
+				rc = false;
+			break;
+		}
+
+		case 0x03: {
+			uint8_t		tmp;
+			if (!_network_proxy_recv_all(ch, &tmp, sizeof tmp) ||
+			    tmp==0 ||
+			    !_network_proxy_recv_all(ch, &bnd_address, tmp))
+				rc = false;
+			else
+				bnd_address[tmp] = '\0';
+		}
+
+		default:
+			g_warning("SOCKS5: unsupported address family in response: %#04x",
+				  s_response.atyp);
+			rc = false;
+		}
+
+		if (!rc ||
+		    !_network_proxy_recv_all(ch, &bnd_port, sizeof bnd_port))
+			goto err;
+
+		bnd_port = ntohs(bnd_port);
+		g_debug("SOCKS5: bound to %s:%u", bnd_address, bnd_port);
+	}
+
+	return true;
+
+err:
+	g_warning("connecting through socks5 proxy failed");
+	return  false;
+}
+
+
+static GIOChannel *
+network_proxy_socks5_connect(struct network_proxy const *proxy, IPADDR const *hint_ip,
+			     char const *address, int port)
+{
+	struct _network_proxy_socks5	*self = container_of(proxy, struct _network_proxy_socks5, proxy);
+	GIOChannel			*ch;
+
+	GIOFlags			old_flags;
+	gchar const			*old_enc;
+	gboolean			old_buf;
+	GError				*err = NULL;
+
+	if (hint_ip)
+		ch = net_connect_ip(hint_ip, self->proxy.port, NULL);
+	else
+		ch = net_connect(self->proxy.host, self->proxy.port, NULL);
+
+	if (!ch)
+		return NULL;
+
+	old_enc   = g_io_channel_get_encoding(ch);
+	old_flags = g_io_channel_get_flags(ch);
+	old_buf   = g_io_channel_get_buffered(ch);
+
+	if (g_io_channel_set_encoding(ch, NULL, &err)!=G_IO_STATUS_NORMAL ||
+	    g_io_channel_set_flags(ch, old_flags & ~G_IO_FLAG_NONBLOCK, &err)!=G_IO_STATUS_NORMAL)
+		goto err;
+
+	g_io_channel_set_buffered(ch, false);
+
+	if (!socks5_connect(self, ch, address, port))
+		goto err;
+
+	g_io_channel_set_buffered(ch, old_buf);
+
+	if (g_io_channel_set_flags(ch, old_flags, &err) !=G_IO_STATUS_NORMAL ||
+	    g_io_channel_set_encoding(ch, old_enc, &err)!=G_IO_STATUS_NORMAL)
+		goto err;
+
+	return ch;
+
+err:
+	if (err) {
+		g_warning("something went wrong while preparing SOCKS5 proxy request: %s",
+			  err->message);
+		g_error_free(err);
+	}
+
+	net_disconnect(ch);
+	return NULL;
+}
+
+struct network_proxy *
+_network_proxy_socks5_create(void)
+{
+	struct _network_proxy_socks5	*res;
+
+	res = g_malloc0(sizeof *res);
+
+	_network_proxy_create(&res->proxy);
+	res->username    = g_strdup(settings_get_str("proxy_username"));
+	res->password    = g_strdup(settings_get_str("proxy_password"));
+
+	res->proxy.destroy = network_proxy_socks5_destroy;
+	res->proxy.connect = network_proxy_socks5_connect;
+	res->proxy.clone   = network_proxy_socks5_clone;
+
+	return &res->proxy;
+}
diff --git a/src/core/network-proxy-socks5.h b/src/core/network-proxy-socks5.h
new file mode 100644
index 00000000..963bad3d
--- /dev/null
+++ b/src/core/network-proxy-socks5.h
@@ -0,0 +1,31 @@
+/*	--*- c -*--
+ * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 and/or 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef H_IRSSI_SRC_CORE_PROXY_SOCKS5_H
+#define H_IRSSI_SRC_CORE_PROXY_SOCKS5_H
+
+#include "network-proxy.h"
+
+struct _network_proxy_socks5 {
+	struct network_proxy	proxy;
+
+	char const		*username;
+	char const		*password;
+};
+
+struct network_proxy *		_network_proxy_socks5_create(void);
+
+#endif	/* H_IRSSI_SRC_CORE_PROXY_SOCKS5_H */

From 2e8975270888cabd65683c070cb53412d43b5120 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Tue, 26 Feb 2008 18:06:02 +0100
Subject: [PATCH 0018/1650] PROXY: merge proxy methods into buildsystem

This patch adds the code and rules to build the various proxy methods.
---
 src/core/Makefile.am     |  6 ++++++
 src/core/network-proxy.c | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index ce4b4bb6..c664739b 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -33,6 +33,12 @@ libcore_a_SOURCES = \
 	network-openssl.c \
 	network-proxy.c \
 	network-proxy.h \
+	network-proxy-simple.c \
+	network-proxy-simple.h \
+	network-proxy-http.c \
+	network-proxy-http.h \
+	network-proxy-socks5.c \
+	network-proxy-socks5.h \
 	network-proxy-priv.h \
 	nicklist.c \
 	nickmatch-cache.c \
diff --git a/src/core/network-proxy.c b/src/core/network-proxy.c
index cedf96b5..cb5f9417 100644
--- a/src/core/network-proxy.c
+++ b/src/core/network-proxy.c
@@ -18,6 +18,9 @@
 
 #include "network-proxy.h"
 #include <string.h>
+#include "network-proxy-simple.h"
+#include "network-proxy-http.h"
+#include "network-proxy-socks5.h"
 
 struct network_proxy *
 network_proxy_create(char const *type)
@@ -25,6 +28,15 @@ network_proxy_create(char const *type)
 	if (type==NULL)
 		return NULL;
 
+	if (strcmp(type, "simple")==0 || type[0]=='\0')
+		return _network_proxy_simple_create();
+
+	if (strcmp(type, "http")==0)
+		return _network_proxy_http_create();
+
+	if (strcmp(type, "socks5")==0)
+		return _network_proxy_socks5_create();
+
 	g_error("unsupported proxy type '%s'", type);
 	return NULL;
 }

From 9fcd69b9efbe64e0b9a8fa53f00ffcb968612fe7 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Wed, 7 Apr 2010 09:50:12 +0200
Subject: [PATCH 0019/1650] http-proxy: fixed bad return value

---
 src/core/network-proxy-http.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/network-proxy-http.c b/src/core/network-proxy-http.c
index 3e79d784..dfed96d9 100644
--- a/src/core/network-proxy-http.c
+++ b/src/core/network-proxy-http.c
@@ -63,7 +63,7 @@ send_connect(struct _network_proxy_http *proxy, GIOChannel *ch, char const *addr
 	    !_network_proxy_send_all(ch, port_str,   -1) ||
 	    !_network_proxy_send_all(ch, " HTTP/1.0\r\n\r\n", -1) ||
 	    !_network_proxy_flush(ch))
-		return -1;
+		return false;
 
 	return true;
 }

From d5727e1648d71dd46fedb3337dbc337e22eed11f Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Fri, 3 Oct 2014 17:34:24 +0200
Subject: [PATCH 0020/1650] Porting some stuff to modern git version

---
 src/core/network-openssl.c | 4 ++--
 src/core/network.h         | 2 +-
 src/core/servers.c         | 5 +----
 src/irc/core/irc-servers.c | 5 +++++
 src/irc/core/irc-servers.h | 3 +++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 1ef2c99c..855333cd 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -551,8 +551,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 
 	return gchan;
 }
-
-GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify)
+GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port,
+                                  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server)
 {
 	GIOChannel *handle, *ssl_handle;
 
diff --git a/src/core/network.h b/src/core/network.h
index af9c6983..910cc182 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -51,7 +51,7 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
 GIOChannel *net_connect_ip(IPADDR const *ip, int port, IPADDR *my_ip);
-GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify);
+GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
 GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip);
diff --git a/src/core/servers.c b/src/core/servers.c
index 39b54f9a..c8b002bf 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -227,10 +227,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 			net_connect_proxy_ssl(server->connrec->proxy,
 					      server->connrec->address, port,
 					      ip, own_ip,
-					      server->connrec->ssl_cert,
-					      server->connrec->ssl_pkey,
-					      server->connrec->ssl_cafile,
-					      server->connrec->ssl_capath, server->connrec->ssl_verify) :
+					      server->connrec) :
 			net_connect_proxy(server->connrec->proxy,
 					  server->connrec->address, port,
 					  ip, own_ip);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 1bf67ac3..daa85438 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -313,6 +313,11 @@ void irc_server_connect(SERVER_REC *server)
 	}
 }
 
+void irc_send_cmd_now_wrapper(void *server, const char *cmd)
+{
+	return irc_send_cmd_now((IRC_SERVER_REC *)server, cmd);
+}
+
 /* Returns TRUE if `command' is sent to `target' */
 static int command_has_target(const char *cmd, const char *target)
 {
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 7e4eeabf..ac08d369 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -109,6 +109,7 @@ struct _IRC_SERVER_REC {
 SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn);
 void irc_server_connect(SERVER_REC *server);
 
+
 /* Purge server output, either all or for specified target */
 void irc_server_purge_output(IRC_SERVER_REC *server, const char *target);
 
@@ -125,6 +126,8 @@ void irc_server_send_away(IRC_SERVER_REC *server, const char *reason);
 void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len);
 void irc_server_init_isupport(IRC_SERVER_REC *server);
 
+void irc_send_cmd_now_wrapper(void *server, const char *cmd);
+
 void irc_servers_start_cmd_timeout(void);
 
 void irc_servers_init(void);

From f153922759eea4e28f92567fb5fa581bbaf7ee41 Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Fri, 3 Oct 2014 17:43:50 +0200
Subject: [PATCH 0021/1650] no patching unrelated stuff

---
 src/core/network.c | 2 +-
 src/core/network.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index b65c376d..eba5a98a 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -170,7 +170,7 @@ GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
 }
 
 /* Connect to socket with ip address */
-GIOChannel *net_connect_ip(IPADDR const *ip, int port, IPADDR *my_ip)
+GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 {
 	union sockaddr_union so;
 	int handle, ret, opt = 1;
diff --git a/src/core/network.h b/src/core/network.h
index 910cc182..3f138b82 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -50,10 +50,10 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
-GIOChannel *net_connect_ip(IPADDR const *ip, int port, IPADDR *my_ip);
 GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
+GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
 GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip);
 /* Connect to named UNIX socket */
 GIOChannel *net_connect_unix(const char *path);

From a35e5b4f9d423b93cba976ef5baddca7ea6fd60c Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Fri, 3 Oct 2014 23:30:37 +0200
Subject: [PATCH 0022/1650] Change coding style

---
 TODO                            |   5 +
 src/core/network-openssl.c      |   2 +-
 src/core/network-proxy-http.c   |  95 ++++++++---------
 src/core/network-proxy-http.h   |  24 +----
 src/core/network-proxy-priv.h   |  64 ++++-------
 src/core/network-proxy-simple.c |  88 ++++++++--------
 src/core/network-proxy-simple.h |  28 ++---
 src/core/network-proxy-socks5.c | 181 ++++++++++++++++----------------
 src/core/network-proxy-socks5.h |  26 +----
 src/core/network-proxy.c        |  35 +++---
 src/core/network-proxy.h        |  53 +++-------
 src/core/network.c              |   2 -
 src/core/network.h              |   6 +-
 src/core/server-connect-rec.h   |   2 +-
 14 files changed, 257 insertions(+), 354 deletions(-)

diff --git a/TODO b/TODO
index 7d28a3f0..832c7e05 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,8 @@
+ - New proxy code crashes if an invalid proxy_type setting is used
+ - Remove old socks code
+ - Lots of warnings at least when using socks5
+ - Clean up coding style
+
 19:36 [IRCNet] [muzzy] more bugs in irssi, apparently the new version:  foo splits out,
       	       	       bar joins, bar changes his nick to foo, foo splits again ->
 		       Glib warning "is already in split list (how?)" .. :)
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 855333cd..177a40db 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -552,7 +552,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	return gchan;
 }
 GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port,
-                                  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server)
+				  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server)
 {
 	GIOChannel *handle, *ssl_handle;
 
diff --git a/src/core/network-proxy-http.c b/src/core/network-proxy-http.c
index dfed96d9..450e0784 100644
--- a/src/core/network-proxy-http.c
+++ b/src/core/network-proxy-http.c
@@ -1,18 +1,20 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*
+ network-proxy-http.c : irssi
+
+    Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 and/or 3 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "module.h"
 #include "network-proxy-http.h"
@@ -25,10 +27,9 @@
 #include "network.h"
 #include "network-proxy-priv.h"
 
-static void
-network_proxy_http_destroy(struct network_proxy *proxy)
+static void network_proxy_http_destroy(struct network_proxy *proxy)
 {
-	struct _network_proxy_http	*self = container_of(proxy, struct _network_proxy_http, proxy);
+	struct _network_proxy_http *self = container_of(proxy, struct _network_proxy_http, proxy);
 
 	g_free((void *)self->password);
 	_network_proxy_destroy(proxy);
@@ -36,11 +37,10 @@ network_proxy_http_destroy(struct network_proxy *proxy)
 	g_free(self);
 }
 
-static struct network_proxy *
-network_proxy_http_clone(struct network_proxy const *proxy)
+static struct network_proxy *network_proxy_http_clone(const struct network_proxy *proxy)
 {
-	struct _network_proxy_http	*self = container_of(proxy, struct _network_proxy_http, proxy);
-	struct _network_proxy_http	*res;
+	struct _network_proxy_http *self = container_of(proxy, struct _network_proxy_http, proxy);
+	struct _network_proxy_http *res;
 
 	res = g_malloc0(sizeof *res);
 
@@ -49,10 +49,10 @@ network_proxy_http_clone(struct network_proxy const *proxy)
 	return &res->proxy;
 }
 
-static bool
-send_connect(struct _network_proxy_http *proxy, GIOChannel *ch, char const *address, uint16_t port)
+static bool send_connect(struct _network_proxy_http *proxy, GIOChannel *ch,
+			 const char *address, uint16_t port)
 {
-	char				port_str[6];
+	char port_str[6];
 
 	(void)proxy;
 	sprintf(port_str, "%u", port);
@@ -68,16 +68,15 @@ send_connect(struct _network_proxy_http *proxy, GIOChannel *ch, char const *addr
 	return true;
 }
 
-static int
-read_response(struct _network_proxy_http *proxy, GIOChannel *ch)
+static int read_response(struct _network_proxy_http *proxy, GIOChannel *ch)
 {
-	GIOStatus			status;
-	GString				line = { .str = NULL };
-	gsize				term_pos;
-	GError				*err = NULL;
-	int				state = 0;
-	int				rc = 0;
-	gchar				*resp = NULL;
+	GIOStatus status;
+	GString line = { .str = NULL };
+	gsize term_pos;
+	GError *err = NULL;
+	int state = 0;
+	int rc = 0;
+	gchar *resp = NULL;
 
 	(void)proxy;
 	for (;;) {
@@ -125,16 +124,15 @@ err:
 	return -1;
 }
 
-static GIOChannel *
-network_proxy_http_connect(struct network_proxy const *proxy, IPADDR const *hint_ip,
-			   char const *address, int port)
+static GIOChannel *network_proxy_http_connect(const struct network_proxy *proxy, const IPADDR *hint_ip,
+					      const char *address, int port)
 {
-	struct _network_proxy_http	*self = container_of(proxy, struct _network_proxy_http, proxy);
-	GIOChannel			*ch;
-	GIOFlags			old_flags;
-	GError				*err = NULL;
-	gchar const			*line_term;
-	gint				line_term_sz;
+	struct _network_proxy_http *self = container_of(proxy, struct _network_proxy_http, proxy);
+	GIOChannel *ch;
+	GIOFlags old_flags;
+	GError *err = NULL;
+	const gchar *line_term;
+	gint line_term_sz;
 
 	if (hint_ip)
 		ch = net_connect_ip(hint_ip, self->proxy.port, NULL);
@@ -171,23 +169,20 @@ err:
 
 	net_disconnect(ch);
 	return NULL;
-
 }
 
-
-struct network_proxy *
-_network_proxy_http_create(void)
+struct network_proxy *_network_proxy_http_create(void)
 {
-	struct _network_proxy_http	*res;
+	struct _network_proxy_http *res;
 
 	res = g_malloc0(sizeof *res);
 
 	_network_proxy_create(&res->proxy);
-	res->password    = g_strdup(settings_get_str("proxy_password"));
+	res->password = g_strdup(settings_get_str("proxy_password"));
 
 	res->proxy.destroy = network_proxy_http_destroy;
 	res->proxy.connect = network_proxy_http_connect;
-	res->proxy.clone   = network_proxy_http_clone;
+	res->proxy.clone = network_proxy_http_clone;
 
 	return &res->proxy;
 }
diff --git a/src/core/network-proxy-http.h b/src/core/network-proxy-http.h
index 92405fa6..04bfdc43 100644
--- a/src/core/network-proxy-http.h
+++ b/src/core/network-proxy-http.h
@@ -1,29 +1,13 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef H_IRSSI_SRC_CORE_PROXY_HTTP_H
 #define H_IRSSI_SRC_CORE_PROXY_HTTP_H
 
 #include "network-proxy.h"
 
 struct _network_proxy_http {
-	struct network_proxy	proxy;
-	char const		*password;
+	struct network_proxy proxy;
+	const char *password;
 };
 
-struct network_proxy *		_network_proxy_http_create(void);
+struct network_proxy *_network_proxy_http_create(void);
 
-#endif	/* H_IRSSI_SRC_CORE_PROXY_HTTP_H */
+#endif
diff --git a/src/core/network-proxy-priv.h b/src/core/network-proxy-priv.h
index 0a8f2449..5f632abb 100644
--- a/src/core/network-proxy-priv.h
+++ b/src/core/network-proxy-priv.h
@@ -1,19 +1,3 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef H_IRSSI_SRC_CORE_PROXY_PRIV_H
 #define H_IRSSI_SRC_CORE_PROXY_PRIV_H
 
@@ -26,38 +10,34 @@
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 
 
-inline static void
-_network_proxy_create(struct network_proxy *dst)
+inline static void _network_proxy_create(struct network_proxy *dst)
 {
-	dst->port  = settings_get_int("proxy_port");
-	dst->host  = g_strdup(settings_get_str("proxy_address"));
+	dst->port = settings_get_int("proxy_port");
+	dst->host = g_strdup(settings_get_str("proxy_address"));
 }
 
-inline static void
-_network_proxy_clone(struct network_proxy *dst, struct network_proxy const *src)
+inline static void _network_proxy_clone(struct network_proxy *dst, const struct network_proxy *src)
 {
-	dst->host  = g_strdup(src->host);
-	dst->port  = src->port;
+	dst->host = g_strdup(src->host);
+	dst->port = src->port;
 
 	dst->destroy = src->destroy;
 	dst->connect = src->connect;
-	dst->clone   = src->clone;
+	dst->clone = src->clone;
 }
 
-inline static void
-_network_proxy_destroy(struct network_proxy *proxy)
+inline static void _network_proxy_destroy(struct network_proxy *proxy)
 {
 	g_free((void *)proxy->host);
 }
 
 
 
-inline static bool
-_network_proxy_send_all(GIOChannel *ch, void const *buf, ssize_t len)
+inline static bool _network_proxy_send_all(GIOChannel *ch, const void *buf, ssize_t len)
 {
-	GError				*err = NULL;
-	gsize				written;
-	GIOStatus			status;
+	GError *err = NULL;
+	gsize written;
+	GIOStatus status;
 
 	while ((status=g_io_channel_write_chars(ch, buf, len, &written,
 						&err))==G_IO_STATUS_AGAIN)
@@ -74,15 +54,14 @@ _network_proxy_send_all(GIOChannel *ch, void const *buf, ssize_t len)
 	return false;
 }
 
-inline static bool
-_network_proxy_recv_all(GIOChannel *ch, void *buf_v, size_t len)
+inline static bool _network_proxy_recv_all(GIOChannel *ch, void *buf_v, size_t len)
 {
-	GError				*err = NULL;
-	gchar				*buf = buf_v;
+	GError *err = NULL;
+	gchar *buf = buf_v;
 
 	while (len>0) {
-		GIOStatus		status;
-		gsize			l;
+		GIOStatus status;
+		gsize l;
 
 		status = g_io_channel_read_chars(ch, buf, len, &l, &err);
 		if (status==G_IO_STATUS_AGAIN)
@@ -105,11 +84,10 @@ _network_proxy_recv_all(GIOChannel *ch, void *buf_v, size_t len)
 	return false;
 }
 
-inline static bool
-_network_proxy_flush(GIOChannel *ch)
+inline static bool _network_proxy_flush(GIOChannel *ch)
 {
-	GError			*err = NULL;
-	GIOStatus		status;
+	GError *err = NULL;
+	GIOStatus status;
 
 	while ((status=g_io_channel_flush(ch, &err))==G_IO_STATUS_AGAIN)
 		continue;
@@ -125,4 +103,4 @@ _network_proxy_flush(GIOChannel *ch)
 	return false;
 }
 
-#endif	/* H_IRSSI_SRC_CORE_PROXY_PRIV_H */
+#endif
diff --git a/src/core/network-proxy-simple.c b/src/core/network-proxy-simple.c
index a7ac1fac..e9f9e44c 100644
--- a/src/core/network-proxy-simple.c
+++ b/src/core/network-proxy-simple.c
@@ -1,18 +1,20 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*
+ network-proxy-simple.c : irssi
+
+    Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 and/or 3 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "module.h"
 #include "network-proxy-simple.h"
@@ -20,10 +22,9 @@
 #include "network-proxy-priv.h"
 #include "network.h"
 
-static void
-network_proxy_simple_destroy(struct network_proxy *proxy)
+static void network_proxy_simple_destroy(struct network_proxy *proxy)
 {
-	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
+	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
 
 	g_free((void *)self->password);
 	g_free((void *)self->string_after);
@@ -34,27 +35,25 @@ network_proxy_simple_destroy(struct network_proxy *proxy)
 	g_free(self);
 }
 
-static struct network_proxy *
-network_proxy_simple_clone(struct network_proxy const *proxy)
+static struct network_proxy *network_proxy_simple_clone(const struct network_proxy *proxy)
 {
-	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
-	struct _network_proxy_simple	*res;
+	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
+	struct _network_proxy_simple *res;
 
 	res = g_malloc0(sizeof *res);
 
 	_network_proxy_clone(&res->proxy, &self->proxy);
 
-	res->string       = g_strdup(self->string);
+	res->string = g_strdup(self->string);
 	res->string_after = g_strdup(self->string_after);
-	res->password     = g_strdup(self->password);
+	res->password = g_strdup(self->password);
 	return &res->proxy;
 }
 
-static GIOChannel *
-network_proxy_simple_connect(struct network_proxy const *proxy, IPADDR const *hint_ip,
-			     char const *address, int port)
+static GIOChannel *network_proxy_simple_connect(const struct network_proxy *proxy, const IPADDR *hint_ip,
+						char const *address, int port)
 {
-	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
+	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
 
 	(void)address;
 	(void)port;
@@ -64,12 +63,11 @@ network_proxy_simple_connect(struct network_proxy const *proxy, IPADDR const *hi
 		return net_connect(self->proxy.host, self->proxy.port, NULL);
 }
 
-static void
-network_proxy_simple_send_string(struct network_proxy const *proxy,
-				 struct network_proxy_send_string_info const *info)
+static void network_proxy_simple_send_string(const struct network_proxy *proxy,
+					     const struct network_proxy_send_string_info *info)
 {
-	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
-	char				*cmd;
+	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
+	char *cmd;
 
 	if (self->password && self->password[0]) {
 		cmd = g_strdup_printf("PASS %s", self->password);
@@ -84,12 +82,11 @@ network_proxy_simple_send_string(struct network_proxy const *proxy,
 	}
 }
 
-static void
-network_proxy_simple_send_string_after(struct network_proxy const *proxy,
-				 struct network_proxy_send_string_info const *info)
+static void network_proxy_simple_send_string_after(const struct network_proxy *proxy,
+						   const struct network_proxy_send_string_info *info)
 {
-	struct _network_proxy_simple	*self = container_of(proxy, struct _network_proxy_simple, proxy);
-	char				*cmd;
+	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
+	char *cmd;
 
 	if (self->string_after && self->string_after[0]) {
 		cmd = g_strdup_printf(self->string_after, info->host, info->port);
@@ -98,23 +95,22 @@ network_proxy_simple_send_string_after(struct network_proxy const *proxy,
 	}
 }
 
-struct network_proxy *
-_network_proxy_simple_create(void)
+struct network_proxy *_network_proxy_simple_create(void)
 {
-	struct _network_proxy_simple	*res;
+	struct _network_proxy_simple *res;
 
 	res = g_malloc0(sizeof *res);
 
 	_network_proxy_create(&res->proxy);
-	res->string        = g_strdup(settings_get_str("proxy_string"));
-	res->string_after  = g_strdup(settings_get_str("proxy_string_after"));
-	res->password      = g_strdup(settings_get_str("proxy_password"));
+	res->string = g_strdup(settings_get_str("proxy_string"));
+	res->string_after = g_strdup(settings_get_str("proxy_string_after"));
+	res->password = g_strdup(settings_get_str("proxy_password"));
 
 	res->proxy.destroy = network_proxy_simple_destroy;
 	res->proxy.connect = network_proxy_simple_connect;
-	res->proxy.clone   = network_proxy_simple_clone;
+	res->proxy.clone = network_proxy_simple_clone;
 
-	res->proxy.send_string       = network_proxy_simple_send_string;
+	res->proxy.send_string = network_proxy_simple_send_string;
 	res->proxy.send_string_after = network_proxy_simple_send_string_after;
 
 	return &res->proxy;
diff --git a/src/core/network-proxy-simple.h b/src/core/network-proxy-simple.h
index b2132cf2..e55c3925 100644
--- a/src/core/network-proxy-simple.h
+++ b/src/core/network-proxy-simple.h
@@ -1,32 +1,16 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef H_IRSSI_SRC_CORE_PROXY_SIMPLE_H
 #define H_IRSSI_SRC_CORE_PROXY_SIMPLE_H
 
 #include "network-proxy.h"
 
 struct _network_proxy_simple {
-	struct network_proxy	proxy;
+	struct network_proxy proxy;
 
-	char const		*string_after;
-	char const		*string;
-	char const		*password;
+	const char *string_after;
+	const char *string;
+	const char *password;
 };
 
-struct network_proxy *		_network_proxy_simple_create(void);
+struct network_proxy *_network_proxy_simple_create(void);
 
-#endif	/* H_IRSSI_SRC_CORE_PROXY_SIMPLE_H */
+#endif
diff --git a/src/core/network-proxy-socks5.c b/src/core/network-proxy-socks5.c
index 64a8f510..8f8fb308 100644
--- a/src/core/network-proxy-socks5.c
+++ b/src/core/network-proxy-socks5.c
@@ -1,18 +1,20 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*
+ network-proxy-socks5.c : irssi
+
+    Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 and/or 3 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "module.h"
 #include "network-proxy-socks5.h"
@@ -26,45 +28,44 @@
 /* RFC 1928 */
 struct client_greeting
 {
-	uint8_t		ver;
-	uint8_t		nmethods;
-	uint8_t		methods[];
+	uint8_t	ver;
+	uint8_t	nmethods;
+	uint8_t	methods[];
 } __attribute__((__packed__));
 
 struct server_greeting
 {
-	uint8_t		ver;
-	uint8_t		method;
+	uint8_t	ver;
+	uint8_t	method;
 } __attribute__((__packed__));
 
 struct server_response_plain
 {
-	uint8_t		ver;
-	uint8_t		status;
+	uint8_t	ver;
+	uint8_t	status;
 } __attribute__((__packed__));
 
 struct client_request
 {
-	uint8_t		ver;
-	uint8_t		cmd;
-	uint8_t		rsv;
-	uint8_t		atyp;
-	uint8_t		dst[];
+	uint8_t	ver;
+	uint8_t	cmd;
+	uint8_t	rsv;
+	uint8_t	atyp;
+	uint8_t	dst[];
 } __attribute__((__packed__));
 
 struct server_response
 {
-	uint8_t		ver;
-	uint8_t		rep;
-	uint8_t		res;
-	uint8_t		atyp;
-	uint8_t		bnd[];
+	uint8_t	ver;
+	uint8_t	rep;
+	uint8_t	res;
+	uint8_t	atyp;
+	uint8_t	bnd[];
 } __attribute__((__packed__));
 
-static void
-network_proxy_socks5_destroy(struct network_proxy *proxy)
+static void network_proxy_socks5_destroy(struct network_proxy *proxy)
 {
-	struct _network_proxy_socks5	*self = container_of(proxy, struct _network_proxy_socks5, proxy);
+	struct _network_proxy_socks5 *self = container_of(proxy, struct _network_proxy_socks5, proxy);
 
 	g_free((void *)self->password);
 	g_free((void *)self->username);
@@ -72,11 +73,10 @@ network_proxy_socks5_destroy(struct network_proxy *proxy)
 	g_free(self);
 }
 
-static struct network_proxy *
-network_proxy_socks5_clone(struct network_proxy const *proxy)
+static struct network_proxy *network_proxy_socks5_clone(const struct network_proxy *proxy)
 {
-	struct _network_proxy_socks5	*self = container_of(proxy, struct _network_proxy_socks5, proxy);
-	struct _network_proxy_socks5	*res;
+	struct _network_proxy_socks5 *self = container_of(proxy, struct _network_proxy_socks5, proxy);
+	struct _network_proxy_socks5 *res;
 
 	res = g_malloc0(sizeof *res);
 
@@ -86,8 +86,7 @@ network_proxy_socks5_clone(struct network_proxy const *proxy)
 	return &res->proxy;
 }
 
-static bool
-socks5_connect_unauthorized(GIOChannel *ch)
+static bool socks5_connect_unauthorized(GIOChannel *ch)
 {
 	/* nothing to do here */
 	(void)ch;
@@ -95,13 +94,12 @@ socks5_connect_unauthorized(GIOChannel *ch)
 }
 
 /* TODO: test this method! */
-static bool
-socks5_connect_plain(struct _network_proxy_socks5 const *proxy, GIOChannel *ch)
+static bool socks5_connect_plain(const struct _network_proxy_socks5 *proxy, GIOChannel *ch)
 {
-	uint8_t				ver  = 0x01;
-	uint8_t				ulen = strlen(proxy->username);
-	uint8_t				plen = proxy->password ? strlen(proxy->password) : 0;
-	struct server_response_plain	resp;
+	uint8_t	ver  = 0x01;
+	uint8_t	ulen = strlen(proxy->username);
+	uint8_t	plen = proxy->password ? strlen(proxy->password) : 0;
+	struct server_response_plain resp;
 
 	if (ulen==0 ||
 	    !_network_proxy_send_all(ch, &ver, sizeof ver) ||
@@ -126,30 +124,29 @@ socks5_connect_plain(struct _network_proxy_socks5 const *proxy, GIOChannel *ch)
 	return true;
 }
 
-static bool
-socks5_connect(struct _network_proxy_socks5 const *proxy, GIOChannel *ch,
-	       char const *address, uint16_t port)
+static bool socks5_connect(const struct _network_proxy_socks5 *proxy, GIOChannel *ch,
+			   const char *address, uint16_t port)
 {
-	bool				rc;
+	bool rc;
 
-	struct server_greeting		s_greeting;
-	struct server_response		s_response;
+	struct server_greeting s_greeting;
+	struct server_response s_response;
 
 
 	/* Phase 1: exchange greeting */
 	{
-		struct client_greeting		c_greeting = {
-			.ver      = 0x05,
+		struct client_greeting c_greeting = {
+			.ver = 0x05,
 			.nmethods = proxy->username && proxy->username[0] ? 2 : 1
 		};
 		/* HACK: order is important because it depends upon
 		 * c_greeting.nmethods  */
-		char const			methods[] = {
-			0x00,			/* no authentication */
-			0x02			/* username/password */
+		char const methods[] = {
+			0x00, /* no authentication */
+			0x02 /* username/password */
 		};
 		if (!_network_proxy_send_all(ch, &c_greeting, sizeof c_greeting) ||
-		    !_network_proxy_send_all(ch, methods,     c_greeting.nmethods) ||
+		    !_network_proxy_send_all(ch, methods, c_greeting.nmethods) ||
 		    !_network_proxy_flush(ch) ||
 		    !_network_proxy_recv_all(ch, &s_greeting, sizeof s_greeting))
 			goto err;
@@ -177,22 +174,22 @@ socks5_connect(struct _network_proxy_socks5 const *proxy, GIOChannel *ch,
 
 	/* Phase 3: connection request */
 	{
-		struct client_request		c_request = {
-			.ver	  = 0x05,
-			.cmd	  = 0x01,	/* CONNECT */
-			.atyp     = 0x03,	/* domain name */
+		struct client_request c_request = {
+			.ver = 0x05,
+			.cmd = 0x01, /* CONNECT */
+			.atyp = 0x03, /* domain name */
 		};
-		uint8_t				address_len = strlen(address);
-		uint16_t			dst_port = htons(port);
-		uint16_t			bnd_port;
-		char				bnd_address[257];
+		uint8_t address_len = strlen(address);
+		uint16_t dst_port = htons(port);
+		uint16_t bnd_port;
+		char bnd_address[257];
 
-		if (!_network_proxy_send_all(ch, &c_request,   sizeof c_request) ||
+		if (!_network_proxy_send_all(ch, &c_request, sizeof c_request) ||
 		    !_network_proxy_send_all(ch, &address_len, sizeof address_len) ||
-		    !_network_proxy_send_all(ch, address,      address_len) ||
-		    !_network_proxy_send_all(ch, &dst_port,    sizeof dst_port) ||
+		    !_network_proxy_send_all(ch, address, address_len) ||
+		    !_network_proxy_send_all(ch, &dst_port, sizeof dst_port) ||
 		    !_network_proxy_flush(ch) ||
-		    !_network_proxy_recv_all(ch, &s_response,  sizeof s_response))
+		    !_network_proxy_recv_all(ch, &s_response, sizeof s_response))
 			goto err;
 
 		if (s_response.ver != 0x05) {
@@ -212,7 +209,7 @@ socks5_connect(struct _network_proxy_socks5 const *proxy, GIOChannel *ch,
 		case 0x06: g_warning("SOCKS5: TTL expired"); break;
 		case 0x07: g_warning("SOCKS5: Command not supported"); break;
 		case 0x08: g_warning("SOCKS5: Address type not supported"); break;
-		default:   g_warning("SOCKS5: unknown error %#04x", s_response.rep); break;
+		default: g_warning("SOCKS5: unknown error %#04x", s_response.rep); break;
 		}
 
 		if (!rc)
@@ -220,8 +217,8 @@ socks5_connect(struct _network_proxy_socks5 const *proxy, GIOChannel *ch,
 
 		switch(s_response.atyp) {
 		case 0x01: {
-			struct in_addr	ip;
-			if (!_network_proxy_recv_all(ch, &ip,     sizeof ip) ||
+			struct in_addr ip;
+			if (!_network_proxy_recv_all(ch, &ip, sizeof ip) ||
 			    !inet_ntop(AF_INET, &ip, bnd_address, sizeof bnd_address))
 				rc = false;
 			break;
@@ -229,14 +226,14 @@ socks5_connect(struct _network_proxy_socks5 const *proxy, GIOChannel *ch,
 
 		case 0x04: {
 			struct in6_addr	ip;
-			if (!_network_proxy_recv_all(ch, &ip,      sizeof ip) ||
+			if (!_network_proxy_recv_all(ch, &ip, sizeof ip) ||
 			    !inet_ntop(AF_INET6, &ip, bnd_address, sizeof bnd_address))
 				rc = false;
 			break;
 		}
 
 		case 0x03: {
-			uint8_t		tmp;
+			uint8_t tmp;
 			if (!_network_proxy_recv_all(ch, &tmp, sizeof tmp) ||
 			    tmp==0 ||
 			    !_network_proxy_recv_all(ch, &bnd_address, tmp))
@@ -267,17 +264,16 @@ err:
 }
 
 
-static GIOChannel *
-network_proxy_socks5_connect(struct network_proxy const *proxy, IPADDR const *hint_ip,
-			     char const *address, int port)
+static GIOChannel *network_proxy_socks5_connect(const struct network_proxy *proxy, const IPADDR *hint_ip,
+						const char *address, int port)
 {
-	struct _network_proxy_socks5	*self = container_of(proxy, struct _network_proxy_socks5, proxy);
-	GIOChannel			*ch;
+	struct _network_proxy_socks5 *self = container_of(proxy, struct _network_proxy_socks5, proxy);
+	GIOChannel *ch;
 
-	GIOFlags			old_flags;
-	gchar const			*old_enc;
-	gboolean			old_buf;
-	GError				*err = NULL;
+	GIOFlags old_flags;
+	const gchar *old_enc;
+	gboolean old_buf;
+	GError *err = NULL;
 
 	if (hint_ip)
 		ch = net_connect_ip(hint_ip, self->proxy.port, NULL);
@@ -287,9 +283,9 @@ network_proxy_socks5_connect(struct network_proxy const *proxy, IPADDR const *hi
 	if (!ch)
 		return NULL;
 
-	old_enc   = g_io_channel_get_encoding(ch);
+	old_enc  = g_io_channel_get_encoding(ch);
 	old_flags = g_io_channel_get_flags(ch);
-	old_buf   = g_io_channel_get_buffered(ch);
+	old_buf = g_io_channel_get_buffered(ch);
 
 	if (g_io_channel_set_encoding(ch, NULL, &err)!=G_IO_STATUS_NORMAL ||
 	    g_io_channel_set_flags(ch, old_flags & ~G_IO_FLAG_NONBLOCK, &err)!=G_IO_STATUS_NORMAL)
@@ -319,20 +315,19 @@ err:
 	return NULL;
 }
 
-struct network_proxy *
-_network_proxy_socks5_create(void)
+struct network_proxy *_network_proxy_socks5_create(void)
 {
-	struct _network_proxy_socks5	*res;
+	struct _network_proxy_socks5 *res;
 
 	res = g_malloc0(sizeof *res);
 
 	_network_proxy_create(&res->proxy);
-	res->username    = g_strdup(settings_get_str("proxy_username"));
-	res->password    = g_strdup(settings_get_str("proxy_password"));
+	res->username = g_strdup(settings_get_str("proxy_username"));
+	res->password = g_strdup(settings_get_str("proxy_password"));
 
 	res->proxy.destroy = network_proxy_socks5_destroy;
 	res->proxy.connect = network_proxy_socks5_connect;
-	res->proxy.clone   = network_proxy_socks5_clone;
+	res->proxy.clone = network_proxy_socks5_clone;
 
 	return &res->proxy;
 }
diff --git a/src/core/network-proxy-socks5.h b/src/core/network-proxy-socks5.h
index 963bad3d..8dff6ed1 100644
--- a/src/core/network-proxy-socks5.h
+++ b/src/core/network-proxy-socks5.h
@@ -1,31 +1,15 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef H_IRSSI_SRC_CORE_PROXY_SOCKS5_H
 #define H_IRSSI_SRC_CORE_PROXY_SOCKS5_H
 
 #include "network-proxy.h"
 
 struct _network_proxy_socks5 {
-	struct network_proxy	proxy;
+	struct network_proxy proxy;
 
-	char const		*username;
-	char const		*password;
+	const char *username;
+	const char *password;
 };
 
-struct network_proxy *		_network_proxy_socks5_create(void);
+struct network_proxy *_network_proxy_socks5_create(void);
 
-#endif	/* H_IRSSI_SRC_CORE_PROXY_SOCKS5_H */
+#endif
diff --git a/src/core/network-proxy.c b/src/core/network-proxy.c
index cb5f9417..0deff1ee 100644
--- a/src/core/network-proxy.c
+++ b/src/core/network-proxy.c
@@ -1,18 +1,20 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*
+ network-proxy.c : irssi
+
+    Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 and/or 3 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "module.h"
 
@@ -22,8 +24,7 @@
 #include "network-proxy-http.h"
 #include "network-proxy-socks5.h"
 
-struct network_proxy *
-network_proxy_create(char const *type)
+struct network_proxy *network_proxy_create(const char *type)
 {
 	if (type==NULL)
 		return NULL;
diff --git a/src/core/network-proxy.h b/src/core/network-proxy.h
index cdc3d057..38fd1c82 100644
--- a/src/core/network-proxy.h
+++ b/src/core/network-proxy.h
@@ -1,19 +1,3 @@
-/*	--*- c -*--
- * Copyright (C) 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 and/or 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef H_IRSSI_SRC_CORE_PROXY_H
 #define H_IRSSI_SRC_CORE_PROXY_H
 
@@ -22,22 +6,21 @@
 
 /* helper structure for the send_string*() functions of the network_proxy
  * class */
-struct network_proxy_send_string_info
-{
-	char const		*host;	/* hostname of the IRC server */
-	uint16_t		port;	/* portnumber of the IRC server */
+struct network_proxy_send_string_info {
+	const char *host; /* hostname of the IRC server */
+	uint16_t port; /* portnumber of the IRC server */
 
 	/* function which is used to send string; usually irc_send_cmd_now() */
-	void			(*func)(void *obj, char const *);
+	void (*func)(void *obj, const char *);
 
 	/* object for func */
-	void			*obj;
+	void *obj;
 };
 
 struct network_proxy {
 	/* destroys the network_proxy structure which must not be used anymore
 	 * after; this memberfunction is mandatory */
-	void			(*destroy)(struct network_proxy *);
+	void (*destroy)(struct network_proxy *);
 
 	/* connects through the proxy; this memberfunction is mandatory
 	 *
@@ -46,36 +29,34 @@ struct network_proxy {
 	 * \arg address   the hostname where proxy shall connect to
 	 * \arg port      port address where proxy shall connect to
 	 */
-	GIOChannel *		(*connect)(struct network_proxy const *, IPADDR const *hint_ip,
-					   char const *address, int port);
+	GIOChannel *(*connect)(const struct *network_proxy, const IPADDR *hint_ip,
+			       const char *address, int port);
 
 	/* clones the given network_proxy object; this memberfunction is
 	 * mandatory */
-	struct network_proxy *	(*clone)(struct network_proxy const *);
+	struct network_proxy *(*clone)(const struct *network_proxy);
 
 
 	/* sends a string after connection has been established but before IRC
 	 * authentication begins; this memberfunction is optional
 	 */
-	void			(*send_string)(struct network_proxy const *,
-					       struct network_proxy_send_string_info const *);
+	void (*send_string)(const struct *network_proxy,
+			    const struct *network_proxy_send_string_info);
 
 	/* sends a string after connection IRC authentication suceeded; this
 	 * memberfunction is optional
 	 */
-	void			(*send_string_after)(struct network_proxy const *,
-						     struct network_proxy_send_string_info const *);
-
+	void (*send_string_after)(const struct *network_proxy,
+				  const struct *network_proxy_send_string_info);
 
 	/* hostname of proxy host */
-	char const		*host;
+	const char *host;
 
 	/* portnumber of proxy */
-	int			port;
+	int port;
 };
 
 /* factory method to create a proxy object based upon value of 'type' */
-struct network_proxy *		network_proxy_create(char const *type);
+struct network_proxy *network_proxy_create(const char *type);
 
-
-#endif	/* H_IRSSI_SRC_CORE_PROXY_H */
+#endif
diff --git a/src/core/network.c b/src/core/network.c
index eba5a98a..75357f92 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -231,14 +231,12 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 GIOChannel *net_connect_proxy(struct network_proxy const *proxy,
 			      char const *host, int port, IPADDR *ip, IPADDR *my_ip)
 {
-
 	if (proxy)
 		return proxy->connect(proxy, ip, host, port);
 	else
 		return net_connect_ip(ip, port, my_ip);
 }
 
-
 /* Connect to named UNIX socket */
 GIOChannel *net_connect_unix(const char *path)
 {
diff --git a/src/core/network.h b/src/core/network.h
index 3f138b82..b11d1ca2 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -50,11 +50,13 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
-GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
+GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port,
+				  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
 GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
-GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip);
+GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port,
+			      IPADDR *ip, IPADDR *my_ip);
 /* Connect to named UNIX socket */
 GIOChannel *net_connect_unix(const char *path);
 /* Disconnect socket */
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index ac99df8d..92a57a31 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -5,7 +5,7 @@ int chat_type; /* chat_protocol_lookup(xx) */
 
 int refcount;
 
-struct network_proxy	*proxy;
+struct network_proxy *proxy;
 
 unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */
 char *tag; /* try to keep this tag when connected to server */

From 714b0241cbb85d98e7137fd513b2705617711aad Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Fri, 3 Oct 2014 23:41:57 +0200
Subject: [PATCH 0023/1650] Change coding style

---
 src/core/network-openssl.c    |  2 +-
 src/core/network-proxy-http.c |  8 ++++----
 src/core/network.c            |  4 ++--
 src/core/network.h            |  4 ++--
 src/irc/core/irc-servers.c    | 10 +++++-----
 src/irc/core/irc-servers.h    |  1 -
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 177a40db..0b0fb881 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -551,7 +551,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 
 	return gchan;
 }
-GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port,
+GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char *host, int port,
 				  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server)
 {
 	GIOChannel *handle, *ssl_handle;
diff --git a/src/core/network-proxy-http.c b/src/core/network-proxy-http.c
index 450e0784..623b3203 100644
--- a/src/core/network-proxy-http.c
+++ b/src/core/network-proxy-http.c
@@ -58,9 +58,9 @@ static bool send_connect(struct _network_proxy_http *proxy, GIOChannel *ch,
 	sprintf(port_str, "%u", port);
 
 	if (!_network_proxy_send_all(ch, "CONNECT ", -1) ||
-	    !_network_proxy_send_all(ch, address,    -1) ||
-	    !_network_proxy_send_all(ch, ":",        -1) ||
-	    !_network_proxy_send_all(ch, port_str,   -1) ||
+	    !_network_proxy_send_all(ch, address, -1) ||
+	    !_network_proxy_send_all(ch, ":", -1) ||
+	    !_network_proxy_send_all(ch, port_str, -1) ||
 	    !_network_proxy_send_all(ch, " HTTP/1.0\r\n\r\n", -1) ||
 	    !_network_proxy_flush(ch))
 		return false;
@@ -96,7 +96,7 @@ static int read_response(struct _network_proxy_http *proxy, GIOChannel *ch)
 		if (state==0) {
 			if (g_str_has_prefix(line.str, "HTTP/1.0 ")) {
 				resp = g_strndup(line.str+9, line.len-9-2);
-				rc   = g_ascii_strtoull(resp, NULL, 10);
+				rc = g_ascii_strtoull(resp, NULL, 10);
 			} else {
 				g_warning("unexpected HTTP response: '%s'", line.str);
 				goto err;
diff --git a/src/core/network.c b/src/core/network.c
index 75357f92..34319c58 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -228,8 +228,8 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 }
 
 /* Connect to socket */
-GIOChannel *net_connect_proxy(struct network_proxy const *proxy,
-			      char const *host, int port, IPADDR *ip, IPADDR *my_ip)
+GIOChannel *net_connect_proxy(const struct network_proxy *proxy,
+			      const char *host, int port, IPADDR *ip, IPADDR *my_ip)
 {
 	if (proxy)
 		return proxy->connect(proxy, ip, host, port);
diff --git a/src/core/network.h b/src/core/network.h
index b11d1ca2..138dd31a 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -50,12 +50,12 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
-GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port,
+GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char c*host, int port,
 				  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
 GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
-GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port,
+GIOChannel *net_connect_proxy(const struct network_proxy *proxy, const char *host, int port,
 			      IPADDR *ip, IPADDR *my_ip);
 /* Connect to named UNIX socket */
 GIOChannel *net_connect_unix(const char *path);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index daa85438..ccd19aa8 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -196,11 +196,11 @@ static void server_init(IRC_SERVER_REC *server)
 	IRC_SERVER_CONNECT_REC *conn;
 	char *address, *ptr, *username, *cmd;
 	GTimeVal now;
-	struct network_proxy_send_string_info const	send_info = {
-		.host	=  server->connrec->address,
-		.port	=  server->connrec->port,
-		.func	=  irc_send_cmd_now_wrapper,
-		.obj    =  server
+	const struct network_proxy_send_string_info send_info = {
+		.host = server->connrec->address,
+		.port = server->connrec->port,
+		.func = irc_send_cmd_now_wrapper,
+		.obj = server
 	};
 
 	g_return_if_fail(server != NULL);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index ac08d369..c6119df3 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -109,7 +109,6 @@ struct _IRC_SERVER_REC {
 SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn);
 void irc_server_connect(SERVER_REC *server);
 
-
 /* Purge server output, either all or for specified target */
 void irc_server_purge_output(IRC_SERVER_REC *server, const char *target);
 

From 17ecad8285795728251fb45a0881ad56a6a1a32a Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Sat, 4 Oct 2014 00:52:26 +0200
Subject: [PATCH 0024/1650] Fixed stuff broken by the coding style cleanup

---
 src/core/network-proxy.h | 12 ++++++------
 src/core/network.h       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/network-proxy.h b/src/core/network-proxy.h
index 38fd1c82..c5ec02a2 100644
--- a/src/core/network-proxy.h
+++ b/src/core/network-proxy.h
@@ -29,25 +29,25 @@ struct network_proxy {
 	 * \arg address   the hostname where proxy shall connect to
 	 * \arg port      port address where proxy shall connect to
 	 */
-	GIOChannel *(*connect)(const struct *network_proxy, const IPADDR *hint_ip,
+	GIOChannel *(*connect)(const struct network_proxy *, const IPADDR *hint_ip,
 			       const char *address, int port);
 
 	/* clones the given network_proxy object; this memberfunction is
 	 * mandatory */
-	struct network_proxy *(*clone)(const struct *network_proxy);
+	struct network_proxy *(*clone)(const struct network_proxy *);
 
 
 	/* sends a string after connection has been established but before IRC
 	 * authentication begins; this memberfunction is optional
 	 */
-	void (*send_string)(const struct *network_proxy,
-			    const struct *network_proxy_send_string_info);
+	void (*send_string)(const struct network_proxy *,
+			    const struct network_proxy_send_string_info *);
 
 	/* sends a string after connection IRC authentication suceeded; this
 	 * memberfunction is optional
 	 */
-	void (*send_string_after)(const struct *network_proxy,
-				  const struct *network_proxy_send_string_info);
+	void (*send_string_after)(const struct network_proxy *,
+				  const struct network_proxy_send_string_info *);
 
 	/* hostname of proxy host */
 	const char *host;
diff --git a/src/core/network.h b/src/core/network.h
index 138dd31a..048ff71b 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -50,7 +50,7 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
-GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char c*host, int port,
+GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char *host, int port,
 				  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */

From 67d343fd3ad48a3096003350c4b715009616845a Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Sat, 4 Oct 2014 01:14:19 +0200
Subject: [PATCH 0025/1650] Fix compile warnings

---
 src/core/network.c | 2 +-
 src/core/network.h | 2 +-
 src/core/servers.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 34319c58..2969902a 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -170,7 +170,7 @@ GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
 }
 
 /* Connect to socket with ip address */
-GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
+GIOChannel *net_connect_ip(const IPADDR *ip, int port, IPADDR *my_ip)
 {
 	union sockaddr_union so;
 	int handle, ret, opt = 1;
diff --git a/src/core/network.h b/src/core/network.h
index 048ff71b..0cdaaf1f 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -54,7 +54,7 @@ GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char
 				  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
-GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
+GIOChannel *net_connect_ip(const IPADDR *ip, int port, IPADDR *my_ip);
 GIOChannel *net_connect_proxy(const struct network_proxy *proxy, const char *host, int port,
 			      IPADDR *ip, IPADDR *my_ip);
 /* Connect to named UNIX socket */
diff --git a/src/core/servers.c b/src/core/servers.c
index c8b002bf..3abd96bc 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -227,7 +227,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 			net_connect_proxy_ssl(server->connrec->proxy,
 					      server->connrec->address, port,
 					      ip, own_ip,
-					      server->connrec) :
+					      server) :
 			net_connect_proxy(server->connrec->proxy,
 					  server->connrec->address, port,
 					  ip, own_ip);

From c2505203d0e4f0eaaf202db6fb1f8cd9e1974ab6 Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Sat, 4 Oct 2014 23:22:50 +0200
Subject: [PATCH 0026/1650] Removed casts in g_free(), therefore also removed
 some const declarations

---
 src/core/network-proxy-http.c   | 2 +-
 src/core/network-proxy-http.h   | 2 +-
 src/core/network-proxy-priv.h   | 2 +-
 src/core/network-proxy-simple.c | 6 +++---
 src/core/network-proxy-simple.h | 6 +++---
 src/core/network-proxy-socks5.c | 4 ++--
 src/core/network-proxy-socks5.h | 4 ++--
 src/core/network-proxy.h        | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/core/network-proxy-http.c b/src/core/network-proxy-http.c
index 623b3203..61d49208 100644
--- a/src/core/network-proxy-http.c
+++ b/src/core/network-proxy-http.c
@@ -31,7 +31,7 @@ static void network_proxy_http_destroy(struct network_proxy *proxy)
 {
 	struct _network_proxy_http *self = container_of(proxy, struct _network_proxy_http, proxy);
 
-	g_free((void *)self->password);
+	g_free(self->password);
 	_network_proxy_destroy(proxy);
 
 	g_free(self);
diff --git a/src/core/network-proxy-http.h b/src/core/network-proxy-http.h
index 04bfdc43..1f63d5e3 100644
--- a/src/core/network-proxy-http.h
+++ b/src/core/network-proxy-http.h
@@ -5,7 +5,7 @@
 
 struct _network_proxy_http {
 	struct network_proxy proxy;
-	const char *password;
+	char *password;
 };
 
 struct network_proxy *_network_proxy_http_create(void);
diff --git a/src/core/network-proxy-priv.h b/src/core/network-proxy-priv.h
index 5f632abb..76d40f27 100644
--- a/src/core/network-proxy-priv.h
+++ b/src/core/network-proxy-priv.h
@@ -28,7 +28,7 @@ inline static void _network_proxy_clone(struct network_proxy *dst, const struct
 
 inline static void _network_proxy_destroy(struct network_proxy *proxy)
 {
-	g_free((void *)proxy->host);
+	g_free(proxy->host);
 }
 
 
diff --git a/src/core/network-proxy-simple.c b/src/core/network-proxy-simple.c
index e9f9e44c..289bb6ba 100644
--- a/src/core/network-proxy-simple.c
+++ b/src/core/network-proxy-simple.c
@@ -26,9 +26,9 @@ static void network_proxy_simple_destroy(struct network_proxy *proxy)
 {
 	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
 
-	g_free((void *)self->password);
-	g_free((void *)self->string_after);
-	g_free((void *)self->string);
+	g_free(self->password);
+	g_free(self->string_after);
+	g_free(self->string);
 
 	_network_proxy_destroy(proxy);
 
diff --git a/src/core/network-proxy-simple.h b/src/core/network-proxy-simple.h
index e55c3925..6c3c8281 100644
--- a/src/core/network-proxy-simple.h
+++ b/src/core/network-proxy-simple.h
@@ -6,9 +6,9 @@
 struct _network_proxy_simple {
 	struct network_proxy proxy;
 
-	const char *string_after;
-	const char *string;
-	const char *password;
+	char *string_after;
+	char *string;
+	char *password;
 };
 
 struct network_proxy *_network_proxy_simple_create(void);
diff --git a/src/core/network-proxy-socks5.c b/src/core/network-proxy-socks5.c
index 8f8fb308..8c4eeaf7 100644
--- a/src/core/network-proxy-socks5.c
+++ b/src/core/network-proxy-socks5.c
@@ -67,8 +67,8 @@ static void network_proxy_socks5_destroy(struct network_proxy *proxy)
 {
 	struct _network_proxy_socks5 *self = container_of(proxy, struct _network_proxy_socks5, proxy);
 
-	g_free((void *)self->password);
-	g_free((void *)self->username);
+	g_free(self->password);
+	g_free(self->username);
 	_network_proxy_destroy(proxy);
 	g_free(self);
 }
diff --git a/src/core/network-proxy-socks5.h b/src/core/network-proxy-socks5.h
index 8dff6ed1..058edaf5 100644
--- a/src/core/network-proxy-socks5.h
+++ b/src/core/network-proxy-socks5.h
@@ -6,8 +6,8 @@
 struct _network_proxy_socks5 {
 	struct network_proxy proxy;
 
-	const char *username;
-	const char *password;
+	char *username;
+	char *password;
 };
 
 struct network_proxy *_network_proxy_socks5_create(void);
diff --git a/src/core/network-proxy.h b/src/core/network-proxy.h
index c5ec02a2..edd1a655 100644
--- a/src/core/network-proxy.h
+++ b/src/core/network-proxy.h
@@ -50,7 +50,7 @@ struct network_proxy {
 				  const struct network_proxy_send_string_info *);
 
 	/* hostname of proxy host */
-	const char *host;
+	char *host;
 
 	/* portnumber of proxy */
 	int port;

From c668e1add0cb51e854ad6d4262d01a69be75b110 Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Sun, 5 Oct 2014 01:02:50 +0200
Subject: [PATCH 0027/1650] add missing proxy_username setting

---
 src/core/servers-setup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 87470266..19b1dc16 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -541,6 +541,7 @@ void servers_setup_init(void)
 	settings_add_int("proxy", "proxy_port", 6667);
 	settings_add_str("proxy", "proxy_string", "CONNECT %s %d");
 	settings_add_str("proxy", "proxy_string_after", "");
+	settings_add_str("proxy", "proxy_username", "");
 	settings_add_str("proxy", "proxy_password", "");
 	settings_add_str("proxy", "proxy_type", "simple");
 

From 510fa50c071c18dcbc76afc0edb18f52302a0fc5 Mon Sep 17 00:00:00 2001
From: hawken93 <hawken@thehawken.org>
Date: Sun, 5 Oct 2014 01:03:46 +0200
Subject: [PATCH 0028/1650] remove container_of, remove some underscores in the
 process

---
 src/core/network-proxy-http.c   | 57 ++++++++++++++----------
 src/core/network-proxy-http.h   |  5 +--
 src/core/network-proxy-priv.h   | 10 +----
 src/core/network-proxy-simple.c | 77 +++++++++++++++++++--------------
 src/core/network-proxy-simple.h |  6 +--
 src/core/network-proxy-socks5.c | 60 ++++++++++++++-----------
 src/core/network-proxy-socks5.h |  6 +--
 src/core/network-proxy.c        |  6 +--
 src/core/network-proxy.h        |  3 ++
 9 files changed, 128 insertions(+), 102 deletions(-)

diff --git a/src/core/network-proxy-http.c b/src/core/network-proxy-http.c
index 61d49208..2eb504b5 100644
--- a/src/core/network-proxy-http.c
+++ b/src/core/network-proxy-http.c
@@ -29,27 +29,35 @@
 
 static void network_proxy_http_destroy(struct network_proxy *proxy)
 {
-	struct _network_proxy_http *self = container_of(proxy, struct _network_proxy_http, proxy);
+	struct network_proxy_http *self = (struct network_proxy_http *)proxy->privdata;
 
 	g_free(self->password);
-	_network_proxy_destroy(proxy);
 
 	g_free(self);
+
+	_network_proxy_destroy(proxy);
+
+	g_free(proxy);
 }
 
 static struct network_proxy *network_proxy_http_clone(const struct network_proxy *proxy)
 {
-	struct _network_proxy_http *self = container_of(proxy, struct _network_proxy_http, proxy);
-	struct _network_proxy_http *res;
+	struct network_proxy_http *self = (struct network_proxy_http *)proxy->privdata;
+	struct network_proxy_http *priv;
+	struct network_proxy *res;
 
-	res = g_malloc0(sizeof *res);
+	res = g_malloc0(sizeof(struct network_proxy));
 
-	_network_proxy_clone(&res->proxy, &self->proxy);
-	res->password = g_strdup(self->password);
-	return &res->proxy;
+	_network_proxy_clone(res, proxy);
+
+	priv = g_malloc0(sizeof(struct network_proxy_http));
+	res->privdata = (void *)priv;
+
+	priv->password = g_strdup(self->password);
+	return res;
 }
 
-static bool send_connect(struct _network_proxy_http *proxy, GIOChannel *ch,
+static bool send_connect(struct network_proxy_http *proxy, GIOChannel *ch,
 			 const char *address, uint16_t port)
 {
 	char port_str[6];
@@ -68,7 +76,7 @@ static bool send_connect(struct _network_proxy_http *proxy, GIOChannel *ch,
 	return true;
 }
 
-static int read_response(struct _network_proxy_http *proxy, GIOChannel *ch)
+static int read_response(struct network_proxy_http *proxy, GIOChannel *ch)
 {
 	GIOStatus status;
 	GString line = { .str = NULL };
@@ -127,7 +135,7 @@ err:
 static GIOChannel *network_proxy_http_connect(const struct network_proxy *proxy, const IPADDR *hint_ip,
 					      const char *address, int port)
 {
-	struct _network_proxy_http *self = container_of(proxy, struct _network_proxy_http, proxy);
+	struct network_proxy_http *self = (struct network_proxy_http *)proxy->privdata;
 	GIOChannel *ch;
 	GIOFlags old_flags;
 	GError *err = NULL;
@@ -135,9 +143,9 @@ static GIOChannel *network_proxy_http_connect(const struct network_proxy *proxy,
 	gint line_term_sz;
 
 	if (hint_ip)
-		ch = net_connect_ip(hint_ip, self->proxy.port, NULL);
+		ch = net_connect_ip(hint_ip, proxy->port, NULL);
 	else
-		ch = net_connect(self->proxy.host, self->proxy.port, NULL);
+		ch = net_connect(proxy->host, proxy->port, NULL);
 
 	if (!ch)
 		return NULL;
@@ -171,18 +179,23 @@ err:
 	return NULL;
 }
 
-struct network_proxy *_network_proxy_http_create(void)
+struct network_proxy *network_proxy_http_create(void)
 {
-	struct _network_proxy_http *res;
+	struct network_proxy *res;
+	struct network_proxy_http *priv;
 
-	res = g_malloc0(sizeof *res);
+	res = g_malloc0(sizeof(struct network_proxy));
 
-	_network_proxy_create(&res->proxy);
-	res->password = g_strdup(settings_get_str("proxy_password"));
+	_network_proxy_create(res);
 
-	res->proxy.destroy = network_proxy_http_destroy;
-	res->proxy.connect = network_proxy_http_connect;
-	res->proxy.clone = network_proxy_http_clone;
+	priv = g_malloc0(sizeof(struct network_proxy_http));
+	res->privdata = (void *)priv;
 
-	return &res->proxy;
+	priv->password = g_strdup(settings_get_str("proxy_password"));
+
+	res->destroy = network_proxy_http_destroy;
+	res->connect = network_proxy_http_connect;
+	res->clone = network_proxy_http_clone;
+
+	return res;
 }
diff --git a/src/core/network-proxy-http.h b/src/core/network-proxy-http.h
index 1f63d5e3..723aae43 100644
--- a/src/core/network-proxy-http.h
+++ b/src/core/network-proxy-http.h
@@ -3,11 +3,10 @@
 
 #include "network-proxy.h"
 
-struct _network_proxy_http {
-	struct network_proxy proxy;
+struct network_proxy_http {
 	char *password;
 };
 
-struct network_proxy *_network_proxy_http_create(void);
+struct network_proxy *network_proxy_http_create(void);
 
 #endif
diff --git a/src/core/network-proxy-priv.h b/src/core/network-proxy-priv.h
index 76d40f27..d7b8050a 100644
--- a/src/core/network-proxy-priv.h
+++ b/src/core/network-proxy-priv.h
@@ -4,14 +4,10 @@
 #include "settings.h"
 #include <stdbool.h>
 
-/* stolen from linux kernel */
-#define container_of(ptr, type, member)  __extension__ ({	    \
-	const __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-
-
 inline static void _network_proxy_create(struct network_proxy *dst)
 {
+	// TODO: Initialize all fields, to bring the struct to a known state
+	dst->privdata = NULL;
 	dst->port = settings_get_int("proxy_port");
 	dst->host = g_strdup(settings_get_str("proxy_address"));
 }
@@ -31,8 +27,6 @@ inline static void _network_proxy_destroy(struct network_proxy *proxy)
 	g_free(proxy->host);
 }
 
-
-
 inline static bool _network_proxy_send_all(GIOChannel *ch, const void *buf, ssize_t len)
 {
 	GError *err = NULL;
diff --git a/src/core/network-proxy-simple.c b/src/core/network-proxy-simple.c
index 289bb6ba..980215b5 100644
--- a/src/core/network-proxy-simple.c
+++ b/src/core/network-proxy-simple.c
@@ -24,49 +24,54 @@
 
 static void network_proxy_simple_destroy(struct network_proxy *proxy)
 {
-	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
+	struct network_proxy_simple *self = (struct network_proxy_simple *)proxy->privdata;
 
 	g_free(self->password);
 	g_free(self->string_after);
 	g_free(self->string);
 
+	g_free(self);
+
 	_network_proxy_destroy(proxy);
 
-	g_free(self);
+	// We are responsible for the whole proxy struct
+	g_free(proxy);
 }
 
 static struct network_proxy *network_proxy_simple_clone(const struct network_proxy *proxy)
 {
-	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
-	struct _network_proxy_simple *res;
+	struct network_proxy_simple *self = (struct network_proxy_simple *)proxy->privdata;
+	struct network_proxy *res;
+	struct network_proxy_simple *newself;
 
-	res = g_malloc0(sizeof *res);
+	// First make and set the parent struct
+	res = g_malloc0(sizeof(struct network_proxy));
+	_network_proxy_clone(res, proxy);
 
-	_network_proxy_clone(&res->proxy, &self->proxy);
+	// Then allocate and set the private data
+	newself = g_malloc0(sizeof(struct network_proxy_simple));
+	res->privdata = (void *)newself;
 
-	res->string = g_strdup(self->string);
-	res->string_after = g_strdup(self->string_after);
-	res->password = g_strdup(self->password);
-	return &res->proxy;
+	newself->string = g_strdup(self->string);
+	newself->string_after = g_strdup(self->string_after);
+	newself->password = g_strdup(self->password);
+
+	return res;
 }
 
-static GIOChannel *network_proxy_simple_connect(const struct network_proxy *proxy, const IPADDR *hint_ip,
-						char const *address, int port)
+static GIOChannel *network_proxy_simple_connect(const struct network_proxy *proxy,
+						const IPADDR *hint_ip, char const *address, int port)
 {
-	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
-
-	(void)address;
-	(void)port;
 	if (hint_ip)
-		return net_connect_ip(hint_ip, self->proxy.port, NULL);
+		return net_connect_ip(hint_ip, proxy->port, NULL);
 	else
-		return net_connect(self->proxy.host, self->proxy.port, NULL);
+		return net_connect(proxy->host, proxy->port, NULL);
 }
 
 static void network_proxy_simple_send_string(const struct network_proxy *proxy,
 					     const struct network_proxy_send_string_info *info)
 {
-	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
+	struct network_proxy_simple *self = (struct network_proxy_simple *)proxy->privdata;
 	char *cmd;
 
 	if (self->password && self->password[0]) {
@@ -85,7 +90,7 @@ static void network_proxy_simple_send_string(const struct network_proxy *proxy,
 static void network_proxy_simple_send_string_after(const struct network_proxy *proxy,
 						   const struct network_proxy_send_string_info *info)
 {
-	struct _network_proxy_simple *self = container_of(proxy, struct _network_proxy_simple, proxy);
+	struct network_proxy_simple *self = (struct network_proxy_simple *)proxy->privdata;
 	char *cmd;
 
 	if (self->string_after && self->string_after[0]) {
@@ -95,23 +100,29 @@ static void network_proxy_simple_send_string_after(const struct network_proxy *p
 	}
 }
 
-struct network_proxy *_network_proxy_simple_create(void)
+struct network_proxy *network_proxy_simple_create(void)
 {
-	struct _network_proxy_simple *res;
+	struct network_proxy *proxy;
+	struct network_proxy_simple *self;
 
-	res = g_malloc0(sizeof *res);
+	proxy = g_malloc0(sizeof(struct network_proxy));
 
-	_network_proxy_create(&res->proxy);
-	res->string = g_strdup(settings_get_str("proxy_string"));
-	res->string_after = g_strdup(settings_get_str("proxy_string_after"));
-	res->password = g_strdup(settings_get_str("proxy_password"));
+	// assume it could reset every variable to a known state
+	_network_proxy_create(proxy);
 
-	res->proxy.destroy = network_proxy_simple_destroy;
-	res->proxy.connect = network_proxy_simple_connect;
-	res->proxy.clone = network_proxy_simple_clone;
+	self = g_malloc0(sizeof(struct network_proxy_simple));
+	proxy->privdata = (void *)self;
 
-	res->proxy.send_string = network_proxy_simple_send_string;
-	res->proxy.send_string_after = network_proxy_simple_send_string_after;
+	self->string = g_strdup(settings_get_str("proxy_string"));
+	self->string_after = g_strdup(settings_get_str("proxy_string_after"));
+	self->password = g_strdup(settings_get_str("proxy_password"));
 
-	return &res->proxy;
+	proxy->destroy = network_proxy_simple_destroy;
+	proxy->connect = network_proxy_simple_connect;
+	proxy->clone = network_proxy_simple_clone;
+
+	proxy->send_string = network_proxy_simple_send_string;
+	proxy->send_string_after = network_proxy_simple_send_string_after;
+
+	return proxy;
 }
diff --git a/src/core/network-proxy-simple.h b/src/core/network-proxy-simple.h
index 6c3c8281..010d8e4a 100644
--- a/src/core/network-proxy-simple.h
+++ b/src/core/network-proxy-simple.h
@@ -3,14 +3,12 @@
 
 #include "network-proxy.h"
 
-struct _network_proxy_simple {
-	struct network_proxy proxy;
-
+struct network_proxy_simple {
 	char *string_after;
 	char *string;
 	char *password;
 };
 
-struct network_proxy *_network_proxy_simple_create(void);
+struct network_proxy *network_proxy_simple_create(void);
 
 #endif
diff --git a/src/core/network-proxy-socks5.c b/src/core/network-proxy-socks5.c
index 8c4eeaf7..c3dc1e4c 100644
--- a/src/core/network-proxy-socks5.c
+++ b/src/core/network-proxy-socks5.c
@@ -65,25 +65,30 @@ struct server_response
 
 static void network_proxy_socks5_destroy(struct network_proxy *proxy)
 {
-	struct _network_proxy_socks5 *self = container_of(proxy, struct _network_proxy_socks5, proxy);
+	struct network_proxy_socks5 *self = (struct network_proxy_socks5 *)proxy->privdata;
 
 	g_free(self->password);
 	g_free(self->username);
-	_network_proxy_destroy(proxy);
 	g_free(self);
+	_network_proxy_destroy(proxy);
+	g_free(proxy);
 }
 
 static struct network_proxy *network_proxy_socks5_clone(const struct network_proxy *proxy)
 {
-	struct _network_proxy_socks5 *self = container_of(proxy, struct _network_proxy_socks5, proxy);
-	struct _network_proxy_socks5 *res;
+	struct network_proxy_socks5 *self = (struct network_proxy_socks5 *)proxy->privdata;
+	struct network_proxy_socks5 *priv;
+	struct network_proxy *res;
 
-	res = g_malloc0(sizeof *res);
+	res = g_malloc0(sizeof(struct network_proxy));
+	_network_proxy_clone(res, proxy);
 
-	_network_proxy_clone(&res->proxy, &self->proxy);
-	res->username = g_strdup(self->username);
-	res->password = g_strdup(self->password);
-	return &res->proxy;
+	priv = g_malloc0(sizeof(struct network_proxy_socks5));
+	res->privdata = (void *)priv;
+
+	priv->username = g_strdup(self->username);
+	priv->password = g_strdup(self->password);
+	return res;
 }
 
 static bool socks5_connect_unauthorized(GIOChannel *ch)
@@ -94,9 +99,9 @@ static bool socks5_connect_unauthorized(GIOChannel *ch)
 }
 
 /* TODO: test this method! */
-static bool socks5_connect_plain(const struct _network_proxy_socks5 *proxy, GIOChannel *ch)
+static bool socks5_connect_plain(const struct network_proxy_socks5 *proxy, GIOChannel *ch)
 {
-	uint8_t	ver  = 0x01;
+	uint8_t	ver = 0x01;
 	uint8_t	ulen = strlen(proxy->username);
 	uint8_t	plen = proxy->password ? strlen(proxy->password) : 0;
 	struct server_response_plain resp;
@@ -124,7 +129,7 @@ static bool socks5_connect_plain(const struct _network_proxy_socks5 *proxy, GIOC
 	return true;
 }
 
-static bool socks5_connect(const struct _network_proxy_socks5 *proxy, GIOChannel *ch,
+static bool socks5_connect(const struct network_proxy_socks5 *proxy, GIOChannel *ch,
 			   const char *address, uint16_t port)
 {
 	bool rc;
@@ -267,7 +272,7 @@ err:
 static GIOChannel *network_proxy_socks5_connect(const struct network_proxy *proxy, const IPADDR *hint_ip,
 						const char *address, int port)
 {
-	struct _network_proxy_socks5 *self = container_of(proxy, struct _network_proxy_socks5, proxy);
+	struct network_proxy_socks5 *self = (struct network_proxy_socks5 *)proxy->privdata;
 	GIOChannel *ch;
 
 	GIOFlags old_flags;
@@ -276,9 +281,9 @@ static GIOChannel *network_proxy_socks5_connect(const struct network_proxy *prox
 	GError *err = NULL;
 
 	if (hint_ip)
-		ch = net_connect_ip(hint_ip, self->proxy.port, NULL);
+		ch = net_connect_ip(hint_ip, proxy->port, NULL);
 	else
-		ch = net_connect(self->proxy.host, self->proxy.port, NULL);
+		ch = net_connect(proxy->host, proxy->port, NULL);
 
 	if (!ch)
 		return NULL;
@@ -315,19 +320,24 @@ err:
 	return NULL;
 }
 
-struct network_proxy *_network_proxy_socks5_create(void)
+struct network_proxy *network_proxy_socks5_create(void)
 {
-	struct _network_proxy_socks5 *res;
+	struct network_proxy *res;
+	struct network_proxy_socks5 *priv;
 
-	res = g_malloc0(sizeof *res);
+	res = g_malloc0(sizeof(struct network_proxy));
 
-	_network_proxy_create(&res->proxy);
-	res->username = g_strdup(settings_get_str("proxy_username"));
-	res->password = g_strdup(settings_get_str("proxy_password"));
+	_network_proxy_create(res);
 
-	res->proxy.destroy = network_proxy_socks5_destroy;
-	res->proxy.connect = network_proxy_socks5_connect;
-	res->proxy.clone = network_proxy_socks5_clone;
+	priv = g_malloc0(sizeof(struct network_proxy_socks5));
+	res->privdata = (void *)priv;
 
-	return &res->proxy;
+	priv->username = g_strdup(settings_get_str("proxy_username"));
+	priv->password = g_strdup(settings_get_str("proxy_password"));
+
+	res->destroy = network_proxy_socks5_destroy;
+	res->connect = network_proxy_socks5_connect;
+	res->clone = network_proxy_socks5_clone;
+
+	return res;
 }
diff --git a/src/core/network-proxy-socks5.h b/src/core/network-proxy-socks5.h
index 058edaf5..45431d3a 100644
--- a/src/core/network-proxy-socks5.h
+++ b/src/core/network-proxy-socks5.h
@@ -3,13 +3,11 @@
 
 #include "network-proxy.h"
 
-struct _network_proxy_socks5 {
-	struct network_proxy proxy;
-
+struct network_proxy_socks5 {
 	char *username;
 	char *password;
 };
 
-struct network_proxy *_network_proxy_socks5_create(void);
+struct network_proxy *network_proxy_socks5_create(void);
 
 #endif
diff --git a/src/core/network-proxy.c b/src/core/network-proxy.c
index 0deff1ee..f056da6b 100644
--- a/src/core/network-proxy.c
+++ b/src/core/network-proxy.c
@@ -30,13 +30,13 @@ struct network_proxy *network_proxy_create(const char *type)
 		return NULL;
 
 	if (strcmp(type, "simple")==0 || type[0]=='\0')
-		return _network_proxy_simple_create();
+		return network_proxy_simple_create();
 
 	if (strcmp(type, "http")==0)
-		return _network_proxy_http_create();
+		return network_proxy_http_create();
 
 	if (strcmp(type, "socks5")==0)
-		return _network_proxy_socks5_create();
+		return network_proxy_socks5_create();
 
 	g_error("unsupported proxy type '%s'", type);
 	return NULL;
diff --git a/src/core/network-proxy.h b/src/core/network-proxy.h
index edd1a655..a9fbf936 100644
--- a/src/core/network-proxy.h
+++ b/src/core/network-proxy.h
@@ -18,6 +18,9 @@ struct network_proxy_send_string_info {
 };
 
 struct network_proxy {
+	/* Contains private data for the chosen proxy type */
+	void *privdata;
+
 	/* destroys the network_proxy structure which must not be used anymore
 	 * after; this memberfunction is mandatory */
 	void (*destroy)(struct network_proxy *);

From df1df75ca2cc461360e336ce83052366002b1b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sat, 11 Oct 2014 10:44:46 +0200
Subject: [PATCH 0029/1650] Prepare for 0.8.17

---
 NEWS         | 3 ++-
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 8f9e36a1..ac002150 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v0.8.17-head 2014-XX-XX  The Irssi team <staff@irssi.org>
+v0.8.17 2014-10-11  The Irssi team <staff@irssi.org>
 	+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.
 	+ Synchronize scripts with scripts.irssi.org.
 	+ Performance enhancement of the nicklist as well as the window_item_find function. See Github PR #24.
@@ -19,6 +19,7 @@ v0.8.17-head 2014-XX-XX  The Irssi team <staff@irssi.org>
 	- Fixed gui_printtext_after and term_refresh_*() visibility. See Github PR #22.
 	- Fixed issue where UTF-8 characters was corrupted once for every 32k text. See Github PR #12.
 	- Fixed redrawing issue with right-aligned statusbar.
+	- Fixed use-after-free bug with cached settings values. See Github PR #147.
 
 v0.8.16 2014-05-28  The Irssi team <staff@irssi.org>
 	+ Add -noautosendcmd to /SERVER and /CONNECT. Passing this option will
diff --git a/configure.ac b/configure.ac
index 2a7bee0d..f148885c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.17-head)
+AC_INIT(irssi, 0.8.17)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 3f50b8f2ad7e9a10aab1ff88c58141563c4dd68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sat, 11 Oct 2014 11:12:43 +0200
Subject: [PATCH 0030/1650] HEAD's now 0.8.18-head.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f148885c..477f8c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.17)
+AC_INIT(irssi, 0.8.18-head)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 10078407f6cab2e25e35be37dba903d91126f561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sat, 11 Oct 2014 12:13:22 +0200
Subject: [PATCH 0031/1650] Remove unnecessary NULL check

Fixes: #135
---
 src/core/servers.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index 06f82d4d..6eaad191 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -218,9 +218,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		return;
 
 	if (ip != NULL) {
-		own_ip = ip == NULL ? NULL :
-			(IPADDR_IS_V6(ip) ? server->connrec->own_ip6 :
-			 server->connrec->own_ip4);
+		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
 		handle = server->connrec->use_ssl ?

From 971b1e57ab762fce967f15c28e7b6e6a826a0188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sat, 11 Oct 2014 12:16:43 +0200
Subject: [PATCH 0032/1650] Add header for v0.8.18-head

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index ac002150..5d313da1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
+
 v0.8.17 2014-10-11  The Irssi team <staff@irssi.org>
 	+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.
 	+ Synchronize scripts with scripts.irssi.org.

From 8bd575df2ec0d4a17b6f59116d555b64f5bb1312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Wed, 15 Oct 2014 10:00:30 +0200
Subject: [PATCH 0033/1650] Disable SSLv3

---
 src/core/network-openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 768fd540..e16403ec 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -475,7 +475,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		g_error("Could not allocate memory for SSL context");
 		return NULL;
 	}
-	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
+	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 	SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback);
 	SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass);
 

From 136efda1bc54a49c89bbb3967d55b735e2788f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Wed, 15 Oct 2014 20:14:17 +0200
Subject: [PATCH 0034/1650] Add NEWS entry on SSLv3

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 5d313da1..de36d195 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
+	+ Disable SSLv3 due to the POODLE vulnerability.
 
 v0.8.17 2014-10-11  The Irssi team <staff@irssi.org>
 	+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.

From 7847bdf67cab8579679d830787929468cbc45139 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 15 Oct 2014 23:52:55 -0300
Subject: [PATCH 0035/1650] Tiny fix to the param order in the /SERVER REMOVE
 help

---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 5628b19f..809c5acd 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,7 +61,7 @@
     /SERVER CONNECT +chat.freenode.net
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
     /SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode -noproxy orwell.freenode.net
-    /SERVER REMOVE -network Freenode orwell.freenode.net
+    /SERVER REMOVE orwell.freenode.net Freenode
     /SERVER PURGE
     /SERVER PURGE orwell.freenode.net
 

From f81a54b937b16ebabc05a01d3053a49b3341ac8c Mon Sep 17 00:00:00 2001
From: Sebastian Thorarensen <sebth@naju.se>
Date: Sat, 11 Oct 2014 18:47:39 +0200
Subject: [PATCH 0036/1650] Try to split long lines on spaces

Try to split long lines on spaces to avoid words being splitted. This
can be turned off with the option `split_line_on_space'. The code
assumes that the terminal encoding has ASCII spaces.
---
 NEWS                       |  2 ++
 src/core/misc.c            | 33 ++++++++++++++++++++++-----------
 src/core/misc.h            |  2 +-
 src/core/recode.c          | 20 +++++++++++++++++---
 src/core/recode.h          |  2 +-
 src/irc/core/irc-servers.c |  4 +++-
 6 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index de36d195..70717965 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
 	+ Disable SSLv3 due to the POODLE vulnerability.
+	+ Try to split long lines on spaces to avoid words being splitted. Adds
+	  a new option: 'split_line_on_space' which defaults to on.
 
 v0.8.17 2014-10-11  The Irssi team <staff@irssi.org>
 	+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.
diff --git a/src/core/misc.c b/src/core/misc.c
index 5e6087cb..586e4f7c 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -967,19 +967,30 @@ char *ascii_strdown(char *str)
 	return str;
 }
 
-char **strsplit_len(const char *str, int len)
+char **strsplit_len(const char *str, int len, gboolean onspace)
 {
-	char **ret;
-	size_t total_len = strlen(str);
-	int n = total_len / len;
-	int i;
+	char **ret = g_new(char *, 1);
+	int n;
+	int offset;
 
-	if (total_len % len)
-		n++;
-
-	ret = g_new(char *, n + 1);
-	for (i = 0; i < n; i++, str += len)
-		ret[i] = g_strndup(str, len);
+	for (n = 0; *str != '\0'; n++, str += MIN(len - offset, strlen(str))) {
+		offset = 0;
+		if (onspace) {
+			/*
+			 * Try to find a space to split on and leave
+			 * the space on the previous line.
+			 */
+			int i;
+			for (i = 0; i < len; i++) {
+				if (str[len-1-i] == ' ') {
+					offset = i;
+					break;
+				}
+			}
+		}
+		ret[n] = g_strndup(str, len - offset);
+		ret = g_renew(char *, ret, n + 2);
+	}
 	ret[n] = NULL;
 
 	return ret;
diff --git a/src/core/misc.h b/src/core/misc.h
index 8fb5078f..c6369489 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -116,6 +116,6 @@ uoff_t str_to_uofft(const char *str);
 int find_substr(const char *list, const char *item);
 
 /* split `str' into `len' sized substrings */
-char **strsplit_len(const char *str, int len);
+char **strsplit_len(const char *str, int len, gboolean onspace);
 
 #endif
diff --git a/src/core/recode.c b/src/core/recode.c
index 029d7ff1..d001a46a 100644
--- a/src/core/recode.c
+++ b/src/core/recode.c
@@ -183,7 +183,7 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target)
 }
 
 char **recode_split(const SERVER_REC *server, const char *str,
-		    const char *target, int len)
+		    const char *target, int len, gboolean onspace)
 {
 	GIConv cd = (GIConv)-1;
 	const char *from = translit_charset;
@@ -219,7 +219,7 @@ char **recode_split(const SERVER_REC *server, const char *str,
 	cd = g_iconv_open(to, from);
 	if (cd == (GIConv)-1) {
 		/* Fall back to splitting by byte. */
-		ret = strsplit_len(str, len);
+		ret = strsplit_len(str, len, onspace);
 		goto out;
 	}
 
@@ -235,11 +235,25 @@ char **recode_split(const SERVER_REC *server, const char *str,
 			 */
 			ret[n] = NULL;
 			g_strfreev(ret);
-			ret = strsplit_len(str, len);
+			ret = strsplit_len(str, len, onspace);
 			goto out;
 		}
 
 		/* Outbuf overflowed, split the input string. */
+		if (onspace) {
+			/*
+			 * Try to find a space to split on and leave
+			 * the space on the previous line.
+			 */
+			int i;
+			for (i = 0; i < inbuf - previnbuf; i++) {
+				if (previnbuf[inbuf-previnbuf-1-i] == ' ') {
+					inbuf -= i;
+					inbytesleft += i;
+					break;
+				}
+			}
+		}
 		ret[n++] = g_strndup(previnbuf, inbuf - previnbuf);
 		ret = g_renew(char *, ret, n + 1);
 		previnbuf = inbuf;
diff --git a/src/core/recode.h b/src/core/recode.h
index b70ec630..719e8f54 100644
--- a/src/core/recode.h
+++ b/src/core/recode.h
@@ -4,7 +4,7 @@
 char *recode_in (const SERVER_REC *server, const char *str, const char *target);
 char *recode_out (const SERVER_REC *server, const char *str, const char *target);
 char **recode_split(const SERVER_REC *server, const char *str,
-		    const char *target, int len);
+		    const char *target, int len, gboolean onspace);
 gboolean is_valid_charset(const char *charset);
 gboolean is_utf8(void);
 void recode_update_charset(void);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 27878989..baf8a0d2 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -85,6 +85,7 @@ static char **split_line(const SERVER_REC *server, const char *line,
 {
 	const char *start = settings_get_str("split_line_start");
 	const char *end = settings_get_str("split_line_end");
+	gboolean onspace = settings_get_bool("split_line_on_space");
 	char *recoded_start = recode_out(server, start, target);
 	char *recoded_end = recode_out(server, end, target);
 	char **lines;
@@ -103,7 +104,7 @@ static char **split_line(const SERVER_REC *server, const char *line,
 		return NULL;
 	}
 
-	lines = recode_split(server, line, target, len);
+	lines = recode_split(server, line, target, len, onspace);
 	for (i = 0; lines[i] != NULL; i++) {
 		if (i != 0 && *start != '\0') {
 			/* Not the first line. */
@@ -972,6 +973,7 @@ void irc_servers_init(void)
 	settings_add_str("misc", "usermode", DEFAULT_USER_MODE);
 	settings_add_str("misc", "split_line_start", "");
 	settings_add_str("misc", "split_line_end", "");
+	settings_add_bool("misc", "split_line_on_space", TRUE);
 	settings_add_time("flood", "cmd_queue_speed", DEFAULT_CMD_QUEUE_SPEED);
 	settings_add_int("flood", "cmds_max_at_once", DEFAULT_CMDS_MAX_AT_ONCE);
 

From 7938af8092fc5bc682bb9017b87eeb7ce0a2e428 Mon Sep 17 00:00:00 2001
From: David Leadbeater <dgl@dgl.cx>
Date: Mon, 20 Oct 2014 21:11:20 +0100
Subject: [PATCH 0037/1650] Actually fix the params for /SERVER REMOVE

---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 809c5acd..d8bcb9a7 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,7 +61,7 @@
     /SERVER CONNECT +chat.freenode.net
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
     /SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode -noproxy orwell.freenode.net
-    /SERVER REMOVE orwell.freenode.net Freenode
+    /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
     /SERVER PURGE orwell.freenode.net
 

From 8e29a70a82ee3dd02f996a7bd3a86954564c6b4a Mon Sep 17 00:00:00 2001
From: mjn <mjn@anadrome.org>
Date: Sat, 25 Oct 2014 17:00:27 +0200
Subject: [PATCH 0038/1650] Update old bug URLs

At some point in the past few years, Flyspray changed its URL scheme from id=nnn to task_id=nnn, which broke some old comments in the source. Update those comments to URLs that still work.
---
 src/fe-common/irc/fe-whois.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c
index 35f99375..a9c3775e 100644
--- a/src/fe-common/irc/fe-whois.c
+++ b/src/fe-common/irc/fe-whois.c
@@ -92,7 +92,7 @@ static void event_whois_oper(IRC_SERVER_REC *server, const char *data)
 
 	params = event_get_params(data, 3, NULL, &nick, &type);
 
-	/* Bugfix: http://bugs.irssi.org/?do=details&id=99
+	/* Bugfix: http://bugs.irssi.org/?do=details&task_id=99
 	 * Author: Geert Hauwaerts <geert@irssi.org>
 	 * Date:   Wed Sep 15 20:17:24 CEST 2004
 	 */
@@ -410,7 +410,7 @@ void fe_whois_init(void)
 	signal_add("event 311", (SIGNAL_FUNC) event_whois);
 	signal_add("event 312", (SIGNAL_FUNC) event_whois_server);
 	/* readding this events fixes the printing of /whois -yes *
-	   Bug http://bugs.irssi.org/?do=details&id=123 */
+	   Bug http://bugs.irssi.org/?do=details&task_id=123 */
 	signal_add("event 317", (SIGNAL_FUNC) event_whois_idle);
 	signal_add("event 319", (SIGNAL_FUNC) event_whois_channels);
 	signal_add("event 313", (SIGNAL_FUNC) event_whois_oper);

From 1edfcedda1105d79fa6b92d77a8fb60f296abe1e Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 26 Oct 2014 00:12:30 -0300
Subject: [PATCH 0039/1650] Receive 'self messages' in the right query window

Original patch by hondza <sedaj2@gmail.com>, from FS#833. I applied
several needed style changes, and rebased to current HEAD.

This implements the IRCv3.2 self-message extension partially (we can't
announce its support through CAP yet). This is also the format used by
the 'privmsg' znc module, and is already implemented by several other
clients.
---
 src/fe-common/core/fe-messages.c    | 19 ++++++++++++++-----
 src/fe-common/core/fe-queries.c     |  7 +++++--
 src/fe-common/irc/fe-irc-messages.c | 27 +++++++++++++++++++--------
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 97f3d84d..1d44bdd9 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -242,13 +242,16 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 }
 
 static void sig_message_private(SERVER_REC *server, const char *msg,
-				const char *nick, const char *address)
+				const char *nick, const char *address, const char *target)
 {
 	QUERY_REC *query;
         char *freemsg = NULL;
 	int level = MSGLEVEL_MSGS;
 
-	query = query_find(server, nick);
+	/* own message returned by bouncer? */
+	int own = (!strcmp(nick, server->nick));
+
+	query = query_find(server, own ? target : nick);
 
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) query, msg);
@@ -256,9 +259,15 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
 	if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	printformat(server, nick, level,
-		    query == NULL ? TXT_MSG_PRIVATE :
-		    TXT_MSG_PRIVATE_QUERY, nick, address, msg);
+	if (own) {
+		printformat(server, target, level,
+			    query == NULL ? TXT_OWN_MSG_PRIVATE :
+			    TXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
+	} else {
+		printformat(server, nick, level,
+			    query == NULL ? TXT_MSG_PRIVATE :
+			    TXT_MSG_PRIVATE_QUERY, nick, address, msg);
+	}
 
 	g_free_not_null(freemsg);
 }
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 7599fb23..5cdf87ee 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -326,12 +326,15 @@ static int sig_query_autoclose(void)
 }
 
 static void sig_message_private(SERVER_REC *server, const char *msg,
-				const char *nick, const char *address)
+				const char *nick, const char *address, const char *target)
 {
 	QUERY_REC *query;
 
+	/* own message returned by bouncer? */
+	int own = (!strcmp(nick, server->nick));
+
 	/* create query window if needed */
-	query = privmsg_get_query(server, nick, FALSE, MSGLEVEL_MSGS);
+	query = privmsg_get_query(server, own ? target : nick, FALSE, MSGLEVEL_MSGS);
 
 	/* reset the query's last_unread_msg timestamp */
         if (query != NULL)
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 0c83a531..e0849c75 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -160,6 +160,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	const char *oldtarget;
         char *freemsg = NULL;
 	int level;
+	int own = FALSE;
 
 	oldtarget = target;
 	target = skip_target(IRC_SERVER(server), target);
@@ -174,10 +175,12 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 			 level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ischannel(*target))
+	if (ischannel(*target)) {
 		item = irc_channel_find(server, target);
-        else
-		item = privmsg_get_query(SERVER(server), nick, FALSE, level);
+	} else {
+		own = (!strcmp(nick, server->nick));
+		item = privmsg_get_query(SERVER(server), own ? nick : target, FALSE, level);
+	}
 
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis(item, msg);
@@ -195,11 +198,19 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 				    nick, oldtarget, msg);
 		}
 	} else {
-		/* private action */
-		printformat(server, nick, MSGLEVEL_ACTIONS | MSGLEVEL_MSGS,
-			    item == NULL ? IRCTXT_ACTION_PRIVATE :
-			    IRCTXT_ACTION_PRIVATE_QUERY,
-			    nick, address == NULL ? "" : address, msg);
+		if (own) {
+			/* own action bounced */
+			printformat(server, target,
+				    MSGLEVEL_ACTIONS | MSGLEVEL_MSGS,
+				    item != NULL && oldtarget == target ? IRCTXT_OWN_ACTION : IRCTXT_OWN_ACTION_TARGET,
+				    server->nick, msg, oldtarget);
+		} else {
+			/* private action */
+			printformat(server, nick, MSGLEVEL_ACTIONS | MSGLEVEL_MSGS,
+				    item == NULL ? IRCTXT_ACTION_PRIVATE :
+				    IRCTXT_ACTION_PRIVATE_QUERY,
+				    nick, address == NULL ? "" : address, msg);
+		}
 	}
 
 	g_free_not_null(freemsg);

From 3ea2a8dab8212d5155014a9aa1aee3f2e456cd94 Mon Sep 17 00:00:00 2001
From: Matt Lewandowsky <matt@greenviolet.net>
Date: Mon, 27 Oct 2014 03:44:28 -0700
Subject: [PATCH 0040/1650] Remove duplicate example from ignore.in

Duplicated line inserted in commit 66f5fb6. Reported by @sharethebug on IRC.
---
 docs/help/in/ignore.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 8c2b1c90..b0a547c1 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -41,7 +41,6 @@
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
     /IGNORE -regexp -pattern
-    /IGNORE mike NO_ACT -MSGS
 
 %9See also:%9 ACCEPT, SILENCE, UNIGNORE
 

From 77a90effe305a0d39ce33fe187bb2e0c0125da36 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Tue, 28 Oct 2014 10:50:26 +0100
Subject: [PATCH 0041/1650] Fix reset of attributes with ansi

reported by Christopher Ohlsson (dmnc)
---
 src/fe-common/core/formats.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 375b00eb..ccf48394 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -905,10 +905,13 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 
 		switch (num) {
 		case 0:
-			/* reset colors back to default */
+			/* reset colors and attributes back to default */
 			fg = theme->default_color;
 			bg = -1;
-			flags &= ~(GUI_PRINT_FLAG_COLOR_24_FG | GUI_PRINT_FLAG_COLOR_24_BG | GUI_PRINT_FLAG_INDENT);
+			flags &= ~(GUI_PRINT_FLAG_INDENT |
+				   GUI_PRINT_FLAG_BOLD | GUI_PRINT_FLAG_ITALIC | GUI_PRINT_FLAG_UNDERLINE |
+				   GUI_PRINT_FLAG_BLINK | GUI_PRINT_FLAG_REVERSE |
+				   GUI_PRINT_FLAG_COLOR_24_FG | GUI_PRINT_FLAG_COLOR_24_BG);
 			break;
 		case 1:
 			/* hilight */

From f285332c5bb98c22952779f6d13664d3b2e3b847 Mon Sep 17 00:00:00 2001
From: Veres Lajos <vlajos@gmail.com>
Date: Sat, 8 Nov 2014 22:26:53 +0000
Subject: [PATCH 0042/1650] typo fixes -
 https://github.com/vlajos/misspell_fixer

---
 NEWS                            |  8 ++++----
 docs/help/in/echo.in            |  4 ++--
 docs/perl.txt                   |  4 ++--
 docs/startup-HOWTO.html         |  2 +-
 m4/glib-2.0.m4                  |  2 +-
 src/core/commands.h             |  2 +-
 src/core/net-nonblock.h         |  2 +-
 src/core/net-sendbuffer.c       |  2 +-
 src/core/net-sendbuffer.h       |  2 +-
 src/core/network.c              |  2 +-
 src/core/nicklist.c             |  2 +-
 src/core/query-rec.h            |  2 +-
 src/fe-text/tparm.c             | 12 ++++++------
 src/irc/core/channels-query.c   |  2 +-
 src/irc/core/servers-redirect.c |  4 ++--
 15 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/NEWS b/NEWS
index de36d195..fe6e5e58 100644
--- a/NEWS
+++ b/NEWS
@@ -368,7 +368,7 @@ v0.8.10 2005-12-11  The Irssi team <staff@irssi.org>
 	  <charset> can be almost everything listed by 'iconv -l'
 	+ Added transpose_words, capitalize_word, downcase_word, upcase_word
 	  key bindings
-	+ Avoid accidentaly /VER in a channel, by requiring parameter
+	+ Avoid accidentally /VER in a channel, by requiring parameter
 	- Pasted lines weren't added to command history. Some other paste
 	  detection fixes
 	- Fixed /BIND escape_char
@@ -1905,7 +1905,7 @@ v0.7.14 1999-08-22  Timo Sirainen <cras@irccrew.org> [unstable]
 	- /msg <tab> completion was a bit buggy, if someone sent you multiple
 	  messages, you had to press tab multiple times until the nick changed
 	  to someone else..
-	- Defaut format for signon time in whois displayed nick instead of
+	- Default format for signon time in whois displayed nick instead of
 	  the signon time..
 	- Disconnecting server while it was still trying to connect hung irssi
 	- If old configuration file wasn't found, irssi (could have?) crashed
@@ -2189,7 +2189,7 @@ v0.7.9 1999-04-22  Timo Sirainen <a@sicom.fi> [unstable]
           that matched the parameters
         - Commented out all GUI_INPUT_EXCEPTIONs .. I don't even know when
           exceptions are sent and why (I thought that only when some error
-          occured..), Linux doesn't seem to send them ever? IRIX however sends
+          occurred..), Linux doesn't seem to send them ever? IRIX however sends
           them all the time which made irssi eating all cpu.
         - Fixed compiling gui-text with systems that had only slang/slang.h
         - gui_widget_depends() had some bugs
@@ -2635,7 +2635,7 @@ v0.3.2 1999-01-22  Timo Sirainen <a@sicom.fi> [unstable]
 
 v0.3.1 1999-01-22  Timo Sirainen <a@sicom.fi>
 
-	* 4 days since last relase. too long :) I'm now starting to create
+	* 4 days since last release. too long :) I'm now starting to create
           "unstable" versions of irssi. They have the latest and greatest
           features while they might not build/work too well. Check
           http://www.sicom.fi/~ikioma/irssi-download.html, new versions will
diff --git a/docs/help/in/echo.in b/docs/help/in/echo.in
index a730e282..4ff23730 100644
--- a/docs/help/in/echo.in
+++ b/docs/help/in/echo.in
@@ -6,10 +6,10 @@
 %9Parameters:%9
 
     -current:    Displays the output in the active window.
-    -window:     Displays the ouput in the target window.
+    -window:     Displays the output in the target window.
     -level:      Displays the output with a given message level.
 
-    The text ouput; if no target is given, the active window will be used.
+    The text output; if no target is given, the active window will be used.
 
 %9Description:%9
 
diff --git a/docs/perl.txt b/docs/perl.txt
index 732b73af..79ab5820 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -796,7 +796,7 @@ Query->{}
   address - Host address of the queries nick
   server_tag - Server tag used for this nick (doesn't get erased if
                server gets disconnected)
-  unwanted - 1 if the other side closed or some error occured (DCC chats)
+  unwanted - 1 if the other side closed or some error occurred (DCC chats)
 
 Query
 query_create(chat_type, server_tag, nick, automatic)
@@ -1123,7 +1123,7 @@ Netsplit->{}
 
 Netsplitserver->{}
   server - The server nick was in
-  destserver - The other server where split occured.
+  destserver - The other server where split occurred.
   count - Number of splits in server
 
 Netsplitchannel->{}
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 736f25e9..30caf657 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -493,7 +493,7 @@ scrollback buffer. Simplest usages are</p>
 
 <pre>
 /LASTLOG word     - print all lines with "word" in them
-/LASTLOG word 10  - print last 10 occurances of "word"
+/LASTLOG word 10  - print last 10 occurrences of "word"
 /LASTLOG -topics  - print all topic changes
 </pre>
 
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
index 2a5afd0c..2c8760b7 100644
--- a/m4/glib-2.0.m4
+++ b/m4/glib-2.0.m4
@@ -187,7 +187,7 @@ main ()
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
+          echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
diff --git a/src/core/commands.h b/src/core/commands.h
index c68c5b24..d65185e5 100644
--- a/src/core/commands.h
+++ b/src/core/commands.h
@@ -158,7 +158,7 @@ char *cmd_get_quoted_param(char **data);
 /* get parameters from command - you should point free_me somewhere and
    cmd_params_free() it after you don't use any of the parameters anymore.
 
-   Returns TRUE if all ok, FALSE if error occured. */
+   Returns TRUE if all ok, FALSE if error occurred. */
 int cmd_get_params(const char *data, gpointer *free_me, int count, ...);
 
 void cmd_params_free(void *free_me);
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 32cfac70..af5968c8 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -29,7 +29,7 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 			       int reverse_lookup);
 /* Get host's name, call func when finished */
 int net_gethostbyaddr_nonblock(IPADDR *ip, NET_HOST_CALLBACK func, void *data);
-/* get the resolved IP address. returns -1 if some error occured with read() */
+/* get the resolved IP address. returns -1 if some error occurred with read() */
 int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec);
 
 /* Connect to server, call func when finished */
diff --git a/src/core/net-sendbuffer.c b/src/core/net-sendbuffer.c
index 9d4b0e37..39257486 100644
--- a/src/core/net-sendbuffer.c
+++ b/src/core/net-sendbuffer.c
@@ -109,7 +109,7 @@ static int buffer_add(NET_SENDBUF_REC *rec, const void *data, int size)
 
 /* Send data, if all of it couldn't be sent immediately, it will be resent
    automatically after a while. Returns -1 if some unrecoverable error
-   occured. */
+   occurred. */
 int net_sendbuffer_send(NET_SENDBUF_REC *rec, const void *data, int size)
 {
 	int ret;
diff --git a/src/core/net-sendbuffer.h b/src/core/net-sendbuffer.h
index 785f59ae..bdeb7156 100644
--- a/src/core/net-sendbuffer.h
+++ b/src/core/net-sendbuffer.h
@@ -24,7 +24,7 @@ void net_sendbuffer_destroy(NET_SENDBUF_REC *rec, int close);
 
 /* Send data, if all of it couldn't be sent immediately, it will be resent
    automatically after a while. Returns -1 if some unrecoverable error
-   occured. */
+   occurred. */
 int net_sendbuffer_send(NET_SENDBUF_REC *rec, const void *data, int size);
 
 int net_sendbuffer_receive_line(NET_SENDBUF_REC *rec, char **str, int read_socket);
diff --git a/src/core/network.c b/src/core/network.c
index 3659ab36..bfaa47fb 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -624,7 +624,7 @@ const char *net_gethosterror(int error)
 int net_hosterror_notfound(int error)
 {
 #ifdef HAVE_IPV6
-#ifdef EAI_NODATA /* NODATA is depricated */
+#ifdef EAI_NODATA /* NODATA is deprecated */
 	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
 #else
 	return error != 1 && (error == EAI_NONAME);
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index a5f25f34..b1c9ecef 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -342,7 +342,7 @@ GSList *nicklist_get_same_unique(SERVER_REC *server, void *id)
 	return rec.list;
 }
 
-/* nick record comparision for sort functions */
+/* nick record comparison for sort functions */
 int nicklist_compare(NICK_REC *p1, NICK_REC *p2, const char *nick_prefix)
 {
 	int i;
diff --git a/src/core/query-rec.h b/src/core/query-rec.h
index fc08d2ef..59519ad4 100644
--- a/src/core/query-rec.h
+++ b/src/core/query-rec.h
@@ -7,5 +7,5 @@ char *server_tag;
 time_t last_unread_msg;
 
 unsigned int unwanted:1; /* TRUE if the other side closed or
-			    some error occured (DCC chats!) */
+			    some error occurred (DCC chats!) */
 unsigned int destroying:1;
diff --git a/src/fe-text/tparm.c b/src/fe-text/tparm.c
index 3f58e6f3..97c790da 100644
--- a/src/fe-text/tparm.c
+++ b/src/fe-text/tparm.c
@@ -153,7 +153,7 @@ static int termcap;
    all terminfo codes are invalid unless something has been pushed on
    the stack and termcap strings will never push things on the stack
    (%p isn't used by termcap). So where we have a choice we make the
-   decision by wether or not somthing has been pushed on the stack.
+   decision by whether or not somthing has been pushed on the stack.
    The static variable termcap keeps track of this; it starts out set
    to 1 and is incremented as each argument processed by a termcap % code,
    however if something is pushed on the stack it's set to 0 and the
@@ -170,7 +170,7 @@ static int termcap;
 	%c	output pop as a char
 	%'c'	push character constant c.
 	%{n}	push decimal constant n.
-	%p[1-9] push paramter [1-9]
+	%p[1-9] push parameter [1-9]
 	%g[a-z] push variable [a-z]
 	%P[a-z] put pop in variable [a-z]
 	%l	push the length of pop (a string)
@@ -188,7 +188,7 @@ static int termcap;
 	%O	logical or pop and pop and push the result
 	%!	push the logical not of pop
 	%? condition %t if_true [%e if_false] %;
-		if condtion evaulates as true then evaluate if_true,
+		if condition evaulates as true then evaluate if_true,
 		else evaluate if_false. elseif's can be done:
 %? cond %t true [%e cond2 %t true2] ... [%e condN %t trueN] [%e false] %;
 	%i	add one to parameters 1 and 2. (ANSI)
@@ -208,7 +208,7 @@ static int termcap;
 (UW)	%sx	subtract parameter FROM the character x
 	%>xy	if parameter > character x then add character y to parameter
 	%B	convert to BCD (parameter = (parameter/10)*16 + parameter%16)
-	%D	Delta Data encode (parameter = parameter - 2*(paramter%16))
+	%D	Delta Data encode (parameter = parameter - 2*(parameter%16))
 	%i	increment the first two parameters by one
 	%n	xor the first two parameters by 0140
 (GNU)	%m	xor the first two parameters by 0177
@@ -216,7 +216,7 @@ static int termcap;
 (GNU)	%b	backup to previous parameter
 (GNU)	%f	skip this parameter
 
-  Note the two definitions of %a, the GNU defintion is used if the characters
+  Note the two definitions of %a, the GNU definition is used if the characters
   after the 'a' are valid, otherwise the UW definition is used.
 
   (GNU) used by GNU Emacs termcap libraries
@@ -316,7 +316,7 @@ char *tparm(const char *str, ...) {
 				if ((sp[1] == 'p' || sp[1] == 'c')
 			            && sp[2] != '\0' && fmt == NULL) {
 					/* GNU aritmitic parameter, what they
-					   realy need is terminfo.	      */
+					   really need is terminfo.	      */
 					int val, lc;
 					if (sp[1] == 'p'
 					    && getarg(termcap - 1 + sp[2] - '@',
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 48ba5703..857ebaf0 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -311,7 +311,7 @@ static void channel_checksync(IRC_CHANNEL_REC *channel)
 	signal_emit("channel sync", 1, channel);
 }
 
-/* Error occured when trying to execute query - abort and try again. */
+/* Error occurred when trying to execute query - abort and try again. */
 static void query_current_error(IRC_SERVER_REC *server)
 {
 	SERVER_QUERY_REC *rec;
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 34beaef6..518248cb 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -734,7 +734,7 @@ void servers_redirect_init(void)
 				 "event 403", 1, /* no such channel */
 				 "event 442", 1, /* "you're not on that channel" */
 				 "event 479", 1, /* "Cannot join channel (illegal name)" IMHO this is not a logical reply from server. */
-				 "event 472", -1, /* unknown mode (you should check e-mode's existance from 004 event instead of relying on this) */
+				 "event 472", -1, /* unknown mode (you should check e-mode's existence from 004 event instead of relying on this) */
 				 NULL,
 				 NULL);
 
@@ -747,7 +747,7 @@ void servers_redirect_init(void)
 				 "event 403", 1, /* no such channel */
 				 "event 442", 1, /* "you're not on that channel" */
 				 "event 479", 1, /* "Cannot join channel (illegal name)" IMHO this is not a logical reply from server. */
-				 "event 472", -1, /* unknown mode (you should check I-mode's existance from 004 event instead of relying on this) */
+				 "event 472", -1, /* unknown mode (you should check I-mode's existence from 004 event instead of relying on this) */
 				 NULL,
 				 NULL);
 

From b03805eeb916712815971ac6bcfffe10cc16711f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Tue, 4 Nov 2014 12:08:27 +0100
Subject: [PATCH 0043/1650] reimplement format and length logic for the entry
 prompt

---
 src/fe-common/core/printtext.c | 12 ++++++++++++
 src/fe-common/core/printtext.h |  1 +
 src/fe-text/gui-entry.c        | 32 ++++++++++++++++++++++++++++++--
 src/fe-text/gui-printtext.c    | 10 ++++++++++
 src/fe-text/gui-printtext.h    |  1 +
 5 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 466a2825..ba6f3242 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -413,6 +413,18 @@ void printtext_gui(const char *text)
 	g_free(str);
 }
 
+/* Like printtext_gui(), but don't expand % codes. */
+void printtext_gui_internal(const char *str)
+{
+	TEXT_DEST_REC dest;
+
+	g_return_if_fail(str != NULL);
+
+        memset(&dest, 0, sizeof(dest));
+
+	format_send_to_gui(&dest, str);
+}
+
 static void msg_beep_check(TEXT_DEST_REC *dest)
 {
 	if (dest->level != 0 && (dest->level & MSGLEVEL_NO_ACT) == 0 &&
diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h
index 66ba28f4..ab8dfac1 100644
--- a/src/fe-common/core/printtext.h
+++ b/src/fe-common/core/printtext.h
@@ -23,6 +23,7 @@ void printtext_dest(TEXT_DEST_REC *dest, const char *text, ...);
 /* only GUI should call these - used for printing text to somewhere else
    than windows */
 void printtext_gui(const char *text);
+void printtext_gui_internal(const char *str);
 void printformat_module_gui(const char *module, int formatnum, ...);
 void printformat_module_gui_args(const char *module, int formatnum, va_list va);
 
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 17a7c507..309f3a68 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -26,6 +26,7 @@
 #include "gui-entry.h"
 #include "gui-printtext.h"
 #include "term.h"
+#include "recode.h"
 
 #undef i_toupper
 #undef i_tolower
@@ -345,6 +346,33 @@ void gui_entry_set_active(GUI_ENTRY_REC *entry)
 	}
 }
 
+/* Return screen length of plain string */
+static int scrlen_str(const char *str)
+{
+	int len = 0;
+	char *stripped;
+	g_return_val_if_fail(str != NULL, 0);
+
+	str = stripped = strip_codes(str);
+	if (is_utf8() && g_utf8_validate(str, -1, NULL)) {
+
+		while (*str != '\0') {
+			gunichar c;
+
+			c = g_utf8_get_char(str);
+			str = g_utf8_next_char(str);
+
+			len += unichar_isprint(c) ? mk_wcwidth(c) : 1;
+		}
+
+	} else {
+		len = strlen(str);
+	}
+
+	g_free(stripped);
+	return len;
+}
+
 void gui_entry_set_prompt(GUI_ENTRY_REC *entry, const char *str)
 {
 	int oldlen;
@@ -355,11 +383,11 @@ void gui_entry_set_prompt(GUI_ENTRY_REC *entry, const char *str)
 	if (str != NULL) {
 		g_free_not_null(entry->prompt);
 		entry->prompt = g_strdup(str);
-		entry->promptlen = format_get_length(str);
+		entry->promptlen = scrlen_str(str);
 	}
 
         if (entry->prompt != NULL)
-		gui_printtext(entry->xpos, entry->ypos, entry->prompt);
+		gui_printtext_internal(entry->xpos, entry->ypos, entry->prompt);
 
 	if (entry->promptlen != oldlen) {
 		gui_entry_fix_cursor(entry);
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 547d39c9..83b26e82 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -109,6 +109,16 @@ void gui_printtext(int xpos, int ypos, const char *str)
 	next_xpos = next_ypos = -1;
 }
 
+void gui_printtext_internal(int xpos, int ypos, const char *str)
+{
+	next_xpos = xpos;
+	next_ypos = ypos;
+
+	printtext_gui_internal(str);
+
+	next_xpos = next_ypos = -1;
+}
+
 void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str, time_t time)
 {
 	GUI_WINDOW_REC *gui;
diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h
index 33b7ce6f..d2671497 100644
--- a/src/fe-text/gui-printtext.h
+++ b/src/fe-text/gui-printtext.h
@@ -17,6 +17,7 @@ void gui_set_default_indent(const char *name);
 INDENT_FUNC get_default_indent_func(void);
 
 void gui_printtext(int xpos, int ypos, const char *str);
+void gui_printtext_internal(int xpos, int ypos, const char *str);
 void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str);
 void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str, time_t time);
 

From 0bba34bbe9b3510ae71cfb83e686de3d3cfb9376 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 14 Nov 2014 03:46:02 -0300
Subject: [PATCH 0044/1650] Fix -ssl_pass documentation in /server and /connect

Copied text from 68f8229 (SVN r5231)
---
 docs/help/in/connect.in | 1 +
 docs/help/in/server.in  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index 1c1aa2bb..3330966e 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -11,6 +11,7 @@
     -ssl_cert:      The SSL client certificate file.
     -ssl_pkey:      The SSL client private key, if not included in the
                     certificate file.
+    -ssl_pass:      The password for the SSL client private key or certificate.
     -ssl_verify:    Verifies the SSL certificate of the server.
     -ssl_cafile:    The file with the list of CA certificates.
     -ssl_capath:    The directory which contains the CA certificates.
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index d8bcb9a7..f6706daf 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -18,7 +18,7 @@
     -ssl_cert:         The SSL client certificate file.
     -ssl_pkey:         The SSL client private key, if not included in the
                        certificate file.
-    -ssl_pass:         Verifies the SSL certificate of the server.
+    -ssl_pass:         The password for the SSL client private key or certificate.
     -ssl_verify:       Verifies the SSL certificate of the server.
     -ssl_cafile:       The file with the list of CA certificates.
     -ssl_capath:       The directory which contains the CA certificates.

From f0a6e5f82a909b5789dfdfa4928ad3d8c4b078a3 Mon Sep 17 00:00:00 2001
From: Guillaume BROGI <guillaume.brogi@yahoo.com>
Date: Thu, 20 Nov 2014 17:01:07 +0100
Subject: [PATCH 0045/1650] Correctly parse unix sockets servers in the config

---
 src/core/servers-setup.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 0819ff1a..27d9f1f0 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -122,6 +122,9 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
 	conn->address = g_strdup(address);
 	if (port > 0) conn->port = port;
 
+	if (strchr(address, '/') != NULL)
+		conn->unix_socket = TRUE;
+
 	if (!conn->nick) conn->nick = g_strdup(settings_get_str("nick"));
 	conn->username = g_strdup(settings_get_str("user_name"));
 	conn->realname = g_strdup(settings_get_str("real_name"));

From 86d263dd7dd39bbb768284fb6b586d1979a821cd Mon Sep 17 00:00:00 2001
From: Guillaume BROGI <guillaume.brogi@yahoo.com>
Date: Wed, 3 Dec 2014 09:43:24 +0100
Subject: [PATCH 0046/1650] Check for unix sockets when reconnecting

---
 src/core/servers-reconnect.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 0a08b461..d99a5405 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -253,6 +253,9 @@ static void sig_reconnect(SERVER_REC *server)
 		conn->port = server->connrec->port;
 		conn->password = g_strdup(server->connrec->password);
 
+		if (strchr(conn->address, '/') != NULL)
+			conn->unix_socket = TRUE;
+
 		server_reconnect_add(conn, (server->connect_time == 0 ? time(NULL) :
 					    server->connect_time) + reconnect_time);
 		server_connect_unref(conn);

From 08b390b11b327f33f77a79816409b595775d4194 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Mon, 8 Dec 2014 21:28:02 +0100
Subject: [PATCH 0047/1650] Documentation fix for #185

Documentation fix for #185
---
 docs/help/in/disconnect.in | 7 ++++---
 docs/help/in/msg.in        | 4 ++++
 src/core/chat-commands.c   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index ace1a3df..bd4a4e17 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -10,10 +10,11 @@
 
 %9Description:%9
 
-    Disconnects from one or more IRC servers; the list of all the servers you
-    are connected to can be retrieved via the SERVER command.
+    Disconnects from an IRC server; the list of all the servers you are
+    connected to can be retrieved via the SERVER command.
 
-    Use the wildcard character '*' if you want to disconnect from all servers.
+    Use the wildcard character '*' if you want to disconnect from the active
+    server.
 
 %9Examples:%9
 
diff --git a/docs/help/in/msg.in b/docs/help/in/msg.in
index dc70f1f3..9e0879e4 100644
--- a/docs/help/in/msg.in
+++ b/docs/help/in/msg.in
@@ -11,6 +11,9 @@
 
     The target nickname or channel and the message to send.
 
+    Use the wildcard character '*' if you want to use the active nickname or
+    channel.
+
 %9Description:%9
 
     Sends a message to a nickname or channel.
@@ -19,6 +22,7 @@
 
     /MSG mike Hi, what's up?
     /MSG #irssi I am awesome :)
+    /MSG * Do you want to build a snowman?
 
 %9See also:%9 ACTION, DCC, JOIN
 
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 235a9fc4..8d1ac3eb 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -321,7 +321,7 @@ static void cmd_quit(const char *data)
 	signal_emit("gui exit", 0);
 }
 
-/* SYNTAX: MSG [-<server tag>] [-channel | -nick] <targets> <message> */
+/* SYNTAX: MSG [-<server tag>] [-channel | -nick] *|<targets> <message> */
 static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 {
 	GHashTable *optlist;

From 367d8efc5ffca32ce6a6407fddb5253ed9eab1a4 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 14 Dec 2014 18:21:40 -0300
Subject: [PATCH 0048/1650] Fix blinking/bold text in terminals with no color
 support

Before this, doing "TERM=vt100 irssi" showed all text as bold and
blinking because of a failed check of window->term->TI_colors that
was doing (value & 8) and not expecting a value of 0.

The changed lines themselves look a bit weird, but they make more sense
in the context of the original commit, 96a292d4.
---
 src/fe-text/term-terminfo.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 29d3f7eb..ded79c28 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -390,7 +390,8 @@ void term_set_color(TERM_WINDOW *window, int col)
 	}
 
 	/* set background color */
-	if (window && (term_color256map[bg&0xff]&8) == window->term->TI_colors)
+	if (window && window->term->TI_colors &&
+	    (term_color256map[bg&0xff]&8) == window->term->TI_colors)
 		col |= ATTR_BLINK;
 	if (col & ATTR_BLINK)
 		current_term->set_blink(current_term);
@@ -413,7 +414,8 @@ void term_set_color(TERM_WINDOW *window, int col)
 		terminfo_set_reverse();
 
 	/* bold */
-	if (window && (term_color256map[fg&0xff]&8) == window->term->TI_colors)
+	if (window && window->term->TI_colors &&
+	    (term_color256map[fg&0xff]&8) == window->term->TI_colors)
 		col |= ATTR_BOLD;
 	if (col & ATTR_BOLD)
 		terminfo_set_bold();

From db62ddfd557799981d779914a5e82473a6b22df8 Mon Sep 17 00:00:00 2001
From: David Leadbeater <dgl@dgl.cx>
Date: Tue, 16 Dec 2014 12:14:23 +0000
Subject: [PATCH 0049/1650] Die if the wrong type of node is found when
 traversing config

Fixes issue #187. It's a bit annoying this can't do anything other than
exit, however as there's no schema for the config it's only possible to
validate on use. This level of config can't be accessed from Perl so a
script can't cause Irssi to die (via this method at least).
---
 src/lib-config/get.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/lib-config/get.c b/src/lib-config/get.c
index 2f1e90e1..af02b048 100644
--- a/src/lib-config/get.c
+++ b/src/lib-config/get.c
@@ -109,6 +109,12 @@ CONFIG_NODE *config_node_traverse(CONFIG_REC *rec, const char *section, int crea
 	}
 	g_strfreev(list);
 
+        if (!is_node_list(node)) {
+		/* Will die. Better to not corrupt the config further in this case. */
+		g_error("Attempt to use non-list node as list. Corrupt config?");
+		return NULL;
+	}
+
 	/* save to cache */
         str = g_strdup(section);
 	g_hash_table_insert(rec->cache, str, node);

From dfc65d959e474d1235f894dc3b5631cb7ad48c2c Mon Sep 17 00:00:00 2001
From: "Nico R. Wohlgemuth" <nico@lifeisabug.com>
Date: Tue, 13 Jan 2015 18:44:16 +0100
Subject: [PATCH 0050/1650] Remove splitlong.pl, it is enabled natively (#1)

---
 scripts/Makefile.am  |  1 -
 scripts/splitlong.pl | 60 --------------------------------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 scripts/splitlong.pl

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b3c641b7..23eb7198 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -13,7 +13,6 @@ script_DATA = \
 	quitmsg.pl \
 	sb_search.pl \
 	scriptassist.pl \
-	splitlong.pl \
 	usercount.pl
 
 EXTRA_DIST = $(script_DATA)
diff --git a/scripts/splitlong.pl b/scripts/splitlong.pl
deleted file mode 100644
index e88840bc..00000000
--- a/scripts/splitlong.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-# /set splitlong_max_length
-#   specifies the maximum length of a msg, automatically chosen when set to "0"
-#   default: 0
-#
-# /set splitlong_line_start
-# /set splitlong_line_end
-#   self-explanatory
-#   defaults: "... ", " ..."
-###
-use strict;
-use vars qw($VERSION %IRSSI);
-
-use Irssi 20011001;
-
-$VERSION = "0.20";
-%IRSSI = (
-	authors     => "Bjoern \'fuchs\' Krombholz",
-	contact     => "bjkro\@gmx.de",
-	name        => "splitlong",
-	licence     => "Public Domain",
-	description => "Split overlong PRIVMSGs to msgs with length allowed by ircd",
-	changed     => "Wed Jun 25 00:17:00 CET 2003",
-	changes     => "Actually the real 0.19 (now 0.20), but upload didn't work some month ago, target problem fixed..."
-);
-
-sub sig_command_msg {
-	my ($cmd, $server, $winitem) = @_;
-	my ( $param, $target,$data) = $cmd =~ /^(-\S*\s)?(\S*)\s(.*)/;
-    
-	my $maxlength = Irssi::settings_get_int('splitlong_max_length');
-	my $lstart    = Irssi::settings_get_str('splitlong_line_start');
-	my $lend      = Irssi::settings_get_str('splitlong_line_end');
-
-	if ($maxlength == 0) {
-		# 497 = 510 - length(":" . "!" . " PRIVMSG " . " :");
-		$maxlength = 497 - length($server->{nick} . $server->{userhost} . $target);
-	}
-	my $maxlength2 = $maxlength - length($lend);
-
-	if (length($data) > ($maxlength)) {
-		my @spltarr;
-
-		while (length($data) > ($maxlength2)) {
-			my $pos = rindex($data, " ", $maxlength2);
-			push @spltarr, substr($data, 0, ($pos < ($maxlength/10 + 4)) ? $maxlength2  : $pos)  . $lend;
-			$data = $lstart . substr($data, ($pos < ($maxlength/10 + 4)) ? $maxlength2 : $pos+1);
-		}
-
-		push @spltarr, $data;
-		foreach (@spltarr) {
-			Irssi::signal_emit("command msg", "$target $_", $server, $winitem);
-		}
-		Irssi::signal_stop();
-	}
-}
-
-Irssi::settings_add_int('misc', 'splitlong_max_length', 0);
-Irssi::settings_add_str('misc', 'splitlong_line_start', "... ");
-Irssi::settings_add_str('misc', 'splitlong_line_end', " ...");
-Irssi::command_bind('msg', 'sig_command_msg');

From 4bf9e1f16aa1d41407ece0d61148907eae666783 Mon Sep 17 00:00:00 2001
From: KindOne <lostinwhatever@outlook.com>
Date: Sat, 17 Jan 2015 08:11:10 -0500
Subject: [PATCH 0051/1650] Do not let the ctcp action of an inital query go
 into the status window.

---
 src/fe-common/irc/fe-irc-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index e0849c75..314f4f53 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -179,7 +179,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 		item = irc_channel_find(server, target);
 	} else {
 		own = (!strcmp(nick, server->nick));
-		item = privmsg_get_query(SERVER(server), own ? nick : target, FALSE, level);
+		item = privmsg_get_query(SERVER(server), own ? target : nick, FALSE, level);
 	}
 
 	if (settings_get_bool("emphasis"))

From 7ca9c86445daff6232f8b876b27e7d10f9d5be5c Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 31 Jan 2015 11:49:01 -0300
Subject: [PATCH 0052/1650] /help lastlog: Clarify usage of -<level> parameter

---
 docs/help/in/lastlog.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/help/in/lastlog.in b/docs/help/in/lastlog.in
index e7b90d42..bb3a6fee 100644
--- a/docs/help/in/lastlog.in
+++ b/docs/help/in/lastlog.in
@@ -10,7 +10,7 @@
     -window:    Specifies the window to check.
     -new:       Only displays results since the previous lastlog.
     -away:      Only displays results since you previous away status.
-    -level:     Specifies the levels to check.
+    -<level>:   Specifies the levels to check (e.g. -joins -quits -hilight)
     -clear:     Removes the previous results from the active window.
     -count:     Displays how many lines match.
     -case:      Performs a case-sensitive matching.
@@ -32,6 +32,7 @@
     /LASTLOG holiday
     /LASTLOG 'is on vacation'
     /LASTLOG -file -force ~/mike.log 'mike'
+    /LASTLOG -hilight
 
 %9See also:%9 HILIGHT, SCROLLBACK
 

From a26a909af0cd7e75af4b7fa5a209301455a33c36 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 1 Feb 2015 19:21:59 +0100
Subject: [PATCH 0053/1650] Fix the lastlog help

Correct some confusing inaccuracies and document a parameters that got lost on the rewrite.
---
 docs/help/in/lastlog.in | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/lastlog.in b/docs/help/in/lastlog.in
index bb3a6fee..3815f5d2 100644
--- a/docs/help/in/lastlog.in
+++ b/docs/help/in/lastlog.in
@@ -17,8 +17,11 @@
     -regexp:    The given text pattern is a regular expression.
     -word:      The text must match full words.
     -force:     Forces to display the lastlog, even if it exceeds 1000 lines.
-    -after:     Only displays results after the given line number.
-    -before:    Only displays results before the given line number.
+    -after:     Include this many lines of content after the match.
+    -before:    Include this many lines of content before the match.
+    -<#>:       Include this many lines of content around the match.
+    <count>:    Display a maximum number of `count' lines.
+    <start>:    Skip the last `start' lines.
 
     The pattern to search for and the maximum of lines to display; if no
     parameter is given, the entire window buffer will be displayed.
@@ -30,9 +33,10 @@
 %9Examples:%9
 
     /LASTLOG holiday
-    /LASTLOG 'is on vacation'
+    /LASTLOG 'is on vacation' 10
     /LASTLOG -file -force ~/mike.log 'mike'
     /LASTLOG -hilight
+    /LASTLOG -5 searchterm
 
 %9See also:%9 HILIGHT, SCROLLBACK
 

From 378cab29f42beb75b6168afdc342ce1b2c21fcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Mart=C3=ADn=20B=C3=A1ez=20Echevarr=C3=ADa?=
 <pab_24n@hotmail.com>
Date: Sun, 1 Feb 2015 20:24:05 -0200
Subject: [PATCH 0054/1650] Fix comment in default.theme: msgownnick -> ownnick

---
 default.theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.theme b/default.theme
index ac99356a..6b6aeab8 100644
--- a/default.theme
+++ b/default.theme
@@ -120,7 +120,7 @@ abstracts = {
   # the basic styling of how to print message, $0 = nick mode, $1 = nick
   msgnick = "%K<%n$0$1-%K>%n %|";
 
-  # message from you is printed. "msgownnick" specifies the styling of the
+  # message from you is printed. "ownnick" specifies the styling of the
   # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
   # whole line.
 

From 466166010b751efc622af444e00c33a843c98063 Mon Sep 17 00:00:00 2001
From: Vesa Pirila <vesa@pirila.fi>
Date: Sun, 8 Feb 2015 12:39:23 +0200
Subject: [PATCH 0055/1650] Added a -date parameter to /lastlog to prepend each
 row with the row's date

---
 docs/help/in/lastlog.in |  1 +
 src/fe-text/lastlog.c   | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/lastlog.in b/docs/help/in/lastlog.in
index 3815f5d2..e6f5886a 100644
--- a/docs/help/in/lastlog.in
+++ b/docs/help/in/lastlog.in
@@ -14,6 +14,7 @@
     -clear:     Removes the previous results from the active window.
     -count:     Displays how many lines match.
     -case:      Performs a case-sensitive matching.
+    -date:      Prepends each row with the message's date (YYYY-MM-DD).
     -regexp:    The given text pattern is a regular expression.
     -word:      The text must match full words.
     -force:     Forces to display the lastlog, even if it exceeds 1000 lines.
diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index 417eb484..fe3cf5af 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -74,6 +74,17 @@ int cmd_options_get_level(const char *cmd, GHashTable *optlist)
 	return retlevel;
 }
 
+static void prepend_date(LINE_REC *rec, GString *line)
+{
+	struct tm *tm = localtime(&rec->info.time);
+	char timestamp[12];
+
+	g_snprintf(timestamp, sizeof(timestamp),
+		   "%04d-%02d-%02d ",
+		   tm->tm_year+1900, tm->tm_mon, tm->tm_mday);
+	g_string_prepend(line, timestamp);
+}
+
 static void show_lastlog(const char *searchtext, GHashTable *optlist,
 			 int start, int count, FILE *fhandle)
 {
@@ -82,7 +93,7 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 	GList *list, *tmp;
 	GString *line;
         char *str;
-	int level, before, after, len;
+	int level, before, after, len, date = FALSE;
 
         level = cmd_options_get_level("lastlog", optlist);
 	if (level == -1) return; /* error in options */
@@ -132,6 +143,9 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 			atoi(str) : DEFAULT_LASTLOG_AFTER;
 	}
 
+	if (g_hash_table_lookup(optlist, "date") != NULL)
+		date = TRUE;
+
 	list = textbuffer_find_text(WINDOW_GUI(window)->view->buffer, startline,
 				    level, MSGLEVEL_LASTLOG,
 				    searchtext, before, after,
@@ -199,6 +213,9 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
                         g_string_prepend(line, timestamp);
 		}
 
+		if (date == TRUE)
+			prepend_date(rec, line);
+
                 /* write to file/window */
 		if (fhandle != NULL) {
 			fwrite(line->str, line->len, 1, fhandle);
@@ -223,7 +240,7 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 }
 
 /* SYNTAX: LASTLOG [-] [-file <filename>] [-window <ref#|name>] [-new | -away]
-		   [-<level> -<level...>] [-clear] [-count] [-case]
+		   [-<level> -<level...>] [-clear] [-count] [-case] [-date]
 		   [-regexp | -word] [-before [<#>]] [-after [<#>]]
 		   [-<# before+after>] [<pattern>] [<count> [<start>]] */
 static void cmd_lastlog(const char *data)
@@ -285,7 +302,7 @@ void lastlog_init(void)
 {
 	command_bind("lastlog", NULL, (SIGNAL_FUNC) cmd_lastlog);
 
-	command_set_options("lastlog", "!- # force clear -file -window new away word regexp case count @a @after @before");
+	command_set_options("lastlog", "!- # force clear -file -window new away word regexp case count date @a @after @before");
 }
 
 void lastlog_deinit(void)

From cd5a571fd8aba12b6b8ddbf54e947ac4cc1e516e Mon Sep 17 00:00:00 2001
From: Vesa Pirila <vesa@pirila.fi>
Date: Sun, 8 Feb 2015 16:58:30 +0200
Subject: [PATCH 0056/1650] Added customization possibility for the lastlog
 date format, lastlog_date

---
 docs/help/in/lastlog.in      |  2 +-
 src/fe-text/lastlog.c        | 22 +++++++++++++++-------
 src/fe-text/module-formats.c |  1 +
 src/fe-text/module-formats.h |  1 +
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/help/in/lastlog.in b/docs/help/in/lastlog.in
index e6f5886a..25879d31 100644
--- a/docs/help/in/lastlog.in
+++ b/docs/help/in/lastlog.in
@@ -14,7 +14,7 @@
     -clear:     Removes the previous results from the active window.
     -count:     Displays how many lines match.
     -case:      Performs a case-sensitive matching.
-    -date:      Prepends each row with the message's date (YYYY-MM-DD).
+    -date:      Prepends each row with the message's date
     -regexp:    The given text pattern is a regular expression.
     -word:      The text must match full words.
     -force:     Forces to display the lastlog, even if it exceeds 1000 lines.
diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index fe3cf5af..3c700d76 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -74,15 +74,23 @@ int cmd_options_get_level(const char *cmd, GHashTable *optlist)
 	return retlevel;
 }
 
-static void prepend_date(LINE_REC *rec, GString *line)
+static void prepend_date(WINDOW_REC *window, LINE_REC *rec, GString *line)
 {
+        THEME_REC *theme = NULL;
+        TEXT_DEST_REC dest = {0};
+        char *format = NULL, datestamp[20] = {0};
 	struct tm *tm = localtime(&rec->info.time);
-	char timestamp[12];
+	int ret = 0;
 
-	g_snprintf(timestamp, sizeof(timestamp),
-		   "%04d-%02d-%02d ",
-		   tm->tm_year+1900, tm->tm_mon, tm->tm_mday);
-	g_string_prepend(line, timestamp);
+        theme = window->theme != NULL ? window->theme : current_theme;
+        format_create_dest(&dest, NULL, NULL, MSGLEVEL_LASTLOG, window);
+        format = format_get_text_theme(theme, MODULE_NAME, &dest, TXT_LASTLOG_DATE);
+ 
+	ret = strftime(datestamp, sizeof(datestamp), format, tm);
+        g_free(format);
+        if (ret <= 0) return;
+
+	g_string_prepend(line, datestamp);
 }
 
 static void show_lastlog(const char *searchtext, GHashTable *optlist,
@@ -214,7 +222,7 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 		}
 
 		if (date == TRUE)
-			prepend_date(rec, line);
+			prepend_date(window, rec, line);
 
                 /* write to file/window */
 		if (fhandle != NULL) {
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index 1d905095..899827c2 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -33,6 +33,7 @@ FORMAT_REC gui_text_formats[] =
 	{ "lastlog_start", "{hilight Lastlog}:", 0 },
 	{ "lastlog_end", "{hilight End of Lastlog}", 0 },
 	{ "lastlog_separator", "--", 0 },
+	{ "lastlog_date", "%%F ", 0 },
 
 	/* ---- */
 	{ NULL, "Windows", 0 },
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index 4eebfc3e..3fa8c511 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -10,6 +10,7 @@ enum {
 	TXT_LASTLOG_START,
 	TXT_LASTLOG_END,
 	TXT_LASTLOG_SEPARATOR,
+	TXT_LASTLOG_DATE,
 
 	TXT_FILL_2,
 

From b4b4ebfadfb580b76e2a2aee301ae7a61dde775e Mon Sep 17 00:00:00 2001
From: mauke <l.mai@web.de>
Date: Sun, 8 Feb 2015 22:16:01 +0100
Subject: [PATCH 0057/1650] accept freenode extbans in /ban [#150]

---
 src/irc/core/bans.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index d8d5d448..38c81aab 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -88,7 +88,7 @@ char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks, int ban_type)
 	str = g_string_new(NULL);
 	banlist = g_strsplit(nicks, " ", -1);
 	for (ban = banlist; *ban != NULL; ban++) {
-		if (strchr(*ban, '!') != NULL) {
+		if (**ban == '$' || strchr(*ban, '!') != NULL) {
 			/* explicit ban */
 			g_string_append_printf(str, "%s ", *ban);
 			continue;

From dee7825f05e0e558020fabe2e536e2b5d4df8050 Mon Sep 17 00:00:00 2001
From: Alexandre Morignot <erdnaxeli@cervoi.se>
Date: Tue, 10 Feb 2015 16:37:41 +0100
Subject: [PATCH 0058/1650] handle an already used nick different from the one
 we send

---
 src/irc/core/irc-nicklist.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 5438509e..a006a3cb 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -343,7 +343,7 @@ static void event_nick_invalid(IRC_SERVER_REC *server, const char *data)
 
 static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
 {
-	char *str, *cmd;
+	char *str, *cmd, *params, *nick;
 	int n;
 
 	g_return_if_fail(data != NULL);
@@ -353,6 +353,14 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
 		return;
 	}
 
+	params = event_get_params(data, 2, NULL, &nick);
+	if (g_ascii_strcasecmp(server->nick, nick) != 0) {
+		/* the server uses a nick different from the one we send */
+		g_free(server->nick);
+		server->nick = g_strdup(nick);
+	}
+	g_free(params);
+
 	/* nick already in use - need to change it .. */
 	if (g_ascii_strcasecmp(server->nick, server->connrec->nick) == 0 &&
 	    server->connrec->alternate_nick != NULL &&

From 895ac10c4eaa347cf2dbe184fc9480a8f47168ee Mon Sep 17 00:00:00 2001
From: Vesa Pirila <vesa@pirila.fi>
Date: Mon, 16 Feb 2015 09:49:22 +0200
Subject: [PATCH 0059/1650] lastlog.c is a mix of tab and space indentation. My
 changes now use tabs.

---
 src/fe-text/lastlog.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index 3c700d76..166d2847 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -76,19 +76,19 @@ int cmd_options_get_level(const char *cmd, GHashTable *optlist)
 
 static void prepend_date(WINDOW_REC *window, LINE_REC *rec, GString *line)
 {
-        THEME_REC *theme = NULL;
-        TEXT_DEST_REC dest = {0};
-        char *format = NULL, datestamp[20] = {0};
+	THEME_REC *theme = NULL;
+	TEXT_DEST_REC dest = {0};
+	char *format = NULL, datestamp[20] = {0};
 	struct tm *tm = localtime(&rec->info.time);
 	int ret = 0;
 
-        theme = window->theme != NULL ? window->theme : current_theme;
-        format_create_dest(&dest, NULL, NULL, MSGLEVEL_LASTLOG, window);
-        format = format_get_text_theme(theme, MODULE_NAME, &dest, TXT_LASTLOG_DATE);
+	theme = window->theme != NULL ? window->theme : current_theme;
+	format_create_dest(&dest, NULL, NULL, MSGLEVEL_LASTLOG, window);
+	format = format_get_text_theme(theme, MODULE_NAME, &dest, TXT_LASTLOG_DATE);
  
 	ret = strftime(datestamp, sizeof(datestamp), format, tm);
-        g_free(format);
-        if (ret <= 0) return;
+	g_free(format);
+	if (ret <= 0) return;
 
 	g_string_prepend(line, datestamp);
 }

From 8e8bc5fdbc4894e87a195caee83c551a0e983275 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 20 Dec 2014 19:46:12 -0300
Subject: [PATCH 0060/1650] Silence unused value warnings in perl binding code

sed -i 's/hv_store/(void) &/'

This only results in a warning in older gcc versions, but that includes
the one used in the Travis CI environment by default
---
 src/perl/common/Core.xs      |   2 +-
 src/perl/irc/Irc.xs          | 128 +++++++++----------
 src/perl/perl-common.c       | 230 +++++++++++++++++------------------
 src/perl/textui/Statusbar.xs |   4 +-
 src/perl/textui/TextUI.xs    |  66 +++++-----
 src/perl/ui/UI.xs            |  64 +++++-----
 6 files changed, 247 insertions(+), 247 deletions(-)

diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index bfe2efde..5d2f7bca 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -63,7 +63,7 @@ static void add_tuple(gpointer key_, gpointer value_, gpointer user_data)
 	HV *hash = user_data;
 	char *key = key_;
 	char *value = value_;
-	hv_store(hash, key, strlen(key), new_pv(value), 0);
+	(void) hv_store(hash, key, strlen(key), new_pv(value), 0);
 }
 
 static void wrap_signal_emit(void *signal, void **p) {
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 22a87384..18665cb7 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -6,90 +6,90 @@ static int initialized = FALSE;
 static void perl_irc_connect_fill_hash(HV *hv, IRC_SERVER_CONNECT_REC *conn)
 {
 	perl_connect_fill_hash(hv, (SERVER_CONNECT_REC *) conn);
-	hv_store(hv, "alternate_nick", 14, new_pv(conn->alternate_nick), 0);
+	(void) hv_store(hv, "alternate_nick", 14, new_pv(conn->alternate_nick), 0);
 }
 
 static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 {
        	perl_server_fill_hash(hv, (SERVER_REC *) server);
 
-       	hv_store(hv, "real_address", 12, new_pv(server->real_address), 0);
-       	hv_store(hv, "usermode", 8, new_pv(server->usermode), 0);
-       	hv_store(hv, "userhost", 8, new_pv(server->userhost), 0);
+       	(void) hv_store(hv, "real_address", 12, new_pv(server->real_address), 0);
+       	(void) hv_store(hv, "usermode", 8, new_pv(server->usermode), 0);
+       	(void) hv_store(hv, "userhost", 8, new_pv(server->userhost), 0);
 
-	hv_store(hv, "max_cmds_at_once", 16, newSViv(server->max_cmds_at_once), 0);
-	hv_store(hv, "cmd_queue_speed", 15, newSViv(server->cmd_queue_speed), 0);
-	hv_store(hv, "max_query_chans", 15, newSViv(server->max_query_chans), 0);
+	(void) hv_store(hv, "max_cmds_at_once", 16, newSViv(server->max_cmds_at_once), 0);
+	(void) hv_store(hv, "cmd_queue_speed", 15, newSViv(server->cmd_queue_speed), 0);
+	(void) hv_store(hv, "max_query_chans", 15, newSViv(server->max_query_chans), 0);
 
-	hv_store(hv, "max_kicks_in_cmd", 16, newSViv(server->max_kicks_in_cmd), 0);
-	hv_store(hv, "max_msgs_in_cmd", 15, newSViv(server->max_msgs_in_cmd), 0);
-	hv_store(hv, "max_modes_in_cmd", 16, newSViv(server->max_modes_in_cmd), 0);
-	hv_store(hv, "max_whois_in_cmd", 16, newSViv(server->max_whois_in_cmd), 0);
-	hv_store(hv, "isupport_sent", 13, newSViv(server->isupport_sent), 0);
+	(void) hv_store(hv, "max_kicks_in_cmd", 16, newSViv(server->max_kicks_in_cmd), 0);
+	(void) hv_store(hv, "max_msgs_in_cmd", 15, newSViv(server->max_msgs_in_cmd), 0);
+	(void) hv_store(hv, "max_modes_in_cmd", 16, newSViv(server->max_modes_in_cmd), 0);
+	(void) hv_store(hv, "max_whois_in_cmd", 16, newSViv(server->max_whois_in_cmd), 0);
+	(void) hv_store(hv, "isupport_sent", 13, newSViv(server->isupport_sent), 0);
 }
 
 static void perl_ban_fill_hash(HV *hv, BAN_REC *ban)
 {
-	hv_store(hv, "ban", 3, new_pv(ban->ban), 0);
-	hv_store(hv, "setby", 5, new_pv(ban->setby), 0);
-	hv_store(hv, "time", 4, newSViv(ban->time), 0);
+	(void) hv_store(hv, "ban", 3, new_pv(ban->ban), 0);
+	(void) hv_store(hv, "setby", 5, new_pv(ban->setby), 0);
+	(void) hv_store(hv, "time", 4, newSViv(ban->time), 0);
 }
 
 static void perl_dcc_fill_hash(HV *hv, DCC_REC *dcc)
 {
-	hv_store(hv, "type", 4, new_pv(dcc_type2str(dcc->type)), 0);
-	hv_store(hv, "orig_type", 9, new_pv(dcc_type2str(dcc->orig_type)), 0);
-	hv_store(hv, "created", 7, newSViv(dcc->created), 0);
+	(void) hv_store(hv, "type", 4, new_pv(dcc_type2str(dcc->type)), 0);
+	(void) hv_store(hv, "orig_type", 9, new_pv(dcc_type2str(dcc->orig_type)), 0);
+	(void) hv_store(hv, "created", 7, newSViv(dcc->created), 0);
 
-	hv_store(hv, "server", 6, iobject_bless(dcc->server), 0);
-	hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0);
-	hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0);
-	hv_store(hv, "nick", 4, new_pv(dcc->nick), 0);
+	(void) hv_store(hv, "server", 6, iobject_bless(dcc->server), 0);
+	(void) hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0);
+	(void) hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0);
+	(void) hv_store(hv, "nick", 4, new_pv(dcc->nick), 0);
 
-	hv_store(hv, "chat", 4, simple_iobject_bless(dcc->chat), 0);
-	hv_store(hv, "target", 6, new_pv(dcc->target), 0);
-	hv_store(hv, "arg", 3, new_pv(dcc->arg), 0);
+	(void) hv_store(hv, "chat", 4, simple_iobject_bless(dcc->chat), 0);
+	(void) hv_store(hv, "target", 6, new_pv(dcc->target), 0);
+	(void) hv_store(hv, "arg", 3, new_pv(dcc->arg), 0);
 
-	hv_store(hv, "addr", 4, new_pv(dcc->addrstr), 0);
-	hv_store(hv, "port", 4, newSViv(dcc->port), 0);
+	(void) hv_store(hv, "addr", 4, new_pv(dcc->addrstr), 0);
+	(void) hv_store(hv, "port", 4, newSViv(dcc->port), 0);
 
-	hv_store(hv, "starttime", 9, newSViv(dcc->starttime), 0);
-	hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0);
+	(void) hv_store(hv, "starttime", 9, newSViv(dcc->starttime), 0);
+	(void) hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0);
 }
 
 static void perl_dcc_chat_fill_hash(HV *hv, CHAT_DCC_REC *dcc)
 {
         perl_dcc_fill_hash(hv, (DCC_REC *) dcc);
 
-	hv_store(hv, "id", 2, new_pv(dcc->id), 0);
-	hv_store(hv, "mirc_ctcp", 9, newSViv(dcc->mirc_ctcp), 0);
-	hv_store(hv, "connection_lost", 15, newSViv(dcc->connection_lost), 0);
+	(void) hv_store(hv, "id", 2, new_pv(dcc->id), 0);
+	(void) hv_store(hv, "mirc_ctcp", 9, newSViv(dcc->mirc_ctcp), 0);
+	(void) hv_store(hv, "connection_lost", 15, newSViv(dcc->connection_lost), 0);
 }
 
 static void perl_dcc_file_fill_hash(HV *hv, FILE_DCC_REC *dcc)
 {
         perl_dcc_fill_hash(hv, (DCC_REC *) dcc);
 
-	hv_store(hv, "size", 4, newSViv(dcc->size), 0);
-	hv_store(hv, "skipped", 7, newSViv(dcc->skipped), 0);
+	(void) hv_store(hv, "size", 4, newSViv(dcc->size), 0);
+	(void) hv_store(hv, "skipped", 7, newSViv(dcc->skipped), 0);
 }
 
 static void perl_dcc_get_fill_hash(HV *hv, GET_DCC_REC *dcc)
 {
         perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc);
 
-	hv_store(hv, "get_type", 8, newSViv(dcc->get_type), 0);
-	hv_store(hv, "file", 4, new_pv(dcc->file), 0);
-	hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
+	(void) hv_store(hv, "get_type", 8, newSViv(dcc->get_type), 0);
+	(void) hv_store(hv, "file", 4, new_pv(dcc->file), 0);
+	(void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
 }
 
 static void perl_dcc_send_fill_hash(HV *hv, SEND_DCC_REC *dcc)
 {
         perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc);
 
-	hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
-	hv_store(hv, "waitforend", 10, newSViv(dcc->waitforend), 0);
-	hv_store(hv, "gotalldata", 10, newSViv(dcc->gotalldata), 0);
+	(void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
+	(void) hv_store(hv, "waitforend", 10, newSViv(dcc->waitforend), 0);
+	(void) hv_store(hv, "gotalldata", 10, newSViv(dcc->gotalldata), 0);
 }
 
 static void perl_netsplit_fill_hash(HV *hv, NETSPLIT_REC *netsplit)
@@ -97,11 +97,11 @@ static void perl_netsplit_fill_hash(HV *hv, NETSPLIT_REC *netsplit)
         AV *av;
         GSList *tmp;
 
-	hv_store(hv, "nick", 4, new_pv(netsplit->nick), 0);
-	hv_store(hv, "address", 7, new_pv(netsplit->address), 0);
-	hv_store(hv, "destroy", 7, newSViv(netsplit->destroy), 0);
+	(void) hv_store(hv, "nick", 4, new_pv(netsplit->nick), 0);
+	(void) hv_store(hv, "address", 7, new_pv(netsplit->address), 0);
+	(void) hv_store(hv, "destroy", 7, newSViv(netsplit->destroy), 0);
 
-	hv_store(hv, "server", 6,
+	(void) hv_store(hv, "server", 6,
 		 plain_bless(netsplit->server,
 			     "Irssi::Irc::Netsplitserver"), 0);
 
@@ -110,22 +110,22 @@ static void perl_netsplit_fill_hash(HV *hv, NETSPLIT_REC *netsplit)
 		av_push(av, plain_bless(tmp->data,
 					"Irssi::Irc::Netsplitchannel"));
 	}
-	hv_store(hv, "channels", 8, newRV_noinc((SV*)av), 0);
+	(void) hv_store(hv, "channels", 8, newRV_noinc((SV*)av), 0);
 }
 
 static void perl_netsplit_server_fill_hash(HV *hv, NETSPLIT_SERVER_REC *rec)
 {
-	hv_store(hv, "server", 6, new_pv(rec->server), 0);
-	hv_store(hv, "destserver", 10, new_pv(rec->destserver), 0);
-	hv_store(hv, "count", 5, newSViv(rec->count), 0);
+	(void) hv_store(hv, "server", 6, new_pv(rec->server), 0);
+	(void) hv_store(hv, "destserver", 10, new_pv(rec->destserver), 0);
+	(void) hv_store(hv, "count", 5, newSViv(rec->count), 0);
 }
 
 static void perl_netsplit_channel_fill_hash(HV *hv, NETSPLIT_CHAN_REC *rec)
 {
-	hv_store(hv, "name", 4, new_pv(rec->name), 0);
-	hv_store(hv, "op", 2, newSViv(rec->op), 0);
-	hv_store(hv, "halfop", 6, newSViv(rec->halfop), 0);
-	hv_store(hv, "voice", 5, newSViv(rec->voice), 0);
+	(void) hv_store(hv, "name", 4, new_pv(rec->name), 0);
+	(void) hv_store(hv, "op", 2, newSViv(rec->op), 0);
+	(void) hv_store(hv, "halfop", 6, newSViv(rec->halfop), 0);
+	(void) hv_store(hv, "voice", 5, newSViv(rec->voice), 0);
 }
 
 static void perl_notifylist_fill_hash(HV *hv, NOTIFYLIST_REC *notify)
@@ -133,8 +133,8 @@ static void perl_notifylist_fill_hash(HV *hv, NOTIFYLIST_REC *notify)
 	AV *av;
 	char **tmp;
 
-	hv_store(hv, "mask", 4, new_pv(notify->mask), 0);
-	hv_store(hv, "away_check", 10, newSViv(notify->away_check), 0);
+	(void) hv_store(hv, "mask", 4, new_pv(notify->mask), 0);
+	(void) hv_store(hv, "away_check", 10, newSViv(notify->away_check), 0);
 
 	av = newAV();
 	if (notify->ircnets != NULL) {
@@ -142,20 +142,20 @@ static void perl_notifylist_fill_hash(HV *hv, NOTIFYLIST_REC *notify)
 			av_push(av, new_pv(*tmp));
 		}
 	}
-	hv_store(hv, "ircnets", 7, newRV_noinc((SV*)av), 0);
+	(void) hv_store(hv, "ircnets", 7, newRV_noinc((SV*)av), 0);
 }
 
 static void perl_client_fill_hash(HV *hv, CLIENT_REC *client)
 {
-	hv_store(hv, "nick", 4, new_pv(client->nick), 0);
-	hv_store(hv, "host", 4, new_pv(client->host), 0);
-	hv_store(hv, "proxy_address", 13, new_pv(client->proxy_address), 0);
-	hv_store(hv, "server", 6, iobject_bless(client->server), 0);
-	hv_store(hv, "pass_sent", 9, newSViv(client->pass_sent), 0);
-	hv_store(hv, "user_sent", 9, newSViv(client->user_sent), 0);
-	hv_store(hv, "connected", 9, newSViv(client->connected), 0);
-	hv_store(hv, "want_ctcp", 9, newSViv(client->want_ctcp), 0);
-	hv_store(hv, "ircnet", 6, new_pv(client->listen->ircnet), 0);
+	(void) hv_store(hv, "nick", 4, new_pv(client->nick), 0);
+	(void) hv_store(hv, "host", 4, new_pv(client->host), 0);
+	(void) hv_store(hv, "proxy_address", 13, new_pv(client->proxy_address), 0);
+	(void) hv_store(hv, "server", 6, iobject_bless(client->server), 0);
+	(void) hv_store(hv, "pass_sent", 9, newSViv(client->pass_sent), 0);
+	(void) hv_store(hv, "user_sent", 9, newSViv(client->user_sent), 0);
+	(void) hv_store(hv, "connected", 9, newSViv(client->connected), 0);
+	(void) hv_store(hv, "want_ctcp", 9, newSViv(client->want_ctcp), 0);
+	(void) hv_store(hv, "ircnet", 6, new_pv(client->listen->ircnet), 0);
 }
 
 static PLAIN_OBJECT_INIT_REC irc_plains[] = {
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 0a8a5d92..dcda3bb5 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -135,7 +135,7 @@ SV *irssi_bless_iobject(int type, int chat_type, void *object)
 	stash = gv_stashpv(rec->stash, 1);
 
 	hv = newHV();
-	hv_store(hv, "_irssi", 6, create_sv_ptr(object), 0);
+	(void) hv_store(hv, "_irssi", 6, create_sv_ptr(object), 0);
         rec->fill_func(hv, object);
 	return sv_bless(newRV_noinc((SV*)hv), stash);
 }
@@ -148,7 +148,7 @@ SV *irssi_bless_plain(const char *stash, void *object)
 	fill_func = g_hash_table_lookup(plain_stashes, stash);
 
 	hv = newHV();
-	hv_store(hv, "_irssi", 6, create_sv_ptr(object), 0);
+	(void) hv_store(hv, "_irssi", 6, create_sv_ptr(object), 0);
 	if (fill_func != NULL)
 		fill_func(hv, object);
 	return sv_bless(newRV_noinc((SV*)hv), gv_stashpv((char *)stash, 1));
@@ -264,17 +264,17 @@ void perl_chatnet_fill_hash(HV *hv, CHATNET_REC *chatnet)
 	type = "CHATNET";
 	chat_type = (char *) chat_protocol_find_id(chatnet->chat_type)->name;
 
-	hv_store(hv, "type", 4, new_pv(type), 0);
-	hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
+	(void) hv_store(hv, "type", 4, new_pv(type), 0);
+	(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
 
-	hv_store(hv, "name", 4, new_pv(chatnet->name), 0);
+	(void) hv_store(hv, "name", 4, new_pv(chatnet->name), 0);
 
-	hv_store(hv, "nick", 4, new_pv(chatnet->nick), 0);
-	hv_store(hv, "username", 8, new_pv(chatnet->username), 0);
-	hv_store(hv, "realname", 8, new_pv(chatnet->realname), 0);
+	(void) hv_store(hv, "nick", 4, new_pv(chatnet->nick), 0);
+	(void) hv_store(hv, "username", 8, new_pv(chatnet->username), 0);
+	(void) hv_store(hv, "realname", 8, new_pv(chatnet->realname), 0);
 
-	hv_store(hv, "own_host", 8, new_pv(chatnet->own_host), 0);
-	hv_store(hv, "autosendcmd", 11, new_pv(chatnet->autosendcmd), 0);
+	(void) hv_store(hv, "own_host", 8, new_pv(chatnet->own_host), 0);
+	(void) hv_store(hv, "autosendcmd", 11, new_pv(chatnet->autosendcmd), 0);
 }
 
 void perl_connect_fill_hash(HV *hv, SERVER_CONNECT_REC *conn)
@@ -287,25 +287,25 @@ void perl_connect_fill_hash(HV *hv, SERVER_CONNECT_REC *conn)
 	type = "SERVER CONNECT";
 	chat_type = (char *) chat_protocol_find_id(conn->chat_type)->name;
 
-	hv_store(hv, "type", 4, new_pv(type), 0);
-	hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
+	(void) hv_store(hv, "type", 4, new_pv(type), 0);
+	(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
 
-	hv_store(hv, "tag", 3, new_pv(conn->tag), 0);
-	hv_store(hv, "address", 7, new_pv(conn->address), 0);
-	hv_store(hv, "port", 4, newSViv(conn->port), 0);
-	hv_store(hv, "chatnet", 7, new_pv(conn->chatnet), 0);
+	(void) hv_store(hv, "tag", 3, new_pv(conn->tag), 0);
+	(void) hv_store(hv, "address", 7, new_pv(conn->address), 0);
+	(void) hv_store(hv, "port", 4, newSViv(conn->port), 0);
+	(void) hv_store(hv, "chatnet", 7, new_pv(conn->chatnet), 0);
 
-	hv_store(hv, "password", 8, new_pv(conn->password), 0);
-	hv_store(hv, "wanted_nick", 11, new_pv(conn->nick), 0);
-	hv_store(hv, "username", 8, new_pv(conn->username), 0);
-	hv_store(hv, "realname", 8, new_pv(conn->realname), 0);
+	(void) hv_store(hv, "password", 8, new_pv(conn->password), 0);
+	(void) hv_store(hv, "wanted_nick", 11, new_pv(conn->nick), 0);
+	(void) hv_store(hv, "username", 8, new_pv(conn->username), 0);
+	(void) hv_store(hv, "realname", 8, new_pv(conn->realname), 0);
 
-	hv_store(hv, "reconnection", 12, newSViv(conn->reconnection), 0);
-	hv_store(hv, "no_autojoin_channels", 20, newSViv(conn->no_autojoin_channels), 0);
-	hv_store(hv, "no_autosendcmd", 14, newSViv(conn->no_autosendcmd), 0);
-	hv_store(hv, "unix_socket", 11, newSViv(conn->unix_socket), 0);
-	hv_store(hv, "use_ssl", 7, newSViv(conn->use_ssl), 0);
-	hv_store(hv, "no_connect", 10, newSViv(conn->no_connect), 0);
+	(void) hv_store(hv, "reconnection", 12, newSViv(conn->reconnection), 0);
+	(void) hv_store(hv, "no_autojoin_channels", 20, newSViv(conn->no_autojoin_channels), 0);
+	(void) hv_store(hv, "no_autosendcmd", 14, newSViv(conn->no_autosendcmd), 0);
+	(void) hv_store(hv, "unix_socket", 11, newSViv(conn->unix_socket), 0);
+	(void) hv_store(hv, "use_ssl", 7, newSViv(conn->use_ssl), 0);
+	(void) hv_store(hv, "no_connect", 10, newSViv(conn->no_connect), 0);
 }
 
 void perl_server_fill_hash(HV *hv, SERVER_REC *server)
@@ -319,28 +319,28 @@ void perl_server_fill_hash(HV *hv, SERVER_REC *server)
 	perl_connect_fill_hash(hv, server->connrec);
 
 	type = "SERVER";
-	hv_store(hv, "type", 4, new_pv(type), 0);
+	(void) hv_store(hv, "type", 4, new_pv(type), 0);
 
-	hv_store(hv, "connect_time", 12, newSViv(server->connect_time), 0);
-	hv_store(hv, "real_connect_time", 17, newSViv(server->real_connect_time), 0);
+	(void) hv_store(hv, "connect_time", 12, newSViv(server->connect_time), 0);
+	(void) hv_store(hv, "real_connect_time", 17, newSViv(server->real_connect_time), 0);
 
-	hv_store(hv, "tag", 3, new_pv(server->tag), 0);
-	hv_store(hv, "nick", 4, new_pv(server->nick), 0);
+	(void) hv_store(hv, "tag", 3, new_pv(server->tag), 0);
+	(void) hv_store(hv, "nick", 4, new_pv(server->nick), 0);
 
-	hv_store(hv, "connected", 9, newSViv(server->connected), 0);
-	hv_store(hv, "connection_lost", 15, newSViv(server->connection_lost), 0);
+	(void) hv_store(hv, "connected", 9, newSViv(server->connected), 0);
+	(void) hv_store(hv, "connection_lost", 15, newSViv(server->connection_lost), 0);
 
 	stash = gv_stashpv("Irssi::Rawlog", 0);
-	hv_store(hv, "rawlog", 6, sv_bless(newRV_noinc(newSViv((IV)server->rawlog)), stash), 0);
+	(void) hv_store(hv, "rawlog", 6, sv_bless(newRV_noinc(newSViv((IV)server->rawlog)), stash), 0);
 
-	hv_store(hv, "version", 7, new_pv(server->version), 0);
-	hv_store(hv, "away_reason", 11, new_pv(server->away_reason), 0);
-	hv_store(hv, "last_invite", 11, new_pv(server->last_invite), 0);
-	hv_store(hv, "server_operator", 15, newSViv(server->server_operator), 0);
-	hv_store(hv, "usermode_away", 13, newSViv(server->usermode_away), 0);
-	hv_store(hv, "banned", 6, newSViv(server->banned), 0);
+	(void) hv_store(hv, "version", 7, new_pv(server->version), 0);
+	(void) hv_store(hv, "away_reason", 11, new_pv(server->away_reason), 0);
+	(void) hv_store(hv, "last_invite", 11, new_pv(server->last_invite), 0);
+	(void) hv_store(hv, "server_operator", 15, newSViv(server->server_operator), 0);
+	(void) hv_store(hv, "usermode_away", 13, newSViv(server->usermode_away), 0);
+	(void) hv_store(hv, "banned", 6, newSViv(server->banned), 0);
 
-	hv_store(hv, "lag", 3, newSViv(server->lag), 0);
+	(void) hv_store(hv, "lag", 3, newSViv(server->lag), 0);
 }
 
 void perl_window_item_fill_hash(HV *hv, WI_ITEM_REC *item)
@@ -353,17 +353,17 @@ void perl_window_item_fill_hash(HV *hv, WI_ITEM_REC *item)
 	type = (char *) module_find_id_str("WINDOW ITEM TYPE", item->type);
 	chat_type = (char *) chat_protocol_find_id(item->chat_type)->name;
 
-	hv_store(hv, "type", 4, new_pv(type), 0);
-	hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
+	(void) hv_store(hv, "type", 4, new_pv(type), 0);
+	(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
 
 	if (item->server != NULL) {
-		hv_store(hv, "server", 6, iobject_bless(item->server), 0);
+		(void) hv_store(hv, "server", 6, iobject_bless(item->server), 0);
 	}
-	hv_store(hv, "visible_name", 12, new_pv(item->visible_name), 0);
+	(void) hv_store(hv, "visible_name", 12, new_pv(item->visible_name), 0);
 
-	hv_store(hv, "createtime", 10, newSViv(item->createtime), 0);
-	hv_store(hv, "data_level", 10, newSViv(item->data_level), 0);
-	hv_store(hv, "hilight_color", 13, new_pv(item->hilight_color), 0);
+	(void) hv_store(hv, "createtime", 10, newSViv(item->createtime), 0);
+	(void) hv_store(hv, "data_level", 10, newSViv(item->data_level), 0);
+	(void) hv_store(hv, "hilight_color", 13, new_pv(item->hilight_color), 0);
 }
 
 void perl_channel_fill_hash(HV *hv, CHANNEL_REC *channel)
@@ -374,26 +374,26 @@ void perl_channel_fill_hash(HV *hv, CHANNEL_REC *channel)
 	perl_window_item_fill_hash(hv, (WI_ITEM_REC *) channel);
 
         if (channel->ownnick != NULL)
-		hv_store(hv, "ownnick", 7, iobject_bless(channel->ownnick), 0);
+		(void) hv_store(hv, "ownnick", 7, iobject_bless(channel->ownnick), 0);
 
-	hv_store(hv, "name", 4, new_pv(channel->name), 0);
-	hv_store(hv, "topic", 5, new_pv(channel->topic), 0);
-	hv_store(hv, "topic_by", 8, new_pv(channel->topic_by), 0);
-	hv_store(hv, "topic_time", 10, newSViv(channel->topic_time), 0);
+	(void) hv_store(hv, "name", 4, new_pv(channel->name), 0);
+	(void) hv_store(hv, "topic", 5, new_pv(channel->topic), 0);
+	(void) hv_store(hv, "topic_by", 8, new_pv(channel->topic_by), 0);
+	(void) hv_store(hv, "topic_time", 10, newSViv(channel->topic_time), 0);
 
-	hv_store(hv, "no_modes", 8, newSViv(channel->no_modes), 0);
-	hv_store(hv, "mode", 4, new_pv(channel->mode), 0);
-	hv_store(hv, "limit", 5, newSViv(channel->limit), 0);
-	hv_store(hv, "key", 3, new_pv(channel->key), 0);
+	(void) hv_store(hv, "no_modes", 8, newSViv(channel->no_modes), 0);
+	(void) hv_store(hv, "mode", 4, new_pv(channel->mode), 0);
+	(void) hv_store(hv, "limit", 5, newSViv(channel->limit), 0);
+	(void) hv_store(hv, "key", 3, new_pv(channel->key), 0);
 
-	hv_store(hv, "chanop", 6, newSViv(channel->chanop), 0);
-	hv_store(hv, "names_got", 9, newSViv(channel->names_got), 0);
-	hv_store(hv, "wholist", 7, newSViv(channel->wholist), 0);
-	hv_store(hv, "synced", 6, newSViv(channel->synced), 0);
+	(void) hv_store(hv, "chanop", 6, newSViv(channel->chanop), 0);
+	(void) hv_store(hv, "names_got", 9, newSViv(channel->names_got), 0);
+	(void) hv_store(hv, "wholist", 7, newSViv(channel->wholist), 0);
+	(void) hv_store(hv, "synced", 6, newSViv(channel->synced), 0);
 
-	hv_store(hv, "joined", 6, newSViv(channel->joined), 0);
-	hv_store(hv, "left", 4, newSViv(channel->left), 0);
-	hv_store(hv, "kicked", 6, newSViv(channel->kicked), 0);
+	(void) hv_store(hv, "joined", 6, newSViv(channel->joined), 0);
+	(void) hv_store(hv, "left", 4, newSViv(channel->left), 0);
+	(void) hv_store(hv, "kicked", 6, newSViv(channel->kicked), 0);
 }
 
 void perl_query_fill_hash(HV *hv, QUERY_REC *query)
@@ -403,11 +403,11 @@ void perl_query_fill_hash(HV *hv, QUERY_REC *query)
 
 	perl_window_item_fill_hash(hv, (WI_ITEM_REC *) query);
 
-	hv_store(hv, "name", 4, new_pv(query->name), 0);
-	hv_store(hv, "last_unread_msg", 15, newSViv(query->last_unread_msg), 0);
-	hv_store(hv, "address", 7, new_pv(query->address), 0);
-	hv_store(hv, "server_tag", 10, new_pv(query->server_tag), 0);
-	hv_store(hv, "unwanted", 8, newSViv(query->unwanted), 0);
+	(void) hv_store(hv, "name", 4, new_pv(query->name), 0);
+	(void) hv_store(hv, "last_unread_msg", 15, newSViv(query->last_unread_msg), 0);
+	(void) hv_store(hv, "address", 7, new_pv(query->address), 0);
+	(void) hv_store(hv, "server_tag", 10, new_pv(query->server_tag), 0);
+	(void) hv_store(hv, "unwanted", 8, newSViv(query->unwanted), 0);
 }
 
 void perl_nick_fill_hash(HV *hv, NICK_REC *nick)
@@ -420,31 +420,31 @@ void perl_nick_fill_hash(HV *hv, NICK_REC *nick)
 	type = "NICK";
 	chat_type = (char *) chat_protocol_find_id(nick->chat_type)->name;
 
-	hv_store(hv, "type", 4, new_pv(type), 0);
-	hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
+	(void) hv_store(hv, "type", 4, new_pv(type), 0);
+	(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
 
-	hv_store(hv, "nick", 4, new_pv(nick->nick), 0);
-	hv_store(hv, "host", 4, new_pv(nick->host), 0);
-	hv_store(hv, "realname", 8, new_pv(nick->realname), 0);
-	hv_store(hv, "hops", 4, newSViv(nick->hops), 0);
+	(void) hv_store(hv, "nick", 4, new_pv(nick->nick), 0);
+	(void) hv_store(hv, "host", 4, new_pv(nick->host), 0);
+	(void) hv_store(hv, "realname", 8, new_pv(nick->realname), 0);
+	(void) hv_store(hv, "hops", 4, newSViv(nick->hops), 0);
 
-	hv_store(hv, "gone", 4, newSViv(nick->gone), 0);
-	hv_store(hv, "serverop", 8, newSViv(nick->serverop), 0);
+	(void) hv_store(hv, "gone", 4, newSViv(nick->gone), 0);
+	(void) hv_store(hv, "serverop", 8, newSViv(nick->serverop), 0);
 
-	hv_store(hv, "op", 2, newSViv(nick->op), 0);
-	hv_store(hv, "halfop", 6, newSViv(nick->halfop), 0);
-	hv_store(hv, "voice", 5, newSViv(nick->voice), 0);
-	hv_store(hv, "other", 5, newSViv(nick->prefixes[0]), 0);
-	hv_store(hv, "prefixes", 8, new_pv(nick->prefixes), 0);
+	(void) hv_store(hv, "op", 2, newSViv(nick->op), 0);
+	(void) hv_store(hv, "halfop", 6, newSViv(nick->halfop), 0);
+	(void) hv_store(hv, "voice", 5, newSViv(nick->voice), 0);
+	(void) hv_store(hv, "other", 5, newSViv(nick->prefixes[0]), 0);
+	(void) hv_store(hv, "prefixes", 8, new_pv(nick->prefixes), 0);
 
-	hv_store(hv, "last_check", 10, newSViv(nick->last_check), 0);
-	hv_store(hv, "send_massjoin", 13, newSViv(nick->send_massjoin), 0);
+	(void) hv_store(hv, "last_check", 10, newSViv(nick->last_check), 0);
+	(void) hv_store(hv, "send_massjoin", 13, newSViv(nick->send_massjoin), 0);
 }
 
 static void perl_command_fill_hash(HV *hv, COMMAND_REC *cmd)
 {
-	hv_store(hv, "category", 8, new_pv(cmd->category), 0);
-	hv_store(hv, "cmd", 3, new_pv(cmd->cmd), 0);
+	(void) hv_store(hv, "category", 8, new_pv(cmd->category), 0);
+	(void) hv_store(hv, "cmd", 3, new_pv(cmd->cmd), 0);
 }
 
 static void perl_ignore_fill_hash(HV *hv, IGNORE_REC *ignore)
@@ -452,22 +452,22 @@ static void perl_ignore_fill_hash(HV *hv, IGNORE_REC *ignore)
 	AV *av;
 	char **tmp;
 
-	hv_store(hv, "mask", 4, new_pv(ignore->mask), 0);
-	hv_store(hv, "servertag", 9, new_pv(ignore->servertag), 0);
+	(void) hv_store(hv, "mask", 4, new_pv(ignore->mask), 0);
+	(void) hv_store(hv, "servertag", 9, new_pv(ignore->servertag), 0);
 	av = newAV();
 	if (ignore->channels != NULL) {
 		for (tmp = ignore->channels; *tmp != NULL; tmp++) {
 			av_push(av, new_pv(*tmp));
 		}
 	}
-	hv_store(hv, "channels", 8, newRV_noinc((SV*)av), 0);
-	hv_store(hv, "pattern", 7, new_pv(ignore->pattern), 0);
+	(void) hv_store(hv, "channels", 8, newRV_noinc((SV*)av), 0);
+	(void) hv_store(hv, "pattern", 7, new_pv(ignore->pattern), 0);
 
-	hv_store(hv, "level", 5, newSViv(ignore->level), 0);
+	(void) hv_store(hv, "level", 5, newSViv(ignore->level), 0);
 
-	hv_store(hv, "exception", 9, newSViv(ignore->exception), 0);
-	hv_store(hv, "regexp", 6, newSViv(ignore->regexp), 0);
-	hv_store(hv, "fullword", 8, newSViv(ignore->fullword), 0);
+	(void) hv_store(hv, "exception", 9, newSViv(ignore->exception), 0);
+	(void) hv_store(hv, "regexp", 6, newSViv(ignore->regexp), 0);
+	(void) hv_store(hv, "fullword", 8, newSViv(ignore->fullword), 0);
 }
 
 static void perl_log_fill_hash(HV *hv, LOG_REC *log)
@@ -475,33 +475,33 @@ static void perl_log_fill_hash(HV *hv, LOG_REC *log)
 	AV *av;
 	GSList *tmp;
 
-	hv_store(hv, "fname", 5, new_pv(log->fname), 0);
-	hv_store(hv, "real_fname", 10, new_pv(log->real_fname), 0);
-	hv_store(hv, "opened", 6, newSViv(log->opened), 0);
-	hv_store(hv, "level", 5, newSViv(log->level), 0);
-	hv_store(hv, "last", 4, newSViv(log->last), 0);
-	hv_store(hv, "autoopen", 8, newSViv(log->autoopen), 0);
-	hv_store(hv, "failed", 6, newSViv(log->failed), 0);
-	hv_store(hv, "temp", 4, newSViv(log->temp), 0);
+	(void) hv_store(hv, "fname", 5, new_pv(log->fname), 0);
+	(void) hv_store(hv, "real_fname", 10, new_pv(log->real_fname), 0);
+	(void) hv_store(hv, "opened", 6, newSViv(log->opened), 0);
+	(void) hv_store(hv, "level", 5, newSViv(log->level), 0);
+	(void) hv_store(hv, "last", 4, newSViv(log->last), 0);
+	(void) hv_store(hv, "autoopen", 8, newSViv(log->autoopen), 0);
+	(void) hv_store(hv, "failed", 6, newSViv(log->failed), 0);
+	(void) hv_store(hv, "temp", 4, newSViv(log->temp), 0);
 
 	av = newAV();
 	for (tmp = log->items; tmp != NULL; tmp = tmp->next) {
 		av_push(av, plain_bless(tmp->data, "Irssi::Logitem"));
 	}
-	hv_store(hv, "items", 5, newRV_noinc((SV*)av), 0);
+	(void) hv_store(hv, "items", 5, newRV_noinc((SV*)av), 0);
 }
 
 static void perl_log_item_fill_hash(HV *hv, LOG_ITEM_REC *item)
 {
-	hv_store(hv, "type", 4, newSViv(item->type), 0);
-	hv_store(hv, "name", 4, new_pv(item->name), 0);
-	hv_store(hv, "servertag", 9, new_pv(item->servertag), 0);
+	(void) hv_store(hv, "type", 4, newSViv(item->type), 0);
+	(void) hv_store(hv, "name", 4, new_pv(item->name), 0);
+	(void) hv_store(hv, "servertag", 9, new_pv(item->servertag), 0);
 }
 
 static void perl_rawlog_fill_hash(HV *hv, RAWLOG_REC *rawlog)
 {
-	hv_store(hv, "logging", 7, newSViv(rawlog->logging), 0);
-	hv_store(hv, "nlines", 6, newSViv(rawlog->nlines), 0);
+	(void) hv_store(hv, "logging", 7, newSViv(rawlog->logging), 0);
+	(void) hv_store(hv, "nlines", 6, newSViv(rawlog->nlines), 0);
 }
 
 static void perl_reconnect_fill_hash(HV *hv, RECONNECT_REC *reconnect)
@@ -511,18 +511,18 @@ static void perl_reconnect_fill_hash(HV *hv, RECONNECT_REC *reconnect)
 	perl_connect_fill_hash(hv, reconnect->conn);
 
 	type = "RECONNECT";
-	hv_store(hv, "type", 4, new_pv(type), 0);
+	(void) hv_store(hv, "type", 4, new_pv(type), 0);
 
-	hv_store(hv, "tag", 3, newSViv(reconnect->tag), 0);
-	hv_store(hv, "next_connect", 12, newSViv(reconnect->next_connect), 0);
+	(void) hv_store(hv, "tag", 3, newSViv(reconnect->tag), 0);
+	(void) hv_store(hv, "next_connect", 12, newSViv(reconnect->next_connect), 0);
 }
 
 static void perl_script_fill_hash(HV *hv, PERL_SCRIPT_REC *script)
 {
-	hv_store(hv, "name", 4, new_pv(script->name), 0);
-	hv_store(hv, "package", 7, new_pv(script->package), 0);
-	hv_store(hv, "path", 4, new_pv(script->path), 0);
-	hv_store(hv, "data", 4, new_pv(script->data), 0);
+	(void) hv_store(hv, "name", 4, new_pv(script->name), 0);
+	(void) hv_store(hv, "package", 7, new_pv(script->package), 0);
+	(void) hv_store(hv, "path", 4, new_pv(script->path), 0);
+	(void) hv_store(hv, "data", 4, new_pv(script->data), 0);
 }
 
 static void remove_newlines(char *str)
diff --git a/src/perl/textui/Statusbar.xs b/src/perl/textui/Statusbar.xs
index 620fad9a..a449e11d 100644
--- a/src/perl/textui/Statusbar.xs
+++ b/src/perl/textui/Statusbar.xs
@@ -160,5 +160,5 @@ CODE:
 				       *str == '\0' ? NULL : str,
 				       data, escape_vars);
 	hv = hvref(ST(0));
-	hv_store(hv, "min_size", 8, newSViv(item->min_size), 0);
-	hv_store(hv, "max_size", 8, newSViv(item->max_size), 0);
+	(void) hv_store(hv, "min_size", 8, newSViv(item->min_size), 0);
+	(void) hv_store(hv, "max_size", 8, newSViv(item->max_size), 0);
diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index ae986aaf..5d2c8a7f 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -8,72 +8,72 @@ static int initialized = FALSE;
 
 static void perl_main_window_fill_hash(HV *hv, MAIN_WINDOW_REC *window)
 {
-	hv_store(hv, "active", 6, plain_bless(window->active, "Irssi::UI::Window"), 0);
+	(void) hv_store(hv, "active", 6, plain_bless(window->active, "Irssi::UI::Window"), 0);
 
-	hv_store(hv, "first_line", 10, newSViv(window->first_line), 0);
-	hv_store(hv, "last_line", 9, newSViv(window->last_line), 0);
-	hv_store(hv, "width", 5, newSViv(window->width), 0);
-	hv_store(hv, "height", 6, newSViv(window->height), 0);
+	(void) hv_store(hv, "first_line", 10, newSViv(window->first_line), 0);
+	(void) hv_store(hv, "last_line", 9, newSViv(window->last_line), 0);
+	(void) hv_store(hv, "width", 5, newSViv(window->width), 0);
+	(void) hv_store(hv, "height", 6, newSViv(window->height), 0);
 
-	hv_store(hv, "statusbar_lines", 15, newSViv(window->statusbar_lines), 0);
+	(void) hv_store(hv, "statusbar_lines", 15, newSViv(window->statusbar_lines), 0);
 }
 
 static void perl_text_buffer_fill_hash(HV *hv, TEXT_BUFFER_REC *buffer)
 {
-	hv_store(hv, "first_line", 10, plain_bless(buffer->first_line, "Irssi::TextUI::Line"), 0);
-	hv_store(hv, "lines_count", 11, newSViv(buffer->lines_count), 0);
-	hv_store(hv, "cur_line", 8, plain_bless(buffer->cur_line, "Irssi::TextUI::Line"), 0);
-	hv_store(hv, "last_eol", 8, newSViv(buffer->last_eol), 0);
+	(void) hv_store(hv, "first_line", 10, plain_bless(buffer->first_line, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "lines_count", 11, newSViv(buffer->lines_count), 0);
+	(void) hv_store(hv, "cur_line", 8, plain_bless(buffer->cur_line, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "last_eol", 8, newSViv(buffer->last_eol), 0);
 }
 
 static void perl_text_buffer_view_fill_hash(HV *hv, TEXT_BUFFER_VIEW_REC *view)
 {
-	hv_store(hv, "buffer", 6, plain_bless(view->buffer, "Irssi::TextUI::TextBuffer"), 0);
-	hv_store(hv, "width", 5, newSViv(view->width), 0);
-	hv_store(hv, "height", 6, newSViv(view->height), 0);
+	(void) hv_store(hv, "buffer", 6, plain_bless(view->buffer, "Irssi::TextUI::TextBuffer"), 0);
+	(void) hv_store(hv, "width", 5, newSViv(view->width), 0);
+	(void) hv_store(hv, "height", 6, newSViv(view->height), 0);
 
-	hv_store(hv, "default_indent", 14, newSViv(view->default_indent), 0);
-	hv_store(hv, "longword_noindent", 17, newSViv(view->longword_noindent), 0);
-	hv_store(hv, "scroll", 6, newSViv(view->scroll), 0);
+	(void) hv_store(hv, "default_indent", 14, newSViv(view->default_indent), 0);
+	(void) hv_store(hv, "longword_noindent", 17, newSViv(view->longword_noindent), 0);
+	(void) hv_store(hv, "scroll", 6, newSViv(view->scroll), 0);
 
-	hv_store(hv, "ypos", 4, newSViv(view->ypos), 0);
+	(void) hv_store(hv, "ypos", 4, newSViv(view->ypos), 0);
 
-	hv_store(hv, "startline", 9, plain_bless(view->startline, "Irssi::TextUI::Line"), 0);
-	hv_store(hv, "subline", 7, newSViv(view->subline), 0);
+	(void) hv_store(hv, "startline", 9, plain_bless(view->startline, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "subline", 7, newSViv(view->subline), 0);
 
-	hv_store(hv, "bottom_startline", 16, plain_bless(view->bottom_startline, "Irssi::TextUI::Line"), 0);
-	hv_store(hv, "bottom_subline", 14, newSViv(view->bottom_subline), 0);
+	(void) hv_store(hv, "bottom_startline", 16, plain_bless(view->bottom_startline, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "bottom_subline", 14, newSViv(view->bottom_subline), 0);
 
-	hv_store(hv, "empty_linecount", 15, newSViv(view->empty_linecount), 0);
-	hv_store(hv, "bottom", 6, newSViv(view->bottom), 0);
+	(void) hv_store(hv, "empty_linecount", 15, newSViv(view->empty_linecount), 0);
+	(void) hv_store(hv, "bottom", 6, newSViv(view->bottom), 0);
 }
 
 static void perl_line_fill_hash(HV *hv, LINE_REC *line)
 {
-	hv_store(hv, "info", 4, plain_bless(&line->info, "Irssi::TextUI::LineInfo"), 0);
+	(void) hv_store(hv, "info", 4, plain_bless(&line->info, "Irssi::TextUI::LineInfo"), 0);
 }
 
 static void perl_line_cache_fill_hash(HV *hv, LINE_CACHE_REC *cache)
 {
-	hv_store(hv, "last_access", 11, newSViv(cache->last_access), 0);
-	hv_store(hv, "count", 5, newSViv(cache->count), 0);
+	(void) hv_store(hv, "last_access", 11, newSViv(cache->last_access), 0);
+	(void) hv_store(hv, "count", 5, newSViv(cache->count), 0);
 	/*LINE_CACHE_SUB_REC lines[1];*/
 }
 
 static void perl_line_info_fill_hash(HV *hv, LINE_INFO_REC *info)
 {
-	hv_store(hv, "level", 5, newSViv(info->level), 0);
-	hv_store(hv, "time", 4, newSViv(info->time), 0);
+	(void) hv_store(hv, "level", 5, newSViv(info->level), 0);
+	(void) hv_store(hv, "time", 4, newSViv(info->time), 0);
 }
 
 static void perl_statusbar_item_fill_hash(HV *hv, SBAR_ITEM_REC *item)
 {
-	hv_store(hv, "min_size", 8, newSViv(item->min_size), 0);
-	hv_store(hv, "max_size", 8, newSViv(item->max_size), 0);
-	hv_store(hv, "xpos", 4, newSViv(item->xpos), 0);
-	hv_store(hv, "size", 4, newSViv(item->size), 0);
+	(void) hv_store(hv, "min_size", 8, newSViv(item->min_size), 0);
+	(void) hv_store(hv, "max_size", 8, newSViv(item->max_size), 0);
+	(void) hv_store(hv, "xpos", 4, newSViv(item->xpos), 0);
+	(void) hv_store(hv, "size", 4, newSViv(item->size), 0);
 	if (item->bar->parent_window != NULL)
-		hv_store(hv, "window", 6, plain_bless(item->bar->parent_window->active, "Irssi::UI::Window"), 0);
+		(void) hv_store(hv, "window", 6, plain_bless(item->bar->parent_window->active, "Irssi::UI::Window"), 0);
 }
 
 static PLAIN_OBJECT_INIT_REC textui_plains[] = {
diff --git a/src/perl/ui/UI.xs b/src/perl/ui/UI.xs
index 2e32762c..9db57e98 100644
--- a/src/perl/ui/UI.xs
+++ b/src/perl/ui/UI.xs
@@ -8,60 +8,60 @@ static int initialized = FALSE;
 
 static void perl_process_fill_hash(HV *hv, PROCESS_REC *process)
 {
-	hv_store(hv, "id", 2, newSViv(process->id), 0);
-	hv_store(hv, "name", 4, new_pv(process->name), 0);
-	hv_store(hv, "args", 4, new_pv(process->args), 0);
+	(void) hv_store(hv, "id", 2, newSViv(process->id), 0);
+	(void) hv_store(hv, "name", 4, new_pv(process->name), 0);
+	(void) hv_store(hv, "args", 4, new_pv(process->args), 0);
 
-	hv_store(hv, "pid", 3, newSViv(process->pid), 0);
-	hv_store(hv, "target", 6, new_pv(process->target), 0);
+	(void) hv_store(hv, "pid", 3, newSViv(process->pid), 0);
+	(void) hv_store(hv, "target", 6, new_pv(process->target), 0);
 	if (process->target_win != NULL) {
-		hv_store(hv, "target_win", 10,
+		(void) hv_store(hv, "target_win", 10,
 			 plain_bless(process->target_win, "Irssi::UI::Window"), 0);
 	}
-	hv_store(hv, "shell", 5, newSViv(process->shell), 0);
-	hv_store(hv, "notice", 6, newSViv(process->notice), 0);
-	hv_store(hv, "silent", 6, newSViv(process->silent), 0);
+	(void) hv_store(hv, "shell", 5, newSViv(process->shell), 0);
+	(void) hv_store(hv, "notice", 6, newSViv(process->notice), 0);
+	(void) hv_store(hv, "silent", 6, newSViv(process->silent), 0);
 }
 
 static void perl_window_fill_hash(HV *hv, WINDOW_REC *window)
 {
-	hv_store(hv, "refnum", 6, newSViv(window->refnum), 0);
-	hv_store(hv, "name", 4, new_pv(window->name), 0);
-	hv_store(hv, "history_name", 12, new_pv(window->history_name), 0);
+	(void) hv_store(hv, "refnum", 6, newSViv(window->refnum), 0);
+	(void) hv_store(hv, "name", 4, new_pv(window->name), 0);
+	(void) hv_store(hv, "history_name", 12, new_pv(window->history_name), 0);
 
-	hv_store(hv, "width", 5, newSViv(window->width), 0);
-	hv_store(hv, "height", 6, newSViv(window->height), 0);
+	(void) hv_store(hv, "width", 5, newSViv(window->width), 0);
+	(void) hv_store(hv, "height", 6, newSViv(window->height), 0);
 
 	if (window->active)
-		hv_store(hv, "active", 6, iobject_bless(window->active), 0);
+		(void) hv_store(hv, "active", 6, iobject_bless(window->active), 0);
 	if (window->active_server)
-		hv_store(hv, "active_server", 13, iobject_bless(window->active_server), 0);
+		(void) hv_store(hv, "active_server", 13, iobject_bless(window->active_server), 0);
 
-	hv_store(hv, "servertag", 9, new_pv(window->servertag), 0);
-	hv_store(hv, "level", 5, newSViv(window->level), 0);
+	(void) hv_store(hv, "servertag", 9, new_pv(window->servertag), 0);
+	(void) hv_store(hv, "level", 5, newSViv(window->level), 0);
 
-	hv_store(hv, "immortal", 8, newSViv(window->immortal), 0);
-	hv_store(hv, "sticky_refnum", 13, newSViv(window->sticky_refnum), 0);
+	(void) hv_store(hv, "immortal", 8, newSViv(window->immortal), 0);
+	(void) hv_store(hv, "sticky_refnum", 13, newSViv(window->sticky_refnum), 0);
 
-	hv_store(hv, "data_level", 10, newSViv(window->data_level), 0);
-	hv_store(hv, "hilight_color", 13, new_pv(window->hilight_color), 0);
+	(void) hv_store(hv, "data_level", 10, newSViv(window->data_level), 0);
+	(void) hv_store(hv, "hilight_color", 13, new_pv(window->hilight_color), 0);
 
-	hv_store(hv, "last_timestamp", 14, newSViv(window->last_timestamp), 0);
-	hv_store(hv, "last_line", 9, newSViv(window->last_line), 0);
+	(void) hv_store(hv, "last_timestamp", 14, newSViv(window->last_timestamp), 0);
+	(void) hv_store(hv, "last_line", 9, newSViv(window->last_line), 0);
 
-	hv_store(hv, "theme", 5, plain_bless(window->theme, "Irssi::UI::Theme"), 0);
-	hv_store(hv, "theme_name", 10, new_pv(window->theme_name), 0);
+	(void) hv_store(hv, "theme", 5, plain_bless(window->theme, "Irssi::UI::Theme"), 0);
+	(void) hv_store(hv, "theme_name", 10, new_pv(window->theme_name), 0);
 }
 
 static void perl_text_dest_fill_hash(HV *hv, TEXT_DEST_REC *dest)
 {
-	hv_store(hv, "window", 6, plain_bless(dest->window, "Irssi::UI::Window"), 0);
-	hv_store(hv, "server", 6, iobject_bless(dest->server), 0);
-	hv_store(hv, "target", 6, new_pv(dest->target), 0);
-	hv_store(hv, "level", 5, newSViv(dest->level), 0);
+	(void) hv_store(hv, "window", 6, plain_bless(dest->window, "Irssi::UI::Window"), 0);
+	(void) hv_store(hv, "server", 6, iobject_bless(dest->server), 0);
+	(void) hv_store(hv, "target", 6, new_pv(dest->target), 0);
+	(void) hv_store(hv, "level", 5, newSViv(dest->level), 0);
 
-	hv_store(hv, "hilight_priority", 16, newSViv(dest->hilight_priority), 0);
-	hv_store(hv, "hilight_color", 13, new_pv(dest->hilight_color), 0);
+	(void) hv_store(hv, "hilight_priority", 16, newSViv(dest->hilight_priority), 0);
+	(void) hv_store(hv, "hilight_color", 13, new_pv(dest->hilight_color), 0);
 }
 
 static PLAIN_OBJECT_INIT_REC fe_plains[] = {

From 96d4fb9156bcef6fc14dbec43dfa0fcd0226d46f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Wed, 7 Jan 2015 03:40:34 +0100
Subject: [PATCH 0061/1650] add CONFIG_REC to config_node_section* APIs

this adds the CONFIG_REC * to the config_node_section and
config_node_section_index APIs as they will require access to the config
cache later on to make the config parser more robust.
---
 src/core/channels-setup.c           |  2 +-
 src/core/chatnets.c                 |  2 +-
 src/core/ignore.c                   |  6 +++---
 src/core/log.c                      |  8 ++++----
 src/core/servers-setup.c            |  2 +-
 src/core/session.c                  | 14 +++++++-------
 src/core/settings.c                 | 14 +++++++-------
 src/core/settings.h                 |  2 ++
 src/fe-common/core/completion.c     |  4 ++--
 src/fe-common/core/hilight-text.c   |  6 +++---
 src/fe-common/core/keyboard.c       |  2 +-
 src/fe-common/core/themes.c         |  4 ++--
 src/fe-common/core/windows-layout.c |  8 ++++----
 src/fe-text/mainwindows-layout.c    |  2 +-
 src/fe-text/statusbar-config.c      | 20 ++++++++++----------
 src/irc/core/irc-session.c          |  4 ++--
 src/irc/notifylist/notify-setup.c   |  6 +++---
 src/lib-config/get.c                |  8 ++++----
 src/lib-config/iconfig.h            |  4 ++--
 src/lib-config/parse.c              |  4 ++--
 20 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index e1289c23..b2d971dd 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -40,7 +40,7 @@ static void channel_setup_save(CHANNEL_SETUP_REC *channel)
 	parentnode = iconfig_node_traverse("(channels", TRUE);
 	node = config_node_nth(parentnode, index);
 	if (node == NULL)
-		node = config_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
+		node = iconfig_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
 
         iconfig_node_clear(node);
 	iconfig_node_set_str(node, "name", channel->name);
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index 3c794ab4..dd4d94b3 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -36,7 +36,7 @@ static void chatnet_config_save(CHATNET_REC *chatnet)
 	CONFIG_NODE *node;
 
 	node = iconfig_node_traverse("chatnets", TRUE);
-	node = config_node_section(node, chatnet->name, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, chatnet->name, NODE_TYPE_BLOCK);
 	iconfig_node_clear(node);
 
 	iconfig_node_set_str(node, "type", chat_protocol_find_id(chatnet->chat_type)->name);
diff --git a/src/core/ignore.c b/src/core/ignore.c
index 68fae11f..2d18f865 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -263,7 +263,7 @@ static void ignore_set_config(IGNORE_REC *rec)
 		return;
 
 	node = iconfig_node_traverse("(ignores", TRUE);
-	node = config_node_section(node, NULL, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, NULL, NODE_TYPE_BLOCK);
 
 	if (rec->mask != NULL) iconfig_node_set_str(node, "mask", rec->mask);
 	if (rec->level) {
@@ -281,7 +281,7 @@ static void ignore_set_config(IGNORE_REC *rec)
 	iconfig_node_set_str(node, "servertag", rec->servertag);
 
 	if (rec->channels != NULL && *rec->channels != NULL) {
-		node = config_node_section(node, "channels", NODE_TYPE_LIST);
+		node = iconfig_node_section(node, "channels", NODE_TYPE_LIST);
 		iconfig_node_add_list(node, rec->channels);
 	}
 }
@@ -436,7 +436,7 @@ static void read_ignores(void)
 		rec->unignore_time = config_node_get_int(node, "unignore_time", 0);
 		rec->servertag = g_strdup(config_node_get_str(node, "servertag", 0));
 
-		node = config_node_section(node, "channels", -1);
+		node = iconfig_node_section(node, "channels", -1);
 		if (node != NULL) rec->channels = config_node_get_list(node);
 
 		ignore_init_rec(rec);
diff --git a/src/core/log.c b/src/core/log.c
index d4d3853e..c9732d6d 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -332,11 +332,11 @@ static void log_items_update_config(LOG_REC *log, CONFIG_NODE *parent)
 	GSList *tmp;
 	CONFIG_NODE *node;
 
-	parent = config_node_section(parent, "items", NODE_TYPE_LIST);
+	parent = iconfig_node_section(parent, "items", NODE_TYPE_LIST);
 	for (tmp = log->items; tmp != NULL; tmp = tmp->next) {
 		LOG_ITEM_REC *rec = tmp->data;
 
-                node = config_node_section(parent, NULL, NODE_TYPE_BLOCK);
+                node = iconfig_node_section(parent, NULL, NODE_TYPE_BLOCK);
 		iconfig_node_set_str(node, "type", log_item_types[rec->type]);
 		iconfig_node_set_str(node, "name", rec->name);
 		iconfig_node_set_str(node, "server", rec->servertag);
@@ -352,7 +352,7 @@ static void log_update_config(LOG_REC *log)
 		return;
 
 	node = iconfig_node_traverse("logs", TRUE);
-	node = config_node_section(node, log->fname, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, log->fname, NODE_TYPE_BLOCK);
 
 	if (log->autoopen)
 		iconfig_node_set_bool(node, "auto_open", TRUE);
@@ -544,7 +544,7 @@ static void log_read_config(void)
 
 		signal_emit("log config read", 2, log, node);
 
-		node = config_node_section(node, "items", -1);
+		node = iconfig_node_section(node, "items", -1);
 		if (node != NULL)
 			log_items_read_config(node, log);
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 27d9f1f0..e648eb36 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -430,7 +430,7 @@ static void server_setup_save(SERVER_SETUP_REC *rec)
 	parentnode = iconfig_node_traverse("(servers", TRUE);
 	node = config_node_nth(parentnode, index);
 	if (node == NULL)
-		node = config_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
+		node = iconfig_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
 
         iconfig_node_clear(node);
 	iconfig_node_set_str(node, "address", rec->address);
diff --git a/src/core/session.c b/src/core/session.c
index b3002632..ca3bf22f 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -92,7 +92,7 @@ static void cmd_upgrade(const char *data)
 static void session_save_nick(CHANNEL_REC *channel, NICK_REC *nick,
 			      CONFIG_REC *config, CONFIG_NODE *node)
 {
-	node = config_node_section(node, NULL, NODE_TYPE_BLOCK);
+	node = config_node_section(config, node, NULL, NODE_TYPE_BLOCK);
 
 	config_node_set_str(config, node, "nick", nick->nick);
 	config_node_set_bool(config, node, "op", nick->op);
@@ -109,7 +109,7 @@ static void session_save_channel_nicks(CHANNEL_REC *channel, CONFIG_REC *config,
 {
 	GSList *tmp, *nicks;
 
-	node = config_node_section(node, "nicks", NODE_TYPE_LIST);
+	node = config_node_section(config, node, "nicks", NODE_TYPE_LIST);
         nicks = nicklist_getnicks(channel);
 	for (tmp = nicks; tmp != NULL; tmp = tmp->next)
 		session_save_nick(channel, tmp->data, config, node);
@@ -119,7 +119,7 @@ static void session_save_channel_nicks(CHANNEL_REC *channel, CONFIG_REC *config,
 static void session_save_channel(CHANNEL_REC *channel, CONFIG_REC *config,
 				 CONFIG_NODE *node)
 {
-	node = config_node_section(node, NULL, NODE_TYPE_BLOCK);
+	node = config_node_section(config, node, NULL, NODE_TYPE_BLOCK);
 
 	config_node_set_str(config, node, "name", channel->name);
 	config_node_set_str(config, node, "visible_name", channel->visible_name);
@@ -138,7 +138,7 @@ static void session_save_server_channels(SERVER_REC *server,
 	GSList *tmp;
 
 	/* save channels */
-        node = config_node_section(node, "channels", NODE_TYPE_LIST);
+	node = config_node_section(config, node, "channels", NODE_TYPE_LIST);
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next)
 		session_save_channel(tmp->data, config, node);
 }
@@ -148,7 +148,7 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config,
 {
 	int handle;
 
-	node = config_node_section(node, NULL, NODE_TYPE_BLOCK);
+	node = config_node_section(config, node, NULL, NODE_TYPE_BLOCK);
 
 	config_node_set_str(config, node, "chat_type",
 			    chat_protocol_find_id(server->chat_type)->name);
@@ -187,7 +187,7 @@ static void session_restore_channel_nicks(CHANNEL_REC *channel,
 	GSList *tmp;
 
 	/* restore nicks */
-	node = config_node_section(node, "nicks", -1);
+	node = config_node_section(NULL, node, "nicks", -1);
 	if (node != NULL && node->type == NODE_TYPE_LIST) {
 		tmp = config_node_first(node->value);
 		for (; tmp != NULL; tmp = config_node_next(tmp)) {
@@ -223,7 +223,7 @@ static void session_restore_server_channels(SERVER_REC *server,
 	GSList *tmp;
 
 	/* restore channels */
-	node = config_node_section(node, "channels", -1);
+	node = config_node_section(NULL, node, "channels", -1);
 	if (node != NULL && node->type == NODE_TYPE_LIST) {
 		tmp = config_node_first(node->value);
 		for (; tmp != NULL; tmp = config_node_next(tmp))
diff --git a/src/core/settings.c b/src/core/settings.c
index 2296909e..6c536180 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -77,7 +77,7 @@ settings_get_str_type(const char *key, SettingType type)
 	if (rec == NULL) return NULL;
 
 	node = iconfig_node_traverse("settings", FALSE);
-	node = node == NULL ? NULL : config_node_section(node, rec->module, -1);
+	node = node == NULL ? NULL : iconfig_node_section(node, rec->module, -1);
 
 	return node == NULL ? rec->default_value.v_string :
 		config_node_get_str(node, key, rec->default_value.v_string);
@@ -97,7 +97,7 @@ int settings_get_int(const char *key)
 	if (rec == NULL) return 0;
 
 	node = iconfig_node_traverse("settings", FALSE);
-	node = node == NULL ? NULL : config_node_section(node, rec->module, -1);
+	node = node == NULL ? NULL : iconfig_node_section(node, rec->module, -1);
 
 	return node == NULL ? rec->default_value.v_int :
 		config_node_get_int(node, key, rec->default_value.v_int);
@@ -112,7 +112,7 @@ int settings_get_bool(const char *key)
 	if (rec == NULL) return FALSE;
 
 	node = iconfig_node_traverse("settings", FALSE);
-	node = node == NULL ? NULL : config_node_section(node, rec->module, -1);
+	node = node == NULL ? NULL : iconfig_node_section(node, rec->module, -1);
 
 	return node == NULL ? rec->default_value.v_bool :
 		config_node_get_bool(node, key, rec->default_value.v_bool);
@@ -324,7 +324,7 @@ static CONFIG_NODE *settings_get_node(const char *key)
 	}
 
 	node = iconfig_node_traverse("settings", TRUE);
-	return config_node_section(node, rec->module, NODE_TYPE_BLOCK);
+	return iconfig_node_section(node, rec->module, NODE_TYPE_BLOCK);
 }
 
 void settings_set_str(const char *key, const char *value)
@@ -420,7 +420,7 @@ static void settings_clean_invalid_module(const char *module)
 	node = iconfig_node_traverse("settings", FALSE);
 	if (node == NULL) return;
 
-	node = config_node_section(node, module, -1);
+	node = iconfig_node_section(node, module, -1);
 	if (node == NULL) return;
 
 	for (tmp = config_node_first(node->value); tmp != NULL; tmp = next) {
@@ -468,7 +468,7 @@ static int backwards_compatibility(const char *module, CONFIG_NODE *node,
 				g_strdup(node->value);
 			new_node = iconfig_node_traverse("settings", FALSE);
 			new_node = new_node == NULL ? NULL :
-				config_node_section(new_node, new_module, -1);
+				iconfig_node_section(new_node, new_module, -1);
 
 			config_node_set_str(mainconfig, new_node,
 					    new_key, new_value);
@@ -502,7 +502,7 @@ void settings_check_module(const char *module)
         g_return_if_fail(module != NULL);
 
 	node = iconfig_node_traverse("settings", FALSE);
-	node = node == NULL ? NULL : config_node_section(node, module, -1);
+	node = node == NULL ? NULL : iconfig_node_section(node, module, -1);
 	if (node == NULL) return;
 
         errors = g_string_new(NULL);
diff --git a/src/core/settings.h b/src/core/settings.h
index f8d9f68f..af00cc80 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -36,6 +36,8 @@ typedef struct {
 #define iconfig_set_int(a, b, c) config_set_int(mainconfig, a, b, c)
 #define iconfig_set_bool(a, b, c) config_set_bool(mainconfig, a, b, c)
 
+#define iconfig_node_section(a, b, c) config_node_section(mainconfig, a, b, c)
+#define iconfig_node_section_index(a, b, c, d) config_node_section_index(mainconfig, a, b, c, d)
 #define iconfig_node_traverse(a, b) config_node_traverse(mainconfig, a, b)
 #define iconfig_node_set_str(a, b, c) config_node_set_str(mainconfig, a, b, c)
 #define iconfig_node_set_int(a, b, c) config_node_set_int(mainconfig, a, b, c)
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 31d62e10..2223b5b5 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -51,7 +51,7 @@ static const char *completion_find(const char *key, int automatic)
 	if (node == NULL || node->type != NODE_TYPE_BLOCK)
 		return NULL;
 
-	node = config_node_section(node, key, -1);
+	node = iconfig_node_section(node, key, -1);
 	if (node == NULL)
 		return NULL;
 
@@ -785,7 +785,7 @@ static void cmd_completion(const char *data)
 	} else if (*key != '\0' && *value != '\0') {
 		int automatic = g_hash_table_lookup(optlist, "auto") != NULL;
 
-		node = config_node_section(node, key, NODE_TYPE_BLOCK);
+		node = iconfig_node_section(node, key, NODE_TYPE_BLOCK);
 		iconfig_node_set_str(node, "value", value);
 		if (automatic)
 			iconfig_node_set_bool(node, "auto", TRUE);
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 4b914517..de9a3130 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -66,7 +66,7 @@ static void hilight_add_config(HILIGHT_REC *rec)
 	g_return_if_fail(rec != NULL);
 
 	node = iconfig_node_traverse("(hilights", TRUE);
-	node = config_node_section(node, NULL, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, NULL, NODE_TYPE_BLOCK);
 
         iconfig_node_set_str(node, "text", rec->text);
         if (rec->level > 0) iconfig_node_set_int(node, "level", rec->level);
@@ -81,7 +81,7 @@ static void hilight_add_config(HILIGHT_REC *rec)
         if (rec->servertag) iconfig_node_set_str(node, "servertag", rec->servertag);
 
 	if (rec->channels != NULL && *rec->channels != NULL) {
-		node = config_node_section(node, "channels", NODE_TYPE_LIST);
+		node = iconfig_node_section(node, "channels", NODE_TYPE_LIST);
 		iconfig_node_add_list(node, rec->channels);
 	}
 }
@@ -471,7 +471,7 @@ static void read_hilight_config(void)
 		rec->servertag = config_node_get_str(node, "servertag", NULL);
 		hilight_init_rec(rec);
 
-		node = config_node_section(node, "channels", -1);
+		node = iconfig_node_section(node, "channels", -1);
 		if (node != NULL) rec->channels = config_node_get_list(node);
 	}
 
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index bec1502e..02c8a8d7 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -135,7 +135,7 @@ static void keyconfig_save(const char *id, const char *key, const char *data)
 	node = key_config_find(key);
 	if (node == NULL) {
 		node = iconfig_node_traverse("(keyboard", TRUE);
-		node = config_node_section(node, NULL, NODE_TYPE_BLOCK);
+		node = iconfig_node_section(node, NULL, NODE_TYPE_BLOCK);
 	}
 
 	iconfig_node_set_str(node, "key", key);
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index c0741cef..cd4039b9 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -739,7 +739,7 @@ static void theme_read_formats(THEME_REC *theme, const char *module,
 
 	node = config_node_traverse(config, "formats", FALSE);
 	if (node == NULL) return;
-	node = config_node_section(node, module, -1);
+	node = config_node_section(config, node, module, -1);
 	if (node == NULL) return;
 
 	for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
@@ -1177,7 +1177,7 @@ static void module_save(const char *module, MODULE_THEME_REC *rec,
 
 	fnode = config_node_traverse(data->config, "formats", TRUE);
 
-	node = config_node_section(fnode, rec->name, NODE_TYPE_BLOCK);
+	node = config_node_section(data->config, fnode, rec->name, NODE_TYPE_BLOCK);
 	for (n = 1; formats[n].def != NULL; n++) {
                 if (rec->formats[n] != NULL) {
                         config_node_set_str(data->config, node, formats[n].tag,
diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 54d7dcbf..d0606bc9 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -143,7 +143,7 @@ static void sig_layout_restore(void)
 		if (window->theme_name != NULL)
 			window->theme = theme_load(window->theme_name);
 
-		window_add_items(window, config_node_section(node, "items", -1));
+		window_add_items(window, iconfig_node_section(node, "items", -1));
 		signal_emit("layout restore window", 2, window, node);
 	}
 }
@@ -160,7 +160,7 @@ static void sig_layout_save_item(WINDOW_REC *window, WI_ITEM_REC *item,
 	if (type == NULL)
 		return;
 
-	subnode = config_node_section(node, NULL, NODE_TYPE_BLOCK);
+	subnode = iconfig_node_section(node, NULL, NODE_TYPE_BLOCK);
 
 	iconfig_node_set_str(subnode, "type", type);
 	proto = item->chat_type == 0 ? NULL :
@@ -185,7 +185,7 @@ static void window_save_items(WINDOW_REC *window, CONFIG_NODE *node)
 {
 	GSList *tmp;
 
-	node = config_node_section(node, "items", NODE_TYPE_LIST);
+	node = iconfig_node_section(node, "items", NODE_TYPE_LIST);
 	for (tmp = window->items; tmp != NULL; tmp = tmp->next)
 		signal_emit("layout save item", 3, window, tmp->data, node);
 }
@@ -195,7 +195,7 @@ static void window_save(WINDOW_REC *window, CONFIG_NODE *node)
 	char refnum[MAX_INT_STRLEN];
 
         ltoa(refnum, window->refnum);
-	node = config_node_section(node, refnum, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, refnum, NODE_TYPE_BLOCK);
 
 	if (window->sticky_refnum)
 		iconfig_node_set_bool(node, "sticky_refnum", TRUE);
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index 28fae924..c53f8f72 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -70,7 +70,7 @@ static void main_window_save(MAIN_WINDOW_REC *window, CONFIG_NODE *node)
         char num[MAX_INT_STRLEN];
 
         ltoa(num, window->active->refnum);
-	node = config_node_section(node, num, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, num, NODE_TYPE_BLOCK);
 
 	iconfig_node_set_int(node, "first_line", window->first_line);
 	iconfig_node_set_int(node, "lines", window->height);
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index deaa1b5d..e8943dac 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -177,7 +177,7 @@ static void statusbar_read(STATUSBAR_GROUP_REC *group, CONFIG_NODE *node)
                 bar->placement = STATUSBAR_TOP;
 	bar->position = config_node_get_int(node, "position", 0);
 
-	node = config_node_section(node, "items", -1);
+	node = iconfig_node_section(node, "items", -1);
 	if (node != NULL) {
                 /* we're overriding the items - destroy the old */
                 while (bar->items != NULL)
@@ -227,7 +227,7 @@ static void read_statusbar_config_from_node(CONFIG_NODE *node)
 	CONFIG_NODE *items;
 	GSList *tmp;
 
-	items = config_node_section(node, "items", -1);
+	items = iconfig_node_section(node, "items", -1);
 	if (items != NULL)
 		statusbar_read_items(items);
 
@@ -369,7 +369,7 @@ static void cmd_statusbar_reset(const char *data, void *server,
 	CONFIG_NODE *parent;
 
 	parent = iconfig_node_traverse("statusbar", TRUE);
-	parent = config_node_section(parent, active_statusbar_group->name,
+	parent = iconfig_node_section(parent, active_statusbar_group->name,
 				     NODE_TYPE_BLOCK);
 
         iconfig_node_set_str(parent, node->key, NULL);
@@ -432,7 +432,7 @@ static CONFIG_NODE *statusbar_items_section(CONFIG_NODE *parent)
         CONFIG_NODE *node;
         GSList *tmp;
 
-	node = config_node_section(parent, "items", -1);
+	node = iconfig_node_section(parent, "items", -1);
 	if (node != NULL)
 		return node;
 
@@ -446,11 +446,11 @@ static CONFIG_NODE *statusbar_items_section(CONFIG_NODE *parent)
 
 	/* since items list in config file overrides defaults,
 	   we'll need to copy the whole list. */
-	parent = config_node_section(parent, "items", NODE_TYPE_BLOCK);
+	parent = iconfig_node_section(parent, "items", NODE_TYPE_BLOCK);
 	for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
 		SBAR_ITEM_CONFIG_REC *rec = tmp->data;
 
-		node = config_node_section(parent, rec->name,
+		node = iconfig_node_section(parent, rec->name,
 					   NODE_TYPE_BLOCK);
 		if (rec->priority != 0)
                         iconfig_node_set_int(node, "priority", rec->priority);
@@ -487,7 +487,7 @@ static void cmd_statusbar_add(const char *data, void *server,
 	if (value != NULL) index = config_node_index(node, value)+1;
 
         /* create/move item */
-	node = config_node_section_index(node, name, index, NODE_TYPE_BLOCK);
+	node = iconfig_node_section_index(node, name, index, NODE_TYPE_BLOCK);
 
         /* set the options */
         value = g_hash_table_lookup(optlist, "priority");
@@ -511,7 +511,7 @@ static void cmd_statusbar_remove(const char *data, void *server,
 	if (node == NULL)
                 return;
 
-	if (config_node_section(node, data, -1) != NULL)
+	if (iconfig_node_section(node, data, -1) != NULL)
 		iconfig_node_set_str(node, data, NULL);
 	else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
@@ -545,9 +545,9 @@ static void cmd_statusbar(const char *data)
 
         /* lookup/create the statusbar node */
 	node = iconfig_node_traverse("statusbar", TRUE);
-	node = config_node_section(node, active_statusbar_group->name,
+	node = iconfig_node_section(node, active_statusbar_group->name,
 				   NODE_TYPE_BLOCK);
-	node = config_node_section(node, name, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, name, NODE_TYPE_BLOCK);
 
 	/* call the subcommand */
 	signal = g_strconcat("command statusbar ", cmd, NULL);
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index 42d82734..ea65d8a5 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -66,7 +66,7 @@ static void sig_session_save_server(IRC_SERVER_REC *server, CONFIG_REC *config,
 	config_node_set_bool(config, node, "emode_known", server->emode_known);
 
 	config_node_set_bool(config, node, "isupport_sent", server->isupport_sent);
-        isupport = config_node_section(node, "isupport", NODE_TYPE_BLOCK);
+	isupport = config_node_section(config, node, "isupport", NODE_TYPE_BLOCK);
         isupport_data.config = config;
         isupport_data.node = isupport;
 
@@ -95,7 +95,7 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 						    (GCompareFunc) g_istr_equal);
 	}
 
-	node = config_node_section(node, "isupport", -1);
+	node = config_node_section(NULL, node, "isupport", -1);
 	tmp = node == NULL ? NULL : config_node_first(node->value);
 
 	for (; tmp != NULL; tmp = config_node_next(tmp)) {
diff --git a/src/irc/notifylist/notify-setup.c b/src/irc/notifylist/notify-setup.c
index d6f91361..9ea481ca 100644
--- a/src/irc/notifylist/notify-setup.c
+++ b/src/irc/notifylist/notify-setup.c
@@ -30,7 +30,7 @@ void notifylist_add_config(NOTIFYLIST_REC *rec)
 	CONFIG_NODE *node;
 
 	node = iconfig_node_traverse("notifies", TRUE);
-	node = config_node_section(node, rec->mask, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, rec->mask, NODE_TYPE_BLOCK);
 
 	if (rec->away_check)
 		iconfig_node_set_bool(node, "away_check", TRUE);
@@ -39,7 +39,7 @@ void notifylist_add_config(NOTIFYLIST_REC *rec)
 
 	iconfig_node_set_str(node, "ircnets", NULL);
 	if (rec->ircnets != NULL && *rec->ircnets != NULL) {
-		node = config_node_section(node, "ircnets", NODE_TYPE_LIST);
+		node = iconfig_node_section(node, "ircnets", NODE_TYPE_LIST);
 		iconfig_node_add_list(node, rec->ircnets);
 	}
 }
@@ -73,7 +73,7 @@ void notifylist_read_config(void)
 		rec->mask = g_strdup(node->key);
 		rec->away_check = config_node_get_bool(node, "away_check", FALSE);
 
-		node = config_node_section(node, "ircnets", -1);
+		node = iconfig_node_section(node, "ircnets", -1);
 		if (node != NULL) rec->ircnets = config_node_get_list(node);
 	}
 }
diff --git a/src/lib-config/get.c b/src/lib-config/get.c
index af02b048..52785f63 100644
--- a/src/lib-config/get.c
+++ b/src/lib-config/get.c
@@ -38,12 +38,12 @@ CONFIG_NODE *config_node_find(CONFIG_NODE *node, const char *key)
 	return NULL;
 }
 
-CONFIG_NODE *config_node_section(CONFIG_NODE *parent, const char *key, int new_type)
+CONFIG_NODE *config_node_section(CONFIG_REC *rec, CONFIG_NODE *parent, const char *key, int new_type)
 {
-        return config_node_section_index(parent, key, -1, new_type);
+	return config_node_section_index(rec, parent, key, -1, new_type);
 }
 
-CONFIG_NODE *config_node_section_index(CONFIG_NODE *parent, const char *key,
+CONFIG_NODE *config_node_section_index(CONFIG_REC *rec, CONFIG_NODE *parent, const char *key,
 				       int index, int new_type)
 {
 	CONFIG_NODE *node;
@@ -101,7 +101,7 @@ CONFIG_NODE *config_node_traverse(CONFIG_REC *rec, const char *section, int crea
 		is_list = **tmp == '(';
 		if (create) new_type = is_list ? NODE_TYPE_LIST : NODE_TYPE_BLOCK;
 
-		node = config_node_section(node, *tmp + is_list, new_type);
+		node = config_node_section(rec, node, *tmp + is_list, new_type);
 		if (node == NULL) {
 			g_strfreev(list);
 			return NULL;
diff --git a/src/lib-config/iconfig.h b/src/lib-config/iconfig.h
index 3d9eb931..91583e40 100644
--- a/src/lib-config/iconfig.h
+++ b/src/lib-config/iconfig.h
@@ -116,8 +116,8 @@ int config_set_bool(CONFIG_REC *rec, const char *section, const char *key, int v
 CONFIG_NODE *config_node_find(CONFIG_NODE *node, const char *key);
 /* Find the section from node - if not found create it unless new_type is -1.
    You can also specify in new_type if it's NODE_TYPE_LIST or NODE_TYPE_BLOCK */
-CONFIG_NODE *config_node_section(CONFIG_NODE *parent, const char *key, int new_type);
-CONFIG_NODE *config_node_section_index(CONFIG_NODE *parent, const char *key,
+CONFIG_NODE *config_node_section(CONFIG_REC *rec, CONFIG_NODE *parent, const char *key, int new_type);
+CONFIG_NODE *config_node_section_index(CONFIG_REC *rec, CONFIG_NODE *parent, const char *key,
 				       int index, int new_type);
 /* Find the section with the whole path.
    Create the path if necessary if `create' is TRUE. */
diff --git a/src/lib-config/parse.c b/src/lib-config/parse.c
index 1b20195a..c106fc46 100644
--- a/src/lib-config/parse.c
+++ b/src/lib-config/parse.c
@@ -173,7 +173,7 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node)
 		if (key == NULL && node->type != NODE_TYPE_LIST)
 			return G_TOKEN_ERROR;
 
-		newnode = config_node_section(node, key, NODE_TYPE_BLOCK);
+		newnode = config_node_section(rec, node, key, NODE_TYPE_BLOCK);
 		config_parse_loop(rec, newnode, (GTokenType) '}');
 		g_free_not_null(key);
 
@@ -188,7 +188,7 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node)
 		/* list */
 		if (key == NULL)
 			return G_TOKEN_ERROR;
-		newnode = config_node_section(node, key, NODE_TYPE_LIST);
+		newnode = config_node_section(rec, node, key, NODE_TYPE_LIST);
 		config_parse_loop(rec, newnode, (GTokenType) ')');
 		g_free_not_null(key);
 

From af6b789d2a6cadce0b8050f9233cacb1d0595913 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@linux.site>
Date: Tue, 17 Feb 2015 09:41:26 +0100
Subject: [PATCH 0062/1650] Warn the user instead of crashing on wrong config

The change introduced in #191 will crash irssi immediately if you
accidentally try to /reload certain broken config files. It is enough to
warn the user in this case, so we turn g_error into g_critical.
---
 src/lib-config/get.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib-config/get.c b/src/lib-config/get.c
index 52785f63..e0d988d0 100644
--- a/src/lib-config/get.c
+++ b/src/lib-config/get.c
@@ -109,9 +109,9 @@ CONFIG_NODE *config_node_traverse(CONFIG_REC *rec, const char *section, int crea
 	}
 	g_strfreev(list);
 
-        if (!is_node_list(node)) {
+	if (!is_node_list(node)) {
 		/* Will die. Better to not corrupt the config further in this case. */
-		g_error("Attempt to use non-list node as list. Corrupt config?");
+		g_critical("Attempt to use non-list node `%s' as list. Corrupt config?", section);
 		return NULL;
 	}
 

From 1e4f7e63249b0300cac27e725e14a0134260a387 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@linux.site>
Date: Tue, 17 Feb 2015 09:44:33 +0100
Subject: [PATCH 0063/1650] Refuse to load broken configs on irssi start

By temporarily raising the fatal log level to critical during irssi
start-up, we make it fail when the config file is broken. This is then
re-set so that /reload of a broken config file will not crash irssi and
just report the errors and gracefully continue instead.
---
 src/fe-text/irssi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 77033d7a..6d5b9b13 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -310,6 +310,7 @@ int main(int argc, char **argv)
 		{ "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Display irssi version", NULL },
 		{ NULL }
 	};
+	int loglev;
 
 #ifdef USE_GC
 	g_mem_set_vtable(&gc_mem_table);
@@ -352,6 +353,7 @@ int main(int argc, char **argv)
 	   you have to call setlocale(LC_ALL, "") */
 	setlocale(LC_ALL, "");
 
+	loglev = g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
 	textui_init();
 
 	if (!dummy && !term_init()) {
@@ -360,6 +362,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	g_log_set_always_fatal(loglev);
 	textui_finish_init();
 	main_loop = g_main_new(TRUE);
 

From fef25d6a35d23f885937b087ed7642b327279df5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@linux.site>
Date: Tue, 17 Feb 2015 09:46:52 +0100
Subject: [PATCH 0064/1650] Make the config parser more robust

We add some additional checks into the config parser's
node_section_index, node_traverse and node_set_str functions. In
particular, we check if the requested node is of scalar or complex type
and whether this matches the value found in the config. If it does not
match, then a warning is issued appropriately and the config is
corrected.
---
 src/lib-config/get.c | 48 ++++++++++++++++++++++++++++++++++++++++----
 src/lib-config/set.c |  6 ++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/lib-config/get.c b/src/lib-config/get.c
index e0d988d0..53d744da 100644
--- a/src/lib-config/get.c
+++ b/src/lib-config/get.c
@@ -54,7 +54,6 @@ CONFIG_NODE *config_node_section_index(CONFIG_REC *rec, CONFIG_NODE *parent, con
 
 	node = key == NULL ? NULL : config_node_find(parent, key);
 	if (node != NULL) {
-		g_return_val_if_fail(new_type == -1 || new_type == node->type, NULL);
 		nindex = g_slist_index(parent->value, node);
 		if (index >= 0 && nindex != index &&
 		    nindex <= g_slist_length(parent->value)) {
@@ -62,7 +61,25 @@ CONFIG_NODE *config_node_section_index(CONFIG_REC *rec, CONFIG_NODE *parent, con
 			parent->value = g_slist_remove(parent->value, node);
 			parent->value = g_slist_insert(parent->value, node, index);
 		}
-		return node;
+		if (!is_node_list(node)) {
+			int show_error = 0;
+
+			if (new_type != -1) {
+				config_node_remove(rec, parent, node);
+				node = NULL;
+				show_error = 1;
+			} else if (!g_hash_table_contains(rec->cache_nodes, node)) {
+				g_hash_table_insert(rec->cache_nodes, node, NULL);
+				show_error = 1;
+			}
+			if (show_error)
+				g_critical("Expected %s node at `..%s/%s' was of scalar type. Corrupt config?",
+						   new_type == NODE_TYPE_LIST ? "list" : new_type == NODE_TYPE_BLOCK ? "block" : "section",
+						   parent->key, key);
+		} else {
+			g_return_val_if_fail(new_type == -1 || new_type == node->type, NULL);
+			return node;
+		}
 	}
 
 	if (new_type == -1)
@@ -91,7 +108,21 @@ CONFIG_NODE *config_node_traverse(CONFIG_REC *rec, const char *section, int crea
 
 	/* check if it already exists in cache */
 	node = g_hash_table_lookup(rec->cache, section);
-	if (node != NULL) return node;
+	if (node != NULL) {
+		if (create) {
+			const char *path = strrchr(section, '/');
+			if (path == NULL) path = section;
+			else path++;
+			new_type = *path == '(' ? NODE_TYPE_LIST : NODE_TYPE_BLOCK;
+			if (node->type != new_type) {
+				g_critical("Expected %s node at `%s' was of %s type. Corrupt config?",
+						   new_type == NODE_TYPE_LIST ? "list" : "block", section,
+						   node->type == NODE_TYPE_LIST ? "list" : "block");
+				node->type = new_type;
+			}
+		}
+		return node;
+	}
 
         new_type = -1;
 
@@ -99,7 +130,16 @@ CONFIG_NODE *config_node_traverse(CONFIG_REC *rec, const char *section, int crea
 	list = g_strsplit(section, "/", -1);
 	for (tmp = list; *tmp != NULL; tmp++) {
 		is_list = **tmp == '(';
-		if (create) new_type = is_list ? NODE_TYPE_LIST : NODE_TYPE_BLOCK;
+		if (create) {
+			CONFIG_NODE *tmpnode;
+
+			new_type = is_list ? NODE_TYPE_LIST : NODE_TYPE_BLOCK;
+			tmpnode = config_node_find(node, *tmp + is_list);
+			if (tmpnode != NULL && tmpnode->type != new_type) {
+				g_critical("Expected %s node at `%s' was of scalar type. Corrupt config?", is_list ? "list" : "block", section);
+				config_node_remove(rec, node, tmpnode);
+			}
+		}
 
 		node = config_node_section(rec, node, *tmp + is_list, new_type);
 		if (node == NULL) {
diff --git a/src/lib-config/set.c b/src/lib-config/set.c
index 61a101fb..5c187035 100644
--- a/src/lib-config/set.c
+++ b/src/lib-config/set.c
@@ -104,6 +104,12 @@ void config_node_set_str(CONFIG_REC *rec, CONFIG_NODE *parent, const char *key,
 		return;
 	}
 
+	if (node != NULL && !has_node_value(node)) {
+		g_critical("Expected scalar node at `..%s/%s' was of complex type. Corrupt config?",
+				   parent->key, key);
+		config_node_remove(rec, parent, node);
+		node = NULL;
+	}
 	if (node != NULL) {
 		if (strcmp(node->value, value) == 0)
 			return;

From ee3eaa5428c7a574ad3d34602230f3168f204414 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Wed, 7 Jan 2015 04:12:55 +0100
Subject: [PATCH 0065/1650] fix crash in layout code when encountering wrong
 config

---
 src/fe-common/core/windows-layout.c | 1 +
 src/fe-text/mainwindows-layout.c    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index d0606bc9..8ebcc12d 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -127,6 +127,7 @@ static void sig_layout_restore(void)
 	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		CONFIG_NODE *node = tmp->data;
 
+		if (node->key == NULL) continue;
 		window = window_find_refnum(atoi(node->key));
 		if (window == NULL)
 			window = window_create(NULL, TRUE);
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index c53f8f72..020969e6 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -179,6 +179,7 @@ static void sig_layout_restore(void)
 	lower_window = NULL; lower_size = 0;
 	for (i = 0, tmp = sorted_config; i < windows_count; tmp = tmp->next, i++) {
 		CONFIG_NODE *node = tmp->data;
+		if (node->key == NULL) continue;
 
 		/* create a new window + mainwindow */
 		signal_emit("gui window create override", 1,

From 6ce8a64118023f79e715fc7f1e50c5ce1f4bf557 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@linux.site>
Date: Fri, 20 Feb 2015 14:05:58 +0100
Subject: [PATCH 0066/1650] Fix scriptassist broken on unload

This is a regression introduced in
c5ad61b4b0166f7cb769f23dfece2a5d4e62bd6e where one `defined' statement
got removed in error while cleaning up warnings.
---
 scripts/scriptassist.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 12678dbb..dd6d3737 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -1088,7 +1088,7 @@ sub sig_command_script_load ($$$) {
     no strict;
     $script = $2 if $script =~ /(.*\/)?(.*?)\.pl$/;
     if ( %{ "Irssi::Script::${script}::" }) {
-	if ( &{ "Irssi::Script::${script}::pre_unload" }) {
+	if (defined &{ "Irssi::Script::${script}::pre_unload" }) {
 	    print CLIENTCRAP "%R>>%n Triggering pre_unload function of $script...";
 	    &{ "Irssi::Script::${script}::pre_unload" }();
 	}

From d27c54486f3e5656445b43affd37f17d1338a6ce Mon Sep 17 00:00:00 2001
From: Hans Nielsen <hans@stackallocated.com>
Date: Tue, 24 Jun 2014 23:01:06 -0700
Subject: [PATCH 0067/1650] Change around connection signals in proxy module

Change "proxy client connected" to "proxy client connecting" to avoid being confused by clients that have connected but not necessarily authenticated. Emit "proxy client connected" once authenticated, keeping the name for backwards compatibility.
---
 src/irc/proxy/listen.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 33392285..8f8ebe99 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -126,6 +126,9 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 			/* client didn't send us PASS, kill it */
 			remove_client(client);
 		} else {
+			signal_emit("proxy client connected", 1, client);
+			printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
+				  "Proxy: Client finished connecting from %s", client->host);
 			client->connected = TRUE;
 			proxy_dump_data(client);
 		}
@@ -361,9 +364,9 @@ static void sig_listen(LISTEN_REC *listen)
 	proxy_clients = g_slist_prepend(proxy_clients, rec);
 	rec->listen->clients = g_slist_prepend(rec->listen->clients, rec);
 
-        signal_emit("proxy client connected", 1, rec);
+        signal_emit("proxy client connecting", 1, rec);
 	printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-		  "Proxy: Client connected from %s", rec->host);
+		  "Proxy: Client connecting from %s", rec->host);
 }
 
 static void sig_incoming(IRC_SERVER_REC *server, const char *line)

From aaa0f73eac88316978c65fb0f0c8b5d23d1dc100 Mon Sep 17 00:00:00 2001
From: Hans Nielsen <hans@stackallocated.com>
Date: Tue, 24 Jun 2014 23:45:35 -0700
Subject: [PATCH 0068/1650] Make proxy messages include more detail and add
 status command

---
 src/irc/proxy/listen.c | 15 +++++++++------
 src/irc/proxy/proxy.c  | 34 ++++++++++++++++++++++++++++++++++
 src/irc/proxy/proxy.h  |  1 +
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 8f8ebe99..df0d7479 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -45,8 +45,8 @@ static void remove_client(CLIENT_REC *rec)
 	rec->listen->clients = g_slist_remove(rec->listen->clients, rec);
 
 	signal_emit("proxy client disconnected", 1, rec);
-	printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-		  "Proxy: Client disconnected from %s", rec->host);
+	printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE,
+		  "Proxy: Client %s:%d disconnected", rec->host, rec->port);
 
 	g_free(rec->proxy_address);
 	net_sendbuffer_destroy(rec->handle, TRUE);
@@ -127,8 +127,9 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 			remove_client(client);
 		} else {
 			signal_emit("proxy client connected", 1, client);
-			printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-				  "Proxy: Client finished connecting from %s", client->host);
+			printtext(client->server, NULL, MSGLEVEL_CLIENTNOTICE,
+				  "Proxy: Client %s:%d connected",
+				  client->host, client->port);
 			client->connected = TRUE;
 			proxy_dump_data(client);
 		}
@@ -350,6 +351,7 @@ static void sig_listen(LISTEN_REC *listen)
 	rec->listen = listen;
 	rec->handle = sendbuf;
         rec->host = g_strdup(host);
+	rec->port = port;
 	if (strcmp(listen->ircnet, "*") == 0) {
 		rec->proxy_address = g_strdup("irc.proxy");
 		rec->server = servers == NULL ? NULL : IRC_SERVER(servers->data);
@@ -365,8 +367,9 @@ static void sig_listen(LISTEN_REC *listen)
 	rec->listen->clients = g_slist_prepend(rec->listen->clients, rec);
 
         signal_emit("proxy client connecting", 1, rec);
-	printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-		  "Proxy: Client connecting from %s", rec->host);
+	printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE,
+		  "Proxy: New client %s:%d on port %d (%s)",
+		  rec->host, rec->port, listen->port, listen->ircnet);
 }
 
 static void sig_incoming(IRC_SERVER_REC *server, const char *line)
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index c8f47bdf..75da112c 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -23,6 +23,37 @@
 #include "settings.h"
 #include "levels.h"
 
+#include "fe-common/core/printtext.h"
+
+static void cmd_proxy_status(const char *data, IRC_SERVER_REC *server)
+{
+	GSList *tmp;
+
+	printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
+		  "Proxy: Currently connected clients: %d",
+		  g_slist_length(proxy_clients));
+
+	for (tmp = proxy_clients; tmp != NULL; tmp = tmp->next) {
+		CLIENT_REC *rec = tmp->data;
+
+		printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
+			  "  %s:%d connect%s to %d (%s)",
+			  rec->host, rec->port,
+			  rec->connected ? "ed" : "ing",
+			  rec->listen->port, rec->listen->ircnet);
+	}
+}
+
+static void cmd_proxy(const char *data, IRC_SERVER_REC *server, void *item)
+{
+	if (*data == '\0') {
+		cmd_proxy_status(data, server);
+		return;
+	}
+
+	command_runsub("proxy", data, server, item);
+}
+
 void irc_proxy_init(void)
 {
 	settings_add_str("irssiproxy", "irssiproxy_ports", "");
@@ -43,6 +74,9 @@ void irc_proxy_init(void)
 			    "... to set them.");
 	}
 
+	command_bind("proxy", NULL, (SIGNAL_FUNC) cmd_proxy);
+	command_bind("proxy status", NULL, (SIGNAL_FUNC) cmd_proxy_status);
+
 	proxy_listen_init();
 	settings_check();
         module_register("proxy", "irc");
diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h
index 4ddc9da9..158b0675 100644
--- a/src/irc/proxy/proxy.h
+++ b/src/irc/proxy/proxy.h
@@ -19,6 +19,7 @@ typedef struct {
 
 typedef struct {
 	char *nick, *host;
+	int port;
 	NET_SENDBUF_REC *handle;
 	int recv_tag;
 	char *proxy_address;

From 6a28bad81440290e799c4d4985f31bea6493f58b Mon Sep 17 00:00:00 2001
From: Hans Nielsen <hans@stackallocated.com>
Date: Wed, 25 Jun 2014 22:29:05 -0700
Subject: [PATCH 0069/1650] Add boolean toggle for irssiproxy being enabled

---
 src/irc/proxy/listen.c | 12 ++++++++++++
 src/irc/proxy/proxy.c  | 22 +++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index df0d7479..a5772301 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -37,6 +37,8 @@ GSList *proxy_clients;
 static GString *next_line;
 static int ignore_next;
 
+static int enabled = FALSE;
+
 static void remove_client(CLIENT_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
@@ -682,6 +684,11 @@ static void sig_dump(CLIENT_REC *client, const char *data)
 
 void proxy_listen_init(void)
 {
+	if (enabled) {
+		return;
+	}
+	enabled = TRUE;
+
 	next_line = g_string_new(NULL);
 
 	proxy_clients = NULL;
@@ -703,6 +710,11 @@ void proxy_listen_init(void)
 
 void proxy_listen_deinit(void)
 {
+	if (!enabled) {
+		return;
+	}
+	enabled = FALSE;
+
 	while (proxy_listens != NULL)
 		remove_listen(proxy_listens->data);
 	g_string_free(next_line, TRUE);
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index 75da112c..1cc8aebe 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -27,6 +27,12 @@
 
 static void cmd_proxy_status(const char *data, IRC_SERVER_REC *server)
 {
+	if (!settings_get_bool("irssiproxy")) {
+		printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
+			  "Proxy is currently disabled");
+		return;
+	}
+
 	GSList *tmp;
 
 	printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
@@ -54,11 +60,21 @@ static void cmd_proxy(const char *data, IRC_SERVER_REC *server, void *item)
 	command_runsub("proxy", data, server, item);
 }
 
+static void irc_proxy_setup_changed(void)
+{
+	if (settings_get_bool("irssiproxy")) {
+		proxy_listen_init();
+	} else {
+		proxy_listen_deinit();
+	}
+}
+
 void irc_proxy_init(void)
 {
 	settings_add_str("irssiproxy", "irssiproxy_ports", "");
 	settings_add_str("irssiproxy", "irssiproxy_password", "");
 	settings_add_str("irssiproxy", "irssiproxy_bind", "");
+	settings_add_bool("irssiproxy", "irssiproxy", TRUE);
 
 	if (*settings_get_str("irssiproxy_password") == '\0') {
 		/* no password - bad idea! */
@@ -77,7 +93,11 @@ void irc_proxy_init(void)
 	command_bind("proxy", NULL, (SIGNAL_FUNC) cmd_proxy);
 	command_bind("proxy status", NULL, (SIGNAL_FUNC) cmd_proxy_status);
 
-	proxy_listen_init();
+	signal_add_first("setup changed", (SIGNAL_FUNC) irc_proxy_setup_changed);
+
+	if (settings_get_bool("irssiproxy")) {
+		proxy_listen_init();
+	}
 	settings_check();
         module_register("proxy", "irc");
 }

From ee3f059e6d895cda94bee0a2df7136108012b910 Mon Sep 17 00:00:00 2001
From: Hans Nielsen <hans@stackallocated.com>
Date: Wed, 25 Jun 2014 22:38:03 -0700
Subject: [PATCH 0070/1650] Update proxy documentation with changes

---
 docs/proxy.txt   | 22 ++++++++++++++++++++++
 docs/signals.txt |  1 +
 2 files changed, 23 insertions(+)

diff --git a/docs/proxy.txt b/docs/proxy.txt
index 41875aab..759ef1dc 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -12,6 +12,11 @@ In irssi, say:
 
   /LOAD proxy
 
+If you want the proxy to be loaded automatically at startup, add the
+load command to ~/.irssi/startup:
+
+  echo "load proxy" >> ~/.irssi/startup
+
 You really should set some password for the proxy with:
 
   /SET irssiproxy_password secret
@@ -24,3 +29,20 @@ something like:
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
 make it work properly.
+
+By default, the proxy binds to all available interfaces. To make it
+only listen on (for example) the loopback address:
+
+  /SET irssiproxy_bind 127.0.0.1
+
+Note that bind address changes won't take effect until the proxy is
+disabled and then reenabled.
+
+Once everything is set up, you can enable / disable the proxy:
+
+  /TOGGLE irssiproxy
+
+When the proxy is configured and running, the following command will
+show all the currently connected clients:
+
+  /PROXY status
diff --git a/docs/signals.txt b/docs/signals.txt
index f0860d3e..bd5849f1 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -220,6 +220,7 @@ notifylist.c:
 
 proxy/listen.c:
 
+ "proxy client connecting", CLIENT_REC
  "proxy client connected", CLIENT_REC
  "proxy client disconnected", CLIENT_REC
  "proxy client command", CLIENT_REC, char *args, char *data

From 178d595c96dafe36a7041864a00e1e45375dab76 Mon Sep 17 00:00:00 2001
From: Hans Nielsen <hans@stackallocated.com>
Date: Tue, 1 Jul 2014 21:21:03 -0700
Subject: [PATCH 0071/1650] Add port to proxy client struct for Perl scripts

---
 src/perl/irc/Irc.xs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 18665cb7..a245206c 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -149,6 +149,7 @@ static void perl_client_fill_hash(HV *hv, CLIENT_REC *client)
 {
 	(void) hv_store(hv, "nick", 4, new_pv(client->nick), 0);
 	(void) hv_store(hv, "host", 4, new_pv(client->host), 0);
+	(void) hv_store(hv, "port", 4, newSViv(client->port), 0);
 	(void) hv_store(hv, "proxy_address", 13, new_pv(client->proxy_address), 0);
 	(void) hv_store(hv, "server", 6, iobject_bless(client->server), 0);
 	(void) hv_store(hv, "pass_sent", 9, newSViv(client->pass_sent), 0);

From bbf404b6112aac5cde9732d893e440d9bf363565 Mon Sep 17 00:00:00 2001
From: Hans Nielsen <hans@stackallocated.com>
Date: Mon, 15 Dec 2014 18:41:45 -0800
Subject: [PATCH 0072/1650] Fix whitespace

---
 src/irc/proxy/listen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index a5772301..a1cda250 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -368,7 +368,7 @@ static void sig_listen(LISTEN_REC *listen)
 	proxy_clients = g_slist_prepend(proxy_clients, rec);
 	rec->listen->clients = g_slist_prepend(rec->listen->clients, rec);
 
-        signal_emit("proxy client connecting", 1, rec);
+	signal_emit("proxy client connecting", 1, rec);
 	printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE,
 		  "Proxy: New client %s:%d on port %d (%s)",
 		  rec->host, rec->port, listen->port, listen->ircnet);

From 7beffbdcc5d9ca7433f6617a652ed0b2feca3677 Mon Sep 17 00:00:00 2001
From: Hans Nielsen <hans@stackallocated.com>
Date: Tue, 24 Feb 2015 19:46:59 -0800
Subject: [PATCH 0073/1650] Add help files for proxy module

---
 docs/help/in/proxy.in | 14 ++++++++++++++
 src/irc/proxy/proxy.c |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 docs/help/in/proxy.in

diff --git a/docs/help/in/proxy.in b/docs/help/in/proxy.in
new file mode 100644
index 00000000..2dc61f43
--- /dev/null
+++ b/docs/help/in/proxy.in
@@ -0,0 +1,14 @@
+
+@SYNTAX:proxy@
+
+%9Description:%9
+
+    Displays the list of clients connected to the proxy.
+
+%9Examples:%9
+
+    /PROXY
+    /PROXY STATUS
+
+%9See also:%9 LOAD PROXY, SET irssiproxy
+
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index 1cc8aebe..65c778d1 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -25,6 +25,7 @@
 
 #include "fe-common/core/printtext.h"
 
+/* SYNTAX: PROXY STATUS */
 static void cmd_proxy_status(const char *data, IRC_SERVER_REC *server)
 {
 	if (!settings_get_bool("irssiproxy")) {
@@ -50,6 +51,7 @@ static void cmd_proxy_status(const char *data, IRC_SERVER_REC *server)
 	}
 }
 
+/* SYNTAX: PROXY */
 static void cmd_proxy(const char *data, IRC_SERVER_REC *server, void *item)
 {
 	if (*data == '\0') {

From be8c3c378ad8deea40973083412be3e7a9def2c1 Mon Sep 17 00:00:00 2001
From: Dima Krasner <dima@dimakrasner.com>
Date: Tue, 7 Apr 2015 12:13:45 +0300
Subject: [PATCH 0074/1650] Bug fix - docdir is ignored during installation.

---
 docs/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5e222564..861a2ca4 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,3 @@
-docdir = $(datadir)/doc/irssi
-
 man_MANS = \
 	irssi.1
 

From f5331a3df5f06e8ebe389aee7c91a355d5918d7c Mon Sep 17 00:00:00 2001
From: David Leadbeater <dgl@dgl.cx>
Date: Tue, 7 Apr 2015 10:26:28 +0100
Subject: [PATCH 0075/1650] Make sure NO_ACT isn't cleared when -actcolor %n is
 used

Fixes issue #227.
---
 src/fe-common/core/hilight-text.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 4b914517..ff3a7085 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -337,14 +337,14 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 
 	old_level = dest->level;
 	if (!nick_match || (dest->level & MSGLEVEL_HILIGHT)) {
-		/* update the level / hilight info */
-		hilight_update_text_dest(dest, hilight);
 		/* Remove NO_ACT, this means explicitly defined hilights will bypass
 		 * /IGNORE ... NO_ACT.
 		 * (It's still possible to use /hilight -actcolor %n to hide
 		 * hilight/beep).
 		 */
 		dest->level &= ~MSGLEVEL_NO_ACT;
+		/* update the level / hilight info */
+		hilight_update_text_dest(dest, hilight);
 	}
 
 	if (nick_match)

From 28aaa653cf681b7bf8500b073f74a255a6fb15eb Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Tue, 7 Apr 2015 15:01:57 -0400
Subject: [PATCH 0076/1650] Add SNI support

---
 src/core/network-openssl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index e16403ec..dcd857d8 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -531,6 +531,10 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		return NULL;
 	}
 
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+	SSL_set_tlsext_host_name(ssl, server->connrec->address);
+#endif
+
 	SSL_set_mode(ssl, SSL_MODE_ENABLE_PARTIAL_WRITE |
 			SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
 

From f14199d9c15a8062b5663fa6fcdae00390473b15 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Tue, 7 Apr 2015 22:39:05 -0300
Subject: [PATCH 0077/1650] Change all strcmp() to g_strcmp0() to handle nulls
 gracefully

Just a string replacement (but i did check every one of them)

    sed -i 's/strcmp(/g_strcmp0(/g' **/*.c
---
 src/core/channels.c                   |  2 +-
 src/core/chat-commands.c              |  8 ++---
 src/core/commands.c                   |  2 +-
 src/core/ignore.c                     |  6 ++--
 src/core/levels.c                     |  4 +--
 src/core/log.c                        |  8 ++---
 src/core/misc.c                       |  4 +--
 src/core/modules-load.c               | 18 +++++------
 src/core/modules.c                    |  4 +--
 src/core/nicklist.c                   |  2 +-
 src/core/servers-reconnect.c          |  2 +-
 src/core/servers-setup.c              |  2 +-
 src/core/settings.c                   | 12 ++++----
 src/fe-common/core/command-history.c  |  6 ++--
 src/fe-common/core/completion.c       |  4 +--
 src/fe-common/core/fe-channels.c      |  6 ++--
 src/fe-common/core/fe-exec.c          |  2 +-
 src/fe-common/core/fe-help.c          |  6 ++--
 src/fe-common/core/fe-ignore.c        |  2 +-
 src/fe-common/core/fe-log.c           |  4 +--
 src/fe-common/core/fe-messages.c      |  8 ++---
 src/fe-common/core/fe-queries.c       |  2 +-
 src/fe-common/core/fe-recode.c        |  2 +-
 src/fe-common/core/fe-server.c        |  4 +--
 src/fe-common/core/fe-settings.c      |  2 +-
 src/fe-common/core/hilight-text.c     |  4 +--
 src/fe-common/core/keyboard.c         | 10 +++---
 src/fe-common/core/themes.c           |  6 ++--
 src/fe-common/core/window-commands.c  |  4 +--
 src/fe-common/irc/dcc/fe-dcc-chat.c   |  2 +-
 src/fe-common/irc/fe-events-numeric.c |  4 +--
 src/fe-common/irc/fe-irc-commands.c   |  8 ++---
 src/fe-common/irc/fe-irc-messages.c   |  2 +-
 src/fe-common/irc/fe-modes.c          |  2 +-
 src/fe-common/irc/fe-whois.c          |  6 ++--
 src/fe-text/gui-readline.c            |  2 +-
 src/fe-text/statusbar-config.c        |  4 +--
 src/fe-text/statusbar.c               |  4 +--
 src/fe-text/terminfo-core.c           |  6 ++--
 src/irc/core/bans.c                   |  4 +--
 src/irc/core/channel-events.c         |  2 +-
 src/irc/core/irc-commands.c           | 20 ++++++------
 src/irc/core/irc-queries.c            |  6 ++--
 src/irc/core/irc-servers.c            |  2 +-
 src/irc/core/modes.c                  |  4 +--
 src/irc/core/servers-redirect.c       |  6 ++--
 src/irc/dcc/dcc-autoget.c             |  2 +-
 src/irc/dcc/dcc-chat.c                |  4 +--
 src/irc/dcc/dcc-get.c                 |  2 +-
 src/irc/dcc/dcc.c                     |  4 +--
 src/irc/notifylist/notifylist.c       |  2 +-
 src/irc/proxy/dump.c                  |  2 +-
 src/irc/proxy/listen.c                | 44 +++++++++++++--------------
 src/lib-config/set.c                  |  2 +-
 src/perl/perl-core.c                  |  6 ++--
 src/perl/perl-fe.c                    |  2 +-
 src/perl/perl-signals.c               | 40 ++++++++++++------------
 57 files changed, 170 insertions(+), 170 deletions(-)

diff --git a/src/core/channels.c b/src/core/channels.c
index 8235a4c7..9af8b844 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -167,7 +167,7 @@ static GSList *servers_find_chatnet_except(SERVER_REC *server)
 		SERVER_REC *rec = tmp->data;
 
 		if (server != rec && rec->connrec->chatnet != NULL &&
-		    strcmp(server->connrec->chatnet,
+		    g_strcmp0(server->connrec->chatnet,
 			   rec->connrec->chatnet) == 0) {
 			/* chatnets match */
 			list = g_slist_append(list, rec);
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 8d1ac3eb..c1d874e3 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -58,7 +58,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 		return NULL;
 	}
 
-	if (strcmp(password, "-") == 0)
+	if (g_strcmp0(password, "-") == 0)
 		*password = '\0';
 
         /* check if -<chatnet> option is used to specify chat protocol */
@@ -283,7 +283,7 @@ static void cmd_disconnect(const char *data, SERVER_REC *server)
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &tag, &msg))
 		return;
 
-	if (*tag != '\0' && strcmp(tag, "*") != 0) {
+	if (*tag != '\0' && g_strcmp0(tag, "*") != 0) {
 		server = server_find_tag(tag);
 		if (server == NULL)
 			server = server_find_lookup_tag(tag);
@@ -343,7 +343,7 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 
         origtarget = target;
 	free_ret = FALSE;
-	if (strcmp(target, ",") == 0 || strcmp(target, ".") == 0) {
+	if (g_strcmp0(target, ",") == 0 || g_strcmp0(target, ".") == 0) {
 		target = parse_special(&target, server, item,
 				       NULL, &free_ret, NULL, 0);
 		if (target != NULL && *target == '\0') {
@@ -355,7 +355,7 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	}
 
 	if (target != NULL) {
-		if (strcmp(target, "*") == 0) {
+		if (g_strcmp0(target, "*") == 0) {
                         /* send to active channel/query */
 			if (item == NULL)
 				cmd_param_error(CMDERR_NOT_JOINED);
diff --git a/src/core/commands.c b/src/core/commands.c
index ed82f44e..9e451bc8 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -674,7 +674,7 @@ get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name)
 	origtmp = tmp = g_strdup(*data);
 	channel = cmd_get_param(&tmp);
 
-	if (strcmp(channel, "*") == 0 && !require_name) {
+	if (g_strcmp0(channel, "*") == 0 && !require_name) {
                 /* "*" means active channel */
 		cmd_get_param(data);
 		ret = window_item_get_target(active_item);
diff --git a/src/core/ignore.c b/src/core/ignore.c
index 68fae11f..beca1427 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -201,10 +201,10 @@ IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask,
 	char **chan;
 	int ignore_servertag;
 
-	if (mask != NULL && (*mask == '\0' || strcmp(mask, "*") == 0))
+	if (mask != NULL && (*mask == '\0' || g_strcmp0(mask, "*") == 0))
 		mask = NULL;
 
-	ignore_servertag = servertag != NULL && strcmp(servertag, "*") == 0;
+	ignore_servertag = servertag != NULL && g_strcmp0(servertag, "*") == 0;
 	for (tmp = ignores; tmp != NULL; tmp = tmp->next) {
 		IGNORE_REC *rec = tmp->data;
 
@@ -232,7 +232,7 @@ IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask,
 		if ((channels == NULL && rec->channels == NULL))
 			return rec; /* no channels - ok */
 
-		if (channels != NULL && strcmp(*channels, "*") == 0)
+		if (channels != NULL && g_strcmp0(*channels, "*") == 0)
 			return rec; /* ignore channels */
 
 		if (channels == NULL || rec->channels == NULL)
diff --git a/src/core/levels.c b/src/core/levels.c
index 7997ba98..e623c4de 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -54,7 +54,7 @@ int level_get(const char *level)
 {
 	int n, len, match;
 
-	if (g_ascii_strcasecmp(level, "ALL") == 0 || strcmp(level, "*") == 0)
+	if (g_ascii_strcasecmp(level, "ALL") == 0 || g_strcmp0(level, "*") == 0)
 		return MSGLEVEL_ALL;
 
 	if (g_ascii_strcasecmp(level, "NEVER") == 0)
@@ -177,7 +177,7 @@ int combine_level(int dest, const char *src)
 		itemname = *item + (**item == '+' || **item == '-' ? 1 : 0);
 		itemlevel = level_get(itemname);
 
-		if (strcmp(itemname, "NONE") == 0)
+		if (g_strcmp0(itemname, "NONE") == 0)
                         dest = 0;
 		else if (**item == '-')
 			dest &= ~(itemlevel);
diff --git a/src/core/log.c b/src/core/log.c
index d4d3853e..35e42544 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -110,7 +110,7 @@ int log_start_logging(LOG_REC *log)
 	log->real_fname = log_filename(log);
 
 	if (log->real_fname != NULL &&
-	    strcmp(log->real_fname, log->fname) != 0) {
+	    g_strcmp0(log->real_fname, log->fname) != 0) {
 		/* path may contain variables (%time, $vars),
 		   make sure the directory is created */
 		dir = g_path_get_dirname(log->real_fname);
@@ -181,7 +181,7 @@ static void log_rotate_check(LOG_REC *log)
 		return;
 
 	new_fname = log_filename(log);
-	if (strcmp(new_fname, log->real_fname) != 0) {
+	if (g_strcmp0(new_fname, log->real_fname) != 0) {
 		/* rotate log */
 		log_stop_logging(log);
 		signal_emit("log rotated", 1, log);
@@ -245,7 +245,7 @@ static int itemcmp(const char *patt, const char *item)
 {
 	/* returns 0 on match, nonzero otherwise */
 
-	if (!strcmp(patt, "*"))
+	if (!g_strcmp0(patt, "*"))
 		return 0;
         return item ? g_ascii_strcasecmp(patt, item) : 1;
 }
@@ -320,7 +320,7 @@ LOG_REC *log_find(const char *fname)
 	for (tmp = logs; tmp != NULL; tmp = tmp->next) {
 		LOG_REC *rec = tmp->data;
 
-		if (strcmp(rec->fname, fname) == 0)
+		if (g_strcmp0(rec->fname, fname) == 0)
 			return rec;
 	}
 
diff --git a/src/core/misc.c b/src/core/misc.c
index 586e4f7c..ef8501d5 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -184,7 +184,7 @@ int strarray_find(char **array, const char *item)
 GSList *gslist_find_string(GSList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
-		if (strcmp(list->data, key) == 0) return list;
+		if (g_strcmp0(list->data, key) == 0) return list;
 
 	return NULL;
 }
@@ -269,7 +269,7 @@ GSList *hashtable_get_keys(GHashTable *hash)
 GList *glist_find_string(GList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
-		if (strcmp(list->data, key) == 0) return list;
+		if (g_strcmp0(list->data, key) == 0) return list;
 
 	return NULL;
 }
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index 49f811de..6086d9ae 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -78,7 +78,7 @@ static char *module_get_root(const char *name, char **prefixes)
 
 	/* skip the _core part */
         len = strlen(name);
-	if (len > 5 && strcmp(name+len-5, "_core") == 0)
+	if (len > 5 && g_strcmp0(name+len-5, "_core") == 0)
 		return g_strndup(name, len-5);
 
         return g_strdup(name);
@@ -94,11 +94,11 @@ static char *module_get_sub(const char *name, const char *root)
         g_return_val_if_fail(namelen >= rootlen, g_strdup(name));
 
 	if (strncmp(name, root, rootlen) == 0 &&
-	    strcmp(name+rootlen, "_core") == 0)
+	    g_strcmp0(name+rootlen, "_core") == 0)
                 return g_strdup("core");
 
 	if (namelen > rootlen && name[namelen-rootlen-1] == '_' &&
-	    strcmp(name+namelen-rootlen, root) == 0)
+	    g_strcmp0(name+namelen-rootlen, root) == 0)
                 return g_strndup(name, namelen-rootlen-1);
 
         return g_strdup(name);
@@ -140,10 +140,10 @@ static GModule *module_open(const char *name, int *found)
 static char *module_get_func(const char *rootmodule, const char *submodule,
 			     const char *function)
 {
-	if (strcmp(submodule, "core") == 0)
+	if (g_strcmp0(submodule, "core") == 0)
 		return g_strconcat(rootmodule, "_core_", function, NULL);
 
-	if (strcmp(rootmodule, submodule) == 0)
+	if (g_strcmp0(rootmodule, submodule) == 0)
 		return g_strconcat(rootmodule, "_", function, NULL);
 
 	return g_strconcat(submodule, "_", rootmodule, "_", function, NULL);
@@ -200,7 +200,7 @@ static int module_load_name(const char *path, const char *rootmodule,
 
 	module = module_find(rootmodule);
 	rec = module == NULL ? NULL :
-                strcmp(rootmodule, submodule) == 0 ?
+                g_strcmp0(rootmodule, submodule) == 0 ?
 		module_file_find(module, "core") :
 		module_file_find(module, submodule);
 	if (rec == NULL) {
@@ -277,7 +277,7 @@ static int module_load_full(const char *path, const char *rootmodule,
 		return FALSE;
 
 	module = module_find(rootmodule);
-	if (module != NULL && (strcmp(submodule, rootmodule) == 0 ||
+	if (module != NULL && (g_strcmp0(submodule, rootmodule) == 0 ||
 			       module_file_find(module, submodule) != NULL)) {
                 /* module is already loaded */
 		module_error(MODULE_ERROR_ALREADY_LOADED, NULL,
@@ -286,7 +286,7 @@ static int module_load_full(const char *path, const char *rootmodule,
 	}
 
 	/* check if the given module exists.. */
-	try_prefixes = strcmp(rootmodule, submodule) == 0;
+	try_prefixes = g_strcmp0(rootmodule, submodule) == 0;
 	status = module_load_name(path, rootmodule, submodule, try_prefixes);
 	if (status == -1 && try_prefixes) {
 		/* nope, try loading the module_core,
@@ -340,7 +340,7 @@ int module_load_sub(const char *path, const char *submodule, char **prefixes)
 	g_free(name);
 
         full_path = g_string_new(exppath);
-	if (strcmp(submodule, "core") == 0)
+	if (g_strcmp0(submodule, "core") == 0)
 		g_string_insert(full_path, end, "_core");
 	else {
 		g_string_insert_c(full_path, start, '_');
diff --git a/src/core/modules.c b/src/core/modules.c
index b002819b..a2542c84 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -44,7 +44,7 @@ void *module_check_cast_module(void *object, int type_pos,
 
 	str = module_find_id_str(module,
 				 G_STRUCT_MEMBER(int, object, type_pos));
-	return str == NULL || strcmp(str, id) != 0 ? NULL : object;
+	return str == NULL || g_strcmp0(str, id) != 0 ? NULL : object;
 }
 
 /* return unique number across all modules for `id' */
@@ -251,7 +251,7 @@ MODULE_FILE_REC *module_file_find(MODULE_REC *module, const char *name)
 	for (tmp = module->files; tmp != NULL; tmp = tmp->next) {
 		MODULE_FILE_REC *rec = tmp->data;
 
-		if (strcmp(rec->name, name) == 0)
+		if (g_strcmp0(rec->name, name) == 0)
                         return rec;
 	}
 
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index b1c9ecef..a96b8a9e 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -478,7 +478,7 @@ static NICK_REC *nick_nfind(CHANNEL_REC *channel, const char *nick, int len)
 	if (rec != NULL) {
 		/* if there's multiple, get the one with identical case */
 		while (rec->next != NULL) {
-			if (strcmp(rec->nick, tmpnick) == 0)
+			if (g_strcmp0(rec->nick, tmpnick) == 0)
 				break;
                         rec = rec->next;
 		}
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index d99a5405..d7660110 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -384,7 +384,7 @@ static void cmd_reconnect(const char *data, SERVER_REC *server)
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &tag, &msg))
 		return;
 
-	if (*tag != '\0' && strcmp(tag, "*") != 0)
+	if (*tag != '\0' && g_strcmp0(tag, "*") != 0)
 		server = server_find_tag(tag);
 
 	if (server != NULL) {
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 27d9f1f0..85aae0e2 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -526,7 +526,7 @@ static void read_servers(void)
 static void read_settings(void)
 {
 	if (old_source_host == NULL ||
-	    strcmp(old_source_host, settings_get_str("hostname")) != 0) {
+	    g_strcmp0(old_source_host, settings_get_str("hostname")) != 0) {
                 g_free_not_null(old_source_host);
 		old_source_host = g_strdup(settings_get_str("hostname"));
 
diff --git a/src/core/settings.c b/src/core/settings.c
index 2296909e..2c43fd10 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -295,7 +295,7 @@ void settings_remove(const char *key)
 static int settings_remove_hash(const char *key, SETTINGS_REC *rec,
 				const char *module)
 {
-	if (strcmp(rec->module, module) == 0) {
+	if (g_strcmp0(rec->module, module) == 0) {
 		settings_unref(rec, FALSE);
                 return TRUE;
 	}
@@ -428,7 +428,7 @@ static void settings_clean_invalid_module(const char *module)
                 next = config_node_next(tmp);
 
 		set = g_hash_table_lookup(settings, subnode->key);
-		if (set == NULL || strcmp(set->module, module) != 0)
+		if (set == NULL || g_strcmp0(set->module, module) != 0)
                         iconfig_node_remove(node, subnode);
 	}
 }
@@ -458,7 +458,7 @@ static int backwards_compatibility(const char *module, CONFIG_NODE *node,
 	new_value = NULL; new_key = NULL; new_module = NULL;
 
 	/* fe-text term_type -> fe-common/core term_charset - for 0.8.10-> */
-	if (strcmp(module, "fe-text") == 0) {
+	if (g_strcmp0(module, "fe-text") == 0) {
 		if (g_ascii_strcasecmp(node->key, "term_type") == 0 ||
 		    /* kludge for cvs-version where term_charset was in fe-text */
 		    g_ascii_strcasecmp(node->key, "term_charset") == 0) {
@@ -520,7 +520,7 @@ void settings_check_module(const char *module)
 		if (backwards_compatibility(module, node, parent))
 			continue;
 
-		if (set == NULL || strcmp(set->module, module) != 0) {
+		if (set == NULL || g_strcmp0(set->module, module) != 0) {
 			g_string_append_printf(errors, " %s", node->key);
                         count++;
 		}
@@ -548,9 +548,9 @@ void settings_check_module(const char *module)
 
 static int settings_compare(SETTINGS_REC *v1, SETTINGS_REC *v2)
 {
-	int cmp = strcmp(v1->section, v2->section);
+	int cmp = g_strcmp0(v1->section, v2->section);
 	if (!cmp)
-		cmp = strcmp(v1->key, v2->key);
+		cmp = g_strcmp0(v1->key, v2->key);
 	return cmp;
 }
 
diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 37405c43..f9c3884c 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -42,7 +42,7 @@ void command_history_add(HISTORY_REC *history, const char *text)
 	g_return_if_fail(text != NULL);
 
 	link = g_list_last(history->list);
-	if (link != NULL && strcmp(link->data, text) == 0)
+	if (link != NULL && g_strcmp0(link->data, text) == 0)
 	  return; /* same as previous entry */
 
 	if (settings_get_int("max_command_history") < 1 ||
@@ -121,7 +121,7 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
 	}
 
 	if (*text != '\0' &&
-	    (pos == NULL || strcmp(pos->data, text) != 0)) {
+	    (pos == NULL || g_strcmp0(pos->data, text) != 0)) {
 		/* save the old entry to history */
 		command_history_add(history, text);
 	}
@@ -145,7 +145,7 @@ const char *command_history_next(WINDOW_REC *window, const char *text)
 	}
 
 	if (*text != '\0' &&
-	    (pos == NULL || strcmp(pos->data, text) != 0)) {
+	    (pos == NULL || g_strcmp0(pos->data, text) != 0)) {
 		/* save the old entry to history */
 		command_history_add(history, text);
 	}
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 31d62e10..c607a884 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -141,7 +141,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 	g_return_val_if_fail(pos != NULL, NULL);
 
 	continue_complete = complist != NULL && *pos == last_line_pos &&
-		strcmp(line, last_line) == 0;
+		g_strcmp0(line, last_line) == 0;
 
 	if (erase && !continue_complete)
 		return NULL;
@@ -681,7 +681,7 @@ static void sig_complete_set(GList **list, WINDOW_REC *window,
 	g_return_if_fail(line != NULL);
 
 	if (*line == '\0' ||
-	    !strcmp("-clear", line) || !strcmp("-default", line))
+	    !g_strcmp0("-clear", line) || !g_strcmp0("-default", line))
 		*list = completion_get_settings(word, -1);
 	else if (*line != '\0' && *word == '\0') {
 		SETTINGS_REC *rec = settings_get_record(line);
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index aefd1034..a171596d 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -287,7 +287,7 @@ static void cmd_channel_add(const char *data)
 	if (g_hash_table_lookup(optlist, "noauto")) rec->autojoin = FALSE;
 	if (botarg != NULL && *botarg != '\0') rec->botmasks = g_strdup(botarg);
 	if (botcmdarg != NULL && *botcmdarg != '\0') rec->autosendcmd = g_strdup(botcmdarg);
-	if (*password != '\0' && strcmp(password, "-") != 0) rec->password = g_strdup(password);
+	if (*password != '\0' && g_strcmp0(password, "-") != 0) rec->password = g_strdup(password);
 
 	signal_emit("channel add fill", 2, rec, optlist);
 
@@ -523,7 +523,7 @@ static void cmd_names(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 			    "names", &optlist, &channel))
 		return;
 
-	if (strcmp(channel, "*") == 0 || *channel == '\0') {
+	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
 		if (!IS_CHANNEL(item))
                         cmd_param_error(CMDERR_NOT_JOINED);
 
@@ -561,7 +561,7 @@ static void cmd_names(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	if (unknowns->len > 1)
                 g_string_truncate(unknowns, unknowns->len-1);
 
-	if (unknowns->len > 0 && strcmp(channel, unknowns->str) != 0)
+	if (unknowns->len > 0 && g_strcmp0(channel, unknowns->str) != 0)
                 signal_emit("command names", 3, unknowns->str, server, item);
         g_string_free(unknowns, TRUE);
 
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index 9249f432..b5f289ce 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -161,7 +161,7 @@ static PROCESS_REC *process_find(const char *name, int verbose)
 	for (tmp = processes; tmp != NULL; tmp = tmp->next) {
 		PROCESS_REC *rec = tmp->data;
 
-		if (rec->name != NULL && strcmp(rec->name, name) == 0)
+		if (rec->name != NULL && g_strcmp0(rec->name, name) == 0)
 			return rec;
 	}
 
diff --git a/src/fe-common/core/fe-help.c b/src/fe-common/core/fe-help.c
index 4ea7c89f..23a6e701 100644
--- a/src/fe-common/core/fe-help.c
+++ b/src/fe-common/core/fe-help.c
@@ -37,12 +37,12 @@ static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
 	if (rec2->category == NULL && rec->category != NULL)
 		return 1;
 	if (rec->category != NULL && rec2->category != NULL) {
-		i = strcmp(rec->category, rec2->category);
+		i = g_strcmp0(rec->category, rec2->category);
 		if (i != 0)
 			return i;
 	}
 
-	return strcmp(rec->cmd, rec2->cmd);
+	return g_strcmp0(rec->cmd, rec2->cmd);
 }
 
 static int get_cmd_length(void *data)
@@ -176,7 +176,7 @@ static void show_help(const char *data)
 
 		if (last != NULL && rec->category != NULL &&
 		    (last->category == NULL ||
-		     strcmp(rec->category, last->category) != 0)) {
+		     g_strcmp0(rec->category, last->category) != 0)) {
 			/* category changed */
 			if (items > 0) {
 				if (!header) {
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 1a0b8339..533cda31 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -165,7 +165,7 @@ static void cmd_ignore(const char *data)
 		rec = g_new0(IGNORE_REC, 1);
 
 		rec->mask = mask == NULL || *mask == '\0' ||
-			strcmp(mask, "*") == 0 ? NULL : g_strdup(mask);
+			g_strcmp0(mask, "*") == 0 ? NULL : g_strdup(mask);
 		rec->channels = channels;
 	} else {
                 g_free_and_null(rec->pattern);
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 9d68faf9..a39623d2 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -485,7 +485,7 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 		return;
 
 	if (target != NULL)
-		autolog_open(server, server_tag, strcmp(target, "*") ? target : deftarget);
+		autolog_open(server, server_tag, g_strcmp0(target, "*") ? target : deftarget);
 }
 
 static void log_single_line(WINDOW_REC *window, const char *server_tag,
@@ -629,7 +629,7 @@ static void sig_log_create_failed(LOG_REC *log)
 static void sig_log_new(LOG_REC *log)
 {
 	if (!settings_get_bool("awaylog_colors") &&
-	    strcmp(log->fname, settings_get_str("awaylog_file")) == 0)
+	    g_strcmp0(log->fname, settings_get_str("awaylog_file")) == 0)
                 log->colorizer = log_colorizer_strip;
 }
 
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 1d44bdd9..3bd2b666 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -249,7 +249,7 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
 	int level = MSGLEVEL_MSGS;
 
 	/* own message returned by bouncer? */
-	int own = (!strcmp(nick, server->nick));
+	int own = (!g_strcmp0(nick, server->nick));
 
 	query = query_find(server, own ? target : nick);
 
@@ -323,8 +323,8 @@ static void sig_message_own_private(SERVER_REC *server, const char *msg,
 		/* this should only happen if some special target failed and
 		   we should display some error message. currently the special
 		   targets are only ',' and '.'. */
-		g_return_if_fail(strcmp(origtarget, ",") == 0 ||
-				 strcmp(origtarget, ".") == 0);
+		g_return_if_fail(g_strcmp0(origtarget, ",") == 0 ||
+				 g_strcmp0(origtarget, ".") == 0);
 
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 			    *origtarget == ',' ? TXT_NO_MSGS_GOT :
@@ -569,7 +569,7 @@ static int printnick_exists(NICK_REC *first, NICK_REC *ignore,
 	while (first != NULL) {
 		if (first != ignore) {
 			printnick = g_hash_table_lookup(printnicks, first);
-			if (printnick != NULL && strcmp(printnick, nick) == 0)
+			if (printnick != NULL && g_strcmp0(printnick, nick) == 0)
 				return TRUE;
 		}
 
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 5cdf87ee..121417e4 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -331,7 +331,7 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
 	QUERY_REC *query;
 
 	/* own message returned by bouncer? */
-	int own = (!strcmp(nick, server->nick));
+	int own = (!g_strcmp0(nick, server->nick));
 
 	/* create query window if needed */
 	query = privmsg_get_query(server, own ? target : nick, FALSE, MSGLEVEL_MSGS);
diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c
index dbc43574..829c89e7 100644
--- a/src/fe-common/core/fe-recode.c
+++ b/src/fe-common/core/fe-recode.c
@@ -45,7 +45,7 @@ static const char *fe_recode_get_target (WI_ITEM_REC *witem)
 
 static int fe_recode_compare_func (CONFIG_NODE *node1, CONFIG_NODE *node2)
 {
-	return strcmp(node1->key, node2->key);
+	return g_strcmp0(node1->key, node2->key);
 }
 
 /* SYNTAX: RECODE */
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 2dec1d8a..667c68fa 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -185,7 +185,7 @@ static void cmd_server_add(const char *data)
 	if (g_hash_table_lookup(optlist, "proxy")) rec->no_proxy = FALSE;
 	if (g_hash_table_lookup(optlist, "noproxy")) rec->no_proxy = TRUE;
 
-	if (*password != '\0' && strcmp(password, "-") != 0) rec->password = g_strdup(password);
+	if (*password != '\0' && g_strcmp0(password, "-") != 0) rec->password = g_strdup(password);
 	value = g_hash_table_lookup(optlist, "host");
 	if (value != NULL && *value != '\0') {
 		rec->own_host = g_strdup(value);
@@ -264,7 +264,7 @@ static void cmd_server_connect(const char *data)
 			    "connect", &optlist, &addr))
 		return;
 
-	if (*addr == '\0' || strcmp(addr, "+") == 0)
+	if (*addr == '\0' || g_strcmp0(addr, "+") == 0)
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 	if (*addr == '+') window_create(NULL, FALSE);
 
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index 96e03ceb..9c370838 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -53,7 +53,7 @@ static void set_print_pattern(const char *pattern)
 
 		if (stristr(rec->key, pattern) == NULL)
 			continue;
-		if (strcmp(last_section, rec->section) != 0) {
+		if (g_strcmp0(last_section, rec->section) != 0) {
 			/* print section */
 			printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP,
 				    TXT_SET_TITLE, rec->section);
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index ff3a7085..beb4ed7a 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -168,7 +168,7 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
 		if ((channels == NULL && rec->channels == NULL))
 			return rec; /* no channels - ok */
 
-		if (channels != NULL && strcmp(*channels, "*") == 0)
+		if (channels != NULL && g_strcmp0(*channels, "*") == 0)
 			return rec; /* ignore channels */
 
 		if (channels == NULL || rec->channels == NULL)
@@ -306,7 +306,7 @@ void hilight_update_text_dest(TEXT_DEST_REC *dest, HILIGHT_REC *rec)
 		dest->hilight_priority = rec->priority;
 
 	g_free_and_null(dest->hilight_color);
-	if (rec->act_color != NULL && strcmp(rec->act_color, "%n") == 0)
+	if (rec->act_color != NULL && g_strcmp0(rec->act_color, "%n") == 0)
 		dest->level |= MSGLEVEL_NO_ACT;
         else
 		dest->hilight_color = hilight_get_act_color(rec);
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index bec1502e..eac8525b 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -118,7 +118,7 @@ static CONFIG_NODE *key_config_find(const char *key)
 	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		node = tmp->data;
 
-		if (strcmp(config_node_get_str(node, "key", ""), key) == 0)
+		if (g_strcmp0(config_node_get_str(node, "key", ""), key) == 0)
                         return node;
 	}
 
@@ -211,7 +211,7 @@ static int expand_combo(const char *start, const char *end, GSList **out)
 	for (tmp = info->keys; tmp != NULL; tmp = tmp->next) {
 		KEY_REC *rec = tmp->data;
 
-		if (strcmp(rec->data, str) == 0)
+		if (g_strcmp0(rec->data, str) == 0)
                         list = g_slist_append(list, rec);
 	}
 
@@ -347,7 +347,7 @@ static void key_states_scan_key(const char *key, KEY_REC *rec)
 {
 	GSList *tmp, *out;
 
-	if (strcmp(rec->info->id, "key") == 0)
+	if (g_strcmp0(rec->info->id, "key") == 0)
 		return;
 
         out = g_slist_append(NULL, g_string_new(NULL));
@@ -383,7 +383,7 @@ static void key_states_rescan(void)
 	g_tree_foreach(key_states, (GTraverseFunc) key_state_destroy,
 			NULL);
 	g_tree_destroy(key_states);
-	key_states = g_tree_new((GCompareFunc) strcmp);
+	key_states = g_tree_new((GCompareFunc) g_strcmp0);
 
         temp = g_string_new(NULL);
 	g_hash_table_foreach(keys, (GHFunc) key_states_scan_key, temp);
@@ -860,7 +860,7 @@ void keyboard_init(void)
 	default_keys = g_hash_table_new((GHashFunc) g_str_hash,
 					(GCompareFunc) g_str_equal);
 	keyinfos = NULL;
-	key_states = g_tree_new((GCompareFunc) strcmp);
+	key_states = g_tree_new((GCompareFunc) g_strcmp0);
         key_config_frozen = 0;
 	memset(used_keys, 0, sizeof(used_keys));
 
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index c0741cef..0ef98fee 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -895,7 +895,7 @@ THEME_REC *theme_load(const char *setname)
 
         name = g_strdup(setname);
 	p = strrchr(name, '.');
-	if (p != NULL && strcmp(p, ".theme") == 0) {
+	if (p != NULL && g_strcmp0(p, ".theme") == 0) {
 		/* remove the trailing .theme */
                 *p = '\0';
 	}
@@ -1358,9 +1358,9 @@ static void read_settings(void)
 
 	theme = settings_get_str("theme");
 	len = strlen(current_theme->name);
-	if (strcmp(current_theme->name, theme) != 0 &&
+	if (g_strcmp0(current_theme->name, theme) != 0 &&
 	    (strncmp(current_theme->name, theme, len) != 0 ||
-	     strcmp(theme+len, ".theme") != 0))
+	     g_strcmp0(theme+len, ".theme") != 0))
 		change_theme(theme, TRUE);
 }
 
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 61357324..c6ab68c0 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -127,7 +127,7 @@ static void cmd_window_info(WINDOW_REC *win)
 				   win->active_server->tag : "NONE");
 	} else {
 		if (win->active_server != NULL &&
-		    strcmp(win->active_server->tag, win->servertag) != 0)
+		    g_strcmp0(win->active_server->tag, win->servertag) != 0)
                         g_warning("Active server isn't the sticky server!");
 
 		printformat_window(win, MSGLEVEL_CLIENTCRAP,
@@ -609,7 +609,7 @@ static void cmd_window_name(const char *data)
 	if (win == NULL || win == active_win)
 		window_set_name(active_win, data);
 	else if (active_win->name == NULL ||
-		 strcmp(active_win->name, data) != 0) {
+		 g_strcmp0(active_win->name, data) != 0) {
 		printformat_window(active_win, MSGLEVEL_CLIENTERROR,
 				   TXT_WINDOW_NAME_NOT_UNIQUE, data);
 	}
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat.c b/src/fe-common/irc/dcc/fe-dcc-chat.c
index 101aeb31..e2706ba3 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat.c
@@ -243,7 +243,7 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		return;
 
 	/* handle only DCC messages */
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		dcc = item_get_dcc(item);
 	else if (*target == '=')
 		dcc = dcc_chat_find_id(target+1);
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index d6c02d9f..ec7669ab 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -427,7 +427,7 @@ static void event_no_such_nick(IRC_SERVER_REC *server, const char *data,
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 2, NULL, &unick);
-	if (!strcmp(unick, "*"))
+	if (!g_strcmp0(unick, "*"))
 		/* more information will be in the description,
 		 * e.g. * :Target left IRC. Failed to deliver: [hi] */
 		print_event_received(server, data, nick, FALSE);
@@ -605,7 +605,7 @@ static void print_event_received(IRC_SERVER_REC *server, const char *data,
 
 	recoded = recode_in(SERVER(server), args, NULL);
 	format = nick == NULL || server->real_address == NULL ||
-		strcmp(nick, server->real_address) == 0 ?
+		g_strcmp0(nick, server->real_address) == 0 ?
 		IRCTXT_DEFAULT_EVENT : IRCTXT_DEFAULT_EVENT_SERVER;
 	printformat(server, target, MSGLEVEL_CRAP, format,
 		    nick, recoded, current_server_event);
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index b380c214..a23facbd 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -110,7 +110,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
 			    &target, &msg))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? "" : window_item_get_target(item);
 
 	if (*target == '\0' || *msg == '\0')
@@ -133,7 +133,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
 			    &target, &ctcpcmd, &ctcpdata))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? "" : window_item_get_target(item);
 	if (*target == '\0' || *ctcpcmd == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -162,7 +162,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
 			    &target, &text))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? "" : window_item_get_target(item);
 	if (*target == '\0' || *text == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -262,7 +262,7 @@ static void cmd_ban(const char *data, IRC_SERVER_REC *server,
 	if (chanrec == NULL && *channel == '\0')
 		cmd_param_error(CMDERR_NOT_JOINED);
 
-	if (*channel != '\0' && strcmp(channel, "*") != 0)
+	if (*channel != '\0' && g_strcmp0(channel, "*") != 0)
 		chanrec = irc_channel_find(server, channel);
 
 	if (chanrec == NULL || !chanrec->synced) {
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 314f4f53..94d1ad4a 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -178,7 +178,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	if (ischannel(*target)) {
 		item = irc_channel_find(server, target);
 	} else {
-		own = (!strcmp(nick, server->nick));
+		own = (!g_strcmp0(nick, server->nick));
 		item = privmsg_get_query(SERVER(server), own ? target : nick, FALSE, level);
 	}
 
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index 027d7a76..e5317c0f 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -135,7 +135,7 @@ static void msg_multi_mode(IRC_CHANNEL_REC *channel, const char *sender,
 		signal_add("print starting", (SIGNAL_FUNC) sig_print_starting);
 
 	rec = mode_find_channel(channel);
-	if (rec != NULL && strcmp(rec->mode, mode) != 0) {
+	if (rec != NULL && g_strcmp0(rec->mode, mode) != 0) {
 		/* different mode than last time, show and remove the old */
 		print_mode(rec);
 		mode_destroy(rec);
diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c
index a9c3775e..117df120 100644
--- a/src/fe-common/irc/fe-whois.c
+++ b/src/fe-common/irc/fe-whois.c
@@ -134,8 +134,8 @@ static void event_whois_realhost(IRC_SERVER_REC *server, const char *data)
         /* <yournick> real hostname <nick> <hostname> */
 	params = event_get_params(data, 5, NULL, &nick, &txt_real,
 				  &txt_hostname, &hostname);
-	if (strcmp(txt_real, "real") != 0 ||
-	    strcmp(txt_hostname, "hostname") != 0) {
+	if (g_strcmp0(txt_real, "real") != 0 ||
+	    g_strcmp0(txt_hostname, "hostname") != 0) {
 		/* <yournick> <nick> :... from <hostname> */
                 g_free(params);
 		params = event_get_params(data, 3, NULL, &nick, &hostname);
@@ -219,7 +219,7 @@ static void event_whois_usermode(IRC_SERVER_REC *server, const char *data)
 	params = event_get_params(data, 4, NULL, &txt_usermodes,
 				  &nick, &usermode);
 
-	if (strcmp(txt_usermodes, "usermodes") == 0) {
+	if (g_strcmp0(txt_usermodes, "usermodes") == 0) {
 		/* <yournick> usermodes <nick> usermode */
 		printformat(server, nick, MSGLEVEL_CRAP,
 			    IRCTXT_WHOIS_USERMODE, nick, usermode);
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index e93f2293..edc4c55d 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -392,7 +392,7 @@ static void sig_gui_key_pressed(gpointer keyp)
 		str[g_unichar_to_utf8(key, str)] = '\0';
 	}
 
-	if (strcmp(str, "^") == 0) {
+	if (g_strcmp0(str, "^") == 0) {
 		/* change it as ^-, that is an invalid control char */
 		str[1] = '-';
 		str[2] = '\0';
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index deaa1b5d..7b3fe252 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -95,7 +95,7 @@ statusbar_config_find(STATUSBAR_GROUP_REC *group, const char *name)
 	for (tmp = group->config_bars; tmp != NULL; tmp = tmp->next) {
 		STATUSBAR_CONFIG_REC *config = tmp->data;
 
-		if (strcmp(config->name, name) == 0)
+		if (g_strcmp0(config->name, name) == 0)
                         return config;
 	}
 
@@ -137,7 +137,7 @@ static void statusbar_read_item(STATUSBAR_CONFIG_REC *bar, CONFIG_NODE *node)
 	int priority, right_alignment;
 
 	priority = config_node_get_int(node, "priority", 0);
-	right_alignment = strcmp(config_node_get_str(node, "alignment", ""), "right") == 0;
+	right_alignment = g_strcmp0(config_node_get_str(node, "alignment", ""), "right") == 0;
 	statusbar_item_config_create(bar, node->key,
 				     priority, right_alignment);
 }
diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c
index b340553f..5448243a 100644
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@@ -129,7 +129,7 @@ STATUSBAR_GROUP_REC *statusbar_group_find(const char *name)
 	for (tmp = statusbar_groups; tmp != NULL; tmp = tmp->next) {
 		STATUSBAR_GROUP_REC *rec = tmp->data;
 
-		if (strcmp(rec->name, name) == 0)
+		if (g_strcmp0(rec->name, name) == 0)
                         return rec;
 	}
 
@@ -617,7 +617,7 @@ STATUSBAR_REC *statusbar_find(STATUSBAR_GROUP_REC *group, const char *name,
 		STATUSBAR_REC *rec = tmp->data;
 
 		if (rec->parent_window == window &&
-		    strcmp(rec->config->name, name) == 0)
+		    g_strcmp0(rec->config->name, name) == 0)
                         return rec;
 	}
 
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index d16987fe..0516cc5f 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -646,11 +646,11 @@ static int term_setup(TERM_REC *term)
         str = g_string_new(NULL);
 	if (term->TI_sgr0)
 		g_string_append(str, term->TI_sgr0);
-	if (term->TI_rmul && (term->TI_sgr0 == NULL || strcmp(term->TI_rmul, term->TI_sgr0) != 0))
+	if (term->TI_rmul && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmul, term->TI_sgr0) != 0))
 		g_string_append(str, term->TI_rmul);
-	if (term->TI_rmso && (term->TI_sgr0 == NULL || strcmp(term->TI_rmso, term->TI_sgr0) != 0))
+	if (term->TI_rmso && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmso, term->TI_sgr0) != 0))
 		g_string_append(str, term->TI_rmso);
-	if (term->TI_ritm && (term->TI_sgr0 == NULL || strcmp(term->TI_ritm, term->TI_sgr0) != 0))
+	if (term->TI_ritm && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_ritm, term->TI_sgr0) != 0))
 		g_string_append(str, term->TI_ritm);
         term->TI_normal = str->str;
 	g_string_free(str, FALSE);
diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index 38c81aab..b60e681b 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -188,7 +188,7 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server,
 			    item, &channel, &nicks)) return;
 	if (!ischannel(*channel)) cmd_param_error(CMDERR_NOT_JOINED);
 	if (*nicks == '\0') {
-		if (strcmp(data, "*") != 0)
+		if (g_strcmp0(data, "*") != 0)
 			cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
                 /* /BAN * or /UNBAN * - ban/unban everyone */
 		nicks = (char *) data;
@@ -318,7 +318,7 @@ static void cmd_unban(const char *data, IRC_SERVER_REC *server, void *item)
 static void read_settings(void)
 {
 	if (default_ban_type_str != NULL &&
-	    strcmp(default_ban_type_str, settings_get_str("ban_type")) == 0)
+	    g_strcmp0(default_ban_type_str, settings_get_str("ban_type")) == 0)
 		return;
 
 	g_free_not_null(default_ban_type_str);
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 6fdfeef3..6cb9b088 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -270,7 +270,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data, const char *nic
 	}
 
 	chanrec->joined = TRUE;
-	if (strcmp(chanrec->name, channel) != 0) {
+	if (g_strcmp0(chanrec->name, channel) != 0) {
                 g_free(chanrec->name);
 		chanrec->name = g_strdup(channel);
 	}
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 7c3d3f5f..e7fb5067 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -72,7 +72,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
 			    &target, &msg))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
 	if (target == NULL || *target == '\0' || *msg == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -99,7 +99,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
 			    &target, &ctcpcmd, &ctcpdata))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
 	if (target == NULL || *target == '\0' || *ctcpcmd == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -133,7 +133,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
 			    &target, &ctcpcmd, &ctcpdata))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
 	if (target == NULL || *target == '\0' || *ctcpcmd == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -238,7 +238,7 @@ static void cmd_invite(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *it
 		return;
 
 	if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-	if (*channame == '\0' || strcmp(channame, "*") == 0) {
+	if (*channame == '\0' || g_strcmp0(channame, "*") == 0) {
 		if (!IS_IRC_CHANNEL(item))
 			cmd_param_error(CMDERR_NOT_JOINED);
 
@@ -284,13 +284,13 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &channel, &rest))
 		return;
 
-	if (strcmp(channel, "*") == 0 || *channel == '\0') {
+	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
 		if (!IS_IRC_CHANNEL(item))
                         cmd_param_error(CMDERR_NOT_JOINED);
 
 		channel = IRC_CHANNEL(item)->name;
 	}
-	if (strcmp(channel, "**") == 0) {
+	if (g_strcmp0(channel, "**") == 0) {
 		/* ** displays all nicks.. */
 		*channel = '\0';
 	}
@@ -313,14 +313,14 @@ static void cmd_names(const char *data, IRC_SERVER_REC *server,
 			    PARAM_FLAG_GETREST, "names", &optlist, &channel))
 		return;
 
-	if (strcmp(channel, "*") == 0 || *channel == '\0') {
+	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
 		if (!IS_IRC_CHANNEL(item))
                         cmd_param_error(CMDERR_NOT_JOINED);
 
 		channel = IRC_CHANNEL(item)->name;
 	}
 
-	if (strcmp(channel, "**") == 0) {
+	if (g_strcmp0(channel, "**") == 0) {
 		/* ** displays all nicks.. */
                 irc_send_cmd(server, "NAMES");
 	} else {
@@ -409,7 +409,7 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
 			query = qserver = queryitem->name;
 	}
 
-	if (strcmp(query, "*") == 0 &&
+	if (g_strcmp0(query, "*") == 0 &&
 	    g_hash_table_lookup(optlist, "yes") == NULL)
 		cmd_param_error(CMDERR_NOT_GOOD_IDEA);
 
@@ -810,7 +810,7 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
 		for (ptr = server->knockoutlist; ptr != NULL; ptr = ptr->next) {
 			rec = ptr->data;
 			if (channel == rec->channel &&
-					!strcmp(rec->ban, banmasks))
+					!g_strcmp0(rec->ban, banmasks))
 				break;
 		}
 		if (ptr == NULL) {
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index ac1a72a1..72c17df1 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -67,13 +67,13 @@ static void check_query_changes(IRC_SERVER_REC *server, const char *nick,
 	if (query == NULL)
 		return;
 
-	if (strcmp(query->name, nick) != 0) {
+	if (g_strcmp0(query->name, nick) != 0) {
 		/* upper/lowercase chars in nick changed */
 		query_change_nick(query, nick);
 	}
 
 	if (address != NULL && (query->address == NULL ||
-				strcmp(query->address, address) != 0)) {
+				g_strcmp0(query->address, address) != 0)) {
                 /* host changed */
 		query_change_address(query, address);
 	}
@@ -109,7 +109,7 @@ static void event_nick(SERVER_REC *server, const char *data,
 	query = query_find(server, orignick);
 	if (query != NULL) {
 		params = event_get_params(data, 1, &nick);
-		if (strcmp(query->name, nick) != 0)
+		if (g_strcmp0(query->name, nick) != 0)
 			query_change_nick(query, nick);
 		g_free(params);
 	}
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index baf8a0d2..d7122eae 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -638,7 +638,7 @@ static void event_connected(IRC_SERVER_REC *server, const char *data, const char
 
 	params = event_get_params(data, 1, &nick);
 
-	if (strcmp(server->nick, nick) != 0) {
+	if (g_strcmp0(server->nick, nick) != 0) {
 		/* nick changed unexpectedly .. connected via proxy, etc. */
 		g_free(server->nick);
 		server->nick = g_strdup(nick);
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index ebaf4b8f..a812691c 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -398,7 +398,7 @@ void parse_channel_modes(IRC_CHANNEL_REC *channel, const char *setby,
 		old_key = NULL;
 	}
 
-	if (strcmp(newmode->str, channel->mode) != 0) {
+	if (g_strcmp0(newmode->str, channel->mode) != 0) {
 		g_free(channel->mode);
 		channel->mode = g_strdup(newmode->str);
 
@@ -842,7 +842,7 @@ static void cmd_mode(const char *data, IRC_SERVER_REC *server,
 			return;
 	}
 
-	if (strcmp(target, "*") == 0) {
+	if (g_strcmp0(target, "*") == 0) {
 		if (!IS_IRC_CHANNEL(channel))
 			cmd_param_error(CMDERR_NOT_JOINED);
 
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 518248cb..f0a285df 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -339,7 +339,7 @@ static GSList *redirect_cmd_list_find(GSList *list, const char *event)
 	while (list != NULL) {
 		const char *str = list->data;
 
-		if (strcmp(str, event) == 0)
+		if (g_strcmp0(str, event) == 0)
                         break;
                 list = list->next->next;
 	}
@@ -365,7 +365,7 @@ static const char *redirect_match(REDIRECT_REC *redirect, const char *event,
 	   use the default signal */
         signal = NULL;
 	for (tmp = redirect->signals; tmp != NULL; tmp = tmp->next->next) {
-		if (strcmp(tmp->data, event) == 0) {
+		if (g_strcmp0(tmp->data, event) == 0) {
 			signal = tmp->next->data;
 			break;
 		}
@@ -527,7 +527,7 @@ server_redirect_get(IRC_SERVER_REC *server, const char *prefix,
 		next = ptr->next;
 		r = ptr->data;
 		if (prefix != NULL && r->prefix != NULL &&
-				strcmp(prefix, r->prefix)) {
+				g_strcmp0(prefix, r->prefix)) {
 			/* not from this server */
 			continue;
 		}
diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index 4768641b..38170c56 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -57,7 +57,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 	/* don't autoget files beginning with a dot, if download dir is
 	   our home dir (stupid kludge for stupid people) */
 	if (*dcc->arg == '.' &&
-	    strcmp(settings_get_str("dcc_download_path"), "~") == 0)
+	    g_strcmp0(settings_get_str("dcc_download_path"), "~") == 0)
 		return;
 
 	/* check file size limit, NOTE: it's still possible to send a
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 8ee4decd..e3dbe72d 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -191,7 +191,7 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		return;
 
 	/* handle only DCC messages */
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		dcc = item_get_dcc(item);
 	else if (*target == '=')
 		dcc = dcc_chat_find_id(target+1);
@@ -625,7 +625,7 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
 		g_strfreev(params);
 		return;
 	}
-	passive = paramcount == 4 && strcmp(params[2], "0") == 0;
+	passive = paramcount == 4 && g_strcmp0(params[2], "0") == 0;
 
 	dcc = DCC_CHAT(dcc_find_request(DCC_CHAT_TYPE, nick, NULL));
 	if (dcc != NULL) {
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 69fdc746..1208b5c5 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -554,7 +554,7 @@ void cmd_dcc_receive(const char *data, DCC_GET_FUNC accept_func,
 		next = tmp->next;
 		if (IS_DCC_GET(dcc) && g_ascii_strcasecmp(dcc->nick, nick) == 0 &&
 		    (dcc_is_waiting_user(dcc) || dcc->from_dccserver) &&
-		    (*fname == '\0' || strcmp(dcc->arg, fname) == 0)) {
+		    (*fname == '\0' || g_strcmp0(dcc->arg, fname) == 0)) {
 			found = TRUE;
 			if (!dcc_is_passive(dcc))
 				accept_func(dcc);
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 6f0d5c81..17f6c477 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -149,7 +149,7 @@ DCC_REC *dcc_find_request(int type, const char *nick, const char *arg)
 
 		if (dcc->type == type && !dcc_is_connected(dcc) &&
 		    g_ascii_strcasecmp(dcc->nick, nick) == 0 &&
-		    (arg == NULL || strcmp(dcc->arg, arg) == 0))
+		    (arg == NULL || g_strcmp0(dcc->arg, arg) == 0))
 			return dcc;
 	}
 
@@ -516,7 +516,7 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
 
 		next = tmp->next;
 		if (dcc->type == type && g_ascii_strcasecmp(dcc->nick, nick) == 0 &&
-		    (*arg == '\0' || strcmp(dcc->arg, arg) == 0)) {
+		    (*arg == '\0' || g_strcmp0(dcc->arg, arg) == 0)) {
 			dcc_reject(dcc, server);
 			found = TRUE;
 		}
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index b0b7ee1c..573f7a7f 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -91,7 +91,7 @@ int notifylist_ircnets_match(NOTIFYLIST_REC *rec, const char *ircnet)
 
 	if (rec->ircnets == NULL) return TRUE;
 	if (ircnet == NULL) return FALSE;
-	if (strcmp(ircnet, "*") == 0) return TRUE;
+	if (g_strcmp0(ircnet, "*") == 0) return TRUE;
 
 	for (tmp = rec->ircnets; *tmp != NULL; tmp++) {
 		if (g_ascii_strcasecmp(*tmp, ircnet) == 0)
diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 80fd7c2e..3d7bf546 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -209,7 +209,7 @@ static void dump_join(IRC_CHANNEL_REC *channel, CLIENT_REC *client)
 void proxy_client_reset_nick(CLIENT_REC *client)
 {
 	if (client->server == NULL ||
-	    strcmp(client->nick, client->server->nick) == 0)
+	    g_strcmp0(client->nick, client->server->nick) == 0)
 		return;
 
 	proxy_outdata(client, ":%s!proxy NICK :%s\n",
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 33392285..4c3bcf68 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -82,7 +82,7 @@ static void grab_who(CLIENT_REC *client, const char *channel)
 	arg = g_string_new(channel);
 
 	for (tmp = list, count = 0; *tmp != NULL; tmp++, count++) {
-		if (strcmp(*tmp, "0") == 0) {
+		if (g_strcmp0(*tmp, "0") == 0) {
 			/* /who 0 displays everyone */
 			**tmp = '*';
 		}
@@ -106,18 +106,18 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 
 	password = settings_get_str("irssiproxy_password");
 
-	if (password != NULL && strcmp(cmd, "PASS") == 0) {
-		if (strcmp(password, args) == 0)
+	if (password != NULL && g_strcmp0(cmd, "PASS") == 0) {
+		if (g_strcmp0(password, args) == 0)
 			client->pass_sent = TRUE;
 		else {
 			/* wrong password! */
 			remove_client(client);
                         return;
 		}
-	} else if (strcmp(cmd, "NICK") == 0) {
+	} else if (g_strcmp0(cmd, "NICK") == 0) {
 		g_free_not_null(client->nick);
 		client->nick = g_strdup(args);
-	} else if (strcmp(cmd, "USER") == 0) {
+	} else if (g_strcmp0(cmd, "USER") == 0) {
 		client->user_sent = TRUE;
 	}
 
@@ -141,12 +141,12 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		return;
 	}
 
-	if (strcmp(cmd, "QUIT") == 0) {
+	if (g_strcmp0(cmd, "QUIT") == 0) {
 		remove_client(client);
 		return;
 	}
 
-	if (strcmp(cmd, "PING") == 0) {
+	if (g_strcmp0(cmd, "PING") == 0) {
 		/* Reply to PING, if the target parameter is either
 		   proxy_adress, our own nick or empty. */
 		char *params, *origin, *target;
@@ -164,7 +164,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		g_free(params);
 	}
 
-	if (strcmp(cmd, "PROXY") == 0) {
+	if (g_strcmp0(cmd, "PROXY") == 0) {
 		if (g_ascii_strcasecmp(args, "CTCP ON") == 0) {
                         /* client wants all ctcps */
 			client->want_ctcp = 1;
@@ -200,11 +200,11 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 	}
 
         /* check if the command could be redirected */
-	if (strcmp(cmd, "WHO") == 0)
+	if (g_strcmp0(cmd, "WHO") == 0)
 		grab_who(client, args);
-	else if (strcmp(cmd, "WHOWAS") == 0)
+	else if (g_strcmp0(cmd, "WHOWAS") == 0)
 		proxy_redirect_event(client, "whowas", 1, args, -1);
-	else if (strcmp(cmd, "WHOIS") == 0) {
+	else if (g_strcmp0(cmd, "WHOIS") == 0) {
 		char *p;
 
 		/* convert dots to spaces */
@@ -212,11 +212,11 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 			if (*p == ',') *p = ' ';
 
 		proxy_redirect_event(client, "whois", 1, args, TRUE);
-	} else if (strcmp(cmd, "ISON") == 0)
+	} else if (g_strcmp0(cmd, "ISON") == 0)
 		proxy_redirect_event(client, "ison", 1, args, -1);
-	else if (strcmp(cmd, "USERHOST") == 0)
+	else if (g_strcmp0(cmd, "USERHOST") == 0)
 		proxy_redirect_event(client, "userhost", 1, args, -1);
-	else if (strcmp(cmd, "MODE") == 0) {
+	else if (g_strcmp0(cmd, "MODE") == 0) {
 		/* convert dots to spaces */
 		char *slist, *str, mode, *p;
 		int argc;
@@ -252,7 +252,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		}
 		g_free(str);
 		g_free(slist);
-	} else if (strcmp(cmd, "PRIVMSG") == 0) {
+	} else if (g_strcmp0(cmd, "PRIVMSG") == 0) {
 		/* send the message to other clients as well */
 		char *params, *target, *msg;
 
@@ -283,9 +283,9 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		}
 		ignore_next = FALSE;
 		g_free(params);
-	} else if (strcmp(cmd, "PING") == 0) {
+	} else if (g_strcmp0(cmd, "PING") == 0) {
 		proxy_redirect_event(client, "ping", 1, NULL, TRUE);
-	} else if (strcmp(cmd, "AWAY") == 0) {
+	} else if (g_strcmp0(cmd, "AWAY") == 0) {
 		/* set the away reason */
 		if (args != NULL) {
 			g_free(client->server->away_reason);
@@ -347,7 +347,7 @@ static void sig_listen(LISTEN_REC *listen)
 	rec->listen = listen;
 	rec->handle = sendbuf;
         rec->host = g_strdup(host);
-	if (strcmp(listen->ircnet, "*") == 0) {
+	if (g_strcmp0(listen->ircnet, "*") == 0) {
 		rec->proxy_address = g_strdup("irc.proxy");
 		rec->server = servers == NULL ? NULL : IRC_SERVER(servers->data);
 	} else {
@@ -415,7 +415,7 @@ static void sig_server_event(IRC_SERVER_REC *server, const char *line,
 		}
 	}
 
-        if (strcmp(event, "event privmsg") == 0 &&
+        if (g_strcmp0(event, "event privmsg") == 0 &&
 	    strstr(args, " :\001") != NULL &&
 	    strstr(args, " :\001ACTION") == NULL) {
 		/* CTCP - either answer ourself or forward it to one client */
@@ -435,8 +435,8 @@ static void sig_server_event(IRC_SERVER_REC *server, const char *line,
 		return;
 	}
 
-	if (strcmp(event, "event ping") == 0 ||
-	    strcmp(event, "event pong") == 0) {
+	if (g_strcmp0(event, "event ping") == 0 ||
+	    g_strcmp0(event, "event pong") == 0) {
 		/* We want to answer ourself to PINGs and CTCPs.
 		   Also hide PONGs from clients. */
 		g_free(event);
@@ -462,7 +462,7 @@ static void event_connected(IRC_SERVER_REC *server)
 		CLIENT_REC *rec = tmp->data;
 
 		if (rec->connected && rec->server == NULL &&
-		    (strcmp(rec->listen->ircnet, "*") == 0 ||
+		    (g_strcmp0(rec->listen->ircnet, "*") == 0 ||
 		     (chatnet != NULL &&
 		      g_ascii_strcasecmp(chatnet, rec->listen->ircnet) == 0))) {
 			proxy_outdata(rec, ":%s NOTICE %s :Connected to server\n",
diff --git a/src/lib-config/set.c b/src/lib-config/set.c
index 61a101fb..3d6001e1 100644
--- a/src/lib-config/set.c
+++ b/src/lib-config/set.c
@@ -105,7 +105,7 @@ void config_node_set_str(CONFIG_REC *rec, CONFIG_NODE *parent, const char *key,
 	}
 
 	if (node != NULL) {
-		if (strcmp(node->value, value) == 0)
+		if (g_strcmp0(node->value, value) == 0)
 			return;
                 g_free(node->value);
 	} else {
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index eb1bddee..793f9375 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -44,7 +44,7 @@ static int print_script_errors;
 static char *perl_args[] = {"", "-e", "0"};
 
 #define IS_PERL_SCRIPT(file) \
-	(strlen(file) > 3 && strcmp(file+strlen(file)-3, ".pl") == 0)
+	(strlen(file) > 3 && g_strcmp0(file+strlen(file)-3, ".pl") == 0)
 
 static void perl_script_destroy_package(PERL_SCRIPT_REC *script)
 {
@@ -314,7 +314,7 @@ PERL_SCRIPT_REC *perl_script_find(const char *name)
 	for (tmp = perl_scripts; tmp != NULL; tmp = tmp->next) {
 		PERL_SCRIPT_REC *rec = tmp->data;
 
-		if (strcmp(rec->name, name) == 0)
+		if (g_strcmp0(rec->name, name) == 0)
                         return rec;
 	}
 
@@ -331,7 +331,7 @@ PERL_SCRIPT_REC *perl_script_find_package(const char *package)
 	for (tmp = perl_scripts; tmp != NULL; tmp = tmp->next) {
 		PERL_SCRIPT_REC *rec = tmp->data;
 
-		if (strcmp(rec->package, package) == 0)
+		if (g_strcmp0(rec->package, package) == 0)
                         return rec;
 	}
 
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index 8e8469e9..2abc75c0 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -170,7 +170,7 @@ static void cmd_load(const char *data, SERVER_REC *server, void *item)
 		return;
 
 	len = strlen(rootmodule);
-	if (len > 3 && strcmp(rootmodule + len - 3, ".pl") == 0) {
+	if (len > 3 && g_strcmp0(rootmodule + len - 3, ".pl") == 0) {
 		/* make /LOAD script.pl work as expected */
 		signal_stop();
 		cmd_script_load(data);
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 1f602c66..007f7ad5 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -99,14 +99,14 @@ void perl_signal_args_to_c(
 
                 if (!SvOK(arg)) {
                         c_arg = NULL;
-                } else if (strcmp(rec->args[n], "string") == 0) {
+                } else if (g_strcmp0(rec->args[n], "string") == 0) {
                         c_arg = SvPV_nolen(arg);
-                } else if (strcmp(rec->args[n], "int") == 0) {
+                } else if (g_strcmp0(rec->args[n], "int") == 0) {
                         c_arg = (void *)SvIV(arg);
-                } else if (strcmp(rec->args[n], "ulongptr") == 0) {
+                } else if (g_strcmp0(rec->args[n], "ulongptr") == 0) {
                         saved_args[n].v_ulong = SvUV(arg);
                         c_arg = &saved_args[n].v_ulong;
-                } else if (strcmp(rec->args[n], "intptr") == 0) {
+                } else if (g_strcmp0(rec->args[n], "intptr") == 0) {
                         saved_args[n].v_int = SvIV(SvRV(arg));
                         c_arg = &saved_args[n].v_int;
                 } else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
@@ -122,7 +122,7 @@ void perl_signal_args_to_c(
                         }
                         av = (AV *)t;
 
-                        is_str = strcmp(rec->args[n]+9, "char*") == 0;
+                        is_str = g_strcmp0(rec->args[n]+9, "char*") == 0;
 
                         gl = NULL;
                         count = av_len(av) + 1;
@@ -181,7 +181,7 @@ void perl_signal_args_to_c(
                         continue;
                 }
 
-                if (strcmp(rec->args[n], "intptr") == 0) {
+                if (g_strcmp0(rec->args[n], "intptr") == 0) {
                         SV *t = SvRV(arg);
                         SvIOK_only(t);
                         SvIV_set(t, saved_args[n].v_int);
@@ -192,8 +192,8 @@ void perl_signal_args_to_c(
                         AV *av;
                         GList *gl, *tmp;
 
-                        is_iobject = strcmp(rec->args[n]+9, "iobject") == 0;
-                        is_str = strcmp(rec->args[n]+9, "char*") == 0;
+                        is_iobject = g_strcmp0(rec->args[n]+9, "iobject") == 0;
+                        is_str = g_strcmp0(rec->args[n]+9, "char*") == 0;
 
                         av = (AV *)SvRV(arg);
                         av_clear(av);
@@ -245,8 +245,8 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 			GList *tmp, **ptr;
                         int is_iobject, is_str;
 
-                        is_iobject = strcmp(rec->args[n]+9, "iobject") == 0;
-                        is_str = strcmp(rec->args[n]+9, "char*") == 0;
+                        is_iobject = g_strcmp0(rec->args[n]+9, "iobject") == 0;
+                        is_str = g_strcmp0(rec->args[n]+9, "char*") == 0;
 			av = newAV();
 
 			ptr = arg;
@@ -258,22 +258,22 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 			}
 
 			saved_args[n] = perlarg = newRV_noinc((SV *) av);
-                } else if (strcmp(rec->args[n], "int") == 0)
+                } else if (g_strcmp0(rec->args[n], "int") == 0)
                         perlarg = newSViv((IV)arg);
                 else if (arg == NULL)
                         perlarg = &PL_sv_undef;
-                else if (strcmp(rec->args[n], "string") == 0)
+                else if (g_strcmp0(rec->args[n], "string") == 0)
                         perlarg = new_pv(arg);
-                else if (strcmp(rec->args[n], "ulongptr") == 0)
+                else if (g_strcmp0(rec->args[n], "ulongptr") == 0)
                         perlarg = newSViv(*(unsigned long *) arg);
-                else if (strcmp(rec->args[n], "intptr") == 0)
+                else if (g_strcmp0(rec->args[n], "intptr") == 0)
                         saved_args[n] = perlarg = newRV_noinc(newSViv(*(int *) arg));
                 else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
 			/* linked list - push as AV */
 			GSList *tmp;
 			int is_iobject;
 
-                        is_iobject = strcmp(rec->args[n]+7, "iobject") == 0;
+                        is_iobject = g_strcmp0(rec->args[n]+7, "iobject") == 0;
 			av = newAV();
 			for (tmp = arg; tmp != NULL; tmp = tmp->next) {
 				sv = is_iobject ? iobject_bless((SERVER_REC *) tmp->data) :
@@ -282,12 +282,12 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 			}
 
 			perlarg = newRV_noinc((SV *) av);
-		} else if (strcmp(rec->args[n], "iobject") == 0) {
+		} else if (g_strcmp0(rec->args[n], "iobject") == 0) {
 			/* "irssi object" - any struct that has
 			   "int type; int chat_type" as it's first
 			   variables (server, channel, ..) */
 			perlarg = iobject_bless((SERVER_REC *) arg);
-		} else if (strcmp(rec->args[n], "siobject") == 0) {
+		} else if (g_strcmp0(rec->args[n], "siobject") == 0) {
 			/* "simple irssi object" - any struct that has
 			   int type; as it's first variable (dcc) */
 			perlarg = simple_iobject_bless((SERVER_REC *) arg);
@@ -317,7 +317,7 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 		if (saved_args[n] == NULL)
                         continue;
 
-		if (strcmp(rec->args[n], "intptr") == 0) {
+		if (g_strcmp0(rec->args[n], "intptr") == 0) {
 			int *val = arg;
 			*val = SvIV(SvRV(saved_args[n]));
 		} else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
@@ -338,7 +338,7 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 				out = g_list_append(out, val);
 			}
 
-			if (strcmp(rec->args[n]+9, "char*") == 0)
+			if (g_strcmp0(rec->args[n]+9, "char*") == 0)
                                 g_list_foreach(*ret, (GFunc) g_free, NULL);
 			g_list_free(*ret);
                         *ret = out;
@@ -434,7 +434,7 @@ static void perl_signal_remove_list_one(GSList **siglist, PERL_SIGNAL_REC *rec)
 
 #define sv_func_cmp(f1, f2) \
 	(f1 == f2 || (SvPOK(f1) && SvPOK(f2) && \
-		strcmp(SvPV_nolen(f1), SvPV_nolen(f2)) == 0))
+		g_strcmp0(SvPV_nolen(f1), SvPV_nolen(f2)) == 0))
 
 static void perl_signal_remove_list(GSList **list, SV *func)
 {

From ef0877f4849a73ba43e886a9faafb321d3559e43 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Tue, 7 Apr 2015 23:01:09 -0300
Subject: [PATCH 0078/1650] Define g_strcmp0 to strcmp if the glib version is
 older than 2.16

---
 src/common.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/common.h b/src/common.h
index bb246962..23d091a1 100644
--- a/src/common.h
+++ b/src/common.h
@@ -52,6 +52,10 @@
 #define g_slice_free(type, mem)  g_free(mem)
 #endif
 
+#if !GLIB_CHECK_VERSION(2,16,0)
+#define g_strcmp0(str1, str2) strcmp(str1, str2)
+#endif
+
 #ifdef USE_GC
 #  define g_free(x) G_STMT_START { (x) = NULL; } G_STMT_END
 #endif

From 9890daca797b31d34d97d953c512378aabe3d51f Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 11 Apr 2015 15:09:49 -0300
Subject: [PATCH 0079/1650] Handle nulls properly in the g_strcmp0() for
 glib<2.16

I wrote some tests to compare the behavior but I don't know where to put
them, so i'm including them here:

    assert(g_strcmp0("a", "b") == -1);
    assert(g_strcmp0(NULL, "a") == -1);
    assert(g_strcmp0("a", NULL) == 1);
    assert(g_strcmp0("b", "a") == 1);
    assert(g_strcmp0("a", "a") == 0);
    assert(g_strcmp0(NULL, NULL) == 0);
---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 23d091a1..1b99753b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -53,7 +53,7 @@
 #endif
 
 #if !GLIB_CHECK_VERSION(2,16,0)
-#define g_strcmp0(str1, str2) strcmp(str1, str2)
+#define g_strcmp0(a, b) (!a ? -(a != b) : (!b ? (a != b) : strcmp(a, b)))
 #endif
 
 #ifdef USE_GC

From 50e955e342c02ac55c48d5be71a940596ff72ac8 Mon Sep 17 00:00:00 2001
From: Haw Loeung <h.loeung@unixque.com>
Date: Tue, 14 Apr 2015 18:07:35 +1000
Subject: [PATCH 0080/1650] ssl: Add option to specify SSL cipher suite
 preference.

---
 docs/help/in/connect.in           | 1 +
 docs/help/in/server.in            | 1 +
 src/core/chat-commands.c          | 6 +++++-
 src/core/network-openssl.c        | 2 ++
 src/core/server-connect-rec.h     | 1 +
 src/core/server-setup-rec.h       | 1 +
 src/core/servers-reconnect.c      | 1 +
 src/core/servers-setup.c          | 5 +++++
 src/core/servers.c                | 1 +
 src/core/session.c                | 1 +
 src/fe-common/core/fe-server.c    | 6 +++++-
 src/fe-common/irc/fe-irc-server.c | 3 +++
 12 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index 3330966e..f13582cc 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -15,6 +15,7 @@
     -ssl_verify:    Verifies the SSL certificate of the server.
     -ssl_cafile:    The file with the list of CA certificates.
     -ssl_capath:    The directory which contains the CA certificates.
+    -ssl_ciphers:   SSL cipher suite preference lists
     -noproxy:       Ignores the global proxy configuration.
     -network:       The network this connection belongs to.
     -host:          The hostname you would like to connect from.
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index f6706daf..34c31972 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -22,6 +22,7 @@
     -ssl_verify:       Verifies the SSL certificate of the server.
     -ssl_cafile:       The file with the list of CA certificates.
     -ssl_capath:       The directory which contains the CA certificates.
+    -ssl_ciphers:      SSL cipher suite preference lists
     -auto:             Automatically connects to the server on startup.
     -noauto:           Doesn't connect to the server on startup.
     -network:          The network the server belongs to.
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 8d1ac3eb..3ee7beca 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -106,6 +106,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 		conn->ssl_cafile = g_strdup(tmp);
 	if ((tmp = g_hash_table_lookup(optlist, "ssl_capath")) != NULL)
 		conn->ssl_capath = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "ssl_ciphers")) != NULL)
+		conn->ssl_ciphers = g_strdup(tmp);
 	if ((conn->ssl_capath != NULL && conn->ssl_capath[0] != '\0')
 	||  (conn->ssl_cafile != NULL && conn->ssl_cafile[0] != '\0'))
 		conn->ssl_verify = TRUE;
@@ -138,6 +140,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 
 /* SYNTAX: CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
                    [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
+                   [-ssl_ciphers <list>]
                    [-!] [-noautosendcmd]
 		   [-noproxy] [-network <network>] [-host <hostname>]
 		   [-rawlog <file>]
@@ -244,6 +247,7 @@ static void sig_default_command_server(const char *data, SERVER_REC *server,
 
 /* SYNTAX: SERVER [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
                   [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
+                  [-ssl_ciphers <list>]
                   [-!] [-noautosendcmd]
 		  [-noproxy] [-network <network>] [-host <hostname>]
 		  [-rawlog <file>]
@@ -483,7 +487,7 @@ void chat_commands_init(void)
 	signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server);
 	signal_add("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
 
-	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +host noproxy -rawlog noautosendcmd");
+	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +host noproxy -rawlog noautosendcmd");
 	command_set_options("msg", "channel nick");
 }
 
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index dcd857d8..e55f2ace 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -460,6 +460,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	const char *mypass = server->connrec->ssl_pass;
 	const char *cafile = server->connrec->ssl_cafile;
 	const char *capath = server->connrec->ssl_capath;
+	const char *ciphers = server->connrec->ssl_ciphers;
 	gboolean verify = server->connrec->ssl_verify;
 
 	g_return_val_if_fail(handle != NULL, NULL);
@@ -478,6 +479,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 	SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback);
 	SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass);
+	SSL_CTX_set_cipher_list(ctx, ciphers);
 
 	if (mycert && *mycert) {
 		char *scert = NULL, *spkey = NULL;
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 17537508..80c5761b 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -28,6 +28,7 @@ char *ssl_pkey;
 char *ssl_pass;
 char *ssl_cafile;
 char *ssl_capath;
+char *ssl_ciphers;
 
 GIOChannel *connect_handle; /* connect using this handle */
 
diff --git a/src/core/server-setup-rec.h b/src/core/server-setup-rec.h
index ae797559..ecdde3f3 100644
--- a/src/core/server-setup-rec.h
+++ b/src/core/server-setup-rec.h
@@ -13,6 +13,7 @@ char *ssl_pkey;
 char *ssl_pass;
 char *ssl_cafile;
 char *ssl_capath;
+char *ssl_ciphers;
 
 char *own_host; /* address to use when connecting this server */
 IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index d99a5405..f9f82a13 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -197,6 +197,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->ssl_verify = src->ssl_verify;
 	dest->ssl_cafile = g_strdup(src->ssl_cafile);
 	dest->ssl_capath = g_strdup(src->ssl_capath);
+	dest->ssl_ciphers = g_strdup(src->ssl_ciphers);
 
 	return dest;
 }
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 27d9f1f0..6cf48300 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -179,6 +179,8 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
 		conn->ssl_cafile = g_strdup(sserver->ssl_cafile);
 	if (conn->ssl_capath == NULL && sserver->ssl_capath != NULL && sserver->ssl_capath[0] != '\0')
 		conn->ssl_capath = g_strdup(sserver->ssl_capath);
+	if (conn->ssl_ciphers == NULL && sserver->ssl_ciphers != NULL && sserver->ssl_ciphers[0] != '\0')
+		conn->ssl_ciphers = g_strdup(sserver->ssl_ciphers);
 
 	server_setup_fill_reconn(conn, sserver);
 
@@ -405,6 +407,7 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 	rec->ssl_verify = config_node_get_bool(node, "ssl_verify", FALSE);
 	rec->ssl_cafile = g_strdup(config_node_get_str(node, "ssl_cafile", NULL));
 	rec->ssl_capath = g_strdup(config_node_get_str(node, "ssl_capath", NULL));
+	rec->ssl_ciphers = g_strdup(config_node_get_str(node, "ssl_ciphers", NULL));
 	if (rec->ssl_cafile || rec->ssl_capath)
 		rec->ssl_verify = TRUE;
 	if (rec->ssl_cert != NULL || rec->ssl_verify)
@@ -445,6 +448,7 @@ static void server_setup_save(SERVER_SETUP_REC *rec)
 	iconfig_node_set_bool(node, "ssl_verify", rec->ssl_verify);
 	iconfig_node_set_str(node, "ssl_cafile", rec->ssl_cafile);
 	iconfig_node_set_str(node, "ssl_capath", rec->ssl_capath);
+	iconfig_node_set_str(node, "ssl_ciphers", rec->ssl_ciphers);
 	iconfig_node_set_str(node, "own_host", rec->own_host);
 
 	iconfig_node_set_str(node, "family",
@@ -486,6 +490,7 @@ static void server_setup_destroy(SERVER_SETUP_REC *rec)
 	g_free_not_null(rec->ssl_pass);
 	g_free_not_null(rec->ssl_cafile);
 	g_free_not_null(rec->ssl_capath);
+	g_free_not_null(rec->ssl_ciphers);
 	g_free(rec->address);
 	g_free(rec);
 }
diff --git a/src/core/servers.c b/src/core/servers.c
index 6eaad191..3342304e 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -636,6 +636,7 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->ssl_pass);
 	g_free_not_null(conn->ssl_cafile);
 	g_free_not_null(conn->ssl_capath);
+	g_free_not_null(conn->ssl_ciphers);
 
 	g_free_not_null(conn->channels);
         g_free_not_null(conn->away_reason);
diff --git a/src/core/session.c b/src/core/session.c
index b3002632..e49162b2 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -165,6 +165,7 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config,
 	config_node_set_bool(config, node, "ssl_verify", server->connrec->ssl_verify);
 	config_node_set_str(config, node, "ssl_cafile", server->connrec->ssl_cafile);
 	config_node_set_str(config, node, "ssl_capath", server->connrec->ssl_capath);
+	config_node_set_str(config, node, "ssl_ciphers", server->connrec->ssl_ciphers);
 
 	handle = g_io_channel_unix_get_fd(net_sendbuffer_handle(server->handle));
 	config_node_set_int(config, node, "handle", handle);
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 2dec1d8a..ec9b5e4c 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -173,6 +173,10 @@ static void cmd_server_add(const char *data)
 	if (value != NULL && *value != '\0')
 		rec->ssl_capath = g_strdup(value);
 
+	value = g_hash_table_lookup(optlist, "ssl_ciphers");
+	if (value != NULL && *value != '\0')
+		rec->ssl_ciphers = g_strdup(value);
+
 	if ((rec->ssl_cafile != NULL && rec->ssl_cafile[0] != '\0')
 	||  (rec->ssl_capath != NULL && rec->ssl_capath[0] != '\0'))
 		rec->ssl_verify = TRUE;
@@ -387,7 +391,7 @@ void fe_server_init(void)
 	command_bind("server remove", NULL, (SIGNAL_FUNC) cmd_server_remove);
 	command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
 	command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
-	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
 
 	signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
 	signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting);
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index abde1112..2cb99a2f 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -52,6 +52,7 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 }
 /* SYNTAX: SERVER ADD [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
                       [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
+                      [-ssl_ciphers <list>]
                       [-auto | -noauto] [-network <network>] [-host <hostname>]
                       [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
                       <address> [<port> [<password>]] */
@@ -121,6 +122,8 @@ static void cmd_server_list(const char *data)
 				g_string_append_printf(str, "ssl_cafile: %s, ", rec->ssl_cafile);
 			if (rec->ssl_capath)
 				g_string_append_printf(str, "ssl_capath: %s, ", rec->ssl_capath);
+			if (rec->ssl_ciphers)
+				g_string_append_printf(str, "ssl_ciphers: %s, ", rec->ssl_ciphers);
 
 		}
 		if (rec->max_cmds_at_once > 0)

From 349ed35ce099d9003078e000acf5d95b5fd644e8 Mon Sep 17 00:00:00 2001
From: Haw Loeung <h.loeung@unixque.com>
Date: Wed, 15 Apr 2015 00:44:07 +1000
Subject: [PATCH 0081/1650] ssl: Fixed call to SSL_CTX_set_cipher_list() only
 when ssl_ciphers specified and warn when no cipher suite could be selected.

---
 src/core/network-openssl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index e55f2ace..465c4154 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -479,7 +479,10 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 	SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback);
 	SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass);
-	SSL_CTX_set_cipher_list(ctx, ciphers);
+	if (ciphers && *ciphers) {
+		if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1)
+			g_warning("No valid SSL cipher suite could be selected");
+	}
 
 	if (mycert && *mycert) {
 		char *scert = NULL, *spkey = NULL;

From 9f77dd802dfe63b79c0d82d4b9ecc0974e354a59 Mon Sep 17 00:00:00 2001
From: Haw Loeung <h.loeung@unixque.com>
Date: Sat, 18 Apr 2015 13:53:07 +1000
Subject: [PATCH 0082/1650] trivial: Minor cosmetic changes fixing docs as per
 review from ahf.

---
 docs/help/in/connect.in | 2 +-
 docs/help/in/server.in  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index f13582cc..df50d1b9 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -15,7 +15,7 @@
     -ssl_verify:    Verifies the SSL certificate of the server.
     -ssl_cafile:    The file with the list of CA certificates.
     -ssl_capath:    The directory which contains the CA certificates.
-    -ssl_ciphers:   SSL cipher suite preference lists
+    -ssl_ciphers:   SSL cipher suite preference lists.
     -noproxy:       Ignores the global proxy configuration.
     -network:       The network this connection belongs to.
     -host:          The hostname you would like to connect from.
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 34c31972..e407b6a9 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -22,7 +22,7 @@
     -ssl_verify:       Verifies the SSL certificate of the server.
     -ssl_cafile:       The file with the list of CA certificates.
     -ssl_capath:       The directory which contains the CA certificates.
-    -ssl_ciphers:      SSL cipher suite preference lists
+    -ssl_ciphers:      SSL cipher suite preference lists.
     -auto:             Automatically connects to the server on startup.
     -noauto:           Doesn't connect to the server on startup.
     -network:          The network the server belongs to.

From 6b56f098e941563258a9a7fb207f1df6de7cbb11 Mon Sep 17 00:00:00 2001
From: Peder Stray <peder.stray@gmail.com>
Date: Sun, 19 Apr 2015 13:14:54 +0200
Subject: [PATCH 0083/1650] Change g_hash_table_contains() for compatibility
 with glib < 2.32

---
 src/lib-config/get.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-config/get.c b/src/lib-config/get.c
index 53d744da..a83686fd 100644
--- a/src/lib-config/get.c
+++ b/src/lib-config/get.c
@@ -68,7 +68,7 @@ CONFIG_NODE *config_node_section_index(CONFIG_REC *rec, CONFIG_NODE *parent, con
 				config_node_remove(rec, parent, node);
 				node = NULL;
 				show_error = 1;
-			} else if (!g_hash_table_contains(rec->cache_nodes, node)) {
+			} else if (!g_hash_table_lookup_extended(rec->cache_nodes, node, NULL, NULL)) {
 				g_hash_table_insert(rec->cache_nodes, node, NULL);
 				show_error = 1;
 			}

From 2d7030a84445ee4547af43970cfb252b36246e62 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 12 Feb 2015 00:07:22 +0100
Subject: [PATCH 0084/1650] Implement support for IRCv3.1 CAP negotiation

---
 docs/signals.txt           |   5 ++
 src/core/misc.c            |  24 ++++++
 src/core/misc.h            |   3 +
 src/irc/core/Makefile.am   |   2 +
 src/irc/core/irc-cap.c     | 172 +++++++++++++++++++++++++++++++++++++
 src/irc/core/irc-cap.h     |   9 ++
 src/irc/core/irc-core.c    |   3 +
 src/irc/core/irc-servers.c |  14 ++-
 src/irc/core/irc-servers.h |   7 ++
 9 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 src/irc/core/irc-cap.c
 create mode 100644 src/irc/core/irc-cap.h

diff --git a/docs/signals.txt b/docs/signals.txt
index f0860d3e..45658b79 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -131,6 +131,11 @@ irc-nicklist.c:
 irc-servers.c:
  "event connected", SERVER_REC
 
+irc-cap.c
+ "server cap ack "<cmd>, SERVER_REC
+ "server cap nak "<cmd>, SERVER_REC
+ "server cap end", SERVER_REC
+
 irc.c:
 
  "server event", SERVER_REC, char *data, char *sender_nick, char *sender_address
diff --git a/src/core/misc.c b/src/core/misc.c
index ef8501d5..395e47ad 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -211,6 +211,30 @@ void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data
 	return NULL;
 }
 
+void gslist_free_full (GSList *list, GDestroyNotify free_func)
+{
+	GSList *tmp;
+
+	if (!list)
+		return;
+
+	for (tmp = list; tmp != NULL; tmp = tmp->next)
+		free_func(tmp->data);
+
+	g_slist_free(list);
+}
+
+GSList *gslist_remove_string (GSList *list, const char *str)
+{
+	GSList *l;
+
+	l = g_slist_find_custom(list, str, (GCompareFunc) g_strcmp0);
+	if (l != NULL)
+		return g_slist_remove_link(list, l);
+
+	return list;
+}
+
 /* `list' contains pointer to structure with a char* to string. */
 char *gslistptr_to_string(GSList *list, int offset, const char *delimiter)
 {
diff --git a/src/core/misc.h b/src/core/misc.h
index c6369489..7e78d3b9 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -21,6 +21,9 @@ GSList *gslist_find_string(GSList *list, const char *key);
 GSList *gslist_find_icase_string(GSList *list, const char *key);
 GList *glist_find_string(GList *list, const char *key);
 GList *glist_find_icase_string(GList *list, const char *key);
+GSList *gslist_remove_string (GSList *list, const char *str);
+
+void gslist_free_full (GSList *list, GDestroyNotify free_func);
 
 void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data);
 
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index 3db5cf0e..7d885d20 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -26,6 +26,7 @@ libirc_core_a_SOURCES = \
         irc-servers-reconnect.c \
         irc-servers-setup.c \
         irc-session.c \
+        irc-cap.c \
         lag.c \
         massjoin.c \
         modes.c \
@@ -48,6 +49,7 @@ pkginc_irc_core_HEADERS = \
         irc-queries.h \
         irc-servers.h \
         irc-servers-setup.h \
+        irc-cap.h \
         modes.h \
         mode-lists.h \
 	module.h \
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
new file mode 100644
index 00000000..c5bf4e67
--- /dev/null
+++ b/src/irc/core/irc-cap.c
@@ -0,0 +1,172 @@
+#include "module.h"
+#include "signals.h"
+#include "misc.h"
+
+#include "irc-cap.h"
+#include "irc-servers.h"
+
+int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
+{
+	if (cap == NULL || *cap == '\0')
+		return FALSE;
+
+	/* If the negotiation hasn't been completed yet just queue the requests */
+	if (!server->cap_complete) {
+		if (enable && !gslist_find_string(server->cap_queue, cap)) {
+			server->cap_queue = g_slist_prepend(server->cap_queue, g_strdup(cap));
+			return TRUE;
+		}
+		else if (!enable && gslist_find_string(server->cap_queue, cap)) {
+			server->cap_queue = gslist_remove_string(server->cap_queue, cap);
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	if (enable && !gslist_find_string(server->cap_active, cap)) {
+		/* Make sure the required cap is supported by the server */
+		if (!gslist_find_string(server->cap_supported, cap))
+			return FALSE;
+
+		irc_send_cmdv(server, "CAP REQ %s", cap);
+		return TRUE;
+	}
+	else if (!enable && gslist_find_string(server->cap_active, cap)) {
+		irc_send_cmdv(server, "CAP REQ -%s", cap);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+void cap_finish_negotiation (IRC_SERVER_REC *server)
+{
+	if (server->cap_complete)
+		return;
+
+	server->cap_complete = TRUE;
+	irc_send_cmd_now(server, "CAP END");
+
+	signal_emit("server cap end", 1, server);
+}
+
+static void cap_emit_signal (IRC_SERVER_REC *server, char *cmd, char *args)
+{
+	char *signal_name;
+
+	signal_name = g_strdup_printf("server cap %s %s", cmd, args? args: "");
+	signal_emit(signal_name, 1, server);
+	g_free(signal_name);
+}
+
+static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *address)
+{
+	GSList *tmp;
+	GString *cmd;
+	char *params, *evt, *list, **caps;
+	int i, caps_length, disable, avail_caps;
+
+	params = event_get_params(args, 3, NULL, &evt, &list);
+	if (params == NULL)
+		return;
+
+	/* Strip the trailing whitespaces before splitting the string, some servers send responses with
+	 * superfluous whitespaces that g_strsplit the interprets as tokens */
+	caps = g_strsplit(g_strchomp(list), " ", -1);
+	caps_length = g_strv_length(caps);
+
+	if (!g_strcmp0(evt, "LS")) {
+		/* Create a list of the supported caps */
+		for (i = 0; i < caps_length; i++)
+			server->cap_supported = g_slist_prepend(server->cap_supported, g_strdup(caps[i]));
+
+		/* Request the required caps, if any */
+		if (server->cap_queue == NULL) {
+			cap_finish_negotiation(server);
+		}
+		else {
+			cmd = g_string_new("CAP REQ :");
+
+			avail_caps = 0;
+
+			/* Check whether the cap is supported by the server */
+			for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
+				if (gslist_find_string(server->cap_supported, tmp->data)) {
+					g_string_append_c(cmd, ' ');
+					g_string_append(cmd, tmp->data);
+
+					avail_caps++;
+				}
+			}
+
+			/* Clear the queue here */
+			gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
+			server->cap_queue = NULL;
+
+			/* If the server doesn't support any cap we requested close the negotiation here */
+			if (avail_caps > 0)
+				irc_send_cmd_now(server, cmd->str);
+			else
+				cap_finish_negotiation(server);
+
+			g_string_free(cmd, TRUE);
+		}
+	}
+	else if (!g_strcmp0(evt, "ACK")) {
+		int got_sasl = FALSE;
+
+		/* Emit a signal for every ack'd cap */
+		for (i = 0; i < caps_length; i++) {
+			disable = (*caps[i] == '-');
+
+			if (disable)
+				server->cap_active = gslist_remove_string(server->cap_active, caps[i] + 1);
+			else
+				server->cap_active = g_slist_prepend(server->cap_active, g_strdup(caps[i]));
+
+			if (!g_strcmp0(caps[i], "sasl"))
+				got_sasl = TRUE;
+
+			cap_emit_signal(server, "ack", caps[i]);
+		}
+
+		/* Hopefully the server has ack'd all the caps requested and we're ready to terminate the
+		 * negotiation, unless sasl was requested. In this case we must not terminate the negotiation
+		 * until the sasl handshake is over. */
+		if (got_sasl == FALSE)
+			cap_finish_negotiation(server);
+	}
+	else if (!g_strcmp0(evt, "NAK")) {
+		g_warning("The server answered with a NAK to our CAP request, this should not happen");
+
+		/* A NAK'd request means that a required cap can't be enabled or disabled, don't update the
+		 * list of active caps and notify the listeners. */
+		for (i = 0; i < caps_length; i++)
+			cap_emit_signal(server, "nak", caps[i]);
+	}
+
+	g_strfreev(caps);
+	g_free(params);
+}
+
+static void event_invalid_cap (IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	/* The server didn't understand one (or more) requested caps, terminate the negotiation.
+	 * This could be handled in a graceful way but since it shouldn't really ever happen this seems a
+	 * good way to deal with 410 errors. */
+	server->cap_complete = FALSE;
+	irc_send_cmd_now(server, "CAP END");
+}
+
+void cap_init (void)
+{
+	signal_add_first("event cap", (SIGNAL_FUNC) event_cap);
+	signal_add_first("event 410", (SIGNAL_FUNC) event_invalid_cap);
+}
+
+void cap_deinit (void)
+{
+	signal_remove("event cap", (SIGNAL_FUNC) event_cap);
+	signal_remove("event 410", (SIGNAL_FUNC) event_invalid_cap);
+}
diff --git a/src/irc/core/irc-cap.h b/src/irc/core/irc-cap.h
new file mode 100644
index 00000000..df957cd2
--- /dev/null
+++ b/src/irc/core/irc-cap.h
@@ -0,0 +1,9 @@
+#ifndef __IRC_CAP_H
+#define __IRC_CAP_H
+
+void cap_init(void);
+void cap_deinit(void);
+int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable);
+void cap_finish_negotiation (IRC_SERVER_REC *server);
+
+#endif
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index bf7386ad..e3ceeeef 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -26,6 +26,7 @@
 #include "irc-chatnets.h"
 #include "irc-channels.h"
 #include "irc-queries.h"
+#include "irc-cap.h"
 
 #include "irc-servers-setup.h"
 #include "channels-setup.h"
@@ -117,6 +118,7 @@ void irc_core_init(void)
 	lag_init();
 	netsplit_init();
 	irc_expandos_init();
+	cap_init();
 
 	settings_check();
 	module_register("core", "irc");
@@ -126,6 +128,7 @@ void irc_core_deinit(void)
 {
 	signal_emit("chat protocol deinit", 1, chat_protocol_find("IRC"));
 
+	cap_deinit();
 	irc_expandos_deinit();
 	netsplit_deinit();
 	lag_deinit();
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index d7122eae..335c88ef 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -32,6 +32,7 @@
 #include "irc-queries.h"
 #include "irc-servers-setup.h"
 #include "irc-servers.h"
+#include "irc-cap.h"
 #include "channel-rejoin.h"
 #include "servers-idle.h"
 #include "servers-reconnect.h"
@@ -201,6 +202,8 @@ static void server_init(IRC_SERVER_REC *server)
 
 	conn = server->connrec;
 
+	irc_send_cmd_now(server, "CAP LS");
+
 	if (conn->proxy != NULL && conn->proxy_password != NULL &&
 	    *conn->proxy_password != '\0') {
 		cmd = g_strdup_printf("PASS %s", conn->proxy_password);
@@ -409,7 +412,16 @@ static void sig_disconnected(IRC_SERVER_REC *server)
                         server_redirect_destroy(tmp->next->data);
 	}
 	g_slist_free(server->cmdqueue);
-        server->cmdqueue = NULL;
+	server->cmdqueue = NULL;
+
+	gslist_free_full(server->cap_active, (GDestroyNotify) g_free);
+	server->cap_active = NULL;
+
+	gslist_free_full(server->cap_supported, (GDestroyNotify) g_free);
+	server->cap_supported = NULL;
+
+	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
+	server->cap_queue = NULL;
 
 	/* these are dynamically allocated only if isupport was sent */
 	g_hash_table_foreach(server->isupport,
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 7e4eeabf..f809fab5 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -69,6 +69,13 @@ struct _IRC_SERVER_REC {
 	int max_whois_in_cmd; /* max. number of nicks in one /WHOIS command */
 	int max_msgs_in_cmd; /* max. number of targets in one /MSG */
 
+	GSList *cap_supported; /* A list of caps supported by the server */
+	GSList *cap_active;    /* A list of caps active for this session */
+	GSList *cap_queue;     /* A list of caps to request on connection */ 
+	int cap_complete:1;    /* We've done the initial CAP negotiation */
+
+	guint sasl_timeout; /* Holds the source id of the running timeout */
+
 	/* Command sending queue */
 	int cmdcount; /* number of commands in `cmdqueue'. Can be more than
 	                 there actually is, to make flood control remember

From ae742f3f13f0d941f3a099740afddcb9d73c446b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Szczepa=C5=84ski?= <jazz2rulez@gmail.com>
Date: Thu, 14 May 2015 13:06:50 +0100
Subject: [PATCH 0085/1650] lastlog doc fix

Only the filename can come right after `-file`. Having `-force` in that position causes an `Irssi: Could not open lastlog: No such file or directory` error.
---
 docs/help/in/lastlog.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/lastlog.in b/docs/help/in/lastlog.in
index 25879d31..e96e2ed5 100644
--- a/docs/help/in/lastlog.in
+++ b/docs/help/in/lastlog.in
@@ -35,7 +35,7 @@
 
     /LASTLOG holiday
     /LASTLOG 'is on vacation' 10
-    /LASTLOG -file -force ~/mike.log 'mike'
+    /LASTLOG -force -file ~/mike.log 'mike'
     /LASTLOG -hilight
     /LASTLOG -5 searchterm
 

From 16c71cf1fbc1e7987fdde821813005b87237e951 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 15 May 2015 16:42:51 +0200
Subject: [PATCH 0086/1650] Implement CHANTYPES support

---
 src/core/servers.h                    |  2 +-
 src/fe-common/irc/dcc/fe-dcc-chat.c   |  2 +-
 src/fe-common/irc/dcc/fe-dcc-get.c    |  5 +++--
 src/fe-common/irc/fe-ctcp.c           |  8 ++++----
 src/fe-common/irc/fe-events-numeric.c |  4 ++--
 src/fe-common/irc/fe-events.c         |  6 +++---
 src/fe-common/irc/fe-irc-channels.c   |  2 +-
 src/fe-common/irc/fe-irc-messages.c   | 20 ++++++++++----------
 src/fe-common/irc/fe-irc-queries.c    |  2 +-
 src/fe-common/irc/fe-modes.c          |  2 +-
 src/fe-common/irc/fe-netjoin.c        |  2 +-
 src/irc/core/bans.c                   |  2 +-
 src/irc/core/channel-rejoin.c         |  2 +-
 src/irc/core/irc-channels.c           |  4 ++--
 src/irc/core/irc-commands.c           |  2 +-
 src/irc/core/irc-nicklist.c           |  2 +-
 src/irc/core/irc-queries.c            |  4 ++--
 src/irc/core/irc-servers.c            | 21 ++++++++++++++-------
 src/irc/core/irc.h                    |  6 ------
 src/irc/core/modes.c                  |  6 +++---
 src/irc/dcc/dcc-autoget.c             |  2 +-
 src/irc/flood/flood.c                 |  4 ++--
 src/irc/proxy/listen.c                |  2 +-
 23 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/src/core/servers.h b/src/core/servers.h
index d6afbdf5..f39c650b 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -18,7 +18,7 @@
 	(SERVER_CONNECT(conn) ? TRUE : FALSE)
 
 #define server_ischannel(server, channel) \
-        (server)->ischannel(server, channel)
+	((server)->ischannel(server, channel))
 
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat.c b/src/fe-common/irc/dcc/fe-dcc-chat.c
index e2706ba3..5bcb3475 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat.c
@@ -44,7 +44,7 @@ static void dcc_request(CHAT_DCC_REC *dcc)
         if (!IS_DCC_CHAT(dcc)) return;
 
 	printformat(dcc->server, NULL, MSGLEVEL_DCC,
-		    ischannel(*dcc->target) ? IRCTXT_DCC_CHAT_CHANNEL :
+		    server_ischannel(SERVER(dcc->server), dcc->target) ? IRCTXT_DCC_CHAT_CHANNEL :
 		    IRCTXT_DCC_CHAT, dcc->id, dcc->addrstr,
 		    dcc->port, dcc->target);
 }
diff --git a/src/fe-common/irc/dcc/fe-dcc-get.c b/src/fe-common/irc/dcc/fe-dcc-get.c
index 451463f9..675cab65 100644
--- a/src/fe-common/irc/dcc/fe-dcc-get.c
+++ b/src/fe-common/irc/dcc/fe-dcc-get.c
@@ -21,6 +21,7 @@
 #include "module.h"
 #include "signals.h"
 #include "levels.h"
+#include "servers.h"
 
 #include "irc.h"
 #include "dcc-file.h"
@@ -35,12 +36,12 @@ static void dcc_request(GET_DCC_REC *dcc)
 {
 	char *sizestr;
 
-        if (!IS_DCC_GET(dcc)) return;
+	if (!IS_DCC_GET(dcc)) return;
 
 	sizestr = dcc_get_size_str(dcc->size);
 
 	printformat(dcc->server, NULL, MSGLEVEL_DCC,
-		    ischannel(*dcc->target) ? IRCTXT_DCC_SEND_CHANNEL :
+		    server_ischannel(SERVER(dcc->server), dcc->target) ? IRCTXT_DCC_SEND_CHANNEL :
 		    IRCTXT_DCC_SEND, dcc->nick, dcc->addrstr,
 		    dcc->port, dcc->arg, sizestr, dcc->target);
 
diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index 2321bb7a..cbb591ba 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -49,7 +49,7 @@ static void ctcp_default_msg(IRC_SERVER_REC *server, const char *data,
                 data = p+1;
 	}
 
-	printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
+	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
 		    IRCTXT_CTCP_REQUESTED_UNKNOWN,
 		    nick, addr, cmd, data, target);
         g_free(cmd);
@@ -113,8 +113,8 @@ static void ctcp_default_reply(IRC_SERVER_REC *server, const char *data,
 		ctcpdata = ptr+1;
 	}
 
-	printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
-		    ischannel(*target) ? IRCTXT_CTCP_REPLY_CHANNEL :
+	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
+		    server_ischannel(SERVER(server), target) ? IRCTXT_CTCP_REPLY_CHANNEL :
 		    IRCTXT_CTCP_REPLY, ctcp, nick, ctcpdata, target);
 	g_free(ctcp);
 }
@@ -137,7 +137,7 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
 
         g_get_current_time(&tv);
 	usecs = get_timeval_diff(&tv, &tv2);
-        printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
+        printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
                     IRCTXT_CTCP_PING_REPLY, nick, usecs/1000, usecs%1000);
 }
 
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index ec7669ab..3eb124fc 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -400,7 +400,7 @@ static void event_target_unavailable(IRC_SERVER_REC *server, const char *data,
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 2, NULL, &target);
-	if (!ischannel(*target)) {
+	if (!server_ischannel(SERVER(server), target)) {
 		/* nick unavailable */
 		printformat(server, NULL, MSGLEVEL_CRAP,
 			    IRCTXT_NICK_UNAVAILABLE, target);
@@ -583,7 +583,7 @@ static void print_event_received(IRC_SERVER_REC *server, const char *data,
 		return;
 	ptr++;
 
-	if (ischannel(*data)) /* directed at channel */
+	if (server_ischannel(SERVER(server), data)) /* directed at channel */
 		target = g_strndup(data, (int)(ptr - data - 1));
 	else if (!target_param || *ptr == ':' || (ptr2 = strchr(ptr, ' ')) == NULL)
 		target = NULL;
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 5cde9e4b..ad5e7559 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -52,15 +52,15 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
 	if (nick == NULL) nick = server->real_address;
 	if (addr == NULL) addr = "";
-	if (*target == '@' && ischannel(target[1])) {
+	if (*target == '@' && server_ischannel(SERVER(server), &target[1])) {
 		/* Hybrid 6 feature, send msg to all ops in channel */
 		recoded = recode_in(SERVER(server), msg, target+1);
 		signal_emit("message irc op_public", 5,
 			    server, recoded, nick, addr,
 			    get_visible_target(server, target+1));
 	} else {
-		recoded = recode_in(SERVER(server), msg, ischannel(*target) ? target : nick);
-		signal_emit(ischannel(*target) ?
+		recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick);
+		signal_emit(server_ischannel(SERVER(server), target) ?
 			    "message public" : "message private", 5,
 			    server, recoded, nick, addr,
 			    get_visible_target(server, target));
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index e884aef4..9129e451 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -46,7 +46,7 @@ static void sig_event_forward(SERVER_REC *server, const char *data,
 	char *params, *from, *to;
 
 	params = event_get_params(data, 3, NULL, &from, &to);
-	if (from != NULL && to != NULL && ischannel(*from) && ischannel(*to)) {
+	if (from != NULL && to != NULL && server_ischannel(server, *from) && server_ischannel(server, *to)) {
 		channel = irc_channel_find(server, from);
 		if (channel != NULL && irc_channel_find(server, to) == NULL) {
 			window_bind_add(window_item_window(channel),
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 94d1ad4a..780c0b7e 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -57,7 +57,7 @@ static const char *skip_target(IRC_SERVER_REC *server, const char *target)
 			break;
 	};
 
-	if(ischannel(target[i]))
+	if(server_ischannel(SERVER(server), &target[i]))
 		target += i;
 
 	return target;
@@ -136,7 +136,7 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
 
 	oldtarget = target;
 	target = skip_target(IRC_SERVER(server), target);
-        if (ischannel(*target))
+	if (server_ischannel(SERVER(server), target))
 		item = irc_channel_find(server, target);
 	else
 		item = irc_query_find(server, target);
@@ -146,7 +146,7 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
 
 	printformat(server, target,
 		    MSGLEVEL_ACTIONS | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT |
-		    (ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS),
+		    (server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS),
 		    item != NULL && oldtarget == target ? IRCTXT_OWN_ACTION : IRCTXT_OWN_ACTION_TARGET,
 		    server->nick, msg, oldtarget);
         g_free_not_null(freemsg);
@@ -166,7 +166,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	target = skip_target(IRC_SERVER(server), target);
 
 	level = MSGLEVEL_ACTIONS |
-		(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
+		(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
 
 	if (ignore_check(SERVER(server), nick, address, target, msg, level))
 		return;
@@ -175,7 +175,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 			 level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ischannel(*target)) {
+	if (server_ischannel(SERVER(server), target)) {
 		item = irc_channel_find(server, target);
 	} else {
 		own = (!g_strcmp0(nick, server->nick));
@@ -185,7 +185,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis(item, msg);
 
-	if (ischannel(*target)) {
+	if (server_ischannel(SERVER(server), target)) {
 		/* channel action */
 		if (window_item_is_active(item) && target == oldtarget) {
 			/* message to active channel in window */
@@ -245,16 +245,16 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 	}
 
 	if (ignore_check(server, nick, address,
-			 ischannel(*target) ? target : NULL,
+			 server_ischannel(SERVER(server), target) ? target : NULL,
 			 msg, level))
 		return;
 
 	if (ignore_check(server, nick, address,
-			 ischannel(*target) ? target : NULL,
+			 server_ischannel(SERVER(server), target) ? target : NULL,
 			 msg, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-        if (ischannel(*target)) {
+        if (server_ischannel(SERVER(server), target)) {
 		/* notice in some channel */
 		printformat(server, target, level,
 			    IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
@@ -283,7 +283,7 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
 
 	oldtarget = target;
 	target = skip_target(server, target);
-	printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
+	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
 		    IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, oldtarget);
 }
 
diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c
index 0861c9e4..b2faefbc 100644
--- a/src/fe-common/irc/fe-irc-queries.c
+++ b/src/fe-common/irc/fe-irc-queries.c
@@ -63,7 +63,7 @@ static void event_privmsg(SERVER_REC *server, const char *data,
 
 	g_return_if_fail(data != NULL);
 
-	if (nick == NULL || address == NULL || ischannel(*data) ||
+	if (nick == NULL || address == NULL || server_ischannel(server, data) ||
 	    !settings_get_bool("query_track_nick_changes"))
                 return;
 
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index e5317c0f..53e56c97 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -168,7 +168,7 @@ static void sig_message_mode(IRC_SERVER_REC *server, const char *channel,
 			 mode, MSGLEVEL_MODES))
 		return;
 
-	if (!ischannel(*channel)) {
+	if (!server_ischannel(SERVER(server), channel)) {
 		/* user mode change */
 		printformat(server, NULL, MSGLEVEL_MODES,
 			    IRCTXT_USERMODE_CHANGE, mode, channel);
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 35c463e4..f5cb081e 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -400,7 +400,7 @@ static void msg_mode(IRC_SERVER_REC *server, const char *channel,
 	int show;
 
 	g_return_if_fail(data != NULL);
-	if (!ischannel(*channel) || addr != NULL)
+	if (!server_ischannel(SERVER(server), channel) || addr != NULL)
 		return;
 
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index b60e681b..68dd45c0 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -186,7 +186,7 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server,
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST,
 			    item, &channel, &nicks)) return;
-	if (!ischannel(*channel)) cmd_param_error(CMDERR_NOT_JOINED);
+	if (!server_ischannel(SERVER(server), channel)) cmd_param_error(CMDERR_NOT_JOINED);
 	if (*nicks == '\0') {
 		if (g_strcmp0(data, "*") != 0)
 			cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c
index 68a1dee1..154035ae 100644
--- a/src/irc/core/channel-rejoin.c
+++ b/src/irc/core/channel-rejoin.c
@@ -149,7 +149,7 @@ static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 2, NULL, &channel);
-	if (ischannel(*channel)) {
+	if (server_ischannel(SERVER(server), channel)) {
 		chanrec = irc_channel_find(server, channel);
 		if (chanrec != NULL && chanrec->joined) {
 			/* dalnet event - can't change nick while
diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index e38cb98b..add18acf 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -99,7 +99,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 	tmp = chanlist;
 	for (;; tmp++) {
 		if (*tmp !=  NULL) {
-			channel = ischannel(**tmp) ? g_strdup(*tmp) :
+			channel = server_ischannel(SERVER(server), *tmp) ? g_strdup(*tmp) :
 			g_strdup_printf("#%s", *tmp);
 
 			chanrec = irc_channel_find(server, channel);
@@ -134,7 +134,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 			if (use_keys)
 				cmdlen += outkeys->len;
 			if (*tmpstr != NULL)
-				cmdlen += ischannel(**tmpstr) ? strlen(*tmpstr) :
+				cmdlen += server_ischannel(SERVER(server), *tmpstr) ? strlen(*tmpstr) :
 					  strlen(*tmpstr)+1;
 			if (*tmpkey != NULL)
 				cmdlen += strlen(*tmpkey);
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index e7fb5067..f2cd49c0 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -191,7 +191,7 @@ static void cmd_kick(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 		return;
 
 	if (*channame == '\0' || *nicks == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-	if (!ischannel(*channame)) cmd_param_error(CMDERR_NOT_JOINED);
+	if (!server_ischannel(SERVER(server), channame)) cmd_param_error(CMDERR_NOT_JOINED);
 
 	recoded = recode_out(SERVER(server), reason, channame);
 	g_string_printf(tmpstr, "KICK %s %s :%s", channame, nicks, recoded);
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 5438509e..667016aa 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -394,7 +394,7 @@ static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 2, NULL, &channel);
-	if (!ischannel(*channel)) {
+	if (!server_ischannel(SERVER(server), channel)) {
 		/* nick is unavailable. */
 		event_nick_in_use(server, data);
 	}
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 72c17df1..12861744 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -60,8 +60,8 @@ static void check_query_changes(IRC_SERVER_REC *server, const char *nick,
 {
 	QUERY_REC *query;
 
-	if (ischannel(*target))
-                return;
+	if (server_ischannel(SERVER(server), target))
+		return;
 
 	query = irc_query_find(server, nick);
 	if (query == NULL)
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index d7122eae..c04c4318 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -71,13 +71,20 @@ static int isnickflag_func(SERVER_REC *server, char flag)
 
 static int ischannel_func(SERVER_REC *server, const char *data)
 {
-	if (*data == '@') {
-		/* @#channel, @+#channel */
-		data++;
-		if (*data == '+' && ischannel(data[1]))
-			return 1;
-	}
-	return ischannel(*data);
+	IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server;
+	char *chantypes;
+
+	chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
+	if (chantypes == NULL)
+		chantypes = "#&!+"; /* normal, local, secure, modeless */
+
+	/* @#channel, @+#channel */
+	if (data[0] == '@' && data[1] == '+')
+		data += 2;
+	else if (data[0] == '@')
+		data += 1;
+
+	return strchr(chantypes, *data) != NULL;
 }
 
 static char **split_line(const SERVER_REC *server, const char *line,
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index de19e084..b5bd833a 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -22,12 +22,6 @@ typedef struct _REDIRECT_REC REDIRECT_REC;
 #define isnickflag(server, a) \
 	(server->prefix[(int)(unsigned char) a] != '\0')
 
-#define ischannel(a) \
-	((a) == '#' || /* normal */ \
-	(a) == '&' || /* local */ \
-	(a) == '!' || /* secure */ \
-	(a) == '+') /* modeless */
-
 #define IS_IRC_ITEM(rec) (IS_IRC_CHANNEL(rec) || IS_IRC_QUERY(rec))
 #define IRC_PROTOCOL (chat_protocol_lookup("IRC"))
 
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index a812691c..32a0c169 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -488,7 +488,7 @@ static void event_mode(IRC_SERVER_REC *server, const char *data,
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
 				  &channel, &mode);
 
-	if (!ischannel(*channel)) {
+	if (!server_ischannel(SERVER(server), channel)) {
 		/* user mode change */
 		parse_user_mode(server, mode);
 	} else {
@@ -536,7 +536,7 @@ static void sig_req_usermode_change(IRC_SERVER_REC *server, const char *data,
 
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
 				  &target, &mode);
-	if (!ischannel(*target)) {
+	if (!server_ischannel(SERVER(server), target)) {
                 /* we requested a user mode change, save this */
 		mode = modes_join(NULL, server->wanted_usermode, mode, FALSE);
                 g_free_not_null(server->wanted_usermode);
@@ -856,7 +856,7 @@ static void cmd_mode(const char *data, IRC_SERVER_REC *server,
 			target = chanrec->name;
 
 		irc_send_cmdv(server, "MODE %s", target);
-	} else if (ischannel(*target))
+	} else if (server_ischannel(SERVER(server), target))
 		channel_set_mode(server, target, mode);
 	else {
 		if (g_ascii_strcasecmp(target, server->nick) == 0) {
diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index 38170c56..de23a5d1 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -51,7 +51,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 
 	/* Unless specifically said in dcc_autoget_masks, don't do autogets
 	   sent to channels. */
-	if (*masks == '\0' && dcc->target != NULL && ischannel(*dcc->target))
+	if (*masks == '\0' && dcc->target != NULL && server_ischannel(SERVER(dcc->server), dcc->target))
 		return;
 
 	/* don't autoget files beginning with a dot, if download dir is
diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c
index 29502ca6..0944a6eb 100644
--- a/src/irc/flood/flood.c
+++ b/src/irc/flood/flood.c
@@ -250,7 +250,7 @@ static void flood_privmsg(IRC_SERVER_REC *server, const char *data,
 
 	params = event_get_params(data, 2, &target, &text);
 
-	level = ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS;
+	level = server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS;
 	if (addr != NULL && !ignore_check(SERVER(server), nick, addr, target, text, level))
 		flood_newmsg(server, level, nick, addr, target);
 
@@ -287,7 +287,7 @@ static void flood_ctcp(IRC_SERVER_REC *server, const char *data,
 		return;
 
 	level = g_ascii_strncasecmp(data, "ACTION ", 7) != 0 ? MSGLEVEL_CTCPS :
-		(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
+		(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
 	if (!ignore_check(SERVER(server), nick, addr, target, data, level))
 		flood_newmsg(server, level, nick, addr, target);
 }
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 4c3bcf68..c334e698 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -262,7 +262,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 
 		ignore_next = TRUE;
 		if (*msg != '\001' || msg[strlen(msg)-1] != '\001') {
-	        	signal_emit(ischannel(*target) ?
+	        	signal_emit(server_ischannel(SERVER(client->server), target) ?
 				    "message own_public" : "message own_private", 4,
 				    client->server, msg, target, target);
 		} else if (strncmp(msg+1, "ACTION ", 7) == 0) {

From fa782ae6bce1efd19f41f3b225e13e390d7629b2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 29 May 2015 14:09:55 +0200
Subject: [PATCH 0087/1650] Update sb_search.pl

make it easier to bind sb search to a key
---
 scripts/sb_search.pl | 51 +++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/scripts/sb_search.pl b/scripts/sb_search.pl
index 43fc7b55..51b9100b 100644
--- a/scripts/sb_search.pl
+++ b/scripts/sb_search.pl
@@ -22,7 +22,7 @@ use Irssi;
 use Irssi::TextUI;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = '1.0';
+$VERSION = '1.1';
 %IRSSI = (
 	authors     => 'Wouter Coekaerts, Emanuele Giaquinta',
 	contact     => 'wouter@coekaerts.be, exg@irssi.org',
@@ -40,49 +40,66 @@ sub cmd_help {
 
 SCROLLBACK SEARCH [-level <level>] [-regexp] [-case] [-word] [-forward] [-all] [<pattern>]
 
-    -level: only search for lines with the given level. see /help levels
-    -regexp: the pattern is a regular expression
-    -case: search case sensitive
-    -word: pattern must match to full words
-    -forward: search forwards (default is backwards)
-    -all: search in all windows
-    <pattern>: text to search for
+    SEARCH:     Search for text in the scrollback buffer.
+
+    -regexp:    The given text pattern is a regular expression.
+    -case:      Performs a case-sensitive matching.
+    -word:      The text must match full words.
+    -forward:   Search forwards (default is backwards).
+    -all:       Search in all windows.
+
+    Without arguments, the last search is repeated.
 SCRIPTHELP_EOF
 			,MSGLEVEL_CLIENTCRAP);
 	}
 }
 
+my $regex;
+my $all;
+my $level;
 
-sub cmd_sb_search ($$$) {
+sub cmd_sb_search {
 	my ($args, $server, $witem) = @_;
 	
 	### handle options
 	
 	my ($options, $pattern) = Irssi::command_parse_options('scrollback search', $args);
 
-	my $level;
+	my $forward = defined(delete $options->{forward});
+
+	if (!%$options && !$pattern) {
+		return if !$regex && !defined $level;
+	} else {
+		$all = defined($options->{all});
+		$level = MSGLEVEL_ALL;
+		undef $regex;
+	}
+
 	if (defined($options->{level})) {
 		$level = $options->{level};
 		$level =~ y/,/ /;
 		$level = Irssi::combine_level(0, $level);
-	} else {
-		return if (!$pattern);
-		$level = MSGLEVEL_ALL;
 	}
 	
-	my $regex;
 	if ($pattern) {
 		my $flags = defined($options->{case}) ? '' : '(?i)';
 		my $b = defined($options->{word}) ? '\b' : '';
 		if (defined($options->{regexp})) {
-			$regex = qr/$flags$b$pattern$b/;
+			local $@;
+			eval {
+				$regex = qr/$flags$b$pattern$b/;
+			};
+			if ($@) {
+				my ($err) = $@ =~ /^(.*)/;
+				$err =~ s/\sat .* line \d+\.$//;
+				print CLIENTERROR $err;
+				return;
+			}
 		} else {
 			$regex = qr/$flags$b\Q$pattern\E$b/;
 		}
 	}
 	
-	my $forward = defined($options->{forward});
-	my $all = defined($options->{all});
 
 	### determine window(s) to search in
 	

From e480b9b16579a0434dba61c58dec362511062cb8 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 31 May 2015 15:30:21 +0200
Subject: [PATCH 0088/1650] Improve ischannel_func (#253)

The function now skips all the leading characters that are in the STATUSMSG. If
the server didn't send the STATUSMSG option then it's assumed to be "@+" for
compatibility with bahamut 2.4 (sic).
---
 src/irc/core/irc-servers.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index c04c4318..31ba397b 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -72,17 +72,17 @@ static int isnickflag_func(SERVER_REC *server, char flag)
 static int ischannel_func(SERVER_REC *server, const char *data)
 {
 	IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server;
-	char *chantypes;
+	char *chantypes, *statusmsg;
 
 	chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
 	if (chantypes == NULL)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
+	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
+	if (statusmsg == NULL)
+		statusmsg = "@+";
 
-	/* @#channel, @+#channel */
-	if (data[0] == '@' && data[1] == '+')
-		data += 2;
-	else if (data[0] == '@')
-		data += 1;
+	while (strchr(statusmsg, *data) != NULL)
+		data++;
 
 	return strchr(chantypes, *data) != NULL;
 }

From a79f150a768b66b04f1edbc6ddf27afe13f2e2c1 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Fri, 12 Jun 2015 17:23:49 +0200
Subject: [PATCH 0089/1650] Clarify the help for /LIST (#228)

Clarify the help for /LIST (#228)
---
 docs/help/in/list.in | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/list.in b/docs/help/in/list.in
index 14858337..33f05e8b 100644
--- a/docs/help/in/list.in
+++ b/docs/help/in/list.in
@@ -7,8 +7,8 @@
 
     -yes:    Confirms that you want to receive a large amount of data.
 
-    The text a channel must match; if no argument is given, the list of all
-    channels will be displayed.
+    If the exact name of a channel is given, the only information about this
+    channel is requested; otherwise, a list of all channels will be displayed.
 
 %9Description:%9
 
@@ -19,7 +19,16 @@
 
     /LIST
     /LIST -yes
-    /LIST -yes *ubuntu*
+    /LIST #ubuntu
+    /LIST #*ubuntu*,>1
+
+%9Remarks:%9
+
+    Not all networks support server-side filtering and may provide a network
+    service instead; on IRCnet, you may use the ALIS service:
+
+    /QUOTE SQUERY ALIS :HELP
+    /MSG ALIS HELP
 
 %9See also:%9 QUOTE, STATS, WHOIS
 

From 4cc6fdaaab5db3d22e195b1d0912dae40348e140 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Fri, 12 Jun 2015 17:44:13 +0200
Subject: [PATCH 0090/1650] Add server check in irc_server_connect (#208)

Fail instead of crash, if irc_server_connect is called without object.
(#208)
---
 src/irc/core/irc-servers.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index d7122eae..c5e1e318 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -314,6 +314,8 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 
 void irc_server_connect(SERVER_REC *server)
 {
+	g_return_if_fail(server != NULL);
+
 	if (!server_start_connect(server)) {
                 server_connect_unref(server->connrec);
 		g_free(server);

From d222c11f74a5662df59e00e7ae6c8105179a804e Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Fri, 12 Jun 2015 18:50:55 +0200
Subject: [PATCH 0091/1650] Revert "Bug fix - docdir is ignored during
 installation."

---
 docs/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 861a2ca4..5e222564 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,3 +1,5 @@
+docdir = $(datadir)/doc/irssi
+
 man_MANS = \
 	irssi.1
 

From a663d2f674f1408fcd54a3d1f8823dffdcc8123f Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Fri, 12 Jun 2015 19:40:15 +0200
Subject: [PATCH 0092/1650] Updated the bundled scripts to their latest version
 (#143)

Updated the bundled scripts to their latest version (#143)

Removed sb_search.pl which is not contributed into the script archive, I
will poke coekie about it.
---
 scripts/autoop.pl     |  73 +++++++++++++++++--
 scripts/autorejoin.pl |  67 ++++++++++--------
 scripts/buf.pl        |  17 +++--
 scripts/dns.pl        |  22 +++---
 scripts/kills.pl      |   9 +--
 scripts/mail.pl       |   4 +-
 scripts/mlock.pl      |   2 +-
 scripts/quitmsg.pl    |   4 +-
 scripts/sb_search.pl  | 159 ------------------------------------------
 scripts/usercount.pl  |   3 +-
 10 files changed, 140 insertions(+), 220 deletions(-)
 delete mode 100644 scripts/sb_search.pl

diff --git a/scripts/autoop.pl b/scripts/autoop.pl
index f7182999..b72def15 100644
--- a/scripts/autoop.pl
+++ b/scripts/autoop.pl
@@ -5,13 +5,13 @@ use Irssi;
 use strict;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.00";
+$VERSION = "1.10";
 %IRSSI = (
-    authors     => 'Timo Sirainen',
+    authors     => 'Timo Sirainen & Jostein Kjønigsen',
     name        => 'autoop',
     description => 'Simple auto-op script',
     license     => 'Public Domain',
-    changed	=> 'Sun Mar 10 23:18 EET 2002'
+    changed	=> 'Fri Nov 24 12:55 GMT+1 2014'
 );
 
 my (%opnicks, %temp_opped);
@@ -64,7 +64,7 @@ sub autoop {
 
                 if (!$temp_opped{$nick} &&
 		    $server->masks_match($masks, $nick, $host)) {
-			$channel->command("op $nick");
+			$channel->command("/op $nick");
 			$temp_opped{$nick} = 1;
 		}
 	}
@@ -89,3 +89,68 @@ sub event_massjoin {
 
 Irssi::command_bind('autoop', 'cmd_autoop');
 Irssi::signal_add_last('massjoin', 'event_massjoin');
+
+sub load_autoops {
+    my($file) = Irssi::get_irssi_dir."/autoop";
+    my($count) = 0;
+    local(*CONF);
+    
+    %opnicks = ();
+    open(CONF, "<", "$file") or return;
+    while (my $line = <CONF>) {
+	if ($line !=~ /^\s*$/) {
+	    cmd_autoop($line);
+	    $count++;
+	}
+    }
+    close(CONF);
+    
+    Irssi::print("Loaded $count channels from $file");
+}
+
+# --------[ save_autoops ]------------------------------------------------
+
+sub save_autoops {
+    my($auto) = @_;
+    my($file) = Irssi::get_irssi_dir."/autoop";
+    my($count) = 0;
+    my($channel) = "";
+    local(*CONF);
+    
+    return if $auto;
+    
+    open(CONF, ">", "$file");
+    foreach $channel (keys %opnicks) {
+	my $masks = $opnicks{$channel};
+	print CONF "$channel\t$masks\n";
+	$count++;
+    }
+    close(CONF);
+    
+    Irssi::print("Saved $count channels to $file")
+	unless $auto;
+}
+
+
+# --------[ sig_setup_reread ]------------------------------------------
+
+# main setup is reread, so let us do it too
+sub sig_setup_reread {
+    load_autoops;
+}
+
+# --------[ sig_setup_save ]--------------------------------------------
+
+# main config is saved, and so we should save too
+sub sig_setup_save {
+    my($mainconf,$auto) = @_;
+    save_autoops($auto);
+}
+
+# persistance
+
+Irssi::signal_add('setup saved', 'sig_setup_save');
+Irssi::signal_add('setup reread', 'sig_setup_reread');
+
+# ensure we load persisted values on start
+load_autoops;
diff --git a/scripts/autorejoin.pl b/scripts/autorejoin.pl
index 2d23449f..42c97da7 100644
--- a/scripts/autorejoin.pl
+++ b/scripts/autorejoin.pl
@@ -1,6 +1,5 @@
-# automatically rejoin to channel after kicked
-
-# /SET autorejoin_channels #channel1 #channel2 ...
+# automatically rejoin to channel after kick
+# delayed rejoin: Lam 28.10.2001 (lam@lac.pl)
 
 # NOTE: I personally don't like this feature, in most channels I'm in it
 # will just result as ban. You've probably misunderstood the idea of /KICK
@@ -10,43 +9,49 @@ use Irssi;
 use Irssi::Irc;
 use strict;
 use vars qw($VERSION %IRSSI);
-
-$VERSION = "1.00";
+$VERSION = "1.0.0";
 %IRSSI = (
-    authors     => 'Timo Sirainen',
-    name        => 'autorejoin',
-    description => 'Automatically rejoin to channel after kicked',
-    license     => 'Public Domain',
-    changed	=> 'Sun Mar 10 23:18 EET 2002'
+	authors => "Timo 'cras' Sirainen, Leszek Matok",
+	contact => "lam\@lac.pl",
+	name => "autorejoin",
+	description => "Automatically rejoin to channel after being kick, after a (short) user-defined delay",
+	license => "GPLv2",
+	changed => "10.3.2002 14:00"
 );
 
-sub channel_rejoin {
-  my ($server, $channel) = @_;
 
-  # check if channel has password
-  my $chanrec = $server->channel_find($channel);
-  my $password = $chanrec->{key} if ($chanrec);
+# How many seconds to wait before the rejoin?
+# TODO: make this a /setting
+my $delay = 5;
 
-  # We have to use send_raw() because the channel record still
-  # exists and irssi won't even try to join to it with command()
-  $server->send_raw("JOIN $channel $password");
+my @tags;
+my $acttag = 0;
+
+sub rejoin {
+	my ( $data ) = @_;
+	my ( $tag, $servtag, $channel, $pass ) = split( / +/, $data );
+
+	my $server = Irssi::server_find_tag( $servtag );
+	$server->send_raw( "JOIN $channel $pass" ) if ( $server );
+	Irssi::timeout_remove( $tags[$tag] );
 }
 
 sub event_rejoin_kick {
-  my ($server, $data) = @_;
-  my ($channel, $nick) = split(/ +/, $data);
+	my ( $server, $data ) = @_;
+	my ( $channel, $nick ) = split( / +/, $data );
 
-  return if ($server->{nick} ne $nick);
+	return if ( $server->{ nick } ne $nick );
 
-  # check if we want to autorejoin this channel
-  my @chans = split(/[ ,]+/, Irssi::settings_get_str('autorejoin_channels'));
-  foreach my $chan (@chans) {
-    if (lc($chan) eq lc($channel)) {
-      channel_rejoin($server, $channel);
-      last;
-    }
-  }
+	# check if channel has password
+	my $chanrec = $server->channel_find( $channel );
+	my $password = $chanrec->{ key } if ( $chanrec );
+	my $rejoinchan = $chanrec->{ name } if ( $chanrec );
+	my $servtag = $server->{ tag };
+
+	Irssi::print "Rejoining $rejoinchan in $delay seconds.";
+	$tags[$acttag] = Irssi::timeout_add( $delay * 1000, "rejoin", "$acttag $servtag $rejoinchan $password" );
+	$acttag++;
+	$acttag = 0 if ( $acttag > 60 );
 }
 
-Irssi::settings_add_str('misc', 'autorejoin_channels', '');
-Irssi::signal_add('event kick', 'event_rejoin_kick');
+Irssi::signal_add( 'event kick', 'event_rejoin_kick' );
diff --git a/scripts/buf.pl b/scripts/buf.pl
index 43b4b3dd..da50e821 100644
--- a/scripts/buf.pl
+++ b/scripts/buf.pl
@@ -40,7 +40,7 @@ use Data::Dumper;
 my %suppress;
 
 sub upgrade {
-    open BUF, sprintf('>%s/scrollbuffer', get_irssi_dir) or die $!;
+    open BUF, q{>}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
     print BUF join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
     for my $window (windows) {
 	next unless defined $window;
@@ -66,7 +66,7 @@ sub upgrade {
 }
 
 sub restore {
-    open BUF, sprintf('<%s/scrollbuffer', get_irssi_dir) or die $!;
+    open BUF, q{<}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
     my @suppress = split /\0/, <BUF>;
     if (settings_get_bool 'upgrade_suppress_join') {
 	chomp $suppress[-1];
@@ -98,14 +98,13 @@ sub restore {
 
 sub suppress {
     my ($first, $second) = @_;
-    return
-	unless scalar keys %suppress
-	and settings_get_bool 'upgrade_suppress_join';
-    my $key = $first->{address} . 
-	(grep { (s/^://, /^[#!+&]/) } split ' ', $second)[0];
+    return unless scalar keys %suppress and settings_get_bool 'upgrade_suppress_join';
+    my $key_part = (grep { /^:?[#!+&]/ } split ' ', $second)[0];
+    $key_part =~ s/^://;
+    my $key = $first->{address} . $key_part;
     if (exists $suppress{$key} and $suppress{$key}--) {
-	signal_stop();
-	delete $suppress{$key} unless $suppress{$key};
+    	signal_stop();
+        delete $suppress{$key} unless $suppress{$key};
     }
 }
 
diff --git a/scripts/dns.pl b/scripts/dns.pl
index 612fab0e..989cdc3e 100644
--- a/scripts/dns.pl
+++ b/scripts/dns.pl
@@ -1,18 +1,24 @@
 # /DNS <nick>|<host>|<ip> ...
+# version 2.1.1
+# 
+# updated the script to fix a bug where the script would let
+# a trailing whitespace go through (ex: tab completion)
+# - inch <inch@stmpd.net>
 
-use Irssi;
 use strict;
 use Socket;
 use POSIX;
 
 use vars qw($VERSION %IRSSI); 
-$VERSION = "2.1";
+$VERSION = "2.1.1";
 %IRSSI = (
-    authors	=> 'Timo Sirainen',
-    name	=> 'dns',
-    description	=> '/DNS <nick>|<host>|<ip> ...',
-    license	=> 'Public Domain',
-    changed	=> 'Sun Mar 10 23:23 EET 2002'
+    authors	=> "Timo \'cras\' Sirainen",
+    contact	=> "tss\@iki.fi", 
+    name	=> "dns",
+    description	=> "/DNS <nick>|<host>|<ip> ...",
+    license	=> "Public Domain",
+    url		=> "http://irssi.org/",
+    changed	=> "2002-03-04T22:47+0100"
 );
 
 my (%resolve_hosts, %resolve_nicks, %resolve_print); # resolve queues
@@ -28,7 +34,7 @@ my $pipe_tag;
 sub cmd_dns {
   my ($nicks, $server) = @_;
   return if !$nicks;
-
+  $nicks =~ s/\s+$//; 
   # get list of nicks/hosts we want to know
   my $tag = !$server ? undef : $server->{tag};
   my $ask_nicks = "";
diff --git a/scripts/kills.pl b/scripts/kills.pl
index 7ed2d533..50d9383d 100644
--- a/scripts/kills.pl
+++ b/scripts/kills.pl
@@ -10,6 +10,7 @@
 # There's a pretty good explanation of (ircnet) ircd's server kills in
 # http://www.irc.org/tech_docs/ircnet/kills.html
 
+use strict;
 use Irssi;
 use vars qw($VERSION %IRSSI);
 
@@ -47,13 +48,13 @@ sub msg_quit {
   my @printargs = ();
   if ($killmsg =~ /([^ ]*) != (.*)/) {
     # 1 != 2
-    my $server1 = $1, $server2 = $2;
+    my $server1 = $1, my $server2 = $2;
 
     $server1 =~ s/([^\[]*)\[([^\]]*)\]/\1/;
     $msg .= "$2 != $server2";
   } elsif ($killmsg =~ /([^ ]*) <- (.*)/) {
     # 1 <- 2
-    my $server1 = $1, $server2 = $2;
+    my $server1 = $1, my $server2 = $2;
 
     if ($server1 =~ /^\(/) {
       # (addr1)server1 <- (add2)server2
@@ -84,9 +85,9 @@ sub msg_quit {
     $msg = $killmsg;
   }
 
-  @list = $server->nicks_get_same($nick);
+  my @list = $server->nicks_get_same($nick);
   while (@list) {
-    $channel = $list[0];
+    my $channel = $list[0];
     shift @list;
     # skip nick record
     shift @list;
diff --git a/scripts/mail.pl b/scripts/mail.pl
index 33b3c22e..190c33af 100644
--- a/scripts/mail.pl
+++ b/scripts/mail.pl
@@ -1,3 +1,5 @@
+use strict;
+use vars qw($VERSION %IRSSI);
 $VERSION = "2.92";
 %IRSSI = (
     authors     => "Timo Sirainen, Matti Hiljanen, Joost Vunderink, Bart Matthaei",
@@ -114,7 +116,7 @@ sub mbox_count {
 	$last_mtime = $mtime;
 
 	my $f = gensym;
-	return 0 if (!open($f, $mailfile));
+	return 0 if (!open($f, "<", $mailfile));
 
 	# count new mails only
 	my $internal_removed = 0;
diff --git a/scripts/mlock.pl b/scripts/mlock.pl
index ed2fe52b..bf2fd002 100644
--- a/scripts/mlock.pl
+++ b/scripts/mlock.pl
@@ -113,7 +113,7 @@ sub mlock_check_mode {
 	}
 
 	if ($modecmd ne "") {
-		$channel->{server}->command("mode $channame $modecmd$extracmd");
+		$channel->{server}->command("/mode $channame $modecmd$extracmd");
 	}
 }
 
diff --git a/scripts/quitmsg.pl b/scripts/quitmsg.pl
index 41bddaa8..e289468c 100644
--- a/scripts/quitmsg.pl
+++ b/scripts/quitmsg.pl
@@ -21,7 +21,7 @@ sub cmd_quit {
 	my ($data, $server, $channel) = @_;
 	return if ($data ne "");
 
-	open (f, $quitfile) || return;
+	open (f, "<", $quitfile) || return;
 	my $lines = 0; while(<f>) { $lines++; };
 
 	my $line = int(rand($lines))+1;
@@ -38,7 +38,7 @@ sub cmd_quit {
 	close(f);
 
 	foreach my $server (Irssi::servers) {
-		$server->command("disconnect ".$server->{tag}." $quitmsg");
+		$server->command("/disconnect ".$server->{tag}." $quitmsg");
 	}
 }
 
diff --git a/scripts/sb_search.pl b/scripts/sb_search.pl
deleted file mode 100644
index 51b9100b..00000000
--- a/scripts/sb_search.pl
+++ /dev/null
@@ -1,159 +0,0 @@
-# sb_search.pl - search in your scrollback, scroll to a match
-# Do /HELP SCROLLBACK for help
-
-# Copyright (C) 2008  Wouter Coekaerts <wouter@coekaerts.be>, Emanuele Giaquinta <exg@irssi.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-use strict;
-use Irssi;
-use Irssi::TextUI;
-use vars qw($VERSION %IRSSI);
-
-$VERSION = '1.1';
-%IRSSI = (
-	authors     => 'Wouter Coekaerts, Emanuele Giaquinta',
-	contact     => 'wouter@coekaerts.be, exg@irssi.org',
-	name        => 'sb_search',
-	description => 'search in your scrollback, scroll to a match',
-	license     => 'GPLv2 or later',
-	url         => 'http://wouter.coekaerts.be/irssi/',
-	changed     => '$LastChangedDate$',
-);
-
-sub cmd_help {
-	my ($args, $server, $witem) = @_;
-	if ($args =~ /^scrollback( search)? *$/i) {
-		Irssi::print ( <<SCRIPTHELP_EOF
-
-SCROLLBACK SEARCH [-level <level>] [-regexp] [-case] [-word] [-forward] [-all] [<pattern>]
-
-    SEARCH:     Search for text in the scrollback buffer.
-
-    -regexp:    The given text pattern is a regular expression.
-    -case:      Performs a case-sensitive matching.
-    -word:      The text must match full words.
-    -forward:   Search forwards (default is backwards).
-    -all:       Search in all windows.
-
-    Without arguments, the last search is repeated.
-SCRIPTHELP_EOF
-			,MSGLEVEL_CLIENTCRAP);
-	}
-}
-
-my $regex;
-my $all;
-my $level;
-
-sub cmd_sb_search {
-	my ($args, $server, $witem) = @_;
-	
-	### handle options
-	
-	my ($options, $pattern) = Irssi::command_parse_options('scrollback search', $args);
-
-	my $forward = defined(delete $options->{forward});
-
-	if (!%$options && !$pattern) {
-		return if !$regex && !defined $level;
-	} else {
-		$all = defined($options->{all});
-		$level = MSGLEVEL_ALL;
-		undef $regex;
-	}
-
-	if (defined($options->{level})) {
-		$level = $options->{level};
-		$level =~ y/,/ /;
-		$level = Irssi::combine_level(0, $level);
-	}
-	
-	if ($pattern) {
-		my $flags = defined($options->{case}) ? '' : '(?i)';
-		my $b = defined($options->{word}) ? '\b' : '';
-		if (defined($options->{regexp})) {
-			local $@;
-			eval {
-				$regex = qr/$flags$b$pattern$b/;
-			};
-			if ($@) {
-				my ($err) = $@ =~ /^(.*)/;
-				$err =~ s/\sat .* line \d+\.$//;
-				print CLIENTERROR $err;
-				return;
-			}
-		} else {
-			$regex = qr/$flags$b\Q$pattern\E$b/;
-		}
-	}
-	
-
-	### determine window(s) to search in
-	
-	my $current_win = ref $witem ? $witem->window() : Irssi::active_win();
-
-	my @windows;
-	if ($all) {
-		# cycle backward or forwards over all windows starting from current
-		# for example, searching backward through 5 windows, with window 3 active: search order is 3,2,1,5,4
-		# if we're searching forward: 3,4,5,1,2
-		my $order = $forward ? 1 : -1;
-		@windows = sort {$order * ($a->{refnum} cmp $b->{refnum})} Irssi::windows();
-		my @before_windows = grep {($_->{refnum} cmp $current_win->{refnum}) == $order} @windows;
-		my @after_windows = grep {($_->{refnum} cmp $current_win->{refnum}) == -$order} @windows;
-		@windows = ($current_win, @before_windows, @after_windows);
-	} else {
-		@windows = ($current_win);
-	}
-	
-	### do the search
-	
-	foreach my $win (@windows) {
-		my $view = $win->view;
-		
-		## determine line to start from
-		my $line;
-		if ($all && $win != $current_win) {
-			if ($forward) { # first line
-				$line = $view->get_lines;
-			} else { # last line
-				$line = $view->{startline};
-				while ($line->next) {
-					$line = $line->next
-				}
-			}
-		} else { # line after or before first visible line
-			$line = $forward ? $view->{startline}->next : $view->{startline}->prev;
-		}
-		
-		## loop over the lines
-		while (defined $line) {
-			my $line_level = $line->{info}{level};
-			if ($line_level & $level && $line->get_text(0) =~ $regex) {
-				$view->scroll_line($line);
-				if ($all) {
-					Irssi::command('window goto ' . $win->{refnum});
-				}
-				return;
-			}
-			$line = $forward ? $line->next : $line->prev;
-		}
-	}
-}
-
-Irssi::command_bind('scrollback search', \&cmd_sb_search);
-Irssi::command_bind_last('help', \&cmd_help);
-Irssi::command_set_options('scrollback search', '-level regexp case word forward all');
diff --git a/scripts/usercount.pl b/scripts/usercount.pl
index 46dc0b46..613da1de 100644
--- a/scripts/usercount.pl
+++ b/scripts/usercount.pl
@@ -1,4 +1,6 @@
+use strict;
 use Irssi 20040119.2359 ();
+use vars qw($VERSION %IRSSI);
 $VERSION = "1.19";
 %IRSSI = (
     authors     => 'David Leadbeater, Timo Sirainen, Georg Lukas',
@@ -29,7 +31,6 @@ $VERSION = "1.19";
 #  sb_uc_space = " ";
 
 
-use strict;
 use Irssi::TextUI;
 
 my ($ircops, $ops, $halfops, $voices, $normal, $total);

From e2eb2483b7d642e8dee31735f70cfb963d16323c Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Fri, 12 Jun 2015 20:41:47 +0200
Subject: [PATCH 0093/1650] Updated the man page (#251)

Updated the man page (#251)
---
 docs/irssi.1 | 64 +++++++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 41 deletions(-)

diff --git a/docs/irssi.1 b/docs/irssi.1
index e86be7ca..f38b639e 100644
--- a/docs/irssi.1
+++ b/docs/irssi.1
@@ -1,12 +1,13 @@
-.TH Irssi 1 "September 2002" "Irssi IRC client"
+.TH Irssi 1 "June 2015" "Irssi IRC client"
 .SH NAME
 Irssi \- a modular IRC client for UNIX
 .SH SYNOPSIS
 .B irssi
-[-dv!?] [-c server] [-p port] [-n nickname] [-w password] [-h hostname]
+[--config=PATH] [--home=PATH] [-dv!?] [-c server] [-p port] [-n nickname]
+[-w password] [-h hostname]
 .SH DESCRIPTION
 .B Irssi
-is a modular Internet Relay Chat client. It is highly extensible and
+is a modular Internet Relay Chat client; it is highly extensible and
 very secure. Being a fullscreen, termcap based client with many
 features,
 .B Irssi
@@ -16,16 +17,15 @@ is easily extensible through scripts and modules.
 .BI "\-\-config="FILE
 use 
 .I FILE
-instead of ~/.irssi/config.
+instead of ~/.irssi/config
 .TP
 .BI "\-\-home="PATH
 .I PATH 
-specifies the home directory of Irssi.
-Default is 
+specifies the home directory of Irssi; default is 
 .BR ~/.irssi
 .TP
 .BI "\-c, \-\-connect="SERVER
-connects to 
+connect to 
 .I SERVER
 .TP
 .BI "\-w, \-\-password="PASSWORD
@@ -39,71 +39,53 @@ automatically connect to
 on server.
 .TP
 .BI "\-!, \-\-noconnect"
-disables autoconnecting.
+disable autoconnecting of servers
 .TP
 .BI "\-n, \-\-nick="NICKNAME
 specify 
 .I NICKNAME 
-as your nick.
+as your nick
 .TP
 .BI "\-h, \-\-hostname="HOSTNAME
 use
 .I HOSTNAME
-for your irc session.
+for your irc session
 .TP
 .BI "\-d, \-\-dummy"
-use dummy terminal mode.
+use dummy terminal mode
 .TP
 .BI "\-v, \-\-version"
-display the version of Irssi.
+display the version of Irssi
 .TP
 .BI "\-?, \-\-help"
-show a help message.
+show a help message
 .SH SEE ALSO
 .B Irssi
-has been supplied with a huge amount of documentation. Check /help or look
-at the files contained by /usr/share/doc/irssi*
+has a solid amount of documentation available; check /HELP or look online
+at http://www.irssi.org
 .SH FILES
 .TP
-.I /etc/irssi.conf
-Global configuration file
-.TP
 .I ~/.irssi/config
-Personal configuration file
+personal configuration file
 .TP
 .I ~/.irssi/config.autosave
-Automatic save of the personal config file when it was changed externally
+automatic save of the personal config file when it was changed externally
 .TP
 .I ~/.irssi/default.theme
-Default irssi theme
+default irssi theme
 .TP
 .I ~/.irssi/away.log
-Logged messages in away status
-.TP
-.I /usr/share/irssi/help/
-Directory including many help files
-.TP
-.I /usr/share/irssi/scripts/
-Global scripts directory
-.TP
-.I /usr/share/irssi/themes/
-Global themes directory
+logged messages in away status
 .TP
 .I ~/.irssi/scripts/
-Default scripts directory
+default scripts directory
 .TP
 .I ~/.irssi/scripts/autorun/
-Directory containing links to scripts that should be loaded
+directory containing links to scripts that should be loaded
 automatically on startup
 .TP
 .I ~/.irssi/startup
-File containing a list of commands to execute on startup
+file containing a list of commands to execute on startup
 .SH AUTHORS/CREDITS
 .B Irssi
-was written by Timo Sirainen
-.B <cras@irssi.org>
-.sp
-This manpage was written by Istvan Sebestyen
-.BR <stevee@alphanet.ch>
-and Stefan Tomanek
-.BR <stefan@pico.ruhr.de>
+was written by Timo Sirainen; this manpage was written by Istvan Sebestyen, Stefan Tomanek, Geert Hauwaerts.

From b90402b7fcc1d2d0b1d07fee973af3aa75c50bfa Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Fri, 12 Jun 2015 20:44:32 +0200
Subject: [PATCH 0094/1650] Proper removal of sb_search.pl (#143)

Proper removal of sb_search.pl (#143)
---
 scripts/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 23eb7198..cd795153 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -11,7 +11,6 @@ script_DATA = \
 	mail.pl \
 	mlock.pl \
 	quitmsg.pl \
-	sb_search.pl \
 	scriptassist.pl \
 	usercount.pl
 

From 6fcafc599350737d0d14f3c863af594efc391124 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Fri, 12 Jun 2015 21:13:27 +0200
Subject: [PATCH 0095/1650] 1k+ windows are now the default formatting (#223)

1k+ windows are now the default formatting (#223)
---
 src/fe-common/core/module-formats.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index db11fae1..4ae26950 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -42,8 +42,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "window_set_immortal", "Window is now immortal", 0 },
 	{ "window_unset_immortal", "Window isn't immortal anymore", 0 },
 	{ "window_immortal_error", "Window is immortal, if you really want to close it, say /WINDOW IMMORTAL OFF", 0 },
-	{ "windowlist_header", "%#Ref Name                 Active item     Server          Level", 0 },
-	{ "windowlist_line", "%#$[3]0 %|$[20]1 $[15]2 $[15]3 $4", 5, { 1, 0, 0, 0, 0 } },
+	{ "windowlist_header", "%#Ref  Name                 Active item     Server          Level", 0 },
+	{ "windowlist_line", "%#$[4]0 %|$[20]1 $[15]2 $[15]3 $4", 5, { 1, 0, 0, 0, 0 } },
 	{ "windowlist_footer", "", 0 },
 	{ "windows_layout_saved", "Layout of windows is now remembered", 0 },
 	{ "windows_layout_reset", "Layout of windows reset to defaults", 0 },

From a47f45b5b7438209177d76f3efde559e61e5bdb7 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 14 Jun 2015 11:57:11 -0300
Subject: [PATCH 0096/1650] Rename /proxy command to /irssiproxy for clarity

---
 docs/help/in/irssiproxy.in | 14 ++++++++++++++
 docs/help/in/proxy.in      | 14 --------------
 docs/proxy.txt             |  2 +-
 src/irc/proxy/proxy.c      | 16 ++++++++--------
 4 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 docs/help/in/irssiproxy.in
 delete mode 100644 docs/help/in/proxy.in

diff --git a/docs/help/in/irssiproxy.in b/docs/help/in/irssiproxy.in
new file mode 100644
index 00000000..79d75b91
--- /dev/null
+++ b/docs/help/in/irssiproxy.in
@@ -0,0 +1,14 @@
+
+@SYNTAX:irssiproxy@
+
+%9Description:%9
+
+    Displays the list of clients connected to irssiproxy.
+
+%9Examples:%9
+
+    /IRSSIPROXY
+    /IRSSIPROXY STATUS
+
+%9See also:%9 LOAD PROXY, SET irssiproxy
+
diff --git a/docs/help/in/proxy.in b/docs/help/in/proxy.in
deleted file mode 100644
index 2dc61f43..00000000
--- a/docs/help/in/proxy.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-@SYNTAX:proxy@
-
-%9Description:%9
-
-    Displays the list of clients connected to the proxy.
-
-%9Examples:%9
-
-    /PROXY
-    /PROXY STATUS
-
-%9See also:%9 LOAD PROXY, SET irssiproxy
-
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 759ef1dc..e6360a82 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -45,4 +45,4 @@ Once everything is set up, you can enable / disable the proxy:
 When the proxy is configured and running, the following command will
 show all the currently connected clients:
 
-  /PROXY status
+  /IRSSIPROXY status
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index 65c778d1..ce79e2b7 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -25,8 +25,8 @@
 
 #include "fe-common/core/printtext.h"
 
-/* SYNTAX: PROXY STATUS */
-static void cmd_proxy_status(const char *data, IRC_SERVER_REC *server)
+/* SYNTAX: IRSSIPROXY STATUS */
+static void cmd_irssiproxy_status(const char *data, IRC_SERVER_REC *server)
 {
 	if (!settings_get_bool("irssiproxy")) {
 		printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
@@ -51,15 +51,15 @@ static void cmd_proxy_status(const char *data, IRC_SERVER_REC *server)
 	}
 }
 
-/* SYNTAX: PROXY */
-static void cmd_proxy(const char *data, IRC_SERVER_REC *server, void *item)
+/* SYNTAX: IRSSIPROXY */
+static void cmd_irssiproxy(const char *data, IRC_SERVER_REC *server, void *item)
 {
 	if (*data == '\0') {
-		cmd_proxy_status(data, server);
+		cmd_irssiproxy_status(data, server);
 		return;
 	}
 
-	command_runsub("proxy", data, server, item);
+	command_runsub("irssiproxy", data, server, item);
 }
 
 static void irc_proxy_setup_changed(void)
@@ -92,8 +92,8 @@ void irc_proxy_init(void)
 			    "... to set them.");
 	}
 
-	command_bind("proxy", NULL, (SIGNAL_FUNC) cmd_proxy);
-	command_bind("proxy status", NULL, (SIGNAL_FUNC) cmd_proxy_status);
+	command_bind("irssiproxy", NULL, (SIGNAL_FUNC) cmd_irssiproxy);
+	command_bind("irssiproxy status", NULL, (SIGNAL_FUNC) cmd_irssiproxy_status);
 
 	signal_add_first("setup changed", (SIGNAL_FUNC) irc_proxy_setup_changed);
 

From 51496cd09f5d2f2da0a4ae678663c66e2ceae17c Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 14 Jun 2015 16:41:52 -0300
Subject: [PATCH 0097/1650] Fix 'address already in use' when changing
 irssiproxy_ports

When changing the value of irssiproxy_ports to use a different network
name in a port that was already bound (so like changing from asd=6667 to
sdf=6667) it would throw "address already in use".

This fixes it by delaying the add_listen() calls after all the
remove_listen() were called.
---
 src/irc/proxy/listen.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index a560801d..dc354c30 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -642,7 +642,8 @@ static void remove_listen(LISTEN_REC *rec)
 static void read_settings(void)
 {
 	LISTEN_REC *rec;
-	GSList *remove_listens;
+	GSList *remove_listens = NULL;
+	GSList *add_listens = NULL;
 	char **ports, **tmp, *ircnet, *port;
 	int portnum;
 
@@ -661,17 +662,30 @@ static void read_settings(void)
 			continue;
 
 		rec = find_listen(ircnet, portnum);
-		if (rec == NULL)
-			add_listen(ircnet, portnum);
-		else
+		if (rec == NULL) {
+			rec = g_new0(LISTEN_REC, 1);
+			rec->ircnet = ircnet; /* borrow */
+			rec->port = portnum;
+			add_listens = g_slist_prepend(add_listens, rec);
+		} else {
+			/* remove from the list of listens to remove == keep it */
 			remove_listens = g_slist_remove(remove_listens, rec);
+		}
 	}
-	g_strfreev(ports);
 
 	while (remove_listens != NULL) {
-                remove_listen(remove_listens->data);
+		remove_listen(remove_listens->data);
 		remove_listens = g_slist_remove(remove_listens, remove_listens->data);
 	}
+
+	while (add_listens != NULL) {
+		rec = add_listens->data;
+		add_listen(rec->ircnet, rec->port);
+		g_free(rec);
+		add_listens = g_slist_remove(add_listens, add_listens->data);
+	}
+
+	g_strfreev(ports);
 }
 
 static void sig_dump(CLIENT_REC *client, const char *data)

From a393c675400a41f7cc3df988c25242857da678a4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@linux.localdomain>
Date: Thu, 9 Jul 2015 14:20:30 +0200
Subject: [PATCH 0098/1650] Introduce check for git commands in autogen

This avoids a misleading compile error when users try to `make` an
incomplete (or non-git) check-out.
---
 autogen.sh       | 4 ++++
 irssi-version.sh | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index 466a5a05..dd556216 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,6 +18,10 @@ perl syntax.pl
 
 echo "Creating ChangeLog..."
 git log > $srcdir/ChangeLog
+if test "$?" -ne 0; then
+    echo "**Error**: ${PKG_NAME} Autogen must be run in a git clone, cannot proceed."
+    exit 1
+fi
 
 files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
 cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
diff --git a/irssi-version.sh b/irssi-version.sh
index 7588182d..1e9eae34 100755
--- a/irssi-version.sh
+++ b/irssi-version.sh
@@ -5,6 +5,12 @@ DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD`
 VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
 VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`
 
+if test -z "$VERSION_DATE"; then
+    exec>&2
+    echo "**Error**: `basename "$0"` must be run in a git clone, cannot proceed."
+    exit 1
+fi
+
 echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
 echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
 

From 8e71d6ec739ec74fbb5c712e9341d4319a17d8f5 Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Sun, 19 Jul 2015 09:45:50 +0300
Subject: [PATCH 0099/1650] Add expandos for hostname

See http://bugs.irssi.org/index.php?do=details&task_id=829
---
 src/irc/core/irc-expandos.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 5d2de503..cc46ece5 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -76,6 +76,29 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
 	return g_strconcat(username, "@", hostname, NULL);;
 }
 
+/* your hostname address (host) */
+static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
+{
+	IRC_SERVER_REC *ircserver;
+	char hostname[100];
+	char **list;
+
+	ircserver = IRC_SERVER(server);
+
+	/* prefer the _real_ /userhost reply */
+	if (ircserver != NULL && ircserver->userhost != NULL) {
+		list = g_strsplit(ircserver->userhost, "@", -1);
+		return list[1];
+	}
+
+	/* haven't received userhost reply yet. guess something */
+	*free_ret = TRUE;
+
+	if (gethostname(hostname, sizeof(hostname)) != 0 || *hostname == '\0')
+		strcpy(hostname, "??");
+	return g_strconcat(hostname, NULL);
+}
+
 /* user mode in active server */
 static char *expando_usermode(SERVER_REC *server, void *item, int *free_ret)
 {
@@ -136,6 +159,9 @@ void irc_expandos_init(void)
 	expando_create("X", expando_userhost,
 		       "window changed", EXPANDO_ARG_NONE,
 		       "window server changed", EXPANDO_ARG_WINDOW, NULL);
+	expando_create("x", expando_hostname,
+		       "window changed", EXPANDO_ARG_NONE,
+		       "window server changed", EXPANDO_ARG_WINDOW, NULL);
 	expando_create("usermode", expando_usermode,
 		       "window changed", EXPANDO_ARG_NONE,
 		       "window server changed", EXPANDO_ARG_WINDOW,
@@ -164,6 +190,7 @@ void irc_expandos_deinit(void)
 	expando_destroy("H", expando_server_numeric);
 	expando_destroy("S", expando_servername);
 	expando_destroy("X", expando_userhost);
+	expando_destroy("x", expando_hostname);
 	expando_destroy("usermode", expando_usermode);
 	expando_destroy("cumode", expando_cumode);
 

From 92d03fe11ed2e4837d0137893fafd758ff0434d5 Mon Sep 17 00:00:00 2001
From: blha303 <stevensmith.ome@gmail.com>
Date: Sat, 25 Jul 2015 02:41:26 -0400
Subject: [PATCH 0100/1650] Replace \n with \r\n in irssiproxy source, fixes
 bug

---
 src/irc/proxy/dump.c   | 38 +++++++++++++++++++-------------------
 src/irc/proxy/listen.c | 16 ++++++++--------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 3d7bf546..455a2fe3 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -83,7 +83,7 @@ void proxy_outserver(CLIENT_REC *client, const char *data, ...)
 	va_start(args, data);
 
 	str = g_strdup_vprintf(data, args);
-	proxy_outdata(client, ":%s!%s@proxy %s\n", client->nick,
+	proxy_outdata(client, ":%s!%s@proxy %s\r\n", client->nick,
 		      settings_get_str("user_name"), str);
 	g_free(str);
 
@@ -106,7 +106,7 @@ void proxy_outserver_all(IRC_SERVER_REC *server, const char *data, ...)
 		CLIENT_REC *rec = tmp->data;
 
 		if (rec->connected && rec->server == server) {
-			proxy_outdata(rec, ":%s!%s@proxy %s\n", rec->nick,
+			proxy_outdata(rec, ":%s!%s@proxy %s\r\n", rec->nick,
 				      settings_get_str("user_name"), str);
 		}
 	}
@@ -132,7 +132,7 @@ void proxy_outserver_all_except(CLIENT_REC *client, const char *data, ...)
 
 		if (rec->connected && rec != client &&
 		    rec->server == client->server) {
-			proxy_outdata(rec, ":%s!%s@proxy %s\n", rec->nick,
+			proxy_outdata(rec, ":%s!%s@proxy %s\r\n", rec->nick,
 				      settings_get_str("user_name"), str);
 		}
 	}
@@ -169,7 +169,7 @@ static void dump_join(IRC_CHANNEL_REC *channel, CLIENT_REC *client)
 		NICK_REC *nick = tmp->data;
 
 		if (str->len >= 500) {
-			g_string_append_c(str, '\n');
+			g_string_append_c(str, '\r\n');
 			proxy_outdata(client, "%s", str->str);
 			create_names_start(str, channel, client);
 			first = TRUE;
@@ -186,21 +186,21 @@ static void dump_join(IRC_CHANNEL_REC *channel, CLIENT_REC *client)
 	}
 	g_slist_free(nicks);
 
-	g_string_append_c(str, '\n');
+	g_string_append_c(str, '\r\n');
 	proxy_outdata(client, "%s", str->str);
 	g_string_free(str, TRUE);
 
-	proxy_outdata(client, ":%s 366 %s %s :End of /NAMES list.\n",
+	proxy_outdata(client, ":%s 366 %s %s :End of /NAMES list.\r\n",
 		      client->proxy_address, client->nick, channel->name);
 	if (channel->topic != NULL) {
 		/* this is needed because the topic may be encoded into other charsets internaly */
 		recoded = recode_out(SERVER(client->server), channel->topic, channel->name);
-		proxy_outdata(client, ":%s 332 %s %s :%s\n",
+		proxy_outdata(client, ":%s 332 %s %s :%s\r\n",
 			      client->proxy_address, client->nick,
 			      channel->name, recoded);
 		g_free(recoded);
 		if (channel->topic_time > 0)
-			proxy_outdata(client, ":%s 333 %s %s %s %d\n",
+			proxy_outdata(client, ":%s 333 %s %s %s %d\r\n",
 			              client->proxy_address, client->nick,
 			              channel->name, channel->topic_by, channel->topic_time);
 	}
@@ -212,7 +212,7 @@ void proxy_client_reset_nick(CLIENT_REC *client)
 	    g_strcmp0(client->nick, client->server->nick) == 0)
 		return;
 
-	proxy_outdata(client, ":%s!proxy NICK :%s\n",
+	proxy_outdata(client, ":%s!proxy NICK :%s\r\n",
 		      client->nick, client->server->nick);
 
 	g_free(client->nick);
@@ -236,13 +236,13 @@ void proxy_dump_data(CLIENT_REC *client)
 	proxy_client_reset_nick(client);
 
 	/* welcome info */
-	proxy_outdata(client, ":%s 001 %s :Welcome to the Internet Relay Network %s!%s@proxy\n", client->proxy_address, client->nick, client->nick, settings_get_str("user_name"));
-	proxy_outdata(client, ":%s 002 %s :Your host is irssi-proxy, running version %s\n", client->proxy_address, client->nick, PACKAGE_VERSION);
-	proxy_outdata(client, ":%s 003 %s :This server was created ...\n", client->proxy_address, client->nick);
+	proxy_outdata(client, ":%s 001 %s :Welcome to the Internet Relay Network %s!%s@proxy\r\n", client->proxy_address, client->nick, client->nick, settings_get_str("user_name"));
+	proxy_outdata(client, ":%s 002 %s :Your host is irssi-proxy, running version %s\r\n", client->proxy_address, client->nick, PACKAGE_VERSION);
+	proxy_outdata(client, ":%s 003 %s :This server was created ...\r\n", client->proxy_address, client->nick);
 	if (client->server == NULL || !client->server->emode_known)
-		proxy_outdata(client, ":%s 004 %s %s %s oirw abiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
+		proxy_outdata(client, ":%s 004 %s %s %s oirw abiklmnopqstv\r\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
 	else
-		proxy_outdata(client, ":%s 004 %s %s %s oirw abeIiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
+		proxy_outdata(client, ":%s 004 %s %s %s oirw abeIiklmnopqstv\r\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
 
 	if (client->server != NULL && client->server->isupport_sent) {
 		isupport_out = g_string_new(NULL);
@@ -267,7 +267,7 @@ void proxy_dump_data(CLIENT_REC *client)
 			count = 0;
 			if (paramstr->len > 0)
 				g_string_truncate(paramstr, paramstr->len-1);
-			g_string_append_printf(paramstr, " :are supported by this server\n");
+			g_string_append_printf(paramstr, " :are supported by this server\r\n");
 			proxy_outdata(client, "%s", paramstr->str);
 			g_string_truncate(paramstr, 0);
 			g_string_printf(paramstr, ":%s 005 %s ", client->proxy_address, client->nick);
@@ -281,9 +281,9 @@ void proxy_dump_data(CLIENT_REC *client)
 		g_strfreev(paramlist);
 	}
 
-	proxy_outdata(client, ":%s 251 %s :There are 0 users and 0 invisible on 1 servers\n", client->proxy_address, client->nick);
-	proxy_outdata(client, ":%s 255 %s :I have 0 clients, 0 services and 0 servers\n", client->proxy_address, client->nick);
-	proxy_outdata(client, ":%s 422 %s :MOTD File is missing\n", client->proxy_address, client->nick);
+	proxy_outdata(client, ":%s 251 %s :There are 0 users and 0 invisible on 1 servers\r\n", client->proxy_address, client->nick);
+	proxy_outdata(client, ":%s 255 %s :I have 0 clients, 0 services and 0 servers\r\n", client->proxy_address, client->nick);
+	proxy_outdata(client, ":%s 422 %s :MOTD File is missing\r\n", client->proxy_address, client->nick);
 
 	/* user mode / away status */
 	if (client->server != NULL) {
@@ -293,7 +293,7 @@ void proxy_dump_data(CLIENT_REC *client)
 					client->server->usermode);
 		}
 		if (client->server->usermode_away) {
-			proxy_outdata(client, ":%s 306 %s :You have been marked as being away\n",
+			proxy_outdata(client, ":%s 306 %s :You have been marked as being away\r\n",
 				      client->proxy_address, client->nick);
 		}
 
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 4c3bcf68..2b7c7bda 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -155,7 +155,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		if (*target == '\0' ||
 		    g_ascii_strcasecmp(target, client->proxy_address) == 0 ||
 		    g_ascii_strcasecmp(target, client->nick) == 0) {
-			proxy_outdata(client, ":%s PONG %s :%s\n",
+			proxy_outdata(client, ":%s PONG %s :%s\r\n",
 				      client->proxy_address,
                                       client->proxy_address, origin);
 			g_free(params);
@@ -174,18 +174,18 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 					/* kludgy way to check if the clients aren't the same */
 					(client->recv_tag != rec->recv_tag)) {
 						if (rec->want_ctcp == 1)
-							proxy_outdata(rec, ":%s NOTICE %s :Another client is now receiving CTCPs sent to %s\n",
+							proxy_outdata(rec, ":%s NOTICE %s :Another client is now receiving CTCPs sent to %s\r\n",
 			                                      rec->proxy_address, rec->nick, rec->listen->ircnet);
 						rec->want_ctcp = 0;
 		                }
 
 			}
-			proxy_outdata(client, ":%s NOTICE %s :You're now receiving CTCPs sent to %s\n",
+			proxy_outdata(client, ":%s NOTICE %s :You're now receiving CTCPs sent to %s\r\n",
 				      client->proxy_address, client->nick,client->listen->ircnet);
 		} else if (g_ascii_strcasecmp(args, "CTCP OFF") == 0) {
                         /* client wants proxy to handle all ctcps */
 			client->want_ctcp = 0;
-			proxy_outdata(client, ":%s NOTICE %s :Proxy is now handling itself CTCPs sent to %s\n",
+			proxy_outdata(client, ":%s NOTICE %s :Proxy is now handling itself CTCPs sent to %s\r\n",
 				      client->proxy_address, client->nick, client->listen->ircnet);
 		} else {
 			signal_emit("proxy client command", 3, client, args, data);
@@ -194,7 +194,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 	}
 
 	if (client->server == NULL || !client->server->connected) {
-		proxy_outdata(client, ":%s NOTICE %s :Not connected to server\n",
+		proxy_outdata(client, ":%s NOTICE %s :Not connected to server\r\n",
 			      client->proxy_address, client->nick);
                 return;
 	}
@@ -371,7 +371,7 @@ static void sig_incoming(IRC_SERVER_REC *server, const char *line)
 	g_return_if_fail(line != NULL);
 
 	/* send server event to all clients */
-	g_string_printf(next_line, "%s\n", line);
+	g_string_printf(next_line, "%s\r\n", line);
 }
 
 static void sig_server_event(IRC_SERVER_REC *server, const char *line,
@@ -465,7 +465,7 @@ static void event_connected(IRC_SERVER_REC *server)
 		    (g_strcmp0(rec->listen->ircnet, "*") == 0 ||
 		     (chatnet != NULL &&
 		      g_ascii_strcasecmp(chatnet, rec->listen->ircnet) == 0))) {
-			proxy_outdata(rec, ":%s NOTICE %s :Connected to server\n",
+			proxy_outdata(rec, ":%s NOTICE %s :Connected to server\r\n",
 				      rec->proxy_address, rec->nick);
 			rec->server = server;
 			proxy_client_reset_nick(rec);
@@ -478,7 +478,7 @@ static void proxy_server_disconnected(CLIENT_REC *client,
 {
 	GSList *tmp;
 
-	proxy_outdata(client, ":%s NOTICE %s :Connection lost to server %s\n",
+	proxy_outdata(client, ":%s NOTICE %s :Connection lost to server %s\r\n",
 		      client->proxy_address, client->nick,
 		      server->connrec->address);
 

From b0e7c183764e696b1e1a79c51651bc6573257bf8 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 20 Aug 2015 23:37:34 +0200
Subject: [PATCH 0101/1650] Send the CAP LS after sending the proxy strings

Patch by @dequis
---
 src/irc/core/irc-servers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 335c88ef..58dc9b25 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -202,8 +202,6 @@ static void server_init(IRC_SERVER_REC *server)
 
 	conn = server->connrec;
 
-	irc_send_cmd_now(server, "CAP LS");
-
 	if (conn->proxy != NULL && conn->proxy_password != NULL &&
 	    *conn->proxy_password != '\0') {
 		cmd = g_strdup_printf("PASS %s", conn->proxy_password);
@@ -217,6 +215,8 @@ static void server_init(IRC_SERVER_REC *server)
 		g_free(cmd);
 	}
 
+	irc_send_cmd_now(server, "CAP LS");
+
 	if (conn->password != NULL && *conn->password != '\0') {
                 /* send password */
 		cmd = g_strdup_printf("PASS %s", conn->password);

From 0435331912f5d975c4cbef9b018bb89c07e610eb Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Wed, 26 Aug 2015 09:34:48 +0300
Subject: [PATCH 0102/1650] Clean up in hostname expando before return

Clean up the vector resulting from g_strsplit before
returning from expando_hostname(). Also, use g_strdup()
instead of g_strconcat() to return the pointer to hostname.
---
 src/irc/core/irc-expandos.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index cc46ece5..f26c9699 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -82,13 +82,16 @@ static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
 	IRC_SERVER_REC *ircserver;
 	char hostname[100];
 	char **list;
+	char *hostname_split;
 
 	ircserver = IRC_SERVER(server);
 
 	/* prefer the _real_ /userhost reply */
 	if (ircserver != NULL && ircserver->userhost != NULL) {
 		list = g_strsplit(ircserver->userhost, "@", -1);
-		return list[1];
+		hostname_split = g_strdup(list[1]);
+		g_strfreev(list);
+		return hostname_split;
 	}
 
 	/* haven't received userhost reply yet. guess something */
@@ -96,7 +99,7 @@ static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
 
 	if (gethostname(hostname, sizeof(hostname)) != 0 || *hostname == '\0')
 		strcpy(hostname, "??");
-	return g_strconcat(hostname, NULL);
+	return g_strdup(hostname);
 }
 
 /* user mode in active server */

From 19760679eb141baf3bff2110ee03aec90c653a2a Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Sat, 29 Aug 2015 15:29:57 +0300
Subject: [PATCH 0103/1650] In expando_hostname, set *free_ret to TRUE

*free_ret must be set to TRUE in both cases, since we return
some newly initialised memory
---
 src/irc/core/irc-expandos.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index f26c9699..4aa50c52 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -86,6 +86,8 @@ static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
 
 	ircserver = IRC_SERVER(server);
 
+	*free_ret = TRUE;
+
 	/* prefer the _real_ /userhost reply */
 	if (ircserver != NULL && ircserver->userhost != NULL) {
 		list = g_strsplit(ircserver->userhost, "@", -1);
@@ -95,8 +97,6 @@ static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
 	}
 
 	/* haven't received userhost reply yet. guess something */
-	*free_ret = TRUE;
-
 	if (gethostname(hostname, sizeof(hostname)) != 0 || *hostname == '\0')
 		strcpy(hostname, "??");
 	return g_strdup(hostname);

From b7d82ecdcee3224ca5280977d0ffd7b5e0fb07d2 Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Sat, 29 Aug 2015 15:32:22 +0300
Subject: [PATCH 0104/1650] Use "(none)" as fallback for hostname and userhost
 expandos

Use "(none)" instead of "??" for hostname and userhost expandos
when these can't be reliably detected.
---
 src/irc/core/irc-expandos.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 4aa50c52..df0326a2 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -72,7 +72,7 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
 		username = ircserver->connrec->username;
 
 	if (gethostname(hostname, sizeof(hostname)) != 0 || *hostname == '\0')
-		strcpy(hostname, "??");
+		strcpy(hostname, "(none)");
 	return g_strconcat(username, "@", hostname, NULL);;
 }
 
@@ -98,7 +98,7 @@ static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
 
 	/* haven't received userhost reply yet. guess something */
 	if (gethostname(hostname, sizeof(hostname)) != 0 || *hostname == '\0')
-		strcpy(hostname, "??");
+		strcpy(hostname, "(none)");
 	return g_strdup(hostname);
 }
 

From b065f2a0112fe733878c17375d16cf12a3457e09 Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Sat, 29 Aug 2015 15:36:05 +0300
Subject: [PATCH 0105/1650] Use HOST_NAME_MAX for userhost and hostname
 expandos

Use HOST_NAME_MAX instead of hardcoded 100 for userhost
and hostname expandos.
---
 src/irc/core/irc-expandos.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index df0326a2..9604c625 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -56,7 +56,8 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
 {
 	IRC_SERVER_REC *ircserver;
 	const char *username;
-	char hostname[100];
+	char hostname[HOST_NAME_MAX];
+
 
 	ircserver = IRC_SERVER(server);
 
@@ -80,7 +81,7 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
 static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
 {
 	IRC_SERVER_REC *ircserver;
-	char hostname[100];
+	char hostname[HOST_NAME_MAX];
 	char **list;
 	char *hostname_split;
 

From 2f9cca8ec6e491759583c1de3bd74fbef0d6e2a1 Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Sat, 29 Aug 2015 15:40:17 +0300
Subject: [PATCH 0106/1650] Remove extra line break

How did this extra break cripple in here?
---
 src/irc/core/irc-expandos.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 9604c625..5d8150f0 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -58,7 +58,6 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
 	const char *username;
 	char hostname[HOST_NAME_MAX];
 
-
 	ircserver = IRC_SERVER(server);
 
 	/* prefer the _real_ /userhost reply */

From 35d30c19a1fa5413a26a04885ed6cb05af4e2565 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 2 Sep 2015 20:24:47 +0200
Subject: [PATCH 0107/1650] Whitespace fix

---
 src/irc/proxy/listen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index c334e698..ebbbdcfa 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -262,7 +262,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 
 		ignore_next = TRUE;
 		if (*msg != '\001' || msg[strlen(msg)-1] != '\001') {
-	        	signal_emit(server_ischannel(SERVER(client->server), target) ?
+			signal_emit(server_ischannel(SERVER(client->server), target) ?
 				    "message own_public" : "message own_private", 4,
 				    client->server, msg, target, target);
 		} else if (strncmp(msg+1, "ACTION ", 7) == 0) {

From 57d645f24603e8c7d2cfe7098b3dbb1359cd8d22 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 2 Sep 2015 21:50:40 +0200
Subject: [PATCH 0108/1650] Introduce some more chantypes awareness

---
 src/fe-common/irc/fe-events.c       | 11 ++++--
 src/fe-common/irc/fe-irc-messages.c | 57 +++++++++++++++++++----------
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index ad5e7559..7f5a8c26 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -42,6 +42,9 @@
 #include "fe-windows.h"
 #include "fe-irc-server.h"
 
+int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target);
+const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target);
+
 static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 			  const char *nick, const char *addr)
 {
@@ -52,12 +55,14 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
 	if (nick == NULL) nick = server->real_address;
 	if (addr == NULL) addr = "";
-	if (*target == '@' && server_ischannel(SERVER(server), &target[1])) {
+
+	if (fe_channel_is_opchannel(server, target)) {
 		/* Hybrid 6 feature, send msg to all ops in channel */
-		recoded = recode_in(SERVER(server), msg, target+1);
+		target = (char *)fe_channel_skip_prefix(server, target);
+		recoded = recode_in(SERVER(server), msg, target);
 		signal_emit("message irc op_public", 5,
 			    server, recoded, nick, addr,
-			    get_visible_target(server, target+1));
+			    get_visible_target(server, target));
 	} else {
 		recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick);
 		signal_emit(server_ischannel(SERVER(server), target) ?
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 780c0b7e..e8cdb2c4 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -37,28 +37,47 @@
 #include "fe-queries.h"
 #include "window-items.h"
 
-static const char *skip_target(IRC_SERVER_REC *server, const char *target)
+int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
 {
-	int i = 0;
-	const char *val, *chars;
+	const char *statusmsg;
+
+	/* Quick check */
+	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
+		return FALSE;
+
+	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
+	if (statusmsg == NULL)
+		statusmsg = "@+";
+
+	return strchr(statusmsg, *target) != NULL;
+}
+
+const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
+{
+	const char *statusmsg;
 
 	/* Quick check */
 	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
 		return target;
 
+	/* Exit early if target doesn't name a channel */
+	if (server_ischannel(SERVER(server), target) == FALSE)
+		return FALSE;
+
+	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
+
 	/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
 	 * WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
-	val = g_hash_table_lookup(server->isupport, "STATUSMSG");
-	if (val == NULL && *target != '@')
+	if (statusmsg == NULL && *target != '@')
 		return target;
-	chars = val ? val : "@+";
-	for(i = 0; target[i] != '\0'; i++) {
-		if (strchr(chars, target[i]) == NULL)
-			break;
-	};
 
-	if(server_ischannel(SERVER(server), &target[i]))
-		target += i;
+	if (statusmsg == NULL)
+		statusmsg = "@+";
+
+	/* Strip the leading statusmsg prefixes */
+	while (strchr(statusmsg, *target) != NULL) {
+		target++;
+	}
 
 	return target;
 }
@@ -72,7 +91,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
 	if (!IS_IRC_SERVER(server))
 		return;
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 	if (target != oldtarget) {
 		/* Hybrid 6 / Bahamut feature, send msg to all
 		   ops / ops+voices in channel */
@@ -135,7 +154,7 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
         char *freemsg = NULL;
 
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 	if (server_ischannel(SERVER(server), target))
 		item = irc_channel_find(server, target);
 	else
@@ -163,7 +182,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	int own = FALSE;
 
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 
 	level = MSGLEVEL_ACTIONS |
 		(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
@@ -219,7 +238,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
 				   const char *target)
 {
-	printformat(server, skip_target(server, target), MSGLEVEL_NOTICES |
+	printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_NOTICES |
 		    MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
 		    IRCTXT_OWN_NOTICE, target, msg);
 }
@@ -232,7 +251,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 	int level = MSGLEVEL_NOTICES;
 
 	oldtarget = target;
-	target = skip_target(IRC_SERVER(server), target);
+	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 
 	if (address == NULL || *address == '\0') {
 		/* notice from server */
@@ -270,7 +289,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd,
 				 const char *data, const char *target)
 {
-	printformat(server, skip_target(server, target), MSGLEVEL_CTCPS |
+	printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_CTCPS |
 		    MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
 		    IRCTXT_OWN_CTCP, target, cmd, data);
 }
@@ -282,7 +301,7 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
 	const char *oldtarget;
 
 	oldtarget = target;
-	target = skip_target(server, target);
+	target = fe_channel_skip_prefix(server, target);
 	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
 		    IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, oldtarget);
 }

From 21c1e4e9f80409b81cb3b8243c904ccf74d8d529 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 2 Sep 2015 22:40:10 +0200
Subject: [PATCH 0109/1650] Fix two minor issues outlined in the PR#222

irc-cap.c has now a licence header.
A minor style fix in misc.c
---
 src/core/misc.c        |  2 +-
 src/irc/core/irc-cap.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 395e47ad..88c27255 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -215,7 +215,7 @@ void gslist_free_full (GSList *list, GDestroyNotify free_func)
 {
 	GSList *tmp;
 
-	if (!list)
+	if (list == NULL)
 		return;
 
 	for (tmp = list; tmp != NULL; tmp = tmp->next)
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index c5bf4e67..cd3ae677 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -1,3 +1,22 @@
+/*  irc-cap.c : irssi
+
+    Copyright (C) 2015 The Lemon Man
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #include "module.h"
 #include "signals.h"
 #include "misc.h"

From b5b73cb471e5dff6f8c872071c7cb8678e4142ea Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 6 Sep 2015 15:47:08 +0200
Subject: [PATCH 0110/1650] Send smkx/rmkx sequence at terminal init

Enter the "application" mode when setting up the terminal, this improves the
compatiblity with the standards; as a side effect now DEL key works ootb when
irssi is run in the suckless's st terminal.
---
 src/fe-text/terminfo-core.c | 107 ++++++++++++++++++++----------------
 src/fe-text/terminfo-core.h |   4 ++
 2 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 0516cc5f..6339e6f4 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -50,62 +50,66 @@ TERM_REC *current_term;
 
 /* Define only what we might need */
 static TERMINFO_REC tcaps[] = {
-        /* Terminal size */
-	{ "cols",	"co",	CAP_TYPE_INT,	G_STRUCT_OFFSET(TERM_REC, width) },
-	{ "lines",	"li",	CAP_TYPE_INT,	G_STRUCT_OFFSET(TERM_REC, height) },
+	/* Terminal size */
+	{ "cols",   "co",  CAP_TYPE_INT,  G_STRUCT_OFFSET(TERM_REC, width) },
+	{ "lines",  "li",  CAP_TYPE_INT,  G_STRUCT_OFFSET(TERM_REC, height) },
 
-        /* Cursor movement */
-	{ "smcup",	"ti",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_smcup) },
-	{ "rmcup",	"te",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_rmcup) },
-	{ "cup",	"cm",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_cup) },
-	{ "hpa",	"ch",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_hpa) },
-	{ "vpa",	"vh",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_vpa) },
-	{ "cub1",	"le",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_cub1) },
-	{ "cuf1",	"nd",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_cuf1) },
-	{ "civis",	"vi",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_civis) },
-	{ "cnorm",	"ve",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_cnorm) },
+	/* Cursor movement */
+	{ "smcup",  "ti",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_smcup) },
+	{ "rmcup",  "te",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_rmcup) },
+	{ "cup",    "cm",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_cup) },
+	{ "hpa",    "ch",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_hpa) },
+	{ "vpa",    "vh",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_vpa) },
+	{ "cub1",   "le",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_cub1) },
+	{ "cuf1",   "nd",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_cuf1) },
+	{ "civis",  "vi",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_civis) },
+	{ "cnorm",  "ve",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_cnorm) },
 
-        /* Scrolling */
-	{ "csr",      	"cs",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_csr) },
-	{ "wind",      	"wi",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_wind) },
-	{ "ri",      	"sr",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_ri) },
-	{ "rin",      	"SR",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_rin) },
-	{ "ind",      	"sf",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_ind) },
-	{ "indn",      	"SF",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_indn) },
-	{ "il",      	"AL",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_il) },
-	{ "il1",      	"al",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_il1) },
-	{ "dl",      	"DL",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_dl) },
-	{ "dl1",      	"dl",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_dl1) },
+	/* Scrolling */
+	{ "csr",    "cs",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_csr) },
+	{ "wind",   "wi",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_wind) },
+	{ "ri",     "sr",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_ri) },
+	{ "rin",    "SR",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_rin) },
+	{ "ind",    "sf",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_ind) },
+	{ "indn",   "SF",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_indn) },
+	{ "il",     "AL",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_il) },
+	{ "il1",    "al",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_il1) },
+	{ "dl",     "DL",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_dl) },
+	{ "dl1",    "dl",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_dl1) },
 
 	/* Clearing screen */
-	{ "clear",     	"cl",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_clear) },
-	{ "ed",     	"cd",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_ed) },
+	{ "clear",  "cl",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_clear) },
+	{ "ed",     "cd",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_ed) },
 
-        /* Clearing to end of line */
-	{ "el",     	"ce",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_el) },
+	/* Clearing to end of line */
+	{ "el",     "ce",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_el) },
 
-        /* Repeating character */
-	{ "rep",     	"rp",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_rep) },
+	/* Repeating character */
+	{ "rep",    "rp",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_rep) },
 
 	/* Colors */
-	{ "colors",	"Co",   CAP_TYPE_INT,   G_STRUCT_OFFSET(TERM_REC, TI_colors) },
-	{ "sgr0",     	"me",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_sgr0) },
-	{ "smul",     	"us",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_smul) },
-	{ "rmul",     	"ue",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_rmul) },
-	{ "smso",     	"so",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_smso) },
-	{ "rmso",     	"se",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_rmso) },
-	{ "sitm",     	"ZH",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_sitm) },
-	{ "ritm",     	"ZR",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_ritm) },
-	{ "bold",     	"md",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_bold) },
-	{ "blink",     	"mb",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_blink) },
-	{ "rev",     	"mr",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_rev) },
-	{ "setaf",     	"AF",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_setaf) },
-	{ "setab",     	"AB",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_setab) },
-	{ "setf",     	"Sf",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_setf) },
-	{ "setb",     	"Sb",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_setb) },
+	{ "colors", "Co",   CAP_TYPE_INT,   G_STRUCT_OFFSET(TERM_REC, TI_colors) },
+	{ "sgr0",   "me",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_sgr0) },
+	{ "smul",   "us",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_smul) },
+	{ "rmul",   "ue",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_rmul) },
+	{ "smso",   "so",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_smso) },
+	{ "rmso",   "se",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_rmso) },
+	{ "sitm",   "ZH",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_sitm) },
+	{ "ritm",   "ZR",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_ritm) },
+	{ "bold",   "md",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_bold) },
+	{ "blink",  "mb",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_blink) },
+	{ "rev",    "mr",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_rev) },
+	{ "setaf",  "AF",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_setaf) },
+	{ "setab",  "AB",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_setab) },
+	{ "setf",   "Sf",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_setf) },
+	{ "setb",   "Sb",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_setb) },
 
-        /* Beep */
-	{ "bel",     	"bl",	CAP_TYPE_STR,	G_STRUCT_OFFSET(TERM_REC, TI_bel) },
+	/* Beep */
+	{ "bel",    "bl",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_bel) },
+
+	/* Keyboard-transmit mode */
+	{ "smkx",   "ks",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_smkx) },
+	{ "rmkx",   "ke",  CAP_TYPE_STR,  G_STRUCT_OFFSET(TERM_REC, TI_rmkx) },
 };
 
 /* Move cursor (cursor_address / cup) */
@@ -523,7 +527,11 @@ static void terminfo_input_deinit(TERM_REC *term)
 void terminfo_cont(TERM_REC *term)
 {
 	if (term->TI_smcup)
-                tput(tparm(term->TI_smcup));
+		tput(tparm(term->TI_smcup));
+
+	if (term->TI_smkx)
+		tput(tparm(term->TI_smkx));
+
         terminfo_input_init(term);
 }
 
@@ -538,6 +546,9 @@ void terminfo_stop(TERM_REC *term)
 	if (term->TI_rmcup)
 		tput(tparm(term->TI_rmcup));
 
+	if (term->TI_rmkx)
+		tput(tparm(term->TI_rmkx));
+
         /* reset input settings */
 	terminfo_input_deinit(term);
         fflush(term->out);
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index 6ab4637d..21398791 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -88,6 +88,10 @@ struct _TERM_REC {
 
 	/* Beep */
         char *TI_bel;
+
+	/* Keyboard-transmit mode */
+	const char *TI_smkx;
+	const char *TI_rmkx;
 };
 
 extern TERM_REC *current_term;

From 4346c2a6d479b9c4d94fabc35ade324fdbe0e0d0 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 9 Sep 2015 23:55:00 +0200
Subject: [PATCH 0111/1650] Move the function prototypes in a separate header

---
 src/fe-common/irc/fe-common-irc.c   |  4 +--
 src/fe-common/irc/fe-events.c       |  3 --
 src/fe-common/irc/fe-irc-channels.c | 47 ++++++++++++++++++++++++++++-
 src/fe-common/irc/fe-irc-channels.h | 10 ++++++
 src/fe-common/irc/fe-irc-messages.c | 45 ---------------------------
 5 files changed, 57 insertions(+), 52 deletions(-)
 create mode 100644 src/fe-common/irc/fe-irc-channels.h

diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index 72606263..d6ab30ce 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -28,13 +28,11 @@
 
 #include "themes.h"
 #include "fe-irc-server.h"
+#include "fe-irc-channels.h"
 
 void fe_irc_modules_init(void);
 void fe_irc_modules_deinit(void);
 
-void fe_irc_channels_init(void);
-void fe_irc_channels_deinit(void);
-
 void fe_irc_queries_init(void);
 void fe_irc_queries_deinit(void);
 
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 7f5a8c26..068ee543 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -42,9 +42,6 @@
 #include "fe-windows.h"
 #include "fe-irc-server.h"
 
-int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target);
-const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target);
-
 static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 			  const char *nick, const char *addr)
 {
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index 9129e451..d5f17bd0 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -31,6 +31,51 @@
 #include "fe-windows.h"
 #include "window-items.h"
 
+int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
+{
+	const char *statusmsg;
+
+	/* Quick check */
+	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
+		return FALSE;
+
+	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
+	if (statusmsg == NULL)
+		statusmsg = "@+";
+
+	return strchr(statusmsg, *target) != NULL;
+}
+
+const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
+{
+	const char *statusmsg;
+
+	/* Quick check */
+	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
+		return target;
+
+	/* Exit early if target doesn't name a channel */
+	if (server_ischannel(SERVER(server), target) == FALSE)
+		return FALSE;
+
+	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
+
+	/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
+	 * WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
+	if (statusmsg == NULL && *target != '@')
+		return target;
+
+	if (statusmsg == NULL)
+		statusmsg = "@+";
+
+	/* Strip the leading statusmsg prefixes */
+	while (strchr(statusmsg, *target) != NULL) {
+		target++;
+	}
+
+	return target;
+}
+
 static void sig_channel_rejoin(SERVER_REC *server, REJOIN_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
@@ -46,7 +91,7 @@ static void sig_event_forward(SERVER_REC *server, const char *data,
 	char *params, *from, *to;
 
 	params = event_get_params(data, 3, NULL, &from, &to);
-	if (from != NULL && to != NULL && server_ischannel(server, *from) && server_ischannel(server, *to)) {
+	if (from != NULL && to != NULL && server_ischannel(server, from) && server_ischannel(server, to)) {
 		channel = irc_channel_find(server, from);
 		if (channel != NULL && irc_channel_find(server, to) == NULL) {
 			window_bind_add(window_item_window(channel),
diff --git a/src/fe-common/irc/fe-irc-channels.h b/src/fe-common/irc/fe-irc-channels.h
new file mode 100644
index 00000000..d05c91a5
--- /dev/null
+++ b/src/fe-common/irc/fe-irc-channels.h
@@ -0,0 +1,10 @@
+#ifndef __FE_IRC_CHANNELS_H
+#define __FE_IRC_CHANNELS_H
+
+int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target);
+const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target);
+
+void fe_irc_channels_init(void);
+void fe_irc_channels_deinit(void);
+
+#endif
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index e8cdb2c4..b2736a2c 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -37,51 +37,6 @@
 #include "fe-queries.h"
 #include "window-items.h"
 
-int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
-{
-	const char *statusmsg;
-
-	/* Quick check */
-	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
-		return FALSE;
-
-	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
-	if (statusmsg == NULL)
-		statusmsg = "@+";
-
-	return strchr(statusmsg, *target) != NULL;
-}
-
-const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
-{
-	const char *statusmsg;
-
-	/* Quick check */
-	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
-		return target;
-
-	/* Exit early if target doesn't name a channel */
-	if (server_ischannel(SERVER(server), target) == FALSE)
-		return FALSE;
-
-	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
-
-	/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
-	 * WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
-	if (statusmsg == NULL && *target != '@')
-		return target;
-
-	if (statusmsg == NULL)
-		statusmsg = "@+";
-
-	/* Strip the leading statusmsg prefixes */
-	while (strchr(statusmsg, *target) != NULL) {
-		target++;
-	}
-
-	return target;
-}
-
 static void sig_message_own_public(SERVER_REC *server, const char *msg,
 				   const char *target, const char *origtarget)
 {

From b8d3301d34f383f039071214872570385de1bb59 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 10 Sep 2015 01:02:44 +0200
Subject: [PATCH 0112/1650] SASL support

The only supported methods are PLAIN and EXTERNAL, the latter is untested as of
now.
The code gets the values from the keys named sasl_{mechanism,username,password}
specified for each chatnet.
---
 src/core/server-setup-rec.h      |   3 +
 src/irc/core/Makefile.am         |   2 +
 src/irc/core/irc-chatnets.c      |   6 +-
 src/irc/core/irc-chatnets.h      |   9 ++-
 src/irc/core/irc-core.c          |   5 +-
 src/irc/core/irc-servers-setup.c |  24 ++++++
 src/irc/core/irc-servers.c       |   4 +
 src/irc/core/irc-servers.h       |   4 +
 src/irc/core/sasl.c              | 134 +++++++++++++++++++++++++++++++
 src/irc/core/sasl.h              |  14 ++++
 10 files changed, 200 insertions(+), 5 deletions(-)
 create mode 100644 src/irc/core/sasl.c
 create mode 100644 src/irc/core/sasl.h

diff --git a/src/core/server-setup-rec.h b/src/core/server-setup-rec.h
index ecdde3f3..2c9614c7 100644
--- a/src/core/server-setup-rec.h
+++ b/src/core/server-setup-rec.h
@@ -8,6 +8,9 @@ char *address;
 int port;
 char *password;
 
+int sasl_mechanism;
+char *sasl_password;
+
 char *ssl_cert;
 char *ssl_pkey;
 char *ssl_pass;
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index 7d885d20..20caaeb1 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -27,6 +27,7 @@ libirc_core_a_SOURCES = \
         irc-servers-setup.c \
         irc-session.c \
         irc-cap.c \
+        sasl.c \
         lag.c \
         massjoin.c \
         modes.c \
@@ -50,6 +51,7 @@ pkginc_irc_core_HEADERS = \
         irc-servers.h \
         irc-servers-setup.h \
         irc-cap.h \
+        sasl.h \
         modes.h \
         mode-lists.h \
 	module.h \
diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index d757bf8d..cfb7deec 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -48,6 +48,10 @@ static void sig_chatnet_read(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 	rec->max_msgs = config_node_get_int(node, "max_msgs", 0);
 	rec->max_modes = config_node_get_int(node, "max_modes", 0);
 	rec->max_whois = config_node_get_int(node, "max_whois", 0);
+
+	rec->sasl_mechanism = config_node_get_str(node, "sasl_mechanism", NULL);
+	rec->sasl_username = config_node_get_str(node, "sasl_username", NULL);
+	rec->sasl_password = config_node_get_str(node, "sasl_password", NULL);
 }
 
 static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
@@ -78,7 +82,7 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec)
 {
 	if (IS_IRC_CHATNET(rec))
-                g_free(rec->usermode);
+		g_free(rec->usermode);
 }
 
 
diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h
index 22da90c5..2bb10fa9 100644
--- a/src/irc/core/irc-chatnets.h
+++ b/src/irc/core/irc-chatnets.h
@@ -17,12 +17,15 @@
 struct _IRC_CHATNET_REC {
 #include "chatnet-rec.h"
 
-        char *usermode;
+	char *usermode;
+
+	char *sasl_mechanism;
+	char *sasl_username;
+	char *sasl_password;
 
 	int max_cmds_at_once;
 	int cmd_queue_speed;
-	int max_query_chans; /* when syncing, max. number of channels to
-				put in one MODE/WHO command */
+	int max_query_chans; /* when syncing, max. number of channels to put in one MODE/WHO command */
 
 	/* max. number of kicks/msgs/mode/whois per command */
 	int max_kicks, max_msgs, max_modes, max_whois;
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index e3ceeeef..a9221e02 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -27,6 +27,7 @@
 #include "irc-channels.h"
 #include "irc-queries.h"
 #include "irc-cap.h"
+#include "sasl.h"
 
 #include "irc-servers-setup.h"
 #include "channels-setup.h"
@@ -119,6 +120,7 @@ void irc_core_init(void)
 	netsplit_init();
 	irc_expandos_init();
 	cap_init();
+	sasl_init();
 
 	settings_check();
 	module_register("core", "irc");
@@ -128,6 +130,7 @@ void irc_core_deinit(void)
 {
 	signal_emit("chat protocol deinit", 1, chat_protocol_find("IRC"));
 
+	sasl_deinit();
 	cap_deinit();
 	irc_expandos_deinit();
 	netsplit_deinit();
@@ -140,7 +143,7 @@ void irc_core_deinit(void)
 	irc_irc_deinit();
 	irc_servers_deinit();
 	irc_chatnets_deinit();
-        irc_session_deinit();
+	irc_session_deinit();
 
 	chat_protocol_unregister("IRC");
 }
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 5659991b..9a9a8347 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -28,6 +28,7 @@
 #include "irc-chatnets.h"
 #include "irc-servers-setup.h"
 #include "irc-servers.h"
+#include "sasl.h"
 
 /* Fill information to connection from server setup record */
 static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
@@ -79,6 +80,29 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 		conn->cmd_queue_speed = ircnet->cmd_queue_speed;
 	if (ircnet->max_query_chans > 0)
 		conn->max_query_chans = ircnet->max_query_chans;
+
+	/* Validate the SASL parameters filled by sig_chatnet_read() */
+	conn->sasl_mechanism = SASL_MECHANISM_NONE;
+
+	if (ircnet->sasl_mechanism != NULL) {
+		if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "plain")) {
+			/* The PLAIN method needs both the username and the password */
+			if (ircnet->sasl_username != NULL && *ircnet->sasl_username &&
+			    ircnet->sasl_password != NULL && *ircnet->sasl_password) {
+				conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
+				conn->sasl_username = ircnet->sasl_username;
+				conn->sasl_password = ircnet->sasl_password;
+			} else
+				g_warning("The fields sasl_username and sasl_password are either undefined or empty");
+		}
+		else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
+				conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
+				conn->sasl_username = NULL;
+				conn->sasl_password = NULL;
+		}
+		else
+			g_warning("Unsupported SASL mechanism \"%s\" selected", ircnet->sasl_mechanism);
+	}
 }
 
 static void init_userinfo(void)
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index e9920d91..ad4d09cc 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -33,6 +33,7 @@
 #include "irc-servers-setup.h"
 #include "irc-servers.h"
 #include "irc-cap.h"
+#include "sasl.h"
 #include "channel-rejoin.h"
 #include "servers-idle.h"
 #include "servers-reconnect.h"
@@ -215,6 +216,9 @@ static void server_init(IRC_SERVER_REC *server)
 		g_free(cmd);
 	}
 
+	if (conn->sasl_mechanism != SASL_MECHANISM_NONE)
+		cap_toggle(server, "sasl", TRUE);
+
 	irc_send_cmd_now(server, "CAP LS");
 
 	if (conn->password != NULL && *conn->password != '\0') {
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index f809fab5..41c4b9c2 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -27,6 +27,10 @@ struct _IRC_SERVER_CONNECT_REC {
 	char *usermode;
 	char *alternate_nick;
 
+	int sasl_mechanism;
+	char *sasl_username;
+	char *sasl_password;
+
 	int max_cmds_at_once;
 	int cmd_queue_speed;
 	int max_query_chans;
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
new file mode 100644
index 00000000..8bffc3d9
--- /dev/null
+++ b/src/irc/core/sasl.c
@@ -0,0 +1,134 @@
+#include "module.h"
+#include "misc.h"
+#include "settings.h"
+
+#include "irc-cap.h"
+#include "irc-servers.h"
+#include "sasl.h"
+
+#define SASL_TIMEOUT (20 * 1000) // ms
+
+static gboolean sasl_timeout (IRC_SERVER_REC *server)
+{
+	/* The authentication timed out, we can't do much beside terminating it */
+	g_critical("The authentication timed out, try increasing the timeout and check your connection "
+	           "to the network.");
+	irc_send_cmd_now(server, "AUTHENTICATE *");
+	cap_finish_negotiation(server);
+
+	return G_SOURCE_REMOVE;
+}
+
+static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	IRC_SERVER_CONNECT_REC *conn;
+
+	conn = server->connrec;
+
+	switch (conn->sasl_mechanism) {
+		case SASL_MECHANISM_PLAIN:
+			irc_send_cmd_now(server, "AUTHENTICATE PLAIN");
+			break;
+
+		case SASL_MECHANISM_EXTERNAL:
+			irc_send_cmd_now(server, "AUTHENTICATE EXTERNAL");
+			break;
+	}
+	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
+}
+
+static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	/* Stop any pending timeout, if any */
+	g_source_remove(server->sasl_timeout);
+
+	g_critical("Authentication failed, make sure your credentials are correct and that the mechanism "
+	           "you have selected is supported by this server.");
+
+	/* Terminate the negotiation */
+	cap_finish_negotiation(server);
+}
+
+static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	g_source_remove(server->sasl_timeout);
+
+	/* We're already authenticated, do nothing */
+	cap_finish_negotiation(server);
+}
+
+static void sasl_success (IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	g_source_remove(server->sasl_timeout);
+
+	/* The authentication succeeded, time to finish the CAP negotiation */
+	g_warning("SASL authentication succeeded");
+	cap_finish_negotiation(server);
+}
+
+static void sasl_step (IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	IRC_SERVER_CONNECT_REC *conn;
+	GString *req;
+	char *enc_req;
+
+	conn = server->connrec;
+
+	/* Stop the timer */
+	g_source_remove(server->sasl_timeout);
+
+	switch (conn->sasl_mechanism) {
+		case SASL_MECHANISM_PLAIN:
+			/* At this point we assume that conn->{username, password} are non-NULL.
+			 * The PLAIN mechanism expects a NULL-separated string composed by the authorization identity, the
+			 * authentication identity and the password.
+			 * The authorization identity field is optional and can be omitted, the server will derive the
+			 * identity by looking at the credentials provided.
+			 * The whole request is then encoded in base64. */
+
+			req = g_string_new(NULL);
+
+			g_string_append_c(req, '\0');
+			g_string_append(req, conn->sasl_username);
+			g_string_append_c(req, '\0');
+			g_string_append(req, conn->sasl_password);
+
+			enc_req = g_base64_encode((const guchar *)req->str, req->len);
+
+			irc_send_cmdv(server, "AUTHENTICATE %s", enc_req);
+
+			g_free(enc_req);
+			g_string_free(req, TRUE);
+			break;
+
+		case SASL_MECHANISM_EXTERNAL:
+			/* Empty response */
+			irc_send_cmdv(server, "+");
+			break;
+	}
+
+	/* We expect a response within a reasonable time */
+	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
+}
+
+void sasl_init(void)
+{
+	signal_add_first("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
+	signal_add_first("event authenticate", (SIGNAL_FUNC) sasl_step);
+	signal_add_first("event 900", (SIGNAL_FUNC) sasl_success);
+	signal_add_first("event 902", (SIGNAL_FUNC) sasl_fail);
+	signal_add_first("event 904", (SIGNAL_FUNC) sasl_fail);
+	signal_add_first("event 905", (SIGNAL_FUNC) sasl_fail);
+	signal_add_first("event 907", (SIGNAL_FUNC) sasl_already);
+}
+
+void sasl_deinit(void)
+{
+	signal_remove("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
+	signal_remove("event authenticate", (SIGNAL_FUNC) sasl_step);
+	signal_remove("event 900", (SIGNAL_FUNC) sasl_success);
+	signal_remove("event 902", (SIGNAL_FUNC) sasl_fail);
+	signal_remove("event 904", (SIGNAL_FUNC) sasl_fail);
+	signal_remove("event 905", (SIGNAL_FUNC) sasl_fail);
+	signal_remove("event 907", (SIGNAL_FUNC) sasl_already);
+}
diff --git a/src/irc/core/sasl.h b/src/irc/core/sasl.h
new file mode 100644
index 00000000..fcf87e16
--- /dev/null
+++ b/src/irc/core/sasl.h
@@ -0,0 +1,14 @@
+#ifndef __SASL_H
+#define __SASL_H
+
+enum {
+	SASL_MECHANISM_NONE = 0,
+	SASL_MECHANISM_PLAIN,
+	SASL_MECHANISM_EXTERNAL,
+	SASL_MECHANISM_MAX
+};
+
+void sasl_init(void);
+void sasl_deinit(void);
+
+#endif

From c90c7deac37bea6754c9c2715230429fd49e8e81 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 11 Sep 2015 00:58:01 +0200
Subject: [PATCH 0113/1650] Address all the points outlined in the first review

Replace G_SOURCE_REMOVE with FALSE for the compatibility sake.
Zero the timeout id after g_source_remove and when exipred.
Save the sasl_* options in sig_chatnet_saved().
---
 src/irc/core/irc-chatnets.c |  9 ++++++++-
 src/irc/core/sasl.c         | 24 +++++++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index cfb7deec..b9b221b8 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -60,7 +60,7 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 		return;
 
 	if (rec->usermode != NULL)
-                iconfig_node_set_str(node, "usermode", rec->usermode);
+		iconfig_node_set_str(node, "usermode", rec->usermode);
 
 	if (rec->max_cmds_at_once > 0)
 		iconfig_node_set_int(node, "cmdmax", rec->max_cmds_at_once);
@@ -77,6 +77,13 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 		iconfig_node_set_int(node, "max_modes", rec->max_modes);
 	if (rec->max_whois > 0)
 		iconfig_node_set_int(node, "max_whois", rec->max_whois);
+
+	if (rec->sasl_mechanism != NULL)
+		iconfig_node_set_str(node, "sasl_mechanism", rec->sasl_mechanism);
+	if (rec->sasl_username != NULL)
+		iconfig_node_set_str(node, "sasl_username", rec->sasl_username);
+	if (rec->sasl_password != NULL)
+		iconfig_node_set_str(node, "sasl_password", rec->sasl_password);
 }
 
 static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec)
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 8bffc3d9..4b221176 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -16,7 +16,9 @@ static gboolean sasl_timeout (IRC_SERVER_REC *server)
 	irc_send_cmd_now(server, "AUTHENTICATE *");
 	cap_finish_negotiation(server);
 
-	return G_SOURCE_REMOVE;
+  server->sasl_timeout = -1;
+
+	return FALSE;
 }
 
 static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *from)
@@ -40,7 +42,10 @@ static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *fr
 static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	/* Stop any pending timeout, if any */
-	g_source_remove(server->sasl_timeout);
+  if (server->sasl_timeout != -1) {
+    g_source_remove(server->sasl_timeout);
+    server->sasl_timeout = -1;
+  }
 
 	g_critical("Authentication failed, make sure your credentials are correct and that the mechanism "
 	           "you have selected is supported by this server.");
@@ -51,7 +56,10 @@ static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *fro
 
 static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	g_source_remove(server->sasl_timeout);
+  if (server->sasl_timeout != -1) {
+    g_source_remove(server->sasl_timeout);
+    server->sasl_timeout = -1;
+  }
 
 	/* We're already authenticated, do nothing */
 	cap_finish_negotiation(server);
@@ -59,7 +67,10 @@ static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *
 
 static void sasl_success (IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	g_source_remove(server->sasl_timeout);
+  if (server->sasl_timeout != -1) {
+    g_source_remove(server->sasl_timeout);
+    server->sasl_timeout = -1;
+  }
 
 	/* The authentication succeeded, time to finish the CAP negotiation */
 	g_warning("SASL authentication succeeded");
@@ -75,7 +86,10 @@ static void sasl_step (IRC_SERVER_REC *server, const char *data, const char *fro
 	conn = server->connrec;
 
 	/* Stop the timer */
-	g_source_remove(server->sasl_timeout);
+  if (server->sasl_timeout != -1) {
+    g_source_remove(server->sasl_timeout);
+    server->sasl_timeout = -1;
+  }
 
 	switch (conn->sasl_mechanism) {
 		case SASL_MECHANISM_PLAIN:

From 171b67441d64a85a23daf5018159f167eb7fe583 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 11 Sep 2015 01:17:18 +0200
Subject: [PATCH 0114/1650] Replace spaces with tabs

---
 src/irc/core/sasl.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 4b221176..0e343299 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -16,7 +16,7 @@ static gboolean sasl_timeout (IRC_SERVER_REC *server)
 	irc_send_cmd_now(server, "AUTHENTICATE *");
 	cap_finish_negotiation(server);
 
-  server->sasl_timeout = -1;
+	server->sasl_timeout = -1;
 
 	return FALSE;
 }
@@ -42,10 +42,10 @@ static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *fr
 static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	/* Stop any pending timeout, if any */
-  if (server->sasl_timeout != -1) {
-    g_source_remove(server->sasl_timeout);
-    server->sasl_timeout = -1;
-  }
+	if (server->sasl_timeout != -1) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = -1;
+	}
 
 	g_critical("Authentication failed, make sure your credentials are correct and that the mechanism "
 	           "you have selected is supported by this server.");
@@ -56,10 +56,10 @@ static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *fro
 
 static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *from)
 {
-  if (server->sasl_timeout != -1) {
-    g_source_remove(server->sasl_timeout);
-    server->sasl_timeout = -1;
-  }
+	if (server->sasl_timeout != -1) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = -1;
+	}
 
 	/* We're already authenticated, do nothing */
 	cap_finish_negotiation(server);
@@ -67,10 +67,10 @@ static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *
 
 static void sasl_success (IRC_SERVER_REC *server, const char *data, const char *from)
 {
-  if (server->sasl_timeout != -1) {
-    g_source_remove(server->sasl_timeout);
-    server->sasl_timeout = -1;
-  }
+	if (server->sasl_timeout != -1) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = -1;
+	}
 
 	/* The authentication succeeded, time to finish the CAP negotiation */
 	g_warning("SASL authentication succeeded");
@@ -86,10 +86,10 @@ static void sasl_step (IRC_SERVER_REC *server, const char *data, const char *fro
 	conn = server->connrec;
 
 	/* Stop the timer */
-  if (server->sasl_timeout != -1) {
-    g_source_remove(server->sasl_timeout);
-    server->sasl_timeout = -1;
-  }
+	if (server->sasl_timeout != -1) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = -1;
+	}
 
 	switch (conn->sasl_mechanism) {
 		case SASL_MECHANISM_PLAIN:

From 6645d0d38dc4627a9553235a98df4f4717a1fc6f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 11 Sep 2015 22:09:47 +0200
Subject: [PATCH 0115/1650] Explicitly set the authorization id during the
 PLAIN handshake

On error show the user the message sent by the server.
---
 src/irc/core/sasl.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 0e343299..4d52e3c0 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -47,8 +47,7 @@ static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *fro
 		server->sasl_timeout = -1;
 	}
 
-	g_critical("Authentication failed, make sure your credentials are correct and that the mechanism "
-	           "you have selected is supported by this server.");
+	g_critical("Authentication failed with reason \"%s\"", data);
 
 	/* Terminate the negotiation */
 	cap_finish_negotiation(server);
@@ -93,15 +92,15 @@ static void sasl_step (IRC_SERVER_REC *server, const char *data, const char *fro
 
 	switch (conn->sasl_mechanism) {
 		case SASL_MECHANISM_PLAIN:
-			/* At this point we assume that conn->{username, password} are non-NULL.
+			/* At this point we assume that conn->sasl_{username, password} are non-NULL.
 			 * The PLAIN mechanism expects a NULL-separated string composed by the authorization identity, the
 			 * authentication identity and the password.
-			 * The authorization identity field is optional and can be omitted, the server will derive the
-			 * identity by looking at the credentials provided.
+			 * The authorization identity field is explicitly set to the user provided username.
 			 * The whole request is then encoded in base64. */
 
 			req = g_string_new(NULL);
 
+			g_string_append(req, conn->sasl_username);
 			g_string_append_c(req, '\0');
 			g_string_append(req, conn->sasl_username);
 			g_string_append_c(req, '\0');

From 55387dd93df4cff349c5696ab1bcb87801f4443f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 11 Sep 2015 22:23:38 +0200
Subject: [PATCH 0116/1650] Handle event 906 and 908

---
 src/irc/core/sasl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 4d52e3c0..bf13dd21 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -132,7 +132,9 @@ void sasl_init(void)
 	signal_add_first("event 902", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 904", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 905", (SIGNAL_FUNC) sasl_fail);
+	signal_add_first("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 907", (SIGNAL_FUNC) sasl_already);
+	signal_add_first("event 908", (SIGNAL_FUNC) sasl_fail);
 }
 
 void sasl_deinit(void)
@@ -143,5 +145,7 @@ void sasl_deinit(void)
 	signal_remove("event 902", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 904", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 905", (SIGNAL_FUNC) sasl_fail);
+	signal_remove("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 907", (SIGNAL_FUNC) sasl_already);
+	signal_remove("event 908", (SIGNAL_FUNC) sasl_fail);
 }

From 1f114d75c6db16726bcb930044b7312e4c851eaa Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 11 Sep 2015 23:17:46 +0200
Subject: [PATCH 0117/1650] Consider the SASL handshake successful on 903

---
 src/irc/core/sasl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index bf13dd21..8f3b823f 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -128,7 +128,7 @@ void sasl_init(void)
 {
 	signal_add_first("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
 	signal_add_first("event authenticate", (SIGNAL_FUNC) sasl_step);
-	signal_add_first("event 900", (SIGNAL_FUNC) sasl_success);
+	signal_add_first("event 903", (SIGNAL_FUNC) sasl_success);
 	signal_add_first("event 902", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 904", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 905", (SIGNAL_FUNC) sasl_fail);
@@ -141,7 +141,7 @@ void sasl_deinit(void)
 {
 	signal_remove("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
 	signal_remove("event authenticate", (SIGNAL_FUNC) sasl_step);
-	signal_remove("event 900", (SIGNAL_FUNC) sasl_success);
+	signal_remove("event 903", (SIGNAL_FUNC) sasl_success);
 	signal_remove("event 902", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 904", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 905", (SIGNAL_FUNC) sasl_fail);

From 49c4ea5fd94c9eee17dc5a8e0691ba1da9bf33b7 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 11 Sep 2015 23:20:07 +0200
Subject: [PATCH 0118/1650] Parse the error string received by the server

So that in case of SASL failure the user sees a nice error message.
---
 src/irc/core/sasl.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 8f3b823f..874b67f3 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -41,16 +41,22 @@ static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *fr
 
 static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *from)
 {
+	char *params, *error;
+
 	/* Stop any pending timeout, if any */
 	if (server->sasl_timeout != -1) {
 		g_source_remove(server->sasl_timeout);
 		server->sasl_timeout = -1;
 	}
 
-	g_critical("Authentication failed with reason \"%s\"", data);
+	params = event_get_params(data, 2, NULL, &error);
+
+	g_critical("Authentication failed with reason \"%s\"", error);
 
 	/* Terminate the negotiation */
 	cap_finish_negotiation(server);
+
+	g_free(params);
 }
 
 static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *from)

From 24d32c28ee2d5dbd001cbe29fa5d90077c6be107 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 11 Sep 2015 23:21:33 +0200
Subject: [PATCH 0119/1650] Don't handle 908 as a critical failure

"if the mechanism is unknown, 908 is optional, 904 (or equivalent error condition) is required"
---
 src/irc/core/sasl.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 874b67f3..56e80f48 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -140,7 +140,6 @@ void sasl_init(void)
 	signal_add_first("event 905", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 907", (SIGNAL_FUNC) sasl_already);
-	signal_add_first("event 908", (SIGNAL_FUNC) sasl_fail);
 }
 
 void sasl_deinit(void)
@@ -153,5 +152,4 @@ void sasl_deinit(void)
 	signal_remove("event 905", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 907", (SIGNAL_FUNC) sasl_already);
-	signal_remove("event 908", (SIGNAL_FUNC) sasl_fail);
 }

From 54a2fafbde593f63811da711c6a5f95ba58c818a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 18 Sep 2015 23:33:52 +0200
Subject: [PATCH 0120/1650] Update perl.txt

---
 docs/perl.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/perl.txt b/docs/perl.txt
index 79ab5820..560fcaec 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -1185,3 +1185,11 @@ Client->{}
   connected - whether the client is connected and ready
   want_ctcp - whether the client wants to receive CTCPs
   ircnet - network tag of the network we proxy
+
+
+
+
+ Bugs and Limitations
+ --------------------
+* Calling die in 'script error' handler causes segfault (#101)
+* Storing and later using any Irssi object may result in use-after-free related crash

From f37f6ac0edadf12476fba962d582bc43876f0be6 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 18 Sep 2015 23:56:17 -0300
Subject: [PATCH 0121/1650] Add two missing #include "fe-irc-channels.h"

Fixes #285
---
 src/fe-common/irc/fe-events.c       | 1 +
 src/fe-common/irc/fe-irc-messages.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 068ee543..3a01b9eb 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -41,6 +41,7 @@
 #include "fe-queries.h"
 #include "fe-windows.h"
 #include "fe-irc-server.h"
+#include "fe-irc-channels.h"
 
 static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 			  const char *nick, const char *addr)
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index b2736a2c..11d158af 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -36,6 +36,7 @@
 
 #include "fe-queries.h"
 #include "window-items.h"
+#include "fe-irc-channels.h"
 
 static void sig_message_own_public(SERVER_REC *server, const char *msg,
 				   const char *target, const char *origtarget)

From 061fb347502bd0b98f4587cfdce6612808d0c989 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 16 Sep 2015 15:31:51 +0200
Subject: [PATCH 0122/1650] Modify the terminal initialization sequence

We disable the ICRNL flag to make Enter independent from ^J from the
keybinding point of view since the former will now send ^M, leaving the
user free to remap ^J without trapping itself into the irssi session
because of a broken Enter key.
Also disable the software flow control because we don't expect anyone to
run irssi over a serial console; we gain some more freedom by having ^Q
and ^S freely mappable by the user.
---
 src/fe-text/terminfo-core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 6339e6f4..60927f1a 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -502,6 +502,9 @@ static void terminfo_input_init(TERM_REC *term)
 	memcpy(&term->tio, &term->old_tio, sizeof(term->tio));
 
 	term->tio.c_lflag &= ~(ICANON | ECHO); /* CBREAK, no ECHO */
+        /* Disable the ICRNL flag to disambiguate ^J and Enter, also disable the
+         * software flow control to leave ^Q and ^S ready to be bound */
+	term->tio.c_iflag &= ~(ICRNL | IXON | IXOFF); 
 	term->tio.c_cc[VMIN] = 1; /* read() is satisfied after 1 char */
 	term->tio.c_cc[VTIME] = 0; /* No timer */
 

From 9586766d87820bdfa9e7cbe805f5ed4b7b0378e5 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 19 Sep 2015 18:27:48 -0300
Subject: [PATCH 0123/1650] Add setting to configure rejoin on reconnect
 behaviour

Closes #169
---
 src/irc/core/irc-servers.c | 50 ++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index b2718ae1..fdc5187f 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -33,6 +33,7 @@
 #include "irc-servers-setup.h"
 #include "irc-servers.h"
 #include "irc-cap.h"
+#include "channels-setup.h"
 #include "channel-rejoin.h"
 #include "servers-idle.h"
 #include "servers-reconnect.h"
@@ -609,32 +610,59 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 	GString *chans, *keys;
 	char *ret;
 	int use_keys;
+	char *rejoin_channels_mode;
 
 	g_return_val_if_fail(server != NULL, FALSE);
 
+	rejoin_channels_mode = g_strdup(settings_get_str("rejoin_channels_on_reconnect"));
+
+	if (rejoin_channels_mode == NULL ||
+	    (g_ascii_strcasecmp(rejoin_channels_mode, "on") != 0 &&
+	     g_ascii_strcasecmp(rejoin_channels_mode, "off") != 0 &&
+	     g_ascii_strcasecmp(rejoin_channels_mode, "auto") != 0)) {
+		g_warning("Invalid value for 'rejoin_channels_on_reconnect', valid values are 'on', 'off', 'auto', using 'on' as default value.");
+		g_free(rejoin_channels_mode);
+		rejoin_channels_mode = g_strdup("on");
+	}
+
 	chans = g_string_new(NULL);
 	keys = g_string_new(NULL);
 	use_keys = FALSE;
 
+	/* do we want to rejoin channels in the first place? */
+	if(g_ascii_strcasecmp(rejoin_channels_mode, "off") == 0) {
+		g_string_free(chans, TRUE);
+		g_string_free(keys, TRUE);
+		g_free(rejoin_channels_mode);
+		return g_strdup("");
+	}
+
 	/* get currently joined channels */
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *channel = tmp->data;
-
-		g_string_append_printf(chans, "%s,", channel->name);
-		g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" :
-				  channel->key);
-		if (channel->key != NULL)
-			use_keys = TRUE;
+		CHANNEL_SETUP_REC *setup = channel_setup_find(channel->name, channel->server->connrec->chatnet);
+		if ((setup != NULL && setup->autojoin && g_ascii_strcasecmp(rejoin_channels_mode, "auto") == 0) ||
+		    g_ascii_strcasecmp(rejoin_channels_mode, "on") == 0) {
+			g_string_append_printf(chans, "%s,", channel->name);
+			g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" : channel->key);
+			if (channel->key != NULL)
+				use_keys = TRUE;
+		}
 	}
 
 	/* get also the channels that are in rejoin list */
 	for (tmp = server->rejoin_channels; tmp != NULL; tmp = tmp->next) {
 		REJOIN_REC *rec = tmp->data;
+		CHANNEL_SETUP_REC *setup = channel_setup_find(rec->channel, server->tag);
 
-		g_string_append_printf(chans, "%s,", rec->channel);
-		g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" :
-				  rec->key);
-		if (rec->key != NULL) use_keys = TRUE;
+		if ((setup != NULL && setup->autojoin && g_ascii_strcasecmp(rejoin_channels_mode, "auto") == 0) ||
+		    g_ascii_strcasecmp(rejoin_channels_mode, "on") == 0) {
+			g_string_append_printf(chans, "%s,", rec->channel);
+			g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" :
+									rec->key);
+
+			if (rec->key != NULL) use_keys = TRUE;
+		}
 	}
 
 	if (chans->len > 0) {
@@ -646,6 +674,7 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 	ret = chans->str;
 	g_string_free(chans, FALSE);
 	g_string_free(keys, TRUE);
+	g_free(rejoin_channels_mode);
 
 	return ret;
 }
@@ -991,6 +1020,7 @@ void irc_server_init_isupport(IRC_SERVER_REC *server)
 
 void irc_servers_init(void)
 {
+	settings_add_str("servers", "rejoin_channels_on_reconnect", "on");
 	settings_add_str("misc", "usermode", DEFAULT_USER_MODE);
 	settings_add_str("misc", "split_line_start", "");
 	settings_add_str("misc", "split_line_end", "");

From ca363efe00a05682acf9de828d55e991657b9e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 21:01:25 +0200
Subject: [PATCH 0124/1650] Use g_string_append() instead of
 g_string_append_c() for string.

---
 src/irc/proxy/dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 455a2fe3..05059360 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -169,7 +169,7 @@ static void dump_join(IRC_CHANNEL_REC *channel, CLIENT_REC *client)
 		NICK_REC *nick = tmp->data;
 
 		if (str->len >= 500) {
-			g_string_append_c(str, '\r\n');
+			g_string_append(str, "\r\n");
 			proxy_outdata(client, "%s", str->str);
 			create_names_start(str, channel, client);
 			first = TRUE;

From 1079ad46d21198b26649c2a81a692781e22336aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 21:12:07 +0200
Subject: [PATCH 0125/1650] Use g_string_append() instead of
 g_string_append_c() for string.

---
 src/irc/proxy/dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 05059360..e39c21a6 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -186,7 +186,7 @@ static void dump_join(IRC_CHANNEL_REC *channel, CLIENT_REC *client)
 	}
 	g_slist_free(nicks);
 
-	g_string_append_c(str, '\r\n');
+	g_string_append(str, "\r\n");
 	proxy_outdata(client, "%s", str->str);
 	g_string_free(str, TRUE);
 

From be977bf1b795c93dbff4fa52f04b5d425a3f3648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 21:21:40 +0200
Subject: [PATCH 0126/1650] Fix warning.

---
 src/irc/core/irc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 509418b7..4dce3fcf 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -212,8 +212,12 @@ void irc_send_cmd_split(IRC_SERVER_REC *server, const char *cmd,
 		count = 0;
 		if (nickstr->len > 0)
 			g_string_truncate(nickstr, nickstr->len-1);
-		irc_send_cmdv(server, post == NULL ? "%s %s" : "%s %s %s",
-			      pre, nickstr->str, post);
+
+		if (post == NULL)
+			irc_send_cmdv(server, "%s %s", pre, nickstr->str);
+		else
+			irc_send_cmdv(server, "%s %s %s", pre, nickstr->str, post);
+
 		g_string_truncate(nickstr, 0);
 
 		if (*tmp == NULL || tmp[1] == NULL)

From 29cf546ee4d5c1af1042d6fbeaae150ecc545d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 20:54:29 +0200
Subject: [PATCH 0127/1650] Remove Garbage Collection support.

GC support was never enabled by default and nobody in the current
development team seems to care about it.
---
 NEWS                |  2 ++
 acconfig.h          |  3 ---
 configure.ac        | 32 --------------------------------
 src/common.h        |  4 ----
 src/fe-text/irssi.c | 23 -----------------------
 5 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/NEWS b/NEWS
index d92f22e8..511f495a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
+	+ Garbage Collection support has been removed. This will hardly have any
+	  effect for anyone given that it has been unsupported for several years.
 	+ Disable SSLv3 due to the POODLE vulnerability.
 	+ Try to split long lines on spaces to avoid words being splitted. Adds
 	  a new option: 'split_line_on_space' which defaults to on.
diff --git a/acconfig.h b/acconfig.h
index cfe62381..9ace70d8 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,9 +3,6 @@
 #undef HAVE_SOCKS_H
 #undef HAVE_STATIC_PERL
 #undef HAVE_GMODULE
-#undef HAVE_GC_H
-#undef HAVE_GC_GC_H
-#undef USE_GC
 
 /* macros/curses checks */
 #undef HAS_CURSES
diff --git a/configure.ac b/configure.ac
index c312d065..e33b8c1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,15 +83,6 @@ if test "x$prefix" != "xNONE"; then
 	perl_prefix_note=yes
 fi
 
-AC_ARG_WITH(gc,
-[  --with-gc               Use garbage collector],
-	if test x$withval = xno; then
-		want_gc=no
-	else
-		want_gc=yes
-	fi,
-	want_gc=no)
-
 AC_ARG_WITH(perl-staticlib,
 [  --with-perl-staticlib   Specify that we want to link perl libraries
                           statically in irssi, default is no],
@@ -322,28 +313,6 @@ if test "$enable_ssl" = "yes"; then
   fi
 fi
 
-dnl **
-dnl ** Garbage Collector
-dnl **
-have_gc=no
-if test "x$want_gc" = xyes; then
-  AC_CHECK_LIB(gc, GC_malloc, [
-    AC_CHECK_HEADER(gc/gc.h, [
-      AC_DEFINE(HAVE_GC_GC_H)
-      AC_DEFINE(USE_GC)
-      LIBS="$LIBS -lgc"
-      have_gc=yes
-    ], [
-      AC_CHECK_HEADER(gc.h, [
-	AC_DEFINE(HAVE_GC_H)
-	AC_DEFINE(USE_GC)
-	LIBS="$LIBS -lgc"
-	have_gc=yes
-      ])
-    ])
-  ])
-fi
-
 dnl **
 dnl ** curses checks
 dnl **
@@ -782,7 +751,6 @@ if test "x$have_openssl" = "xno" -a "x$enable_ssl" = "xyes"; then
   fi
 fi
 echo "Building with 64bit DCC support .. : $offt_64bit"
-echo "Building with garbage collector .. : $have_gc"
 echo "Building with DANE support ....... : $have_dane"
 echo "Building with true color support.. : $want_truecolor"
 
diff --git a/src/common.h b/src/common.h
index 1b99753b..e9073925 100644
--- a/src/common.h
+++ b/src/common.h
@@ -56,10 +56,6 @@
 #define g_strcmp0(a, b) (!a ? -(a != b) : (!b ? (a != b) : strcmp(a, b)))
 #endif
 
-#ifdef USE_GC
-#  define g_free(x) G_STMT_START { (x) = NULL; } G_STMT_END
-#endif
-
 #if defined (UOFF_T_INT)
 typedef unsigned int uoff_t;
 #elif defined (UOFF_T_LONG)
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 6d5b9b13..b1fa5e22 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -286,22 +286,6 @@ static void winsock_init(void)
 }
 #endif
 
-#ifdef USE_GC
-#ifdef HAVE_GC_H
-#  include <gc.h>
-#else
-#  include <gc/gc.h>
-#endif
-
-GMemVTable gc_mem_table = {
-	GC_malloc,
-	GC_realloc,
-	GC_free,
-
-	NULL, NULL, NULL
-};
-#endif
-
 int main(int argc, char **argv)
 {
 	static int version = 0;
@@ -312,10 +296,6 @@ int main(int argc, char **argv)
 	};
 	int loglev;
 
-#ifdef USE_GC
-	g_mem_set_vtable(&gc_mem_table);
-#endif
-
 	core_register_options();
 	fe_common_core_register_options();
 	args_register(options);
@@ -369,9 +349,6 @@ int main(int argc, char **argv)
 	/* Does the same as g_main_run(main_loop), except we
 	   can call our dirty-checker after each iteration */
 	while (!quitting) {
-#ifdef USE_GC
-		GC_collect_a_little();
-#endif
 		if (!dummy) term_refresh_freeze();
 		g_main_iteration(TRUE);
                 if (!dummy) term_refresh_thaw();

From 519955ebe4a421e8027c3dd09af9ea76d949d259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 21:45:33 +0200
Subject: [PATCH 0128/1650] Fix warning.

Add comment on the use of ??) in C, since that string isn't entirely
obvious to people who are reading the code.
---
 src/fe-text/statusbar-items.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 044c2fa0..e3e0c2a6 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -347,10 +347,14 @@ static void item_lag(SBAR_ITEM_REC *item, int get_size_only)
 	last_lag_unknown = lag_unknown;
 
 	if (lag_unknown) {
-		g_snprintf(str, sizeof(str), "%d (?""?)", lag/100);
+		// "??)" in C becomes ']'
+		// See: https://en.wikipedia.org/wiki/Digraphs_and_trigraphs#C
+		g_snprintf(str, sizeof(str), "%d (?""?)", lag / 100);
 	} else {
-		g_snprintf(str, sizeof(str),
-			   lag%100 == 0 ? "%d" : "%d.%02d", lag/100, lag%100);
+		if (lag % 100 == 0)
+			g_snprintf(str, sizeof(str), "%d", lag / 100);
+		else
+			g_snprintf(str, sizeof(str), "%d.%02d", lag / 100, lag % 100);
 	}
 
 	statusbar_item_default_handler(item, get_size_only,

From 6c9dcffb5ef6b0f024f5ab6d335b69ef79e4daa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 22:51:13 +0200
Subject: [PATCH 0129/1650] Fix formatting warnings.

---
 src/irc/core/irc-commands.c | 40 ++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index f2cd49c0..47644753 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -170,8 +170,11 @@ static void cmd_part(const char *data, IRC_SERVER_REC *server,
 
 	if (*msg != '\0')
 		recoded = recode_out(SERVER(server), msg, channame);
-	irc_send_cmdv(server, ! recoded ? "PART %s" : "PART %s :%s",
-		      channame, recoded);
+
+	if (recoded == NULL)
+		irc_send_cmdv(server, "PART %s", channame);
+	else
+		irc_send_cmdv(server, "PART %s :%s", channame, recoded);
 
 	g_free(recoded);
 	cmd_params_free(free_arg);
@@ -219,8 +222,12 @@ static void cmd_topic(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *ite
 
 	if (*topic != '\0' || g_hash_table_lookup(optlist, "delete") != NULL)
 		recoded = recode_out(SERVER(server), topic, channame);
-	irc_send_cmdv(server, recoded == NULL ? "TOPIC %s" : "TOPIC %s :%s",
-		      channame, recoded);
+
+	if (recoded == NULL)
+		irc_send_cmdv(server, "TOPIC %s", channame);
+	else
+		irc_send_cmdv(server, "TOPIC %s :%s", channame, recoded);
+
 	g_free(recoded);
 
 	cmd_params_free(free_arg);
@@ -279,14 +286,14 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
 	char *channel, *rest;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &channel, &rest))
 		return;
 
 	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
 		if (!IS_IRC_CHANNEL(item))
-                        cmd_param_error(CMDERR_NOT_JOINED);
+			cmd_param_error(CMDERR_NOT_JOINED);
 
 		channel = IRC_CHANNEL(item)->name;
 	}
@@ -295,8 +302,11 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
 		*channel = '\0';
 	}
 
-	irc_send_cmdv(server, *rest == '\0' ? "WHO %s" : "WHO %s %s",
-		      channel, rest);
+	if (rest[0] == '\0')
+		irc_send_cmdv(server, "WHO %s", channel);
+	else
+		irc_send_cmdv(server, "WHO %s %s", channel, rest);
+
 	cmd_params_free(free_arg);
 }
 
@@ -502,8 +512,11 @@ static void cmd_whowas(const char *data, IRC_SERVER_REC *server)
 	if (free_nick) g_free(nicks_redir);
 
 	server->whowas_found = FALSE;
-	irc_send_cmdv(server, *rest == '\0' ? "WHOWAS %s" :
-		      "WHOWAS %s %s", nicks, rest);
+
+	if (rest[0] == '\0')
+		irc_send_cmdv(server, "WHOWAS %s", nicks);
+	else
+		irc_send_cmdv(server, "WHOWAS %s %s", nicks, rest);
 
 	cmd_params_free(free_arg);
 }
@@ -913,9 +926,12 @@ static void cmd_unsilence(const char *data, IRC_SERVER_REC *server)
 
 static void command_self(const char *data, IRC_SERVER_REC *server)
 {
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
-	irc_send_cmdv(server, *data == '\0' ? "%s" : "%s %s", current_command, data);
+	if (data[0] == '\0')
+		irc_send_cmdv(server, "%s", current_command);
+	else
+		irc_send_cmdv(server, "%s %s", current_command, data);
 }
 
 static void command_1self(const char *data, IRC_SERVER_REC *server)

From 5c3ef84a0ba3cde0d9e2586fcb618d81851776f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 23:02:51 +0200
Subject: [PATCH 0130/1650] Undefine PACKAGE_VERSION before overwriting it.

---
 irssi-version.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/irssi-version.sh b/irssi-version.sh
index 1e9eae34..1fc6a558 100755
--- a/irssi-version.sh
+++ b/irssi-version.sh
@@ -22,6 +22,7 @@ if echo "${VERSION}" | grep -q -- -head; then
     # Because the git tag won't yet include the next release we modify the git
     # describe output using the version defined from configure.ac.
     version="${new_version}-$(echo "${git_version}" | sed 's/^.*-[0-9]\+-//')"
+    echo "#undef PACKAGE_VERSION"
     echo "#define PACKAGE_VERSION \"${version}\""
   fi
 fi

From a44c4b82de44af9aec59c542f3212795ecc52b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 20 Sep 2015 23:11:39 +0200
Subject: [PATCH 0131/1650] More format warnings removed.

---
 src/fe-common/core/fe-common-core.c |  7 +++++--
 src/irc/core/irc-channels.c         | 12 +++++++-----
 src/irc/core/servers-redirect.c     |  8 +++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index a475f056..341902df 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -326,8 +326,11 @@ static void autoconnect_servers(void)
 
 	if (autocon_server != NULL) {
 		/* connect to specified server */
-		str = g_strdup_printf(autocon_password == NULL ? "%s %d" : "%s %d %s",
-				      autocon_server, autocon_port, autocon_password);
+		if (autocon_password == NULL)
+			str = g_strdup_printf("%s %d", autocon_server, autocon_port);
+		else
+			str = g_strdup_printf("%s %d %s", autocon_server, autocon_port, autocon_password);
+
 		signal_emit("command connect", 1, str);
 		g_free(str);
 		return;
diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index add18acf..682be4c2 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -146,11 +146,13 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 				continue;
 		}
 		if (outchans->len > 0) {
-			g_string_truncate(outchans, outchans->len-1);
-			g_string_truncate(outkeys, outkeys->len-1);
-			irc_send_cmdv(IRC_SERVER(server),
-				      use_keys ? "JOIN %s %s" : "JOIN %s",
-				      outchans->str, outkeys->str);
+			g_string_truncate(outchans, outchans->len - 1);
+			g_string_truncate(outkeys, outkeys->len - 1);
+
+			if (use_keys)
+				irc_send_cmdv(IRC_SERVER(server), "JOIN %s %s", outchans->str, outkeys->str);
+			else
+				irc_send_cmdv(IRC_SERVER(server), "JOIN %s", outchans->str);
 		}
 		cmdlen = 0;
 		g_string_truncate(outchans,0);
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index f0a285df..aeb9c010 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -433,9 +433,11 @@ static void redirect_abort(IRC_SERVER_REC *server, REDIRECT_REC *rec)
 
 	if (rec->aborted || !rec->destroyed) {
 		/* emit the failure signal */
-		str = g_strdup_printf(rec->failure_signal != NULL ?
-				      "FAILED %s: %s" : "FAILED %s",
-				      rec->cmd->name, rec->failure_signal);
+		if (rec->failure_signal != NULL)
+			str = g_strdup_printf("FAILED %s: %s", rec->cmd->name, rec->failure_signal);
+		else
+			str = g_strdup_printf("FAILED %s", rec->cmd->name);
+
 		rawlog_redirect(server->rawlog, str);
 		g_free(str);
 

From 203c00938acad1da4a91a2c21afdac4ede08572a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 20 Sep 2015 23:13:43 +0200
Subject: [PATCH 0132/1650] Use formats instead of g_warning

Add some copyright headers here and there too.
---
 docs/signals.txt                   |  4 +++
 src/fe-common/irc/Makefile.am      |  1 +
 src/fe-common/irc/fe-common-irc.c  |  5 ++++
 src/fe-common/irc/fe-sasl.c        | 48 ++++++++++++++++++++++++++++++
 src/fe-common/irc/module-formats.c |  2 ++
 src/fe-common/irc/module-formats.h |  2 ++
 src/irc/core/irc-servers-setup.c   |  2 +-
 src/irc/core/sasl.c                | 43 +++++++++++++++++++-------
 src/irc/core/sasl.h                | 20 +++++++++++++
 9 files changed, 116 insertions(+), 11 deletions(-)
 create mode 100644 src/fe-common/irc/fe-sasl.c

diff --git a/docs/signals.txt b/docs/signals.txt
index 5c40ce77..8b71fd95 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -136,6 +136,10 @@ irc-cap.c
  "server cap nak "<cmd>, SERVER_REC
  "server cap end", SERVER_REC
 
+sasl.c
+ "server sasl failure", SERVER_REC, char *reason
+ "server sasl success", SERVER_REC
+
 irc.c:
 
  "server event", SERVER_REC, char *data, char *sender_nick, char *sender_address
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index 463f145c..a5dd4c77 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -26,6 +26,7 @@ real_sources = \
 	fe-netsplit.c \
 	fe-common-irc.c \
 	fe-whois.c \
+	fe-sasl.c \
 	irc-completion.c \
 	module-formats.c 
 
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index d6ab30ce..4a3ef1d3 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -69,6 +69,9 @@ void fe_netjoin_deinit(void);
 void fe_whois_init(void);
 void fe_whois_deinit(void);
 
+void fe_sasl_init(void);
+void fe_sasl_deinit(void);
+
 void irc_completion_init(void);
 void irc_completion_deinit(void);
 
@@ -91,6 +94,7 @@ void fe_common_irc_init(void)
 	fe_netsplit_init();
 	fe_netjoin_init();
         fe_whois_init();
+	fe_sasl_init();
         irc_completion_init();
 
 	settings_check();
@@ -116,6 +120,7 @@ void fe_common_irc_deinit(void)
 	fe_netsplit_deinit();
 	fe_netjoin_deinit();
         fe_whois_deinit();
+	fe_sasl_deinit();
         irc_completion_deinit();
 
 	theme_unregister();
diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
new file mode 100644
index 00000000..331b38b0
--- /dev/null
+++ b/src/fe-common/irc/fe-sasl.c
@@ -0,0 +1,48 @@
+/*
+    fe-sasl.c : irssi
+
+    Copyright (C) 2015 The Lemon Man
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "module-formats.h"
+#include "signals.h"
+#include "levels.h"
+
+#include "printtext.h"
+
+static void sig_sasl_success(IRC_SERVER_REC *server)
+{
+	printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_SUCCESS);
+}
+
+static void sig_sasl_failure(IRC_SERVER_REC *server, const char *reason)
+{
+	printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_ERROR, reason);
+}
+
+void fe_sasl_init(void)
+{
+	signal_add("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
+	signal_add("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
+}
+
+void fe_sasl_deinit(void)
+{
+	signal_remove("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
+	signal_remove("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
+}
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 6eaf18e8..f7b074ec 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -44,6 +44,8 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "setupserver_header", "%#Server               Port  Network    Settings", 0 },
 	{ "setupserver_line", "%#%|$[!20]0 $[5]1 $[10]2 $3", 4, { 0, 1, 0, 0 } },
 	{ "setupserver_footer", "", 0 },
+	{ "sasl_success", "SASL authentication succeeded", 0 },
+	{ "sasl_error", "Cannot authenticate via SASL ($0)", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Channels", 0 },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 34dd3efc..c45f4562 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -22,6 +22,8 @@ enum {
 	IRCTXT_SETUPSERVER_HEADER,
 	IRCTXT_SETUPSERVER_LINE,
 	IRCTXT_SETUPSERVER_FOOTER,
+	IRCTXT_SASL_SUCCESS,
+	IRCTXT_SASL_ERROR,
 
 	IRCTXT_FILL_2,
 
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 9a9a8347..f5e4f8f4 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -93,7 +93,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 				conn->sasl_username = ircnet->sasl_username;
 				conn->sasl_password = ircnet->sasl_password;
 			} else
-				g_warning("The fields sasl_username and sasl_password are either undefined or empty");
+				g_warning("The fields sasl_username and sasl_password are either missing or empty");
 		}
 		else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
 				conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 56e80f48..a04eaf45 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -1,3 +1,23 @@
+/*
+    fe-sasl.c : irssi
+
+    Copyright (C) 2015 The Lemon Man
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #include "module.h"
 #include "misc.h"
 #include "settings.h"
@@ -8,20 +28,20 @@
 
 #define SASL_TIMEOUT (20 * 1000) // ms
 
-static gboolean sasl_timeout (IRC_SERVER_REC *server)
+static gboolean sasl_timeout(IRC_SERVER_REC *server)
 {
 	/* The authentication timed out, we can't do much beside terminating it */
-	g_critical("The authentication timed out, try increasing the timeout and check your connection "
-	           "to the network.");
 	irc_send_cmd_now(server, "AUTHENTICATE *");
 	cap_finish_negotiation(server);
 
 	server->sasl_timeout = -1;
 
+	signal_emit("server sasl failure", 2, server, "The authentication timed out");
+
 	return FALSE;
 }
 
-static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *from)
+static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	IRC_SERVER_CONNECT_REC *conn;
 
@@ -39,7 +59,7 @@ static void sasl_start (IRC_SERVER_REC *server, const char *data, const char *fr
 	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
 }
 
-static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *from)
+static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	char *params, *error;
 
@@ -51,7 +71,7 @@ static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *fro
 
 	params = event_get_params(data, 2, NULL, &error);
 
-	g_critical("Authentication failed with reason \"%s\"", error);
+	signal_emit("server sasl fail", 2, server, error);
 
 	/* Terminate the negotiation */
 	cap_finish_negotiation(server);
@@ -59,30 +79,33 @@ static void sasl_fail (IRC_SERVER_REC *server, const char *data, const char *fro
 	g_free(params);
 }
 
-static void sasl_already (IRC_SERVER_REC *server, const char *data, const char *from)
+static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	if (server->sasl_timeout != -1) {
 		g_source_remove(server->sasl_timeout);
 		server->sasl_timeout = -1;
 	}
 
+	signal_emit("server sasl success", 1, server);
+
 	/* We're already authenticated, do nothing */
 	cap_finish_negotiation(server);
 }
 
-static void sasl_success (IRC_SERVER_REC *server, const char *data, const char *from)
+static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	if (server->sasl_timeout != -1) {
 		g_source_remove(server->sasl_timeout);
 		server->sasl_timeout = -1;
 	}
 
+	signal_emit("server sasl success", 1, server);
+
 	/* The authentication succeeded, time to finish the CAP negotiation */
-	g_warning("SASL authentication succeeded");
 	cap_finish_negotiation(server);
 }
 
-static void sasl_step (IRC_SERVER_REC *server, const char *data, const char *from)
+static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	IRC_SERVER_CONNECT_REC *conn;
 	GString *req;
diff --git a/src/irc/core/sasl.h b/src/irc/core/sasl.h
index fcf87e16..0693989d 100644
--- a/src/irc/core/sasl.h
+++ b/src/irc/core/sasl.h
@@ -1,3 +1,23 @@
+/*
+    fe-sasl.c : irssi
+
+    Copyright (C) 2015 The Lemon Man
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #ifndef __SASL_H
 #define __SASL_H
 

From ffaa890e99e2176ff3d2dec0ab5a8136e1e946ff Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 21 Sep 2015 13:54:13 +0200
Subject: [PATCH 0133/1650] Initial work to make irssi respect the resolved ip
 order

Ip's aren't selected using random() anymore, also select the ip version
by using getaddrinfo and some proper hints.
---
 src/core/chat-commands.c       |  6 +--
 src/core/chatnet-rec.h         |  2 +-
 src/core/net-nonblock.c        | 38 ++++---------
 src/core/net-nonblock.h        |  4 +-
 src/core/network.c             | 98 ++++++----------------------------
 src/core/network.h             |  2 +-
 src/core/server-connect-rec.h  |  2 +-
 src/core/server-setup-rec.h    |  2 +-
 src/core/servers-reconnect.c   | 10 ++--
 src/core/servers-setup.c       | 67 +++++++----------------
 src/core/servers-setup.h       |  2 +-
 src/core/servers.c             | 66 +++++++----------------
 src/core/servers.h             |  3 +-
 src/fe-common/core/fe-server.c |  4 +-
 src/fe-common/irc/fe-ircnet.c  |  4 +-
 src/irc/dcc/dcc.c              |  4 +-
 src/irc/proxy/listen.c         |  9 ++--
 17 files changed, 87 insertions(+), 236 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 8e881679..9c28a1fc 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -128,10 +128,10 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 
         host = g_hash_table_lookup(optlist, "host");
 	if (host != NULL && *host != '\0') {
-		IPADDR ip4, ip6;
+		IPADDR ip;
 
-		if (net_gethostbyname(host, &ip4, &ip6) == 0)
-                        server_connect_own_ip_save(conn, &ip4, &ip6);
+		if (net_gethostbyname(host, &ip) == 0)
+                        server_connect_own_ip_save(conn, &ip);
 	}
 
 	cmd_params_free(free_arg);
diff --git a/src/core/chatnet-rec.h b/src/core/chatnet-rec.h
index e3ed8aa0..3044643a 100644
--- a/src/core/chatnet-rec.h
+++ b/src/core/chatnet-rec.h
@@ -9,4 +9,4 @@ char *realname;
 
 char *own_host; /* address to use when connecting this server */
 char *autosendcmd; /* command to send after connecting to this ircnet */
-IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
+IPADDR *own_ip; /* resolved own_address if not NULL */
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index e637e673..bc8c4b96 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -103,15 +103,12 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 	srand(time(NULL));
 
         memset(&rec, 0, sizeof(rec));
-	rec.error = net_gethostbyname(addr, &rec.ip4, &rec.ip6);
+	rec.error = net_gethostbyname(addr, &rec.ip);
 	if (rec.error == 0) {
 		errorstr = NULL;
 		if (reverse_lookup) {
 			/* reverse lookup the IP, ignore any error */
-			if (rec.ip4.family != 0)
-				net_gethostbyaddr(&rec.ip4, &rec.host4);
-			if (rec.ip6.family != 0)
-				net_gethostbyaddr(&rec.ip6, &rec.host6);
+			net_gethostbyaddr(&rec.ip, &rec.host);
 		}
 	} else {
 		errorstr = net_gethosterror(rec.error);
@@ -122,18 +119,11 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 	if (rec.errlen != 0)
 		g_io_channel_write_block(pipe, (void *) errorstr, rec.errlen);
 	else {
-		if (rec.host4) {
-			len = strlen(rec.host4) + 1;
+		if (rec.host) {
+			len = strlen(rec.host) + 1;
 			g_io_channel_write_block(pipe, (void *) &len,
 						       sizeof(int));
-			g_io_channel_write_block(pipe, (void *) rec.host4,
-						       len);
-		}
-		if (rec.host6) {
-			len = strlen(rec.host6) + 1;
-			g_io_channel_write_block(pipe, (void *) &len,
-						       sizeof(int));
-			g_io_channel_write_block(pipe, (void *) rec.host6,
+			g_io_channel_write_block(pipe, (void *) rec.host,
 						       len);
 		}
 	}
@@ -154,8 +144,7 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 
 	rec->error = -1;
 	rec->errorstr = NULL;
-	rec->host4 = NULL;
-	rec->host6 = NULL;
+	rec->host = NULL;
 
 #ifndef WIN32
 	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
@@ -174,15 +163,10 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 		rec->errorstr = g_malloc0(rec->errlen+1);
                 g_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
 	} else {
-		if (rec->host4) {
+		if (rec->host) {
 			g_io_channel_read_block(pipe, &len, sizeof(int));
-			rec->host4 = g_malloc0(len);
-			g_io_channel_read_block(pipe, rec->host4, len);
-		}
-		if (rec->host6) {
-			g_io_channel_read_block(pipe, &len, sizeof(int));
-			rec->host6 = g_malloc0(len);
-			g_io_channel_read_block(pipe, rec->host6, len);
+			rec->host = g_malloc0(len);
+			g_io_channel_read_block(pipe, rec->host, len);
 		}
 	}
 
@@ -227,7 +211,6 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, GIOChannel *pipe)
 {
 	RESOLVED_IP_REC iprec;
 	GIOChannel *handle;
-	IPADDR *ip;
 
 	g_return_if_fail(rec != NULL);
 
@@ -241,9 +224,8 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, GIOChannel *pipe)
 	g_io_channel_shutdown(rec->pipes[1], TRUE, NULL);
 	g_io_channel_unref(rec->pipes[1]);
 
-	ip = iprec.ip4.family != 0 ? &iprec.ip4 : &iprec.ip6;
 	handle = iprec.error == -1 ? NULL :
-		net_connect_ip(ip, rec->port, rec->my_ip);
+		net_connect_ip(&iprec.ip, rec->port, rec->my_ip);
 
 	g_free_not_null(rec->my_ip);
 
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index af5968c8..581536b3 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -4,12 +4,12 @@
 #include "network.h"
 
 typedef struct {
-	IPADDR ip4, ip6; /* resolved ip addresses */
+	IPADDR ip; /* resolved ip address */
 	int error; /* error, 0 = no error, -1 = error: */
 	int errlen; /* error text length */
 	char *errorstr; /* error string - dynamically allocated, you'll
 	                   need to free() it yourself unless it's NULL */
-	char *host4, *host6; /* dito */
+	char *host; /* dito */
 } RESOLVED_IP_REC;
 
 typedef struct {
diff --git a/src/core/network.c b/src/core/network.c
index bfaa47fb..303483c6 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -137,35 +137,14 @@ static int sin_get_port(union sockaddr_union *so)
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
 {
-	IPADDR ip4, ip6, *ip;
+	IPADDR ip;
 
 	g_return_val_if_fail(addr != NULL, NULL);
 
-	if (net_gethostbyname(addr, &ip4, &ip6) == -1)
+	if (net_gethostbyname(addr, &ip) == -1)
 		return NULL;
 
-	if (my_ip == NULL) {
-                /* prefer IPv4 addresses */
-		ip = ip4.family != 0 ? &ip4 : &ip6;
-	} else if (IPADDR_IS_V6(my_ip)) {
-                /* my_ip is IPv6 address, use it if possible */
-		if (ip6.family != 0)
-			ip = &ip6;
-		else {
-			my_ip = NULL;
-                        ip = &ip4;
-		}
-	} else {
-                /* my_ip is IPv4 address, use it if possible */
-		if (ip4.family != 0)
-			ip = &ip4;
-		else {
-			my_ip = NULL;
-                        ip = &ip6;
-		}
-	}
-
-	return net_connect_ip(ip, port, my_ip);
+	return net_connect_ip(&ip, port, my_ip);
 }
 
 /* Connect to socket with ip address */
@@ -413,82 +392,35 @@ int net_getsockname(GIOChannel *handle, IPADDR *addr, int *port)
 /* Get IP addresses for host, both IPv4 and IPv6 if possible.
    If ip->family is 0, the address wasn't found.
    Returns 0 = ok, others = error code for net_gethosterror() */
-int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
+int net_gethostbyname(const char *addr, IPADDR *ip)
 {
-#ifdef HAVE_IPV6
 	union sockaddr_union *so;
-	struct addrinfo hints, *ai, *ailist;
-	int ret, count_v4, count_v6, use_v4, use_v6;
-#else
-	struct hostent *hp;
-	int count;
-#endif
+	struct addrinfo hints, *ailist;
+	int ret;
 
 	g_return_val_if_fail(addr != NULL, -1);
 
-	memset(ip4, 0, sizeof(IPADDR));
-	memset(ip6, 0, sizeof(IPADDR));
+	memset(ip, 0, sizeof(IPADDR));
 
-#ifdef HAVE_IPV6
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_socktype = SOCK_STREAM;
+#ifdef HAVE_IPV6
+	hints.ai_family = AF_UNSPEC;
+#else
+	hints.ai_family = AF_INET;
+#endif
+	hints.ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
 
 	/* save error to host_error for later use */
 	ret = getaddrinfo(addr, NULL, &hints, &ailist);
 	if (ret != 0)
 		return ret;
 
-	/* count IPs */
-        count_v4 = count_v6 = 0;
-	for (ai = ailist; ai != NULL; ai = ai->ai_next) {
-		if (ai->ai_family == AF_INET)
-			count_v4++;
-		else if (ai->ai_family == AF_INET6)
-			count_v6++;
-	}
-
-	if (count_v4 == 0 && count_v6 == 0)
-		return HOST_NOT_FOUND; /* shouldn't happen? */
-
-	/* if there are multiple addresses, return random one */
-	use_v4 = count_v4 <= 1 ? 0 : rand() % count_v4;
-	use_v6 = count_v6 <= 1 ? 0 : rand() % count_v6;
-
-	count_v4 = count_v6 = 0;
-	for (ai = ailist; ai != NULL; ai = ai->ai_next) {
-		so = (union sockaddr_union *) ai->ai_addr;
-
-		if (ai->ai_family == AF_INET) {
-			if (use_v4 == count_v4)
-				sin_get_ip(so, ip4);
-                        count_v4++;
-		} else if (ai->ai_family == AF_INET6) {
-			if (use_v6 == count_v6)
-				sin_get_ip(so, ip6);
-			count_v6++;
-		}
-	}
+	so = (const union sockaddr_union *)ailist->ai_addr;
+	sin_get_ip(so, ip);
 	freeaddrinfo(ailist);
-	return 0;
-#else
-	hp = gethostbyname(addr);
-	if (hp == NULL)
-		return h_errno;
-
-	/* count IPs */
-	count = 0;
-	while (hp->h_addr_list[count] != NULL)
-		count++;
-
-	if (count == 0)
-		return HOST_NOT_FOUND; /* shouldn't happen? */
-
-	/* if there are multiple addresses, return random one */
-	ip4->family = AF_INET;
-	memcpy(&ip4->ip, hp->h_addr_list[rand() % count], 4);
 
 	return 0;
-#endif
 }
 
 /* Get name for host, *name should be g_free()'d unless it's NULL.
diff --git a/src/core/network.h b/src/core/network.h
index fa7e9675..ea8b3055 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -71,7 +71,7 @@ int net_transmit(GIOChannel *handle, const char *data, int len);
 /* Get IP addresses for host, both IPv4 and IPv6 if possible.
    If ip->family is 0, the address wasn't found.
    Returns 0 = ok, others = error code for net_gethosterror() */
-int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
+int net_gethostbyname(const char *addr, IPADDR *ip);
 /* Get name for host, *name should be g_free()'d unless it's NULL.
    Return values are the same as with net_gethostbyname() */
 int net_gethostbyaddr(IPADDR *ip, char **name);
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 80c5761b..3f24e7d8 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -16,7 +16,7 @@ char *address;
 int port;
 char *chatnet;
 
-IPADDR *own_ip4, *own_ip6;
+IPADDR *own_ip;
 
 char *password;
 char *nick;
diff --git a/src/core/server-setup-rec.h b/src/core/server-setup-rec.h
index 2c9614c7..fbf49b2c 100644
--- a/src/core/server-setup-rec.h
+++ b/src/core/server-setup-rec.h
@@ -19,7 +19,7 @@ char *ssl_capath;
 char *ssl_ciphers;
 
 char *own_host; /* address to use when connecting this server */
-IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
+IPADDR *own_ip; /* resolved own_address if not NULL */
 
 time_t last_connect; /* to avoid reconnecting too fast.. */
 
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index ae97ecd2..3ba18ad0 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -177,13 +177,9 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->username = g_strdup(src->username);
 	dest->realname = g_strdup(src->realname);
 
-	if (src->own_ip4 != NULL) {
-		dest->own_ip4 = g_new(IPADDR, 1);
-		memcpy(dest->own_ip4, src->own_ip4, sizeof(IPADDR));
-	}
-	if (src->own_ip6 != NULL) {
-		dest->own_ip6 = g_new(IPADDR, 1);
-		memcpy(dest->own_ip6, src->own_ip6, sizeof(IPADDR));
+	if (src->own_ip != NULL) {
+		dest->own_ip = g_new(IPADDR, 1);
+		memcpy(dest->own_ip, src->own_ip, sizeof(IPADDR));
 	}
 
 	dest->channels = g_strdup(src->channels);
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 90a447d4..e8506f0f 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -33,32 +33,22 @@ GSList *setupservers;
 
 static char *old_source_host;
 int source_host_ok; /* Use source_host_ip .. */
-IPADDR *source_host_ip4, *source_host_ip6; /* Resolved address */
+IPADDR source_host_ip; /* Resolved address */
 
-static void save_ips(IPADDR *ip4, IPADDR *ip6,
-		     IPADDR **save_ip4, IPADDR **save_ip6)
+static void save_ips(IPADDR *ip, IPADDR **save_ip)
 {
-	if (ip4->family == 0)
-		g_free_and_null(*save_ip4);
+	if (ip->family == 0)
+		g_free_and_null(*save_ip);
 	else {
-                if (*save_ip4 == NULL)
-			*save_ip4 = g_new(IPADDR, 1);
-		memcpy(*save_ip4, ip4, sizeof(IPADDR));
-	}
-
-	if (ip6->family == 0)
-		g_free_and_null(*save_ip6);
-	else {
-                if (*save_ip6 == NULL)
-			*save_ip6 = g_new(IPADDR, 1);
-		memcpy(*save_ip6, ip6, sizeof(IPADDR));
+                if (*save_ip == NULL)
+			*save_ip = g_new(IPADDR, 1);
+		memcpy(*save_ip, ip, sizeof(IPADDR));
 	}
 }
 
 static void get_source_host_ip(void)
 {
         const char *hostname;
-	IPADDR ip4, ip6;
 
 	if (source_host_ok)
 		return;
@@ -66,28 +56,21 @@ static void get_source_host_ip(void)
 	/* FIXME: This will block! */
         hostname = settings_get_str("hostname");
 	source_host_ok = *hostname != '\0' &&
-		net_gethostbyname(hostname, &ip4, &ip6) == 0;
-
-	if (source_host_ok)
-		save_ips(&ip4, &ip6, &source_host_ip4, &source_host_ip6);
-	else {
-                g_free_and_null(source_host_ip4);
-                g_free_and_null(source_host_ip6);
-	}
+		net_gethostbyname(hostname, &source_host_ip) == 0;
 }
 
 static void conn_set_ip(SERVER_CONNECT_REC *conn, const char *own_host,
-			IPADDR **own_ip4, IPADDR **own_ip6)
+			IPADDR **own_ip)
 {
-	IPADDR ip4, ip6;
+	IPADDR ip;
 
-	if (*own_ip4 == NULL && *own_ip6 == NULL) {
+	if (*own_ip == NULL) {
 		/* resolve the IP */
-		if (net_gethostbyname(own_host, &ip4, &ip6) == 0)
-                        save_ips(&ip4, &ip6, own_ip4, own_ip6);
+		if (net_gethostbyname(own_host, &ip) == 0)
+                        save_ips(&ip, own_ip);
 	}
 
-	server_connect_own_ip_save(conn, *own_ip4, *own_ip6);
+	server_connect_own_ip_save(conn, *own_ip);
 }
 
 /* Fill information to connection from server setup record */
@@ -98,8 +81,7 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn,
 	g_return_if_fail(IS_SERVER_SETUP(sserver));
 
 	if (sserver->own_host != NULL) {
-		conn_set_ip(conn, sserver->own_host,
-			    &sserver->own_ip4, &sserver->own_ip6);
+		conn_set_ip(conn, sserver->own_host, &sserver->own_ip);
 	}
 
 	if (sserver->chatnet != NULL && conn->chatnet == NULL)
@@ -139,13 +121,9 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
 	}
 
 	/* source IP */
-	if (source_host_ip4 != NULL) {
-		conn->own_ip4 = g_new(IPADDR, 1);
-		memcpy(conn->own_ip4, source_host_ip4, sizeof(IPADDR));
-	}
-	if (source_host_ip6 != NULL) {
-		conn->own_ip6 = g_new(IPADDR, 1);
-		memcpy(conn->own_ip6, source_host_ip6, sizeof(IPADDR));
+	if (source_host_ok) {
+		conn->own_ip = g_new(IPADDR, 1);
+		memcpy(conn->own_ip, &source_host_ip, sizeof(IPADDR));
 	}
 
 	signal_emit("server setup fill connect", 1, conn);
@@ -206,8 +184,7 @@ static void server_setup_fill_chatnet(SERVER_CONNECT_REC *conn,
 		conn->realname = g_strdup(chatnet->realname);;
 	}
 	if (chatnet->own_host != NULL) {
-		conn_set_ip(conn, chatnet->own_host,
-			    &chatnet->own_ip4, &chatnet->own_ip6);
+		conn_set_ip(conn, chatnet->own_host, &chatnet->own_ip);
 	}
 
 	signal_emit("server setup fill chatnet", 2, conn, chatnet);
@@ -481,8 +458,7 @@ static void server_setup_destroy(SERVER_SETUP_REC *rec)
 	signal_emit("server setup destroyed", 1, rec);
 
 	g_free_not_null(rec->own_host);
-	g_free_not_null(rec->own_ip4);
-	g_free_not_null(rec->own_ip6);
+	g_free_not_null(rec->own_ip);
 	g_free_not_null(rec->chatnet);
 	g_free_not_null(rec->password);
 	g_free_not_null(rec->ssl_cert);
@@ -556,7 +532,6 @@ void servers_setup_init(void)
 	settings_add_str("proxy", "proxy_password", "");
 
         setupservers = NULL;
-	source_host_ip4 = source_host_ip6 = NULL;
         old_source_host = NULL;
 	read_settings();
 
@@ -567,8 +542,6 @@ void servers_setup_init(void)
 
 void servers_setup_deinit(void)
 {
-	g_free_not_null(source_host_ip4);
-	g_free_not_null(source_host_ip6);
 	g_free_not_null(old_source_host);
 
 	while (setupservers != NULL)
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index f7601a68..c4878094 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -16,7 +16,7 @@ struct _SERVER_SETUP_REC {
 
 extern GSList *setupservers;
 
-extern IPADDR *source_host_ip4, *source_host_ip6; /* Resolved address */
+extern IPADDR source_host_ip; /* Resolved address */
 extern int source_host_ok; /* Use source_host_ip .. */
 
 /* Fill reconnection specific information to connection
diff --git a/src/core/servers.c b/src/core/servers.c
index 3342304e..e18f8d9c 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -218,7 +218,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		return;
 
 	if (ip != NULL) {
-		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
+		own_ip = server->connrec->own_ip;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
 		handle = server->connrec->use_ssl ?
@@ -280,30 +280,15 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 	server->connect_pipe[0] = NULL;
 	server->connect_pipe[1] = NULL;
 
-	/* figure out if we should use IPv4 or v6 address */
-	if (iprec.error != 0) {
-                /* error */
-		ip = NULL;
-	} else if (server->connrec->family == AF_INET) {
-		/* force IPv4 connection */
-		ip = iprec.ip4.family == 0 ? NULL : &iprec.ip4;
-		servername = iprec.host4;
-	} else if (server->connrec->family == AF_INET6) {
-		/* force IPv6 connection */
-		ip = iprec.ip6.family == 0 ? NULL : &iprec.ip6;
-		servername = iprec.host6;
-	} else {
-		/* pick the one that was found, or if both do it like
-		   /SET resolve_prefer_ipv6 says. */
-		if (iprec.ip4.family == 0 ||
-		    (iprec.ip6.family != 0 &&
-		     settings_get_bool("resolve_prefer_ipv6"))) {
-			ip = &iprec.ip6;
-			servername = iprec.host6;
-		} else {
-			ip = &iprec.ip4;
-			servername = iprec.host4;
-		}
+	ip = NULL;
+
+	if (iprec.error == 0) {
+	    // FIXME : REMOVE THIS BEFORE MERGE
+	    if (server->connrec->family)
+		g_assert(server->connrec->family == iprec.ip.family);
+
+	    ip = &iprec.ip;
+	    servername = iprec.host;
 	}
 
 	if (ip != NULL) {
@@ -337,8 +322,7 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 	}
 
 	g_free(iprec.errorstr);
-	g_free(iprec.host4);
-	g_free(iprec.host6);
+	g_free(iprec.host);
 }
 
 SERVER_REC *server_connect(SERVER_CONNECT_REC *conn)
@@ -623,8 +607,7 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->address);
 	g_free_not_null(conn->chatnet);
 
-	g_free_not_null(conn->own_ip4);
-	g_free_not_null(conn->own_ip6);
+	g_free_not_null(conn->own_ip);
 
         g_free_not_null(conn->password);
         g_free_not_null(conn->nick);
@@ -654,26 +637,15 @@ void server_change_nick(SERVER_REC *server, const char *nick)
 }
 
 /* Update own IPv4 and IPv6 records */
-void server_connect_own_ip_save(SERVER_CONNECT_REC *conn,
-				IPADDR *ip4, IPADDR *ip6)
+void server_connect_own_ip_save(SERVER_CONNECT_REC *conn, IPADDR *ip)
 {
-	if (ip4 == NULL || ip4->family == 0)
-		g_free_and_null(conn->own_ip4);
-	if (ip6 == NULL || ip6->family == 0)
-		g_free_and_null(conn->own_ip6);
+	if (ip == NULL || ip->family == 0)
+		g_free_and_null(conn->own_ip);
 
-	if (ip4 != NULL && ip4->family != 0) {
-		/* IPv4 address was found */
-		if (conn->own_ip4 == NULL)
-			conn->own_ip4 = g_new0(IPADDR, 1);
-		memcpy(conn->own_ip4, ip4, sizeof(IPADDR));
-	}
-
-	if (ip6 != NULL && ip6->family != 0) {
-		/* IPv6 address was found */
-		if (conn->own_ip6 == NULL)
-			conn->own_ip6 = g_new0(IPADDR, 1);
-		memcpy(conn->own_ip6, ip6, sizeof(IPADDR));
+	if (ip != NULL && ip->family != 0) {
+		if (conn->own_ip == NULL)
+			conn->own_ip = g_new0(IPADDR, 1);
+		memcpy(conn->own_ip, ip, sizeof(IPADDR));
 	}
 }
 
diff --git a/src/core/servers.h b/src/core/servers.h
index f39c650b..314faa32 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -67,8 +67,7 @@ void server_connect_failed(SERVER_REC *server, const char *msg);
 void server_change_nick(SERVER_REC *server, const char *nick);
 
 /* Update own IPv4 and IPv6 records */
-void server_connect_own_ip_save(SERVER_CONNECT_REC *conn,
-				IPADDR *ip4, IPADDR *ip6);
+void server_connect_own_ip_save(SERVER_CONNECT_REC *conn, IPADDR *ip);
 
 /* `optlist' should contain only one unknown key - the server tag.
    returns NULL if there was unknown -option */
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 429e6dac..f8558ad1 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -138,7 +138,7 @@ static void cmd_server_add(const char *data)
 		if (*password != '\0') g_free_and_null(rec->password);
 		if (g_hash_table_lookup(optlist, "host")) {
 			g_free_and_null(rec->own_host);
-			rec->own_ip4 = rec->own_ip6 = NULL;
+			rec->own_ip = NULL;
 		}
 	}
 
@@ -193,7 +193,7 @@ static void cmd_server_add(const char *data)
 	value = g_hash_table_lookup(optlist, "host");
 	if (value != NULL && *value != '\0') {
 		rec->own_host = g_strdup(value);
-		rec->own_ip4 = rec->own_ip6 = NULL;
+		rec->own_ip = NULL;
 	}
 
 	signal_emit("server add fill", 2, rec, optlist);
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 6618edd7..4071f367 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -108,7 +108,7 @@ static void cmd_network_add(const char *data)
 		if (g_hash_table_lookup(optlist, "realname")) g_free_and_null(rec->realname);
 		if (g_hash_table_lookup(optlist, "host")) {
 			g_free_and_null(rec->own_host);
-                        rec->own_ip4 = rec->own_ip6 = NULL;
+                        rec->own_ip = NULL;
 		}
 		if (g_hash_table_lookup(optlist, "usermode")) g_free_and_null(rec->usermode);
 		if (g_hash_table_lookup(optlist, "autosendcmd")) g_free_and_null(rec->autosendcmd);
@@ -140,7 +140,7 @@ static void cmd_network_add(const char *data)
 	value = g_hash_table_lookup(optlist, "host");
 	if (value != NULL && *value != '\0') {
 		rec->own_host = g_strdup(value);
-		rec->own_ip4 = rec->own_ip6 = NULL;
+		rec->own_ip = NULL;
 	}
 
 	value = g_hash_table_lookup(optlist, "usermode");
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 17f6c477..7fef2ae5 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -264,12 +264,12 @@ GIOChannel *dcc_connect_ip(IPADDR *ip, int port)
 	}
 
 	if (own_ip == NULL)
-		own_ip = IPADDR_IS_V6(ip) ? source_host_ip6 : source_host_ip4;
+		own_ip = &source_host_ip;
 
 	handle = net_connect_ip(ip, port, own_ip);
 	if (handle == NULL && errno == EADDRNOTAVAIL && own_ip != NULL) {
 		/* dcc_own_ip is external address */
-		own_ip = IPADDR_IS_V6(ip) ? source_host_ip6 : source_host_ip4;
+		own_ip = &source_host_ip;
 		handle = net_connect_ip(ip, port, own_ip);
 	}
 	return handle;
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index dcc94e6b..16950c79 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -585,7 +585,7 @@ static LISTEN_REC *find_listen(const char *ircnet, int port)
 static void add_listen(const char *ircnet, int port)
 {
 	LISTEN_REC *rec;
-	IPADDR ip4, ip6, *my_ip;
+	IPADDR ip, *my_ip;
 
 	if (port <= 0 || *ircnet == '\0')
 		return;
@@ -593,16 +593,13 @@ static void add_listen(const char *ircnet, int port)
 	/* bind to specific host/ip? */
 	my_ip = NULL;
 	if (*settings_get_str("irssiproxy_bind") != '\0') {
-		if (net_gethostbyname(settings_get_str("irssiproxy_bind"),
-				      &ip4, &ip6) != 0) {
+		if (net_gethostbyname(settings_get_str("irssiproxy_bind"), &ip) != 0) {
 			printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
 				  "Proxy: can not resolve '%s' - aborting",
 				  settings_get_str("irssiproxy_bind"));
 			return;
 		}
-
-		my_ip = ip6.family == 0 ? &ip4 : ip4.family == 0 ||
-			settings_get_bool("resolve_prefer_ipv6") ? &ip6 : &ip4;
+		my_ip = &ip;
 	}
 
 	rec = g_new0(LISTEN_REC, 1);

From 564829610de20f75ec667f1943524c3a49b9ea3f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 21 Sep 2015 14:38:10 +0200
Subject: [PATCH 0134/1650] Ding dong the switch is dead

---
 docs/help/in/toggle.in | 2 +-
 docs/manual.txt        | 3 ---
 src/core/servers.c     | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/help/in/toggle.in b/docs/help/in/toggle.in
index f87a6462..71f5c8f4 100644
--- a/docs/help/in/toggle.in
+++ b/docs/help/in/toggle.in
@@ -15,7 +15,7 @@
 
 %9Examples:%9
 
-    /TOGGLE resolve_prefer_ipv6
+    /TOGGLE resolve_reverse_lookup
     /TOGGLE channels_rejoin_unavailable ON
 
 %9See also:%9 SET
diff --git a/docs/manual.txt b/docs/manual.txt
index b2d0de14..12d8031e 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -429,9 +429,6 @@
 	After connected to server, Irssi can automatically change your user
 	mode. You can set it with /SET usermode <mode>, default is +i.
 
-	/SET resolve_prefer_ipv6 - If ON, prefer IPv6 for hosts that
-	     have both v4 and v6 addresses.
-
  5.5 Automatic reconnecting
 
 	If you get disconnected from server, Irssi will try to reconnect
diff --git a/src/core/servers.c b/src/core/servers.c
index e18f8d9c..66060a7f 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -710,7 +710,6 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto)
 
 void servers_init(void)
 {
-	settings_add_bool("server", "resolve_prefer_ipv6", FALSE);
 	settings_add_bool("server", "resolve_reverse_lookup", FALSE);
 	lookup_servers = servers = NULL;
 

From f39723f6510bf57c5d21d62d55be6eefb6305078 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 17 Sep 2015 00:55:31 -0300
Subject: [PATCH 0135/1650] Fix FS#905, mangled text when pasted line length
 exceeds 400

http://bugs.irssi.org/index.php?do=details&task_id=905

Not using the patch from that ticket, the issue turned out to be that
(dest - last_lf_pos) returned number of unichr, not bytes, so that's 4
times less than what the size parameter of memmove() should be.
---
 src/fe-text/gui-readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index edc4c55d..ec61e317 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -237,7 +237,7 @@ static void paste_buffer_join_lines(GArray *buf)
 			last_lf = FALSE;
 			if (++line_len >= 400 && last_lf_pos != NULL) {
 				memmove(last_lf_pos+1, last_lf_pos,
-					dest - last_lf_pos);
+					(dest - last_lf_pos) * sizeof(unichar));
 				*last_lf_pos = '\n'; last_lf_pos = NULL;
 				line_len = 0;
 				dest++;

From 0823289fd9c6a2eec7ff04581426856d1dbb15e5 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 21 Sep 2015 22:53:53 -0300
Subject: [PATCH 0136/1650] Limit recursion depth of key/combo expansion in
 key_states_scan()

Fixes FS#817 - "SegFault when executing bind command", which provides
the test case "/bind cleft key meta", which is stupid but now it doesn't
break things.

The limit of 100 is arbitrary, it means roughly 140 stack frames total.
The flyspray ticket mentions it crashes at 512, in my system it goes all
the way to 149677 stack frames.

http://bugs.irssi.org/index.php?do=details&task_id=817
---
 src/fe-common/core/keyboard.c | 37 ++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index f138d4e2..fed7f9cb 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -31,6 +31,8 @@
 #include "fe-windows.h"
 #include "printtext.h"
 
+#define MAX_EXPAND_RECURSION 100
+
 GSList *keyinfos;
 static GHashTable *keys, *default_keys;
 
@@ -171,7 +173,7 @@ KEYINFO_REC *key_info_find(const char *id)
 	return NULL;
 }
 
-static int expand_key(const char *key, GSList **out);
+static int expand_key(const char *key, GSList **out, int *limit);
 
 #define expand_out_char(out, c) \
 	{ \
@@ -188,13 +190,17 @@ static int expand_key(const char *key, GSList **out);
 	  g_slist_free(out); out = NULL; \
 	}
 
-static int expand_combo(const char *start, const char *end, GSList **out)
+static int expand_combo(const char *start, const char *end, GSList **out, int *limit)
 {
         KEY_REC *rec;
 	KEYINFO_REC *info;
         GSList *tmp, *tmp2, *list, *copy, *newout;
 	char *str, *p;
 
+	if ((*limit)-- < 0) {
+		return FALSE;
+	}
+
 	if (start == end) {
 		/* single key */
 		expand_out_char(*out, *start);
@@ -229,7 +235,7 @@ static int expand_combo(const char *start, const char *end, GSList **out)
                 /* only one way to generate the combo, good */
                 rec = list->data;
 		g_slist_free(list);
-		return expand_key(rec->key, out);
+		return expand_key(rec->key, out, limit);
 	}
 
 	/* multiple ways to generate the combo -
@@ -244,7 +250,11 @@ static int expand_combo(const char *start, const char *end, GSList **out)
                         copy = g_slist_append(copy, g_string_new(str->str));
 		}
 
-		if (!expand_key(rec->key, &copy)) {
+		if (!expand_key(rec->key, &copy, limit)) {
+			if (*limit < 0) {
+				return FALSE;
+			}
+
 			/* illegal key combo, remove from list */
                         expand_out_free(copy);
 		} else {
@@ -254,7 +264,11 @@ static int expand_combo(const char *start, const char *end, GSList **out)
 
         rec = list->data;
 	g_slist_free(list);
-	if (!expand_key(rec->key, out)) {
+	if (!expand_key(rec->key, out, limit)) {
+		if (*limit < 0) {
+			return FALSE;
+		}
+
 		/* illegal key combo, remove from list */
 		expand_out_free(*out);
 	}
@@ -264,12 +278,16 @@ static int expand_combo(const char *start, const char *end, GSList **out)
 }
 
 /* Expand key code - returns TRUE if successful. */
-static int expand_key(const char *key, GSList **out)
+static int expand_key(const char *key, GSList **out, int *limit)
 {
 	GSList *tmp;
 	const char *start;
 	int last_hyphen;
 
+	if ((*limit)-- < 0) {
+		return FALSE;
+	}
+
 	/* meta-^W^Gf -> ^[-^W-^G-f */
         start = NULL; last_hyphen = TRUE;
 	for (; *key != '\0'; key++) {
@@ -279,7 +297,7 @@ static int expand_key(const char *key, GSList **out)
 				continue;
 			}
 
-			if (!expand_combo(start, key-1, out))
+			if (!expand_combo(start, key-1, out, limit))
                                 return FALSE;
 			expand_out_char(*out, '-');
                         start = NULL;
@@ -332,7 +350,7 @@ static int expand_key(const char *key, GSList **out)
 	}
 
 	if (start != NULL)
-		return expand_combo(start, key-1, out);
+		return expand_combo(start, key-1, out, limit);
 
 	for (tmp = *out; tmp != NULL; tmp = tmp->next) {
 		GString *str = tmp->data;
@@ -346,12 +364,13 @@ static int expand_key(const char *key, GSList **out)
 static void key_states_scan_key(const char *key, KEY_REC *rec)
 {
 	GSList *tmp, *out;
+	int limit = MAX_EXPAND_RECURSION;
 
 	if (g_strcmp0(rec->info->id, "key") == 0)
 		return;
 
         out = g_slist_append(NULL, g_string_new(NULL));
-	if (expand_key(key, &out)) {
+	if (expand_key(key, &out, &limit)) {
 		for (tmp = out; tmp != NULL; tmp = tmp->next) {
 			GString *str = tmp->data;
 

From bf36f71b99b18401dbc6105509b0285146b37286 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Tue, 22 Sep 2015 00:01:04 -0300
Subject: [PATCH 0137/1650] Fix #291, "/msg +#channel incorrectly shows up as
 Nick:@#channel"

Just passing the full target to the "message irc op_public" signal
handler and letting it do the cleanup.

The fe_channel_skip_prefix() call in event_privmsg() is kept because
recode_in() needs a real channel name, but

There was similar code in sig_message_own_wall(), but that one is
correct - the /wall command always sends NOTICE @#chan, so I added a
comment down there to make it clear.
---
 src/fe-common/irc/fe-events.c       | 10 ++++++----
 src/fe-common/irc/fe-irc-messages.c | 22 +++++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 3a01b9eb..850174c5 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -56,11 +56,13 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 
 	if (fe_channel_is_opchannel(server, target)) {
 		/* Hybrid 6 feature, send msg to all ops in channel */
-		target = (char *)fe_channel_skip_prefix(server, target);
-		recoded = recode_in(SERVER(server), msg, target);
+		const char *cleantarget = fe_channel_skip_prefix(server, target);
+		recoded = recode_in(SERVER(server), msg, cleantarget);
+
+		/* pass the original target to the signal, with the @+ here
+		 * the other one is only needed for recode_in*/
 		signal_emit("message irc op_public", 5,
-			    server, recoded, nick, addr,
-			    get_visible_target(server, target));
+			    server, recoded, nick, addr, target);
 	} else {
 		recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick);
 		signal_emit(server_ischannel(SERVER(server), target) ?
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 11d158af..110fb29a 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -37,6 +37,7 @@
 #include "fe-queries.h"
 #include "window-items.h"
 #include "fe-irc-channels.h"
+#include "fe-irc-server.h"
 
 static void sig_message_own_public(SERVER_REC *server, const char *msg,
 				   const char *target, const char *origtarget)
@@ -70,18 +71,28 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 				      const char *nick, const char *address,
 				      const char *target)
 {
-	char *nickmode, *optarget;
+	char *nickmode, *optarget, *prefix;
+	const char *cleantarget;
+
+	/* only skip here so the difference can be stored in prefix */
+	cleantarget = fe_channel_skip_prefix(IRC_SERVER(server), target);
+	prefix = g_strndup(target, cleantarget - target);
+
+	/* and clean the rest here */
+	cleantarget = get_visible_target(IRC_SERVER(server), cleantarget);
 
 	nickmode = channel_get_nickmode(channel_find(server, target),
 					nick);
 
-        optarget = g_strconcat("@", target, NULL);
-	printformat_module("fe-common/core", server, target,
+	optarget = g_strconcat(prefix, cleantarget, NULL);
+
+	printformat_module("fe-common/core", server, cleantarget,
 			   MSGLEVEL_PUBLIC,
 			   TXT_PUBMSG_CHANNEL,
 			   nick, optarget, msg, nickmode);
 	g_free(nickmode);
-        g_free(optarget);
+	g_free(optarget);
+	g_free(prefix);
 }
 
 static void sig_message_own_wall(SERVER_REC *server, const char *msg,
@@ -92,7 +103,8 @@ static void sig_message_own_wall(SERVER_REC *server, const char *msg,
 	nickmode = channel_get_nickmode(channel_find(server, target),
 					server->nick);
 
-        optarget = g_strconcat("@", target, NULL);
+	/* this is always @, skip_prefix is not needed here */
+	optarget = g_strconcat("@", target, NULL);
 	printformat_module("fe-common/core", server, target,
 			   MSGLEVEL_PUBLIC | MSGLEVEL_NOHILIGHT |
 			   MSGLEVEL_NO_ACT,

From 99f074b0db2d723c3a1ddbdc5226f54f24b01989 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Tue, 22 Sep 2015 01:17:15 -0300
Subject: [PATCH 0138/1650] fe_channel_skip_prefix: fix return value
 (FALSE/NULL isn't valid)

The return value is a char*, and here it was false which is 0 which is
more or less the same as null.

That could have been a crash somewhere, the functions that call this
don't expect null ever.
---
 src/fe-common/irc/fe-irc-channels.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index d5f17bd0..a2737fc3 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -56,7 +56,7 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
 
 	/* Exit early if target doesn't name a channel */
 	if (server_ischannel(SERVER(server), target) == FALSE)
-		return FALSE;
+		return target;
 
 	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
 

From f5f3d7cc98f24799f562e8d3126ea1c2786a6547 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Sep 2015 21:59:17 +0200
Subject: [PATCH 0139/1650] Revert "Network and IPv{4,6} related changes"

---
 docs/help/in/toggle.in         |  2 +-
 docs/manual.txt                |  3 ++
 src/core/chat-commands.c       |  6 +--
 src/core/chatnet-rec.h         |  2 +-
 src/core/net-nonblock.c        | 38 +++++++++----
 src/core/net-nonblock.h        |  4 +-
 src/core/network.c             | 98 ++++++++++++++++++++++++++++------
 src/core/network.h             |  2 +-
 src/core/server-connect-rec.h  |  2 +-
 src/core/server-setup-rec.h    |  2 +-
 src/core/servers-reconnect.c   | 10 ++--
 src/core/servers-setup.c       | 67 ++++++++++++++++-------
 src/core/servers-setup.h       |  2 +-
 src/core/servers.c             | 67 ++++++++++++++++-------
 src/core/servers.h             |  3 +-
 src/fe-common/core/fe-server.c |  4 +-
 src/fe-common/irc/fe-ircnet.c  |  4 +-
 src/irc/dcc/dcc.c              |  4 +-
 src/irc/proxy/listen.c         |  9 ++--
 19 files changed, 241 insertions(+), 88 deletions(-)

diff --git a/docs/help/in/toggle.in b/docs/help/in/toggle.in
index 71f5c8f4..f87a6462 100644
--- a/docs/help/in/toggle.in
+++ b/docs/help/in/toggle.in
@@ -15,7 +15,7 @@
 
 %9Examples:%9
 
-    /TOGGLE resolve_reverse_lookup
+    /TOGGLE resolve_prefer_ipv6
     /TOGGLE channels_rejoin_unavailable ON
 
 %9See also:%9 SET
diff --git a/docs/manual.txt b/docs/manual.txt
index 12d8031e..b2d0de14 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -429,6 +429,9 @@
 	After connected to server, Irssi can automatically change your user
 	mode. You can set it with /SET usermode <mode>, default is +i.
 
+	/SET resolve_prefer_ipv6 - If ON, prefer IPv6 for hosts that
+	     have both v4 and v6 addresses.
+
  5.5 Automatic reconnecting
 
 	If you get disconnected from server, Irssi will try to reconnect
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 9c28a1fc..8e881679 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -128,10 +128,10 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 
         host = g_hash_table_lookup(optlist, "host");
 	if (host != NULL && *host != '\0') {
-		IPADDR ip;
+		IPADDR ip4, ip6;
 
-		if (net_gethostbyname(host, &ip) == 0)
-                        server_connect_own_ip_save(conn, &ip);
+		if (net_gethostbyname(host, &ip4, &ip6) == 0)
+                        server_connect_own_ip_save(conn, &ip4, &ip6);
 	}
 
 	cmd_params_free(free_arg);
diff --git a/src/core/chatnet-rec.h b/src/core/chatnet-rec.h
index 3044643a..e3ed8aa0 100644
--- a/src/core/chatnet-rec.h
+++ b/src/core/chatnet-rec.h
@@ -9,4 +9,4 @@ char *realname;
 
 char *own_host; /* address to use when connecting this server */
 char *autosendcmd; /* command to send after connecting to this ircnet */
-IPADDR *own_ip; /* resolved own_address if not NULL */
+IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index bc8c4b96..e637e673 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -103,12 +103,15 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 	srand(time(NULL));
 
         memset(&rec, 0, sizeof(rec));
-	rec.error = net_gethostbyname(addr, &rec.ip);
+	rec.error = net_gethostbyname(addr, &rec.ip4, &rec.ip6);
 	if (rec.error == 0) {
 		errorstr = NULL;
 		if (reverse_lookup) {
 			/* reverse lookup the IP, ignore any error */
-			net_gethostbyaddr(&rec.ip, &rec.host);
+			if (rec.ip4.family != 0)
+				net_gethostbyaddr(&rec.ip4, &rec.host4);
+			if (rec.ip6.family != 0)
+				net_gethostbyaddr(&rec.ip6, &rec.host6);
 		}
 	} else {
 		errorstr = net_gethosterror(rec.error);
@@ -119,11 +122,18 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 	if (rec.errlen != 0)
 		g_io_channel_write_block(pipe, (void *) errorstr, rec.errlen);
 	else {
-		if (rec.host) {
-			len = strlen(rec.host) + 1;
+		if (rec.host4) {
+			len = strlen(rec.host4) + 1;
 			g_io_channel_write_block(pipe, (void *) &len,
 						       sizeof(int));
-			g_io_channel_write_block(pipe, (void *) rec.host,
+			g_io_channel_write_block(pipe, (void *) rec.host4,
+						       len);
+		}
+		if (rec.host6) {
+			len = strlen(rec.host6) + 1;
+			g_io_channel_write_block(pipe, (void *) &len,
+						       sizeof(int));
+			g_io_channel_write_block(pipe, (void *) rec.host6,
 						       len);
 		}
 	}
@@ -144,7 +154,8 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 
 	rec->error = -1;
 	rec->errorstr = NULL;
-	rec->host = NULL;
+	rec->host4 = NULL;
+	rec->host6 = NULL;
 
 #ifndef WIN32
 	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
@@ -163,10 +174,15 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 		rec->errorstr = g_malloc0(rec->errlen+1);
                 g_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
 	} else {
-		if (rec->host) {
+		if (rec->host4) {
 			g_io_channel_read_block(pipe, &len, sizeof(int));
-			rec->host = g_malloc0(len);
-			g_io_channel_read_block(pipe, rec->host, len);
+			rec->host4 = g_malloc0(len);
+			g_io_channel_read_block(pipe, rec->host4, len);
+		}
+		if (rec->host6) {
+			g_io_channel_read_block(pipe, &len, sizeof(int));
+			rec->host6 = g_malloc0(len);
+			g_io_channel_read_block(pipe, rec->host6, len);
 		}
 	}
 
@@ -211,6 +227,7 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, GIOChannel *pipe)
 {
 	RESOLVED_IP_REC iprec;
 	GIOChannel *handle;
+	IPADDR *ip;
 
 	g_return_if_fail(rec != NULL);
 
@@ -224,8 +241,9 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, GIOChannel *pipe)
 	g_io_channel_shutdown(rec->pipes[1], TRUE, NULL);
 	g_io_channel_unref(rec->pipes[1]);
 
+	ip = iprec.ip4.family != 0 ? &iprec.ip4 : &iprec.ip6;
 	handle = iprec.error == -1 ? NULL :
-		net_connect_ip(&iprec.ip, rec->port, rec->my_ip);
+		net_connect_ip(ip, rec->port, rec->my_ip);
 
 	g_free_not_null(rec->my_ip);
 
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 581536b3..af5968c8 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -4,12 +4,12 @@
 #include "network.h"
 
 typedef struct {
-	IPADDR ip; /* resolved ip address */
+	IPADDR ip4, ip6; /* resolved ip addresses */
 	int error; /* error, 0 = no error, -1 = error: */
 	int errlen; /* error text length */
 	char *errorstr; /* error string - dynamically allocated, you'll
 	                   need to free() it yourself unless it's NULL */
-	char *host; /* dito */
+	char *host4, *host6; /* dito */
 } RESOLVED_IP_REC;
 
 typedef struct {
diff --git a/src/core/network.c b/src/core/network.c
index 303483c6..bfaa47fb 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -137,14 +137,35 @@ static int sin_get_port(union sockaddr_union *so)
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
 {
-	IPADDR ip;
+	IPADDR ip4, ip6, *ip;
 
 	g_return_val_if_fail(addr != NULL, NULL);
 
-	if (net_gethostbyname(addr, &ip) == -1)
+	if (net_gethostbyname(addr, &ip4, &ip6) == -1)
 		return NULL;
 
-	return net_connect_ip(&ip, port, my_ip);
+	if (my_ip == NULL) {
+                /* prefer IPv4 addresses */
+		ip = ip4.family != 0 ? &ip4 : &ip6;
+	} else if (IPADDR_IS_V6(my_ip)) {
+                /* my_ip is IPv6 address, use it if possible */
+		if (ip6.family != 0)
+			ip = &ip6;
+		else {
+			my_ip = NULL;
+                        ip = &ip4;
+		}
+	} else {
+                /* my_ip is IPv4 address, use it if possible */
+		if (ip4.family != 0)
+			ip = &ip4;
+		else {
+			my_ip = NULL;
+                        ip = &ip6;
+		}
+	}
+
+	return net_connect_ip(ip, port, my_ip);
 }
 
 /* Connect to socket with ip address */
@@ -392,35 +413,82 @@ int net_getsockname(GIOChannel *handle, IPADDR *addr, int *port)
 /* Get IP addresses for host, both IPv4 and IPv6 if possible.
    If ip->family is 0, the address wasn't found.
    Returns 0 = ok, others = error code for net_gethosterror() */
-int net_gethostbyname(const char *addr, IPADDR *ip)
+int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 {
+#ifdef HAVE_IPV6
 	union sockaddr_union *so;
-	struct addrinfo hints, *ailist;
-	int ret;
+	struct addrinfo hints, *ai, *ailist;
+	int ret, count_v4, count_v6, use_v4, use_v6;
+#else
+	struct hostent *hp;
+	int count;
+#endif
 
 	g_return_val_if_fail(addr != NULL, -1);
 
-	memset(ip, 0, sizeof(IPADDR));
+	memset(ip4, 0, sizeof(IPADDR));
+	memset(ip6, 0, sizeof(IPADDR));
 
+#ifdef HAVE_IPV6
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_socktype = SOCK_STREAM;
-#ifdef HAVE_IPV6
-	hints.ai_family = AF_UNSPEC;
-#else
-	hints.ai_family = AF_INET;
-#endif
-	hints.ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
 
 	/* save error to host_error for later use */
 	ret = getaddrinfo(addr, NULL, &hints, &ailist);
 	if (ret != 0)
 		return ret;
 
-	so = (const union sockaddr_union *)ailist->ai_addr;
-	sin_get_ip(so, ip);
+	/* count IPs */
+        count_v4 = count_v6 = 0;
+	for (ai = ailist; ai != NULL; ai = ai->ai_next) {
+		if (ai->ai_family == AF_INET)
+			count_v4++;
+		else if (ai->ai_family == AF_INET6)
+			count_v6++;
+	}
+
+	if (count_v4 == 0 && count_v6 == 0)
+		return HOST_NOT_FOUND; /* shouldn't happen? */
+
+	/* if there are multiple addresses, return random one */
+	use_v4 = count_v4 <= 1 ? 0 : rand() % count_v4;
+	use_v6 = count_v6 <= 1 ? 0 : rand() % count_v6;
+
+	count_v4 = count_v6 = 0;
+	for (ai = ailist; ai != NULL; ai = ai->ai_next) {
+		so = (union sockaddr_union *) ai->ai_addr;
+
+		if (ai->ai_family == AF_INET) {
+			if (use_v4 == count_v4)
+				sin_get_ip(so, ip4);
+                        count_v4++;
+		} else if (ai->ai_family == AF_INET6) {
+			if (use_v6 == count_v6)
+				sin_get_ip(so, ip6);
+			count_v6++;
+		}
+	}
 	freeaddrinfo(ailist);
+	return 0;
+#else
+	hp = gethostbyname(addr);
+	if (hp == NULL)
+		return h_errno;
+
+	/* count IPs */
+	count = 0;
+	while (hp->h_addr_list[count] != NULL)
+		count++;
+
+	if (count == 0)
+		return HOST_NOT_FOUND; /* shouldn't happen? */
+
+	/* if there are multiple addresses, return random one */
+	ip4->family = AF_INET;
+	memcpy(&ip4->ip, hp->h_addr_list[rand() % count], 4);
 
 	return 0;
+#endif
 }
 
 /* Get name for host, *name should be g_free()'d unless it's NULL.
diff --git a/src/core/network.h b/src/core/network.h
index ea8b3055..fa7e9675 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -71,7 +71,7 @@ int net_transmit(GIOChannel *handle, const char *data, int len);
 /* Get IP addresses for host, both IPv4 and IPv6 if possible.
    If ip->family is 0, the address wasn't found.
    Returns 0 = ok, others = error code for net_gethosterror() */
-int net_gethostbyname(const char *addr, IPADDR *ip);
+int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
 /* Get name for host, *name should be g_free()'d unless it's NULL.
    Return values are the same as with net_gethostbyname() */
 int net_gethostbyaddr(IPADDR *ip, char **name);
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 3f24e7d8..80c5761b 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -16,7 +16,7 @@ char *address;
 int port;
 char *chatnet;
 
-IPADDR *own_ip;
+IPADDR *own_ip4, *own_ip6;
 
 char *password;
 char *nick;
diff --git a/src/core/server-setup-rec.h b/src/core/server-setup-rec.h
index fbf49b2c..2c9614c7 100644
--- a/src/core/server-setup-rec.h
+++ b/src/core/server-setup-rec.h
@@ -19,7 +19,7 @@ char *ssl_capath;
 char *ssl_ciphers;
 
 char *own_host; /* address to use when connecting this server */
-IPADDR *own_ip; /* resolved own_address if not NULL */
+IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
 
 time_t last_connect; /* to avoid reconnecting too fast.. */
 
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 3ba18ad0..ae97ecd2 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -177,9 +177,13 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->username = g_strdup(src->username);
 	dest->realname = g_strdup(src->realname);
 
-	if (src->own_ip != NULL) {
-		dest->own_ip = g_new(IPADDR, 1);
-		memcpy(dest->own_ip, src->own_ip, sizeof(IPADDR));
+	if (src->own_ip4 != NULL) {
+		dest->own_ip4 = g_new(IPADDR, 1);
+		memcpy(dest->own_ip4, src->own_ip4, sizeof(IPADDR));
+	}
+	if (src->own_ip6 != NULL) {
+		dest->own_ip6 = g_new(IPADDR, 1);
+		memcpy(dest->own_ip6, src->own_ip6, sizeof(IPADDR));
 	}
 
 	dest->channels = g_strdup(src->channels);
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index e8506f0f..90a447d4 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -33,22 +33,32 @@ GSList *setupservers;
 
 static char *old_source_host;
 int source_host_ok; /* Use source_host_ip .. */
-IPADDR source_host_ip; /* Resolved address */
+IPADDR *source_host_ip4, *source_host_ip6; /* Resolved address */
 
-static void save_ips(IPADDR *ip, IPADDR **save_ip)
+static void save_ips(IPADDR *ip4, IPADDR *ip6,
+		     IPADDR **save_ip4, IPADDR **save_ip6)
 {
-	if (ip->family == 0)
-		g_free_and_null(*save_ip);
+	if (ip4->family == 0)
+		g_free_and_null(*save_ip4);
 	else {
-                if (*save_ip == NULL)
-			*save_ip = g_new(IPADDR, 1);
-		memcpy(*save_ip, ip, sizeof(IPADDR));
+                if (*save_ip4 == NULL)
+			*save_ip4 = g_new(IPADDR, 1);
+		memcpy(*save_ip4, ip4, sizeof(IPADDR));
+	}
+
+	if (ip6->family == 0)
+		g_free_and_null(*save_ip6);
+	else {
+                if (*save_ip6 == NULL)
+			*save_ip6 = g_new(IPADDR, 1);
+		memcpy(*save_ip6, ip6, sizeof(IPADDR));
 	}
 }
 
 static void get_source_host_ip(void)
 {
         const char *hostname;
+	IPADDR ip4, ip6;
 
 	if (source_host_ok)
 		return;
@@ -56,21 +66,28 @@ static void get_source_host_ip(void)
 	/* FIXME: This will block! */
         hostname = settings_get_str("hostname");
 	source_host_ok = *hostname != '\0' &&
-		net_gethostbyname(hostname, &source_host_ip) == 0;
+		net_gethostbyname(hostname, &ip4, &ip6) == 0;
+
+	if (source_host_ok)
+		save_ips(&ip4, &ip6, &source_host_ip4, &source_host_ip6);
+	else {
+                g_free_and_null(source_host_ip4);
+                g_free_and_null(source_host_ip6);
+	}
 }
 
 static void conn_set_ip(SERVER_CONNECT_REC *conn, const char *own_host,
-			IPADDR **own_ip)
+			IPADDR **own_ip4, IPADDR **own_ip6)
 {
-	IPADDR ip;
+	IPADDR ip4, ip6;
 
-	if (*own_ip == NULL) {
+	if (*own_ip4 == NULL && *own_ip6 == NULL) {
 		/* resolve the IP */
-		if (net_gethostbyname(own_host, &ip) == 0)
-                        save_ips(&ip, own_ip);
+		if (net_gethostbyname(own_host, &ip4, &ip6) == 0)
+                        save_ips(&ip4, &ip6, own_ip4, own_ip6);
 	}
 
-	server_connect_own_ip_save(conn, *own_ip);
+	server_connect_own_ip_save(conn, *own_ip4, *own_ip6);
 }
 
 /* Fill information to connection from server setup record */
@@ -81,7 +98,8 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn,
 	g_return_if_fail(IS_SERVER_SETUP(sserver));
 
 	if (sserver->own_host != NULL) {
-		conn_set_ip(conn, sserver->own_host, &sserver->own_ip);
+		conn_set_ip(conn, sserver->own_host,
+			    &sserver->own_ip4, &sserver->own_ip6);
 	}
 
 	if (sserver->chatnet != NULL && conn->chatnet == NULL)
@@ -121,9 +139,13 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
 	}
 
 	/* source IP */
-	if (source_host_ok) {
-		conn->own_ip = g_new(IPADDR, 1);
-		memcpy(conn->own_ip, &source_host_ip, sizeof(IPADDR));
+	if (source_host_ip4 != NULL) {
+		conn->own_ip4 = g_new(IPADDR, 1);
+		memcpy(conn->own_ip4, source_host_ip4, sizeof(IPADDR));
+	}
+	if (source_host_ip6 != NULL) {
+		conn->own_ip6 = g_new(IPADDR, 1);
+		memcpy(conn->own_ip6, source_host_ip6, sizeof(IPADDR));
 	}
 
 	signal_emit("server setup fill connect", 1, conn);
@@ -184,7 +206,8 @@ static void server_setup_fill_chatnet(SERVER_CONNECT_REC *conn,
 		conn->realname = g_strdup(chatnet->realname);;
 	}
 	if (chatnet->own_host != NULL) {
-		conn_set_ip(conn, chatnet->own_host, &chatnet->own_ip);
+		conn_set_ip(conn, chatnet->own_host,
+			    &chatnet->own_ip4, &chatnet->own_ip6);
 	}
 
 	signal_emit("server setup fill chatnet", 2, conn, chatnet);
@@ -458,7 +481,8 @@ static void server_setup_destroy(SERVER_SETUP_REC *rec)
 	signal_emit("server setup destroyed", 1, rec);
 
 	g_free_not_null(rec->own_host);
-	g_free_not_null(rec->own_ip);
+	g_free_not_null(rec->own_ip4);
+	g_free_not_null(rec->own_ip6);
 	g_free_not_null(rec->chatnet);
 	g_free_not_null(rec->password);
 	g_free_not_null(rec->ssl_cert);
@@ -532,6 +556,7 @@ void servers_setup_init(void)
 	settings_add_str("proxy", "proxy_password", "");
 
         setupservers = NULL;
+	source_host_ip4 = source_host_ip6 = NULL;
         old_source_host = NULL;
 	read_settings();
 
@@ -542,6 +567,8 @@ void servers_setup_init(void)
 
 void servers_setup_deinit(void)
 {
+	g_free_not_null(source_host_ip4);
+	g_free_not_null(source_host_ip6);
 	g_free_not_null(old_source_host);
 
 	while (setupservers != NULL)
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index c4878094..f7601a68 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -16,7 +16,7 @@ struct _SERVER_SETUP_REC {
 
 extern GSList *setupservers;
 
-extern IPADDR source_host_ip; /* Resolved address */
+extern IPADDR *source_host_ip4, *source_host_ip6; /* Resolved address */
 extern int source_host_ok; /* Use source_host_ip .. */
 
 /* Fill reconnection specific information to connection
diff --git a/src/core/servers.c b/src/core/servers.c
index 66060a7f..3342304e 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -218,7 +218,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		return;
 
 	if (ip != NULL) {
-		own_ip = server->connrec->own_ip;
+		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
 		handle = server->connrec->use_ssl ?
@@ -280,15 +280,30 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 	server->connect_pipe[0] = NULL;
 	server->connect_pipe[1] = NULL;
 
-	ip = NULL;
-
-	if (iprec.error == 0) {
-	    // FIXME : REMOVE THIS BEFORE MERGE
-	    if (server->connrec->family)
-		g_assert(server->connrec->family == iprec.ip.family);
-
-	    ip = &iprec.ip;
-	    servername = iprec.host;
+	/* figure out if we should use IPv4 or v6 address */
+	if (iprec.error != 0) {
+                /* error */
+		ip = NULL;
+	} else if (server->connrec->family == AF_INET) {
+		/* force IPv4 connection */
+		ip = iprec.ip4.family == 0 ? NULL : &iprec.ip4;
+		servername = iprec.host4;
+	} else if (server->connrec->family == AF_INET6) {
+		/* force IPv6 connection */
+		ip = iprec.ip6.family == 0 ? NULL : &iprec.ip6;
+		servername = iprec.host6;
+	} else {
+		/* pick the one that was found, or if both do it like
+		   /SET resolve_prefer_ipv6 says. */
+		if (iprec.ip4.family == 0 ||
+		    (iprec.ip6.family != 0 &&
+		     settings_get_bool("resolve_prefer_ipv6"))) {
+			ip = &iprec.ip6;
+			servername = iprec.host6;
+		} else {
+			ip = &iprec.ip4;
+			servername = iprec.host4;
+		}
 	}
 
 	if (ip != NULL) {
@@ -322,7 +337,8 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 	}
 
 	g_free(iprec.errorstr);
-	g_free(iprec.host);
+	g_free(iprec.host4);
+	g_free(iprec.host6);
 }
 
 SERVER_REC *server_connect(SERVER_CONNECT_REC *conn)
@@ -607,7 +623,8 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->address);
 	g_free_not_null(conn->chatnet);
 
-	g_free_not_null(conn->own_ip);
+	g_free_not_null(conn->own_ip4);
+	g_free_not_null(conn->own_ip6);
 
         g_free_not_null(conn->password);
         g_free_not_null(conn->nick);
@@ -637,15 +654,26 @@ void server_change_nick(SERVER_REC *server, const char *nick)
 }
 
 /* Update own IPv4 and IPv6 records */
-void server_connect_own_ip_save(SERVER_CONNECT_REC *conn, IPADDR *ip)
+void server_connect_own_ip_save(SERVER_CONNECT_REC *conn,
+				IPADDR *ip4, IPADDR *ip6)
 {
-	if (ip == NULL || ip->family == 0)
-		g_free_and_null(conn->own_ip);
+	if (ip4 == NULL || ip4->family == 0)
+		g_free_and_null(conn->own_ip4);
+	if (ip6 == NULL || ip6->family == 0)
+		g_free_and_null(conn->own_ip6);
 
-	if (ip != NULL && ip->family != 0) {
-		if (conn->own_ip == NULL)
-			conn->own_ip = g_new0(IPADDR, 1);
-		memcpy(conn->own_ip, ip, sizeof(IPADDR));
+	if (ip4 != NULL && ip4->family != 0) {
+		/* IPv4 address was found */
+		if (conn->own_ip4 == NULL)
+			conn->own_ip4 = g_new0(IPADDR, 1);
+		memcpy(conn->own_ip4, ip4, sizeof(IPADDR));
+	}
+
+	if (ip6 != NULL && ip6->family != 0) {
+		/* IPv6 address was found */
+		if (conn->own_ip6 == NULL)
+			conn->own_ip6 = g_new0(IPADDR, 1);
+		memcpy(conn->own_ip6, ip6, sizeof(IPADDR));
 	}
 }
 
@@ -710,6 +738,7 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto)
 
 void servers_init(void)
 {
+	settings_add_bool("server", "resolve_prefer_ipv6", FALSE);
 	settings_add_bool("server", "resolve_reverse_lookup", FALSE);
 	lookup_servers = servers = NULL;
 
diff --git a/src/core/servers.h b/src/core/servers.h
index 314faa32..f39c650b 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -67,7 +67,8 @@ void server_connect_failed(SERVER_REC *server, const char *msg);
 void server_change_nick(SERVER_REC *server, const char *nick);
 
 /* Update own IPv4 and IPv6 records */
-void server_connect_own_ip_save(SERVER_CONNECT_REC *conn, IPADDR *ip);
+void server_connect_own_ip_save(SERVER_CONNECT_REC *conn,
+				IPADDR *ip4, IPADDR *ip6);
 
 /* `optlist' should contain only one unknown key - the server tag.
    returns NULL if there was unknown -option */
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index f8558ad1..429e6dac 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -138,7 +138,7 @@ static void cmd_server_add(const char *data)
 		if (*password != '\0') g_free_and_null(rec->password);
 		if (g_hash_table_lookup(optlist, "host")) {
 			g_free_and_null(rec->own_host);
-			rec->own_ip = NULL;
+			rec->own_ip4 = rec->own_ip6 = NULL;
 		}
 	}
 
@@ -193,7 +193,7 @@ static void cmd_server_add(const char *data)
 	value = g_hash_table_lookup(optlist, "host");
 	if (value != NULL && *value != '\0') {
 		rec->own_host = g_strdup(value);
-		rec->own_ip = NULL;
+		rec->own_ip4 = rec->own_ip6 = NULL;
 	}
 
 	signal_emit("server add fill", 2, rec, optlist);
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 4071f367..6618edd7 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -108,7 +108,7 @@ static void cmd_network_add(const char *data)
 		if (g_hash_table_lookup(optlist, "realname")) g_free_and_null(rec->realname);
 		if (g_hash_table_lookup(optlist, "host")) {
 			g_free_and_null(rec->own_host);
-                        rec->own_ip = NULL;
+                        rec->own_ip4 = rec->own_ip6 = NULL;
 		}
 		if (g_hash_table_lookup(optlist, "usermode")) g_free_and_null(rec->usermode);
 		if (g_hash_table_lookup(optlist, "autosendcmd")) g_free_and_null(rec->autosendcmd);
@@ -140,7 +140,7 @@ static void cmd_network_add(const char *data)
 	value = g_hash_table_lookup(optlist, "host");
 	if (value != NULL && *value != '\0') {
 		rec->own_host = g_strdup(value);
-		rec->own_ip = NULL;
+		rec->own_ip4 = rec->own_ip6 = NULL;
 	}
 
 	value = g_hash_table_lookup(optlist, "usermode");
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 7fef2ae5..17f6c477 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -264,12 +264,12 @@ GIOChannel *dcc_connect_ip(IPADDR *ip, int port)
 	}
 
 	if (own_ip == NULL)
-		own_ip = &source_host_ip;
+		own_ip = IPADDR_IS_V6(ip) ? source_host_ip6 : source_host_ip4;
 
 	handle = net_connect_ip(ip, port, own_ip);
 	if (handle == NULL && errno == EADDRNOTAVAIL && own_ip != NULL) {
 		/* dcc_own_ip is external address */
-		own_ip = &source_host_ip;
+		own_ip = IPADDR_IS_V6(ip) ? source_host_ip6 : source_host_ip4;
 		handle = net_connect_ip(ip, port, own_ip);
 	}
 	return handle;
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 16950c79..dcc94e6b 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -585,7 +585,7 @@ static LISTEN_REC *find_listen(const char *ircnet, int port)
 static void add_listen(const char *ircnet, int port)
 {
 	LISTEN_REC *rec;
-	IPADDR ip, *my_ip;
+	IPADDR ip4, ip6, *my_ip;
 
 	if (port <= 0 || *ircnet == '\0')
 		return;
@@ -593,13 +593,16 @@ static void add_listen(const char *ircnet, int port)
 	/* bind to specific host/ip? */
 	my_ip = NULL;
 	if (*settings_get_str("irssiproxy_bind") != '\0') {
-		if (net_gethostbyname(settings_get_str("irssiproxy_bind"), &ip) != 0) {
+		if (net_gethostbyname(settings_get_str("irssiproxy_bind"),
+				      &ip4, &ip6) != 0) {
 			printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
 				  "Proxy: can not resolve '%s' - aborting",
 				  settings_get_str("irssiproxy_bind"));
 			return;
 		}
-		my_ip = &ip;
+
+		my_ip = ip6.family == 0 ? &ip4 : ip4.family == 0 ||
+			settings_get_bool("resolve_prefer_ipv6") ? &ip6 : &ip4;
 	}
 
 	rec = g_new0(LISTEN_REC, 1);

From 5a4be0f4f5f36787e98215d87b88a50a5f7e7e01 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Tue, 22 Sep 2015 22:39:44 +0200
Subject: [PATCH 0140/1650] Add new setting to optionally modify behaviour of
 hilight_nick_matches

Fix indentation

Remove unused variables that crept into the nick_match_msg_everywhere function
---
 src/core/nicklist.c              | 9 +++++++++
 src/core/nicklist.h              | 1 +
 src/fe-common/core/fe-messages.c | 5 ++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index a96b8a9e..c88f5d6d 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -21,6 +21,7 @@
 #include "module.h"
 #include "signals.h"
 #include "misc.h"
+#include "settings.h"
 
 #include "servers.h"
 #include "channels.h"
@@ -571,6 +572,14 @@ int nick_match_msg(CHANNEL_REC *channel, const char *msg, const char *nick)
 	}
 }
 
+int nick_match_msg_everywhere(CHANNEL_REC *channel, const char *msg, const char *nick)
+{
+	g_return_val_if_fail(nick != NULL, FALSE);
+	g_return_val_if_fail(msg != NULL, FALSE);
+
+	return stristr_full(msg, nick);
+}
+
 void nicklist_init(void)
 {
 	signal_add_first("channel created", (SIGNAL_FUNC) sig_channel_created);
diff --git a/src/core/nicklist.h b/src/core/nicklist.h
index 55dfd5ef..5e0f4f75 100644
--- a/src/core/nicklist.h
+++ b/src/core/nicklist.h
@@ -55,6 +55,7 @@ int nicklist_compare(NICK_REC *p1, NICK_REC *p2, const char *nick_prefix);
 
 /* Check is `msg' is meant for `nick'. */
 int nick_match_msg(CHANNEL_REC *channel, const char *msg, const char *nick);
+int nick_match_msg_everywhere(CHANNEL_REC *channel, const char *msg, const char *nick);
 
 void nicklist_init(void);
 void nicklist_deinit(void);
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 3bd2b666..d09c1b0b 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -183,7 +183,9 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
                 nickrec = nicklist_find(chanrec, nick);
 
 	for_me = !settings_get_bool("hilight_nick_matches") ? FALSE :
-		nick_match_msg(chanrec, msg, server->nick);
+		!settings_get_bool("hilight_nick_matches_everywhere") ?
+		nick_match_msg(chanrec, msg, server->nick) :
+		nick_match_msg_everywhere(chanrec, msg, server->nick);
 	hilight = for_me ? NULL :
 		hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
 	color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
@@ -694,6 +696,7 @@ void fe_messages_init(void)
 				      (GCompareFunc) g_direct_equal);
 
 	settings_add_bool("lookandfeel", "hilight_nick_matches", TRUE);
+	settings_add_bool("lookandfeel", "hilight_nick_matches_everywhere", FALSE);
 	settings_add_bool("lookandfeel", "emphasis", TRUE);
 	settings_add_bool("lookandfeel", "emphasis_replace", FALSE);
 	settings_add_bool("lookandfeel", "emphasis_multiword", FALSE);

From b5c3e90802e926e35ad9a4f1f02403578a3ff392 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Tue, 22 Sep 2015 23:09:55 +0200
Subject: [PATCH 0141/1650] Fix return value from nick_match_msg_everywhere

---
 src/core/nicklist.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index c88f5d6d..160deb6a 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -577,7 +577,12 @@ int nick_match_msg_everywhere(CHANNEL_REC *channel, const char *msg, const char
 	g_return_val_if_fail(nick != NULL, FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
-	return stristr_full(msg, nick);
+	char *ret = stristr_full(msg, nick);
+
+	if (ret != NULL)
+		return TRUE;
+
+	return FALSE;
 }
 
 void nicklist_init(void)

From 3f2eaf1d3a67eddd42dd88eccb39402d45297fcb Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Tue, 22 Sep 2015 23:16:41 +0200
Subject: [PATCH 0142/1650] Fix return value from nick_match_msg_everywhere,
 remove #include 'settings.h'

---
 src/core/nicklist.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 160deb6a..770b0afc 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -21,7 +21,6 @@
 #include "module.h"
 #include "signals.h"
 #include "misc.h"
-#include "settings.h"
 
 #include "servers.h"
 #include "channels.h"
@@ -577,12 +576,7 @@ int nick_match_msg_everywhere(CHANNEL_REC *channel, const char *msg, const char
 	g_return_val_if_fail(nick != NULL, FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
-	char *ret = stristr_full(msg, nick);
-
-	if (ret != NULL)
-		return TRUE;
-
-	return FALSE;
+	return stristr_full(msg, nick) != NULL;
 }
 
 void nicklist_init(void)

From f247a43b97731cd1d58ec765dd2d10f885ef66dc Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Tue, 22 Sep 2015 19:35:10 -0300
Subject: [PATCH 0143/1650] sig_message_irc_op_public: fix nickmode lookup, use
 cleantarget instead

---
 src/fe-common/irc/fe-irc-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 110fb29a..40ca306d 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -81,7 +81,7 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 	/* and clean the rest here */
 	cleantarget = get_visible_target(IRC_SERVER(server), cleantarget);
 
-	nickmode = channel_get_nickmode(channel_find(server, target),
+	nickmode = channel_get_nickmode(channel_find(server, cleantarget),
 					nick);
 
 	optarget = g_strconcat(prefix, cleantarget, NULL);

From 7ae742293926dde06be5563efb5acd19dc2c3a75 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 23 Sep 2015 03:17:29 -0300
Subject: [PATCH 0144/1650] Add multi-prefix to list of capabilities to request

Turns out event_names_list() in irc-nicklist.c already handles this.

event_who() just ignores it, which is probably a good idea since some of
the irc servers I tested this with have a bug that results in sending
multiple prefixes in the NAMES reply but not in the WHO one (they were
forks of ircd-hybrid before 7.3.0)

And NAMES always happens, anyway. WHO is omitted sometimes for huge
channels.
---
 src/irc/core/irc-servers.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 82584382..81f0c269 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -228,6 +228,8 @@ static void server_init(IRC_SERVER_REC *server)
 	if (conn->sasl_mechanism != SASL_MECHANISM_NONE)
 		cap_toggle(server, "sasl", TRUE);
 
+	cap_toggle(server, "multi-prefix", TRUE);
+
 	irc_send_cmd_now(server, "CAP LS");
 
 	if (conn->password != NULL && *conn->password != '\0') {

From d3df165e0b067461e49d7f065f3820739e9ba229 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@linux.localdomain>
Date: Sun, 12 Jul 2015 19:03:58 +0200
Subject: [PATCH 0145/1650] Improve the WINDOW help

Properly describe the window command.
Make help sort order deterministic.
---
 docs/help/in/window.in | 84 +++++++++++++++++++++---------------------
 syntax.pl              |  2 +-
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index c965d3fb..6dde6c50 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -5,49 +5,49 @@
 
 %9Parameters:%9
 
-    LOG:          Modifies the logging status.
-    LOGFILE:      Modifies the location to the log file.
-    NEW:          Creates a new window.
-    CLOSE:        Closes a window.
-    REFNUM:       Go to the window with the given number.
-    GOTO:         Go to the window with the given nickname, channel or number.
-    NEXT:         Go to the next window.
-    LAST:         Go to the last window.
-    PREVIOUS:     Go to the previous window.
-    LEVEL:        Modifies the text levels to display in the window.
-    IMMORTAL:     Modifies the window mortality status.
-    SERVER:       Set the active server of the window.
-    ITEM PREV:    Go to the previous item in the window.
-    ITEM NEXT:    Go to the next item in the window.
-    ITEM GOTO:    Go to the specified nickname, channel or window item number.
-    ITEM MOVE:    Move the active window item to another window.
-    NUMBER:       Move the active window to another position.
-    NAME:         Give the window a name.
-    HISTORY:      Clears the window history buffer.
-    MOVE PREV:    Move the window down.
-    MOVE NEXT:    Move the window up.
-    MOVE FIRST:   Move the window to the first position.
-    MOVE LAST:    Move the window to the last position.
-    MOVE:         Move the window.
-    LIST:         List all the windows.
-    THEME:        Applies a theme to the windows.
-    GROW:         Increase the window size when using split windows.
-    SHRINK:       Decrease the window size when using split windows.
-    SIZE:         Modify the window size when using split windows.
-    BALANCE:      Balance the window locations when using split windows.
-    HIDE:         Hide the window when using split windows.
-    SHOW:         Show the window when using split windows.
-    UP:           Go to the window above when using split windows.
-    DOWN:         Go to the window below when using split windows.
-    LEFT:         Go to the previous window.
-    RIGHT:        Go to the next window.
-    STICK:        Make the window sticky.
-    MOVE LEFT:    Move the window to the previous location.
-    MOVE RIGHT:   Move the window to the next location.
-    MOVE UP:      Move the window up when using split windows.
-    MOVE DOWN:    Move the window down when using split windows.
+    LOG:          %|Turn on or off logging of the active window, optionally specifying the log file to use.
+    LOGFILE:      %|Sets the location of the log file to use for window logging without starting to log.
+    NEW:          %|Creates a new hidden or split window.
+    CLOSE:        %|Closes the current window, the specified one or all windows in the given range.
+    REFNUM:       %|Go to the window with the given number.
+    GOTO:         %|Go to the window with activity, with the given nickname, channel or with the specified number.
+    NEXT:         %|Go to the next window numerically.
+    LAST:         %|Go to the previously active window.
+    PREVIOUS:     %|Go to the previous window numerically.
+    LEVEL:        %|Changes the text levels to display in the window, or query the current level.
+    IMMORTAL:     %|Modifies or queries the window mortality status. Immortal windows have an extra protection against WINDOW CLOSE.
+    SERVER:       %|Change the active server of the window or the server stickyness. If the server is sticky, it cannot be cycled with next_window_item/previous_window_item
+    ITEM PREV:    %|Make the previous item in this window active.
+    ITEM NEXT:    %|Make the next item in this window active.
+    ITEM GOTO:    %|Change to the query with the specified nickname, channel with the given name or window item number.
+    ITEM MOVE:    %|Move the active window item to another window, or move the channel or query item specified by their name to the current window.
+    NUMBER:       %|Change the active window number to the specified number, swapping the window already in that place if required. With -sticky, protect the window number from renumbering done by windows_auto_renumber. (To re-set the sticky attribute, use WINDOW NUMBER again without -sticky.)
+    NAME:         %|Change or clear the window name. Window names must be unique.
+    HISTORY:      %|Set or clear a specific named history to use for this window. All windows with the same named history will share a history.
+    MOVE PREV:    %|Move the window to the place of the numerically previous window. At the first position, move the window to the end and renumber the consecutive block that it was part of.
+    MOVE NEXT:    %|Move the window to the place of the numerically next window. At the last position, move the window to the first position and renumber the consecutive block at first position (if any)
+    MOVE FIRST:   %|Move the window to the first position. Any windows inbetween are moved to their numerically next positions.
+    MOVE LAST:    %|Move the window to the last position. Any windows inbetween are moved to their numerically previous positions.
+    MOVE:         %|Move the window to the specified number or the first number that is in use when moving the window in the direction of the specified position. Any windows inbetween are shifted towards the old position of the window (unused positions remain empty)
+    LIST:         %|List all the windows.
+    THEME:        %|Applies or removes a per-window theme.
+    GROW:         %|Increase the size of the active split window by the specified number of lines.
+    SHRINK:       %|Decrease the size of the active split window by the specified number of lines.
+    SIZE:         %|Set the current split window size to the specified numer of lines.
+    BALANCE:      %|Balance the heights of all split windows.
+    HIDE:         %|Hides the current split window, or the split window specified by number or item name.
+    SHOW:         %|Show the window specified by number or item name as a new split windows. It is made sticky when autostick_split_windows is turned on.
+    UP:           %|Set the split window above the current one active. At the top, wraps to the bottom.
+    DOWN:         %|Set the split window below the current one active. At the bottom, wraps to the top.
+    LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
+    RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
+    STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.
+    MOVE LEFT:    %|Move the window to the numerically previous location inside the current sticky group.
+    MOVE RIGHT:   %|Move the window to the numerically next location inside the current sticky group.
+    MOVE UP:      %|Move the current window to the sticky group of the split window above. If no sticky group remains, the split window collapses.
+    MOVE DOWN:    %|Move the current window to the sticky group of the split window below. If no sticky group remains, the split window collapses.
 
-   Add the required arguments for the given command.
+   %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 
 %9Description:%9
 
diff --git a/syntax.pl b/syntax.pl
index bf10451f..33bd12b4 100755
--- a/syntax.pl
+++ b/syntax.pl
@@ -10,7 +10,7 @@
 # Remember to include the asterisk ('*').
 $SRC_PATH='src';
 
-@files = `find src -name '*.c'`;
+@files = sort `find src -name '*.c'`;
 
 foreach $file (@files) {
    open (FILE, "$file");

From c9be1a7a80974858a21fc74191198189030df40b Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 23 Sep 2015 13:37:14 -0300
Subject: [PATCH 0146/1650] Revert "Revert "Bug fix - docdir is ignored during
 installation.""

This reverts commit d222c11f74a5662df59e00e7ae6c8105179a804e.
---
 docs/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5e222564..861a2ca4 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,3 @@
-docdir = $(datadir)/doc/irssi
-
 man_MANS = \
 	irssi.1
 

From e833521cefdedcdbc0e4382715a36ea5f8276a86 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 23 Sep 2015 13:39:07 -0300
Subject: [PATCH 0147/1650] Bump glib2 requirement from 2.6 to 2.16

This drops support for rhel/centos 5 (18 months left of its 10 year
support cycle)

Keeps support for debian 5.0 (lenny) and ubuntu 8.04 LTS, both of
which are unsupported, so bumping up to glib 2.24 wouldn't be a problem,
but it's not needed atm.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e33b8c1d..7bcd3fe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -261,7 +261,7 @@ for try in 1 2; do
     echo "*** trying without -lgmodule"
     glib_modules=
   fi
-  AM_PATH_GLIB_2_0(2.6.0,,, $glib_modules)
+  AM_PATH_GLIB_2_0(2.16.0,,, $glib_modules)
   if test "$GLIB_LIBS"; then
     if test $glib_modules = gmodule; then
       AC_DEFINE(HAVE_GMODULE)

From 9da445ab86740be13f47da7eb540fb9e4b962085 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 23 Sep 2015 13:42:00 -0300
Subject: [PATCH 0148/1650] Drop some glib version checks that are not needed
 anymore

The g_strcmp0 fallback in particular was broken since it was used in a
few places as a GCompareFunc, and macros don't work that way.

Yes, that one was my fault, but nobody complained :D
---
 src/common.h                        | 13 -------------
 src/fe-common/core/fe-common-core.c | 11 -----------
 2 files changed, 24 deletions(-)

diff --git a/src/common.h b/src/common.h
index e9073925..86a079fe 100644
--- a/src/common.h
+++ b/src/common.h
@@ -43,19 +43,6 @@
 #  include <gmodule.h>
 #endif
 
-#if !GLIB_CHECK_VERSION(2,10,0)
-#define g_slice_alloc(size)      g_malloc(size)
-#define g_slice_alloc0(size)     g_malloc0(size)
-#define g_slice_free1(size, mem) g_free(mem)
-#define g_slice_new(type)        g_new(type, 1)
-#define g_slice_new0(type)       g_new0(type, 1)
-#define g_slice_free(type, mem)  g_free(mem)
-#endif
-
-#if !GLIB_CHECK_VERSION(2,16,0)
-#define g_strcmp0(a, b) (!a ? -(a != b) : (!b ? (a != b) : strcmp(a, b)))
-#endif
-
 #if defined (UOFF_T_INT)
 typedef unsigned int uoff_t;
 #elif defined (UOFF_T_LONG)
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 341902df..a15850e2 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -450,18 +450,7 @@ void fe_common_core_finish_init(void)
 	signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed);
 
         /* _after_ windows are created.. */
-#if GLIB_CHECK_VERSION(2,6,0)
 	g_log_set_default_handler((GLogFunc) glog_func, NULL);
-#else
-	g_log_set_handler(G_LOG_DOMAIN,
-			  (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL |
-					    G_LOG_LEVEL_WARNING),
-			  (GLogFunc) glog_func, NULL);
-	g_log_set_handler("GLib",
-			  (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL |
-					    G_LOG_LEVEL_WARNING),
-			  (GLogFunc) glog_func, NULL); /* send glib errors to the same place */
-#endif
 
 	if (setup_changed)
                 signal_emit("setup changed", 0);

From b984f1fa250fd87b2808bed6826f17386ddb30ce Mon Sep 17 00:00:00 2001
From: Robert C Jensen <jensen.r@husky.neu.edu>
Date: Wed, 23 Sep 2015 23:39:37 -0300
Subject: [PATCH 0149/1650] dcc-get: close() the temp fd so we don't get
 ETXTBSY in ntfs mounts

Patch from debian bug 696963 [1]

Fixes github bug #220 and flyspray bug 867 [2]

[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696963
[2]: http://bugs.irssi.org/index.php?do=details&task_id=867
---
 src/irc/dcc/dcc-get.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 1208b5c5..a8b1c967 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -226,6 +226,8 @@ void sig_dccget_connected(GET_DCC_REC *dcc)
 		else
 			ret = fchmod(temphandle, dcc_file_create_mode);
 
+		close(temphandle);
+
 		if (ret != -1) {
 			ret = link(tempfname, dcc->file);
 
@@ -249,7 +251,6 @@ void sig_dccget_connected(GET_DCC_REC *dcc)
 
 		/* close/remove the temp file */
 		ret_errno = errno;
-		close(temphandle);
 		unlink(tempfname);
 		g_free(tempfname);
 

From a2277e84bd390b9eaca906541f32e5d60e529f7f Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Thu, 24 Sep 2015 11:59:18 +0200
Subject: [PATCH 0150/1650] Added functionality to create dir if dir specified
 in rawlog filename

---
 src/core/rawlog.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 2fa6b850..875c0ef2 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -32,6 +32,7 @@
 static int rawlog_lines;
 static int signal_rawlog;
 static int log_file_create_mode;
+static int log_dir_create_mode;
 
 RAWLOG_REC *rawlog_create(void)
 {
@@ -145,9 +146,13 @@ void rawlog_close(RAWLOG_REC *rawlog)
 
 void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
 {
-	char *path;
+	char *path, *dir;
 	int f;
 
+        dir = g_path_get_dirname(fname);
+        mkpath(dir, log_dir_create_mode);
+        g_free(dir);
+
 	path = convert_home(fname);
 	f = open(path, O_WRONLY | O_APPEND | O_CREAT, log_file_create_mode);
 	g_free(path);
@@ -165,6 +170,11 @@ static void read_settings(void)
 {
 	rawlog_set_size(settings_get_int("rawlog_lines"));
 	log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
+        log_dir_create_mode = log_file_create_mode;
+        if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
+        if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
+        if (log_file_create_mode & 0004) log_dir_create_mode |= 0001;
+
 }
 
 static void cmd_rawlog(const char *data, SERVER_REC *server, void *item)

From deb6ca1b1a676fae094253fc55519e2a60c206d1 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Thu, 24 Sep 2015 13:03:02 +0200
Subject: [PATCH 0151/1650] Applied patch from fs#275 to make /hilight -mask
 -line work properly

---
 src/fe-common/core/fe-messages.c  | 16 ++++++++++------
 src/fe-common/core/formats.c      |  2 ++
 src/fe-common/core/formats.h      |  6 ++++++
 src/fe-common/core/hilight-text.c |  9 ++++-----
 src/fe-common/core/hilight-text.h |  2 +-
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index d09c1b0b..e06a4571 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -175,6 +175,7 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	int for_me, print_channel, level;
 	char *nickmode, *color, *freemsg = NULL;
 	HILIGHT_REC *hilight;
+	int match_beg = 0, match_end = 0;
 
 	/* NOTE: this may return NULL if some channel is just closed with
 	   /WINDOW CLOSE and server still sends the few last messages */
@@ -187,8 +188,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 		nick_match_msg(chanrec, msg, server->nick) :
 		nick_match_msg_everywhere(chanrec, msg, server->nick);
 	hilight = for_me ? NULL :
-		hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
-	color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
+		hilight_match(server, target, nick, address, MSGLEVEL_PUBLIC, msg, &match_beg, &match_end);
+	color = (hilight == NULL || !hilight->nick) ? NULL : hilight_get_color(hilight);
 
 	print_channel = chanrec == NULL ||
 		!window_item_is_active((WI_ITEM_REC *) chanrec);
@@ -214,10 +215,13 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	if (printnick == NULL)
 		printnick = nick;
 
+	TEXT_DEST_REC dest;
+	format_create_dest(&dest, server, target, level, NULL);
+	dest.hilight = hilight;
+	dest.match_beg = match_beg;
+	dest.match_end = match_end;
 	if (color != NULL) {
 		/* highlighted nick */
-		TEXT_DEST_REC dest;
-		format_create_dest(&dest, server, target, level, NULL);
 		hilight_update_text_dest(&dest,hilight);
 		if (!print_channel) /* message to active channel in window */
 			printformat_dest(&dest, TXT_PUBMSG_HILIGHT, color,
@@ -228,11 +232,11 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 					 nickmode);
 	} else {
 		if (!print_channel)
-			printformat(server, target, level,
+			printformat_dest(&dest,
 				    for_me ? TXT_PUBMSG_ME : TXT_PUBMSG,
 				    printnick, msg, nickmode);
 		else
-			printformat(server, target, level,
+			printformat_dest(&dest,
 				    for_me ? TXT_PUBMSG_ME_CHANNEL :
 				    TXT_PUBMSG_CHANNEL,
 				    printnick, target, msg, nickmode);
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index ccf48394..b95b3966 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -416,6 +416,8 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
 	dest->server_tag = server != NULL ? SERVER(server)->tag : server_tag;
 	dest->target = target;
 	dest->level = level;
+	dest->match_beg = 0;
+	dest->match_end = 0;
 	dest->window = window != NULL ? window :
 		window_find_closest(server, target, level);
 }
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 07e1832c..484105f9 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -45,6 +45,9 @@ struct _FORMAT_REC {
 #define PRINT_FLAG_SET_SERVERTAG	0x0010
 #define PRINT_FLAG_UNSET_SERVERTAG	0x0020
 
+// FIXME: sould use better
+typedef struct _HILIGHT_REC HILIGHT_REC;
+
 typedef struct _TEXT_DEST_REC {
 	WINDOW_REC *window;
 	SERVER_REC *server;
@@ -52,6 +55,9 @@ typedef struct _TEXT_DEST_REC {
 	const char *target;
 	int level;
 
+	HILIGHT_REC *hilight;
+	int match_beg;
+	int match_end;
 	int hilight_priority;
 	char *hilight_color;
         int flags;
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 87c5d467..c6017d2a 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -325,11 +325,10 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 	if (dest->level & MSGLEVEL_NOHILIGHT)
 		return;
 
-        hilight_start = hilight_end = 0;
-	hilight = hilight_match(dest->server, dest->target,
-				NULL, NULL, dest->level, stripped,
-				&hilight_start,
-				&hilight_end);
+	hilight_start = dest->match_beg;
+	hilight_end = dest->match_end;
+	hilight = dest->hilight;
+
 	if (hilight == NULL)
 		return;
 
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 1692b8ab..fa083882 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -7,7 +7,7 @@
 
 #include "formats.h"
 
-typedef struct _HILIGHT_REC HILIGHT_REC;
+//typedef struct _HILIGHT_REC HILIGHT_REC;
 
 struct _HILIGHT_REC {
 	char *text;

From 1a2c479bc04cdb6758ca9f1976e235b092cc83fb Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 26 Sep 2015 18:53:10 +0200
Subject: [PATCH 0152/1650] Allow the user to set and modify the SASL
 parameters

The /NETWORK ADD command now is able to modify the SASL mechanism, the
username and the password on a chatnet basis.
---
 docs/help/in/network.in          |  6 ++++++
 src/fe-common/irc/fe-ircnet.c    | 24 +++++++++++++++++++-----
 src/irc/core/irc-chatnets.c      | 12 ++++++++----
 src/irc/core/irc-servers-setup.c |  2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 046d9feb..2918f6ae 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -32,6 +32,12 @@
                      additional commands to the server.
     -cmdmax:         Specifies the maximum number of commands to perform before
                      starting the internal flood protection.
+    -sasl_mechanism  Specifies the mechanism to use for the SASL authentication.
+                     At the moment irssi only supports the 'plain' and the
+                     'external' mechanisms.
+    -sasl_username   Specifies the username to use during the SASL authentication.
+    -sasl_password   Specifies the password to use during the SASL authentication.
+
 
     The name of the network to add, edit or remove; if no parameter is given,
     the list of networks will be displayed.
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 6618edd7..dab6f57f 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -82,10 +82,12 @@ static void cmd_network_list(void)
 }
 
 /* SYNTAX: NETWORK ADD [-nick <nick>] [-user <user>] [-realname <name>]
-                      [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
-		      [-querychans <count>] [-whois <count>] [-msgs <count>]
-		      [-kicks <count>] [-modes <count>]
-		      [-cmdspeed <ms>] [-cmdmax <count>] <name> */
+                       [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
+                       [-querychans <count>] [-whois <count>] [-msgs <count>]
+                       [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
+                       [-cmdmax <count>] [-sasl_mechanism <mechanism>]
+                       [-sasl_username <username>] [-sasl_password <password>]
+                       <name> */
 static void cmd_network_add(const char *data)
 {
 	GHashTable *optlist;
@@ -112,6 +114,9 @@ static void cmd_network_add(const char *data)
 		}
 		if (g_hash_table_lookup(optlist, "usermode")) g_free_and_null(rec->usermode);
 		if (g_hash_table_lookup(optlist, "autosendcmd")) g_free_and_null(rec->autosendcmd);
+		if (g_hash_table_lookup(optlist, "sasl_mechanism")) g_free_and_null(rec->sasl_mechanism);
+		if (g_hash_table_lookup(optlist, "sasl_username")) g_free_and_null(rec->sasl_username);
+		if (g_hash_table_lookup(optlist, "sasl_password")) g_free_and_null(rec->sasl_password);
 	}
 
 	value = g_hash_table_lookup(optlist, "kicks");
@@ -148,6 +153,14 @@ static void cmd_network_add(const char *data)
 	value = g_hash_table_lookup(optlist, "autosendcmd");
 	if (value != NULL && *value != '\0') rec->autosendcmd = g_strdup(value);
 
+	/* the validity of the parameters is checked in sig_server_setup_fill_chatnet */
+	value = g_hash_table_lookup(optlist, "sasl_mechanism");
+	if (value != NULL && *value != '\0') rec->sasl_mechanism = g_strdup(value);
+	value = g_hash_table_lookup(optlist, "sasl_username");
+	if (value != NULL && *value != '\0') rec->sasl_username = g_strdup(value);
+	value = g_hash_table_lookup(optlist, "sasl_password");
+	if (value != NULL && *value != '\0') rec->sasl_password = g_strdup(value);
+
 	ircnet_create(rec);
 	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_ADDED, name);
 
@@ -186,7 +199,8 @@ void fe_ircnet_init(void)
 	command_bind("network add", NULL, (SIGNAL_FUNC) cmd_network_add);
 	command_bind("network remove", NULL, (SIGNAL_FUNC) cmd_network_remove);
 
-	command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed -cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode");
+	command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed "
+			    "-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
 }
 
 void fe_ircnet_deinit(void)
diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index b9b221b8..d72f71dd 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -49,9 +49,9 @@ static void sig_chatnet_read(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 	rec->max_modes = config_node_get_int(node, "max_modes", 0);
 	rec->max_whois = config_node_get_int(node, "max_whois", 0);
 
-	rec->sasl_mechanism = config_node_get_str(node, "sasl_mechanism", NULL);
-	rec->sasl_username = config_node_get_str(node, "sasl_username", NULL);
-	rec->sasl_password = config_node_get_str(node, "sasl_password", NULL);
+	rec->sasl_mechanism = g_strdup(config_node_get_str(node, "sasl_mechanism", NULL));
+	rec->sasl_username = g_strdup(config_node_get_str(node, "sasl_username", NULL));
+	rec->sasl_password = g_strdup(config_node_get_str(node, "sasl_password", NULL));
 }
 
 static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
@@ -88,8 +88,12 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 
 static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec)
 {
-	if (IS_IRC_CHATNET(rec))
+	if (IS_IRC_CHATNET(rec)) {
 		g_free(rec->usermode);
+		g_free(rec->sasl_mechanism);
+		g_free(rec->sasl_username);
+		g_free(rec->sasl_password);
+	}
 }
 
 
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index f5e4f8f4..bf1d2ddf 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -81,7 +81,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 	if (ircnet->max_query_chans > 0)
 		conn->max_query_chans = ircnet->max_query_chans;
 
-	/* Validate the SASL parameters filled by sig_chatnet_read() */
+	/* Validate the SASL parameters filled by sig_chatnet_read() or cmd_network_add */
 	conn->sasl_mechanism = SASL_MECHANISM_NONE;
 
 	if (ircnet->sasl_mechanism != NULL) {

From 6f9fc5d5230f6d094130bd4f0ce659b740ed2a54 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 27 Sep 2015 02:15:14 -0300
Subject: [PATCH 0153/1650] INSTALL: mention local::lib for home directory
 installations

I had problems installing this and this file didn't have the answer.
So I'm adding what nei told me to do.
---
 INSTALL | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/INSTALL b/INSTALL
index 719369de..a83a6c76 100644
--- a/INSTALL
+++ b/INSTALL
@@ -94,6 +94,10 @@ things that can go wrong:
  - If configure complains that it doesn't find some perl stuff, you're
    probably missing libperl.so or libperl.a. In debian, you'll need to do
    apt-get install libperl-dev
+ - For unprivileged home directory installations, using the local::lib CPAN
+   module is recommended. Read its docs, bootstrap it if needed, ensure that
+   the environment variables are set before running the configure script, and
+   append "--with-perl-lib=site" to the configure parameters to use it.
 
 You can verify that the perl module is loaded and working with "/LOAD"
 command. It should print something like:

From 72ac27e5a030b7c9207ecd00b8c2d092d28da644 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 8 Sep 2015 00:40:25 +0200
Subject: [PATCH 0154/1650] Implement the bracketed paste mode

As an alternative method of paste detection, more reliable but might not be
supported by all the VTs.
---
 src/fe-text/gui-readline.c | 42 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index ec61e317..b8f3c1c7 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -37,6 +37,7 @@
 #include "gui-windows.h"
 #include "utf8.h"
 
+#include <string.h>
 #include <signal.h>
 
 typedef void (*ENTRY_REDIRECT_KEY_FUNC) (int key, void *data, SERVER_REC *server, WI_ITEM_REC *item);
@@ -65,6 +66,13 @@ static char *paste_old_prompt;
 static int paste_prompt, paste_line_count;
 static int paste_join_multiline;
 static int paste_timeout_id;
+static int paste_bracketed_mode;
+
+/* Terminal sequences that surround the input when the terminal has the
+ * bracketed paste mode active. Fror more details see
+ * https://cirw.in/blog/bracketed-paste */
+static const unichar bp_start[] = { 0x1b, '[', '2', '0', '0', '~' };
+static const unichar bp_end[]   = { 0x1b, '[', '2', '0', '1', '~' };
 
 static void sig_input(void);
 
@@ -647,12 +655,43 @@ static void sig_input(void)
 		unichar key;
 		term_gets(buffer, &line_count);
 		key = g_array_index(buffer, unichar, 0);
+		/* Either Ctrl-k or Ctrl-c is pressed */
 		if (key == 11 || key == 3)
 			paste_flush(key == 11);
 		g_array_free(buffer, TRUE);
 	} else {
 		term_gets(paste_buffer, &paste_line_count);
-		if (paste_detect_time > 0 && paste_buffer->len >= 3) {
+
+		/* use the bracketed paste mode to detect when the user has
+		 * pasted some text into the field. */
+		if (paste_buffer->len > 12) {
+			/* try to find the start/end sequence */
+			int seq_start = memmem(paste_buffer->data, 
+					       paste_buffer->len * g_array_get_element_size(paste_buffer),
+					       bp_start, sizeof(bp_start)) != NULL,
+			    seq_end   = memmem(paste_buffer->data,
+					       paste_buffer->len * g_array_get_element_size(paste_buffer),
+					       bp_end, sizeof(bp_end)) != NULL;
+
+			g_warning("found sequences : start %d end %d", seq_start, seq_end);
+
+			if (seq_start) {
+				paste_bracketed_mode = TRUE;
+				/* remove the leading sequence chars */
+				memmove(paste_buffer->data, paste_buffer->data + sizeof(bp_start), 
+					paste_buffer->len * g_array_get_element_size(paste_buffer) - sizeof(bp_start));
+				g_array_set_size(paste_buffer, paste_buffer->len - 6);
+			}
+
+			if (seq_end) {
+				paste_bracketed_mode = FALSE;
+				/* remove the trailing sequence chars */
+				g_array_set_size(paste_buffer, paste_buffer->len - 6);
+				/* decide what to do with the buffer */
+				paste_timeout(NULL);
+			}
+		}
+		else if (paste_detect_time > 0 && paste_buffer->len >= 3) {
 			if (paste_timeout_id != -1)
 				g_source_remove(paste_timeout_id);
 			paste_timeout_id = g_timeout_add(paste_detect_time, paste_timeout, NULL);
@@ -945,6 +984,7 @@ void gui_readline_init(void)
 	paste_buffer = g_array_new(FALSE, FALSE, sizeof(unichar));
         paste_old_prompt = NULL;
 	paste_timeout_id = -1;
+	paste_bracketed_mode = FALSE;
 	g_get_current_time(&last_keypress);
         input_listen_init(STDIN_FILENO);
 

From f1eead7b4a7cdcae6d71dba6e97d38e9d34fcf95 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 8 Sep 2015 00:48:13 +0200
Subject: [PATCH 0155/1650] Toggles

---
 src/fe-text/gui-readline.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index b8f3c1c7..90399711 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -66,6 +66,7 @@ static char *paste_old_prompt;
 static int paste_prompt, paste_line_count;
 static int paste_join_multiline;
 static int paste_timeout_id;
+static int paste_use_bracketed_mode;
 static int paste_bracketed_mode;
 
 /* Terminal sequences that surround the input when the terminal has the
@@ -662,11 +663,11 @@ static void sig_input(void)
 	} else {
 		term_gets(paste_buffer, &paste_line_count);
 
-		/* use the bracketed paste mode to detect when the user has
-		 * pasted some text into the field. */
-		if (paste_buffer->len > 12) {
+		/* use the bracketed paste mode to detect when the user pastes
+		 * some text into the entry */
+		if (paste_use_bracketed_mode != FALSE && paste_buffer->len > 12) {
 			/* try to find the start/end sequence */
-			int seq_start = memmem(paste_buffer->data, 
+			int seq_start = memmem(paste_buffer->data,
 					       paste_buffer->len * g_array_get_element_size(paste_buffer),
 					       bp_start, sizeof(bp_start)) != NULL,
 			    seq_end   = memmem(paste_buffer->data,
@@ -678,7 +679,7 @@ static void sig_input(void)
 			if (seq_start) {
 				paste_bracketed_mode = TRUE;
 				/* remove the leading sequence chars */
-				memmove(paste_buffer->data, paste_buffer->data + sizeof(bp_start), 
+				memmove(paste_buffer->data, paste_buffer->data + sizeof(bp_start),
 					paste_buffer->len * g_array_get_element_size(paste_buffer) - sizeof(bp_start));
 				g_array_set_size(paste_buffer, paste_buffer->len - 6);
 			}
@@ -969,6 +970,7 @@ static void setup_changed(void)
 
 	paste_verify_line_count = settings_get_int("paste_verify_line_count");
 	paste_join_multiline = settings_get_bool("paste_join_multiline");
+	paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
 }
 
 void gui_readline_init(void)
@@ -990,6 +992,7 @@ void gui_readline_init(void)
 
 	settings_add_str("history", "scroll_page_count", "/2");
 	settings_add_time("misc", "paste_detect_time", "5msecs");
+	settings_add_bool("misc", "paste_use_bracketed_mode", FALSE);
 	/* NOTE: function keys can generate at least 5 characters long
 	   keycodes. this must be larger to allow them to work. */
 	settings_add_int("misc", "paste_verify_line_count", 5);

From 15dad291c7829c4ae7855880654b94d6edb4f17f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 8 Sep 2015 00:55:34 +0200
Subject: [PATCH 0156/1650] Replace some hairy logic with g_array_remove_range

In the hope it'll do the same under the hood.
---
 src/fe-text/gui-readline.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 90399711..c4c0064e 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -679,9 +679,7 @@ static void sig_input(void)
 			if (seq_start) {
 				paste_bracketed_mode = TRUE;
 				/* remove the leading sequence chars */
-				memmove(paste_buffer->data, paste_buffer->data + sizeof(bp_start),
-					paste_buffer->len * g_array_get_element_size(paste_buffer) - sizeof(bp_start));
-				g_array_set_size(paste_buffer, paste_buffer->len - 6);
+				g_array_remove_range(paste_buffer, 0, 6);
 			}
 
 			if (seq_end) {

From 4764b102ff274f4a8695ced2ff2ebb39bf8d7bc2 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 9 Sep 2015 22:35:11 +0200
Subject: [PATCH 0157/1650] Enable the bracketed paste mode on demand

---
 src/fe-text/gui-readline.c  | 3 +++
 src/fe-text/term-terminfo.c | 8 ++++++++
 src/fe-text/term.h          | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index c4c0064e..91dec4ea 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -969,6 +969,9 @@ static void setup_changed(void)
 	paste_verify_line_count = settings_get_int("paste_verify_line_count");
 	paste_join_multiline = settings_get_bool("paste_join_multiline");
 	paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
+
+	/* Enable the bracketed paste mode on demand */
+	term_set_bracketed_paste_mode(paste_use_bracketed_mode);
 }
 
 void gui_readline_init(void)
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index ded79c28..9376bda8 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -689,3 +689,11 @@ void term_gets(GArray *buffer, int *line_count)
 		}
 	}
 }
+
+void term_set_bracketed_paste_mode(int enable)
+{
+	if (enable)
+		tputs("\e[?2004h", 0, term_putchar);
+	else
+		tputs("\e[?2004l", 0, term_putchar);
+}
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index cdcc787a..692ce9c5 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -94,6 +94,8 @@ void term_refresh(TERM_WINDOW *window);
 
 void term_stop(void);
 
+void term_set_bracketed_paste_mode(int enable);
+
 /* keyboard input handling */
 void term_set_input_type(int type);
 void term_gets(GArray *buffer, int *line_count);

From 6888fc5fc74936af74fd30042e45652951648ea4 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 9 Sep 2015 22:41:17 +0200
Subject: [PATCH 0158/1650] Get rid of the non-portable memmem

The sequences we're after are found at the beginning or at the end of the
buffer, there's no need to scan the whole thing.
---
 src/fe-text/gui-readline.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 91dec4ea..87c824cf 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -666,15 +666,11 @@ static void sig_input(void)
 		/* use the bracketed paste mode to detect when the user pastes
 		 * some text into the entry */
 		if (paste_use_bracketed_mode != FALSE && paste_buffer->len > 12) {
-			/* try to find the start/end sequence */
-			int seq_start = memmem(paste_buffer->data,
-					       paste_buffer->len * g_array_get_element_size(paste_buffer),
-					       bp_start, sizeof(bp_start)) != NULL,
-			    seq_end   = memmem(paste_buffer->data,
-					       paste_buffer->len * g_array_get_element_size(paste_buffer),
-					       bp_end, sizeof(bp_end)) != NULL;
-
-			g_warning("found sequences : start %d end %d", seq_start, seq_end);
+			/* try to find the start/end sequence, we know that we
+			 * either find those at the start/end of the buffer or
+			 * we don't find those at all. */
+			int seq_start = !memcmp(paste_buffer->data, bp_start, sizeof(bp_start)),
+			    seq_end = !memcmp(paste_buffer->data + paste_buffer->len * g_array_get_element_size(paste_buffer) - sizeof(bp_end), bp_end, sizeof(bp_end));
 
 			if (seq_start) {
 				paste_bracketed_mode = TRUE;

From 9a6b2dedcce165211892b39cf7455314dfde57fb Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 17 Sep 2015 00:52:55 -0300
Subject: [PATCH 0159/1650] Improve bracketed paste start/end detection

- Use a keybinding to detect the start of a bracketed paste
- Iterate over the paste buffer looking for the end marker
---
 src/fe-text/gui-readline.c | 50 +++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 87c824cf..51b9f758 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -665,37 +665,44 @@ static void sig_input(void)
 
 		/* use the bracketed paste mode to detect when the user pastes
 		 * some text into the entry */
-		if (paste_use_bracketed_mode != FALSE && paste_buffer->len > 12) {
-			/* try to find the start/end sequence, we know that we
-			 * either find those at the start/end of the buffer or
-			 * we don't find those at all. */
-			int seq_start = !memcmp(paste_buffer->data, bp_start, sizeof(bp_start)),
-			    seq_end = !memcmp(paste_buffer->data + paste_buffer->len * g_array_get_element_size(paste_buffer) - sizeof(bp_end), bp_end, sizeof(bp_end));
+		if (paste_bracketed_mode) {
+			int i;
+			int len = paste_buffer->len - G_N_ELEMENTS(bp_end);
+			unichar *ptr = (unichar *) paste_buffer->data;
 
-			if (seq_start) {
-				paste_bracketed_mode = TRUE;
-				/* remove the leading sequence chars */
-				g_array_remove_range(paste_buffer, 0, 6);
+			if (len <= 0) {
+				return;
 			}
 
-			if (seq_end) {
-				paste_bracketed_mode = FALSE;
-				/* remove the trailing sequence chars */
-				g_array_set_size(paste_buffer, paste_buffer->len - 6);
-				/* decide what to do with the buffer */
-				paste_timeout(NULL);
+			for (i = 0; i <= len; i++, ptr++) {
+				if (ptr[0] == bp_end[0] && !memcmp(ptr, bp_end, sizeof(bp_end))) {
+					/* remove the trailing sequence chars */
+					g_array_set_size(paste_buffer, i);
+
+					/* decide what to do with the buffer */
+					paste_timeout(NULL);
+
+					paste_bracketed_mode = FALSE;
+					break;
+				}
 			}
 		}
 		else if (paste_detect_time > 0 && paste_buffer->len >= 3) {
 			if (paste_timeout_id != -1)
 				g_source_remove(paste_timeout_id);
 			paste_timeout_id = g_timeout_add(paste_detect_time, paste_timeout, NULL);
-		} else {
+		} else if (!paste_bracketed_mode) {
 			int i;
 
 			for (i = 0; i < paste_buffer->len; i++) {
 				unichar key = g_array_index(paste_buffer, unichar, i);
 				signal_emit("gui key pressed", 1, GINT_TO_POINTER(key));
+
+				if (paste_bracketed_mode) {
+					/* just enabled by the signal, remove what was processed so far */
+					g_array_remove_range(paste_buffer, 0, i + 1);
+					return;
+				}
 			}
 			g_array_set_size(paste_buffer, 0);
 			paste_line_count = 0;
@@ -703,6 +710,11 @@ static void sig_input(void)
 	}
 }
 
+static void key_paste_start(void)
+{
+	paste_bracketed_mode = TRUE;
+}
+
 time_t get_idle_time(void)
 {
 	return last_keypress.tv_sec;
@@ -1060,6 +1072,8 @@ void gui_readline_init(void)
 	key_bind("key", NULL, "meta2-5F", "cend", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;5F", "cend", (SIGNAL_FUNC) key_combo);
 
+	key_bind("paste_start", "Bracketed paste start", "meta2-200~", "paste_start", (SIGNAL_FUNC) key_paste_start);
+
 	/* cursor movement */
 	key_bind("backward_character", "Move the cursor a character backward", "left", NULL, (SIGNAL_FUNC) key_backward_character);
 	key_bind("forward_character", "Move the cursor a character forward", "right", NULL, (SIGNAL_FUNC) key_forward_character);
@@ -1155,6 +1169,8 @@ void gui_readline_deinit(void)
 
         key_configure_freeze();
 
+	key_unbind("paste_start", (SIGNAL_FUNC) key_paste_start);
+
 	key_unbind("backward_character", (SIGNAL_FUNC) key_backward_character);
 	key_unbind("forward_character", (SIGNAL_FUNC) key_forward_character);
  	key_unbind("backward_word", (SIGNAL_FUNC) key_backward_word);

From 52729ca3da6ca594d710f58f252ac6cd6952fab0 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 17 Sep 2015 00:54:13 -0300
Subject: [PATCH 0160/1650] Save the part of the paste buffer after the bp_end
 marker for later

Also move relevant code to a paste_bracketed_end() function
---
 src/fe-text/gui-readline.c | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 51b9f758..61cdad1a 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -61,6 +61,7 @@ static int paste_detect_time, paste_verify_line_count;
 static char *paste_entry;
 static int paste_entry_pos;
 static GArray *paste_buffer;
+static GArray *paste_buffer_rest;
 
 static char *paste_old_prompt;
 static int paste_prompt, paste_line_count;
@@ -331,6 +332,12 @@ static void paste_flush(int send)
 		paste_send();
 	g_array_set_size(paste_buffer, 0);
 
+	/* re-add anything that may have been after the bracketed paste end */
+	if (paste_buffer_rest->len) {
+		g_array_append_vals(paste_buffer, paste_buffer_rest->data, paste_buffer_rest->len);
+		g_array_set_size(paste_buffer_rest, 0);
+	}
+
 	gui_entry_set_prompt(active_entry,
 			     paste_old_prompt == NULL ? "" : paste_old_prompt);
 	g_free(paste_old_prompt); paste_old_prompt = NULL;
@@ -643,6 +650,26 @@ static gboolean paste_timeout(gpointer data)
 	return FALSE;
 }
 
+static void paste_bracketed_end(int i, gboolean rest)
+{
+	/* if there's stuff after the end bracket, save it for later */
+	if (rest) {
+		unichar *start = ((unichar *) paste_buffer->data) + i + G_N_ELEMENTS(bp_end);
+		int len = paste_buffer->len - G_N_ELEMENTS(bp_end);
+
+		g_array_set_size(paste_buffer_rest, 0);
+		g_array_append_vals(paste_buffer_rest, start, len);
+	}
+
+	/* remove the rest, including the trailing sequence chars */
+	g_array_set_size(paste_buffer, i);
+
+	/* decide what to do with the buffer */
+	paste_timeout(NULL);
+
+	paste_bracketed_mode = FALSE;
+}
+
 static void sig_input(void)
 {
 	if (!active_entry) {
@@ -676,13 +703,7 @@ static void sig_input(void)
 
 			for (i = 0; i <= len; i++, ptr++) {
 				if (ptr[0] == bp_end[0] && !memcmp(ptr, bp_end, sizeof(bp_end))) {
-					/* remove the trailing sequence chars */
-					g_array_set_size(paste_buffer, i);
-
-					/* decide what to do with the buffer */
-					paste_timeout(NULL);
-
-					paste_bracketed_mode = FALSE;
+					paste_bracketed_end(i, i != len);
 					break;
 				}
 			}
@@ -993,6 +1014,7 @@ void gui_readline_init(void)
 	paste_entry = NULL;
 	paste_entry_pos = 0;
 	paste_buffer = g_array_new(FALSE, FALSE, sizeof(unichar));
+	paste_buffer_rest = g_array_new(FALSE, FALSE, sizeof(unichar));
         paste_old_prompt = NULL;
 	paste_timeout_id = -1;
 	paste_bracketed_mode = FALSE;
@@ -1228,6 +1250,7 @@ void gui_readline_deinit(void)
 	key_unbind("stop_irc", (SIGNAL_FUNC) key_sig_stop);
 	keyboard_destroy(keyboard);
         g_array_free(paste_buffer, TRUE);
+        g_array_free(paste_buffer_rest, TRUE);
 
         key_configure_thaw();
 

From 3b01198f0306676425f2bf90db2ca9c7179b014e Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 25 Sep 2015 01:37:06 -0300
Subject: [PATCH 0161/1650] paste_bracketed_end: Fix rest length calculation

---
 src/fe-text/gui-readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 61cdad1a..8d571041 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -655,7 +655,7 @@ static void paste_bracketed_end(int i, gboolean rest)
 	/* if there's stuff after the end bracket, save it for later */
 	if (rest) {
 		unichar *start = ((unichar *) paste_buffer->data) + i + G_N_ELEMENTS(bp_end);
-		int len = paste_buffer->len - G_N_ELEMENTS(bp_end);
+		int len = paste_buffer->len - i - G_N_ELEMENTS(bp_end);
 
 		g_array_set_size(paste_buffer_rest, 0);
 		g_array_append_vals(paste_buffer_rest, start, len);

From 79987d87f37f37ce07171ad4c6b94ffbab77b36d Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 25 Sep 2015 02:21:27 -0300
Subject: [PATCH 0162/1650] Send last line of bracketed paste together with the
 rest

---
 src/fe-text/gui-readline.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 8d571041..7f1ed9ca 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -69,6 +69,7 @@ static int paste_join_multiline;
 static int paste_timeout_id;
 static int paste_use_bracketed_mode;
 static int paste_bracketed_mode;
+static int paste_was_bracketed_mode;
 
 /* Terminal sequences that surround the input when the terminal has the
  * bracketed paste mode active. Fror more details see
@@ -258,9 +259,16 @@ static void paste_buffer_join_lines(GArray *buf)
 	g_array_set_size(buf, dest - arr);
 }
 
+static void paste_send_line(char *text)
+{
+	/* we need to get the current history every time because it might change between calls */
+	command_history_add(command_history_current(active_win), text);
+
+	signal_emit("send command", 3, text, active_win->active_server, active_win->active);
+}
+
 static void paste_send(void)
 {
-	HISTORY_REC *history;
 	unichar *arr;
 	GString *str;
 	char out[10], *text;
@@ -285,11 +293,7 @@ static void paste_send(void)
 		}
 
 		text = gui_entry_get_text(active_entry);
-		history = command_history_current(active_win);
-		command_history_add(history, text);
-
-		signal_emit("send command", 3, text,
-			    active_win->active_server, active_win->active);
+		paste_send_line(text);
 		g_free(text);
 	}
 
@@ -297,12 +301,7 @@ static void paste_send(void)
 	str = g_string_new(NULL);
 	for (; i < paste_buffer->len; i++) {
 		if (arr[i] == '\r' || arr[i] == '\n') {
-			history = command_history_current(active_win);
-			command_history_add(history, str->str);
-
-			signal_emit("send command", 3, str->str,
-				    active_win->active_server,
-				    active_win->active);
+			paste_send_line(str->str);
 			g_string_truncate(str, 0);
 		} else if (active_entry->utf8) {
 			out[g_unichar_to_utf8(arr[i], out)] = '\0';
@@ -316,7 +315,14 @@ static void paste_send(void)
 		}
 	}
 
-	gui_entry_set_text(active_entry, str->str);
+	if (paste_was_bracketed_mode) {
+		/* the text before the bracket end should be sent along with the rest */
+		paste_send_line(str->str);
+		gui_entry_set_text(active_entry, "");
+	} else {
+		gui_entry_set_text(active_entry, str->str);
+	}
+
 	g_string_free(str, TRUE);
 }
 
@@ -632,6 +638,8 @@ static void key_delete_to_next_space(void)
 
 static gboolean paste_timeout(gpointer data)
 {
+	paste_was_bracketed_mode = paste_bracketed_mode;
+
 	if (paste_line_count == 0) {
 		int i;
 

From 83f9772e213b6b1e181338738c2997150162c871 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 25 Sep 2015 02:23:38 -0300
Subject: [PATCH 0163/1650] Fix some minor style issues

---
 src/fe-text/gui-readline.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 7f1ed9ca..9b635139 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -710,13 +710,12 @@ static void sig_input(void)
 			}
 
 			for (i = 0; i <= len; i++, ptr++) {
-				if (ptr[0] == bp_end[0] && !memcmp(ptr, bp_end, sizeof(bp_end))) {
+				if (ptr[0] == bp_end[0] && memcmp(ptr, bp_end, sizeof(bp_end)) == 0) {
 					paste_bracketed_end(i, i != len);
 					break;
 				}
 			}
-		}
-		else if (paste_detect_time > 0 && paste_buffer->len >= 3) {
+		} else if (paste_detect_time > 0 && paste_buffer->len >= 3) {
 			if (paste_timeout_id != -1)
 				g_source_remove(paste_timeout_id);
 			paste_timeout_id = g_timeout_add(paste_detect_time, paste_timeout, NULL);

From 7d062a313add81584608f2b0abf086f2b73e8098 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 25 Sep 2015 02:27:59 -0300
Subject: [PATCH 0164/1650] Create paste_bracketed_middle() function to handle
 small pastes

"Small" as in ending in the same sig_input() call where they started
---
 src/fe-text/gui-readline.c | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 9b635139..5d859ede 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -678,6 +678,24 @@ static void paste_bracketed_end(int i, gboolean rest)
 	paste_bracketed_mode = FALSE;
 }
 
+static void paste_bracketed_middle()
+{
+	int i;
+	int len = paste_buffer->len - G_N_ELEMENTS(bp_end);
+	unichar *ptr = (unichar *) paste_buffer->data;
+
+	if (len <= 0) {
+		return;
+	}
+
+	for (i = 0; i <= len; i++, ptr++) {
+		if (ptr[0] == bp_end[0] && memcmp(ptr, bp_end, sizeof(bp_end)) == 0) {
+			paste_bracketed_end(i, i != len);
+			break;
+		}
+	}
+}
+
 static void sig_input(void)
 {
 	if (!active_entry) {
@@ -701,20 +719,8 @@ static void sig_input(void)
 		/* use the bracketed paste mode to detect when the user pastes
 		 * some text into the entry */
 		if (paste_bracketed_mode) {
-			int i;
-			int len = paste_buffer->len - G_N_ELEMENTS(bp_end);
-			unichar *ptr = (unichar *) paste_buffer->data;
+			paste_bracketed_middle();
 
-			if (len <= 0) {
-				return;
-			}
-
-			for (i = 0; i <= len; i++, ptr++) {
-				if (ptr[0] == bp_end[0] && memcmp(ptr, bp_end, sizeof(bp_end)) == 0) {
-					paste_bracketed_end(i, i != len);
-					break;
-				}
-			}
 		} else if (paste_detect_time > 0 && paste_buffer->len >= 3) {
 			if (paste_timeout_id != -1)
 				g_source_remove(paste_timeout_id);
@@ -729,6 +735,9 @@ static void sig_input(void)
 				if (paste_bracketed_mode) {
 					/* just enabled by the signal, remove what was processed so far */
 					g_array_remove_range(paste_buffer, 0, i + 1);
+
+					/* handle single-line / small pastes here */
+					paste_bracketed_middle();
 					return;
 				}
 			}

From c721d57688e8f5413df7c179eac54c315343fbb0 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 25 Sep 2015 03:09:14 -0300
Subject: [PATCH 0165/1650] Handle a paste start marker right after an end one
 (ignore both)

This actually workarounds a bug with the "st" terminal, for which i've
already submitted a patch, but irssi needs to be able to handle it
decently too.
---
 src/fe-text/gui-readline.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 5d859ede..4616e919 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -681,7 +681,8 @@ static void paste_bracketed_end(int i, gboolean rest)
 static void paste_bracketed_middle()
 {
 	int i;
-	int len = paste_buffer->len - G_N_ELEMENTS(bp_end);
+	int marklen = G_N_ELEMENTS(bp_end);
+	int len = paste_buffer->len - marklen;
 	unichar *ptr = (unichar *) paste_buffer->data;
 
 	if (len <= 0) {
@@ -690,6 +691,23 @@ static void paste_bracketed_middle()
 
 	for (i = 0; i <= len; i++, ptr++) {
 		if (ptr[0] == bp_end[0] && memcmp(ptr, bp_end, sizeof(bp_end)) == 0) {
+
+			/* if there are at least 6 bytes after the end,
+			 * check for another start marker right afterwards */
+			if (i <= (len - marklen) &&
+			    memcmp(ptr + marklen, bp_start, sizeof(bp_start)) == 0) {
+
+				/* remove both markers*/
+				g_array_remove_range(paste_buffer, i, marklen * 2);
+				len -= marklen * 2;
+
+				/* go one step back */
+				if (i > 0) {
+					i--;
+					ptr--;
+				}
+				continue;
+			}
 			paste_bracketed_end(i, i != len);
 			break;
 		}

From 7866d2bcd6797b8279238ffb2f710bd9ea599cc8 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 25 Sep 2015 03:22:02 -0300
Subject: [PATCH 0166/1650] Handle empty bracketed pastes (or sequences of
 those)

Both cases were off-by-one mistakes erring on the side of being too
conservative. This fixes these two harmless issues:

- For a single empty paste, it required another keystroke before
  processing it
- For a sequence of themcase, a single '~' was left in the input
---
 src/fe-text/gui-readline.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 4616e919..6e169b93 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -685,7 +685,7 @@ static void paste_bracketed_middle()
 	int len = paste_buffer->len - marklen;
 	unichar *ptr = (unichar *) paste_buffer->data;
 
-	if (len <= 0) {
+	if (len < 0) {
 		return;
 	}
 
@@ -702,10 +702,8 @@ static void paste_bracketed_middle()
 				len -= marklen * 2;
 
 				/* go one step back */
-				if (i > 0) {
-					i--;
-					ptr--;
-				}
+				i--;
+				ptr--;
 				continue;
 			}
 			paste_bracketed_end(i, i != len);

From 0f066aac11e9a56f394330a8d7dab3428594a623 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chi6rag@gmail.com>
Date: Mon, 28 Sep 2015 08:54:19 +0530
Subject: [PATCH 0167/1650] Remove Typo from FAQs

---
 docs/startup-HOWTO.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 30caf657..deff3116 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -391,7 +391,7 @@ messages window.</p>
 the connection into some window. IRSSI DOES NOT. There is no required
 relationship between window and server. You can connect to 10 servers
 and manage them all in just one window, or join channel in each one of
-them to one sigle window if you really want to. That being said, here's
+them to one single window if you really want to. That being said, here's
 how you do connect to new server without closing the old connection:</p>
 
 <pre>

From cff536ab7091e79747352ff1f1d1d832870b2fb4 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Tue, 29 Sep 2015 10:39:49 +0200
Subject: [PATCH 0168/1650] Add sasl info to /network list output if available

---
 src/fe-common/irc/fe-ircnet.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index dab6f57f..c341081a 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -56,6 +56,11 @@ static void cmd_network_list(void)
 			g_string_append_printf(str, "autosendcmd: %s, ", rec->autosendcmd);
 		if (rec->usermode != NULL)
 			g_string_append_printf(str, "usermode: %s, ", rec->usermode);
+		if (rec->sasl_username != NULL) {
+			g_string_append_printf(str, "sasl_mechanism: %s, ", rec->sasl_mechanism);
+			g_string_append_printf(str, "sasl_username: %s, ", rec->sasl_username);
+			g_string_append_printf(str, "sasl_password: (pass), ");
+		}
 
 		if (rec->cmd_queue_speed > 0)
 			g_string_append_printf(str, "cmdspeed: %d, ", rec->cmd_queue_speed);

From b04b5f0f1d03be6282f7ba835b8a4f29b18b9c69 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Tue, 29 Sep 2015 11:44:11 +0200
Subject: [PATCH 0169/1650] Make sure sasl settings are defined before printing
 them out

---
 src/fe-common/irc/fe-ircnet.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index c341081a..bb0af313 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -56,12 +56,12 @@ static void cmd_network_list(void)
 			g_string_append_printf(str, "autosendcmd: %s, ", rec->autosendcmd);
 		if (rec->usermode != NULL)
 			g_string_append_printf(str, "usermode: %s, ", rec->usermode);
-		if (rec->sasl_username != NULL) {
+		if (rec->sasl_mechanism != NULL)
 			g_string_append_printf(str, "sasl_mechanism: %s, ", rec->sasl_mechanism);
+		if (rec->sasl_username != NULL)
 			g_string_append_printf(str, "sasl_username: %s, ", rec->sasl_username);
+		if (rec->sasl_password != NULL)
 			g_string_append_printf(str, "sasl_password: (pass), ");
-		}
-
 		if (rec->cmd_queue_speed > 0)
 			g_string_append_printf(str, "cmdspeed: %d, ", rec->cmd_queue_speed);
 		if (rec->max_cmds_at_once > 0)

From 00176dbff5af1a649a1f45972c45d661912aa8be Mon Sep 17 00:00:00 2001
From: Jellyfrog <Jellyfrog@users.noreply.github.com>
Date: Tue, 29 Sep 2015 17:34:35 +0200
Subject: [PATCH 0170/1650] Switch to modern Travis CI infrastructure

Fixes #310
---
 .travis.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35226645..aa807a7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: perl
 perl:
     - "5.20-shrplib"
@@ -7,19 +8,22 @@ env:
     - CC=clang
     - CC=gcc
 
+addons:
+    apt:
+        packages:
+            - libperl-dev
+            - elinks
+
 before_install:
-    - sudo apt-get update -qq
     - perl -V
-    - sudo apt-get build-dep -qq irssi
-    - sudo apt-get install -qq lynx
 
 install: true
 
 script:
-    - ./autogen.sh --with-proxy --with-bot --with-perl=module
+    - ./autogen.sh --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build --enable-silent-rules
     - cat config.log
     - make
-    - sudo make install
+    - make install
 
 notifications:
     irc:

From 2ad6bb12955b3e9bfa43628e6dbfc984537f8b26 Mon Sep 17 00:00:00 2001
From: isundil <isundill@gmail.com>
Date: Thu, 1 Oct 2015 21:14:30 +0200
Subject: [PATCH 0171/1650] Fix #45 Make it easy to delete default channels,
 servers and networks Removing network will now also remove all attached
 servers

---
 src/core/servers-setup.c      | 18 ++++++++++++++++++
 src/core/servers-setup.h      |  4 ++++
 src/fe-common/irc/fe-ircnet.c |  6 ++++++
 3 files changed, 28 insertions(+)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 90a447d4..74b818e7 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -333,6 +333,24 @@ server_create_conn(int chat_type, const char *dest, int port,
 				chatnet, password, nick);
 }
 
+GSList *server_setup_find_chatnet(const char *chatnet)
+{
+	GSList *servers;
+	GSList *tmp;
+
+	g_return_val_if_fail(chatnet != NULL, NULL);
+
+	servers = NULL;
+	for (tmp = setupservers; tmp != NULL; tmp = tmp->next) {
+		SERVER_SETUP_REC *rec = tmp->data;
+
+		if (g_ascii_strcasecmp(rec->chatnet, chatnet) == 0)
+			servers = g_slist_append(servers, rec);
+	}
+
+	return servers;
+}
+
 /* Find matching server from setup. Try to find record with a same port,
    but fallback to any server with the same address. */
 SERVER_SETUP_REC *server_setup_find(const char *address, int port,
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index f7601a68..dffaec02 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -36,6 +36,10 @@ server_create_conn(int chat_type, const char *dest, int port,
 SERVER_SETUP_REC *server_setup_find(const char *address, int port,
 				    const char *chatnet);
 
+/* Find all servers matching chatnet.
+   Return a list of SERVER_SETUP_REC */
+GSList *server_setup_find_chatnet(const char *chatnet);
+
 void server_setup_add(SERVER_SETUP_REC *rec);
 void server_setup_remove(SERVER_SETUP_REC *rec);
 
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index bb0af313..1760b966 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -176,6 +176,8 @@ static void cmd_network_add(const char *data)
 static void cmd_network_remove(const char *data)
 {
 	IRC_CHATNET_REC *rec;
+	GSList *servers;
+	GSList *tmp;
 
 	if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
 
@@ -183,6 +185,10 @@ static void cmd_network_remove(const char *data)
 	if (rec == NULL)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_NOT_FOUND, data);
 	else {
+		servers = server_setup_find_chatnet(data);
+
+		for (tmp = servers; tmp != NULL; tmp = tmp->next)
+			server_setup_remove((SERVER_SETUP_REC *) tmp->data);
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_REMOVED, data);
 		chatnet_remove(CHATNET(rec));
 	}

From 6ca7dc68478772258dea114d29625dc2c87999f9 Mon Sep 17 00:00:00 2001
From: isundil <isundill@gmail.com>
Date: Thu, 1 Oct 2015 22:36:02 +0200
Subject: [PATCH 0172/1650] Updated server removal Removing network will also
 remove attached channels

---
 src/core/channels-setup.c     | 15 +++++++++++++++
 src/core/channels-setup.h     |  3 +++
 src/core/servers-setup.c      | 33 +++++++++++++++------------------
 src/core/servers-setup.h      |  7 +++----
 src/fe-common/irc/fe-ircnet.c | 10 ++++------
 5 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index b2d971dd..2902ef8e 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -86,6 +86,21 @@ static void channel_setup_destroy(CHANNEL_SETUP_REC *channel)
 	g_free(channel);
 }
 
+void channel_setup_remove_chatnet(const char *chatnet)
+{
+	GSList *tmp, *next;
+
+	g_return_if_fail(chatnet != NULL);
+
+	for (tmp = setupchannels; tmp != NULL; tmp = next) {
+		CHANNEL_SETUP_REC *rec = tmp->data;
+
+		next = tmp->next;
+		if (g_ascii_strcasecmp(rec->chatnet, chatnet) == 0)
+			channel_setup_remove(rec);
+	}
+}
+
 void channel_setup_remove(CHANNEL_SETUP_REC *channel)
 {
         channel_config_remove(channel);
diff --git a/src/core/channels-setup.h b/src/core/channels-setup.h
index 61b828b2..3bb7da7f 100644
--- a/src/core/channels-setup.h
+++ b/src/core/channels-setup.h
@@ -21,6 +21,9 @@ void channels_setup_deinit(void);
 void channel_setup_create(CHANNEL_SETUP_REC *channel);
 void channel_setup_remove(CHANNEL_SETUP_REC *channel);
 
+/* Remove channels attached to chatnet */
+void channel_setup_remove_chatnet(const char *chatnet);
+
 CHANNEL_SETUP_REC *channel_setup_find(const char *channel,
 				      const char *chatnet);
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 74b818e7..cd5fe406 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -333,24 +333,6 @@ server_create_conn(int chat_type, const char *dest, int port,
 				chatnet, password, nick);
 }
 
-GSList *server_setup_find_chatnet(const char *chatnet)
-{
-	GSList *servers;
-	GSList *tmp;
-
-	g_return_val_if_fail(chatnet != NULL, NULL);
-
-	servers = NULL;
-	for (tmp = setupservers; tmp != NULL; tmp = tmp->next) {
-		SERVER_SETUP_REC *rec = tmp->data;
-
-		if (g_ascii_strcasecmp(rec->chatnet, chatnet) == 0)
-			servers = g_slist_append(servers, rec);
-	}
-
-	return servers;
-}
-
 /* Find matching server from setup. Try to find record with a same port,
    but fallback to any server with the same address. */
 SERVER_SETUP_REC *server_setup_find(const char *address, int port,
@@ -523,6 +505,21 @@ void server_setup_add(SERVER_SETUP_REC *rec)
 	signal_emit("server setup updated", 1, rec);
 }
 
+void server_setup_remove_chatnet(const char *chatnet)
+{
+	GSList *tmp, *next;
+
+	g_return_val_if_fail(chatnet != NULL, NULL);
+
+	for (tmp = setupservers; tmp != NULL; tmp = next) {
+		SERVER_SETUP_REC *rec = tmp->data;
+
+		next = tmp->next;
+		if (g_ascii_strcasecmp(rec->chatnet, chatnet) == 0)
+			server_setup_remove(rec);
+	}
+}
+
 void server_setup_remove(SERVER_SETUP_REC *rec)
 {
 	server_setup_remove_config(rec);
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index dffaec02..e7ff7abf 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -36,13 +36,12 @@ server_create_conn(int chat_type, const char *dest, int port,
 SERVER_SETUP_REC *server_setup_find(const char *address, int port,
 				    const char *chatnet);
 
-/* Find all servers matching chatnet.
-   Return a list of SERVER_SETUP_REC */
-GSList *server_setup_find_chatnet(const char *chatnet);
-
 void server_setup_add(SERVER_SETUP_REC *rec);
 void server_setup_remove(SERVER_SETUP_REC *rec);
 
+/* Remove servers attached to chatne */
+void server_setup_remove_chatnet(const char *chatnet);
+
 void servers_setup_init(void);
 void servers_setup_deinit(void);
 
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 1760b966..4d7037d5 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -29,6 +29,8 @@
 #include "irc-servers.h"
 #include "irc-chatnets.h"
 #include "printtext.h"
+#include "servers-setup.h"
+#include "channels-setup.h"
 
 static void cmd_network_list(void)
 {
@@ -176,8 +178,6 @@ static void cmd_network_add(const char *data)
 static void cmd_network_remove(const char *data)
 {
 	IRC_CHATNET_REC *rec;
-	GSList *servers;
-	GSList *tmp;
 
 	if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
 
@@ -185,10 +185,8 @@ static void cmd_network_remove(const char *data)
 	if (rec == NULL)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_NOT_FOUND, data);
 	else {
-		servers = server_setup_find_chatnet(data);
-
-		for (tmp = servers; tmp != NULL; tmp = tmp->next)
-			server_setup_remove((SERVER_SETUP_REC *) tmp->data);
+		server_setup_remove_chatnet(data);
+		channel_setup_remove_chatnet(data);
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_REMOVED, data);
 		chatnet_remove(CHATNET(rec));
 	}

From ef1a09b87d5df7fcaeced70e09312c225d99c4b6 Mon Sep 17 00:00:00 2001
From: isundil <isundill@gmail.com>
Date: Thu, 1 Oct 2015 22:53:34 +0200
Subject: [PATCH 0173/1650] Fix return value of server_setup_remove_chatnet

---
 src/core/servers-setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index cd5fe406..771e3999 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -509,7 +509,7 @@ void server_setup_remove_chatnet(const char *chatnet)
 {
 	GSList *tmp, *next;
 
-	g_return_val_if_fail(chatnet != NULL, NULL);
+	g_return_if_fail(chatnet != NULL);
 
 	for (tmp = setupservers; tmp != NULL; tmp = next) {
 		SERVER_SETUP_REC *rec = tmp->data;

From a475d57183bcbfd6e540dba5cd7894d8c38b53b7 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 1 Oct 2015 22:25:40 +0200
Subject: [PATCH 0174/1650] Save the sasl state in the session

This is seemingly required to have irssi re-authenticate after a
restart.
---
 src/irc/core/irc-session.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index ea65d8a5..18e8e5c7 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -28,6 +28,8 @@
 #include "irc-channels.h"
 #include "irc-nicklist.h"
 
+#include "sasl.h"
+
 struct _isupport_data { CONFIG_REC *config; CONFIG_NODE *node; };
 
 static void session_isupport_foreach(char *key, char *value, struct _isupport_data *data)
@@ -65,6 +67,10 @@ static void sig_session_save_server(IRC_SERVER_REC *server, CONFIG_REC *config,
 	config_node_set_str(config, node, "away_reason", server->away_reason);
 	config_node_set_bool(config, node, "emode_known", server->emode_known);
 
+	config_node_set_int(config, node, "sasl_mechanism", server->connrec->sasl_mechanism);
+	config_node_set_str(config, node, "sasl_username", server->connrec->sasl_username);
+	config_node_set_str(config, node, "sasl_password", server->connrec->sasl_password);
+
 	config_node_set_bool(config, node, "isupport_sent", server->isupport_sent);
 	isupport = config_node_section(config, node, "isupport", NODE_TYPE_BLOCK);
         isupport_data.config = config;
@@ -90,6 +96,15 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 	server->emode_known = config_node_get_bool(node, "emode_known", FALSE);
 	server->isupport_sent = config_node_get_bool(node, "isupport_sent", FALSE);
 
+	server->connrec->sasl_mechanism = config_node_get_int(node, "sasl_mechanism", SASL_MECHANISM_NONE);
+	/* The fields below might have been filled when loading the chatnet
+	 * description from the config and we favor the content that's been saved
+	 * in the session file over that. */
+	g_free(server->connrec->sasl_username);
+	server->connrec->sasl_username = g_strdup(config_node_get_str(node, "sasl_username", NULL));
+	g_free(server->connrec->sasl_password);
+	server->connrec->sasl_password = g_strdup(config_node_get_str(node, "sasl_password", NULL));
+
 	if (server->isupport == NULL) {
 		server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
 						    (GCompareFunc) g_istr_equal);

From cfff402fe677316d286ce6663b8afeee4be95526 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 2 Oct 2015 11:25:30 +0200
Subject: [PATCH 0175/1650] Don't set the usermode field if blank

Fixes FS#919
---
 src/irc/core/irc-chatnets.c      |  5 ++++-
 src/irc/core/irc-servers-setup.c | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index d72f71dd..0796e0cb 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -35,10 +35,13 @@ void ircnet_create(IRC_CHATNET_REC *rec)
 
 static void sig_chatnet_read(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 {
+	char *value;
+
 	if (!IS_IRC_CHATNET(rec))
 		return;
 
-	rec->usermode = g_strdup(config_node_get_str(node, "usermode", NULL));
+	value = config_node_get_str(node, "usermode", NULL);
+	rec->usermode = (value != NULL && *value != '\0') ? g_strdup(value) : NULL;
 
 	rec->max_cmds_at_once = config_node_get_int(node, "cmdmax", 0);
 	rec->cmd_queue_speed = config_node_get_int(node, "cmdspeed", 0);
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index bf1d2ddf..f425b587 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -48,12 +48,18 @@ static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
 
 static void sig_server_setup_fill_connect(IRC_SERVER_CONNECT_REC *conn)
 {
+	const char *value;
+
 	if (!IS_IRC_SERVER_CONNECT(conn))
 		return;
 
-	conn->alternate_nick = *settings_get_str("alternate_nick") != '\0' ?
-		g_strdup(settings_get_str("alternate_nick")) : NULL;
-        conn->usermode = g_strdup(settings_get_str("usermode"));
+	value = settings_get_str("alternate_nick");
+	conn->alternate_nick = (value != NULL && *value != '\0') ?
+		g_strdup(value) : NULL;
+
+	value = settings_get_str("usermode");
+	conn->usermode = (value != NULL && *value != '\0') ?
+		g_strdup(value) : NULL;
 }
 
 static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,

From b545bc96a9e1a875beb50d9202161864ca8164d8 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 2 Oct 2015 12:39:08 +0200
Subject: [PATCH 0176/1650] Fix a memory leak.

g_get_current_dir() returns a heap-allocated string.
---
 src/core/core.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/core.c b/src/core/core.c
index b9debbb5..879d346f 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -156,11 +156,17 @@ static void sig_init_finished(void)
 static char *fix_path(const char *str)
 {
 	char *new_str = convert_home(str);
+
 	if (!g_path_is_absolute(new_str)) {
 		char *tmp_str = new_str;
-		new_str = g_strdup_printf("%s/%s", g_get_current_dir(), tmp_str);
+		char *current_dir = g_get_current_dir();
+
+		new_str = g_build_path(G_DIR_SEPARATOR_S, current_dir, tmp_str);
+
+		g_free(current_dir);
 		g_free(tmp_str);
 	}
+
 	return new_str;
 }
 

From 2e860abd2b8b3a30f74005450830c34a318b64a3 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 2 Oct 2015 14:04:04 +0200
Subject: [PATCH 0177/1650] Fix the display of utf8 sequences in the gui

term_addstr() had a long-standing fixme that suggested it didn't
take into account the string encoding when calculating the string
length.
The BIG5 code path is untested.
---
 src/fe-common/core/utf8.h   |  2 ++
 src/fe-text/gui-printtext.c |  7 +++--
 src/fe-text/term-terminfo.c | 53 ++++++++++++++++++++++++++++++++++---
 src/fe-text/term.h          |  2 +-
 4 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/core/utf8.h b/src/fe-common/core/utf8.h
index 3c15dc7d..70b44d7e 100644
--- a/src/fe-common/core/utf8.h
+++ b/src/fe-common/core/utf8.h
@@ -8,6 +8,8 @@
 #define is_big5_hi(hi)  (0x81 <= (hi) && (hi) <= 0xFE)
 #define is_big5(hi,lo) (is_big5_hi(hi) && is_big5_lo(lo))
 
+int strlen_big5(const unsigned char *str);
+
 /* Returns width for character (0-2). */
 int mk_wcwidth(unichar c);
 
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 547d39c9..d8272df5 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -220,16 +220,15 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 	get_colors(flags, &fg, &bg, &attr);
 
 	if (window == NULL) {
-                g_return_if_fail(next_xpos != -1);
+		g_return_if_fail(next_xpos != -1);
 
 		term_set_color2(root_window, attr, fg, bg);
 
 		term_move(root_window, next_xpos, next_ypos);
 		if (flags & GUI_PRINT_FLAG_CLRTOEOL)
 			term_clrtoeol(root_window);
-		term_addstr(root_window, str);
-		next_xpos += strlen(str); /* FIXME utf8 or big5 */
-                return;
+		next_xpos += term_addstr(root_window, str);
+		return;
 	}
 
 	lineinfo.level = dest == NULL ? 0 : dest->level;
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index ded79c28..8c95bc0d 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -522,15 +522,60 @@ void term_add_unichar(TERM_WINDOW *window, unichar chr)
 	}
 }
 
-void term_addstr(TERM_WINDOW *window, const char *str)
+int term_addstr(TERM_WINDOW *window, const char *str)
 {
-	int len;
+	int i, len, raw_len;
+	unichar *tmp;
+	const char *ptr;
 
 	if (vcmove) term_move_real();
-	len = strlen(str); /* FIXME utf8 or big5 */
+
+	raw_len = strlen(str);
+
+	/* The string length depends on the terminal encoding */
+	switch (term_type) {
+	case TERM_TYPE_BIG5:
+		len = strlen_big5((const unsigned char *)str);
+		break;
+	case TERM_TYPE_UTF8:
+		len = g_utf8_strlen(str, -1);
+		break;
+	default:
+		len = strlen(str);
+		break;
+	}
+
+	tmp = calloc(len, sizeof(unichar));
+	if (tmp == NULL)
+	    return 0;
+
+	switch (term_type) {
+	case TERM_TYPE_BIG5:
+	    big5_to_unichars(str, tmp);
+	    break;
+	case TERM_TYPE_UTF8:
+	    ptr = str;
+	    for (i = 0; i < len; i++) {
+		tmp[i] = g_utf8_get_char(ptr);
+		ptr = g_utf8_next_char(ptr);
+	    }
+	    break;
+	default:
+	    for (i = 0; i < len; i++)
+		tmp[i] = str[i];
+	}
+
+	for (len = i = 0; i < len; i++)
+	    len += unichar_isprint(tmp[i]) ? mk_wcwidth(tmp[i]) : 1;
+
+	free(tmp);
+
         term_printed_text(len);
 
-	fwrite(str, 1, len, window->term->out);
+	/* Use strlen() here since we need the number of raw bytes */
+	fwrite(str, 1, raw_len, window->term->out);
+
+	return len;
 }
 
 void term_clrtoeol(TERM_WINDOW *window)
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index cdcc787a..f0a76c42 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -83,7 +83,7 @@ void term_set_color(TERM_WINDOW *window, int col);
 void term_move(TERM_WINDOW *window, int x, int y);
 void term_addch(TERM_WINDOW *window, char chr);
 void term_add_unichar(TERM_WINDOW *window, unichar chr);
-void term_addstr(TERM_WINDOW *window, const char *str);
+int  term_addstr(TERM_WINDOW *window, const char *str);
 void term_clrtoeol(TERM_WINDOW *window);
 
 void term_move_cursor(int x, int y);

From c351c448b8dd2b9759e46c0c6e73ed5ead936ffc Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 2 Oct 2015 15:02:43 +0200
Subject: [PATCH 0178/1650] Rework the logic to avoid allocating memory

---
 src/fe-text/term-terminfo.c | 52 ++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 8c95bc0d..2ee69a1c 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -524,52 +524,38 @@ void term_add_unichar(TERM_WINDOW *window, unichar chr)
 
 int term_addstr(TERM_WINDOW *window, const char *str)
 {
-	int i, len, raw_len;
-	unichar *tmp;
+	int len, raw_len;
+	unichar tmp;
 	const char *ptr;
 
 	if (vcmove) term_move_real();
 
+	len = 0;
 	raw_len = strlen(str);
 
 	/* The string length depends on the terminal encoding */
-	switch (term_type) {
-	case TERM_TYPE_BIG5:
-		len = strlen_big5((const unsigned char *)str);
-		break;
-	case TERM_TYPE_UTF8:
-		len = g_utf8_strlen(str, -1);
-		break;
-	default:
-		len = strlen(str);
-		break;
-	}
 
-	tmp = calloc(len, sizeof(unichar));
-	if (tmp == NULL)
-	    return 0;
+	ptr = str;
 
-	switch (term_type) {
-	case TERM_TYPE_BIG5:
-	    big5_to_unichars(str, tmp);
-	    break;
-	case TERM_TYPE_UTF8:
-	    ptr = str;
-	    for (i = 0; i < len; i++) {
-		tmp[i] = g_utf8_get_char(ptr);
+	if (term_type != TERM_TYPE_BIG5) {
+	    while (*ptr != '\0') {
+		tmp = g_utf8_get_char(ptr);
+		len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
 		ptr = g_utf8_next_char(ptr);
 	    }
-	    break;
-	default:
-	    for (i = 0; i < len; i++)
-		tmp[i] = str[i];
+	} else {
+	    while (*ptr != '\0') {
+		if (is_big5(ptr[0], ptr[1])) {
+		    tmp = ptr[0] << 8 | ptr[1];
+		    ptr += 2;
+		} else {
+		    tmp = *ptr;
+		    ptr += 1;
+		}
+		len += (tmp > 0xff) ? 2 : 1; 
+	    }
 	}
 
-	for (len = i = 0; i < len; i++)
-	    len += unichar_isprint(tmp[i]) ? mk_wcwidth(tmp[i]) : 1;
-
-	free(tmp);
-
         term_printed_text(len);
 
 	/* Use strlen() here since we need the number of raw bytes */

From c7646dc58d1e70abc8d2981e08baa83e459affdb Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 2 Oct 2015 15:07:59 +0200
Subject: [PATCH 0179/1650] Even simpler logic

---
 src/fe-text/term-terminfo.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 2ee69a1c..6d289cfc 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -543,18 +543,8 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 		len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
 		ptr = g_utf8_next_char(ptr);
 	    }
-	} else {
-	    while (*ptr != '\0') {
-		if (is_big5(ptr[0], ptr[1])) {
-		    tmp = ptr[0] << 8 | ptr[1];
-		    ptr += 2;
-		} else {
-		    tmp = *ptr;
-		    ptr += 1;
-		}
-		len += (tmp > 0xff) ? 2 : 1; 
-	    }
-	}
+	} else
+	    len = raw_len;
 
         term_printed_text(len);
 

From 48ab298a67151e6fce33c1d7b34f4f83796b8d9a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 2 Oct 2015 15:08:48 +0200
Subject: [PATCH 0180/1650] Kill an unneeded declaration

---
 src/fe-common/core/utf8.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fe-common/core/utf8.h b/src/fe-common/core/utf8.h
index 70b44d7e..3c15dc7d 100644
--- a/src/fe-common/core/utf8.h
+++ b/src/fe-common/core/utf8.h
@@ -8,8 +8,6 @@
 #define is_big5_hi(hi)  (0x81 <= (hi) && (hi) <= 0xFE)
 #define is_big5(hi,lo) (is_big5_hi(hi) && is_big5_lo(lo))
 
-int strlen_big5(const unsigned char *str);
-
 /* Returns width for character (0-2). */
 int mk_wcwidth(unichar c);
 

From db5ae4adce6ad82150a4fef01c8b141631f89d96 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 2 Oct 2015 17:13:49 +0200
Subject: [PATCH 0181/1650] Flush the dirty buffer to disk

Given a big enough write_buffer_size and a long enough
write_buffer_timeout it might be possible to show the user an incomplete
or empty awaylog.

Patch by: Petteri Aimonen
---
 src/core/log-away.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/core/log-away.c b/src/core/log-away.c
index 681edcbf..c6de721c 100644
--- a/src/core/log-away.c
+++ b/src/core/log-away.c
@@ -62,6 +62,9 @@ static void awaylog_open(void)
 		return;
 	}
 
+	/* Flush the dirty buffers to disk before acquiring the file position */
+	write_buffer_flush();
+
 	awaylog = log;
 	away_filepos = lseek(log->handle, 0, SEEK_CUR);
 	away_msgs = 0;
@@ -83,6 +86,9 @@ static void awaylog_close(void)
 
 	if (awaylog == log) awaylog = NULL;
 
+	/* Flush the dirty buffers to disk before showing the away log */
+	write_buffer_flush();
+
 	signal_emit("awaylog show", 3, log, GINT_TO_POINTER(away_msgs),
 		    GINT_TO_POINTER(away_filepos));
 	log_close(log);

From ef55e0f6534a5b790131c320fd0490a5beb21a68 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 2 Oct 2015 13:48:23 -0300
Subject: [PATCH 0182/1650] Add missing null terminator to the g_build_path()
 varargs

Lemon broke it a few commits ago.
---
 src/core/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/core.c b/src/core/core.c
index 879d346f..bbeec6f4 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -161,7 +161,7 @@ static char *fix_path(const char *str)
 		char *tmp_str = new_str;
 		char *current_dir = g_get_current_dir();
 
-		new_str = g_build_path(G_DIR_SEPARATOR_S, current_dir, tmp_str);
+		new_str = g_build_path(G_DIR_SEPARATOR_S, current_dir, tmp_str, NULL);
 
 		g_free(current_dir);
 		g_free(tmp_str);

From a66bb95d0e3d76dfb6abda88d6f128540279b461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 2 Oct 2015 18:57:06 +0200
Subject: [PATCH 0183/1650] Use silent rules.

---
 .travis.yml  | 2 +-
 configure.ac | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aa807a7b..f066c17b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
 install: true
 
 script:
-    - ./autogen.sh --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build --enable-silent-rules
+    - ./autogen.sh --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
     - cat config.log
     - make
     - make install
diff --git a/configure.ac b/configure.ac
index 7bcd3fe7..325b5e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,8 @@ AC_CONFIG_HEADERS([irssi-config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.9 no-define foreign])
 
+AM_SILENT_RULES([yes])
+
 AM_MAINTAINER_MODE
 
 AC_PROG_CC

From da3f2f0d0174675faa1a092722e8298460254112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 2 Oct 2015 19:51:54 +0200
Subject: [PATCH 0184/1650] Set HOST_NAME_MAX to 255, if it's undefined.

Thanks to Jilles and dx.

Fixes #309
---
 src/irc/core/irc-expandos.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 5d8150f0..62ef577a 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -27,6 +27,10 @@
 #include "irc-channels.h"
 #include "nicklist.h"
 
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 255
+#endif
+
 static char *last_join;
 
 /* last person to join a channel you are on */
@@ -56,7 +60,7 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
 {
 	IRC_SERVER_REC *ircserver;
 	const char *username;
-	char hostname[HOST_NAME_MAX];
+	char hostname[HOST_NAME_MAX + 1];
 
 	ircserver = IRC_SERVER(server);
 
@@ -80,7 +84,7 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
 static char *expando_hostname(SERVER_REC *server, void *item, int *free_ret)
 {
 	IRC_SERVER_REC *ircserver;
-	char hostname[HOST_NAME_MAX];
+	char hostname[HOST_NAME_MAX + 1];
 	char **list;
 	char *hostname_split;
 

From b68a30cdfe43bec9cdb0e7c822b66d90ccf8982d Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 3 Oct 2015 14:32:38 +0200
Subject: [PATCH 0185/1650] Include write-buffer.h in log-away.c

Silence a warning and make the world a better place.
---
 src/core/log-away.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/log-away.c b/src/core/log-away.c
index c6de721c..e2a0120b 100644
--- a/src/core/log-away.c
+++ b/src/core/log-away.c
@@ -24,6 +24,7 @@
 #include "log.h"
 #include "servers.h"
 #include "settings.h"
+#include "write-buffer.h"
 
 static LOG_REC *awaylog;
 static int away_filepos;

From 48375c3f900f56434441caa0161c0531fd0ce435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sat, 3 Oct 2015 18:50:23 +0200
Subject: [PATCH 0186/1650] Simplify Travis config.

---
 .travis.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f066c17b..c8bbb6d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,15 +24,3 @@ script:
     - cat config.log
     - make
     - make install
-
-notifications:
-    irc:
-        channels:
-            - "irc.freenode.net#irssi"
-        template:
-            - "%{repository} (%{commit}: %{author}): %{message}"
-            - "Build details : %{build_url}"
-        on_success: always
-        on_failure: always
-        use_notice: true
-        skip_join: true

From 685d8fe5b033ffce40b02aaf4ec3341f5cf3350c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 2 Oct 2015 20:25:14 +0200
Subject: [PATCH 0187/1650] Add SETTING_TYPE_ANY and replace -1 with it.

---
 src/core/settings.c              |  9 +++++----
 src/core/settings.h              |  3 ++-
 src/fe-common/core/completion.c  |  5 ++---
 src/fe-common/core/fe-settings.c | 31 +++++++++++++++----------------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index b34a5766..8e493124 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -59,7 +59,7 @@ static SETTINGS_REC *settings_get(const char *key, SettingType type)
 		g_warning("settings_get(%s) : not found", key);
 		return NULL;
 	}
-	if (type != -1 && rec->type != type) {
+	if (type != SETTING_TYPE_ANY && rec->type != type) {
 		g_warning("settings_get(%s) : invalid type", key);
 		return NULL;
 	}
@@ -85,7 +85,7 @@ settings_get_str_type(const char *key, SettingType type)
 
 const char *settings_get_str(const char *key)
 {
-	return settings_get_str_type(key, -1);
+	return settings_get_str_type(key, SETTING_TYPE_ANY);
 }
 
 int settings_get_int(const char *key)
@@ -163,6 +163,7 @@ char *settings_get_print(SETTINGS_REC *rec)
 	case SETTING_TYPE_TIME:
 	case SETTING_TYPE_LEVEL:
 	case SETTING_TYPE_SIZE:
+	case SETTING_TYPE_ANY:
 		value = g_strdup(settings_get_str(rec->key));
 		break;
 	}
@@ -380,10 +381,10 @@ SettingType settings_get_type(const char *key)
 {
 	SETTINGS_REC *rec;
 
-	g_return_val_if_fail(key != NULL, -1);
+	g_return_val_if_fail(key != NULL, SETTING_TYPE_ANY);
 
 	rec = g_hash_table_lookup(settings, key);
-	return rec == NULL ? -1 : rec->type;
+	return rec == NULL ? SETTING_TYPE_ANY : rec->type;
 }
 
 /* Get the record of the setting */
diff --git a/src/core/settings.h b/src/core/settings.h
index af00cc80..6f2cf129 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -7,7 +7,8 @@ typedef enum {
 	SETTING_TYPE_BOOLEAN,
 	SETTING_TYPE_TIME,
 	SETTING_TYPE_LEVEL,
-	SETTING_TYPE_SIZE
+	SETTING_TYPE_SIZE,
+	SETTING_TYPE_ANY
 } SettingType;
 
 typedef struct {
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 312e417c..4461de92 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -362,8 +362,7 @@ static GList *completion_get_settings(const char *key, SettingType type)
 	for (tmp = sets; tmp != NULL; tmp = tmp->next) {
 		SETTINGS_REC *rec = tmp->data;
 
-		if ((type == -1 || rec->type == type) &&
-		    g_ascii_strncasecmp(rec->key, key, len) == 0)
+		if ((type == SETTING_TYPE_ANY || rec->type == type) && g_ascii_strncasecmp(rec->key, key, len) == 0)
 			complist = g_list_insert_sorted(complist, g_strdup(rec->key), (GCompareFunc) g_istr_cmp);
 	}
 	g_slist_free(sets);
@@ -682,7 +681,7 @@ static void sig_complete_set(GList **list, WINDOW_REC *window,
 
 	if (*line == '\0' ||
 	    !g_strcmp0("-clear", line) || !g_strcmp0("-default", line))
-		*list = completion_get_settings(word, -1);
+		*list = completion_get_settings(word, SETTING_TYPE_ANY);
 	else if (*line != '\0' && *word == '\0') {
 		SETTINGS_REC *rec = settings_get_record(line);
 		if (rec != NULL) {
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index 9c370838..2627989d 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -126,7 +126,7 @@ static void cmd_set(char *data)
 			/* change the setting */
 			switch (rec->type) {
 			case SETTING_TYPE_BOOLEAN:
-                                if (clear)
+				if (clear)
 					settings_set_bool(key, FALSE);
 				else if (set_default)
 					settings_set_bool(key, rec->default_value.v_bool);
@@ -149,32 +149,30 @@ static void cmd_set(char *data)
 			case SETTING_TYPE_TIME:
 				if (!settings_set_time(key, clear ? "0" :
 						       set_default ? rec->default_value.v_string : value))
-					printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-						    TXT_INVALID_TIME);
+					printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_INVALID_TIME);
 				break;
 			case SETTING_TYPE_LEVEL:
 				if (!settings_set_level(key, clear ? "" :
 							set_default ? rec->default_value.v_string : value))
-					printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-						    TXT_INVALID_LEVEL);
+					printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_INVALID_LEVEL);
 				break;
 			case SETTING_TYPE_SIZE:
 				if (!settings_set_size(key, clear ? "0" :
 						       set_default ? rec->default_value.v_string : value))
-					printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-						    TXT_INVALID_SIZE);
+					printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_INVALID_SIZE);
+				break;
+			case SETTING_TYPE_ANY:
+				/* Unpossible! */
 				break;
 			}
 			signal_emit("setup changed", 0);
-			printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP,
-				    TXT_SET_TITLE, rec->section);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_SET_TITLE, rec->section);
 			set_print(rec);
 		} else
-			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-				    TXT_SET_UNKNOWN, key);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_SET_UNKNOWN, key);
 	}
 
-        cmd_params_free(free_arg);
+	cmd_params_free(free_arg);
 }
 
 /* SYNTAX: TOGGLE <key> [on|off|toggle] */
@@ -187,20 +185,21 @@ static void cmd_toggle(const char *data)
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &key, &value))
 		return;
 
-        if (*key == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	if (*key == '\0')
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	type = settings_get_type(key);
-        if (type == -1)
+	if (type == SETTING_TYPE_ANY)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_SET_UNKNOWN, key);
 	else if (type != SETTING_TYPE_BOOLEAN)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_SET_NOT_BOOLEAN, key);
 	else {
 		set_boolean(key, *value != '\0' ? value : "TOGGLE");
-                set_print(settings_get_record(key));
+		set_print(settings_get_record(key));
 		signal_emit("setup changed", 0);
 	}
 
-        cmd_params_free(free_arg);
+	cmd_params_free(free_arg);
 }
 
 static int config_key_compare(CONFIG_NODE *node1, CONFIG_NODE *node2)

From 5f35fbc57a18eabc68723f1b82aacbfd84f637d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 2 Oct 2015 20:29:19 +0200
Subject: [PATCH 0188/1650] Remove check for >= 0 for unsigned unichar.

---
 src/fe-text/gui-entry.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 17a7c507..c7d06404 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -35,21 +35,21 @@ static unichar i_toupper(unichar c)
 {
 	if (term_type == TERM_TYPE_UTF8)
 		return g_unichar_toupper(c);
-	return (c >= 0 && c <= 255) ? toupper(c) : c;
+	return c <= 255 ? toupper(c) : c;
 }
 
 static unichar i_tolower(unichar c)
 {
 	if (term_type == TERM_TYPE_UTF8)
 		return g_unichar_tolower(c);
-	return (c >= 0 && c <= 255) ? tolower(c) : c;
+	return c <= 255 ? tolower(c) : c;
 }
 
 static int i_isalnum(unichar c)
 {
 	if (term_type == TERM_TYPE_UTF8)
 		return (g_unichar_isalnum(c) || mk_wcwidth(c) == 0);
-	return (c >= 0 && c <= 255) ? isalnum(c) : 0;
+	return c <= 255 ? isalnum(c) : 0;
 }
 
 GUI_ENTRY_REC *active_entry;

From 2127fd362e240a9fed09dff9044fe5c477fc2bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sat, 3 Oct 2015 19:07:08 +0200
Subject: [PATCH 0189/1650] Add -Wall and -Werror as CFLAGS to make.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c8bbb6d8..46f58766 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,5 +22,5 @@ install: true
 script:
     - ./autogen.sh --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
     - cat config.log
-    - make
+    - make CFLAGS="-Wall -Werror"
     - make install

From 0140e7c6b23ff1490965b080a7882b2508677d55 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 4 Oct 2015 11:56:54 +0200
Subject: [PATCH 0190/1650] Fix the indentation.

---
 src/fe-text/term-terminfo.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 6d289cfc..27be904e 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -537,14 +537,14 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 
 	ptr = str;
 
-	if (term_type != TERM_TYPE_BIG5) {
-	    while (*ptr != '\0') {
-		tmp = g_utf8_get_char(ptr);
-		len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
-		ptr = g_utf8_next_char(ptr);
-	    }
+	if (term_type == TERM_TYPE_UTF8) {
+		while (*ptr != '\0') {
+			tmp = g_utf8_get_char(ptr);
+			len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
+			ptr = g_utf8_next_char(ptr);
+		}
 	} else
-	    len = raw_len;
+		len = raw_len;
 
         term_printed_text(len);
 

From 58a166484ad7eab33c1ad72b64016e5aacebfaf5 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Tue, 6 Oct 2015 04:51:16 -0300
Subject: [PATCH 0191/1650] Add xterm's keypad enter, meta-O-M to "key return"
 bindings

From the 'kent' terminfo entry. Also applies to putty.

Fixes #327
---
 src/fe-text/gui-readline.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index ec61e317..dc7185e7 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -1020,6 +1020,8 @@ void gui_readline_init(void)
 	key_bind("key", NULL, "meta2-5F", "cend", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;5F", "cend", (SIGNAL_FUNC) key_combo);
 
+	key_bind("key", NULL, "meta-O-M", "return", (SIGNAL_FUNC) key_combo);
+
 	/* cursor movement */
 	key_bind("backward_character", "Move the cursor a character backward", "left", NULL, (SIGNAL_FUNC) key_backward_character);
 	key_bind("forward_character", "Move the cursor a character forward", "right", NULL, (SIGNAL_FUNC) key_forward_character);

From f540ec9de1bb35b226e3c97e763238072fe295dd Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 8 Oct 2015 00:06:17 -0300
Subject: [PATCH 0192/1650] Fix /reconnect RECON-1 saying "Reconnection tag 1
 not found"

Turns out it was fixing the wrong string, and trying to do
atoi("RECON-1") instead of atoi("1").

"/reconnect 1" worked, but "/reconnect RECON-1" gave that confusing
error message.
---
 src/core/servers-reconnect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index ae97ecd2..f419035b 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -420,8 +420,8 @@ static void cmd_reconnect(const char *data, SERVER_REC *server)
 			cmd_param_error(CMDERR_NOT_CONNECTED);
                 rec = reconnects->data;
 	} else {
-		if (g_ascii_strncasecmp(data, "RECON-", 6) == 0)
-			data += 6;
+		if (g_ascii_strncasecmp(tag, "RECON-", 6) == 0)
+			tag += 6;
 
 		tagnum = atoi(tag);
 		rec = tagnum <= 0 ? NULL : reconnect_find_tag(tagnum);

From ed28483e7509f0a7a75716f2651f603824fd9817 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 23 Oct 2015 04:25:57 -0300
Subject: [PATCH 0193/1650] Fix invalid reads in strsplit_len when splitting on
 spaces

The symptom for this one is randomly getting lines split before the last
word, even if there's no need for splitting. Also, this function is only
reached if recode is on, and iconv failed (for example, due to an
incorrect source charset). Thanks to vague for finding this and
providing valgrind logs.

The loop that looks for spaces tried to read backwards from the end of
the current line, with the end being determined by len. Assuming
strsplit_len() with len=400, this meant accessing str[399] in the first
iteration. For strings that don't need splitting, this means an invalid
read always.

If that invalid read happens to hit garbage that has a space character,
(len - offset) points after the end of string, which isn't a problem for
g_strndup() since it stops at the first null, and no splitting happens.
If the garbage doesn't have any spaces, it splits by the last word.

This commit avoids that loop entirely if (remaining_len > len). It also
changes the way it iterates over the string to be much less confusing.
---
 src/core/misc.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 88c27255..e209efa1 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -995,25 +995,29 @@ char **strsplit_len(const char *str, int len, gboolean onspace)
 {
 	char **ret = g_new(char *, 1);
 	int n;
-	int offset;
+	int split_offset = 0;
+	size_t remaining_len = strlen(str);
 
-	for (n = 0; *str != '\0'; n++, str += MIN(len - offset, strlen(str))) {
-		offset = 0;
-		if (onspace) {
+	for (n = 0; *str != '\0'; n++) {
+		split_offset = MIN(len, remaining_len);
+		if (onspace && remaining_len > len) {
 			/*
 			 * Try to find a space to split on and leave
 			 * the space on the previous line.
 			 */
 			int i;
-			for (i = 0; i < len; i++) {
-				if (str[len-1-i] == ' ') {
-					offset = i;
+			for (i = len - 1; i > 0; i--) {
+				if (str[i] == ' ') {
+					split_offset = i;
 					break;
 				}
 			}
 		}
-		ret[n] = g_strndup(str, len - offset);
+		ret[n] = g_strndup(str, split_offset);
 		ret = g_renew(char *, ret, n + 2);
+
+		str += split_offset;
+		remaining_len -= split_offset;
 	}
 	ret[n] = NULL;
 

From 06bf25bfbaaf33772e36317dba28ce5b6a301616 Mon Sep 17 00:00:00 2001
From: Rodrigo Rebello <rprebello@gmail.com>
Date: Wed, 28 Oct 2015 13:38:21 -0200
Subject: [PATCH 0194/1650] Fix quote around macro argument

In m4/curses.m4, line 134, the 5th argument passed to AC_NCURSES was
surrounded by '"' instead of '[' and ']'. Because of that, the expansion
of AC_NCURSES in that case would produce the following line inside the
configure script (note the repeated double quotes):

  screen_manager=""ncurses on $withval/include""

That would cause the following error when configure was executed with
the "--with-ncurses=dir" argument:

  ./configure: line 13468: on: command not found

Although in the case above the error doesn't actually influence the
build process ('screen_manager' isn't used anywhere in the script),
trying to execute 'on' might be harmful if it corresponded to an
existing command in the user's environment.
---
 m4/curses.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/curses.m4 b/m4/curses.m4
index 82b110fe..41c0e6c8 100644
--- a/m4/curses.m4
+++ b/m4/curses.m4
@@ -131,7 +131,7 @@ AC_DEFUN([AC_CHECK_CURSES],[
 	  if test x$withval = xno ; then
 		search_ncurses=false
 	  elif test x$withval != xyes ; then
-		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
+		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, [ncurses on $withval/include])
 	  fi
 	)
 

From 8094e87cdf78bd864ffb37351ff4853cb127d8d1 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 28 Oct 2015 21:56:35 +0100
Subject: [PATCH 0195/1650] Preserve the sasl_ options across reconnects.

---
 src/irc/core/irc-servers-reconnect.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index b0aad26f..ca61492d 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -48,6 +48,9 @@ static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 	rec->max_whois = src->max_whois;
 	rec->usermode = g_strdup(src->usermode);
 	rec->alternate_nick = g_strdup(src->alternate_nick);
+	rec->sasl_mechanism = src->sasl_mechanism;
+	rec->sasl_username = src->sasl_username;
+	rec->sasl_password = src->sasl_password;
 	*dest = (SERVER_CONNECT_REC *) rec;
 }
 

From 3c95f6aae9826c10a50c4a0f12c16fca6038410c Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <ae88925@gmail.com>
Date: Mon, 2 Nov 2015 08:00:52 -0500
Subject: [PATCH 0196/1650] Make C-w and M-backspace work right.

---
 src/fe-text/gui-entry.c    | 38 +++++++++++++++++++++++++++-----------
 src/fe-text/gui-entry.h    |  4 +++-
 src/fe-text/gui-readline.c |  7 +++++--
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 17a7c507..b7d58019 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -555,16 +555,31 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
 		return;
 
 	if (update_cutbuffer) {
-		/* put erased text to cutbuffer */
-		if (entry->cutbuffer_len < size) {
-			g_free(entry->cutbuffer);
-			entry->cutbuffer = g_new(unichar, size+1);
-		}
+		if (entry->cutbuffer_len && update_cutbuffer == CUTBUFFER_PREPEND) {
+			int cutbuffer_new_size = entry->cutbuffer_len + size;
+			unichar *tmpcutbuffer = entry->cutbuffer;
+			entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
 
-		entry->cutbuffer_len = size;
-		entry->cutbuffer[size] = '\0';
-		memcpy(entry->cutbuffer, entry->text + entry->pos - size,
-		       size * sizeof(unichar));
+			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
+					size * sizeof(unichar));
+			memcpy(entry->cutbuffer + size, tmpcutbuffer,
+
+			entry->cutbuffer_len * sizeof(unichar));
+			entry->cutbuffer_len = cutbuffer_new_size;
+			entry->cutbuffer[cutbuffer_new_size] = '\0';
+
+			g_free(tmpcutbuffer);
+                 } else if (update_cutbuffer) {
+			/* put erased text to cutbuffer */
+			if (entry->cutbuffer_len < size) {
+				g_free(entry->cutbuffer);
+				entry->cutbuffer = g_new(unichar, size+1);
+			}
+			entry->cutbuffer_len = size;
+			entry->cutbuffer[size] = '\0';
+			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
+			size * sizeof(unichar));
+		}
 	}
 
 	if (entry->utf8)
@@ -601,7 +616,7 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
 	gui_entry_draw(entry);
 }
 
-void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space)
+void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat)
 {
 	int to;
 
@@ -624,7 +639,8 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space)
 	}
 	if (to > 0) to++;
 
-        gui_entry_erase(entry, entry->pos-to, TRUE);
+        gui_entry_erase(entry, entry->pos-to,
+			repeat ? CUTBUFFER_PREPEND : TRUE);
 }
 
 void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index 29d8dea2..006a1858 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -1,6 +1,8 @@
 #ifndef __GUI_ENTRY_H
 #define __GUI_ENTRY_H
 
+#define CUTBUFFER_PREPEND 42
+
 typedef struct {
 	int text_len, text_alloc; /* as shorts, not chars */
 	unichar *text;
@@ -43,7 +45,7 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry);
 void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer);
 void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer);
 void gui_entry_erase_cell(GUI_ENTRY_REC *entry);
-void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space);
+void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat);
 void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space);
 
 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry);
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index ec61e317..4d645748 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -68,6 +68,8 @@ static int paste_timeout_id;
 
 static void sig_input(void);
 
+static int key_repeated = FALSE;
+
 void input_listen_init(int handle)
 {
 	readtag = g_input_add_poll(handle,
@@ -361,6 +363,7 @@ static void sig_gui_key_pressed(gpointer keyp)
 	int ret;
 
 	key = GPOINTER_TO_INT(keyp);
+	key_repeated = key == prev_key;
 
 	if (redir != NULL && redir->flags & ENTRY_REDIRECT_FLAG_HOTKEY) {
 		handle_key_redirect(key);
@@ -596,7 +599,7 @@ static void key_backspace(void)
 
 static void key_delete_previous_word(void)
 {
-	gui_entry_erase_word(active_entry, FALSE);
+	gui_entry_erase_word(active_entry, FALSE, key_repeated);
 }
 
 static void key_delete_next_word(void)
@@ -606,7 +609,7 @@ static void key_delete_next_word(void)
 
 static void key_delete_to_previous_space(void)
 {
-	gui_entry_erase_word(active_entry, TRUE);
+	gui_entry_erase_word(active_entry, TRUE, key_repeated);
 }
 
 static void key_delete_to_next_space(void)

From 8736c12fc95ca977f4fc4a947c760bac651cd3af Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 9 Nov 2015 06:33:08 -0300
Subject: [PATCH 0197/1650] strsplit_len: use strlen() directly instead of a
 remaining_len variable

---
 src/core/misc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index e209efa1..4e8322fa 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -996,11 +996,10 @@ char **strsplit_len(const char *str, int len, gboolean onspace)
 	char **ret = g_new(char *, 1);
 	int n;
 	int split_offset = 0;
-	size_t remaining_len = strlen(str);
 
 	for (n = 0; *str != '\0'; n++) {
-		split_offset = MIN(len, remaining_len);
-		if (onspace && remaining_len > len) {
+		split_offset = MIN(len, strlen(str));
+		if (onspace && strlen(str) > len) {
 			/*
 			 * Try to find a space to split on and leave
 			 * the space on the previous line.
@@ -1017,7 +1016,6 @@ char **strsplit_len(const char *str, int len, gboolean onspace)
 		ret = g_renew(char *, ret, n + 2);
 
 		str += split_offset;
-		remaining_len -= split_offset;
 	}
 	ret[n] = NULL;
 

From b054ade4b90a05d778a64c63c0c834a126884aaa Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 9 Nov 2015 06:46:40 -0300
Subject: [PATCH 0198/1650] strsplit_len: make it look more like the original
 version

---
 src/core/misc.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 4e8322fa..490b5a8f 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -995,10 +995,10 @@ char **strsplit_len(const char *str, int len, gboolean onspace)
 {
 	char **ret = g_new(char *, 1);
 	int n;
-	int split_offset = 0;
+	int offset;
 
-	for (n = 0; *str != '\0'; n++) {
-		split_offset = MIN(len, strlen(str));
+	for (n = 0; *str != '\0'; n++, str += offset) {
+		offset = MIN(len, strlen(str));
 		if (onspace && strlen(str) > len) {
 			/*
 			 * Try to find a space to split on and leave
@@ -1007,15 +1007,13 @@ char **strsplit_len(const char *str, int len, gboolean onspace)
 			int i;
 			for (i = len - 1; i > 0; i--) {
 				if (str[i] == ' ') {
-					split_offset = i;
+					offset = i;
 					break;
 				}
 			}
 		}
-		ret[n] = g_strndup(str, split_offset);
+		ret[n] = g_strndup(str, offset);
 		ret = g_renew(char *, ret, n + 2);
-
-		str += split_offset;
 	}
 	ret[n] = NULL;
 

From 1006fee8027936c68e0f0b2f8dae766ad090764a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 9 Nov 2015 17:32:51 +0100
Subject: [PATCH 0199/1650] Add an option to strip trailing whitespace when
 parsing commands

---
 src/core/commands.c | 5 +++++
 src/core/commands.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/core/commands.c b/src/core/commands.c
index 9e451bc8..0fb373c7 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -748,6 +748,11 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...)
 			if (cnt == 0 && count & PARAM_FLAG_GETREST) {
 				/* get rest */
 				arg = datad;
+
+				/* strip the trailing whitespace */
+				if (count & PARAM_FLAG_STRIP_TRAILING_WS) {
+					arg = g_strchomp (arg);
+				}
 			} else {
 				arg = (count & PARAM_FLAG_NOQUOTES) ?
 					cmd_get_param(&datad) :
diff --git a/src/core/commands.h b/src/core/commands.h
index d65185e5..72105ad3 100644
--- a/src/core/commands.h
+++ b/src/core/commands.h
@@ -152,6 +152,8 @@ int command_have_option(const char *cmd, const char *option);
 #define PARAM_FLAG_OPTCHAN 0x00010000
 /* optional channel in first argument, but don't treat "*" as current channel */
 #define PARAM_FLAG_OPTCHAN_NAME (0x00020000|PARAM_FLAG_OPTCHAN)
+/* strip the trailing whitespace */
+#define PARAM_FLAG_STRIP_TRAILING_WS 0x00040000
 
 char *cmd_get_param(char **data);
 char *cmd_get_quoted_param(char **data);

From 3d9b9d473fdd2ec6af367df27cfc26a90a3f4375 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 9 Nov 2015 18:39:13 +0100
Subject: [PATCH 0200/1650] Strip the trailing whitespace from /join commands.

Fixes #99 for great good.
---
 src/core/commands.c              | 2 +-
 src/fe-common/core/fe-channels.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/commands.c b/src/core/commands.c
index 0fb373c7..88d1208c 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -751,7 +751,7 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...)
 
 				/* strip the trailing whitespace */
 				if (count & PARAM_FLAG_STRIP_TRAILING_WS) {
-					arg = g_strchomp (arg);
+					arg = g_strchomp(arg);
 				}
 			} else {
 				arg = (count & PARAM_FLAG_NOQUOTES) ?
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index a171596d..046d641a 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -122,7 +122,8 @@ static void cmd_join(const char *data, SERVER_REC *server)
 	void *free_arg;
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
+			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST |
+			    PARAM_FLAG_STRIP_TRAILING_WS,
 			    "join", &optlist, &pdata))
 		return;
 

From d4676c985553dc957e863e814097beba9bcc279e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 9 Nov 2015 23:02:41 +0100
Subject: [PATCH 0201/1650] Use the PARAM_FLAG_STRIP_TRAILING_WS flag wherever
 possible.

---
 src/fe-common/core/completion.c      |  2 +-
 src/fe-common/core/fe-ignore.c       |  3 ++-
 src/fe-common/core/fe-log.c          |  5 +++--
 src/fe-common/core/fe-settings.c     |  5 +++--
 src/fe-common/irc/fe-irc-commands.c  |  4 ++--
 src/irc/core/bans.c                  | 12 ++++++------
 src/irc/core/irc-commands.c          | 12 ++++++++----
 src/irc/core/modes.c                 |  4 ++--
 src/irc/dcc/dcc-send.c               |  4 ++--
 src/irc/dcc/dcc.c                    |  4 ++--
 src/irc/notifylist/notify-commands.c |  3 ++-
 11 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 4461de92..a4715d23 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -757,7 +757,7 @@ static void cmd_completion(const char *data)
 	int len;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST,
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "completion", &optlist, &key, &value))
 		return;
 
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 533cda31..d2f9de27 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -127,7 +127,8 @@ static void cmd_ignore(const char *data)
 		return;
 	}
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | 
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "ignore", &optlist, &mask, &levels))
 		return;
 
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index a39623d2..476abaab 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -87,8 +87,9 @@ static void cmd_log_open(const char *data)
 	int level;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS,
-			    "log open", &optlist, &fname, &levels))
+			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS |
+			    PARAM_FLAG_STRIP_TRAILING_WS, "log open", &optlist, 
+			    &fname, &levels))
 		return;
 	if (*fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index 2627989d..3bb43bf7 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -108,7 +108,8 @@ static void cmd_set(char *data)
 	int clear, set_default;
 	SETTINGS_REC *rec;
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
+			    PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "set", &optlist, &key, &value))
 		return;
 
@@ -182,7 +183,7 @@ static void cmd_toggle(const char *data)
 	void *free_arg;
 	int type;
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &key, &value))
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, &key, &value))
 		return;
 
 	if (*key == '\0')
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index a23facbd..11a911d2 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -246,8 +246,8 @@ static void cmd_ban(const char *data, IRC_SERVER_REC *server,
 
         CMD_IRC_SERVER(server);
 
-	if (!cmd_get_params(data, &free_arg, 2 |
-			    PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST,
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | 
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
 			    item, &channel, &nicks))
 		return;
 
diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index 68dd45c0..198fdc4a 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -184,8 +184,8 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server,
 	if (server == NULL || !server->connected || !IS_IRC_SERVER(server))
 		cmd_return_error(CMDERR_NOT_CONNECTED);
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST,
-			    item, &channel, &nicks)) return;
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST |
+			    PARAM_FLAG_STRIP_TRAILING_WS, item, &channel, &nicks)) return;
 	if (!server_ischannel(SERVER(server), channel)) cmd_param_error(CMDERR_NOT_JOINED);
 	if (*nicks == '\0') {
 		if (g_strcmp0(data, "*") != 0)
@@ -262,8 +262,8 @@ static void cmd_ban(const char *data, IRC_SERVER_REC *server, void *item)
 
         CMD_IRC_SERVER(server);
 
-	if (!cmd_get_params(data, &free_arg, 1 |
-			    PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | 
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "ban", &optlist, &ban))
 		return;
 
@@ -297,8 +297,8 @@ static void cmd_unban(const char *data, IRC_SERVER_REC *server, void *item)
 
         CMD_IRC_SERVER(server);
 
-	if (!cmd_get_params(data, &free_arg, 1 |
-			    PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | 
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "unban", &optlist, &ban))
 		return;
 
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 47644753..3cc105ba 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -267,7 +267,8 @@ static void cmd_list(const char *data, IRC_SERVER_REC *server,
         CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST, "list", &optlist, &str))
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, 
+			    "list", &optlist, &str))
 		return;
 
 	if (*str == '\0' && g_hash_table_lookup(optlist, "yes") == NULL &&
@@ -288,7 +289,8 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
 
 	CMD_IRC_SERVER(server);
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &channel, &rest))
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | 
+			    PARAM_FLAG_STRIP_TRAILING_WS, &channel, &rest))
 		return;
 
 	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
@@ -320,7 +322,8 @@ static void cmd_names(const char *data, IRC_SERVER_REC *server,
         CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST, "names", &optlist, &channel))
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
+			    "names", &optlist, &channel))
 		return;
 
 	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
@@ -501,7 +504,8 @@ static void cmd_whowas(const char *data, IRC_SERVER_REC *server)
 
         CMD_IRC_SERVER(server);
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &nicks, &rest))
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
+			    &nicks, &rest))
 		return;
 	if (*nicks == '\0') nicks = server->nick;
 
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index 32a0c169..207461cc 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -835,10 +835,10 @@ static void cmd_mode(const char *data, IRC_SERVER_REC *server,
 
 	if (*data == '+' || *data == '-') {
 		target = "*";
-		if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST, &mode))
+		if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, &mode))
 			return;
 	} else {
-		if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &target, &mode))
+		if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, &target, &mode))
 			return;
 	}
 
diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c
index 2ce84f18..ca29b9b9 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -174,8 +174,8 @@ static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server,
 	int queue, mode, passive;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST, "dcc send",
-			    &optlist, &nick, &fileargs))
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, 
+			    "dcc send", &optlist, &nick, &fileargs))
 		return;
 
 	chat = item_get_dcc(item);
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 17f6c477..7f35585e 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -496,8 +496,8 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
 
 	g_return_if_fail(data != NULL);
 
-	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
-			    &typestr, &nick, &arg))
+	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
+			    PARAM_FLAG_STRIP_TRAILING_WS, &typestr, &nick, &arg))
 		return;
 
 	if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
diff --git a/src/irc/notifylist/notify-commands.c b/src/irc/notifylist/notify-commands.c
index 67076106..0d4fd4f2 100644
--- a/src/irc/notifylist/notify-commands.c
+++ b/src/irc/notifylist/notify-commands.c
@@ -36,7 +36,8 @@ static void cmd_notify(gchar *data)
 
 	g_return_if_fail(data != NULL);
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
+	if (!cmd_get_params(data, &free_arg,
+			    2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "notify", &optlist, &mask, &ircnets))
 		return;
 	if (*mask == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

From b333d103641b48b77ab76c6d31b1f3788192268f Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Mon, 9 Nov 2015 23:06:56 +0100
Subject: [PATCH 0202/1650] /hilight list print output with enabled flags,
 except when -word and -nick are used

---
 src/fe-common/core/hilight-text.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 87c5d467..9822de1e 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -484,10 +484,14 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 	GString *options;
 
 	options = g_string_new(NULL);
-	if (!rec->nick || !rec->word) {
-		if (rec->nick) g_string_append(options, "-nick ");
-		if (rec->word) g_string_append(options, "-word ");
-	}
+
+	if (rec->nick && rec->word) { /* default case, no option */ }
+	else if (rec->nick)
+		g_string_append(options, "-nick ");
+	else if (rec->word)
+		g_string_append(options, "-word ");
+	else
+		g_string_append(options, "-line ");
 
 	if (rec->nickmask) g_string_append(options, "-mask ");
 	if (rec->fullword) g_string_append(options, "-full ");

From 1199ecc62f137eedb388b3dbd9b003cf1a8280f7 Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <ae88925@gmail.com>
Date: Fri, 13 Nov 2015 13:42:28 -0500
Subject: [PATCH 0203/1650] a facility for prepending or replacing the
 cutbuffer

---
 src/fe-text/gui-entry.c    | 47 +++++++++++++++++++++-----------------
 src/fe-text/gui-entry.h    | 13 ++++++++---
 src/fe-text/gui-readline.c | 12 +++++-----
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index a83bcf64..ec484cb5 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -534,7 +534,7 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
 	return buf;
 }
 
-void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer)
+void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
 	int newpos, size = 0;
 
@@ -545,7 +545,7 @@ void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer)
 	gui_entry_erase(entry, size, update_cutbuffer);
 }
 
-void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
+void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
 	size_t w = 0;
 
@@ -554,32 +554,39 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
 	if (size == 0 || entry->pos < size)
 		return;
 
-	if (update_cutbuffer) {
-		if (entry->cutbuffer_len && update_cutbuffer == CUTBUFFER_PREPEND) {
-			int cutbuffer_new_size = entry->cutbuffer_len + size;
-			unichar *tmpcutbuffer = entry->cutbuffer;
-			entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+	switch (update_cutbuffer) {
+		case CUTBUFFER_UPDATE_PREPEND:
+			if (entry->cutbuffer_len) {
+				int cutbuffer_new_size = entry->cutbuffer_len + size;
+				unichar *tmpcutbuffer = entry->cutbuffer;
+				entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
 
-			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
-					size * sizeof(unichar));
-			memcpy(entry->cutbuffer + size, tmpcutbuffer,
+				memcpy(entry->cutbuffer, entry->text + entry->pos - size,
+						size * sizeof(unichar));
+				memcpy(entry->cutbuffer + size, tmpcutbuffer,
 
-			entry->cutbuffer_len * sizeof(unichar));
-			entry->cutbuffer_len = cutbuffer_new_size;
-			entry->cutbuffer[cutbuffer_new_size] = '\0';
+				entry->cutbuffer_len * sizeof(unichar));
+				entry->cutbuffer_len = cutbuffer_new_size;
+				entry->cutbuffer[cutbuffer_new_size] = '\0';
 
-			g_free(tmpcutbuffer);
-                 } else if (update_cutbuffer) {
+				g_free(tmpcutbuffer);
+				break;
+			}
+			/* fall through to REPLACE if cutbuffer_len was 0 */
+		case CUTBUFFER_UPDATE_REPLACE:
 			/* put erased text to cutbuffer */
 			if (entry->cutbuffer_len < size) {
 				g_free(entry->cutbuffer);
 				entry->cutbuffer = g_new(unichar, size+1);
 			}
+
 			entry->cutbuffer_len = size;
 			entry->cutbuffer[size] = '\0';
 			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
-			size * sizeof(unichar));
-		}
+			       size * sizeof(unichar));
+			break;
+		case CUTBUFFER_UPDATE_NOOP:
+			break;
 	}
 
 	if (entry->utf8)
@@ -616,7 +623,7 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
 	gui_entry_draw(entry);
 }
 
-void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat)
+void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op)
 {
 	int to;
 
@@ -639,8 +646,6 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat)
 	}
 	if (to > 0) to++;
 
-        gui_entry_erase(entry, entry->pos-to,
-			repeat ? CUTBUFFER_PREPEND : TRUE);
 }
 
 void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)
@@ -666,7 +671,7 @@ void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)
 
         size = to-entry->pos;
 	entry->pos = to;
-        gui_entry_erase(entry, size, TRUE);
+        gui_entry_erase(entry, size, CUTBUFFER_UPDATE_REPLACE);
 }
 
 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index 006a1858..0f86e431 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -22,6 +22,12 @@ typedef struct {
 	unsigned int utf8:1;
 } GUI_ENTRY_REC;
 
+typedef enum {
+	CUTBUFFER_UPDATE_NOOP,
+	CUTBUFFER_UPDATE_REPLACE,
+	CUTBUFFER_UPDATE_PREPEND
+} CUTBUFFER_UPDATE_OP;
+
 extern GUI_ENTRY_REC *active_entry;
 
 GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8);
@@ -42,10 +48,10 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str);
 void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr);
 
 char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry);
-void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer);
-void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer);
+void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer);
+void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer);
 void gui_entry_erase_cell(GUI_ENTRY_REC *entry);
-void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat);
+void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op);
 void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space);
 
 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry);
@@ -62,4 +68,5 @@ void gui_entry_move_words(GUI_ENTRY_REC *entry, int count, int to_space);
 
 void gui_entry_redraw(GUI_ENTRY_REC *entry);
 
+
 #endif
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index c21925db..47689b4d 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -530,7 +530,7 @@ static void key_forward_to_space(void)
 static void key_erase_line(void)
 {
 	gui_entry_set_pos(active_entry, active_entry->text_len);
-	gui_entry_erase(active_entry, active_entry->text_len, TRUE);
+	gui_entry_erase(active_entry, active_entry->text_len, CUTBUFFER_UPDATE_REPLACE);
 }
 
 static void key_erase_to_beg_of_line(void)
@@ -538,7 +538,7 @@ static void key_erase_to_beg_of_line(void)
 	int pos;
 
 	pos = gui_entry_get_pos(active_entry);
-	gui_entry_erase(active_entry, pos, TRUE);
+	gui_entry_erase(active_entry, pos, CUTBUFFER_UPDATE_REPLACE);
 }
 
 static void key_erase_to_end_of_line(void)
@@ -547,7 +547,7 @@ static void key_erase_to_end_of_line(void)
 
 	pos = gui_entry_get_pos(active_entry);
 	gui_entry_set_pos(active_entry, active_entry->text_len);
-	gui_entry_erase(active_entry, active_entry->text_len - pos, TRUE);
+	gui_entry_erase(active_entry, active_entry->text_len - pos, CUTBUFFER_UPDATE_REPLACE);
 }
 
 static void key_yank_from_cutbuffer(void)
@@ -594,12 +594,12 @@ static void key_delete_character(void)
 
 static void key_backspace(void)
 {
-	gui_entry_erase(active_entry, 1, FALSE);
+	gui_entry_erase(active_entry, 1, CUTBUFFER_UPDATE_NOOP);
 }
 
 static void key_delete_previous_word(void)
 {
-	gui_entry_erase_word(active_entry, FALSE, key_repeated);
+	gui_entry_erase_word(active_entry, FALSE, CUTBUFFER_UPDATE_REPLACE);
 }
 
 static void key_delete_next_word(void)
@@ -609,7 +609,7 @@ static void key_delete_next_word(void)
 
 static void key_delete_to_previous_space(void)
 {
-	gui_entry_erase_word(active_entry, TRUE, key_repeated);
+	gui_entry_erase_word(active_entry, TRUE, CUTBUFFER_UPDATE_REPLACE);
 }
 
 static void key_delete_to_next_space(void)

From 7768f3e52074715e9c83bcded8607500e4434468 Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <ae88925@gmail.com>
Date: Fri, 13 Nov 2015 13:51:56 -0500
Subject: [PATCH 0204/1650] remove cruft from previous implementation

---
 src/fe-text/gui-entry.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index 0f86e431..498f95b9 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -1,8 +1,6 @@
 #ifndef __GUI_ENTRY_H
 #define __GUI_ENTRY_H
 
-#define CUTBUFFER_PREPEND 42
-
 typedef struct {
 	int text_len, text_alloc; /* as shorts, not chars */
 	unichar *text;

From f90e10c5d27ee7d8a6663a432238cf487e7d372f Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <ae88925@gmail.com>
Date: Fri, 13 Nov 2015 14:01:25 -0500
Subject: [PATCH 0205/1650] remove more cruft from previous implementation

---
 src/fe-text/gui-readline.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 47689b4d..0ca68d80 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -68,8 +68,6 @@ static int paste_timeout_id;
 
 static void sig_input(void);
 
-static int key_repeated = FALSE;
-
 void input_listen_init(int handle)
 {
 	readtag = g_input_add_poll(handle,
@@ -363,7 +361,6 @@ static void sig_gui_key_pressed(gpointer keyp)
 	int ret;
 
 	key = GPOINTER_TO_INT(keyp);
-	key_repeated = key == prev_key;
 
 	if (redir != NULL && redir->flags & ENTRY_REDIRECT_FLAG_HOTKEY) {
 		handle_key_redirect(key);

From bb8c0bbf4caf87172255993ce8a86f91a8cd4208 Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <ae88925@gmail.com>
Date: Fri, 13 Nov 2015 20:33:57 -0500
Subject: [PATCH 0206/1650] fix indentation, undelete line not meant to be
 deleted.

---
 src/fe-text/gui-entry.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index ec484cb5..650995bd 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -564,8 +564,8 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 				memcpy(entry->cutbuffer, entry->text + entry->pos - size,
 						size * sizeof(unichar));
 				memcpy(entry->cutbuffer + size, tmpcutbuffer,
+						entry->cutbuffer_len * sizeof(unichar));
 
-				entry->cutbuffer_len * sizeof(unichar));
 				entry->cutbuffer_len = cutbuffer_new_size;
 				entry->cutbuffer[cutbuffer_new_size] = '\0';
 
@@ -646,6 +646,7 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_O
 	}
 	if (to > 0) to++;
 
+	gui_entry_erase(entry, entry->pos-to, TRUE);
 }
 
 void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)

From 15dfb27f80922f6f3b751da9e1395994c3026a62 Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <ae88925@gmail.com>
Date: Sat, 14 Nov 2015 09:07:35 -0500
Subject: [PATCH 0207/1650] use the enum name which was the original intended
 change

---
 src/fe-text/gui-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 650995bd..176ee431 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -646,7 +646,7 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_O
 	}
 	if (to > 0) to++;
 
-	gui_entry_erase(entry, entry->pos-to, TRUE);
+	gui_entry_erase(entry, entry->pos-to, CUTBUFFER_UPDATE_REPLACE);
 }
 
 void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)

From d7ef9c590fa679403da103f8e89042aad6abb919 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 19 Nov 2015 15:31:32 +0100
Subject: [PATCH 0208/1650] Correctly alias 'channel' to '#channel'

Use the same approach used in 'irc_channels_join'.
Remove 'irc_nick_strip' since it was unused.
---
 src/irc/core/irc-channels.c | 17 +++++++++++++++--
 src/irc/core/irc-nicklist.c | 24 ------------------------
 src/irc/core/irc-nicklist.h |  3 ---
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index 682be4c2..e775f530 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -174,6 +174,13 @@ static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
 					    const char *channel)
 {
 	GSList *tmp;
+	char *fmt_channel;
+
+	/* if 'channel' has no leading # this lookup is going to fail, add a
+	 * octothorpe in front of it to handle this case. */
+	fmt_channel = server_ischannel(SERVER(server), channel) ?
+	    g_strdup(channel) :
+	    g_strdup_printf("#%s", channel);
 
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *rec = tmp->data;
@@ -182,13 +189,19 @@ static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
                         continue;
 
 		/* check both !ABCDEchannel and !channel */
-		if (IRC_SERVER(server)->nick_comp_func(channel, rec->name) == 0)
+		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->name) == 0) {
+			g_free(fmt_channel);
 			return rec;
+		}
 
-		if (IRC_SERVER(server)->nick_comp_func(channel, rec->visible_name) == 0)
+		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->visible_name) == 0) {
+			g_free(fmt_channel);
 			return rec;
+		}
 	}
 
+	g_free(fmt_channel);
+
 	return NULL;
 }
 
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 667016aa..bcb9d1f6 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -55,30 +55,6 @@ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
 	return rec;
 }
 
-#define isnickchar(a) \
-	(i_isalnum(a) || (a) == '`' || (a) == '-' || (a) == '_' || \
-	(a) == '[' || (a) == ']' || (a) == '{' || (a) == '}' || \
-	(a) == '|' || (a) == '\\' || (a) == '^')
-
-/* Remove all "extra" characters from `nick'. Like _nick_ -> nick */
-char *irc_nick_strip(const char *nick)
-{
-	char *stripped, *spos;
-
-	g_return_val_if_fail(nick != NULL, NULL);
-
-	spos = stripped = g_strdup(nick);
-	while (isnickchar(*nick)) {
-		if (i_isalnum(*nick))
-			*spos++ = *nick;
-		nick++;
-	}
-	if ((unsigned char) *nick >= 128)
-		*spos++ = *nick; /* just add it so that nicks won't match.. */
-	*spos = '\0';
-	return stripped;
-}
-
 int irc_nickcmp_rfc1459(const char *m, const char *n)
 {
 	while (*m != '\0' && *n != '\0') {
diff --git a/src/irc/core/irc-nicklist.h b/src/irc/core/irc-nicklist.h
index 7302556b..2ae17d2c 100644
--- a/src/irc/core/irc-nicklist.h
+++ b/src/irc/core/irc-nicklist.h
@@ -8,9 +8,6 @@ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
 			      int op, int halfop, int voice, int send_massjoin,
 			      const char *prefixes);
 
-/* Remove all "extra" characters from `nick'. Like _nick_ -> nick */
-char *irc_nick_strip(const char *nick);
-
 int irc_nickcmp_rfc1459(const char *, const char *);
 int irc_nickcmp_ascii(const char *, const char *);
 

From 8701cbc972955ba7522390988e3c0e0c62770fa4 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 22 Nov 2015 16:57:45 +0100
Subject: [PATCH 0209/1650] Let ignore_check do its work when server is NULL

A NULL-check has been added to the ignore_match_server macro, making the
function safe from a pointer perspective.
Fixes #193 in the meanwhile.
---
 src/core/ignore.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index e70b741b..fd3c8a38 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -97,8 +97,8 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
 		match_wildcards((rec)->mask, nick)))
 
 #define ignore_match_server(rec, server) \
-	((rec)->servertag == NULL || \
-	g_ascii_strcasecmp((server)->tag, (rec)->servertag) == 0)
+	((rec)->servertag == NULL || ((server) != NULL && \
+		g_ascii_strcasecmp((server)->tag, (rec)->servertag) == 0))
 
 #define ignore_match_channel(rec, channel) \
 	((rec)->channels == NULL || ((channel) != NULL && \
@@ -135,7 +135,6 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
         char *nickmask;
         int len, best_mask, best_match, best_patt;
 
-	g_return_val_if_fail(server != NULL, 0);
         if (nick == NULL) nick = "";
 
 	chanrec = server == NULL || channel == NULL ? NULL :

From 011eda7d9e755d1df82b678c05c0cb9b1aaa1e29 Mon Sep 17 00:00:00 2001
From: Fabian Kurz <fabian@fkurz.net>
Date: Sun, 22 Nov 2015 21:24:05 +0100
Subject: [PATCH 0210/1650] Correct a wrong use of the 'paste_buffer' variable

The function "static void paste_buffer_join_lines(GArray *buf)" in
"src/fe-text/gui-readline.c" is supposed to join lines from the GArray
pointed to by *buf under certain circumstances.

In the code of the function "buf" is actually used for getting the length
of the GArray, but to get a pointer to the data, "paste_buffer->data" is
used; paste_buffer is defined in the scope of the whole file.

This delivers the desired result, because this function is only called
once, with "paste_buffer" as the argument. If paste_buffer_join_lines()
will ever be used with a different argument, it will fail.
---
 src/fe-text/gui-readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index dc7185e7..ecf116fe 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -177,7 +177,7 @@ static void paste_buffer_join_lines(GArray *buf)
 	if (buf->len == 0)
 		return;
 
-	arr = (unichar *) paste_buffer->data;
+	arr = (unichar *)buf->data;
 
 	/* first line */
 	if (IS_WHITE(arr[0]))

From 50fae4212ec5fbb9931093b1c31bbeda97ddfbb3 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 22 Nov 2015 21:33:44 +0100
Subject: [PATCH 0211/1650] Use 'isblank()' instead of a custom macro

---
 src/fe-text/gui-readline.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index ecf116fe..a8f3ba99 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -147,7 +147,6 @@ static void window_next_page(void)
 
 static void paste_buffer_join_lines(GArray *buf)
 {
-#define IS_WHITE(c) ((c) == ' ' || (c) == '\t')
 	unsigned int i, count, indent, line_len;
 	unichar *arr, *dest, *last_lf_pos;
 	int last_lf;
@@ -180,12 +179,12 @@ static void paste_buffer_join_lines(GArray *buf)
 	arr = (unichar *)buf->data;
 
 	/* first line */
-	if (IS_WHITE(arr[0]))
+	if (isblank(arr[0]))
 		return;
 
 	/* find the first beginning of indented line */
 	for (i = 1; i < buf->len; i++) {
-		if (arr[i-1] == '\n' && IS_WHITE(arr[i]))
+		if (arr[i-1] == '\n' && isblank(arr[i]))
 			break;
 	}
 	if (i == buf->len)
@@ -193,7 +192,7 @@ static void paste_buffer_join_lines(GArray *buf)
 
 	/* get how much indentation we have.. */
 	for (indent = 0; i < buf->len; i++, indent++) {
-		if (!IS_WHITE(arr[i]))
+		if (!isblank(arr[i]))
 			break;
 	}
 	if (i == buf->len)
@@ -203,7 +202,7 @@ static void paste_buffer_join_lines(GArray *buf)
 	count = indent; last_lf = TRUE;
 	for (; i < buf->len; i++) {
 		if (last_lf) {
-			if (IS_WHITE(arr[i]))
+			if (isblank(arr[i]))
 				count++;
 			else {
 				last_lf = FALSE;
@@ -220,11 +219,11 @@ static void paste_buffer_join_lines(GArray *buf)
 	   get longer than 400 chars */
 	dest = arr; last_lf = TRUE; last_lf_pos = NULL; line_len = 0;
 	for (i = 0; i < buf->len; i++) {
-		if (last_lf && IS_WHITE(arr[i])) {
+		if (last_lf && isblank(arr[i])) {
 			/* whitespace, ignore */
 		} else if (arr[i] == '\n') {
 			if (!last_lf && i+1 != buf->len &&
-			    IS_WHITE(arr[i+1])) {
+			    isblank(arr[i+1])) {
 				last_lf_pos = dest;
 				*dest++ = ' ';
 			} else {

From 0171b1a6343434477845ac5365e5ee20ceef7904 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 22 Nov 2015 21:59:28 +0100
Subject: [PATCH 0212/1650] Use the expanded filename when picking the awaylog

This fixes a long-standing bug where 'fname' was being feed to cat
instead of 'real_fname', causing it to quit with a 'No such file or directory'
error.

FS#377
---
 src/fe-common/core/fe-log.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 476abaab..f2c4c014 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -617,7 +617,7 @@ static void sig_window_item_remove(WINDOW_REC *window, WI_ITEM_REC *item)
 static void sig_log_locked(LOG_REC *log)
 {
 	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-		    TXT_LOG_LOCKED, log->fname);
+		    TXT_LOG_LOCKED, log->real_fname);
 }
 
 static void sig_log_create_failed(LOG_REC *log)
@@ -657,11 +657,11 @@ static void sig_awaylog_show(LOG_REC *log, gpointer pmsgs, gpointer pfilepos)
 	filepos = GPOINTER_TO_INT(pfilepos);
 
 	if (msgs == 0)
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_NO_AWAY_MSGS, log->fname);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_NO_AWAY_MSGS, log->real_fname);
 	else {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->fname, msgs);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->real_fname, msgs);
 
-                str = g_strdup_printf("\"%s\" %d", log->fname, filepos);
+                str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
 		signal_emit("command cat", 1, str);
 		g_free(str);
 	}

From 877ff075bde3dee9da01f53e1afcf18be7ddf703 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 24 Nov 2015 00:30:12 +0100
Subject: [PATCH 0213/1650] stop cap_sasl

---
 src/perl/irssi-core.pl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/perl/irssi-core.pl b/src/perl/irssi-core.pl
index 38265a80..46066a38 100644
--- a/src/perl/irssi-core.pl
+++ b/src/perl/irssi-core.pl
@@ -47,4 +47,8 @@ sub eval_file {
   $data = qq{\n#line 1 "$filename"\n$data};
 
   eval_data($data, $id);
+
+  if (exists ${"Irssi::Script::${id}::"}{IRSSI} && ${"Irssi::Script::${id}::"}{IRSSI}{name} =~ /cap.sasl/ && ${"Irssi::Script::${id}::VERSION"} < 2) {
+    die "cap_sasl has been unloaded from Irssi ".Irssi::version()." because it conflicts with the built-in SASL support. See /help network for configuring SASL or read the ChangeLog for more information.";
+  }
 }

From a941329b4140b436d0bd5316a29d8be47019d1ea Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 24 Nov 2015 00:40:19 +0100
Subject: [PATCH 0214/1650] fix nick class hierarchy

---
 src/perl/common/Irssi.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/perl/common/Irssi.pm b/src/perl/common/Irssi.pm
index a9f93bf0..3ff02d5a 100644
--- a/src/perl/common/Irssi.pm
+++ b/src/perl/common/Irssi.pm
@@ -159,6 +159,7 @@ if (!in_irssi()) {
 
   @Irssi::Channel::ISA = qw(Irssi::Windowitem);
   @Irssi::Query::ISA = qw(Irssi::Windowitem);
+  @Irssi::Nick::ISA = qw();
 
   Irssi::init();
 

From 11ad4da0e33f565e83008045fe2532bb713f1f6b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 25 Nov 2015 12:16:42 +0100
Subject: [PATCH 0215/1650] more perl inheritance warning fixes

---
 src/perl/common/Irssi.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/perl/common/Irssi.pm b/src/perl/common/Irssi.pm
index 3ff02d5a..e2d9f963 100644
--- a/src/perl/common/Irssi.pm
+++ b/src/perl/common/Irssi.pm
@@ -159,6 +159,7 @@ if (!in_irssi()) {
 
   @Irssi::Channel::ISA = qw(Irssi::Windowitem);
   @Irssi::Query::ISA = qw(Irssi::Windowitem);
+  @Irssi::Chatnet::ISA = qw();
   @Irssi::Nick::ISA = qw();
 
   Irssi::init();

From 6ac6fcec469227971e7856201c27de09e1773ae4 Mon Sep 17 00:00:00 2001
From: Will Song <incertia9474@gmail.com>
Date: Wed, 25 Nov 2015 11:53:48 -0600
Subject: [PATCH 0216/1650] ignore MYMETA.* generated by scripts in project
 root

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0b15f43e..945b6cf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ ltversion.m4
 lt~obsolete.m4
 pm_to_blib
 stamp-h1
+MYMETA.*
 
 docs/help/Makefile.am
 docs/help/[a-z]*

From c52e6ebc992a317bfa3c1a67b8931e2e6cc40215 Mon Sep 17 00:00:00 2001
From: Will Song <incertia9474@gmail.com>
Date: Wed, 25 Nov 2015 11:55:18 -0600
Subject: [PATCH 0217/1650] change ./configure to ./autogen.sh because
 ./configure does not exist in a fresh clone of the repository

---
 INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index a83a6c76..fdf4200d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,7 +11,7 @@ To compile irssi you need:
 
 For most people, this should work just fine:
 
- ./configure
+ ./autogen.sh
  make
  su
  make install     (not _really_ required except for perl support)

From 54153e6d887545b5f2b46580ce1f7eba2f7c702b Mon Sep 17 00:00:00 2001
From: Will Song <incertia9474@gmail.com>
Date: Wed, 25 Nov 2015 12:25:55 -0600
Subject: [PATCH 0218/1650] revise INSTALL to be more clear regarding which
 script to use

---
 INSTALL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index fdf4200d..234c6cf6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,7 +11,8 @@ To compile irssi you need:
 
 For most people, this should work just fine:
 
- ./autogen.sh
+ ./autogen.sh     (for people who just cloned the repository)
+ ./configure      (if this script already exists, skip ./autogen.sh)
  make
  su
  make install     (not _really_ required except for perl support)

From 82ce1de5b004d27b8a742a72065feebf6d96f3ae Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 26 Nov 2015 19:50:58 -0300
Subject: [PATCH 0219/1650] irc-cap: Don't send a space at the beginning of the
 CAP REQ parameter

Turns out it confuses inspircd, making it reply a NAK with empty
parameter. The rest is ACKed anyway. I've already whined at saberuk
and there's a pending pull request over there fixing this issue.

And, of course, this is cleaner.
---
 src/irc/core/irc-cap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index cd3ae677..5464e493 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -112,7 +112,8 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			/* Check whether the cap is supported by the server */
 			for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
 				if (gslist_find_string(server->cap_supported, tmp->data)) {
-					g_string_append_c(cmd, ' ');
+					if (avail_caps > 0)
+						g_string_append_c(cmd, ' ');
 					g_string_append(cmd, tmp->data);
 
 					avail_caps++;

From 750df38e8ccd59d7cb3a11e09a682755060f7283 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 6 Dec 2015 22:31:49 +0100
Subject: [PATCH 0220/1650] Rewrite some faulty logic handling the saved
 channels.

Issue #340 brought to our attention the fact that under certain
circumstances irssi would go on a wild rampage and carelessly overwrite
some saved channel records in the configuration file.
This happened because the code didn't take into account the case where
the channel index in setupchannels wouldn't match the one in the
configuration; this actually happens when the user removes a chatnet
without removing the associated channels.
---
 src/core/channels-setup.c | 45 ++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index 2902ef8e..33f58022 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -30,16 +30,34 @@
 
 GSList *setupchannels;
 
+static int compare_channel_name (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
+{
+	char *name, *chatnet;
+
+	name = config_node_get_str(node, "name", NULL);
+	chatnet = config_node_get_str(node, "chatnet", NULL);
+
+	if (name == NULL || chatnet == NULL)
+		return 1;
+
+	return !!strcmp(name, channel->name) | !!strcmp(chatnet, channel->chatnet);
+}
+
 static void channel_setup_save(CHANNEL_SETUP_REC *channel)
 {
 	CONFIG_NODE *parentnode, *node;
-	int index;
-
-	index = g_slist_index(setupchannels, channel);
+	GSList *config_node;
 
 	parentnode = iconfig_node_traverse("(channels", TRUE);
-	node = config_node_nth(parentnode, index);
-	if (node == NULL)
+
+	/* Try to find this channel in the configuration */
+	config_node = g_slist_find_custom(parentnode->value, channel,
+					  (GCompareFunc)compare_channel_name);
+	if (config_node != NULL)
+		/* Let's update this channel record */
+		node = config_node->data;
+	else
+		/* Create a brand-new channel record */
 		node = iconfig_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
 
         iconfig_node_clear(node);
@@ -65,10 +83,21 @@ void channel_setup_create(CHANNEL_SETUP_REC *channel)
 
 static void channel_config_remove(CHANNEL_SETUP_REC *channel)
 {
-	CONFIG_NODE *node;
+	CONFIG_NODE *parentnode;
+	GSList *config_node;
 
-	node = iconfig_node_traverse("channels", FALSE);
-	if (node != NULL) iconfig_node_list_remove(node, g_slist_index(setupchannels, channel));
+	parentnode = iconfig_node_traverse("channels", FALSE);
+
+	if (parentnode == NULL)
+		return;
+
+	/* Try to find this channel in the configuration */
+	config_node = g_slist_find_custom(parentnode->value, channel,
+					  (GCompareFunc)compare_channel_name);
+
+	if (config_node != NULL)
+		/* Delete the channel from the configuration */
+		iconfig_node_remove(parentnode, config_node->data);
 }
 
 static void channel_setup_destroy(CHANNEL_SETUP_REC *channel)

From ca96444784535222e41606bd179f511fca097057 Mon Sep 17 00:00:00 2001
From: Wieland Hoffmann <themineo@gmail.com>
Date: Wed, 9 Dec 2015 11:21:51 +0100
Subject: [PATCH 0221/1650] DCC close always requires a type

---
 docs/help/in/dcc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/dcc.in b/docs/help/in/dcc.in
index c348b1ae..649cb12b 100644
--- a/docs/help/in/dcc.in
+++ b/docs/help/in/dcc.in
@@ -38,8 +38,8 @@
     /DCC CHAT mike
     /DCC GET bob 'summer vacation.mkv'
     /DCC SEND sarah documents/resume.pdf
-    /DCC CLOSE mike
-    /DCC CLOSE bob 'summer vacation.mkv'
+    /DCC CLOSE get mike
+    /DCC CLOSE send bob 'summer vacation.mkv'
 
 %9See also:%9 CD
 

From 3532fc46719ebbcfe83b5814f93ac9cb58eea220 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@esf51.localdomain>
Date: Fri, 22 Aug 2014 13:48:17 +0200
Subject: [PATCH 0222/1650] Add bindings for exec-type window items to Perl

These bindings were missing and resulted in non-hash non-undef active
entries when an interactive process is executing.
---
 src/perl/perl-common.c |  6 ++++--
 src/perl/ui/UI.xs      | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index dcda3bb5..d7a428e5 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -351,10 +351,12 @@ void perl_window_item_fill_hash(HV *hv, WI_ITEM_REC *item)
         g_return_if_fail(item != NULL);
 
 	type = (char *) module_find_id_str("WINDOW ITEM TYPE", item->type);
-	chat_type = (char *) chat_protocol_find_id(item->chat_type)->name;
 
 	(void) hv_store(hv, "type", 4, new_pv(type), 0);
-	(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
+	if (item->chat_type) {
+		chat_type = (char *) chat_protocol_find_id(item->chat_type)->name;
+		(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
+	}
 
 	if (item->server != NULL) {
 		(void) hv_store(hv, "server", 6, iobject_bless(item->server), 0);
diff --git a/src/perl/ui/UI.xs b/src/perl/ui/UI.xs
index 9db57e98..5ac3da4e 100644
--- a/src/perl/ui/UI.xs
+++ b/src/perl/ui/UI.xs
@@ -64,6 +64,19 @@ static void perl_text_dest_fill_hash(HV *hv, TEXT_DEST_REC *dest)
 	(void) hv_store(hv, "hilight_color", 13, new_pv(dest->hilight_color), 0);
 }
 
+static void perl_exec_fill_hash(HV *hv, EXEC_WI_REC *item)
+{
+	g_return_if_fail(hv != NULL);
+	g_return_if_fail(item != NULL);
+
+	perl_window_item_fill_hash(hv, (WI_ITEM_REC *) item);
+	/* we don't bless to Process here to avoid infinite recursion
+	   in the simplistic script binding */
+	if (item->process != NULL) {
+		(void) hv_store(hv, "process_id", 10, newSViv(item->process->id), 0);
+	}
+}
+
 static PLAIN_OBJECT_INIT_REC fe_plains[] = {
 	{ "Irssi::UI::Process", (PERL_OBJECT_FUNC) perl_process_fill_hash },
 	{ "Irssi::UI::Window", (PERL_OBJECT_FUNC) perl_window_fill_hash },
@@ -94,6 +107,10 @@ CODE:
 	initialized = TRUE;
 
         irssi_add_plains(fe_plains);
+        /* window items: fe-exec */
+        irssi_add_object(module_get_uniq_id_str("WINDOW ITEM TYPE", "EXEC"),
+			 0, "Irssi::UI::Exec",
+                         (PERL_OBJECT_FUNC) perl_exec_fill_hash);
         perl_themes_init();
 
 void

From 20fe5d0c7feea176129b6a31f2983b1b17689866 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 9 Dec 2015 14:23:15 +0100
Subject: [PATCH 0223/1650] add missing file to Makefile

---
 src/fe-common/irc/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index a5dd4c77..bf88f5cd 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -37,6 +37,7 @@ libfe_common_irc_a_SOURCES = \
 pkginc_fe_common_ircdir=$(pkgincludedir)/src/fe-common/irc
 pkginc_fe_common_irc_HEADERS = \
 	fe-irc-server.h \
+	fe-irc-channels.h \
 	module.h \
 	module-formats.h
 

From 0fcfd37b83afb3ca9abe4cce6630080b850df2be Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 9 Dec 2015 15:00:25 +0100
Subject: [PATCH 0224/1650] Fix Out-of-tree build

Symlink irssi-version.h into build dir, restoring 550df275580b253e8c3ebb5dbfceef87311a63c9
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 325b5e5d..c0efd5e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,6 +659,7 @@ AC_OUTPUT
 dnl ** for building from objdir
 old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir
 if test "x$old_dir" != "x$whole_dir"; then
+	$LN_S $srcdir/irssi-version.h irssi-version.h
 	if test "x$want_perl" != "xno"; then
 		subdirfiles=""
 		for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do

From 60c501625bbc450b8bd443a7cbccf897810634fc Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 9 Dec 2015 15:43:31 +0100
Subject: [PATCH 0225/1650] Better function naming

---
 src/core/channels-setup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index 33f58022..b3039fb2 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -30,7 +30,7 @@
 
 GSList *setupchannels;
 
-static int compare_channel_name (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
+static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
 {
 	char *name, *chatnet;
 
@@ -52,7 +52,7 @@ static void channel_setup_save(CHANNEL_SETUP_REC *channel)
 
 	/* Try to find this channel in the configuration */
 	config_node = g_slist_find_custom(parentnode->value, channel,
-					  (GCompareFunc)compare_channel_name);
+					  (GCompareFunc)compare_channel_setup);
 	if (config_node != NULL)
 		/* Let's update this channel record */
 		node = config_node->data;
@@ -93,7 +93,7 @@ static void channel_config_remove(CHANNEL_SETUP_REC *channel)
 
 	/* Try to find this channel in the configuration */
 	config_node = g_slist_find_custom(parentnode->value, channel,
-					  (GCompareFunc)compare_channel_name);
+					  (GCompareFunc)compare_channel_setup);
 
 	if (config_node != NULL)
 		/* Delete the channel from the configuration */

From 971417caa342881780b347f6aca728d962d710ee Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 9 Dec 2015 16:02:37 +0100
Subject: [PATCH 0226/1650] Rewrite some faulty logic handling the saved
 servers.

---
 src/core/channels-setup.c | 23 ++++++++-------
 src/core/servers-setup.c  | 59 +++++++++++++++++++++++++++++----------
 2 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index b3039fb2..dd722fea 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -40,25 +40,28 @@ static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
 	if (name == NULL || chatnet == NULL)
 		return 1;
 
-	return !!strcmp(name, channel->name) | !!strcmp(chatnet, channel->chatnet);
+	if (strcmp(name, channel->name) || strcmp(chatnet, channel->chatnet))
+		return 1;
+
+	return 0;
 }
 
 static void channel_setup_save(CHANNEL_SETUP_REC *channel)
 {
-	CONFIG_NODE *parentnode, *node;
+	CONFIG_NODE *parent_node, *node;
 	GSList *config_node;
 
-	parentnode = iconfig_node_traverse("(channels", TRUE);
+	parent_node = iconfig_node_traverse("(channels", TRUE);
 
 	/* Try to find this channel in the configuration */
-	config_node = g_slist_find_custom(parentnode->value, channel,
+	config_node = g_slist_find_custom(parent_node->value, channel,
 					  (GCompareFunc)compare_channel_setup);
 	if (config_node != NULL)
 		/* Let's update this channel record */
 		node = config_node->data;
 	else
 		/* Create a brand-new channel record */
-		node = iconfig_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
+		node = iconfig_node_section(parent_node, NULL, NODE_TYPE_BLOCK);
 
         iconfig_node_clear(node);
 	iconfig_node_set_str(node, "name", channel->name);
@@ -83,21 +86,21 @@ void channel_setup_create(CHANNEL_SETUP_REC *channel)
 
 static void channel_config_remove(CHANNEL_SETUP_REC *channel)
 {
-	CONFIG_NODE *parentnode;
+	CONFIG_NODE *parent_node;
 	GSList *config_node;
 
-	parentnode = iconfig_node_traverse("channels", FALSE);
+	parent_node = iconfig_node_traverse("channels", FALSE);
 
-	if (parentnode == NULL)
+	if (parent_node == NULL)
 		return;
 
 	/* Try to find this channel in the configuration */
-	config_node = g_slist_find_custom(parentnode->value, channel,
+	config_node = g_slist_find_custom(parent_node->value, channel,
 					  (GCompareFunc)compare_channel_setup);
 
 	if (config_node != NULL)
 		/* Delete the channel from the configuration */
-		iconfig_node_remove(parentnode, config_node->data);
+		iconfig_node_remove(parent_node, config_node->data);
 }
 
 static void channel_setup_destroy(CHANNEL_SETUP_REC *channel)
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 771e3999..26632d63 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -423,17 +423,41 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 	return rec;
 }
 
+static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
+{
+	char *address, *chatnet;
+	int port;
+
+	address = config_node_get_str(node, "address", NULL);
+	chatnet = config_node_get_str(node, "chatnet", NULL);
+	port = config_node_get_int(node, "port", 0);
+
+	if (address == NULL || chatnet == NULL)
+		return 1;
+
+	if (strcmp(address, server->address) || strcmp(chatnet, server->chatnet)
+	    || port != server->port)
+		return 1;
+
+	return 0;
+}
+
 static void server_setup_save(SERVER_SETUP_REC *rec)
 {
-	CONFIG_NODE *parentnode, *node;
-	int index;
+	CONFIG_NODE *parent_node, *node;
+	GSList *config_node;
 
-	index = g_slist_index(setupservers, rec);
+	parent_node = iconfig_node_traverse("(servers", TRUE);
 
-	parentnode = iconfig_node_traverse("(servers", TRUE);
-	node = config_node_nth(parentnode, index);
-	if (node == NULL)
-		node = iconfig_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
+	/* Try to find this channel in the configuration */
+	config_node = g_slist_find_custom(parent_node->value, rec,
+					  (GCompareFunc)compare_server_setup);
+	if (config_node != NULL)
+		/* Let's update this server record */
+		node = config_node->data;
+	else
+		/* Create a brand-new server record */
+		node = iconfig_node_section(parent_node, NULL, NODE_TYPE_BLOCK);
 
         iconfig_node_clear(node);
 	iconfig_node_set_str(node, "address", rec->address);
@@ -465,14 +489,21 @@ static void server_setup_save(SERVER_SETUP_REC *rec)
 
 static void server_setup_remove_config(SERVER_SETUP_REC *rec)
 {
-	CONFIG_NODE *node;
-	int index;
+	CONFIG_NODE *parent_node;
+	GSList *config_node;
 
-	node = iconfig_node_traverse("servers", FALSE);
-	if (node != NULL) {
-		index = g_slist_index(setupservers, rec);
-		iconfig_node_list_remove(node, index);
-	}
+	parent_node = iconfig_node_traverse("servers", FALSE);
+
+	if (parent_node == NULL)
+		return;
+
+	/* Try to find this server in the configuration */
+	config_node = g_slist_find_custom(parent_node->value, rec,
+					  (GCompareFunc)compare_server_setup);
+
+	if (config_node != NULL)
+		/* Delete the server from the configuration */
+		iconfig_node_remove(parent_node, config_node->data);
 }
 
 static void server_setup_destroy(SERVER_SETUP_REC *rec)

From 1749a7a5abf9801bb663b74d4b3e7c3bcbfeb271 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 9 Dec 2015 16:16:03 +0100
Subject: [PATCH 0227/1650] Minor adjustments.

Use g_strcmp0 instead of strcmp.
Explicit checks added for the g_strcmp0 clauses.
---
 src/core/channels-setup.c | 6 ++----
 src/core/servers-setup.c  | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index dd722fea..4966d77d 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -37,10 +37,8 @@ static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
 	name = config_node_get_str(node, "name", NULL);
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 
-	if (name == NULL || chatnet == NULL)
-		return 1;
-
-	if (strcmp(name, channel->name) || strcmp(chatnet, channel->chatnet))
+	if (g_strcmp0(name, channel->name) != 0 || 
+	    g_strcmp0(chatnet, channel->chatnet) != 0)
 		return 1;
 
 	return 0;
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 26632d63..4a048282 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -432,11 +432,9 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 	port = config_node_get_int(node, "port", 0);
 
-	if (address == NULL || chatnet == NULL)
-		return 1;
-
-	if (strcmp(address, server->address) || strcmp(chatnet, server->chatnet)
-	    || port != server->port)
+	if (g_strcmp0(address, server->address) != 0 ||
+	    g_strcmp0(chatnet, server->chatnet) != 0 ||
+	    port != server->port)
 		return 1;
 
 	return 0;

From 96766b7f0530ca2e5b4d0fde68337f956e46eb0e Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 9 Dec 2015 15:20:59 -0300
Subject: [PATCH 0228/1650] Remove all WIN32 ifdefs (unifdef -UWIN32)

Just use cygwin.

This looks like it wasn't enough to do anything useful, and I don't
think anyone cares about supporting win32 the hard way.
---
 src/common.h                        |  3 ---
 src/core/core.c                     |  6 ------
 src/core/misc.c                     |  4 ----
 src/core/net-disconnect.c           |  2 --
 src/core/net-nonblock.c             | 10 ----------
 src/core/net-sendbuffer.c           |  4 ----
 src/core/network.c                  | 16 ----------------
 src/core/network.h                  |  2 --
 src/fe-common/core/fe-common-core.c |  4 ----
 src/fe-text/irssi.c                 | 17 -----------------
 10 files changed, 68 deletions(-)

diff --git a/src/common.h b/src/common.h
index 86a079fe..0cf951b3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -34,9 +34,6 @@
 #  include <dirent.h>
 #endif
 #include <fcntl.h>
-#ifdef WIN32
-#  include <win32-compat.h>
-#endif
 
 #include <glib.h>
 #ifdef HAVE_GMODULE
diff --git a/src/core/core.c b/src/core/core.c
index bbeec6f4..bf7cdd6b 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -83,7 +83,6 @@ static void sig_reload_config(int signo)
 
 static void read_settings(void)
 {
-#ifndef WIN32
 	static int signals[] = {
 		SIGINT, SIGQUIT, SIGTERM,
 		SIGALRM, SIGUSR1, SIGUSR2
@@ -124,7 +123,6 @@ static void read_settings(void)
                         settings_set_bool("override_coredump_limit", FALSE);
 	}
 #endif
-#endif
 }
 
 static void sig_gui_dialog(const char *type, const char *text)
@@ -225,9 +223,7 @@ void core_init(void)
 	client_start_time = time(NULL);
 
 	modules_init();
-#ifndef WIN32
 	pidwait_init();
-#endif
 
 	net_disconnect_init();
 	signals_init();
@@ -303,9 +299,7 @@ void core_deinit(void)
 	signals_deinit();
 	net_disconnect_deinit();
 
-#ifndef WIN32
 	pidwait_deinit();
-#endif
 	modules_deinit();
 
 	g_free(irssi_dir);
diff --git a/src/core/misc.c b/src/core/misc.c
index 490b5a8f..aaa470f5 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -430,11 +430,7 @@ int mkpath(const char *path, int mode)
 
 		dir = g_strndup(path, (int) (p-path));
 		if (stat(dir, &statbuf) != 0) {
-#ifndef WIN32
 			if (mkdir(dir, mode) == -1)
-#else
-			if (_mkdir(dir) == -1)
-#endif
 			{
 				g_free(dir);
 				return -1;
diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index 321f79ac..6476e776 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -116,7 +116,6 @@ void net_disconnect_init(void)
 
 void net_disconnect_deinit(void)
 {
-#ifndef WIN32
 	NET_DISCONNECT_REC *rec;
 	time_t now, max;
 	int first, fd;
@@ -155,5 +154,4 @@ void net_disconnect_deinit(void)
 			first = 0;
 		}
 	}
-#endif
 }
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index e637e673..d6e767b6 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -77,14 +77,11 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 {
 	RESOLVED_IP_REC rec;
 	const char *errorstr;
-#ifndef WIN32
 	int pid;
-#endif
 	int len;
 
 	g_return_val_if_fail(addr != NULL, FALSE);
 
-#ifndef WIN32
 	pid = fork();
 	if (pid > 0) {
 		/* parent */
@@ -97,7 +94,6 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 		g_warning("net_connect_thread(): fork() failed! "
 			  "Using blocking resolving");
 	}
-#endif
 
 	/* child */
 	srand(time(NULL));
@@ -138,10 +134,8 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 		}
 	}
 
-#ifndef WIN32
 	if (pid == 0)
 		_exit(99);
-#endif
 
 	/* we used blocking lookup */
 	return 0;
@@ -157,9 +151,7 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 	rec->host4 = NULL;
 	rec->host6 = NULL;
 
-#ifndef WIN32
 	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
-#endif
 
 	/* get ip+error */
 	if (g_io_channel_read_block(pipe, rec, sizeof(*rec)) == -1) {
@@ -201,9 +193,7 @@ void net_disconnect_nonblock(int pid)
 {
 	g_return_if_fail(pid > 0);
 
-#ifndef WIN32
 	kill(pid, SIGKILL);
-#endif
 }
 
 static void simple_init(SIMPLE_THREAD_REC *rec, GIOChannel *handle)
diff --git a/src/core/net-sendbuffer.c b/src/core/net-sendbuffer.c
index 39257486..97fb551f 100644
--- a/src/core/net-sendbuffer.c
+++ b/src/core/net-sendbuffer.c
@@ -160,13 +160,9 @@ void net_sendbuffer_flush(NET_SENDBUF_REC *rec)
 
         /* set the socket blocking while doing this */
 	handle = g_io_channel_unix_get_fd(rec->handle);
-#ifndef WIN32
 	fcntl(handle, F_SETFL, 0);
-#endif
 	while (!buffer_send(rec)) ;
-#ifndef WIN32
 	fcntl(handle, F_SETFL, O_NONBLOCK);
-#endif
 }
 
 /* Returns the socket handle */
diff --git a/src/core/network.c b/src/core/network.c
index bfaa47fb..0751aa95 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -45,11 +45,7 @@ union sockaddr_union {
 GIOChannel *g_io_channel_new(int handle)
 {
 	GIOChannel *chan;
-#ifdef WIN32
-	chan = g_io_channel_win32_new_socket(handle);
-#else
 	chan = g_io_channel_unix_new(handle);
-#endif
 	g_io_channel_set_encoding(chan, NULL, NULL);
 	g_io_channel_set_buffered(chan, FALSE);
 	return chan;
@@ -188,9 +184,7 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 		return NULL;
 
 	/* set socket options */
-#ifndef WIN32
 	fcntl(handle, F_SETFL, O_NONBLOCK);
-#endif
 	setsockopt(handle, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
 	setsockopt(handle, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt));
 
@@ -211,11 +205,7 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 	sin_set_port(&so, port);
 	ret = connect(handle, &so.sa, SIZEOF_SOCKADDR(so));
 
-#ifndef WIN32
 	if (ret < 0 && errno != EINPROGRESS)
-#else
-	if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK)
-#endif
 	{
 		int old_errno = errno;
 		close(handle);
@@ -238,9 +228,7 @@ GIOChannel *net_connect_unix(const char *path)
 		return NULL;
 
 	/* set socket options */
-#ifndef WIN32
 	fcntl(handle, F_SETFL, O_NONBLOCK);
-#endif
 
 	/* connect */
 	memset(&sa, 0, sizeof(sa));
@@ -297,9 +285,7 @@ GIOChannel *net_listen(IPADDR *my_ip, int *port)
 		return NULL;
 
 	/* set socket options */
-#ifndef WIN32
 	fcntl(handle, F_SETFL, O_NONBLOCK);
-#endif
 	setsockopt(handle, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
 	setsockopt(handle, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt));
 
@@ -342,9 +328,7 @@ GIOChannel *net_accept(GIOChannel *handle, IPADDR *addr, int *port)
 	if (addr != NULL) sin_get_ip(&so, addr);
 	if (port != NULL) *port = sin_get_port(&so);
 
-#ifndef WIN32
 	fcntl(ret, F_SETFL, O_NONBLOCK);
-#endif
 	return g_io_channel_new(ret);
 }
 
diff --git a/src/core/network.h b/src/core/network.h
index fa7e9675..73ac8dee 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -6,12 +6,10 @@
 #endif
 
 #include <sys/types.h>
-#ifndef WIN32
 #  include <sys/socket.h>
 #  include <netinet/in.h>
 #  include <netdb.h>
 #  include <arpa/inet.h>
-#endif
 
 #ifndef AF_INET6
 #  ifdef PF_INET6
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index a15850e2..ee7f9424 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -168,9 +168,7 @@ void fe_common_core_init(void)
 	keyboard_init();
 	printtext_init();
 	formats_init();
-#ifndef WIN32
         fe_exec_init();
-#endif
         fe_expandos_init();
 	fe_help_init();
 	fe_ignore_init();
@@ -211,9 +209,7 @@ void fe_common_core_deinit(void)
 	keyboard_deinit();
 	printtext_deinit();
 	formats_deinit();
-#ifndef WIN32
         fe_exec_deinit();
-#endif
         fe_expandos_deinit();
 	fe_help_deinit();
 	fe_ignore_deinit();
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index b1fa5e22..cad271c9 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -271,20 +271,6 @@ static void check_files(void)
 	}
 }
 
-#ifdef WIN32
-static void winsock_init(void)
-{
-	WORD wVersionRequested;
-	WSADATA wsaData;
-
-	wVersionRequested = MAKEWORD(2, 2);
-
-	if (WSAStartup(wVersionRequested, &wsaData) != 0) {
-		printf("Error initializing winsock\n");
-		exit(1);
-	}
-}
-#endif
 
 int main(int argc, char **argv)
 {
@@ -315,9 +301,6 @@ int main(int argc, char **argv)
 
 	check_files();
 
-#ifdef WIN32
-        winsock_init();
-#endif
 #ifdef HAVE_SOCKS
 	SOCKSinit(argv[0]);
 #endif

From ff8ccaf08b60d88a67ddf810f8229f910f016cf7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 24 Nov 2015 00:08:20 +0100
Subject: [PATCH 0229/1650] module check irssi version

Add explicit checks into every module to match the ABI version defined
in common.h
---
 src/common.h                        |  2 ++
 src/core/expandos.c                 |  9 +++++++++
 src/core/modules-load.c             | 26 +++++++++++++++++++++++++-
 src/core/modules.h                  |  1 +
 src/fe-common/core/fe-modules.c     |  4 ++++
 src/fe-common/core/module-formats.c |  1 +
 src/fe-common/core/module-formats.h |  1 +
 src/irc/proxy/proxy.c               |  5 +++++
 src/perl/perl-core.c                |  5 +++++
 src/perl/perl-fe.c                  |  5 +++++
 10 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 0cf951b3..966e28d0 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,6 +6,8 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
+#define IRSSI_ABI_VERSION 1
+
 #define DEFAULT_SERVER_ADD_PORT 6667
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/core/expandos.c b/src/core/expandos.c
index 1fc517af..67aea837 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -414,6 +414,13 @@ static char *expando_releasetime(SERVER_REC *server, void *item, int *free_ret)
 	return g_strdup_printf("%04d", IRSSI_VERSION_TIME);
 }
 
+/* client abi */
+static char *expando_abiversion(SERVER_REC *server, void *item, int *free_ret)
+{
+        *free_ret = TRUE;
+	return g_strdup_printf("%d", IRSSI_ABI_VERSION);
+}
+
 /* current working directory */
 static char *expando_workdir(SERVER_REC *server, void *item, int *free_ret)
 {
@@ -658,6 +665,8 @@ void expandos_init(void)
 		       "", EXPANDO_NEVER, NULL);
 	expando_create("versiontime", expando_releasetime,
 		       "", EXPANDO_NEVER, NULL);
+	expando_create("abiversion", expando_abiversion,
+		       "", EXPANDO_NEVER, NULL);
 	expando_create("W", expando_workdir, NULL);
 	expando_create("Y", expando_realname,
 		       "window changed", EXPANDO_ARG_NONE,
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index 6086d9ae..9baac1d7 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -160,11 +160,14 @@ static int module_load_name(const char *path, const char *rootmodule,
 {
 	void (*module_init) (void);
 	void (*module_deinit) (void);
+	void (*module_version) (int *);
 	GModule *gmodule;
         MODULE_REC *module;
 	MODULE_FILE_REC *rec;
+	gpointer value_version = NULL;
 	gpointer value1, value2 = NULL;
-	char *initfunc, *deinitfunc;
+	char *versionfunc, *initfunc, *deinitfunc;
+	int module_abi_version = 0;
         int found;
 
 	gmodule = module_open(path, &found);
@@ -176,6 +179,27 @@ static int module_load_name(const char *path, const char *rootmodule,
 		return found ? 0 : -1;
 	}
 
+	/* get the module's irssi abi version and bail out on mismatch */
+	versionfunc = module_get_func(rootmodule, submodule, "abicheck");
+	if (!g_module_symbol(gmodule, versionfunc, &value_version)) {
+		g_free(versionfunc);
+		module_error(MODULE_ERROR_VERSION_MISMATCH, "0",
+			     rootmodule, submodule);
+		g_module_close(gmodule);
+		return 0;
+	}
+	g_free(versionfunc);
+	module_version = value_version;
+	module_version(&module_abi_version);
+	if (module_abi_version != IRSSI_ABI_VERSION) {
+		char *module_abi_versionstr = g_strdup_printf("%d", module_abi_version);
+		module_error(MODULE_ERROR_VERSION_MISMATCH, module_abi_versionstr,
+			     rootmodule, submodule);
+		g_free(module_abi_versionstr);
+		g_module_close(gmodule);
+		return 0;
+	}
+
 	/* get the module's init() and deinit() functions */
 	initfunc = module_get_func(rootmodule, submodule, "init");
 	deinitfunc = module_get_func(rootmodule, submodule, "deinit");
diff --git a/src/core/modules.h b/src/core/modules.h
index 75a77c77..b2fa2fa4 100644
--- a/src/core/modules.h
+++ b/src/core/modules.h
@@ -27,6 +27,7 @@
 enum {
 	MODULE_ERROR_ALREADY_LOADED,
 	MODULE_ERROR_LOAD,
+	MODULE_ERROR_VERSION_MISMATCH,
 	MODULE_ERROR_INVALID
 };
 
diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index df97ceb1..27b6b4c1 100644
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@@ -43,6 +43,10 @@ static void sig_module_error(void *number, const char *data,
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
 			    TXT_MODULE_LOAD_ERROR, rootmodule, submodule, data);
 		break;
+	case MODULE_ERROR_VERSION_MISMATCH:
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+			    TXT_MODULE_VERSION_MISMATCH, rootmodule, submodule, data);
+		break;
 	case MODULE_ERROR_INVALID:
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
 			    TXT_MODULE_INVALID, rootmodule, submodule);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 4ae26950..e6d32b6d 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -196,6 +196,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "module_already_loaded", "Module {hilight $0/$1} already loaded", 2, { 0, 0 } },
 	{ "module_not_loaded", "Module {hilight $0/$1} is not loaded", 2, { 0, 0 } },
 	{ "module_load_error", "Error loading module {hilight $0/$1}: $2", 3, { 0, 0, 0 } },
+	{ "module_version_mismatch", "{hilight $0/$1} is ABI version $2 but Irssi is version $abiversion, cannot load", 3, { 0, 0, 0 } },
 	{ "module_invalid", "{hilight $0/$1} isn't Irssi module", 2, { 0, 0 } },
 	{ "module_loaded", "Loaded module {hilight $0/$1}", 2, { 0, 0 } },
 	{ "module_unloaded", "Unloaded module {hilight $0/$1}", 2, { 0, 0 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 18bf91f5..3f06bb97 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -166,6 +166,7 @@ enum {
 	TXT_MODULE_ALREADY_LOADED,
 	TXT_MODULE_NOT_LOADED,
 	TXT_MODULE_LOAD_ERROR,
+	TXT_MODULE_VERSION_MISMATCH,
 	TXT_MODULE_INVALID,
 	TXT_MODULE_LOADED,
 	TXT_MODULE_UNLOADED,
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index ce79e2b7..50a41b21 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -108,3 +108,8 @@ void irc_proxy_deinit(void)
 {
 	proxy_listen_deinit();
 }
+
+void irc_proxy_abicheck(int *version)
+{
+	*version = IRSSI_ABI_VERSION;
+}
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 793f9375..2f28c718 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -466,3 +466,8 @@ void perl_core_deinit(void)
 	signal_remove("script error", (SIGNAL_FUNC) sig_script_error);
 	PERL_SYS_TERM();
 }
+
+void perl_core_abicheck(int *version)
+{
+	*version = IRSSI_ABI_VERSION;
+}
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index 2abc75c0..04305b63 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -278,3 +278,8 @@ void fe_perl_deinit(void)
 
         perl_core_print_script_error(TRUE);
 }
+
+void fe_perl_abicheck(int *version)
+{
+	*version = IRSSI_ABI_VERSION;
+}

From 9dd2b7c616e48a7525e72d6798a0adae34720616 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 10 Dec 2015 14:02:59 +0100
Subject: [PATCH 0230/1650] deinit perl on staticperl builds

---
 src/perl/perl-core.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 793f9375..2c0ca49d 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -82,16 +82,18 @@ static void perl_script_destroy(PERL_SCRIPT_REC *script)
 extern void boot_DynaLoader(pTHX_ CV* cv);
 
 #if PERL_STATIC_LIBS == 1
-extern void boot_Irssi(CV *cv);
+extern void boot_Irssi(pTHX_ CV *cv);
 
 XS(boot_Irssi_Core)
 {
 	dXSARGS;
+	PERL_UNUSED_VAR(items);
 
 	irssi_callXS(boot_Irssi, cv, mark);
         irssi_boot(Irc);
         irssi_boot(UI);
         irssi_boot(TextUI);
+	/* Make sure to keep this in line with perl_scripts_deinit below. */
 	XSRETURN_YES;
 }
 #endif
@@ -155,6 +157,17 @@ void perl_scripts_deinit(void)
 	/* Unload all perl libraries loaded with dynaloader */
 	perl_eval_pv("foreach my $lib (@DynaLoader::dl_modules) { if ($lib =~ /^Irssi\\b/) { $lib .= '::deinit();'; eval $lib; } }", TRUE);
 
+#if PERL_STATIC_LIBS == 1
+	/* If perl is statically built we should manually deinit the modules
+	   which are booted in boot_Irssi_Core above */
+	perl_eval_pv("foreach my $lib (qw("
+		"Irssi" " "
+		"Irssi::Irc" " "
+		"Irssi::UI" " "
+		"Irssi::TextUI"
+		")) { eval $lib . '::deinit();'; }", TRUE);
+#endif
+
 	/* We could unload all libraries .. but this crashes with some
 	   libraries, probably because we don't call some deinit function..
 	   Anyway, this would free some memory with /SCRIPT RESET, but it

From 0b1a912f822b21e5c4dfc18436ab5b90f079e19b Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 11 Dec 2015 21:31:04 -0300
Subject: [PATCH 0231/1650] Makefile.am: Add default-config.h and
 default-theme.h to CLEANFILES

Fixes issues when building from other directories when the source tree
was already configured before, as found in the comments of PR #375
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 6ca69fc7..75d502f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 # create default-config.h
 BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
+CLEANFILES = default-config.h default-theme.h
 
 @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
 

From 38d372eccb3745a7734b8f8963ae572d1343c5b1 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 12 Dec 2015 01:17:48 -0300
Subject: [PATCH 0232/1650] Disable timeout-based paste detection if
 paste_use_bracketed_mode is on

---
 src/fe-text/gui-readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 96b8b386..a9755318 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -737,7 +737,7 @@ static void sig_input(void)
 		if (paste_bracketed_mode) {
 			paste_bracketed_middle();
 
-		} else if (paste_detect_time > 0 && paste_buffer->len >= 3) {
+		} else if (!paste_use_bracketed_mode && paste_detect_time > 0 && paste_buffer->len >= 3) {
 			if (paste_timeout_id != -1)
 				g_source_remove(paste_timeout_id);
 			paste_timeout_id = g_timeout_add(paste_detect_time, paste_timeout, NULL);

From e6fa311590da78d05e9eea42d3664cec01c9b1ae Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 12 Dec 2015 01:44:05 -0300
Subject: [PATCH 0233/1650] Bracketed paste: Adjust paste line count if there's
 text after newlines

With bracketed paste, "a\nb" will result in two lines being pasted,
because it's a single thing, with an end marker which the timeout based
pastes don't have.

Due to the way term_gets() counts lines, that input will have
paste_line_count == 1. This can be misleading.

This code adjusts it by looking at the last character, and increasing
the count if it finds anything that isn't a newline.
---
 src/fe-text/gui-readline.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index a9755318..851cbbe6 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -660,6 +660,8 @@ static gboolean paste_timeout(gpointer data)
 
 static void paste_bracketed_end(int i, gboolean rest)
 {
+	unichar last_char;
+
 	/* if there's stuff after the end bracket, save it for later */
 	if (rest) {
 		unichar *start = ((unichar *) paste_buffer->data) + i + G_N_ELEMENTS(bp_end);
@@ -672,6 +674,14 @@ static void paste_bracketed_end(int i, gboolean rest)
 	/* remove the rest, including the trailing sequence chars */
 	g_array_set_size(paste_buffer, i);
 
+	last_char = g_array_index(paste_buffer, unichar, i - 1);
+
+	if (paste_line_count > 0 && last_char != '\n' && last_char != '\r') {
+		/* there are newlines, but there's also stuff after the newline
+		 * adjust line count to reflect this */
+		paste_line_count++;
+	}
+
 	/* decide what to do with the buffer */
 	paste_timeout(NULL);
 

From 6e01a2313439bb02a66a52db645f63f078c2c4b0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 13 Dec 2015 01:08:53 +0100
Subject: [PATCH 0234/1650] ensure staticlib perl works on 5.22 (for now)

---
 src/perl/perl-common.c | 3 ---
 src/perl/perl-core.c   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index d7a428e5..b641867f 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -246,10 +246,7 @@ char *perl_get_use_list(void)
 
 void irssi_callXS(void (*subaddr)(pTHX_ CV* cv), CV *cv, SV **mark)
 {
-	dSP;
-
 	PUSHMARK(mark);
-	PUTBACK;
 
 	(*subaddr)(aTHX_ cv);
 }
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 2c0ca49d..1a864ef7 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -125,7 +125,7 @@ void perl_scripts_init(void)
 
 	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args), perl_args, NULL);
 #if PERL_STATIC_LIBS == 1
-	perl_eval_pv("Irssi::Core::boot_Irssi_Core();", TRUE);
+	perl_eval_pv("Irssi::Core::->boot_Irssi_Core(0.9);", TRUE);
 #endif
 
         perl_common_start();

From ce77842a985edc82aa1ca30c83c4edfe904872aa Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 13 Dec 2015 13:56:09 -0300
Subject: [PATCH 0235/1650] Bracketed paste: fix nitpick from ahf's review

Thanks ahf
---
 src/fe-text/gui-readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 851cbbe6..f531d282 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -339,7 +339,7 @@ static void paste_flush(int send)
 	g_array_set_size(paste_buffer, 0);
 
 	/* re-add anything that may have been after the bracketed paste end */
-	if (paste_buffer_rest->len) {
+	if (paste_buffer_rest->len > 0) {
 		g_array_append_vals(paste_buffer, paste_buffer_rest->data, paste_buffer_rest->len);
 		g_array_set_size(paste_buffer_rest, 0);
 	}

From 620d0a9299d31e3f9b59233904151cdce4519526 Mon Sep 17 00:00:00 2001
From: mh <mh-source@users.noreply.github.com>
Date: Mon, 14 Dec 2015 19:12:47 +0100
Subject: [PATCH 0236/1650] script should be plural

---
 docs/perl.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/perl.txt b/docs/perl.txt
index 560fcaec..9688341f 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -10,7 +10,7 @@ INSTALL file for information about perl problems.
  ---------------
 
 Scripts are run with /SCRIPT LOAD command, or the default /RUN alias.
-"/SCRIPT" shows list of running script, and /SCRIPT UNLOAD can unload
+"/SCRIPT" shows list of running scripts, and /SCRIPT UNLOAD can unload
 scripts.
 
 Scripts should be placed to ~/.irssi/scripts/ or

From 5fbad764df7b96618553a45facde73edb5e7bb9c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 15 Dec 2015 00:08:44 +0100
Subject: [PATCH 0237/1650] clean up after #303

---
 src/fe-common/core/formats.h      | 1 -
 src/fe-common/core/hilight-text.h | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 484105f9..a4b26852 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -45,7 +45,6 @@ struct _FORMAT_REC {
 #define PRINT_FLAG_SET_SERVERTAG	0x0010
 #define PRINT_FLAG_UNSET_SERVERTAG	0x0020
 
-// FIXME: sould use better
 typedef struct _HILIGHT_REC HILIGHT_REC;
 
 typedef struct _TEXT_DEST_REC {
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index fa083882..3c897def 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -7,8 +7,6 @@
 
 #include "formats.h"
 
-//typedef struct _HILIGHT_REC HILIGHT_REC;
-
 struct _HILIGHT_REC {
 	char *text;
 

From e4e040929b247b2432190b84b6edca997dacd600 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 15 Dec 2015 01:52:44 +0100
Subject: [PATCH 0238/1650] option to clear the history

---
 src/fe-common/core/command-history.c | 45 ++++++++++++++++++++++++----
 src/fe-common/core/command-history.h |  1 +
 src/fe-common/core/fe-windows.c      |  7 ++++-
 src/fe-common/core/fe-windows.h      |  1 +
 src/fe-common/core/window-commands.c | 21 +++++++++++--
 5 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index f9c3884c..9f46ee99 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -33,6 +33,7 @@
 static HISTORY_REC *global_history;
 static int window_history;
 static GSList *histories;
+static HISTORY_REC *last_cleared_history;
 
 void command_history_add(HISTORY_REC *history, const char *text)
 {
@@ -41,6 +42,13 @@ void command_history_add(HISTORY_REC *history, const char *text)
 	g_return_if_fail(history != NULL);
 	g_return_if_fail(text != NULL);
 
+	if (last_cleared_history == history) {
+		last_cleared_history = NULL;
+		return; /* ignore this history addition, we just
+			   cleared it */
+	}
+	last_cleared_history = NULL;
+
 	link = g_list_last(history->list);
 	if (link != NULL && g_strcmp0(link->data, text) == 0)
 	  return; /* same as previous entry */
@@ -94,13 +102,13 @@ HISTORY_REC *command_history_current(WINDOW_REC *window)
 	if (window == NULL)
 		return global_history;
 
-	if (window_history)
-		return window->history;
-
 	rec = command_history_find_name(window->history_name);
 	if (rec != NULL)
 		return rec;
 
+	if (window_history)
+		return window->history;
+
 	return global_history;
 }
 
@@ -178,6 +186,18 @@ HISTORY_REC *command_history_create(const char *name)
 	return rec;
 }
 
+void command_history_clear(HISTORY_REC *history)
+{
+	g_return_if_fail(history != NULL);
+
+	command_history_clear_pos_func(history, NULL);
+	g_list_foreach(history->list, (GFunc) g_free, NULL);
+	g_list_free(history->list);
+	history->list = NULL;
+	history->lines = 0;
+	last_cleared_history = history;
+}
+
 void command_history_destroy(HISTORY_REC *history)
 {
 	g_return_if_fail(history != NULL);
@@ -186,9 +206,8 @@ void command_history_destroy(HISTORY_REC *history)
 	g_return_if_fail(history->refcount == 0);
 
 	histories = g_slist_remove(histories, history);
-
-	g_list_foreach(history->list, (GFunc) g_free, NULL);
-	g_list_free(history->list);
+	command_history_clear(history);
+	last_cleared_history = NULL; /* was destroyed */
 
 	g_free_not_null(history->name);
 	g_free(history);
@@ -229,6 +248,18 @@ static void sig_window_destroyed(WINDOW_REC *window)
 	g_free_not_null(window->history_name);
 }
 
+static void sig_window_history_cleared(WINDOW_REC *window, const char *name) {
+	HISTORY_REC *history;
+
+	if (name == NULL || *name == '\0') {
+		history = command_history_current(window);
+	} else {
+		history = command_history_find_name(name);
+	}
+
+	command_history_clear(history);
+}
+
 static void sig_window_history_changed(WINDOW_REC *window, const char *oldname)
 {
 	command_history_link(window->history_name);
@@ -279,6 +310,7 @@ void command_history_init(void)
 	signal_add("window created", (SIGNAL_FUNC) sig_window_created);
 	signal_add("window destroyed", (SIGNAL_FUNC) sig_window_destroyed);
 	signal_add("window history changed", (SIGNAL_FUNC) sig_window_history_changed);
+	signal_add_last("window history cleared", (SIGNAL_FUNC) sig_window_history_cleared);
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 }
 
@@ -287,6 +319,7 @@ void command_history_deinit(void)
 	signal_remove("window created", (SIGNAL_FUNC) sig_window_created);
 	signal_remove("window destroyed", (SIGNAL_FUNC) sig_window_destroyed);
 	signal_remove("window history changed", (SIGNAL_FUNC) sig_window_history_changed);
+	signal_remove("window history cleared", (SIGNAL_FUNC) sig_window_history_cleared);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 
 	command_history_destroy(global_history);
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index 7b76246b..a572216b 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -28,6 +28,7 @@ const char *command_history_next(WINDOW_REC *window, const char *text);
 void command_history_clear_pos(WINDOW_REC *window);
 
 HISTORY_REC *command_history_create(const char *name);
+void command_history_clear(HISTORY_REC *history);
 void command_history_destroy(HISTORY_REC *history);
 void command_history_link(const char *name);
 void command_history_unlink(const char *name);
diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 1049137f..46c1593b 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -229,11 +229,16 @@ void window_set_history(WINDOW_REC *window, const char *name)
 	else
 		window->history_name = g_strdup(name);
 
-	signal_emit("window history changed", 1, window, oldname);
+	signal_emit("window history changed", 2, window, oldname);
 
 	g_free_not_null(oldname);
 }
 
+void window_clear_history(WINDOW_REC *window, const char *name)
+{
+	signal_emit("window history cleared", 2, window, name);
+}
+
 void window_set_level(WINDOW_REC *window, int level)
 {
 	g_return_if_fail(window != NULL);
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index 613f15f8..32d6cfcd 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -66,6 +66,7 @@ void window_change_server(WINDOW_REC *window, void *server);
 void window_set_refnum(WINDOW_REC *window, int refnum);
 void window_set_name(WINDOW_REC *window, const char *name);
 void window_set_history(WINDOW_REC *window, const char *name);
+void window_clear_history(WINDOW_REC *window, const char *name);
 void window_set_level(WINDOW_REC *window, int level);
 void window_set_immortal(WINDOW_REC *window, int immortal);
 
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index c6ab68c0..e5005144 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -33,6 +33,7 @@
 #include "window-items.h"
 #include "windows-layout.h"
 #include "printtext.h"
+#include "command-history.h"
 
 static void window_print_binds(WINDOW_REC *win)
 {
@@ -615,10 +616,25 @@ static void cmd_window_name(const char *data)
 	}
 }
 
-/* SYNTAX: WINDOW HISTORY <name> */
+/* SYNTAX: WINDOW HISTORY [-clear] <name> */
 void cmd_window_history(const char *data)
 {
-	window_set_history(active_win, data);
+	GHashTable *optlist;
+        char *name;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS,
+			    "window history", &optlist, &name))
+		return;
+
+	if (g_hash_table_lookup(optlist, "clear") != NULL) {
+		signal_continue(1, data);
+		window_clear_history(active_win, name);
+	} else {
+		window_set_history(active_win, name);
+	}
+
+	cmd_params_free(free_arg);
 }
 
 /* we're moving the first window to last - move the first contiguous block
@@ -883,6 +899,7 @@ void window_commands_init(void)
 	command_set_options("window number", "sticky");
 	command_set_options("window server", "sticky unsticky");
 	command_set_options("window theme", "delete");
+	command_set_options("window history", "clear");
 }
 
 void window_commands_deinit(void)

From 653fd590aff1d2f602ceef999b3df2719e0835b1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 13 Dec 2015 12:35:27 +0100
Subject: [PATCH 0239/1650] add new authors since 0.8.17

---
 AUTHORS | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d2cb58c0..dc8e578c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,8 @@ Irssi staff (current maintainers) <staff@irssi.org>:
   Jilles Tjoelker (jilles)
   Alexander Færøy (ahf)
   Jase Thew (bazerka)
+  dequis (dx)
+  Ailin Nemui (Nei)
 
 Former developers:
 
@@ -24,6 +26,7 @@ Large feature patches by:
   Heikki Orsila : DCC SEND queueing
   Mark Trumbull : DCC SERVER
   Francesco Fracassi : Passive DCC
+  Giuseppe (The Lemon Man)
 
 Other patches (grep for "patch" in ChangeLog) by:
 
@@ -78,6 +81,20 @@ Other patches (grep for "patch" in ChangeLog) by:
   Ismael Luceno
   Thomas Karpiniec
   Svante Kvarnström
-  Ailin Nemui (Nei)
   Tom Feist (shabble)
-  Sebastian Thorarensen
+  Sebastian Thorarensen (Sebban)
+  Hans Nielsen
+  Jari Matilainen (vague)
+  Thibault B (isundil)
+  kyak
+  Vesa Pirila (Lohhari)
+  Haw Loeung
+  François Revol (mmuman)
+  blha303
+  Guillaume Brogi (guiniol)
+  Adam-
+  Robert C Jensen
+  Paul Johnson
+  mauke
+  KindOne
+  Fabian Kurz

From ab809d8d2a9cfb3f0d879c098f2d2d88ce60d3fe Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 13 Dec 2015 14:14:41 +0100
Subject: [PATCH 0240/1650] list NEWS since 0.8.17

---
 NEWS | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 511f495a..c37129bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,57 @@
-v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
-	+ Garbage Collection support has been removed. This will hardly have any
+v0.8.18-rc1 2015-12-15  The Irssi team <staff@irssi.org>
+	* Modules will now require to define a
+	      void MODULENAME ## _abicheck(int *version)
+	  method to ensure that they are compiled against the correct Irssi
+	  version.
+	* The signature of "message private" has been changed to
+	      5: server, message, nick, address, target
+	  in order to support "self messages". Module authors should
+	  implement this change if they are using this signal.
+	* Removing networks will now remove all attached servers and channels
+          (#45).
+	* /proxy command has been renamed to /irssiproxy
+	* sb_search has been moved to scripts.irssi.org
+	* WIN32 has been completely removed (it had not been working and is
+          lacking a maintainer.)
+	* Garbage Collection support has been removed. This will hardly have any
 	  effect for anyone given that it has been unsupported for several years.
-	+ Disable SSLv3 due to the POODLE vulnerability.
+	+ CAP SASL PLAIN login is now supported natively.
+	+ Paste bracket markers can be requested from terminal with
+	      /set paste_use_bracketed_mode on
+	+ "Self messages" generated by some bouncers can now be received in the
+	  proper window.
 	+ Try to split long lines on spaces to avoid words being splitted. Adds
 	  a new option: 'split_line_on_space' which defaults to on.
+	+ Add setting hilight_nick_matches_everywhere (#56).
+	+ The config parser is more robust and prints out better diagnostics on
+	  incorrect config files.
+	+ Ctrl+^ (FS#721) and Ctrl+J can now be bound.
+	+ Command history can be cleared with /window history -clear
+	+ /hilight -mask -line is now supported (FS#275).
+	+ CHANTYPES are now supported.
+	+ Improved reload speed of ignores.
+	+ Add -date feature to /lastlog
+	+ irssiproxy can be more easily enabled and disabled.
+	+ Expando for hostname (FS#829).
+	+ UNIX sockets can now also be specified in the config file.
+	+ Disable SSLv3 due to the POODLE vulnerability.
+	+ SSL ciphers can now be specified per server.
+	+ Added SNI support for SSL.
+	- irssiproxy (BNC) module now uses correct line endings.
+	- Fix missing lines on large pastes (FS#905).
+	- Correctly preserve STATUSMSG prefixes (#291).
+	- Fix infinite recursion in key bindings (FS#817).
+	- Fix incomplete awaylog caused by buffering.
+	- Fix calculation of UTF-8 string length display in some cases.
+	- Fix some Perl warnings related to @ISA.
+	- EXEC windowitems now get proper references on the Perl side.
+	- Incremental help file improvements.
+	- ANSI attributes are now properly reset.
+	- Fixed regression where text would blink when terminal lacks color
+          support.
+	- Permit the usage of Freenode extban syntax in /ban (#150)
+	- Fixed regression in scriptassist on unload of scripts.
+	- Fixed regression in -actcolor %n
 
 v0.8.17 2014-10-11  The Irssi team <staff@irssi.org>
 	+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.

From 77143aee7dcff85f0b8656543c185a9e6a8131bb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 13 Dec 2015 14:17:33 +0100
Subject: [PATCH 0241/1650] remove mention of ./autogen.sh from releases
 INSTALL

---
 INSTALL | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 234c6cf6..a83a6c76 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,8 +11,7 @@ To compile irssi you need:
 
 For most people, this should work just fine:
 
- ./autogen.sh     (for people who just cloned the repository)
- ./configure      (if this script already exists, skip ./autogen.sh)
+ ./configure
  make
  su
  make install     (not _really_ required except for perl support)

From d495111bde29796430e34832f15025f3708a7166 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 15 Dec 2015 10:59:23 +0100
Subject: [PATCH 0242/1650] tag as 0.8.18-beta1

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c0efd5e3..92ca04ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.18-head)
+AC_INIT(irssi, 0.8.18-beta1)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 74eb556c504271129f44268870d34c011804d7e4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 13 Dec 2015 12:35:27 +0100
Subject: [PATCH 0243/1650] add new authors since 0.8.17

---
 AUTHORS | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d2cb58c0..dc8e578c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,8 @@ Irssi staff (current maintainers) <staff@irssi.org>:
   Jilles Tjoelker (jilles)
   Alexander Færøy (ahf)
   Jase Thew (bazerka)
+  dequis (dx)
+  Ailin Nemui (Nei)
 
 Former developers:
 
@@ -24,6 +26,7 @@ Large feature patches by:
   Heikki Orsila : DCC SEND queueing
   Mark Trumbull : DCC SERVER
   Francesco Fracassi : Passive DCC
+  Giuseppe (The Lemon Man)
 
 Other patches (grep for "patch" in ChangeLog) by:
 
@@ -78,6 +81,20 @@ Other patches (grep for "patch" in ChangeLog) by:
   Ismael Luceno
   Thomas Karpiniec
   Svante Kvarnström
-  Ailin Nemui (Nei)
   Tom Feist (shabble)
-  Sebastian Thorarensen
+  Sebastian Thorarensen (Sebban)
+  Hans Nielsen
+  Jari Matilainen (vague)
+  Thibault B (isundil)
+  kyak
+  Vesa Pirila (Lohhari)
+  Haw Loeung
+  François Revol (mmuman)
+  blha303
+  Guillaume Brogi (guiniol)
+  Adam-
+  Robert C Jensen
+  Paul Johnson
+  mauke
+  KindOne
+  Fabian Kurz

From 64463933fdb923cdc55fcd105c8e35d61546e62e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 13 Dec 2015 14:14:41 +0100
Subject: [PATCH 0244/1650] list NEWS since 0.8.17

---
 NEWS | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 511f495a..8db80f80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,52 @@
-v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
-	+ Garbage Collection support has been removed. This will hardly have any
+v0.8.18-head 2016-xx-xx  The Irssi team <staff@irssi.org>
+	* The signature of "message private" has been changed to
+	      5: server, message, nick, address, target
+	  in order to support "self messages". Module authors should
+	  implement this change if they are using this signal.
+	* Removing networks will now remove all attached servers and channels
+          (#45).
+	* The proxy module now has an /irssiproxy command.
+	* sb_search has been moved to scripts.irssi.org
+	* WIN32 has been completely removed (it had not been working and is
+          lacking a maintainer.)
+	* Garbage Collection support has been removed. This will hardly have any
 	  effect for anyone given that it has been unsupported for several years.
-	+ Disable SSLv3 due to the POODLE vulnerability.
+	+ CAP SASL PLAIN login is now supported natively.
+	+ Paste bracket markers can be requested from terminal with
+	      /set paste_use_bracketed_mode on
+	+ "Self messages" generated by some bouncers can now be received in the
+	  proper window.
 	+ Try to split long lines on spaces to avoid words being splitted. Adds
 	  a new option: 'split_line_on_space' which defaults to on.
+	+ Add setting hilight_nick_matches_everywhere (#56).
+	+ The config parser is more robust and prints out better diagnostics on
+	  incorrect config files.
+	+ Ctrl+^ (FS#721) and Ctrl+J can now be bound.
+	+ /hilight -mask -line is now supported (FS#275).
+	+ CHANTYPES are now supported.
+	+ Improved reload speed of ignores.
+	+ Add -date feature to /lastlog
+	+ irssiproxy can be more easily enabled and disabled.
+	+ Expando for hostname (FS#829).
+	+ UNIX sockets can now also be specified in the config file.
+	+ Disable SSLv3 due to the POODLE vulnerability.
+	+ SSL ciphers can now be specified per server.
+	+ Added SNI support for SSL.
+	- irssiproxy (BNC) module now uses correct line endings.
+	- Fix missing lines on large pastes (FS#905).
+	- Correctly preserve STATUSMSG prefixes (#291).
+	- Fix infinite recursion in key bindings (FS#817).
+	- Fix incomplete awaylog caused by buffering.
+	- Fix calculation of UTF-8 string length display in some cases.
+	- Fix some Perl warnings related to @ISA.
+	- EXEC windowitems now get proper references on the Perl side.
+	- Incremental help file improvements.
+	- ANSI attributes are now properly reset.
+	- Fixed regression where text would blink when terminal lacks color
+          support.
+	- Permit the usage of Freenode extban syntax in /ban (#150)
+	- Fixed regression in scriptassist on unload of scripts.
+	- Fixed regression in -actcolor %n
 
 v0.8.17 2014-10-11  The Irssi team <staff@irssi.org>
 	+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.

From f6d4b11079e0e8c2619989e3550a8ebd161eb1ae Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Dec 2015 00:51:57 +0100
Subject: [PATCH 0245/1650] correct incorrect pre-release tag in NEWS

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index c37129bb..6155f7bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v0.8.18-rc1 2015-12-15  The Irssi team <staff@irssi.org>
+v0.8.18-beta1 2015-12-15  The Irssi team <staff@irssi.org>
 	* Modules will now require to define a
 	      void MODULENAME ## _abicheck(int *version)
 	  method to ensure that they are compiled against the correct Irssi

From c6a85721a6e9d5a6f67f76f0062c750146c6805f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 28 Dec 2015 00:07:42 +0100
Subject: [PATCH 0246/1650] keep track of address in text_dest for hilight
 purposes

---
 src/fe-common/core/fe-messages.c  | 10 ++++------
 src/fe-common/core/formats.c      |  2 --
 src/fe-common/core/formats.h      |  5 ++---
 src/fe-common/core/hilight-text.c |  7 ++++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index e06a4571..3240fd10 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -175,7 +175,6 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	int for_me, print_channel, level;
 	char *nickmode, *color, *freemsg = NULL;
 	HILIGHT_REC *hilight;
-	int match_beg = 0, match_end = 0;
 
 	/* NOTE: this may return NULL if some channel is just closed with
 	   /WINDOW CLOSE and server still sends the few last messages */
@@ -188,8 +187,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 		nick_match_msg(chanrec, msg, server->nick) :
 		nick_match_msg_everywhere(chanrec, msg, server->nick);
 	hilight = for_me ? NULL :
-		hilight_match(server, target, nick, address, MSGLEVEL_PUBLIC, msg, &match_beg, &match_end);
-	color = (hilight == NULL || !hilight->nick) ? NULL : hilight_get_color(hilight);
+		hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
+	color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
 
 	print_channel = chanrec == NULL ||
 		!window_item_is_active((WI_ITEM_REC *) chanrec);
@@ -217,9 +216,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 
 	TEXT_DEST_REC dest;
 	format_create_dest(&dest, server, target, level, NULL);
-	dest.hilight = hilight;
-	dest.match_beg = match_beg;
-	dest.match_end = match_end;
+	dest.address = address;
+	dest.nick = nick;
 	if (color != NULL) {
 		/* highlighted nick */
 		hilight_update_text_dest(&dest,hilight);
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index b95b3966..ccf48394 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -416,8 +416,6 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
 	dest->server_tag = server != NULL ? SERVER(server)->tag : server_tag;
 	dest->target = target;
 	dest->level = level;
-	dest->match_beg = 0;
-	dest->match_end = 0;
 	dest->window = window != NULL ? window :
 		window_find_closest(server, target, level);
 }
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index a4b26852..8efd204c 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -52,11 +52,10 @@ typedef struct _TEXT_DEST_REC {
 	SERVER_REC *server;
         const char *server_tag; /* if server is non-NULL, must be server->tag */
 	const char *target;
+	const char *nick;
+	const char *address;
 	int level;
 
-	HILIGHT_REC *hilight;
-	int match_beg;
-	int match_end;
 	int hilight_priority;
 	char *hilight_color;
         int flags;
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 2c0075ec..b746f636 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -325,9 +325,10 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 	if (dest->level & MSGLEVEL_NOHILIGHT)
 		return;
 
-	hilight_start = dest->match_beg;
-	hilight_end = dest->match_end;
-	hilight = dest->hilight;
+	hilight_start = hilight_end = 0;
+	hilight = hilight_match(dest->server, dest->target, dest->nick,
+				dest->address, dest->level, stripped,
+				&hilight_start, &hilight_end);
 
 	if (hilight == NULL)
 		return;

From 7cc85b9427887c4f77b8a5706b148371e713828b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 28 Dec 2015 00:07:42 +0100
Subject: [PATCH 0247/1650] keep track of address in text_dest for hilight
 purposes

---
 src/fe-common/core/fe-messages.c  | 10 ++++------
 src/fe-common/core/formats.c      |  2 --
 src/fe-common/core/formats.h      |  5 ++---
 src/fe-common/core/hilight-text.c |  7 ++++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index e06a4571..3240fd10 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -175,7 +175,6 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	int for_me, print_channel, level;
 	char *nickmode, *color, *freemsg = NULL;
 	HILIGHT_REC *hilight;
-	int match_beg = 0, match_end = 0;
 
 	/* NOTE: this may return NULL if some channel is just closed with
 	   /WINDOW CLOSE and server still sends the few last messages */
@@ -188,8 +187,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 		nick_match_msg(chanrec, msg, server->nick) :
 		nick_match_msg_everywhere(chanrec, msg, server->nick);
 	hilight = for_me ? NULL :
-		hilight_match(server, target, nick, address, MSGLEVEL_PUBLIC, msg, &match_beg, &match_end);
-	color = (hilight == NULL || !hilight->nick) ? NULL : hilight_get_color(hilight);
+		hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
+	color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
 
 	print_channel = chanrec == NULL ||
 		!window_item_is_active((WI_ITEM_REC *) chanrec);
@@ -217,9 +216,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 
 	TEXT_DEST_REC dest;
 	format_create_dest(&dest, server, target, level, NULL);
-	dest.hilight = hilight;
-	dest.match_beg = match_beg;
-	dest.match_end = match_end;
+	dest.address = address;
+	dest.nick = nick;
 	if (color != NULL) {
 		/* highlighted nick */
 		hilight_update_text_dest(&dest,hilight);
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index b95b3966..ccf48394 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -416,8 +416,6 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
 	dest->server_tag = server != NULL ? SERVER(server)->tag : server_tag;
 	dest->target = target;
 	dest->level = level;
-	dest->match_beg = 0;
-	dest->match_end = 0;
 	dest->window = window != NULL ? window :
 		window_find_closest(server, target, level);
 }
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index a4b26852..8efd204c 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -52,11 +52,10 @@ typedef struct _TEXT_DEST_REC {
 	SERVER_REC *server;
         const char *server_tag; /* if server is non-NULL, must be server->tag */
 	const char *target;
+	const char *nick;
+	const char *address;
 	int level;
 
-	HILIGHT_REC *hilight;
-	int match_beg;
-	int match_end;
 	int hilight_priority;
 	char *hilight_color;
         int flags;
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 2c0075ec..b746f636 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -325,9 +325,10 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 	if (dest->level & MSGLEVEL_NOHILIGHT)
 		return;
 
-	hilight_start = dest->match_beg;
-	hilight_end = dest->match_end;
-	hilight = dest->hilight;
+	hilight_start = hilight_end = 0;
+	hilight = hilight_match(dest->server, dest->target, dest->nick,
+				dest->address, dest->level, stripped,
+				&hilight_start, &hilight_end);
 
 	if (hilight == NULL)
 		return;

From 609f3ba6c2db4f04e1e11304459d4fc42babd8ff Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 3 Jan 2016 19:49:18 +0100
Subject: [PATCH 0248/1650] Clean up the ignore_find API to make it more
 powerful.

This way we prevent the creation of duplicate ignores since the old code
skipped the ignore_find call when a pattern was specified.
It should also cover all the cases where the ignores would be wrongly
overwritten, such as the case outlined in #78.
---
 src/core/ignore.c              | 28 ++++++++++++++++------------
 src/core/ignore.h              |  9 +++++++--
 src/fe-common/core/fe-ignore.c |  8 ++++----
 src/irc/flood/autoignore.c     |  2 +-
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index fd3c8a38..ee9e180d 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -186,15 +186,8 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
         return ignore_check_replies(chanrec, text, level);
 }
 
-IGNORE_REC *ignore_find(const char *servertag, const char *mask,
-		char **channels)
-{
-	return ignore_find_noact(servertag, mask, channels, 0);
-}
-
-
-IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask,
-		char **channels, int noact)
+IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
+		char **channels, const int flags)
 {
 	GSList *tmp;
 	char **chan;
@@ -216,18 +209,29 @@ IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask,
 				continue;
 		}
 
-		if (noact && (rec->level & MSGLEVEL_NO_ACT) == 0)
+		if ((flags & IGNORE_FIND_NOACT) && (rec->level & MSGLEVEL_NO_ACT) == 0)
 			continue;
 
-		if (!noact && (rec->level & MSGLEVEL_NO_ACT) != 0)
+		if (!(flags & IGNORE_FIND_NOACT) && (rec->level & MSGLEVEL_NO_ACT) != 0)
 			continue;
 
 		if ((rec->mask == NULL && mask != NULL) ||
-		    (rec->mask != NULL && mask == NULL)) continue;
+		    (rec->mask != NULL && mask == NULL))
+			continue;
 
 		if (rec->mask != NULL && g_ascii_strcasecmp(rec->mask, mask) != 0)
 			continue;
 
+		/* match the pattern too if requested */
+		if (flags & IGNORE_FIND_PATTERN) {
+			if ((rec->pattern == NULL && pattern != NULL) ||
+			    (rec->pattern != NULL && pattern == NULL))
+				continue;
+
+			if (rec->pattern != NULL && g_ascii_strcasecmp(rec->pattern, pattern) != 0)
+				continue;
+		}
+
 		if ((channels == NULL && rec->channels == NULL))
 			return rec; /* no channels - ok */
 
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 46025d4c..0901e795 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -31,8 +31,13 @@ extern GSList *ignores;
 int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 		 const char *channel, const char *text, int level);
 
-IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
-IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact);
+enum {
+	IGNORE_FIND_PATTERN = 0x01, // Match the pattern
+	IGNORE_FIND_NOACT   = 0x02, // Exclude the targets with NOACT level
+};
+
+IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
+		char **channels, const int flags);
 
 void ignore_add_rec(IGNORE_REC *rec);
 void ignore_update_rec(IGNORE_REC *rec);
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index d2f9de27..2799e15f 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -158,8 +158,8 @@ static void cmd_ignore(const char *data)
 	channels = (chanarg == NULL || *chanarg == '\0') ? NULL :
 		g_strsplit(chanarg, ",", -1);
 
-	rec = patternarg != NULL ? NULL: ignore_find_noact(servertag, mask, channels,
-			(level & MSGLEVEL_NO_ACT));
+	rec = ignore_find(servertag, mask, patternarg, channels,
+			  IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0));
 	new_ignore = rec == NULL;
 
 	if (rec == NULL) {
@@ -237,9 +237,9 @@ static void cmd_unignore(const char *data)
 			chans[0] = mask;
 			mask = NULL;
 		}
-		rec = ignore_find_noact("*", mask, (char **) chans, 0);
+		rec = ignore_find("*", mask, NULL, (char **) chans, 0);
 		if (rec == NULL) {
-			rec = ignore_find_noact("*", mask, (char **) chans, 1);
+			rec = ignore_find("*", mask, NULL, (char **) chans, IGNORE_FIND_NOACT);
 		}
 	}
 
diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c
index 250a1fe8..4708cb03 100644
--- a/src/irc/flood/autoignore.c
+++ b/src/irc/flood/autoignore.c
@@ -66,7 +66,7 @@ static void sig_flood(IRC_SERVER_REC *server, const char *nick, const char *host
 
         mask = g_strdup_printf("%s!%s", nick, host);
 	if (level & check_level) {
-		rec = ignore_find(server->tag, mask, NULL);
+		rec = ignore_find(server->tag, mask, NULL, NULL, 0);
 		if (rec == NULL)
 			autoignore_add(server, mask, level);
 		else

From dbee606c60c4d8d7c6e5cabd1241fc182ae6c4a3 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 3 Jan 2016 21:19:46 +0100
Subject: [PATCH 0249/1650] Don't break the API.

Have a ignore_find_full method that is the one that all the new code
should be using and provide some working stubs for ignore_find and
ignore_find_noact.
---
 src/core/ignore.c              | 12 +++++++++++-
 src/core/ignore.h              |  9 +++++++--
 src/fe-common/core/fe-ignore.c |  6 +++---
 src/irc/flood/autoignore.c     |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index ee9e180d..8d5a27c2 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -186,7 +186,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
         return ignore_check_replies(chanrec, text, level);
 }
 
-IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
+IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char *pattern,
 		char **channels, const int flags)
 {
 	GSList *tmp;
@@ -257,6 +257,16 @@ IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pat
 	return NULL;
 }
 
+IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels)
+{
+	return ignore_find_full(servertag, mask, NULL, channels, 0);
+}
+
+IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact)
+{
+	return ignore_find_full(servertag, mask, NULL, channels, IGNORE_FIND_NOACT);
+}
+
 static void ignore_set_config(IGNORE_REC *rec)
 {
 	CONFIG_NODE *node;
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 0901e795..f889740f 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -36,8 +36,13 @@ enum {
 	IGNORE_FIND_NOACT   = 0x02, // Exclude the targets with NOACT level
 };
 
-IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
-		char **channels, const int flags);
+IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern,
+                char **channels, const int flags);
+
+// Convenience wrappers around ignore_find_full, for compatibility purpose
+
+IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
+IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact);
 
 void ignore_add_rec(IGNORE_REC *rec);
 void ignore_update_rec(IGNORE_REC *rec);
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 2799e15f..a809ac91 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -158,7 +158,7 @@ static void cmd_ignore(const char *data)
 	channels = (chanarg == NULL || *chanarg == '\0') ? NULL :
 		g_strsplit(chanarg, ",", -1);
 
-	rec = ignore_find(servertag, mask, patternarg, channels,
+	rec = ignore_find_full(servertag, mask, patternarg, channels,
 			  IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0));
 	new_ignore = rec == NULL;
 
@@ -237,9 +237,9 @@ static void cmd_unignore(const char *data)
 			chans[0] = mask;
 			mask = NULL;
 		}
-		rec = ignore_find("*", mask, NULL, (char **) chans, 0);
+		rec = ignore_find_full("*", mask, NULL, (char **) chans, 0);
 		if (rec == NULL) {
-			rec = ignore_find("*", mask, NULL, (char **) chans, IGNORE_FIND_NOACT);
+			rec = ignore_find_full("*", mask, NULL, (char **) chans, IGNORE_FIND_NOACT);
 		}
 	}
 
diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c
index 4708cb03..86ff3ec5 100644
--- a/src/irc/flood/autoignore.c
+++ b/src/irc/flood/autoignore.c
@@ -66,7 +66,7 @@ static void sig_flood(IRC_SERVER_REC *server, const char *nick, const char *host
 
         mask = g_strdup_printf("%s!%s", nick, host);
 	if (level & check_level) {
-		rec = ignore_find(server->tag, mask, NULL, NULL, 0);
+		rec = ignore_find_full(server->tag, mask, NULL, NULL, 0);
 		if (rec == NULL)
 			autoignore_add(server, mask, level);
 		else

From 837e03bd8f1be71ca26e3c2581b5444dcb5fe73f Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Wed, 6 Jan 2016 12:45:18 +0100
Subject: [PATCH 0250/1650] irssiproxy: avoid using pointer after freeing it

---
 src/irc/proxy/listen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index dcc94e6b..5dc9a704 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -681,8 +681,8 @@ static void read_settings(void)
 	while (add_listens != NULL) {
 		rec = add_listens->data;
 		add_listen(rec->ircnet, rec->port);
+		add_listens = g_slist_remove(add_listens, rec);
 		g_free(rec);
-		add_listens = g_slist_remove(add_listens, add_listens->data);
 	}
 
 	g_strfreev(ports);

From cfb6123a7ab56e12136711a7e088424c9f68fd26 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 6 Jan 2016 17:25:53 +0100
Subject: [PATCH 0251/1650] forward ABI to perl modules

---
 src/perl/module.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/module.h b/src/perl/module.h
index 2fd15137..3cbdf3d5 100644
--- a/src/perl/module.h
+++ b/src/perl/module.h
@@ -17,4 +17,4 @@ extern PerlInterpreter *my_perl; /* must be called my_perl or some perl implemen
 
 /* Change this every time when some API changes between irssi's perl module
    (or irssi itself) and irssi's perl libraries. */
-#define IRSSI_PERL_API_VERSION 20011214
+#define IRSSI_PERL_API_VERSION (20011214 + IRSSI_ABI_VERSION)

From 4659cea65a663b11f3cc16e1d03c9955a4135238 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 15 Dec 2015 01:52:44 +0100
Subject: [PATCH 0252/1650] option to clear the history

---
 src/fe-common/core/command-history.c | 45 ++++++++++++++++++++++++----
 src/fe-common/core/command-history.h |  1 +
 src/fe-common/core/fe-windows.c      |  7 ++++-
 src/fe-common/core/fe-windows.h      |  1 +
 src/fe-common/core/window-commands.c | 21 +++++++++++--
 5 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index f9c3884c..9f46ee99 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -33,6 +33,7 @@
 static HISTORY_REC *global_history;
 static int window_history;
 static GSList *histories;
+static HISTORY_REC *last_cleared_history;
 
 void command_history_add(HISTORY_REC *history, const char *text)
 {
@@ -41,6 +42,13 @@ void command_history_add(HISTORY_REC *history, const char *text)
 	g_return_if_fail(history != NULL);
 	g_return_if_fail(text != NULL);
 
+	if (last_cleared_history == history) {
+		last_cleared_history = NULL;
+		return; /* ignore this history addition, we just
+			   cleared it */
+	}
+	last_cleared_history = NULL;
+
 	link = g_list_last(history->list);
 	if (link != NULL && g_strcmp0(link->data, text) == 0)
 	  return; /* same as previous entry */
@@ -94,13 +102,13 @@ HISTORY_REC *command_history_current(WINDOW_REC *window)
 	if (window == NULL)
 		return global_history;
 
-	if (window_history)
-		return window->history;
-
 	rec = command_history_find_name(window->history_name);
 	if (rec != NULL)
 		return rec;
 
+	if (window_history)
+		return window->history;
+
 	return global_history;
 }
 
@@ -178,6 +186,18 @@ HISTORY_REC *command_history_create(const char *name)
 	return rec;
 }
 
+void command_history_clear(HISTORY_REC *history)
+{
+	g_return_if_fail(history != NULL);
+
+	command_history_clear_pos_func(history, NULL);
+	g_list_foreach(history->list, (GFunc) g_free, NULL);
+	g_list_free(history->list);
+	history->list = NULL;
+	history->lines = 0;
+	last_cleared_history = history;
+}
+
 void command_history_destroy(HISTORY_REC *history)
 {
 	g_return_if_fail(history != NULL);
@@ -186,9 +206,8 @@ void command_history_destroy(HISTORY_REC *history)
 	g_return_if_fail(history->refcount == 0);
 
 	histories = g_slist_remove(histories, history);
-
-	g_list_foreach(history->list, (GFunc) g_free, NULL);
-	g_list_free(history->list);
+	command_history_clear(history);
+	last_cleared_history = NULL; /* was destroyed */
 
 	g_free_not_null(history->name);
 	g_free(history);
@@ -229,6 +248,18 @@ static void sig_window_destroyed(WINDOW_REC *window)
 	g_free_not_null(window->history_name);
 }
 
+static void sig_window_history_cleared(WINDOW_REC *window, const char *name) {
+	HISTORY_REC *history;
+
+	if (name == NULL || *name == '\0') {
+		history = command_history_current(window);
+	} else {
+		history = command_history_find_name(name);
+	}
+
+	command_history_clear(history);
+}
+
 static void sig_window_history_changed(WINDOW_REC *window, const char *oldname)
 {
 	command_history_link(window->history_name);
@@ -279,6 +310,7 @@ void command_history_init(void)
 	signal_add("window created", (SIGNAL_FUNC) sig_window_created);
 	signal_add("window destroyed", (SIGNAL_FUNC) sig_window_destroyed);
 	signal_add("window history changed", (SIGNAL_FUNC) sig_window_history_changed);
+	signal_add_last("window history cleared", (SIGNAL_FUNC) sig_window_history_cleared);
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 }
 
@@ -287,6 +319,7 @@ void command_history_deinit(void)
 	signal_remove("window created", (SIGNAL_FUNC) sig_window_created);
 	signal_remove("window destroyed", (SIGNAL_FUNC) sig_window_destroyed);
 	signal_remove("window history changed", (SIGNAL_FUNC) sig_window_history_changed);
+	signal_remove("window history cleared", (SIGNAL_FUNC) sig_window_history_cleared);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 
 	command_history_destroy(global_history);
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index 7b76246b..a572216b 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -28,6 +28,7 @@ const char *command_history_next(WINDOW_REC *window, const char *text);
 void command_history_clear_pos(WINDOW_REC *window);
 
 HISTORY_REC *command_history_create(const char *name);
+void command_history_clear(HISTORY_REC *history);
 void command_history_destroy(HISTORY_REC *history);
 void command_history_link(const char *name);
 void command_history_unlink(const char *name);
diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 1049137f..46c1593b 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -229,11 +229,16 @@ void window_set_history(WINDOW_REC *window, const char *name)
 	else
 		window->history_name = g_strdup(name);
 
-	signal_emit("window history changed", 1, window, oldname);
+	signal_emit("window history changed", 2, window, oldname);
 
 	g_free_not_null(oldname);
 }
 
+void window_clear_history(WINDOW_REC *window, const char *name)
+{
+	signal_emit("window history cleared", 2, window, name);
+}
+
 void window_set_level(WINDOW_REC *window, int level)
 {
 	g_return_if_fail(window != NULL);
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index 613f15f8..32d6cfcd 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -66,6 +66,7 @@ void window_change_server(WINDOW_REC *window, void *server);
 void window_set_refnum(WINDOW_REC *window, int refnum);
 void window_set_name(WINDOW_REC *window, const char *name);
 void window_set_history(WINDOW_REC *window, const char *name);
+void window_clear_history(WINDOW_REC *window, const char *name);
 void window_set_level(WINDOW_REC *window, int level);
 void window_set_immortal(WINDOW_REC *window, int immortal);
 
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index c6ab68c0..e5005144 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -33,6 +33,7 @@
 #include "window-items.h"
 #include "windows-layout.h"
 #include "printtext.h"
+#include "command-history.h"
 
 static void window_print_binds(WINDOW_REC *win)
 {
@@ -615,10 +616,25 @@ static void cmd_window_name(const char *data)
 	}
 }
 
-/* SYNTAX: WINDOW HISTORY <name> */
+/* SYNTAX: WINDOW HISTORY [-clear] <name> */
 void cmd_window_history(const char *data)
 {
-	window_set_history(active_win, data);
+	GHashTable *optlist;
+        char *name;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS,
+			    "window history", &optlist, &name))
+		return;
+
+	if (g_hash_table_lookup(optlist, "clear") != NULL) {
+		signal_continue(1, data);
+		window_clear_history(active_win, name);
+	} else {
+		window_set_history(active_win, name);
+	}
+
+	cmd_params_free(free_arg);
 }
 
 /* we're moving the first window to last - move the first contiguous block
@@ -883,6 +899,7 @@ void window_commands_init(void)
 	command_set_options("window number", "sticky");
 	command_set_options("window server", "sticky unsticky");
 	command_set_options("window theme", "delete");
+	command_set_options("window history", "clear");
 }
 
 void window_commands_deinit(void)

From ad842ea8a60f107d68df4298a8914e66edf95c3b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 8 Jan 2016 15:42:59 +0100
Subject: [PATCH 0253/1650] reorder history add and fixes

---
 src/fe-common/core/command-history.c | 10 ----------
 src/fe-common/core/window-commands.c |  4 ++--
 src/fe-text/gui-readline.c           | 15 +++++++--------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 9f46ee99..1060744e 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -33,7 +33,6 @@
 static HISTORY_REC *global_history;
 static int window_history;
 static GSList *histories;
-static HISTORY_REC *last_cleared_history;
 
 void command_history_add(HISTORY_REC *history, const char *text)
 {
@@ -42,13 +41,6 @@ void command_history_add(HISTORY_REC *history, const char *text)
 	g_return_if_fail(history != NULL);
 	g_return_if_fail(text != NULL);
 
-	if (last_cleared_history == history) {
-		last_cleared_history = NULL;
-		return; /* ignore this history addition, we just
-			   cleared it */
-	}
-	last_cleared_history = NULL;
-
 	link = g_list_last(history->list);
 	if (link != NULL && g_strcmp0(link->data, text) == 0)
 	  return; /* same as previous entry */
@@ -195,7 +187,6 @@ void command_history_clear(HISTORY_REC *history)
 	g_list_free(history->list);
 	history->list = NULL;
 	history->lines = 0;
-	last_cleared_history = history;
 }
 
 void command_history_destroy(HISTORY_REC *history)
@@ -207,7 +198,6 @@ void command_history_destroy(HISTORY_REC *history)
 
 	histories = g_slist_remove(histories, history);
 	command_history_clear(history);
-	last_cleared_history = NULL; /* was destroyed */
 
 	g_free_not_null(history->name);
 	g_free(history);
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index e5005144..9e4aab3a 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -620,10 +620,10 @@ static void cmd_window_name(const char *data)
 void cmd_window_history(const char *data)
 {
 	GHashTable *optlist;
-        char *name;
+	char *name;
 	void *free_arg;
 
-	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS,
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "window history", &optlist, &name))
 		return;
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index fcf152e8..5acfaf60 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -456,22 +456,21 @@ static void key_send_line(void)
 	add_history = *str != '\0';
 	history = command_history_current(active_win);
 
+	if (redir != NULL && redir->flags & ENTRY_REDIRECT_FLAG_HIDDEN)
+		add_history = 0;
+
+	if (add_history && history != NULL) {
+		command_history_add(history, str);
+	}
+
 	if (redir == NULL) {
 		signal_emit("send command", 3, str,
 			    active_win->active_server,
 			    active_win->active);
 	} else {
-		if (redir->flags & ENTRY_REDIRECT_FLAG_HIDDEN)
-                        add_history = 0;
 		handle_entry_redirect(str);
 	}
 
-	if (add_history) {
-		history = command_history_find(history);
-		if (history != NULL)
-			command_history_add(history, str);
-	}
-
 	if (active_entry != NULL)
 		gui_entry_set_text(active_entry, "");
 	command_history_clear_pos(active_win);

From cf90b2122efdc2a6fc5246e3c538af3c71f38988 Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Fri, 8 Jan 2016 18:52:59 +0100
Subject: [PATCH 0254/1650] irc/core/irc-commands.c: fix indentation

---
 src/irc/core/irc-commands.c | 200 ++++++++++++++++++------------------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 3cc105ba..d5988f97 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -61,16 +61,16 @@ static int knockout_tag;
 
 /* SYNTAX: NOTICE <targets> <message> */
 static void cmd_notice(const char *data, IRC_SERVER_REC *server,
-		       WI_ITEM_REC *item)
+                       WI_ITEM_REC *item)
 {
 	const char *target, *msg;
 	char *recoded;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
-			    &target, &msg))
+	                    &target, &msg))
 		return;
 	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
@@ -88,16 +88,16 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
 
 /* SYNTAX: CTCP <targets> <ctcp command> [<ctcp data>] */
 static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
-		     WI_ITEM_REC *item)
+                     WI_ITEM_REC *item)
 {
 	const char *target;
 	char *ctcpcmd, *ctcpdata;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
-			    &target, &ctcpcmd, &ctcpdata))
+	                    &target, &ctcpcmd, &ctcpdata))
 		return;
 	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
@@ -122,16 +122,16 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
 
 /* SYNTAX: NCTCP <targets> <ctcp command> [<ctcp data>] */
 static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
-		      WI_ITEM_REC *item)
+                      WI_ITEM_REC *item)
 {
 	const char *target;
 	char *ctcpcmd, *ctcpdata, *recoded;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
-			    &target, &ctcpcmd, &ctcpdata))
+	                    &target, &ctcpcmd, &ctcpdata))
 		return;
 	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
@@ -150,22 +150,22 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
 
 /* SYNTAX: PART [<channels>] [<message>] */
 static void cmd_part(const char *data, IRC_SERVER_REC *server,
-		     WI_ITEM_REC *item)
+                     WI_ITEM_REC *item)
 {
 	char *channame, *msg;
 	char *recoded = NULL;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_OPTCHAN, item, &channame, &msg))
+	                    PARAM_FLAG_OPTCHAN, item, &channame, &msg))
 		return;
 	if (*channame == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	if (*msg == '\0') msg = (char *) settings_get_str("part_message");
 
-        if (server->cmdcount > MAX_COMMANDS_ON_PART_UNTIL_PURGE)
+	if (server->cmdcount > MAX_COMMANDS_ON_PART_UNTIL_PURGE)
 		irc_server_purge_output(server, channame);
 
 	if (*msg != '\0')
@@ -186,11 +186,11 @@ static void cmd_kick(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 	char *channame, *nicks, *reason, *recoded;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_OPTCHAN, item,
-			    &channame, &nicks, &reason))
+	                    PARAM_FLAG_OPTCHAN, item,
+	                    &channame, &nicks, &reason))
 		return;
 
 	if (*channame == '\0' || *nicks == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -213,11 +213,11 @@ static void cmd_topic(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *ite
 	char *recoded = NULL;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN |
-			    PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
-			    item, "topic", &optlist, &channame, &topic))
+	                    PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
+	                    item, "topic", &optlist, &channame, &topic))
 		return;
 
 	if (*topic != '\0' || g_hash_table_lookup(optlist, "delete") != NULL)
@@ -239,7 +239,7 @@ static void cmd_invite(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *it
 	char *nick, *channame;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2, &nick, &channame))
 		return;
@@ -258,17 +258,17 @@ static void cmd_invite(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *it
 
 /* SYNTAX: LIST [-yes] [<channel>] */
 static void cmd_list(const char *data, IRC_SERVER_REC *server,
-		     WI_ITEM_REC *item)
+                     WI_ITEM_REC *item)
 {
 	GHashTable *optlist;
 	char *str;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, 
-			    "list", &optlist, &str))
+	                    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, 
+	                    "list", &optlist, &str))
 		return;
 
 	if (*str == '\0' && g_hash_table_lookup(optlist, "yes") == NULL &&
@@ -282,7 +282,7 @@ static void cmd_list(const char *data, IRC_SERVER_REC *server,
 
 /* SYNTAX: WHO [<nicks> | <channels> | **] */
 static void cmd_who(const char *data, IRC_SERVER_REC *server,
-		    WI_ITEM_REC *item)
+                    WI_ITEM_REC *item)
 {
 	char *channel, *rest;
 	void *free_arg;
@@ -290,7 +290,7 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
 	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | 
-			    PARAM_FLAG_STRIP_TRAILING_WS, &channel, &rest))
+	                    PARAM_FLAG_STRIP_TRAILING_WS, &channel, &rest))
 		return;
 
 	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
@@ -313,29 +313,29 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
 }
 
 static void cmd_names(const char *data, IRC_SERVER_REC *server,
-		      WI_ITEM_REC *item)
+                      WI_ITEM_REC *item)
 {
-        GHashTable *optlist;
+	GHashTable *optlist;
 	char *channel;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
-			    "names", &optlist, &channel))
+	                    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
+	                    "names", &optlist, &channel))
 		return;
 
 	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
 		if (!IS_IRC_CHANNEL(item))
-                        cmd_param_error(CMDERR_NOT_JOINED);
+			cmd_param_error(CMDERR_NOT_JOINED);
 
 		channel = IRC_CHANNEL(item)->name;
 	}
 
 	if (g_strcmp0(channel, "**") == 0) {
 		/* ** displays all nicks.. */
-                irc_send_cmd(server, "NAMES");
+		irc_send_cmd(server, "NAMES");
 	} else {
 		irc_send_cmdv(server, "NAMES %s", channel);
 	}
@@ -346,12 +346,12 @@ static void cmd_names(const char *data, IRC_SERVER_REC *server,
 /* SYNTAX: NICK <new nick> */
 static void cmd_nick(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
 {
-        char *nick;
+	char *nick;
 	void *free_arg;
 
 	g_return_if_fail(data != NULL);
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 1, &nick))
 		return;
@@ -388,23 +388,23 @@ static char *get_redirect_nicklist(const char *nicks, int *free)
 
 /* SYNTAX: WHOIS [-<server tag>] [<server>] [<nicks>] */
 static void cmd_whois(const char *data, IRC_SERVER_REC *server,
-		      WI_ITEM_REC *item)
+                      WI_ITEM_REC *item)
 {
 	GHashTable *optlist;
 	char *qserver, *query, *event_402, *str;
 	void *free_arg;
 	int free_nick;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_UNKNOWN_OPTIONS,
-			    "whois", &optlist, &qserver, &query))
+	                    PARAM_FLAG_UNKNOWN_OPTIONS,
+	                    "whois", &optlist, &qserver, &query))
 		return;
 
 	/* -<server tag> */
 	server = IRC_SERVER(cmd_options_get_server("whois", optlist,
-						   SERVER(server)));
+	                                           SERVER(server)));
 	if (server == NULL) {
 		cmd_params_free(free_arg);
 		return;
@@ -439,15 +439,15 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
 
 	str = g_strconcat(qserver, " ", query, NULL);
 	server_redirect_event(server, "whois", 1, str, TRUE,
-		      NULL,
-		      "event 318", "whois end",
-		      "event 402", event_402,
-		      "event 301", "whois away", /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
-		      "event 313", "whois oper",
-		      "event 401", (settings_get_bool("auto_whowas") ? "whois try whowas" : "whois event not found"),
-		      "event 311", "whois event",
-		      "", "whois default event", NULL);
-        g_free(str);
+	              NULL,
+	              "event 318", "whois end",
+	              "event 402", event_402,
+	              "event 301", "whois away", /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
+	              "event 313", "whois oper",
+	              "event 401", (settings_get_bool("auto_whowas") ? "whois try whowas" : "whois event not found"),
+	              "event 311", "whois event",
+	              "", "whois default event", NULL);
+	g_free(str);
 
 	server->whois_found = FALSE;
 	irc_send_cmd_split(server, tmpstr->str, 2, server->max_whois_in_cmd);
@@ -457,7 +457,7 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
 }
 
 static void event_whois(IRC_SERVER_REC *server, const char *data,
-			const char *nick, const char *addr)
+                        const char *nick, const char *addr)
 {
 	server->whois_found = TRUE;
 	signal_emit("event 311", 4, server, data, nick, addr);
@@ -473,23 +473,23 @@ static void sig_whois_try_whowas(IRC_SERVER_REC *server, const char *data)
 
 	server->whowas_found = FALSE;
 	server_redirect_event(server, "whowas", 1, nick, -1, NULL,
-			      "event 314", "whowas event",
-			      "event 369", "whowas event end",
-			      "event 406", "event empty", NULL);
+	                      "event 314", "whowas event",
+	                      "event 369", "whowas event end",
+	                      "event 406", "event empty", NULL);
 	irc_send_cmdv(server, "WHOWAS %s 1", nick);
 
 	g_free(params);
 }
 
 static void event_end_of_whois(IRC_SERVER_REC *server, const char *data,
-			       const char *nick, const char *addr)
+                               const char *nick, const char *addr)
 {
 	signal_emit("event 318", 4, server, data, nick, addr);
 	server->whois_found = FALSE;
 }
 
 static void event_whowas(IRC_SERVER_REC *server, const char *data,
-			 const char *nick, const char *addr)
+                         const char *nick, const char *addr)
 {
 	server->whowas_found = TRUE;
 	signal_emit("event 314", 4, server, data, nick, addr);
@@ -502,17 +502,17 @@ static void cmd_whowas(const char *data, IRC_SERVER_REC *server)
 	void *free_arg;
 	int free_nick;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
-			    &nicks, &rest))
+	                    &nicks, &rest))
 		return;
 	if (*nicks == '\0') nicks = server->nick;
 
 	nicks_redir = get_redirect_nicklist(nicks, &free_nick);
 	server_redirect_event(server, "whowas", 1, nicks_redir, -1, NULL,
-			      "event 301", "whowas away", /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
-			      "event 314", "whowas event", NULL);
+	                      "event 301", "whowas away", /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
+	                      "event 314", "whowas event", NULL);
 	if (free_nick) g_free(nicks_redir);
 
 	server->whowas_found = FALSE;
@@ -529,9 +529,9 @@ static void cmd_whowas(const char *data, IRC_SERVER_REC *server)
 static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
 {
 	GTimeVal tv;
-        char *str;
+	char *str;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (*data == '\0') {
 		if (!IS_QUERY(item))
@@ -554,7 +554,7 @@ static void cmd_away(const char *data, IRC_SERVER_REC *server)
 	void *free_arg;
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST, "away", &optlist, &reason)) return;
+	                    PARAM_FLAG_GETREST, "away", &optlist, &reason)) return;
 
 	if (g_hash_table_lookup(optlist, "one") != NULL)
 		irc_server_send_away(server, reason);
@@ -567,7 +567,7 @@ static void cmd_away(const char *data, IRC_SERVER_REC *server)
 /* SYNTAX: SCONNECT <new server> [[<port>] <existing server>] */
 static void cmd_sconnect(const char *data, IRC_SERVER_REC *server)
 {
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 	if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	irc_send_cmdv(server, "CONNECT %s", data);
@@ -600,11 +600,11 @@ static void cmd_wait(const char *data, IRC_SERVER_REC *server)
 	void *free_arg;
 	int n;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
-			    NULL, &optlist, &msecs))
+	                    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
+	                    NULL, &optlist, &msecs))
 		return;
 
 	if (*msecs == '\0')
@@ -612,7 +612,7 @@ static void cmd_wait(const char *data, IRC_SERVER_REC *server)
 
 	/* -<server tag> */
 	server = IRC_SERVER(cmd_options_get_server(NULL, optlist,
-						   SERVER(server)));
+	                                           SERVER(server)));
 
 	n = atoi(msecs);
 	if (server != NULL && n > 0) {
@@ -635,10 +635,10 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 	IRC_CHANNEL_REC *chanrec;
 	GSList *tmp, *nicks;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN |
-			    PARAM_FLAG_GETREST, item, &channame, &msg))
+	                    PARAM_FLAG_GETREST, item, &channame, &msg))
 		return;
 	if (*msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
@@ -654,11 +654,11 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 		/* Fall back to manually noticing each op */
 		nicks = NULL;
 		g_hash_table_foreach(chanrec->nicks,
-				     (GHFunc) cmd_wall_hash, &nicks);
+		                     (GHFunc) cmd_wall_hash, &nicks);
 
 		args = g_strconcat(chanrec->name, " ", recoded, NULL);
 		msg = parse_special_string(settings_get_str("wall_format"),
-					   SERVER(server), item, args, NULL, 0);
+		                           SERVER(server), item, args, NULL, 0);
 		g_free(args);
 
 		for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
@@ -666,7 +666,7 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 
 			if (rec != chanrec->ownnick) {
 				irc_send_cmdv(server, "NOTICE %s :%s",
-					      rec->nick, msg);
+				              rec->nick, msg);
 			}
 		}
 
@@ -680,17 +680,17 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 
 /* SYNTAX: KICKBAN [<channel>] <nicks> <reason> */
 static void cmd_kickban(const char *data, IRC_SERVER_REC *server,
-			WI_ITEM_REC *item)
+                        WI_ITEM_REC *item)
 {
-        IRC_CHANNEL_REC *chanrec;
+	IRC_CHANNEL_REC *chanrec;
 	char *channel, *nicks, *reason, *kickcmd, *bancmd, *recoded;
-        char **nicklist, *spacenicks;
+	char **nicklist, *spacenicks;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST,
-			    item, &channel, &nicks, &reason))
+	                    item, &channel, &nicks, &reason))
 		return;
 
 	if (*channel == '\0' || *nicks == '\0')
@@ -701,7 +701,7 @@ static void cmd_kickban(const char *data, IRC_SERVER_REC *server,
 		cmd_param_error(CMDERR_CHAN_NOT_FOUND);
 
 	nicklist = g_strsplit(nicks, ",", -1);
-        spacenicks = g_strjoinv(" ", nicklist);
+	spacenicks = g_strjoinv(" ", nicklist);
 	g_strfreev(nicklist);
 
 	recoded = recode_out(SERVER(server), reason, channel);
@@ -709,9 +709,9 @@ static void cmd_kickban(const char *data, IRC_SERVER_REC *server,
 	g_free(recoded);
 
 	bancmd = g_strdup_printf("%s %s", chanrec->name, spacenicks);
-        g_free(spacenicks);
+	g_free(spacenicks);
 
-        if (settings_get_bool("kick_first_on_kickban")) {
+	if (settings_get_bool("kick_first_on_kickban")) {
 		signal_emit("command kick", 3, kickcmd, server, chanrec);
 		signal_emit("command ban", 3, bancmd, server, chanrec);
 	} else {
@@ -742,7 +742,7 @@ static void knockout_timeout_server(IRC_SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
-        now = time(NULL);
+	now = time(NULL);
 	for (tmp = server->knockoutlist; tmp != NULL; tmp = next) {
 		KNOCKOUT_REC *rec = tmp->data;
 
@@ -763,16 +763,16 @@ static int knockout_timeout(void)
 
 /* SYNTAX: KNOCKOUT [<time>] <nicks> <reason> */
 static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
-			 IRC_CHANNEL_REC *channel)
+                         IRC_CHANNEL_REC *channel)
 {
 	KNOCKOUT_REC *rec;
 	char *nicks, *reason, *timeoutstr, *kickcmd, *bancmd, *recoded;
-        char **nicklist, *spacenicks, *banmasks;
+	char **nicklist, *spacenicks, *banmasks;
 	void *free_arg;
 	int timeleft;
 	GSList *ptr;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!IS_IRC_CHANNEL(channel))
 		cmd_return_error(CMDERR_NOT_JOINED);
@@ -780,14 +780,14 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
 	if (i_isdigit(*data)) {
 		/* first argument is the timeout */
 		if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
-				    &timeoutstr, &nicks, &reason))
+		                    &timeoutstr, &nicks, &reason))
                         return;
 
 		if (!parse_time_interval(timeoutstr, &timeleft))
 			cmd_param_error(CMDERR_INVALID_TIME);
 	} else {
 		if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
-				    &nicks, &reason))
+		                    &nicks, &reason))
 			return;
                 timeleft = settings_get_time("knockout_time");
 	}
@@ -795,7 +795,7 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
 	if (*nicks == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	nicklist = g_strsplit(nicks, ",", -1);
-        spacenicks = g_strjoinv(" ", nicklist);
+	spacenicks = g_strjoinv(" ", nicklist);
 	g_strfreev(nicklist);
 
 	banmasks = ban_get_masks(channel, spacenicks, 0);
@@ -808,7 +808,7 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
 	bancmd = *banmasks == '\0'? NULL :
 		g_strdup_printf("%s %s", channel->name, banmasks);
 
-        if (settings_get_bool("kick_first_on_kickban")) {
+	if (settings_get_bool("kick_first_on_kickban")) {
 		signal_emit("command kick", 3, kickcmd, server, channel);
 		if (bancmd != NULL)
 			signal_emit("command ban", 3, bancmd, server, channel);
@@ -827,7 +827,7 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
 		for (ptr = server->knockoutlist; ptr != NULL; ptr = ptr->next) {
 			rec = ptr->data;
 			if (channel == rec->channel &&
-					!g_strcmp0(rec->ban, banmasks))
+			    !g_strcmp0(rec->ban, banmasks))
 				break;
 		}
 		if (ptr == NULL) {
@@ -845,10 +845,10 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
 /* SYNTAX: SERVER PURGE [<target>] */
 static void cmd_server_purge(const char *data, IRC_SERVER_REC *server)
 {
-        char *target;
+	char *target;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 1, &target))
 		return;
@@ -895,12 +895,12 @@ static void cmd_oper(const char *data, IRC_SERVER_REC *server)
 	char *nick, *password;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
-        /* asking for password is handled by fe-common */
+	/* asking for password is handled by fe-common */
 	if (!cmd_get_params(data, &free_arg, 2, &nick, &password))
 		return;
-        if (*password == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	if (*password == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	irc_send_cmdv(server, "OPER %s %s", nick, password);
 	cmd_params_free(free_arg);
@@ -909,7 +909,7 @@ static void cmd_oper(const char *data, IRC_SERVER_REC *server)
 /* SYNTAX: ACCEPT [[-]nick,...] */
 static void cmd_accept(const char *data, IRC_SERVER_REC *server)
 {
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (*data == '\0')
 		irc_send_cmd(server, "ACCEPT *");
@@ -920,7 +920,7 @@ static void cmd_accept(const char *data, IRC_SERVER_REC *server)
 /* SYNTAX: UNSILENCE <nick!user@host> */
 static void cmd_unsilence(const char *data, IRC_SERVER_REC *server)
 {
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (*data == '\0')
 		cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -953,7 +953,7 @@ static void command_2self(const char *data, IRC_SERVER_REC *server)
 	char *target, *text;
 	void *free_arg;
 
-        CMD_IRC_SERVER(server);
+	CMD_IRC_SERVER(server);
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &target, &text))
 		return;
@@ -998,8 +998,8 @@ void irc_commands_init(void)
 	command_bind_irc("admin", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: INFO [<server>] */
 	command_bind_irc("info", NULL, (SIGNAL_FUNC) command_self);
-    /* SYNTAX: KNOCK <channel> */
-    command_bind_irc("knock", NULL, (SIGNAL_FUNC) command_self);
+	/* SYNTAX: KNOCK <channel> */
+	command_bind_irc("knock", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: LINKS [[<server>] <mask>] */
 	command_bind_irc("links", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: LUSERS [<server mask> [<remote server>]] */
@@ -1081,7 +1081,7 @@ void irc_commands_deinit(void)
 	command_unbind("accept", (SIGNAL_FUNC) cmd_accept);
 	command_unbind("admin", (SIGNAL_FUNC) command_self);
 	command_unbind("info", (SIGNAL_FUNC) command_self);
-    command_unbind("knock", (SIGNAL_FUNC) command_self);
+	command_unbind("knock", (SIGNAL_FUNC) command_self);
 	command_unbind("links", (SIGNAL_FUNC) command_self);
 	command_unbind("lusers", (SIGNAL_FUNC) command_self);
 	command_unbind("map", (SIGNAL_FUNC) command_self);

From 41088b6f65674d48edfe4d5667a03d1389617d34 Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Fri, 8 Jan 2016 19:37:29 +0100
Subject: [PATCH 0255/1650] make /knockout use /unban to remove bans

/knockout uses /ban to set bans but calls ban_remove() directly to
remove them. This commit makes it use /unban instead. This allows
scripts that hook ban/unban to work automatically with /knockout.
---
 src/irc/core/irc-commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index d5988f97..6baf2f6d 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -749,7 +749,7 @@ static void knockout_timeout_server(IRC_SERVER_REC *server)
 		next = tmp->next;
 		if (rec->unban_time <= now) {
 			/* timeout, unban. */
-			ban_remove(rec->channel, rec->ban);
+			signal_emit("command unban", 3, rec->ban, server, rec->channel);
 			knockout_destroy(server, rec);
 		}
 	}

From 25020808710f359e75a85a5252bf0f72443d09ee Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 14 Jan 2016 23:54:42 +0100
Subject: [PATCH 0256/1650] Change when the autocmds are sent.

As per #175 if a -botcmd is specified for a given channel without a
-bots parameter then the command is sent right after joining the
channel.
---
 src/core/channels.c               | 15 ++++++++++++---
 src/irc/core/irc-channels-setup.c |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/core/channels.c b/src/core/channels.c
index 9af8b844..bfde605e 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -245,9 +245,18 @@ void channel_send_autocommands(CHANNEL_REC *channel)
 	if (rec == NULL || rec->autosendcmd == NULL || !*rec->autosendcmd)
 		return;
 
-	if (rec->botmasks == NULL || !*rec->botmasks) {
-		/* just send the command. */
-		eval_special_string(rec->autosendcmd, "", channel->server, channel);
+	if (channel->wholist == FALSE) {
+		/* if the autosendcmd alone (with no -bots parameter) has been
+		 * specified then send it right after joining the channel, when
+		 * the WHO list hasn't been yet retrieved.
+		 * Depending on the value of the 'channel_max_who_sync' option
+		 * the WHO list might not be retrieved after the join event. */
+
+		if (rec->botmasks == NULL || !*rec->botmasks) {
+			/* just send the command. */
+			eval_special_string(rec->autosendcmd, "", channel->server, channel);
+		}
+
 		return;
 	}
 
diff --git a/src/irc/core/irc-channels-setup.c b/src/irc/core/irc-channels-setup.c
index 2320352d..be69ad63 100644
--- a/src/irc/core/irc-channels-setup.c
+++ b/src/irc/core/irc-channels-setup.c
@@ -25,9 +25,11 @@
 void irc_channels_setup_init(void)
 {
 	signal_add("channel wholist", (SIGNAL_FUNC) channel_send_autocommands);
+	signal_add("channel joined", (SIGNAL_FUNC) channel_send_autocommands);
 }
 
 void irc_channels_setup_deinit(void)
 {
 	signal_remove("channel wholist", (SIGNAL_FUNC) channel_send_autocommands);
+	signal_remove("channel joined", (SIGNAL_FUNC) channel_send_autocommands);
 }

From 4af3a4731ee21f063b90fdb051efa90f6788d99f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 12 Jan 2016 23:38:50 +0100
Subject: [PATCH 0257/1650] continue head

---
 INSTALL      | 3 ++-
 NEWS         | 2 +-
 configure.ac | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index a83a6c76..234c6cf6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,7 +11,8 @@ To compile irssi you need:
 
 For most people, this should work just fine:
 
- ./configure
+ ./autogen.sh     (for people who just cloned the repository)
+ ./configure      (if this script already exists, skip ./autogen.sh)
  make
  su
  make install     (not _really_ required except for perl support)
diff --git a/NEWS b/NEWS
index 405e8b4c..f44fdb56 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v0.8.18-beta2 2016-01-13  The Irssi team <staff@irssi.org>
+v0.8.18-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	* Modules will now require to define a
 	      void MODULENAME ## _abicheck(int *version)
 	  method to ensure that they are compiled against the correct Irssi
diff --git a/configure.ac b/configure.ac
index bf39c95f..c0efd5e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.18-beta2)
+AC_INIT(irssi, 0.8.18-head)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From eba160ca6df194913d80df67c19e929b9428d77e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 24 Jan 2016 23:02:40 +0100
Subject: [PATCH 0258/1650] Duplicate the code paths for autocommands.

---
 src/core/channels.c               | 40 +++++++++++++++++++++----------
 src/core/channels.h               |  1 +
 src/irc/core/irc-channels-setup.c |  4 ++--
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/core/channels.c b/src/core/channels.c
index bfde605e..9c3b92ba 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -231,6 +231,31 @@ static int match_nick_flags(SERVER_REC *server, NICK_REC *nick, char flag)
 
 /* Send the auto send command to channel */
 void channel_send_autocommands(CHANNEL_REC *channel)
+{
+	CHANNEL_SETUP_REC *rec;
+
+	g_return_if_fail(IS_CHANNEL(channel));
+
+	if (channel->session_rejoin)
+		return;
+
+	rec = channel_setup_find(channel->name, channel->server->connrec->chatnet);
+	if (rec == NULL || rec->autosendcmd == NULL || !*rec->autosendcmd)
+		return;
+
+	/* if the autosendcmd alone (with no -bots parameter) has been
+	 * specified then send it right after joining the channel, when
+	 * the WHO list hasn't been yet retrieved.
+	 * Depending on the value of the 'channel_max_who_sync' option
+	 * the WHO list might not be retrieved after the join event. */
+
+	if (rec->botmasks == NULL || !*rec->botmasks) {
+		/* just send the command. */
+		eval_special_string(rec->autosendcmd, "", channel->server, channel);
+	}
+}
+
+void channel_send_botcommands(CHANNEL_REC *channel)
 {
 	CHANNEL_SETUP_REC *rec;
 	NICK_REC *nick;
@@ -245,20 +270,9 @@ void channel_send_autocommands(CHANNEL_REC *channel)
 	if (rec == NULL || rec->autosendcmd == NULL || !*rec->autosendcmd)
 		return;
 
-	if (channel->wholist == FALSE) {
-		/* if the autosendcmd alone (with no -bots parameter) has been
-		 * specified then send it right after joining the channel, when
-		 * the WHO list hasn't been yet retrieved.
-		 * Depending on the value of the 'channel_max_who_sync' option
-		 * the WHO list might not be retrieved after the join event. */
-
-		if (rec->botmasks == NULL || !*rec->botmasks) {
-			/* just send the command. */
-			eval_special_string(rec->autosendcmd, "", channel->server, channel);
-		}
-
+	/* this case has already been handled by channel_send_autocommands */
+	if (rec->botmasks == NULL || !*rec->botmasks)
 		return;
-	}
 
 	/* find first available bot.. */
 	bots = g_strsplit(rec->botmasks, " ", -1);
diff --git a/src/core/channels.h b/src/core/channels.h
index 0839d69b..bd136fe2 100644
--- a/src/core/channels.h
+++ b/src/core/channels.h
@@ -31,6 +31,7 @@ void channel_change_visible_name(CHANNEL_REC *channel, const char *name);
 
 /* Send the auto send command to channel */
 void channel_send_autocommands(CHANNEL_REC *channel);
+void channel_send_botcommands(CHANNEL_REC *channel);
 
 void channels_init(void);
 void channels_deinit(void);
diff --git a/src/irc/core/irc-channels-setup.c b/src/irc/core/irc-channels-setup.c
index be69ad63..bbbc095c 100644
--- a/src/irc/core/irc-channels-setup.c
+++ b/src/irc/core/irc-channels-setup.c
@@ -24,12 +24,12 @@
 
 void irc_channels_setup_init(void)
 {
-	signal_add("channel wholist", (SIGNAL_FUNC) channel_send_autocommands);
+	signal_add("channel wholist", (SIGNAL_FUNC) channel_send_botcommands);
 	signal_add("channel joined", (SIGNAL_FUNC) channel_send_autocommands);
 }
 
 void irc_channels_setup_deinit(void)
 {
-	signal_remove("channel wholist", (SIGNAL_FUNC) channel_send_autocommands);
+	signal_remove("channel wholist", (SIGNAL_FUNC) channel_send_botcommands);
 	signal_remove("channel joined", (SIGNAL_FUNC) channel_send_autocommands);
 }

From d964950e5ddf9b83c67326b3a45108de4e5a44f2 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 24 Jan 2016 23:53:31 +0100
Subject: [PATCH 0259/1650] Serialize the 'name' attribute of the CHANNEL_REC.

This way the code doing the serialization in 'sig_layout_save_item' is
now symmetric with the loading code loading the data in
'sig_layout_restore'.
---
 src/fe-common/core/windows-layout.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 8ebcc12d..ce6b9910 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -168,12 +168,12 @@ static void sig_layout_save_item(WINDOW_REC *window, WI_ITEM_REC *item,
 		chat_protocol_find_id(item->chat_type);
 	if (proto != NULL)
 		iconfig_node_set_str(subnode, "chat_type", proto->name);
-	iconfig_node_set_str(subnode, "name", item->visible_name);
+	iconfig_node_set_str(subnode, "name", item->name);
 
 	if (item->server != NULL) {
 		iconfig_node_set_str(subnode, "tag", item->server->tag);
 		if (IS_CHANNEL(item)) {
-			rec = window_bind_add(window, item->server->tag, item->visible_name);
+			rec = window_bind_add(window, item->server->tag, item->name);
 			if (rec != NULL)
 				rec->sticky = TRUE;
 		}

From b229138b2ef6efc4ab91504801e27e9922b766b4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 26 Jan 2016 09:33:46 +0100
Subject: [PATCH 0260/1650] Update perl.txt

Mention known Perl Bugs (#386)
---
 docs/perl.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/perl.txt b/docs/perl.txt
index 9688341f..59f65462 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -1193,3 +1193,7 @@ Client->{}
  --------------------
 * Calling die in 'script error' handler causes segfault (#101)
 * Storing and later using any Irssi object may result in use-after-free related crash
+  - Workaround: always acquire fresh objects
+* Calling $dcc->close from the "dcc created" signal will cause unstable behaviour and crashes (#386)
+  - Workaround: use "dcc request" signal instead AND call
+    &Irssi::signal_continue(@_); as the first thing

From 87c0827471763ad5c086d1377ed91980e4b6c8d1 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 27 Jan 2016 14:31:55 +0100
Subject: [PATCH 0261/1650] Delete the HAVE_IPV6 ifdef.

Welcome to the future.
---
 src/core/network.c | 112 ++++-----------------------------------------
 src/core/network.h |  10 +---
 2 files changed, 10 insertions(+), 112 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 0751aa95..4d3997a1 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -30,17 +30,11 @@
 union sockaddr_union {
 	struct sockaddr sa;
 	struct sockaddr_in sin;
-#ifdef HAVE_IPV6
 	struct sockaddr_in6 sin6;
-#endif
 };
 
-#ifdef HAVE_IPV6
-#  define SIZEOF_SOCKADDR(so) ((so).sa.sa_family == AF_INET6 ? \
+#define SIZEOF_SOCKADDR(so) ((so).sa.sa_family == AF_INET6 ? \
 	sizeof(so.sin6) : sizeof(so.sin))
-#else
-#  define SIZEOF_SOCKADDR(so) (sizeof(so.sin))
-#endif
 
 GIOChannel *g_io_channel_new(int handle)
 {
@@ -56,7 +50,7 @@ GIOChannel *g_io_channel_new(int handle)
 
 IPADDR ip4_any = {
 	AF_INET,
-#if defined(HAVE_IPV6) && defined(IN6ADDR_ANY_INIT)
+#if defined(IN6ADDR_ANY_INIT)
 	IN6ADDR_ANY_INIT
 #else
 	{ INADDR_ANY }
@@ -68,10 +62,8 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2)
 	if (ip1->family != ip2->family)
 		return 0;
 
-#ifdef HAVE_IPV6
 	if (ip1->family == AF_INET6)
 		return memcmp(&ip1->ip, &ip2->ip, sizeof(ip1->ip)) == 0;
-#endif
 
 	return memcmp(&ip1->ip, &ip2->ip, 4) == 0;
 }
@@ -80,22 +72,16 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2)
 static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
 {
 	if (ip == NULL) {
-#ifdef HAVE_IPV6
 		so->sin6.sin6_family = AF_INET6;
 		so->sin6.sin6_addr = in6addr_any;
-#else
-		so->sin.sin_family = AF_INET;
-		so->sin.sin_addr.s_addr = INADDR_ANY;
-#endif
 		return;
 	}
 
 	so->sin.sin_family = ip->family;
-#ifdef HAVE_IPV6
+
 	if (ip->family == AF_INET6)
 		memcpy(&so->sin6.sin6_addr, &ip->ip, sizeof(ip->ip));
 	else
-#endif
 		memcpy(&so->sin.sin_addr, &ip->ip, 4);
 }
 
@@ -103,31 +89,25 @@ void sin_get_ip(const union sockaddr_union *so, IPADDR *ip)
 {
 	ip->family = so->sin.sin_family;
 
-#ifdef HAVE_IPV6
 	if (ip->family == AF_INET6)
 		memcpy(&ip->ip, &so->sin6.sin6_addr, sizeof(ip->ip));
 	else
-#endif
 		memcpy(&ip->ip, &so->sin.sin_addr, 4);
 }
 
 static void sin_set_port(union sockaddr_union *so, int port)
 {
-#ifdef HAVE_IPV6
 	if (so->sin.sin_family == AF_INET6)
                 so->sin6.sin6_port = htons((unsigned short)port);
 	else
-#endif
 		so->sin.sin_port = htons((unsigned short)port);
 }
 
 static int sin_get_port(union sockaddr_union *so)
 {
-#ifdef HAVE_IPV6
-	if (so->sin.sin_family == AF_INET6)
-		return ntohs(so->sin6.sin6_port);
-#endif
-	return ntohs(so->sin.sin_port);
+	return ntohs((so->sin.sin_family == AF_INET6) ?
+		     so->sin6.sin6_port :
+		     so->sin.sin_port);
 }
 
 /* Connect to socket */
@@ -272,7 +252,7 @@ GIOChannel *net_listen(IPADDR *my_ip, int *port)
 
 	/* create the socket */
 	handle = socket(so.sin.sin_family, SOCK_STREAM, 0);
-#ifdef HAVE_IPV6
+
 	if (handle == -1 && (errno == EINVAL || errno == EAFNOSUPPORT)) {
 		/* IPv6 is not supported by OS */
 		so.sin.sin_family = AF_INET;
@@ -280,7 +260,7 @@ GIOChannel *net_listen(IPADDR *my_ip, int *port)
 
 		handle = socket(AF_INET, SOCK_STREAM, 0);
 	}
-#endif
+
 	if (handle == -1)
 		return NULL;
 
@@ -399,21 +379,15 @@ int net_getsockname(GIOChannel *handle, IPADDR *addr, int *port)
    Returns 0 = ok, others = error code for net_gethosterror() */
 int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 {
-#ifdef HAVE_IPV6
 	union sockaddr_union *so;
 	struct addrinfo hints, *ai, *ailist;
 	int ret, count_v4, count_v6, use_v4, use_v6;
-#else
-	struct hostent *hp;
-	int count;
-#endif
 
 	g_return_val_if_fail(addr != NULL, -1);
 
 	memset(ip4, 0, sizeof(IPADDR));
 	memset(ip6, 0, sizeof(IPADDR));
 
-#ifdef HAVE_IPV6
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_socktype = SOCK_STREAM;
 
@@ -454,44 +428,21 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 	}
 	freeaddrinfo(ailist);
 	return 0;
-#else
-	hp = gethostbyname(addr);
-	if (hp == NULL)
-		return h_errno;
-
-	/* count IPs */
-	count = 0;
-	while (hp->h_addr_list[count] != NULL)
-		count++;
-
-	if (count == 0)
-		return HOST_NOT_FOUND; /* shouldn't happen? */
-
-	/* if there are multiple addresses, return random one */
-	ip4->family = AF_INET;
-	memcpy(&ip4->ip, hp->h_addr_list[rand() % count], 4);
-
-	return 0;
-#endif
 }
 
 /* Get name for host, *name should be g_free()'d unless it's NULL.
    Return values are the same as with net_gethostbyname() */
 int net_gethostbyaddr(IPADDR *ip, char **name)
 {
-#ifdef HAVE_IPV6
 	union sockaddr_union so;
 	int host_error;
 	char hostname[NI_MAXHOST];
-#else
-	struct hostent *hp;
-#endif
 
 	g_return_val_if_fail(ip != NULL, -1);
 	g_return_val_if_fail(name != NULL, -1);
 
 	*name = NULL;
-#ifdef HAVE_IPV6
+
 	memset(&so, 0, sizeof(so));
 	sin_set_ip(&so, ip);
 
@@ -502,36 +453,15 @@ int net_gethostbyaddr(IPADDR *ip, char **name)
                 return host_error;
 
 	*name = g_strdup(hostname);
-#else
-	if (ip->family != AF_INET) return -1;
-	hp = gethostbyaddr((const char *) &ip->ip, 4, AF_INET);
-	if (hp == NULL) return -1;
-
-	*name = g_strdup(hp->h_name);
-#endif
 
 	return 0;
 }
 
 int net_ip2host(IPADDR *ip, char *host)
 {
-#ifdef HAVE_IPV6
 	if (!inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN))
 		return -1;
-#else
-	unsigned long ip4;
 
-	if (ip->family != AF_INET) {
-		strcpy(host, "0.0.0.0");
-	} else {
-		ip4 = ntohl(ip->ip.s_addr);
-		g_snprintf(host, MAX_IP_LEN, "%lu.%lu.%lu.%lu",
-			   (ip4 & 0xff000000UL) >> 24,
-			   (ip4 & 0x00ff0000) >> 16,
-			   (ip4 & 0x0000ff00) >> 8,
-			   (ip4 & 0x000000ff));
-	}
-#endif
 	return 0;
 }
 
@@ -542,12 +472,8 @@ int net_host2ip(const char *host, IPADDR *ip)
 	if (strchr(host, ':') != NULL) {
 		/* IPv6 */
 		ip->family = AF_INET6;
-#ifdef HAVE_IPV6
 		if (inet_pton(AF_INET6, host, &ip->ip) == 0)
 			return -1;
-#else
-		ip->ip.s_addr = 0;
-#endif
 	} else {
 		/* IPv4 */
 		ip->family = AF_INET;
@@ -582,40 +508,20 @@ int net_geterror(GIOChannel *handle)
 /* get error of net_gethostname() */
 const char *net_gethosterror(int error)
 {
-#ifdef HAVE_IPV6
 	g_return_val_if_fail(error != 0, NULL);
 
 	return gai_strerror(error);
-#else
-	switch (error) {
-	case HOST_NOT_FOUND:
-		return "Host not found";
-	case NO_ADDRESS:
-		return "No IP address found for name";
-	case NO_RECOVERY:
-		return "A non-recovable name server error occurred";
-	case TRY_AGAIN:
-		return "A temporary error on an authoritative name server";
-	}
-
-	/* unknown error */
-	return NULL;
-#endif
 }
 
 /* return TRUE if host lookup failed because it didn't exist (ie. not
    some error with name server) */
 int net_hosterror_notfound(int error)
 {
-#ifdef HAVE_IPV6
 #ifdef EAI_NODATA /* NODATA is deprecated */
 	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
 #else
 	return error != 1 && (error == EAI_NONAME);
 #endif
-#else
-	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
-#endif
 }
 
 /* Get name of TCP service */
diff --git a/src/core/network.h b/src/core/network.h
index 73ac8dee..fb627b4d 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -21,19 +21,11 @@
 
 struct _IPADDR {
 	unsigned short family;
-#ifdef HAVE_IPV6
 	struct in6_addr ip;
-#else
-	struct in_addr ip;
-#endif
 };
 
 /* maxmimum string length of IP address */
-#ifdef HAVE_IPV6
-#  define MAX_IP_LEN INET6_ADDRSTRLEN
-#else
-#  define MAX_IP_LEN 20
-#endif
+#define MAX_IP_LEN INET6_ADDRSTRLEN
 
 #define IPADDR_IS_V6(ip) ((ip)->family != AF_INET)
 

From 70c7949cfe2f07545e5eeb4291631916ab28d07f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 27 Jan 2016 14:42:50 +0100
Subject: [PATCH 0262/1650] Update the configure script and INSTALL.

Now that HAVE_IPV6 is gone remove all the references from the
buildscript and documentation.
---
 INSTALL      |  4 ----
 acconfig.h   |  1 -
 configure.ac | 33 ---------------------------------
 3 files changed, 38 deletions(-)

diff --git a/INSTALL b/INSTALL
index 234c6cf6..4b20c1ba 100644
--- a/INSTALL
+++ b/INSTALL
@@ -29,10 +29,6 @@ configure options
 
   Build the irssi proxy (see startup-HOWTO).
 
-  --disable-ipv6
-
-  Disable IPv6 support.
-
   --disable-ssl
 
   Disable SSL support.
diff --git a/acconfig.h b/acconfig.h
index 9ace70d8..53e268d7 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,5 +1,4 @@
 /* misc.. */
-#undef HAVE_IPV6
 #undef HAVE_SOCKS_H
 #undef HAVE_STATIC_PERL
 #undef HAVE_GMODULE
diff --git a/configure.ac b/configure.ac
index c0efd5e3..1a579911 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,15 +140,6 @@ AC_ARG_WITH(perl,
 	fi,
 	want_perl=static)
 
-AC_ARG_ENABLE(ipv6,
-[  --disable-ipv6          Disable IPv6 support],
-	if test x$enableval = xno; then
-		want_ipv6=no
-	else
-		want_ipv6=yes
-	fi,
-	want_ipv6=yes)
-
 AC_ARG_ENABLE(dane,
 [  --enable-dane           Enable DANE support],
 	if test x$enableval = xno ; then
@@ -577,29 +568,6 @@ COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS"
 AC_SUBST(COMMON_NOUI_LIBS)
 AC_SUBST(COMMON_LIBS)
 
-dnl **
-dnl ** IPv6 support
-dnl **
-
-have_ipv6=no
-if test "x$want_ipv6" = "xyes"; then
-	AC_MSG_CHECKING([for IPv6])
-	AC_CACHE_VAL(irssi_cv_type_in6_addr,
-	[AC_TRY_COMPILE([
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <netdb.h>
-	#include <arpa/inet.h>],
-	[struct in6_addr i = in6addr_any; return &i == &i;],
-	have_ipv6=yes,
-	)])
-	if test $have_ipv6 = yes; then
-		AC_DEFINE(HAVE_IPV6)
-	fi
-	AC_MSG_RESULT($have_ipv6)
-fi
-
 have_dane=no
 if test "x$want_dane" = "xyes"; then
 	AC_MSG_CHECKING([for DANE])
@@ -742,7 +710,6 @@ echo "Install prefix ................... : $prefix"
 
 echo
 
-echo "Building with IPv6 support ....... : $have_ipv6"
 echo "Building with SSL support ........ : $have_openssl"
 if test "x$have_openssl" = "xno" -a "x$enable_ssl" = "xyes"; then
   if test -f /etc/debian_version; then

From f31b2026b4732e57f88af14796ac0dea4b2d0131 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 27 Jan 2016 15:04:07 +0100
Subject: [PATCH 0263/1650] Minor style fix in net_ip2host.

---
 src/core/network.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 4d3997a1..28189661 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -459,10 +459,7 @@ int net_gethostbyaddr(IPADDR *ip, char **name)
 
 int net_ip2host(IPADDR *ip, char *host)
 {
-	if (!inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN))
-		return -1;
-
-	return 0;
+	return inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN) ? 0 : -1;
 }
 
 int net_host2ip(const char *host, IPADDR *ip)

From 118eb0a68ce3250aa4528e6086b2bd0567e7638c Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 27 Jan 2016 15:54:29 +0100
Subject: [PATCH 0264/1650] Call getnameinfo with NI_NAMEREQD flag.

This way net_gethostbyaddr will fail when the system is unable to
resolve the address to a valid host name.
Without this flag in case of failure the function would return the ip
address instead of failing.
---
 src/core/network.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 28189661..8abc1ba1 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -447,8 +447,10 @@ int net_gethostbyaddr(IPADDR *ip, char **name)
 	sin_set_ip(&so, ip);
 
 	/* save error to host_error for later use */
-        host_error = getnameinfo((struct sockaddr *) &so, sizeof(so),
-                                 hostname, sizeof(hostname), NULL, 0, 0);
+        host_error = getnameinfo((struct sockaddr *)&so, sizeof(so),
+				 hostname, sizeof(hostname),
+				 NULL, 0,
+				 NI_NAMEREQD);
         if (host_error != 0)
                 return host_error;
 

From 0cc8276e896441a186a8080f127e35d60112d758 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 27 Jan 2016 16:16:27 +0100
Subject: [PATCH 0265/1650] Add AI_ADDRCONFIG to the getaddrinfo hints.

A first step to untangle the ipv4 vs ipv6 mess.
At the time of writing Linux, OpenBSD and FreeBSD all support the
AI_ADDRCONFIG flag.
---
 src/core/network.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/network.c b/src/core/network.c
index 28189661..d777bdcc 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -390,6 +390,7 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_flags = AI_ADDRCONFIG;
 
 	/* save error to host_error for later use */
 	ret = getaddrinfo(addr, NULL, &hints, &ailist);

From 7674fd5936de3190f1fd3bba3ef82370a2941064 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 29 Jan 2016 10:40:18 -0300
Subject: [PATCH 0266/1650] completion: Fix crash when the complist provided by
 a script has nulls

Can be reproduced with aspell_complete.pl 1.00 by setting an invalid
dictionary with "/set spell_dict a"
---
 src/fe-common/core/completion.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index a4715d23..1e7833a4 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -217,6 +217,11 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 		want_space = TRUE;
 		signal_emit("complete word", 5, &complist, window, word, linestart, &want_space);
 		last_want_space = want_space;
+
+		if (complist != NULL) {
+			/* Remove all nulls (from the signal) before doing further processing */
+			complist = g_list_remove_all(g_list_first(complist), NULL);
+		}
 	}
 
 	g_free(linestart);

From 876609901a5476ab2764a8002b9c57d25dc34f20 Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <toddpratt978@gmail.com>
Date: Sat, 30 Jan 2016 09:34:46 -0500
Subject: [PATCH 0267/1650] add an append operation to cut buffer handling

---
 src/fe-text/gui-entry.c | 46 +++++++++++++++++++++++++++--------------
 src/fe-text/gui-entry.h |  1 +
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 6e13ba4e..58743ac3 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -582,25 +582,40 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	if (size == 0 || entry->pos < size)
 		return;
 
+        if (entry->cutbuffer_len == 0) {
+          update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
+        }
+        int cutbuffer_new_size = entry->cutbuffer_len + size;
+        unichar *tmpcutbuffer = entry->cutbuffer;
 	switch (update_cutbuffer) {
+		case CUTBUFFER_UPDATE_APPEND:
+                        entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+                        if (entry->cutbuffer) {
+                                memcpy(entry->cutbuffer, tmpcutbuffer,
+                                                entry->cutbuffer_len * sizeof(unichar));
+                                memcpy(entry->cutbuffer + entry->cutbuffer_len * sizeof(unichar),
+                                                entry->text + entry->pos - size, size * sizeof(unichar));
+
+                                entry->cutbuffer_len = cutbuffer_new_size;
+                                entry->cutbuffer[cutbuffer_new_size] = '\0';
+                                g_free(tmpcutbuffer);
+                        }
+                        break;
+
 		case CUTBUFFER_UPDATE_PREPEND:
-			if (entry->cutbuffer_len) {
-				int cutbuffer_new_size = entry->cutbuffer_len + size;
-				unichar *tmpcutbuffer = entry->cutbuffer;
-				entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+                        entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+                        if (entry->cutbuffer) {
+                                memcpy(entry->cutbuffer, entry->text + entry->pos - size,
+                                                size * sizeof(unichar));
+                                memcpy(entry->cutbuffer + size, tmpcutbuffer,
+                                                entry->cutbuffer_len * sizeof(unichar));
 
-				memcpy(entry->cutbuffer, entry->text + entry->pos - size,
-						size * sizeof(unichar));
-				memcpy(entry->cutbuffer + size, tmpcutbuffer,
-						entry->cutbuffer_len * sizeof(unichar));
+                                entry->cutbuffer_len = cutbuffer_new_size;
+                                entry->cutbuffer[cutbuffer_new_size] = '\0';
+                                g_free(tmpcutbuffer);
+                        }
+                        break;
 
-				entry->cutbuffer_len = cutbuffer_new_size;
-				entry->cutbuffer[cutbuffer_new_size] = '\0';
-
-				g_free(tmpcutbuffer);
-				break;
-			}
-			/* fall through to REPLACE if cutbuffer_len was 0 */
 		case CUTBUFFER_UPDATE_REPLACE:
 			/* put erased text to cutbuffer */
 			if (entry->cutbuffer_len < size) {
@@ -613,6 +628,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
 			       size * sizeof(unichar));
 			break;
+
 		case CUTBUFFER_UPDATE_NOOP:
 			break;
 	}
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index 498f95b9..d22a7fb8 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -23,6 +23,7 @@ typedef struct {
 typedef enum {
 	CUTBUFFER_UPDATE_NOOP,
 	CUTBUFFER_UPDATE_REPLACE,
+	CUTBUFFER_UPDATE_APPEND,
 	CUTBUFFER_UPDATE_PREPEND
 } CUTBUFFER_UPDATE_OP;
 

From 966d002b55eb0b49a04833e5a51b9ab265013eab Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <toddpratt978@gmail.com>
Date: Sat, 30 Jan 2016 11:32:08 -0500
Subject: [PATCH 0268/1650] remove memory allocation check, spaces to tabs

---
 src/fe-text/gui-entry.c | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 58743ac3..78b9166d 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -589,32 +589,28 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
         unichar *tmpcutbuffer = entry->cutbuffer;
 	switch (update_cutbuffer) {
 		case CUTBUFFER_UPDATE_APPEND:
-                        entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-                        if (entry->cutbuffer) {
-                                memcpy(entry->cutbuffer, tmpcutbuffer,
-                                                entry->cutbuffer_len * sizeof(unichar));
-                                memcpy(entry->cutbuffer + entry->cutbuffer_len * sizeof(unichar),
-                                                entry->text + entry->pos - size, size * sizeof(unichar));
+			entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+			memcpy(entry->cutbuffer, tmpcutbuffer,
+					entry->cutbuffer_len * sizeof(unichar));
+			memcpy(entry->cutbuffer + entry->cutbuffer_len * sizeof(unichar),
+					entry->text + entry->pos - size, size * sizeof(unichar));
 
-                                entry->cutbuffer_len = cutbuffer_new_size;
-                                entry->cutbuffer[cutbuffer_new_size] = '\0';
-                                g_free(tmpcutbuffer);
-                        }
-                        break;
+			entry->cutbuffer_len = cutbuffer_new_size;
+			entry->cutbuffer[cutbuffer_new_size] = '\0';
+			g_free(tmpcutbuffer);
+			break;
 
 		case CUTBUFFER_UPDATE_PREPEND:
-                        entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-                        if (entry->cutbuffer) {
-                                memcpy(entry->cutbuffer, entry->text + entry->pos - size,
-                                                size * sizeof(unichar));
-                                memcpy(entry->cutbuffer + size, tmpcutbuffer,
-                                                entry->cutbuffer_len * sizeof(unichar));
+			entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
+					size * sizeof(unichar));
+			memcpy(entry->cutbuffer + size, tmpcutbuffer,
+					entry->cutbuffer_len * sizeof(unichar));
 
-                                entry->cutbuffer_len = cutbuffer_new_size;
-                                entry->cutbuffer[cutbuffer_new_size] = '\0';
-                                g_free(tmpcutbuffer);
-                        }
-                        break;
+			entry->cutbuffer_len = cutbuffer_new_size;
+			entry->cutbuffer[cutbuffer_new_size] = '\0';
+			g_free(tmpcutbuffer);
+			break;
 
 		case CUTBUFFER_UPDATE_REPLACE:
 			/* put erased text to cutbuffer */

From 8708d8da49d68057ee8f32e64415c7109d237bd7 Mon Sep 17 00:00:00 2001
From: Lauri Nurmi <lanurmi@iki.fi>
Date: Sun, 31 Jan 2016 20:49:59 +0200
Subject: [PATCH 0269/1650] Add .gitattributes to ensure all shell scripts have
 LF as eol-style.

Some Git clients on Windows may use CRLF otherwise, which effectively prevents running such scripts.
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..e1ae7d9d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# On Windows, some Git clients may normalize all text files' line-endings to
+# CRLF, which causes obscure errors when running shell scripts.
+*.sh	eol=lf

From 06fdfd617e3944e5ed07aa0e230d71a1e76384c3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 8 Feb 2016 14:38:33 +0100
Subject: [PATCH 0270/1650] sync scriptassist.pl

---
 scripts/scriptassist.pl | 454 +++++++++++++++++++++++-----------------
 1 file changed, 259 insertions(+), 195 deletions(-)

diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index dd6d3737..459d97f6 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,21 +5,19 @@
 
 use strict;
 
-use vars qw($VERSION %IRSSI);
-$VERSION = '2003020803';
-%IRSSI = (
+our $VERSION = '2003020804';
+our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
     name        => 'scriptassist',
     description => 'keeps your scripts on the cutting edge',
     license     => 'GPLv2',
     url         => 'http://irssi.org/scripts/',
-    changed     => $VERSION,
     modules     => 'Data::Dumper LWP::UserAgent (GnuPG)',
     commands	=> "scriptassist"
 );
 
-use vars qw($forked %remote_db $have_gpg);
+our ($forked, %remote_db, $have_gpg, @complist);
 
 use Irssi 20020324;
 use Data::Dumper;
@@ -27,12 +25,11 @@ use LWP::UserAgent;
 use POSIX;
 
 # GnuPG is not always needed
-use vars qw($have_gpg @complist);
 $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
-sub show_help() {
+sub show_help {
     my $help = "scriptassist $VERSION
 /scriptassist check
     Check all loaded scripts for new available versions
@@ -42,15 +39,15 @@ sub show_help() {
     Search the script database
 /scriptassist info <scripts>
     Display information about <scripts>
-/scriptassist ratings <scripts>
-    Retrieve the average ratings of the the scripts
-/scriptassist top <num>
-    Retrieve the first <num> top rated scripts
-/scriptassist new <num>
+".#/scriptassist ratings <scripts>
+#    Retrieve the average ratings of the the scripts
+#/scriptassist top <num>
+#    Retrieve the first <num> top rated scripts
+"/scriptassist new <num>
     Display the newest <num> scripts
-/scriptassist rate <script> <stars>
-    Rate the script with a number of stars ranging from 0-5
-/scriptassist contact <script>
+".#/scriptassist rate <script> <stars>
+#    Rate the script with a number of stars ranging from 0-5
+"/scriptassist contact <script>
     Write an email to the author of the script
     (Requires OpenURL)
 /scriptassist cpan <module>
@@ -70,7 +67,7 @@ sub show_help() {
     #theme_box("ScriptAssist", $text, "scriptassist help", 1);
 }
 
-sub theme_box ($$$$) {
+sub theme_box {
     my ($title, $text, $footer, $colour) = @_;
     Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'box_header', $title);
     foreach (split(/\n/, $text)) {
@@ -79,31 +76,30 @@ sub theme_box ($$$$) {
     Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'box_footer', $footer);
 }
 
-sub draw_box ($$$$) {
+sub draw_box {
     my ($title, $text, $footer, $colour) = @_;
     my $box = '';
     $box .= '%R,--[%n%9%U'.$title.'%U%9%R]%n'."\n";
     foreach (split(/\n/, $text)) {
         $box .= '%R|%n '.$_."\n";
-    }                                                                               $box .= '%R`--<%n'.$footer.'%R>->%n';
+    }
+    $box .= '%R`--<%n'.$footer.'%R>->%n';
     $box =~ s/%.//g unless $colour;
     return $box;
 }
 
-sub call_openurl ($) {
+sub call_openurl {
     my ($url) = @_;
-    no strict "refs";
     # check for a loaded openurl
-    if ( %{ "Irssi::Script::openurl::" }) {
-        &{ "Irssi::Script::openurl::launch_url" }($url);
+    if (my $code = Irssi::Script::openurl::->can('launch_url')) {
+	$code->($url);
     } else {
         print CLIENTCRAP "%R>>%n Please install openurl.pl";
     }
-    use strict;
 }
 
-sub bg_do ($) {
-    my ($func) = @_; 
+sub bg_do {
+    my ($func) = @_;
     my ($rh, $wh);
     pipe($rh, $wh);
     if ($forked) {
@@ -137,7 +133,6 @@ sub bg_do ($) {
 		$result{data}{update} = update_scripts(\@items, $xml);
 	    } elsif ($items[0] eq 'search') {
 		shift(@items);
-		#$result{data}{search}{-foo} = 0;
 		foreach (@items) {
 		    $result{data}{search}{$_} = search_scripts($_, $xml);
 		}
@@ -150,14 +145,12 @@ sub bg_do ($) {
 	    } elsif ($items[0] eq 'ratings') {
 		shift(@items);
 		@items = @{ loaded_scripts() } if $items[0] eq "all";
-		#$result{data}{rating}{-foo} = 1;
 		my %ratings = %{ get_ratings(\@items, '') };
 		foreach (keys %ratings) {
 		    $result{data}{rating}{$_}{rating} = $ratings{$_}->[0];
 		    $result{data}{rating}{$_}{votes} = $ratings{$_}->[1];
 		}
 	    } elsif ($items[0] eq 'rate') {
-		#$result{data}{rate}{-foo} = 1;
 		$result{data}{rate}{$items[1]} = rate_script($items[1], $items[2]);
 	    } elsif ($items[0] eq 'info') {
 		shift(@items);
@@ -182,12 +175,16 @@ sub bg_do ($) {
 	    my $data = $dumper->Dump;
 	    print($wh $data);
 	};
+	if ($@) {
+	    print($wh Data::Dumper->new([+{data=>+{error=>$@}}])
+		      ->Purity(1)->Deepcopy(1)->Indent(0)->Dump);
+	}
 	close($wh);
 	POSIX::_exit(1);
     }
 }
 
-sub get_unknown ($$) {
+sub get_unknown {
     my ($cmd, $db) = @_;
     foreach (keys %$db) {
 	next unless defined $db->{$_}{commands};
@@ -198,56 +195,90 @@ sub get_unknown ($$) {
     return undef;
 }
 
-sub script_info ($) {
+sub get_names {
+    my ($sname, $db) = shift;
+    $sname =~ s/\s+$//;
+    $sname =~ s/\.pl$//;
+    my $plname = "$sname.pl";
+    $sname =~ s/^.*\///;
+    my $xname = $sname;
+    $xname =~ s/\W/_/g;
+    my $pname = "${xname}::";
+    if ($xname ne $sname || $sname =~ /_/) {
+	my $dir = Irssi::get_irssi_dir()."/scripts/";
+	if ($db && exists $db->{"$sname.pl"}) {
+	    # $found = 1;
+	} elsif (-e $dir.$plname || -e $dir."$sname.pl" || -e $dir."autorun/$sname.pl") {
+	    # $found = 1;
+	} else {
+	    # not found
+	    my $pat = $xname; $pat =~ y/_/?/;
+	    my $re = "\Q$xname"; $re =~ s/\Q_/./g;
+	    if ($db) {
+		my ($cand) = grep /^$re\.pl$/, sort keys %$db;
+		if ($cand) {
+		    return get_names($cand, $db);
+		}
+	    }
+	    my ($cand) = glob "'$dir$pat.pl' '${dir}autorun/$pat.pl'";
+	    if ($cand) {
+		$cand =~ s/^.*\///;
+		return get_names($cand, $db);
+	    }
+	}
+    }
+    ($sname, $plname, $pname, $xname)
+}
+
+sub script_info {
     my ($scripts) = @_;
-    no strict "refs";
     my %result;
     my $xml = get_scripts();
     foreach (@{$scripts}) {
-	next unless (defined $xml->{$_.".pl"} || ( %{ 'Irssi::Script::'.$_.'::' } &&  %{ 'Irssi::Script::'.$_.'::IRSSI' }));
-	$result{$_}{version} = get_remote_version($_, $xml);
+	my ($sname, $plname, $pname) = get_names($_, $xml);
+	next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} ));
+	$result{$sname}{version} = get_remote_version($sname, $xml);
 	my @headers = ('authors', 'contact', 'description', 'license', 'source');
 	foreach my $entry (@headers) {
-	    $result{$_}{$entry} = ${ 'Irssi::Script::'.$_.'::IRSSI' }{$entry};
-	    if (defined $xml->{$_.".pl"}{$entry}) {
-		$result{$_}{$entry} = $xml->{$_.".pl"}{$entry};
+	    $result{$sname}{$entry} = $Irssi::Script::{$pname}{IRSSI}{$entry};
+	    if (defined $xml->{$plname}{$entry}) {
+		$result{$sname}{$entry} = $xml->{$plname}{$entry};
 	    }
 	}
-	if ($xml->{$_.".pl"}{signature_available}) {
-	    $result{$_}{signature_available} = 1;
+	if ($xml->{$plname}{signature_available}) {
+	    $result{$sname}{signature_available} = 1;
 	}
-	if (defined $xml->{$_.".pl"}{modules}) {
-	    my $modules = $xml->{$_.".pl"}{modules};
-	    #$result{$_}{modules}{-foo} = 1;
+	if (defined $xml->{$plname}{modules}) {
+	    my $modules = $xml->{$plname}{modules};
 	    foreach my $mod (split(/ /, $modules)) {
 		my $opt = ($mod =~ /\((.*)\)/)? 1 : 0;
 		$mod = $1 if $1;
-		$result{$_}{modules}{$mod}{optional} = $opt;
-		$result{$_}{modules}{$mod}{installed} = module_exist($mod);
+		$result{$sname}{modules}{$mod}{optional} = $opt;
+		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
 	    }
-	} elsif (defined ${ 'Irssi::Script::'.$_.'::IRSSI' }{modules}) {
-	    my $modules = ${ 'Irssi::Script::'.$_.'::IRSSI' }{modules};
+	} elsif (defined $Irssi::Script::{$pname}{IRSSI}{modules}) {
+	    my $modules = $Irssi::Script::{$pname}{IRSSI}{modules};
 	    foreach my $mod (split(/ /, $modules)) {
 		my $opt = ($mod =~ /\((.*)\)/)? 1 : 0;
 		$mod = $1 if $1;
-		$result{$_}{modules}{$mod}{optional} = $opt;
-		$result{$_}{modules}{$mod}{installed} = module_exist($mod);
+		$result{$sname}{modules}{$mod}{optional} = $opt;
+		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
 	    }
 	}
-	if (defined $xml->{$_.".pl"}{depends}) {
-	    my $depends = $xml->{$_.".pl"}{depends};
+	if (defined $xml->{$plname}{depends}) {
+	    my $depends = $xml->{$plname}{depends};
 	    foreach my $dep (split(/ /, $depends)) {
-		$result{$_}{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep }); 
+		$result{$sname}{depends}{$dep}{installed} = 1;
 	    }
 	}
     }
     return \%result;
 }
 
-sub rate_script ($$) {
+sub rate_script {
     my ($script, $stars) = @_;
     my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.$VERSION);
+    $ua->agent('ScriptAssist/'.2003020803);
     my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?&stars='.$stars.'&mode=rate&script='.$script);
     my $response = $ua->request($request);
     unless ($response->is_success() && $response->content() =~ /You already rated this script/) {
@@ -257,10 +288,10 @@ sub rate_script ($$) {
     }
 }
 
-sub get_ratings ($$) {
+sub get_ratings {
     my ($scripts, $limit) = @_;
     my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.$VERSION);
+    $ua->agent('ScriptAssist/'.2003020803);
     my $script = join(',', @{$scripts});
     my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?script='.$script.'&sort=rating&limit='.$limit);
     my $response = $ua->request($request);
@@ -278,7 +309,7 @@ sub get_ratings ($$) {
     return \%result;
 }
 
-sub get_new ($) {
+sub get_new {
     my ($num) = @_;
     my $result;
     my $xml = get_scripts();
@@ -290,7 +321,7 @@ sub get_new ($) {
     }
     return $result;
 }
-sub module_exist ($) {
+sub module_exist {
     my ($module) = @_;
     $module =~ s/::/\//g;
     foreach (@INC) {
@@ -299,63 +330,64 @@ sub module_exist ($) {
     return 0;
 }
 
-sub debug_scripts ($) {
+sub debug_scripts {
     my ($scripts) = @_;
     my %result;
+    my $xml = get_scripts();
     foreach (@{$scripts}) {
-	my $xml = get_scripts();
-	if (defined $xml->{$_.".pl"}{modules}) {
-	    my $modules = $xml->{$_.".pl"}{modules};
+	my ($sname, $plname) = get_names($_, $xml);
+	if (defined $xml->{$plname}{modules}) {
+	    my $modules = $xml->{$plname}{modules};
 	    foreach my $mod (split(/ /, $modules)) {
                 my $opt = ($mod =~ /\((.*)\)/)? 1 : 0;
                 $mod = $1 if $1;
-                $result{$_}{$mod}{optional} = $opt;
-                $result{$_}{$mod}{installed} = module_exist($mod);
+                $result{$sname}{$mod}{optional} = $opt;
+                $result{$sname}{$mod}{installed} = module_exist($mod);
 	    }
 	}
     }
     return(\%result);
 }
 
-sub install_scripts ($$) {
+sub install_scripts {
     my ($scripts, $xml) = @_;
     my %success;
-    #$success{-foo} = 1;
     my $dir = Irssi::get_irssi_dir()."/scripts/";
     foreach (@{$scripts}) {
-	if (get_local_version($_) && (-e $dir.$_.".pl")) {
-	    $success{$_}{installed} = -2;
+	my ($sname, $plname, $pname) = get_names($_, $xml);
+	if (get_local_version($sname) && (-e $dir.$plname)) {
+	    $success{$sname}{installed} = -2;
 	} else {
-	    $success{$_} = download_script($_, $xml);
+	    $success{$sname} = download_script($sname, $xml);
 	}
     }
     return \%success;
 }
 
-sub update_scripts ($$) {
+sub update_scripts {
     my ($list, $database) = @_;
     $list = loaded_scripts() if ($list->[0] eq "all" || scalar(@$list) == 0);
     my %status;
-    #$status{-foo} = 1;
     foreach (@{$list}) {
-	my $local = get_local_version($_);
-	my $remote = get_remote_version($_, $database);
+	my ($sname) = get_names($_, $database);
+	my $local = get_local_version($sname);
+	my $remote = get_remote_version($sname, $database);
 	next if $local eq '' || $remote eq '';
 	if (compare_versions($local, $remote) eq "older") {
-	    $status{$_} = download_script($_, $database);
+	    $status{$sname} = download_script($sname, $database);
 	} else {
-	    $status{$_}{installed} = -2;
+	    $status{$sname}{installed} = -2;
 	}
-	$status{$_}{remote} = $remote;
-	$status{$_}{local} = $local;
+	$status{$sname}{remote} = $remote;
+	$status{$sname}{local} = $local;
     }
     return \%status;
 }
 
-sub search_scripts ($$) {
+sub search_scripts {
     my ($query, $database) = @_;
+    $query =~ s/\.pl\Z//;
     my %result;
-    #$result{-foo} = " ";
     foreach (sort keys %{$database}) {
 	my %entry = %{$database->{$_}};
 	my $string = $_." ";
@@ -385,23 +417,22 @@ sub search_scripts ($$) {
 
 sub pipe_input {
     my ($rh, $pipetag) = @{$_[0]};
-    my @lines = <$rh>;
+    my $text = do { local $/; <$rh>; };
     close($rh);
     Irssi::input_remove($$pipetag);
     $forked = 0;
-    my $text = join("", @lines);
     unless ($text) {
-	print CLIENTCRAP "%R<<%n Something weird happend";
+	print CLIENTCRAP "%R<<%n Something weird happend (no text)";
 	return();
     }
-    no strict "vars";
-    my $incoming = eval("$text");
+    local our $VAR1;
+    my $incoming = eval($text);
     if ($incoming->{db} && $incoming->{timestamp}) {
     	$remote_db{db} = $incoming->{db};
     	$remote_db{timestamp} = $incoming->{timestamp};
     }
     unless (defined $incoming->{data}) {
-	print CLIENTCRAP "%R<<%n Something weird happend";
+	print CLIENTCRAP "%R<<%n Something weird happend (no data)";
 	return;
     }
     my %result = %{ $incoming->{data} };
@@ -447,10 +478,14 @@ sub pipe_input {
     if ($result{unknown}) {
         print_unknown($result{unknown});
     }
+    if (defined $result{error}) {
+	print CLIENTCRAP "%R<<%n There was an error in background processing:"; chomp($result{error});
+	print CLIENTERROR $result{error};
+    }
 
 }
 
-sub print_unknown ($) {
+sub print_unknown {
     my ($data) = @_;
     foreach my $cmd (keys %$data) {
 	print CLIENTCRAP "%R<<%n No script provides '/$cmd'" unless $data->{$cmd};
@@ -458,7 +493,7 @@ sub print_unknown ($) {
 	    my $text .= "The command '/".$cmd."' is provided by the script '".$data->{$cmd}{$_}{name}."'.\n";
 	    $text .= "This script is currently not installed on your system.\n";
 	    $text .= "If you want to install the script, enter\n";
-	    my ($name) = /(.*?)\.pl$/;
+	    my ($name) = get_names($_);
 	    $text .= "  %U/script install ".$name."%U ";
 	    my $output = draw_box("ScriptAssist", $text, "'".$_."' missing", 1);
 	    print CLIENTCRAP $output;
@@ -466,11 +501,12 @@ sub print_unknown ($) {
     }
 }
 
-sub check_autorun ($) {
+sub check_autorun {
     my ($script) = @_;
+    my (undef, $plname) = get_names($script);
     my $dir = Irssi::get_irssi_dir()."/scripts/";
-    if (-e $dir."/autorun/".$script.".pl") {
-	if (readlink($dir."/autorun/".$script.".pl") eq "../".$script.".pl") {
+    if (-e $dir."/autorun/".$plname) {
+	if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
 	    return 1;
 	}
     }
@@ -487,7 +523,7 @@ sub array2table {
             $l =~ s/%%/%/g;
             $width[$_] = length($l) if $width[$_]<length($l);
         }
-    }   
+    }
     my $text;
     foreach my $line (@array) {
         for (0..scalar(@$line)-1) {
@@ -503,7 +539,7 @@ sub array2table {
 }
 
 
-sub print_info (%) {
+sub print_info {
     my (%data) = @_;
     my $line;
     foreach my $script (sort keys(%data)) {
@@ -543,7 +579,6 @@ sub print_info (%) {
 	    $line .= " <optional>" if $data{$script}{modules}{$_}{optional};
             $line .= "\n";
         }
-	#$line .= "  Needed Irssi scripts:\n";
 	$line .= "  Needed Irssi Scripts:\n" if $data{$script}{depends};
 	foreach (sort keys %{$data{$script}{depends}}) {
 	    if ( $data{$script}{depends}{$_}{installed} == 1 ) {
@@ -551,14 +586,13 @@ sub print_info (%) {
 	    } else {
 		$line .= "  %r->%n ".$_." (not loaded)";
 	    }
-	    #$line .= " <optional>" if $data{$script}{depends}{$_}{optional};
 	    $line .= "\n";
 	}
     }
     print CLIENTCRAP draw_box('ScriptAssist', $line, 'info', 1) ;
 }
 
-sub print_rate (%) {
+sub print_rate {
     my (%data) = @_;
     my $line;
     foreach my $script (sort keys(%data)) {
@@ -571,7 +605,7 @@ sub print_rate (%) {
     print CLIENTCRAP draw_box('ScriptAssist', $line, 'rating', 1) ;
 }
 
-sub print_ratings (%) {
+sub print_ratings {
     my (%data) = @_;
     my @table;
     foreach my $script (sort {$data{$b}{rating}<=>$data{$a}{rating}} keys(%data)) {
@@ -589,12 +623,12 @@ sub print_ratings (%) {
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'ratings', 1) ;
 }
 
-sub print_new ($) {
+sub print_new {
     my ($list) = @_;
     my @table;
     foreach (sort {$list->{$b}{last_modified} cmp $list->{$a}{last_modified}} keys %$list) {
 	my @line;
-	my ($name) = /^(.*?)\.pl$/;
+	my ($name) = get_names($_);
         if (get_local_version($name)) {
             push @line, "%go%n";
         } else {
@@ -607,7 +641,7 @@ sub print_new ($) {
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'new scripts', 1) ;
 }
 
-sub print_debug (%) {
+sub print_debug {
     my (%data) = @_;
     my $line;
     foreach my $script (sort keys %data) {
@@ -627,12 +661,12 @@ sub print_debug (%) {
     }
 }
 
-sub load_script ($) {
+sub load_script {
     my ($script) = @_;
     Irssi::command('script load '.$script);
 }
 
-sub print_install (%) {
+sub print_install {
     my (%data) = @_;
     my $text;
     my ($crashed, @installed);
@@ -681,17 +715,16 @@ sub print_install (%) {
     list_sbitems(\@installed);
 }
 
-sub list_sbitems ($) {
+sub list_sbitems {
     my ($scripts) = @_;
     my $text;
     foreach (@$scripts) {
-	no strict 'refs';
-	next unless  %{ "Irssi::Script::${_}::" };
-	next unless  %{ "Irssi::Script::${_}::IRSSI" };
-	my %header = %{ "Irssi::Script::${_}::IRSSI" };
-	next unless $header{sbitems};
+	next unless exists $Irssi::Script::{"${_}::"};
+	next unless exists $Irssi::Script::{"${_}::"}{IRSSI};
+	my $header = $Irssi::Script::{"${_}::"}{IRSSI};
+	next unless $header->{sbitems};
 	$text .= '%9"'.$_.'"%9 provides the following statusbar item(s):'."\n";
-	$text .= '  ->'.$_."\n" foreach (split / /, $header{sbitems});
+	$text .= '  ->'.$_."\n" foreach (split / /, $header->{sbitems});
     }
     return unless $text;
     $text .= "\n";
@@ -699,7 +732,7 @@ sub list_sbitems ($) {
     print CLIENTCRAP draw_box('ScriptAssist', $text, 'sbitems', 1);
 }
 
-sub check_sig ($) {
+sub check_sig {
     my ($sig) = @_;
     my $line;
     my %trust = ( -1 => 'undefined',
@@ -722,7 +755,7 @@ sub check_sig ($) {
     return $line;
 }
 
-sub print_search ($%) {
+sub print_search {
     my ($query, %data) = @_;
     my $text;
     foreach (sort keys %data) {
@@ -738,7 +771,7 @@ sub print_search ($%) {
     print CLIENTCRAP draw_box('ScriptAssist', $text, 'search: '.$query, 1) ;
 }
 
-sub print_update (%) { 
+sub print_update {
     my (%data) = @_;
     my $text;
     my @table;
@@ -761,7 +794,7 @@ sub print_update (%) {
 	    push @table, ['%yo%n', '%9'.$_.'%9', 'not upgraded'];
             foreach (split /\n/, check_sig($data{$_})) {
 		push @table, ['', '', $_];
-            } 
+            }
 	} elsif ($data{$_}{installed} == -2 && $verbose) {
 	    my $local = $data{$_}{local};
 	    push @table, ['%go%n', '%9'.$_.'%9', 'already at the latest version ('.$local.')'];
@@ -771,35 +804,44 @@ sub print_update (%) {
     print CLIENTCRAP draw_box('ScriptAssist', $text, 'update', 1) ;
 }
 
-sub contact_author ($) {
+sub contact_author {
     my ($script) = @_;
-    no strict 'refs';
-    return unless  %{ "Irssi::Script::${script}::" };
-    my %header = %{ "Irssi::Script::${script}::IRSSI" };
-    if (defined $header{contact}) {
-	my @ads = split(/ |,/, $header{contact});
+    my ($sname, $plname, $pname) = get_names($script);
+    return unless exists $Irssi::Script::{$pname};
+    my $header = $Irssi::Script::{$pname}{IRSSI};
+    if ($header && defined $header->{contact}) {
+	my @ads = split(/ |,/, $header->{contact});
 	my $address = $ads[0];
 	$address .= '?subject='.$script;
 	$address .= '_'.get_local_version($script) if defined get_local_version($script);
-	call_openurl($address);
+	call_openurl($address) if $address =~ /[\@:]/;
     }
 }
 
 sub get_scripts {
     my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.$VERSION);
+    $ua->agent('ScriptAssist/'.2003020803);
     $ua->env_proxy();
     my @mirrors = split(/ /, Irssi::settings_get_str('scriptassist_script_sources'));
     my %sites_db;
+    my $not_modified = 0;
     my $fetched = 0;
     my @sources;
+    my $error;
     foreach my $site (@mirrors) {
 	my $request = HTTP::Request->new('GET', $site);
 	if ($remote_db{timestamp}) {
 	    $request->if_modified_since($remote_db{timestamp});
 	}
 	my $response = $ua->request($request);
-	next unless $response->is_success;
+	if ($response->code == 304) { # HTTP_NOT_MODIFIED
+	    $not_modified = 1;
+	    next;
+	}
+	unless ($response->is_success) {
+	    $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
+	    next;
+	}
 	$fetched = 1;
 	my $data = $response->content();
 	my ($src, $type);
@@ -826,9 +868,8 @@ sub get_scripts {
 		$sites_db{$_}{source} = $src;
 	    }
 	} else {
-	    ## FIXME Panic?!
+	    die("Unknown script database type ($type).\n");
 	}
-	
     }
     if ($fetched) {
 	# Clean database
@@ -842,32 +883,40 @@ sub get_scripts {
 	}
 	$remote_db{db}{$_} = $sites_db{$_} foreach (keys %sites_db);
 	$remote_db{timestamp} = time();
+    } elsif ($not_modified) {
+	# nothing to do
+    } else {
+	die("No script database sources defined in /set scriptassist_script_sources\n") unless @mirrors;
+	die("Fetching script database failed: $error") if $error;
+	die("Unknown error while fetching script database\n");
     }
     return $remote_db{db};
 }
 
-sub get_remote_version ($$) {
+sub get_remote_version {
     my ($script, $database) = @_;
-    return $database->{$script.".pl"}{version};
+    my $plname = (get_names($script, $database))[1];
+    return $database->{$plname}{version};
 }
 
-sub get_local_version ($) {
+sub get_local_version {
     my ($script) = @_;
-    no strict 'refs';
-    return unless  %{ "Irssi::Script::${script}::" };
-    my $version = ${ "Irssi::Script::${script}::VERSION" };
-    return $version;
+    my $pname = (get_names($script))[2];
+    return unless exists $Irssi::Script::{$pname};
+    my $vref = $Irssi::Script::{$pname}{VERSION};
+    return $vref ? $$vref : undef;
 }
 
-sub compare_versions ($$) {
+sub compare_versions {
     my ($ver1, $ver2) = @_;
-    my @ver1 = split /\./, $ver1;
-    my @ver2 = split /\./, $ver2;
-    #if (scalar(@ver2) != scalar(@ver1)) {
-    #    return 0;
-    #}       
+    for ($ver1, $ver2) {
+	$_ = "0:$_" unless /:/;
+    }
+    my @ver1 = split /[.:]/, $ver1;
+    my @ver2 = split /[.:]/, $ver2;
     my $cmp = 0;
     ### Special thanks to Clemens Heidinger
+    no warnings 'uninitialized';
     $cmp ||= $ver1[$_] <=> $ver2[$_] || $ver1[$_] cmp $ver2[$_] for 0..scalar(@ver2);
     return 'newer' if $cmp == 1;
     return 'older' if $cmp == -1;
@@ -875,24 +924,20 @@ sub compare_versions ($$) {
 }
 
 sub loaded_scripts {
-    no strict 'refs';
     my @modules;
     foreach (sort grep(s/::$//, keys %Irssi::Script::)) {
-        #my $name    = ${ "Irssi::Script::${_}::IRSSI" }{name};
-        #my $version = ${ "Irssi::Script::${_}::VERSION" };
-	push @modules, $_;# if $name && $version;
+	push @modules, $_;
     }
     return \@modules;
-
 }
 
 sub check_scripts {
     my ($data) = @_;
     my %versions;
-    #$versions{-foo} = 1;
     foreach (@{loaded_scripts()}) {
-        my $remote = get_remote_version($_, $data);
-        my $local =  get_local_version($_);
+	my ($sname) = get_names($_, $data);
+	my $remote = get_remote_version($sname, $data);
+	my $local = get_local_version($sname);
 	my $state;
 	if ($local && $remote) {
 	    $state = compare_versions($local, $remote);
@@ -905,51 +950,50 @@ sub check_scripts {
 	    $remote = '/';
 	}
 	if ($state) {
-	    $versions{$_}{state} = $state;
-	    $versions{$_}{remote} = $remote;
-	    $versions{$_}{local} = $local;
+	    $versions{$sname}{state} = $state;
+	    $versions{$sname}{remote} = $remote;
+	    $versions{$sname}{local} = $local;
 	}
     }
     return \%versions;
 }
 
-sub download_script ($$) {
+sub download_script {
     my ($script, $xml) = @_;
+    my ($sname, $plname) = get_names($script, $xml);
     my %result;
-    my $site = $xml->{$script.".pl"}{source};
+    my $site = $xml->{$plname}{source};
     $result{installed} = 0;
     $result{signed} = 0;
     my $dir = Irssi::get_irssi_dir();
     my $ua = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1,timeout => 30);
-    $ua->agent('ScriptAssist/'.$VERSION);
+    $ua->agent('ScriptAssist/'.2003020803);
     my $request = HTTP::Request->new('GET', $site.'/scripts/'.$script.'.pl');
     my $response = $ua->request($request);
     if ($response->is_success()) {
 	my $file = $response->content();
 	mkdir $dir.'/scripts/' unless (-e $dir.'/scripts/');
-	local *F;
-	open(F, '>'.$dir.'/scripts/'.$script.'.pl.new');
-	print F $file;
-	close(F);
+	open(my $F, '>', $dir.'/scripts/'.$plname.'.new');
+	print $F $file;
+	close($F);
 	if ($have_gpg && Irssi::settings_get_bool('scriptassist_use_gpg')) {
 	    my $ua2 = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1,timeout => 30);
-	    $ua->agent('ScriptAssist/'.$VERSION);
-	    my $request2 = HTTP::Request->new('GET', $site.'/signatures/'.$script.'.pl.asc');
+	    $ua->agent('ScriptAssist/'.2003020803);
+	    my $request2 = HTTP::Request->new('GET', $site.'/signatures/'.$plname.'.asc');
 	    my $response2 = $ua->request($request2);
 	    if ($response2->is_success()) {
-		local *S;
 		my $sig_dir = $dir.'/scripts/signatures/';
 		mkdir $sig_dir unless (-e $sig_dir);
-		open(S, '>'.$sig_dir.$script.'.pl.asc');
+		open(my $S, '>', $sig_dir.$plname.'.asc');
 		my $file2 = $response2->content();
-		print S $file2;
-		close(S);
+		print $S $file2;
+		close($S);
 		my $sig;
 		foreach (1..2) {
 		    # FIXME gpg needs two rounds to load the key
 		    my $gpg = new GnuPG();
 		    eval {
-			$sig = $gpg->verify( file => $dir.'/scripts/'.$script.'.pl.new', signature => $sig_dir.$script.'.pl.asc' );
+			$sig = $gpg->verify( file => $dir.'/scripts/'.$plname.'.new', signature => $sig_dir.$plname.'.asc' );
 		    };
 		}
 		if (defined $sig->{user}) {
@@ -975,13 +1019,13 @@ sub download_script ($$) {
     if ($result{installed}) {
 	my $old_dir = "$dir/scripts/old/";
 	mkdir $old_dir unless (-e $old_dir);
-	rename "$dir/scripts/$script.pl", "$old_dir/$script.pl.old" if -e "$dir/scripts/$script.pl";
-	rename "$dir/scripts/$script.pl.new", "$dir/scripts/$script.pl";
+	rename "$dir/scripts/$plname", "$old_dir/$plname.old" if -e "$dir/scripts/$plname";
+	rename "$dir/scripts/$plname.new", "$dir/scripts/$plname";
     }
     return \%result;
 }
 
-sub print_check (%) {
+sub print_check {
     my (%data) = @_;
     my $text;
     my @table;
@@ -1001,28 +1045,29 @@ sub print_check (%) {
     print CLIENTCRAP draw_box('ScriptAssist', $text, 'check', 1) ;
 }
 
-sub toggle_autorun ($) {
+sub toggle_autorun {
     my ($script) = @_;
+    my ($sname, $plname) = get_names($script);
     my $dir = Irssi::get_irssi_dir()."/scripts/";
     mkdir $dir."autorun/" unless (-e $dir."autorun/");
-    return unless (-e $dir.$script.".pl");
-    if (check_autorun($script)) {
-	if (readlink($dir."/autorun/".$script.".pl") eq "../".$script.".pl") {
-	    if (unlink($dir."/autorun/".$script.".pl")) {
-		print CLIENTCRAP "%R>>%n Autorun of ".$script." disabled";
+    return unless (-e $dir.$plname);
+    if (check_autorun($sname)) {
+	if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
+	    if (unlink($dir."/autorun/".$plname)) {
+		print CLIENTCRAP "%R>>%n Autorun of ".$sname." disabled";
 	    } else {
 		print CLIENTCRAP "%R>>%n Unable to delete link";
 	    }
 	} else {
-	    print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$script.".pl is not a correct link";
+	    print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$plname." is not a correct link";
 	}
     } else {
-	symlink("../".$script.".pl", $dir."/autorun/".$script.".pl");
-    	print CLIENTCRAP "%R>>%n Autorun of ".$script." enabled";
+	symlink("../".$plname, $dir."/autorun/".$plname);
+    	print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
     }
 }
 
-sub sig_script_error ($$) {
+sub sig_script_error {
     my ($script, $msg) = @_;
     return unless Irssi::settings_get_bool('scriptassist_catch_script_errors');
     if ($msg =~ /Can't locate (.*?)\.pm in \@INC \(\@INC contains:(.*?) at/) {
@@ -1032,7 +1077,7 @@ sub sig_script_error ($$) {
     }
 }
 
-sub missing_module ($$) {
+sub missing_module {
     my ($module) = @_;
     my $text;
     $text .= "The perl module %9".$module."%9 is missing on your system.\n";
@@ -1041,7 +1086,7 @@ sub missing_module ($$) {
     print CLIENTCRAP &draw_box('ScriptAssist', $text, $module, 1);
 }
 
-sub cmd_scripassist ($$$) {
+sub cmd_scripassist {
     my ($arg, $server, $witem) = @_;
     my @args = split(/ /, $arg);
     if ($args[0] eq 'help' || $args[0] eq '-h') {
@@ -1083,27 +1128,34 @@ sub cmd_scripassist ($$$) {
     }
 }
 
-sub sig_command_script_load ($$$) {
+sub cmd_help {
+    my ($arg, $server, $witem) = @_;
+    $arg =~ s/\s+$//;
+    if ($arg =~ /^scriptassist/i) {
+	show_help();
+    }
+}
+
+sub sig_command_script_load {
     my ($script, $server, $witem) = @_;
-    no strict;
-    $script = $2 if $script =~ /(.*\/)?(.*?)\.pl$/;
-    if ( %{ "Irssi::Script::${script}::" }) {
-	if (defined &{ "Irssi::Script::${script}::pre_unload" }) {
+    my ($sname, $plname, $pname, $xname) = get_names($script);
+    if ( exists $Irssi::Script::{$pname} ) {
+	if (my $code = "Irssi::Script::${pname}"->can('pre_unload')) {
 	    print CLIENTCRAP "%R>>%n Triggering pre_unload function of $script...";
-	    &{ "Irssi::Script::${script}::pre_unload" }();
+	    $code->();
 	}
     }
 }
 
-sub sig_default_command ($$) {
+sub sig_default_command {
     my ($cmd, $server) = @_;
     return unless Irssi::settings_get_bool("scriptassist_check_unknown_commands");
     bg_do('unknown '.$cmd);
 }
 
-sub sig_complete ($$$$$) {
+sub sig_complete {
     my ($list, $window, $word, $linestart, $want_space) = @_;
-    return unless $linestart =~ /^.script(assist)? (install|rate|ratings|update|check|contact|info|autorun)/;
+    return unless $linestart =~ /^.script(assist)? (install|rate|ratings|update|check|contact|info|autorun)/i;
     my @newlist;
     my $str = $word;
     foreach (@complist) {
@@ -1114,13 +1166,12 @@ sub sig_complete ($$$$$) {
     foreach (@{loaded_scripts()}) {
 	push @newlist, $_ if /^(\Q$str\E.*)?$/;
     }
-    $want_space = 0;
     push @$list, $_ foreach @newlist;
     Irssi::signal_stop();
 }
 
 
-Irssi::settings_add_str($IRSSI{name}, 'scriptassist_script_sources', 'http://scripts.irssi.org/scripts.dmp');
+Irssi::settings_add_str($IRSSI{name}, 'scriptassist_script_sources', 'https://scripts.irssi.org/scripts.dmp');
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_cache_sources', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_update_verbose', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_check_verbose', 1);
@@ -1131,24 +1182,37 @@ Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_use_gpg', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_integrate', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_check_unknown_commands', 1);
 
-Irssi::signal_add_first("default command", \&sig_default_command);
-Irssi::signal_add_first('complete word', \&sig_complete);
-Irssi::signal_add_first('command script load', \&sig_command_script_load);
-Irssi::signal_add_first('command script unload', \&sig_command_script_load);
+Irssi::signal_add_first("default command", 'sig_default_command');
+Irssi::signal_add_first('complete word', 'sig_complete');
+Irssi::signal_add_first('command script load', 'sig_command_script_load');
+Irssi::signal_add_first('command script unload', 'sig_command_script_load');
 
-if (defined &Irssi::signal_register) {
-    Irssi::signal_register({ 'script error' => [ 'Irssi::Script', 'string' ] });
-    Irssi::signal_add_last('script error', \&sig_script_error);
-}
+Irssi::signal_register({ 'script error' => [ 'Irssi::Script', 'string' ] });
+Irssi::signal_add_last('script error', 'sig_script_error');
 
-Irssi::command_bind('scriptassist', \&cmd_scripassist);
+Irssi::command_bind('scriptassist', 'cmd_scripassist');
+Irssi::command_bind('help', 'cmd_help');
 
 Irssi::theme_register(['box_header', '%R,--[%n$*%R]%n',
 'box_inside', '%R|%n $*',
 'box_footer', '%R`--<%n$*%R>->%n',
 ]);
 
-foreach my $cmd ( ( 'check', 'install', 'update', 'contact', 'search', '-h', 'help', 'ratings', 'rate', 'info', 'echo', 'top', 'cpan', 'autorun', 'new') ) {
+foreach my $cmd ( ( 'check',
+		    'install',
+		    'update',
+		    'contact',
+		    'search',
+#		    '-h',
+		    'help',
+#		    'ratings',
+#		    'rate',
+		    'info',
+#		    'echo',
+#		    'top',
+		    'cpan',
+		    'autorun',
+		    'new' ) ) {
     Irssi::command_bind('scriptassist '.$cmd => sub {
 			cmd_scripassist("$cmd ".$_[0], $_[1], $_[2]); });
     if (Irssi::settings_get_bool('scriptassist_integrate')) {

From 8ab537cf22371f9115002484b320719676dab86b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 8 Feb 2016 21:03:35 +0100
Subject: [PATCH 0271/1650] sync docs

---
 autogen.sh                  |    2 +-
 docs/faq.html               |  150 ++---
 docs/startup-HOWTO-rus.html |  846 -----------------------
 docs/startup-HOWTO.html     | 1265 +++++++++++++----------------------
 4 files changed, 506 insertions(+), 1757 deletions(-)
 delete mode 100644 docs/startup-HOWTO-rus.html

diff --git a/autogen.sh b/autogen.sh
index dd556216..946f1ebb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,7 +32,7 @@ cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!
 # .html -> .txt with lynx or elinks
 echo "Documentation: html -> txt..."
 if type lynx >/dev/null 2>&1 ; then
-  LC_ALL=C lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+  LC_ALL=en_IE.utf8 lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 elif type elinks >/dev/null 2>&1 ; then
   elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 elif type links >/dev/null 2>&1 ; then
diff --git a/docs/faq.html b/docs/faq.html
index e2de9799..345060dc 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1,152 +1,80 @@
-<h2>FAQ</h2>
+<h1>Frequently Asked Questions</h1>
+<h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
 
-<h3>Q: Why doesn't irssi display colors even when ircii etc. displays them?</h3>
+<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
 
-<p>A: They force ANSI colors even if terminal doesn't support them. By
-default, irssi uses colors only if terminfo/termcap so says. The correct
-way to fix this would be to change your TERM environment to a value where
-colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color
-irssi</code>). If this doesn't help, then use the evil way of <code>/SET
-term_force_colors ON</code>.</p>
-
-
-<h3>Q: How do I easily write text to channel that starts with '/' character?</h3>
+<h3 id="q-how-do-i-easily-write-text-to-channel-that-starts-with--character">Q: How do I easily write text to channel that starts with ‘/’ character?</h3>
 
 <p>A: <code>/ /text</code></p>
 
+<h3 id="q-why-doesnt-irssi-update-my-realname-or-whatever-after-i-change-it-with-set-realname-and-reconnect-with-reconnect-or-server">Q: Why doesn’t irssi update my realname (or whatever) after I change it with <code>/SET realname</code> and reconnect with <code>/RECONNECT</code> or <code>/SERVER</code>?</h3>
 
-<h3>Q: Why doesn't irssi update my realname (or whatever) after I change it
-with <code>/SET realname</code> and reconnect with <code>/RECONNECT</code>
-or <code>/SERVER</code>?</h3>
+<p>A: Irssi is trying to be too smart. This will be fixed in future, but for now you should use <code>/DISCONNECT</code> and <code>/CONNECT</code>.</p>
 
-<p>A: Irssi is trying to be too smart. This will be fixed in future, but for
-now you should use <code>/DISCONNECT</code> and <code>/CONNECT</code>.</p>
+<h3 id="q-i-connected-to-some-server-which-isnt-responding-but-now-irssi-tries-to-connect-back-to-it-all-the-time-how-can-i-stop-it">Q: I connected to some server which isn’t responding but now irssi tries to connect back to it all the time! How can I stop it?</h3>
 
+<p>A: Two ways. The “good way” to do it is with <code>/DISCONNECT</code>. Check the server tags first with <code>/SERVER</code> without giving it any parameters, reconnections are those that have tag starting with “recon” text. So most probably you’re going to do <code>/DISCONNECT recon-1</code>. The other way is to remove all the reconnections with <code>/RMRECONNS</code>, easier but may remove some connections you actually wanted to reconnect (if you used multiple servers..).</p>
 
-<h3>Q: I connected to some server which isn't responding but now irssi tries
-to connect back to it all the time! How can I stop it?</h3>
+<h3 id="q-how-do-i-add-seconds-to-timestamp">Q: How do I add seconds to timestamp?</h3>
 
-<p>A: Two ways. The "good way" to do it is with <code>/DISCONNECT</code>.
-Check the server tags first with <code>/SERVER</code> without giving it any
-parameters, reconnections are those that have tag starting with "recon"
-text. So most probably you're going to do <code>/DISCONNECT recon-1</code>.
-The other way is to remove all the reconnections with
-<code>/RMRECONNS</code>, easier but may remove some connections you actually
-wanted to reconnect (if you used multiple servers..).</p>
+<p>A: <code>/FORMAT timestamp {timestamp %%H:%%M:%%S}</code> - and remember to add the trailing space :)</p>
 
+<h3 id="q-why-does-irssi-say-irssi-channel-not-fully-synchronized-yet-try-again-after-a-while-when-i-try-to-use-ban-etc">Q: Why does irssi say “Irssi: Channel not fully synchronized yet, try again after a while” when I try to use /BAN etc?</h3>
 
-<h3>Q: How do I add seconds to timestamp?</h3>
+<p>A: Possibly a bug in irssi, or ircd you’re using does something that irssi didn’t really notice. The new code should make this happen far less often than before, but one known reason for this is when irssi doesn’t notice that you were unable to join some channel. Currently however I don’t know of any such events irssi doesn’t know about.</p>
 
-<p>A: <code>/FORMAT timestamp {timestamp %%H:%%M:%%S}</code> - and remember
-to add the trailing space :)</p>
-
-
-<h3>Q: Why does irssi say "Irssi: Channel not fully synchronized yet, try
-again after a while" when I try to use /BAN etc?</h3>
- 
-<p>A: Possibly a bug in irssi, or ircd you're using does something that
-irssi didn't really notice. The new code should make this happen far less
-often than before, but one known reason for this is when irssi doesn't
-notice that you were unable to join some channel. Currently however I don't
-know of any such events irssi doesn't know about.</p>
-
-<p>Anyway, if this does happen, do <code>/RAWLOG SAVE ~/rawlog</code> soon
-after joining to channel, and either try to figure out yourself why irssi
-didn't get reply to WHO request, or send the whole log to cras@irssi.org. Note
-that the rawlog is by default only 200 lines and it may not be enough to
-show all needed information, so you might want to do <code>/SET rawlog_lines
-1000</code> or so.</p>
+<p>Anyway, if this does happen, do <code>/RAWLOG SAVE ~/rawlog</code> soon after joining to channel, and either try to figure out yourself why irssi didn’t get reply to WHO request, or open a Github issue with the full log included. Note that the rawlog is by default only 200 lines and it may not be enough to show all needed information, so you might want to do <code>/SET rawlog_lines 1000</code> or so.</p>
 
 <p><code>MODE +b</code> still works fine though.</p>
 
+<h3 id="q-wheres-the-gui-version">Q: Where’s the GUI version?</h3>
 
-<h3>Q: Where's the GUI version?</h3>
+<p>A: There was one on <a href="https://github.com/irssi-import/xirssi">irssi-import/xirssi</a> but it has not been maintained for a long time.</p>
 
-<p>A: Read
-<a href="http://www.irssi.org/about">http://www.irssi.org/about</a></p>
+<h3 id="q-how-do-i-autorejoin-channels-after-being-kicked">Q: How do I autorejoin channels after being kicked?</h3>
 
+<p>A: That’s evil and you shouldn’t do it. If you get kicked, you should stay out, at least until the channel forgot you existed :) Most channels I’ve joined just ban you if you autorejoin after kick. If you’re joined to channels who kick people for fun, try changing channels or something.</p>
 
-<h3>Q: How do I autorejoin channels after being kicked?</h3>
+<p>Anyway, if you REALLY want to do that, and you understand that you’re doing evilness, you can use the autorejoin.pl script that comes with irssi. You’ll still need to specify the channels you wish to rejoin with <code>/SET autorejoin_channels #chan1 #chan2 ...</code></p>
 
-<p>A: That's evil and you shouldn't do it. If you get kicked, you should stay
-out, at least until the channel forgot you existed :) Most channels I've
-joined just ban you if you autorejoin after kick. If you're joined to
-channels who kick people for fun, try changing channels or something.</p>
+<h3 id="q-how-do-i-announce-that-im-awayback-in-all-channels-ive-joined-or-how-do-i-change-my-nick-when-setting-myself-awayback">Q: How do I announce that I’m away/back in all channels I’ve joined? Or how do I change my nick when setting myself away/back?</h3>
 
-<p>Anyway, if you REALLY want to do that, and you understand that you're doing
-evilness, you can use the autorejoin.pl script that comes with irssi. You'll
-still need to specify the channels you wish to rejoin with <code>/SET
-autorejoin_channels #chan1 #chan2 ...</code></p>
+<p>A: That’s even worse than autorejoin. Who could possibly care every time you come and go? Many channels will kick you for using this, and I for example have added several ignores so I’d never need to see these messages. Learn to use <code>/AWAY</code> command properly and tell its existence to people who don’t know about it. <code>/WII yournick</code> shows your away reason much better for people who actually want to know if you’re there or not.</p>
 
+<h3 id="q-why-does-irssi-autojoin-on-invite-by-default">Q: Why does irssi autojoin on invite by default?</h3>
 
-<h3>Q: How do I announce that I'm away/back in all channels I've joined? Or
-how do I change my nick when setting myself away/back?</h3>
+<p>A: The setting is /SET join_auto_chans_on_invite - it’s not the same as regular autojoin-on-invite, which irssi doesn’t even have. The only channels that are joined on invite, are the ones you’ve added to config with /CHANNEL ADD -auto. This is very useful with +i channels when you need to first send an invite request to bot, or if you get accidentally kicked from channel, the kicker can invite you back immediately.</p>
 
-<p>A: That's even worse than autorejoin. Who could possibly care every time 
-you come and go? Many channels will kick you for using this, and I for example
-have added several ignores so I'd never need to see these messages. Learn to
-use <code>/AWAY</code> command properly and tell its existence to people
-who don't know about it. <code>/WII yournick</code> shows your away reason
-much better for people who actually want to know if you're there or not.</p>
+<p>I don’t see any bad side effects with this feature, so it’s ON by default. I guess someone could start kicking/inviting you all the time but server connection shouldn’t drop because of that, and you shouldn’t join channels whose operators are that evil.</p>
 
+<h3 id="q-how-to-make-utf-8-support-work-with-irssi">Q: How to make UTF-8 support work with irssi?</h3>
 
-<h3>Q: Why does irssi autojoin on invite by default?</h3>
+<p>A: Make sure your terminal supports UTF-8 (for example, <code>xterm -u8</code>). If you use screen, you may have to do <code>screen -U</code>. And in Irssi do <code>/SET term_charset utf-8</code>. (for 0.8.9 and older: <code>/SET term_type utf-8</code>)</p>
 
-<p>A: The setting is /SET join_auto_chans_on_invite - it's not the same
-as regular autojoin-on-invite, which irssi doesn't even have. The only
-channels that are joined on invite, are the ones you've added to config
-with /CHANNEL ADD -auto. This is very useful with +i channels when you
-need to first send an invite request to bot, or if you get accidentally
-kicked from channel, the kicker can invite you back immediately.</p>
+<h3 id="q-will-there-be-detach-like-feature">Q: Will there be /DETACH-like feature?</h3>
 
-<p>I don't see any bad side effects with this feature, so it's ON by
-default. I guess someone could start kicking/inviting you all the time
-but server connection shouldn't drop because of that, and you shouldn't
-join channels whose operators are that evil.</p>
+<p>A: <a href="http://tmux.github.io/">tmux</a>, <a href="http://www.gnu.org/software/screen/screen.html">screen</a> and <a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
 
+<h3 id="q-how-do-i-run-scripts-automatically-at-startup">Q: How do I run scripts automatically at startup?</h3>
 
-<h3>Q: How to make UTF-8 support work with irssi?</h3>
+<p>A: Put them into <code>~/.irssi/scripts/autorun/</code> directory. Or better would be if you placed them in <code>~/.irssi/scripts/</code> and created symlinks to autorun directory (eg. <code>cd ~/.irssi/scripts/autorun/ ; ln -s ../script.pl .</code>)</p>
 
-<p>A: Make sure your terminal supports UTF-8 (for example, <code>xterm -u8</code>).
-If you use screen, you may have to do <code>screen -U</code>. And in Irssi do
-<code>/SET term_charset utf-8</code>. (for 0.8.9 and older: <code>/SET term_type utf-8</code>)</p>
+<h3 id="q-how-do-i-execute-commands-automatically-at-startup">Q: How do I execute commands automatically at startup?</h3>
 
+<p>A: Put them into <code>~/.irssi/startup</code> file, each command on its own line. The preceding slash (/) is not necessary.</p>
 
-<h3>Q: Will there be /DETACH-like feature?</h3>
+<h3 id="q-how-do-i-easily-edit-existing-topic">Q: How do I easily edit existing topic?</h3>
 
-<p>A: Maybe. Detach code already is there, attach is just missing :) But I
-don't have much interest in coding it,
-<a href="http://www.gnu.org/software/screen/screen.html">screen</a> and
-<a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
+<p>A: <code>/TOPIC &lt;tab&gt;</code></p>
 
+<h3 id="q-how-can-i-have-whois-replies-to-active-window">Q: How can I have /WHOIS replies to active window?</h3>
 
-<h3>Q: How do I run scripts automatically at startup?</h3>
+<p>A: You can disable the status window, or do <code>/WINDOW LEVEL -CRAP</code> in it which would also make several other messages show up in active window. You can also use a <a href="http://dgl.cx/irssi/hack-whois-in-current-window.pl">script</a>.</p>
 
-<p>A: Put them into <code>~/.irssi/scripts/autorun/</code> directory. Or
-better would be if you placed them in <code>~/.irssi/scripts/</code> and
-created symlinks to autorun directory (eg. <code>cd
-~/.irssi/scripts/autorun/ ; ln -s ../script.pl .</code>)</p>
+<h3 id="q-how-do-i-add-the-active-network-to-the-statusbar">Q: How do I add the active network to the statusbar</h3>
 
+<p>A: Modify the window-line in statusbar section in config file to <code>window = "{sb $winref:$tag/$T{sbmode $M}}";</code></p>
 
-<h3>Q: How do I execute commands automatically at startup?</h3>
-
-<p>A: Put them into <code>~/.irssi/startup</code> file, each command on its
-own line. The preceding slash (/) is not necessary.</p>
-
-
-<h3>Q: How do I easily edit existing topic?</h3>
-
-<p>A: /TOPIC &lt;tab&gt;</p>
-
-<h3>Q: How can I have /WHOIS replies to active window?</h3>
-
-<p>A: You can disable the status window, or do <code>/WINDOW LEVEL
--CRAP</code> in it which would also make several other messages show up in
-active window. You can also use a
-<a href="http://dgl.cx/irssi/hack-whois-in-current-window.pl">script</a>.</p>
-
-<h3>Q: How do I add the active network to the statusbar</h3>
-
-<p>A: Modify the window-line in statusbar section in config file to
-<code>window = "{sb $winref:$tag/$T{sbmode $M}}";</code></p>
+<h3 id="q-how-to-pronounce-irssi">Q: How to pronounce Irssi?</h3>
 
+<p>A: Check <a href="https://irssi.org/assets/irssi.wav">here</a></p>
diff --git a/docs/startup-HOWTO-rus.html b/docs/startup-HOWTO-rus.html
deleted file mode 100644
index 595d1df0..00000000
--- a/docs/startup-HOWTO-rus.html
+++ /dev/null
@@ -1,846 +0,0 @@
- <h2>Startup HOWTO</h2>
-
- <h3>�������� � Irssi (� �� IRC ..)</h3>
-
- <p>&copy; 2000-2002 by Timo Sirainen, ���������������� ��� ���������
-    <a href="http://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1.<br/>
-	�� ������� ���� ���������� NiXoiD'�� (#xakep @ irc.wenet.ru)
-	</p>
-
-
-<p>���������� � ���������� ��������� �� FAQ, �� ������� ������ ����� � ����������:</p>
-
-<ol>
-<li><a href="#c1">��� �������</a>
-    <ul>
-    <li>���������� ������, ����������� ircII</li>
-    </ul></li>
-<li><a href="#c2">������ ����������������� ����������</a>
-    <ul>
-    <li>������ � "������������" ������ (� ��� ����ף� "split windows")</li>
-    <li>��� � ���� ����� ������������� ����� ������?</li>
-    <li>�� alt-1 �.�.�. �� ��������!</li>
-    </ul></li>
-<li><a href="#c3">��������� �� ������ � �������</a>
-    <ul>
-    <li>��� ������������� ������������ � �������� ��� �������?</li>
-    <li>��� ������������� �������� �� ������?</li>
-    <li>��� ������������� ��������� ������� ��� �����������?</li>
-    </ul></li>
-<li><a href="#c4">��������� ���� � �������������� �������������� �� ��� �������</a></li>
-<li><a href="#c5">���� status � msgs &amp; ������ ���������</a>
-    <ul>
-    <li>� ���� ����� ����� �� /WHOIS ��������� � ������� ����</li>
-    <li>� ���� ����� ��� ��������� ���������� � ����� ����</li>
-    </ul></li>
-<li><a href="#c6">��� � irssi �������� �������������� ���������</a>
-    <ul>
-    <li>� ����������� � �������, ������� �� �������� � ������ irssi �������� ������������ � ���� ����� � �����. ��� ��� ���������� ���??</li>
-    <li>� ���� ��������� ���� ������� � ��������� ��� ������� �������</li>
-    </ul></li>
-<li><a href="#c7">������� /LASTLOG � ��������� ����</a>
-    <ul>
-    <li>��� ��������� ���� ����� �� ���� � ����?</li>
-    </ul></li>
-<li><a href="#c8">������� �����</a></li>
-<li><a href="#c9">��������� ������������ ���������</a>
-    <ul>
-    <li>��� � ���� ��������� F1 ������ ���-��?</li>
-    </ul></li>
-<li><a href="#c10">������ � ��������</a>
-    <ul>
-    <li>��� ����� irssi-proxy?</li>
-    </ul></li>
-<li><a href="#c11">��������� Irssi</a></li>
-<li><a href="#c12">���������</a>
-    <ul>
-    <li>� �������� ������ ��� ����������, �� ��� ����� �� �����!</li>
-    </ul></li>
-</ol>
-
-<h3><a id="c1">1. ��� �������</a></h3>
-
-<p>��������� �������� �������� �� ���������:</p>
-
-<p>���� �� �������� ����� � �� �� ����������� ������������ VT-������������� ��������, �� ������ �������:</p>
-
-<pre>
-/SET term_force_colors ON
-</pre>
-
-<p>���� �� ������ ����� ��� ��������� ���������� � ����� ����:</p>
-
-<pre>
-/SET autocreate_own_query OFF
-/SET autocreate_query_level DCCMSGS
-/SET use_status_window OFF
-/SET use_msgs_window ON
-</pre>
-
-<p>����� ���� ������������� �� ����������� ����� �� ��������� �����(<code>/PART</code>)��� ������
-(<code>/UNQUERY</code>):</p>
-
-<pre>
-/SET autoclose_windows OFF
-/SET reuse_unused_windows ON
-</pre>
-
-<p>����� ���������� ������ � irssi ���� ������ �� ircII ������� ��� �������:</p>
-
-<pre>
-/SET autocreate_own_query OFF
-/SET autocreate_query_level NONE
-/SET use_status_window OFF
-/SET use_msgs_window OFF
-/SET reuse_unused_windows ON
-/SET windows_auto_renumber OFF
-
-/SET autostick_split_windows OFF
-/SET autoclose_windows OFF
-/SET print_active_channel ON
-</pre>
-
-<p>��� ������ ���������� ��������:</p>
-
-<p>(���� OFTC, ������������������ ����� nickserv � ����� 2 ������� ����� ������� �� ������)</p>
-
-<pre>
-/IRCNET ADD -autosendcmd "/^msg nickserv identify pass;wait 2000" OFTC
-</pre>
-
-<p>������ ���������� ���������� �������� � ������ ����� (IRC-���� ��� ��� ��� �����������),
- irc.kpnqwest.fi ������������ �� ������� ��� IRCNet �� ���� �� �� ��������, �� irssi ����� �������� ������������ � 
-irc.funet.fi:</p>
-
-<pre>
-/SERVER ADD -auto -ircnet ircnet irc.kpnqwest.fi 6667
-/SERVER ADD -ircnet ircnet irc.funet.fi 6667
-/SERVER ADD -auto -ircnet efnet efnet.cs.hut.fi 6667
-</pre>
-
-<p>��������� �� ������ ��� ����������� � ������� � ��-������ ���� ��� ������ �� efnet/#irssi:</p>
-
-<pre>
-/CHANNEL ADD -auto #irssi ircnet
-/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
-</pre>
-
-����� ������, ���������� ��� ��� ��������������:
-
-<pre>
-/HILIGHT ���_���
-</pre>
-
-<h3><a id="c2">2. ������ ����������������� ����������</a></h3>
-
-<p>��� ���������� ����������� ���� ����������� PgUp � PgDown. ���� ��� �� ��������, ����������� ������ Meta-p � Meta-n.
- ����� ����������� � ������ ��� ����� ������ ����������� ������� <code>/SB HOME</code> � <code>/SB END</code>.</p>
-
-<p>�� ��������� irssi ���������� ��� ����� "������� ����". ������� ���� ��������� ������ ��� ����� �� ��������(<code>/JOIN</code>) �� ����� ��� �������� ������(<code>/QUERY</code>)
-� ���-��. ���� ��������� �������� ������������ ����� ����� ������:</p>
-
-<pre>
-Meta-1, Meta-2, .. Meta-0 - ������������ ����� ������ 1-10
-Meta-q .. Meta-o          - ������������ ����� ������ 11-19
-/WINDOW &lt;�����&gt;          - ������������ �� ���� � �������� �������
-Ctrl-P, Ctrl-N            - ������������ � �����������/���������� ����
-</pre>
-
-<p>���������� ������ ������������ - ��� Meta-�����. ��� ����� Meta? 
-��� ��������� ���������� ��� ALT. ���� � ��� windows-����������� ����������, �� ��� ���-�� ����� ���� ����� ������ windows. ���� ��� �� ��������, �� ��� �������� ��������� ��������� X-�������
-(��� �������� ��� � xterm ��� � � rxvt):</p>   
-
-<pre>
-XTerm*eightBitInput:   false
-XTerm*metaSendsEscape: true
-</pre>
-
-<p>� rxvt �� ���-�� ������ ������� ����� ������ ������������� ������ meta, ��� ��� ���� �� ������ ������������ Alt ������ Win �������� ��� � ���� � ���������:</p>
-
-<pre>
-rxvt*modifier: alt
-</pre>
-
-<p>�� ���-�� ������ ������� ��� ��� ������ xmodmap:</p>
-
-<pre>
-xmodmap -e "keysym Alt_L = Meta_L Alt_L"
-</pre>
-
-<p>��� ���-�� ���������� ��� X-�������? ��� Debian'�, ��� ����
-<code>/etc/X11/Xresources/xterm</code>, � ������� �� ������ �� �������� � ��� ����� ������������� �������� ��� ������ �����. ����� <code>~/.Xresources</code> � 
-<code>~/.Xdefaults</code> ���-�� ������ ��������. ���� ������ �� ������������������ �� ��������, �� ������ ���������� �� � <code>~/.Xresources</code>
-� ��������� �������� <code>xrdb -merge ~/.Xresources</code>. 
-��������� �������� ����������� ������ � ������ ���������� ���������.</p> 
-
-<p>������ SSH ������� ��� Windows ��� �� �� ��������� ������������ ������ ALT. ���������� ������, ������� ��������� ������ ��� -  putty, �� ������ ������� ��� �
-<a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/">
-http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>.</p>
-
-<p>���-�� ������������ ���������� ����. ��� �������, ������� ��������� ��� �������:</p>
-
-<pre>
-/WINDOW NEW                    - ������� ����� ����������� ����
-/WINDOW NEW HIDE               - ������� ����� ������� ����
-/WINDOW CLOSE                  - ������� ����������� ��� ������� ����
-
-/WINDOW HIDE [&lt;number&gt;|&lt;name&gt;] - ������� ����������� ���� �������
-/WINDOW SHOW &lt;number&gt;|&lt;name&gt;   - ������� ������� ���� �����������
-
-/WINDOW SHRINK [&lt;lines&gt;]       - ��������� �������� ����
-/WINDOW GROW [&lt;lines&gt;]         - ��������� �������� ����
-/WINDOW BALANCE                - �������������� ������� ���� ����������� ����
-</pre>
-
-<p>�� ��������� Irssi ���������� "������������ ����". ��� �������������, ��� ����, ��������� ������ ������������ ���� �� ����� ���� ���������� ��� ���������� ������ :). �������� � ��� ����� ���� ��������� ������������ ����:</p>
-
-<pre>
-Split window 1: win#1 - Status window, win#2 - ���� ���������
-Split window 2: win#3 - ircnet/#channel1, win#4 - ircnet/#channel2
-Split window 3: win#5 - efnet/#channel1, win#6 - efnet/#channel2
-</pre>
-
-<p>����� �� � ���� win#1 ��������� ALT-6, irssi ������������� �� ����������� ����
-#3 � ���������� ����� efnet/#channel2 � �������� ����.</p>
-
-<p>��� "��������̣����" �������� ���� �� ����� ������� ����� � ������������ ������ 
-� ������� ALT-6 � ���� win#1 ���������� ���� win#6 � ����������� ���� 1
-� ������ ��� ��������, ���������� ����� ���� ����� ���� win#6 ��� ������ � �����-�� ������
-����������� ����, irssi ������ ������������� � ����� ������������ ����. ����� ����� ������������ ����� ������ ����������� � ircII � ���� �� ��� ���������� �� �� ������ �������������� ��� ��� ������ �������</p>
-
-<pre>
-/SET autostick_split_windows OFF
-</pre>
-
-<p>������ ���� ������ ���� ����� ��������� ����� �������, �������� � ������ "�����". ���� �� ������ �� ������ ����, �� �� ������ �������� �� ��������</p>
-
-<pre>
-/SET autocreate_windows OFF		[format c: ��ģ���� ;) - ����. �����.]
-</pre>
-
-<p>� ���� �� ������� ��� ������ � ����� ����, �� ��� �������� ��������� ����� ��� ������ ���������� � ������ ���������:</p>
-
-<pre>
-/SET print_active_channel ON
-</pre>
-
-<p>���� �� ������ ������������� � �����-�� ���� ������ ��������� ������ ��� �������, �� ����������� ��� �������:</p>
-
-<pre>
-/JOIN -window #channel
-/QUERY -window nick
-</pre>
-
-<h3><a id="c3">3. ��������� �� ������ � �������</a></h3>
-
-<p>� Irssi �������������� ��������� ���� ����� ������� :). ���� ���� �� ������ �������� ������ � ����� ����, �� ����� ������ ������������� ��� ������� ���� ���� � ���� ������ �.�. ��� �������� � ������ ������������� ���������� � ������� �������� � � ��������� ������ ������� :). 
-�������������� ���������� �� ����������� ������������� �������������� ��������� �������� � ����� 6.</p>
-
-<p>��� ������ ��� ����� ���������� ���� IRC-����, ��� ����� ����������� ������� <code>/IRCNET</code>,
-����� ��������, ��� ��� �ݣ �� �����������. ���� ��� �� �����������, �� ������� <code>/IRCNET ADD
-���_����</code>. ���� �� ������, ����� �����-�� ������� ������������� ����������� ��� ����������� � ���� ����, �� �������������� ������ <code>-autosendcmd</code>.
-��� ��������� �������:</p>
-
-<pre>
-/IRCNET ADD -autosendcmd '^msg bot invite' ircnet
-/IRCNET ADD -autosendcmd "/^msg nickserv identify pass;wait 2000" OFTC
-</pre>
-
-<p>����� ����� �� ������ �������� � ���� ���� �������. ��������:</p>
-
-<pre>
-/SERVER ADD -auto -ircnet ircnet irc.kpnqwest.fi 6667
-/SERVER ADD -auto -ircnet worknet irc.mycompany.com 6667 ������
-</pre>
-
-<p>����� <code>-auto</code> ���������, ��� � ����� ������� ����� ������������� ������������ ��� �������. 
-�� �� ������ �������� ������ ������� ���-�� ���� ������ <code>-auto</code> - Irssi ������������� � ��� �����������, ���� ������ ���������� <code>-auto</code> ����������.</p>
-
-<p>� ������� ������:</p>
-
-<pre>
-/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
-/CHANNEL ADD -auto #secret ircnet password
-</pre>
-
-<p>����� <code>-bots</code> � <code>-botcmd</code> ������� ���������� ���������. 
-��� ������������ ��� ����, ����� ������������� ������ ������� ���� ��� ������ �� �����, 
-������ ��� ��������������� ��������� ���. �� ������ ������ ����� ����� ����� ��� ������ ����� 
-<code>-bots</code>, ����������� ��������� (�� �������� ����� ��� ������ � �������). ���������� $0 � ����� 
-<code>-botcmd</code> ��������� �� ������� ���� � ������ ���������. ���� �� �� ������ ������������ ����� ��� ����� (�������� ���� ��� ������ ����� ��� ����� �����) 
-�� ������ ������� ������ ����� <code>-botcmd</code> � �������.</p>
-
-<h3><a id="c4">4. ��������� ���� � �������������� �������������� ��� �������</a></h3>
-
-<p>��� ������ �������� ������ ����(������������ � ������ ��������, ������� �.�.�.). 
-��� ����������� ���� ����������� ��������� �������:</p>
-
-<pre>
-/WINDOW MOVE LEFT/RIGHT/�����    - ����������� ���� �����, ������ ��� �� ��������� �����
-/WINDOW ITEM MOVE &lt;�����&gt;|&lt;���&gt; - ����������� ����� ��� ������ � ������ ����
-</pre>
-
-<p>����� �ӣ �������� ���, ��� �� ������, ����������� ������� <code>/LAYOUT SAVE</code>
- (� <code>/SAVE</code>, ���� �� �������� ��������������) � ����� �� � ��������� ��� ��������� irssi, �� �� �������� ������� ����������� ����. 
- ��� "�����������" �� ��������, ��� ������������� ������� <code>/LAYOUT SAVE</code> ����� ��������� � ��������������� ����������� � �������� � ������ �� ������, 
- ��� ����� �� ������ ������������ ������� <code>/SERVER ADD -auto</code> � <code>/CHANNEL ADD -auto</code>.</p>
-
-<p>����� �������� ����������� ��������� ����, ���������� �� � ������ ������� � ������ ������� ������� <code>/LAYOUT SAVE</code>. 
-����� �������� ��������� ����������� ������� <code>/LAYOUT RESET.</code></p>
-
-
-<h3><a id="c5">5. ���� status � msgs &amp; ������ ���������</a></h3>
-
-<p>�� ��������� "�������������� ���������" ��������� � ���� �������. ��� ��������������� ��������������� ���������, ������� �� ����������� �� � ������ ������ ��� �������(�������� ctcp-�������). 
-��������� ����� ��� ����������, ��� ��� ���� �� ������ �� ������, �� �������</p>
-
-<pre>
-/SET use_status_window OFF
-</pre>
-
-<p>���� �������� ���������� ������ ����� ����������� irssi. ���� �� ������ ������� �� ����������, �� ������ �������� ����(<code>/WINDOW CLOSE</code>).</p>
-
-<p>������ �������� ���� - ��� "���� ���������", ���� ���� ��� ��������� �������. 
-�� ��������� ��� ��������� � ������ ����� ��� ������� ������� ��������� ����� ����. ����� ��� ��������� ������� ��� � ���� ���� ����������� �������:</p>
-
-<pre>
-/SET use_msgs_window ON
-/SET autocreate_query_level DCCMSGS  (��� ���� �� ���-�� �� ������
-	 ��������� ����� ���� ��� DCC-���� �������� NONE)
-</pre>
-
-<p>���� �������� ���-�� �� ����� ������������ �� ����������� irssi. ����� ��������� ��� ���������� �������:</p>
-
-<pre>
-/WINDOW NEW HIDE     - ������� ����
-/WINDOW NAME (msgs)  - ������������� ��� � "(msgs)"
-/WINDOW LEVEL MSGS   - ������������� ��� ��������� ��������� � ��� ����
-/WINDOW MOVE 1       - ������� ��� ���� ������ � ������
-</pre>
-
-<p>������, ��� �� use_msgs_window, �� use_status_window �� ����� �������� ���� ������������ ������� <code>/LAYOUT SAVE</code>.</p>
-
-<p>������ �� ������� � ������� ���������.. ��� ���? ��� ���������, ������� ������� irssi ����� ���� ��� ������ 
-"������� ���������". ��� �������� ������: PUBLIC - ��� ��������� �� �������, 
-MSGS - ��� ��������� ��������� � CRAP ��� ��������� ���������, ������� ������ ����������������. �� ������ �������� ������ ������ ������� ��� ������ �������</p>
-
-<pre>
-/HELP levels
-</pre>
-
-<p>���� ������� �������� ������� <code>ALL -MSGS</code>, ������� �������������, ��� ��� ���������, 
-�������� ���������, ��� ������� �� ��������� ������ ����� ���� � ��� ����. ��������� ����� <code>-MSGS</code> ��� �� ����������� � ����� ���������.</p>
-
-
-<h3><a id="c6">6. ��� � irssi �������� �������������� ���������</a></h3>
-
-<p>� ircII � ��������� ������ IRC-�������� �������������� ��������� ����������� � ���� ��������� ������� � �������� � ������ ����
-. � IRSSI ���. ��� ������� ����� ����� ����� � ��������. �� ������ ������������ � ������ �������� ������������ � ��������� ��� ����� �� ������ ����, ��� �������� �� ������ �� ������ �� ��� 
-� ����� ����, ���� �� ������������� ����� ������. ��� ���� ������� �� ������ ������������ � ������ �������, �� �������� �������� ����������:</p>
-
-<pre>
-/CONNECT irc.server.org
-</pre>
-
-<p>������ ������� <code>/SERVER</code>, ������� ��������� ������������
-����������. ����� ���������� ������ �������������� ���������� ����������� ������� <code>/SERVER</code>
-��� ����������. �� ������� �������� ���������:</p>
-
-<pre>
--!- IRCNet: irc.song.fi:6667 (IRCNet)
--!- OFTC: irc.oftc.net:6667 (OFTC)
--!- RECON-1: 192.168.0.1:6667 () (02:59 left before reconnecting)
-</pre>
-
-<p>����� �����, ��� �� ���������� � ����� IRCNet � OFTC.
-������� IRCNet � ������ �������� "������ �������" � 
-(IRCnet) � ����� ���������� ��������������� IRC-����. ����� ������� ������������� ����������� �����, ������� ������ ��������� � ��������� ����.
-����� IRC-���� �� �������� ��� �����-�� ����� ����� �������.
-����� ������������ ��������� ���������� � ����� ����� ��� ��������, irssi
-��������� ����� ����� �����, ��� ��� ��� ����� ���� ircnet, ircnet2, ircnet3
-�.�.�.</p>
-
-<p>����� �������, ������������ � <code>RECON-</code> ���������� ���������������. 
-� ��������������� ������� �� �����, ��� ����������� � ������� 192.168.0.1 ���� ��������� � 
-irssi ��������� ������������ ������ ����� 3 ������.</p>
-
-<p>����� ����������� �� ������� ����������� ��������� �������:</p>
-
-<pre>
-/DISCONNECT ircnet   - ����������� �� ������� � ������ "ircnet"
-/DISCONNECT recon-1  - ���������� ������� ��������������� � ������� RECON-1
-/RMRECONNS           - ���������� ��� ������� ���������������
-
-/RECONNECT recon-1   - ���������� ����������� ���������������� � RECON-1
-/RECONNECT ALL       - ���������� ����������� ���������������� �� ���� ��������
-					� ������� �� �����������
-</pre>
-
-<p>������, ����� �� ���������� �� ���� �������� �� ������ ����� ��� ������� ����� �� ��� �� ������ ������������. 
-������������ ������ - ��� ����� ������ ���� �������� ���� �������. � ��� �� ������ ������� ����� ������ ������ ������� ��������</p>
-
-<pre>
-/WINDOW SERVER tag    - ������� ������ � ������ "tag" ��������
-Ctrl-X                - ������� ��������� � ������ ������ ��������
-</pre>
-
-<p>����� ������ �������� �� ������ ��������� ��� ������������. ����� �� ���������� � ���������� ��������, irssi ��������� ������� [�����_�������] 
-�� ���� ����������, �� ����������� � ������ ��� ������� ��� ��� �� ������ ����� � ������ ������� ��� ������.</p>
-
-<p>��������� ������� ���-�� ��������� ������������ ����� <code>-�����_�������</code> 
-����� ������� ��� ������ ������� �� ������ ţ ������������:</p>
-
-<pre>
-/MSG -����� ��� ���������
-/JOIN -����� #�����
-/QUERY -����� ���
-</pre>
-
-<p>�������������� ������� <code>/MSG</code> ���-�� ������������� ��������� ����� �������
- ����� ��� �� �� �������� �������.</p>
-
-<p>���� ������� ����� ������� ������̣����. ����� ��� ����������, �� ��� ������� ������������� �� ������������ �� �����-�� ������, � ���� ��������� ���������� �� �������, 
-�� ��� �� ����� ����� ��������� �������. ����� � ������� ����� ����������� �����������,
-�� �� ������������� ���������� �������� � ���� ����. ����� ��������� ���� ������� ����������� ��������� �������:</p>
-
-<pre>
-/WINDOW SERVER -sticky tag
-</pre>
-
-<p>��� ������� ���� �� ������ ����� ��������� ���� ������� � ��������� ��� ������� �������. ��� ��� ��� ����� ������� (��������� ��� ������� �������):</p>
-
-<pre>
-/WINDOW NEW HIDE
-/WINDOW NAME (status)
-/WINDOW LEVEL ALL -MSGS
-/WINDOW SERVER -sticky ircnet
-
-/WINDOW NEW HIDE
-/WINDOW NAME (msgs)
-/WINDOW LEVEL MSGS
-/WINDOW SERVER -sticky ircnet
-</pre>
-
-<h3><a id="c7">7. ������� /LASTLOG � ��������� ����</a></h3>
-
-<p>������� <code>/LASTLOG</code> ����� ���� ������������ ��� ������ ������ � ������ ����. ��� ���������� ������� ţ �������������:</p>
-
-<pre>
-/LASTLOG �����    - ������� ��� ������, ���������� "�����"
-/LASTLOG word 10  - ������� ��������� 10 �����, ���������� "word"
-/LASTLOG -topics  - ������� ��� ��������� ������
-</pre>
-
-<p>���� ����������� ������ ������ ����� ����� 1000 �����, �� irssi �����������, ��� �� ��������� ������ � ������� �� ������ � ������ <code>-force</code>. 
-����� ��������� ���������� ������ ���� � ����, ����������� ��������� �������:</p>
-
-<pre>
-/LASTLOG -file ~/irc.log
-</pre>
-
-<p>��� ������������� ����� <code>-file</code> ����� <code>-force</code> 
-�� ���������. � ������� <code>/LASTLOG</code> ���� ����� ������ �����. ����� �������� ����� ��������� ������� �� ��� ����������� <code>/HELP lastlog</code>.</p>
-
-<p>����� �� ����� �������������� ��� ������, ��� ������ ����� ��������� ���������� ������ ����������� � ��� ���������. � Irssi ���� ������� <code>/SCROLLBACK</code> (���
-ţ ������� - <code>/SB</code>) ��� ����������� �� ������ ����.
-������� <code>/LASTLOG</code> ������� ������������ ����� ���������
- � �� ������ ������������ ������� <code>/SB GOTO ��:��</code> ����� "������������" � ����� ��������� ���������.
- ����� ������������� ������� ���� ����������� ������� <code>/SB
-END</code>.</p>
-
-
-<h3><a id="c8">8. ������� �����</a></h3>
-
-<p>Irssi ����� ������������� ����� ��� ���� ������ ��������� ����� �� � ����
-(<code>/AWAY �������</code>). ����� �� ����� �� ����
-(�ݣ ��� ������� <code>/AWAY</code>), ����� ��������� � ����-���� ��������� �� �����.
-�� ������ ��������� ��� ��� ������ ��������� ������:</p>
-
-<pre>
-/SET awaylog_level MSGS HILIGHT     - �������� ����� ��������� ���� ���������� � ���
-/SET awaylog_file ~/.irssi/away.log - �������� ���� ��� ����
-</pre>
-
-<p>���������� ������ ������� ����� ��� ������ Irssi - ��������� ��������. 
-Irssi ����� ����� ���� ���� ��������� � �������� �������.
-�� ������ �������� ��� ��� ������ ��������� �������:</p>
-
-<pre>
-/SET autolog ON
-</pre>
-
-<p>�� ��������� � ���� ������������ ����� �ӣ ����� ������� CTCPS ��� CRAP
-(<code>/WHOIS</code>-������� �.�.�.). �� ������ ������ ������ ���������, ������� ���� ������ � ���� ��������� ��������:</p>
-
-<pre>
-/SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
-</pre>
-
-<p>�� ��������� irssi ����� ��� � ~/irclogs/&lt;�����_�������&gt;/&lt;����&gt;.log.
-��� ������������� ��������� ��������:</p>
-
-<pre>
-/SET autolog_path ~/irclogs/$tag/$0.log (������� "�� ���������")
-</pre>
-
-<p>���� �������� ������� �� ����������, �� �� ������������� ���������. � ���������� $0 
-���������� ����(����� ��� ���). �� ������ ��������� Irssi ���, ����� �� ������������� �������� ����/����� � ����� ����� � �����. 
-������ ���� - "man strftime" :). ��� ������:</p>
-
-<pre>
-/SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
-</pre>
-
-<p>����� ����� ���� ������ �� �����-�� ��������� ������� ��� ����� �������� <code>/HELP
-log</code></p>
-
-
-<h3><a id="c9">9. ��������� ������������ ���������</a></h3>
-
-<p>�� ������ �������� ����� ������������ ���������, � ������� �������� ���� ����� irssi. 
-�� ���� irssi "�����" �� ��� ������������ ���������, �������� �� �� ����� ����������� �� 
-shift-backspace ���� �� ���-�� �� �������������� ��������������� X-�������.</p>
-
-<p>������� <code>/HELP bind</code> ���� ������� ������ ���������� � ������������ ����������, ��� ��������� �����. 
-������ ���������� �������� "���������" �����-�� �� ����������� ������. 
-��� ������� �������� ��� ������� ���������, ��� ��� �� ������ ������ ������ ��� ������ ���� ������� ���� �������. 
-���������� ���� ������ ��� - ��������� � ������� <code>cat</code> � ���������� ��� ����� ��������� ��� ������� ���� �������. 
-��� ������ ������� ������� F1:</p>
-
-<pre>
-[cras@hurina] ~% cat
-^[OP
-</pre>
-
-<p>��� ��� � irssi ����� "������" ���-�� �� F1 �� ������ ������ ������������ ������� <code>/BIND ^[OP /ECHO ������ ������� F1</code>. 
-���� �� ����������� ������ ���������, ������� �� ������� ���������� ������� ����� � ���-�� �������, �� ��� ����� ������������ ���-�� ����� �����:</p>
-
-<pre>
-/BIND ^[OP key F1
-/BIND ^[11~ key F1
-/BIND F1 /ECHO ������ ������� F1.
-</pre>
-
-<h3><a id="c10">10. ������ � ��������</a></h3>
-
-<p>Irssi ������������ ����������� � IRC-�������� ����� ������. ���� �� �ӣ ��������� ��������, �� ��� ����������� ����� �������������� ����� ���� � ��� �� ���� ����� ������� ������� �������������� ������.</p>
-
-<p>��� ������: � ��� ���� �������, ������� ��
-irc.bouncer.org 5000. �� ������ ������������ ��� ��� ����������� � �������� irc.dal.net � irc.efnet.org. ��� ������ �� ������ ������ ��������� �������:</p>
-
-<pre>
-/SET use_proxy ON                      (�������� ������������� ������)
-/SET proxy_address irc.bouncer.org
-/SET proxy_port 5000
-
-/SET proxy_password ���_������
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-</pre>
-
-<p>����� ��� ����� ����� �������� ������ �������. ��� �������� ����� ���-��, ��� ���� �� �� ������ ������������ � ��� ��������:</p>
-
-<pre>
-/SERVER ADD -auto -ircnet dalnet irc.dal.net
-/SERVER ADD -auto -ircnet efnet irc.efnet.org
-</pre>
-
-<p>����� ����, ��� �� ������� ����������������� ��������� ��� ���������� irssi ����� ����������� ����� ������.</p>
-
-<p>���� �� �� ������ ������������ ������ ��� ������-�� �������, �� ��� ��� ���������� ������� ����� 
-<code>-noproxy</code>.</p>
-
-<p><strong>����������� ��������� ��� ������ ����� ������:</strong></p>
-
-<p>������� ���������:</p>
-
-<pre>
-/SET use_proxy ON
-/SET proxy_address &lt;����� ������&gt;
-/SET proxy_port &lt;����&gt;
-</pre>
-
-<p><strong>HTTP proxy</strong></p>
-
-<p>����������� ��� ��������� ��� HTTP-������:</p>
-
-<pre>
-/SET -clear proxy_password
-/EVAL SET proxy_string CONNECT %s:%d\n\n
-</pre>
-
-<p><strong>BNC</strong></p>
-
-<pre>
-/SET proxy_password ���_������
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-</pre>
-
-<p><strong>dircproxy</strong></p>
-
-<p>dircproxy ���������� ����������� � �������� �� �������. ��� ��� ���� �������� �� ������ ������������ � ������� ircnet � ������� ircpass 
-� � OFTC � ������� oftcpass, �� ������ ������� �������� ���������:</p>
-
-<pre>
-/SET -clear proxy_password
-/SET -clear proxy_string
-
-/SERVER ADD -auto -ircnet ircnet fake.ircnet 6667 ircpass
-/SERVER ADD -auto -ircnet OFTC fake.oftc 6667 oftcpass
-</pre>
-
-<p>��� ������� � ����, ������� �� ������� ����� �� ������������, ��� ��� �� ������ ������ ���� �ӣ ��� ������.</p>
-
-<p><strong>psyBNC</strong></p>
-
-<p>psyBNC ����� ���������� �������������� ���������. 
-��� ����� ���������� ��������� ���������� � ��������� ���� ������ ���������� ������ ������ ��� ����������� � ���������� ��������.
-�� ����� ������ ������ ������ ��� ���������� Irssi:</p>
-
-<pre>
-/SET -clear proxy_password
-/SET -clear proxy_string
-
-/IRCNET ADD -user ircnetuser ircnet
-/SERVER ADD -auto -ircnet ircnet fake.ircnet 6667 ircpass
-/IRCNET ADD -user oftcuser OFTC
-/SERVER ADD -auto -ircnet OFTC fake.oftc 6667 oftcpass
-</pre>
-
-<p>����� ��� ������ ������� <code>/IRCNET ADD</code> �� ������� ����� �������������
-� ������ ��� ������ <code>/SERVER ADD</code>.</p>
-
-<p><strong>Irssi proxy</strong></p>
-
-<p>Irssi �������� ���� ����������� ������, ������� �� ������ ������� ��� ������ ����� configure 
-<code>--with-proxy</code>. ����� ţ ������������ �� ������ ��������� irssi ����������.</p>
-
-<p>Irssi-������ ������� ���������� �� ��������� ������-��������, ���������� ������ ������� ����� ���������� � IRC-�������� ����� �� ������ � ���� ������������, �
-<strong>irssi-������ ���������� ��� ������������ ����������(�) ��� ���� ��������</strong>. ��� �ݣ ��������: <strong>�� ������ ������������ ������ ���� ���������� � IRC-�������� ��� ��������������� ����� ��������</strong>.</p>
-
-<p>Irssi-������ ����� ������������ ��������� ���������� � ��������� �� ������ �����, �������� �� 2777-�� ����� � ��� ����� ���� ���������� � ircnet, � �� 2778 � efnet.</p>
-
-<p>������������� �� ������� ������:</p>
-
-<pre>
-/LOAD proxy
-/SET irssiproxy_password &lt;������&gt;
-/SET irssiproxy_ports &lt;IRC_����&gt;=&lt;����&gt; ... (�������� ircnet=2777 efnet=2778)
-</pre>
-<p>�� <strong>������</strong> �������� ��� �������, ������� �� ����������� � ������ �������� � ����� 
-��� ������ ������ <code>/SERVER ADD</code> � 
-<code>/IRCNET ADD</code>. ..����� ��� ���� �� ������ ������������ ������ ���� ����������, �� �� ������ �������:</p>
-
-<pre>
-/SET irssiproxy_ports *=2777
-</pre>
-
-<p>������������� �� ������� �������:</p>
-
-<p>������ ������������ � ������ ��� � ����������� ������� � �������, �������� �������� <code>/SET irssiproxy_password</code>. ������:</p>
-
-<pre>
-/SERVER ADD -ircnet ircnet my.irssi-proxy.org 2777 secret
-/SERVER ADD -ircnet efnet my.irssi-proxy.org 2778 secret
-</pre>
-
-<p>Irssi-������ ���-�� ��������� �������� � ������� irc-���������.</p>
-
-<p><strong>SOCKS</strong></p>
-
-Irssi ����� ���� ������ � ���������� socks-������ (����� configure <code>--with-socks</code>), 
-�� � �� ����� ���� �� ���� ��� ��� ��������. ��������� <code>/SET
-proxy</code> �� ��� ������ ����� �� ���������.
-
-<p><strong>������ ������</strong></p>
-
-<p>IRC-�������� ������ �������� ����� ���-�� ��� � IRC-�������, �� ������ ������. �� ������ ���� �� ��� ��� ������ ��������� �������:</p>
-
-<pre>
-/SET proxy_password &lt;������&gt;
-</pre>
-
-<p>CONNECT-������ �� ���������:</p>
-
-<pre>
-/SET proxy_string CONNECT %s %d
-/SET proxy_string_after
-</pre>
-
-<p>proxy_string ������������ ����� ��������� NICK/USER, � 
-proxy_string_after ������������ ����� ���. %s and %d can be used with both
-of them.</p>
-
-<h3><a id="c11">11. ��������� Irssi</a></h3>
-
-<p>��� ����� �� ���������� ��������� Irssi �� ���������.
-��� ��������� �� ���, ������� �� ������ ����� �������� ��������(� �������� ��������� "�����������" ��������):</p>
-
-<p><strong>���� ��������</strong></p>
-
-<dl>
-<dt>/SET autocreate_own_query ON</dt>
-  <dd>������������� ��������� ���� ������� ����� �� ����������� ����-�� ��������� ��� ������ ������� <code>/MSG</code>.</dd>
-
-<dt>/SET autocreate_query_level MSGS</dt>
-  <dd>��� ��������� ��������� ���� ������� ��������� � ���� ������� ���������. ������ �������� ������ MSGS, DCCMSGS � NOTICES.
-   �� ������ �������� ��� ��� ������ ������� <code>/SET -clear autocreate_query_level</code>.</dd>
-
-<dt>/SET autoclose_query 0</dt>
-  <dd>���� �������� ����� ���� ������������� ������� ����� ��������� "�������". �������� ���� � ���� � �������������� ����������� �� �����������. �������� �������� � ��������.</dd>
-</dl>
-
-<p><strong>����</strong></p>
-
-<dl>
-<dt>/SET use_msgs_window OFF</dt>
-  <dd>��������� ���� ��������� ��� �������. ��� ��������� ��������� ����� ������������ � ��� ����. 
-  ��� ����� ����� ������ ���� �� �������� ������������ ���� ��������. 
-  ��� ���� ���-�� ����� ���� ������� ������� ��� ������ ������� /WINDOW LEVEL
-  MSGS, /WINDOW NAME (msgs).</dd>
-
-<dt>/SET use_status_window ON</dt>
-  <dd>��������� ���� ������� ��� �������. ��� ���������, ������� ������ ������ ��������� ���� ����, ������� /WHOIS �.�.�. 
-  ���� ������� ���� ����� ���� ������� ������� ��� ������ ������ <code>/WINDOW LEVEL ALL -MSGS</code>,
-  <code>/WINDOW NAME (status)</code>.</dd>
-
-<dt>/SET autocreate_windows ON</dt>
-  <dd>���� �� ��� ���������, �� ��� ��������� ����� ���������� � ���� ����</dd>
-
-<dt>/SET autoclose_windows ON</dt>
-  <dd>������������ ���� (�������� ��� ������ � �������(<code>/PART</code>)).</dd>
-
-<dt>/SET reuse_unused_windows OFF</dt>
-  <dd>����� ������ ����� ��� �������� ������ ���� (������ ��� �������) Irssi 
-  ������� �������� ������������ ��� ������������ ������ ����. ���� ��� ����� ��������, �� ������ ����� ����������� ����� ����. 
-  ��� ��������� ������������ ���� autoclose_windows �������.</dd>
-
-<dt>/SET window_auto_change OFF</dt>
-  <dd>������������� ������������� � ������������� ��������� ����.</dd>
-
-<dt>/SET print_active_channel OFF</dt>
-  <dd>����� �� ������� � ����� ���� ������ ��� ���� �����, Irssi ������� ���������, ���������� �� �������� ����� � ����� <code>&lt;���&gt; �����</code>
-  � ��, ��� �������� �� ������ ������ ���: <code>&lt;���:�����&gt; �����</code>. ���� ��� ����� ��������, �� ���������, ���������� �� �������� ����� ����� ���-�� ���������� �� ������ ��������.</dd>
-
-<dt>/SET window_history OFF</dt>
-  <dd>������� ��������� ������� ������ ��� ������� ����.</dd>
-</dl>
-
-
-<p><strong>���������� � ������������</strong></p>
-
-<dl>
-<dt>/SET nick</dt>
-  <dd>��� ���</dd>
-
-<dt>/SET alternate_nick</dt>
-  <dd>��� �������������� ���.</dd>
-
-<dt>/SET user_name</dt>
-  <dd>���� ��� ������������. ���� � ��� ������� ident, �� ��� ������ �� ����.</dd>
-
-<dt>/SET real_name</dt>
-  <dd>���� ��������� ���.</dd>
-</dl>
-
-
-<p><strong>���������� � �������</strong></p>
-
-<dl>
-<dt>/SET skip_motd OFF</dt>
-  <dd>���������� motd ��� ����������� � �������.</dd>
-
-<dt>/SET server_reconnect_time 300</dt>
-  <dd>������� ������ ���� ����� ����� ��������� �������� ����������� � �������.</dd>
-
-<dt>/SET lag_max_before_disconnect 300</dt>
-  <dd>��� ����� ����(� ��������) ���� ����������� �� ������� � ������������� ������� ���������������.</dd>
-</dl>
-
-
-<p><strong>������� ���</strong></p>
-
-<dl>
-<dt>/SET timestamps ON</dt>
-  <dd>���������� ����� ����� ������ ����������.</dd>
-
-<dt>/SET hide_text_style OFF</dt>
-  <dd>������ ���������� ������(������ �����, ����� �.�.�.).</dd>
-
-<dt>/SET show_nickmode ON</dt>
-  <dd>���������� "����� ����" �� �������, ��������
-  <code>&lt;@nick&gt;</code> � ����, <code>&lt;+nick&gt;</code> � ������ �.�.�.</dd>
-
-<dt>/SET show_nickmode_empty ON</dt>
-  <dd>���� � ���� ��� ������ - �������� ������ �� ����� "������� ������".</dd>
-
-<dt>/SET show_quit_once OFF</dt>
-  <dd>���������� quit-��������� ������ � ����� ����, ���� ������� ����� � ���������� �������, �� ������� �� ������.</dd>
-
-<dt>/SET lag_min_show 100</dt>
-  <dd>���������� � ������-���� ��� ���� �� ��������� �������� ����� ������. � ����� ������� 100 ������.</dd>
-
-<dt>/SET indent 10</dt>
-  <dd>���� ������, ������� ���� ������� �� ��������� � ���� ������, �� ��� ����������� � ��������� �� ��������� �������. ���� �������� ���������� ������� ����� ���� ��������� ����� ������� ������ ������ �� ��������� �������. 
-  ��� ����� ���� �������������� � ���������� �������������� ������ ��� ������ ������� <code>%|</code>.</dd>
-
-<dt>/SET activity_hide_targets</dt>
-  <dd>���� �� �� ������ ������ ���������� �� �����-�� ������� ��� ��������, �� ����������� �� �����. �������� <code>#boringchannel =bot1
-  =bot2</code>. ��� ��������� ������������ ���� ����������� ����� ��� ���������, ��� �������� �� ��������� ���������(highlight).</dd>
-</dl>
-
-<p><strong>�������������� �����</strong></p>
-
-<dl>
-<dt>/SET completion_auto OFF</dt>
-  <dd>������������� ��������� ��� ���� ������ ���������� � ������ ���� ���� � "������� ��������������". 
-  ����� ����� ������������ �������������� �����.</dd>
-
-<dt>/SET completion_char :</dt>
-  <dd>"������ ��������������".</dd>
-</dl>
-
-<h3><a id="c12">12. ������ �������</a></h3>
-
-<p>������� <code>/STATUSBAR</code> ������� ������ ������� �������:</p>
-
-<pre>
-Name                           Type   Placement Position Visible
-window                         window bottom    0        always
-window_inact                   window bottom    1        inactive
-prompt                         root   bottom    100      always
-topic                          root   top       1        always
-</pre>
-
-<p><code>/STATUSBAR &lt;���&gt;</code> ������� ��������� ������ ������� � ţ ����������. 
-<code>/STATUSBAR &lt;���&gt; ENABLE|DISABLE</code>
-�������� ��� ��������� ������. <code>/STATUSBAR &lt;���&gt; RESET</code>
-������������� ��� ������ ������� ��������� �� ���������, ��� ���� ��� ���� ������� ����, �� ������� ţ.</p>
-
-<p>������ ����� ����� ��� ����: windows � root - ��� �������������, ��� ��� ����� ���� ����� ��� ���� ���� ��� ������ ��� ������. 
-Placement - ��� ������������ ������: top - ������, bottom - �����. 
-Position - ��� �����, ��� ������ �������� ��������, ��� ���� �� ������ ������������� ������. 
-�������� Visible ����� ��������� 3 ��������: always, active � inactive. ������ active/inactive ������� ������ ��� ����������� ����. 
-��� ��������� ����� ���� �������� ���������� ���������:</p>
-
-<pre>
-/STATUSBAR &lt;���&gt; TYPE window|root
-/STATUSBAR &lt;���&gt; PLACEMENT top|bottom
-/STATUSBAR &lt;���&gt; POSITION &lt;num&gt;
-/STATUSBAR &lt;���&gt; VISIBLE always|active|inactive
-</pre>
-
-<p>����� �� ���������� ����� ������� ��� ������� ������� ��� ������ ����� �������� ������� ��� �� ������ �� �����������. 
-���������� ������� ����� ���� �������� ���������� ���������:</p>
-
-<pre>
-/STATUSBAR &lt;���&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;����������(item)&gt;
-/STATUSBAR &lt;���&gt; REMOVE &lt;����������(item)&gt;
-</pre>
-
-<p>������ ��� ��� ���������� � ������� ��� ������ ������������� ����� �������. 
-�� ���� ������ ���� �������� � ������������ � �������. ��� ��� ����� �������� ������ mail.pl 
-����� ������� �������� ���� (�������� 
-<code>/STATUSBAR</code>), ������� ��� �������: <code>/STATUSBAR window ADD -before
-act mail</code>.</p>
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index deff3116..12128c59 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -1,979 +1,646 @@
- <h2>Startup HOWTO</h2>
-
- <h3>To new Irssi users (not to new IRC users ..)</h3>
-
- <p>Copyright (c) 2000-2002 by Timo Sirainen, release under
-    <a href="http://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1 license.</p>
+                    <h1>Startup How-To</h1>
+<h3 id="to-new-irssi-users-not-to-new-irc-users-">To new Irssi users (not to new IRC users ..)</h3>
 
+<p>Copyright (c) 2000-2002 by Timo Sirainen, release under <a href="http://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1 license.</p>
 
 <p>Index with some FAQ questions that are answered in the chapter:</p>
 
 <ol>
-<li><a href="#c1">For all the lazy people</a>
+  <li><a href="#for-all-the-ircii-people">For all the ircII people</a>
     <ul>
-    <li>This window management is just weird, I want it exactly like ircII</li>
-    </ul></li>
-<li><a href="#c2">Basic user interface usage</a>
+      <li>This window management is just weird, I want it exactly like ircII</li>
+    </ul>
+  </li>
+  <li><a href="#basic-user-interface-usage">Basic user interface usage</a>
     <ul>
-    <li>Split windows work in weird way</li>
-    <li>How can I easily switch between windows?</li>
-    <li>But alt-1 etc. don't work!</li>
-    </ul></li>
-<li><a href="#c3">Server and channel automation</a>
+      <li>Split windows work in weird way</li>
+      <li>How can I easily switch between windows?</li>
+      <li>But alt-1 etc. don’t work!</li>
+    </ul>
+  </li>
+  <li><a href="#server-and-channel-automation">Server and channel automation</a>
     <ul>
-    <li>How do I automatically connect to servers at startup?</li>
-    <li>How do I automatically join to channels at startup?</li>
-    <li>How do I automatically send commands to server at connect?</li>
-    </ul></li>
-<li><a href="#c4">Setting up windows and automatically restoring them
-    at startup</a></li>
-<li><a href="#c5">Status and msgs windows &amp; message levels</a>
+      <li>How do I automatically connect to servers at startup?</li>
+      <li>How do I automatically join to channels at startup?</li>
+      <li>How do I automatically send commands to server at connect?</li>
+    </ul>
+  </li>
+  <li><a href="#setting-up-windows-and-automatically-restoring-them-at-startup">Setting up windows and automatically restoring them at startup</a></li>
+  <li><a href="#status-and-msgs-windows--message-levels">Status and msgs windows &amp; message levels</a>
     <ul>
-    <li>I want /WHOIS to print reply to current window</li>
-    <li>I want all messages to go to one window, not create new windows</li>
-    </ul></li>
-<li><a href="#c6">How support for multiple servers works in irssi</a>
+      <li>I want /WHOIS to print reply to current window</li>
+      <li>I want all messages to go to one window, not create new windows</li>
+    </ul>
+  </li>
+  <li><a href="#how-support-for-multiple-servers-works-in-irssi">How support for multiple servers works in irssi</a>
     <ul>
-    <li>I connected to some server that doesn't respond and now irssi
-        keeps trying to reconnect to it again and again, how can I stop
-	it??</li>
-    <li>I want to have own status and/or msgs window for each servers</li>
-    </ul></li>
-<li><a href="#c7">/LASTLOG and jumping around in scrollback</a>
+      <li>I connected to some server that doesn’t respond and now irssi keeps trying to reconnect to it again and again, how can I stop it??</li>
+      <li>I want to have own status and/or msgs window for each servers</li>
+    </ul>
+  </li>
+  <li><a href="#lastlog-and-jumping-around-in-scrollback">/LASTLOG and jumping around in scrollback</a>
     <ul>
-    <li>How can I save all texts in a window to file?</li>
-    </ul></li>
-<li><a href="#c8">Logging</a></li>
-<li><a href="#c9">Changing keyboard bindings</a>
+      <li>How can I save all texts in a window to file?</li>
+    </ul>
+  </li>
+  <li><a href="#logging">Logging</a></li>
+  <li><a href="#changing-keyboard-bindings">Changing keyboard bindings</a>
     <ul>
-    <li>How do I make F1 key do something?</li>
-    </ul></li>
-<li><a href="#c10">Proxies and IRC bouncers</a>
+      <li>How do I make F1 key do something?</li>
+    </ul>
+  </li>
+  <li><a href="#proxies-and-irc-bouncers">Proxies and IRC bouncers</a></li>
+  <li><a href="#irssis-settings">Irssi’s settings</a></li>
+  <li><a href="#statusbar">Statusbar</a>
     <ul>
-    <li>What's this irssi-proxy?</li>
-    </ul></li>
-<li><a href="#c11">Irssi's settings</a></li>
-<li><a href="#c12">Statusbar</a>
-    <ul>
-    <li>I loaded a statusbar script but it's not visible anywhere!</li>
-    </ul></li>
+      <li>I loaded a statusbar script but it’s not visible anywhere!</li>
+    </ul>
+  </li>
 </ol>
 
-<h3><a id="c1">1. For all the lazy people</a></h3>
+<h2 id="for-all-the-ircii-people">1. For all the ircII people</h2>
 
 <p>These settings should give you pretty good defaults (the ones I use):</p>
 
-<p>If colors don't work, and you know you're not going to use some
-weird non-VT compatible terminal (you most probably aren't), just
-say:</p>
+<p>If colors don’t work, and you know you’re not going to use some weird non-VT compatible terminal (you most probably aren’t), just say:</p>
 
-<pre>
-/SET term_force_colors ON
-</pre>
+<pre><code> /SET term_force_colors ON
+</code></pre>
 
-<p>I don't like automatic query windows, I don't like status window, I do
-like msgs window where all messages go:</p>
+<p>I don’t like automatic query windows, I don’t like status window, I do like msgs window where all messages go:</p>
 
-<pre>
-/SET autocreate_own_query OFF
-/SET autocreate_query_level DCCMSGS
-/SET use_status_window OFF
-/SET use_msgs_window ON
-</pre>
+<pre><code> /SET autocreate_own_query OFF
+ /SET autocreate_query_level DCCMSGS
+ /SET use_status_window OFF
+ /SET use_msgs_window ON
+</code></pre>
 
-<p>Disable automatic window closing when <code>/PART</code>ing channel or
-<code>/UNQUERY</code>ing query:</p>
+<p>Disable automatic window closing when <code>/PART</code>ing channel or <code>/UNQUERY</code>ing query:</p>
 
-<pre>
-/SET autoclose_windows OFF
-/SET reuse_unused_windows ON
-</pre>
+<pre><code> /SET autoclose_windows OFF
+ /SET reuse_unused_windows ON
+</code></pre>
 
-<p>Here's the settings that make irssi work exactly like ircII in window
-management (send me a note if you can think of more):</p>
+<p>Here’s the settings that make irssi work exactly like ircII in window management (send me a note if you can think of more):</p>
 
-<pre>
-/SET autocreate_own_query OFF
-/SET autocreate_query_level NONE
-/SET use_status_window OFF
-/SET use_msgs_window OFF
-/SET reuse_unused_windows ON
-/SET windows_auto_renumber OFF
+<pre><code> /SET autocreate_own_query OFF
+ /SET autocreate_query_level NONE
+ /SET use_status_window OFF
+ /SET use_msgs_window OFF
+ /SET reuse_unused_windows ON
+ /SET windows_auto_renumber OFF
 
-/SET autostick_split_windows OFF
-/SET autoclose_windows OFF
-/SET print_active_channel ON
-</pre>
+ /SET autostick_split_windows OFF
+ /SET autoclose_windows OFF
+ /SET print_active_channel ON
+</code></pre>
 
 <p>And example how to add servers:</p>
 
-<p>(OFTC network, identify with nickserv and wait for 2 seconds before
-joining channels)</p>
+<p>(OFTC network, identify with nickserv and wait for 2 seconds before joining channels)</p>
 
-<pre>
-/NETWORK ADD -autosendcmd "/^msg nickserv identify pass;wait 2000" OFTC
-</pre>
+<pre><code> /NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
+</code></pre>
 
 <p>(NOTE: use /IRCNET with 0.8.9 and older)</p>
 
-<p>Then add some servers to different networks (network is already set up 
-for them), irc.kpnqwest.fi is used by default for IRCNet but if it fails,
-irc.funet.fi is tried next:</p>
+<p>Then add some servers to different networks (network is already set up for them), irc.kpnqwest.fi is used by default for IRCNet but if it fails, irc.funet.fi is tried next:</p>
 
-<pre>
-/SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
-/SERVER ADD -network IRCnet irc.funet.fi 6667
-/SERVER ADD -auto -network efnet efnet.cs.hut.fi 6667
-</pre>
+<pre><code> /SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
+ /SERVER ADD -network IRCnet irc.funet.fi 6667
+ /SERVER ADD -auto -network efnet efnet.cs.hut.fi 6667
+</code></pre>
 
-<p>Automatically join to channels after connected to server, send op request
-to bot after joined to efnet/#irssi:</p>
+<p>Automatically join to channels after connected to server, send op request to bot after joined to efnet/#irssi:</p>
 
-<pre>
-/CHANNEL ADD -auto #irssi IRCnet
-/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
-</pre>
+<pre><code> /CHANNEL ADD -auto #irssi IRCnet
+ /CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
+</code></pre>
 
-If you want lines containing your nick to hilight:
+<p>If you want lines containing your nick to hilight:</p>
 
-<pre>
-/HILIGHT nick
-</pre>
+<pre><code> /HILIGHT nick
+</code></pre>
 
-<h3><a id="c2">2. Basic user interface usage</a></h3>
+<h2 id="basic-user-interface-usage">2. Basic user interface usage</h2>
 
-<p>Windows can be scrolled up/down with PgUp and PgDown keys. If they don't
-work for you, use Meta-p and Meta-n keys. For jumping to beginning or end of
-the buffer, use <code>/SB HOME</code> and <code>/SB END</code> commands.</p>
+<p>Windows can be scrolled up/down with PgUp and PgDown keys. If they don’t work for you, use Meta-p and Meta-n keys. For jumping to beginning or end of the buffer, use <code>/SB HOME</code> and <code>/SB END</code> commands.</p>
 
-<p>By default, irssi uses "hidden windows" for everything. Hidden window is
-created every time you <code>/JOIN</code> a channel or <code>/QUERY</code>
-someone. There's several ways you can change between these windows:</p>
+<p>By default, irssi uses “hidden windows” for everything. Hidden window is created every time you <code>/JOIN</code> a channel or <code>/QUERY</code> someone. There’s several ways you can change between these windows:</p>
 
-<pre>
-Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
-Meta-q .. Meta-o          - Jump directly between windows 11-19
-/WINDOW &lt;number&gt;          - Jump to any window with specified number
-Ctrl-P, Ctrl-N            - Jump to previous / next window
-</pre>
+<pre><code> Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
+ Meta-q .. Meta-o          - Jump directly between windows 11-19
+ /WINDOW &lt;number&gt;          - Jump to any window with specified number
+ Ctrl-P, Ctrl-N            - Jump to previous / next window
+</code></pre>
 
-<p>Clearly the easiest way is to use Meta-number keys. And what is the Meta
-key? ESC key always works as Meta, but there's also easier ways. ALT could
-work as Meta, or if you have Windows keyboard, left Windows key might work
-as Meta. If they don't work directly, you'll need to set a few X resources
-(NOTE: these work with both xterm and rxvt):</p>   
+<p>Clearly the easiest way is to use Meta-number keys. And what is the Meta key? ESC key always works as Meta, but there’s also easier ways. ALT could work as Meta, or if you have Windows keyboard, left Windows key might work as Meta. If they don’t work directly, you’ll need to set a few X resources (NOTE: these work with both xterm and rxvt):</p>
 
-<pre>
-XTerm*eightBitInput:   false
-XTerm*metaSendsEscape: true
-</pre>
+<pre><code> XTerm*eightBitInput:   false
+ XTerm*metaSendsEscape: true
+</code></pre>
 
-<p>With rxvt, you can also specify which key acts as Meta key. So if you
-want to use ALT instead of Windows key for it, use:</p>
+<p>With rxvt, you can also specify which key acts as Meta key. So if you want to use ALT instead of Windows key for it, use:</p>
 
-<pre>
-rxvt*modifier: alt
-</pre>
+<pre><code> rxvt*modifier: alt
+</code></pre>
 
 <p>You could do this by changing the X key mappings:</p>
 
-<pre>
-xmodmap -e "keysym Alt_L = Meta_L Alt_L"
-</pre>
+<pre><code> xmodmap -e "keysym Alt_L = Meta_L Alt_L"
+</code></pre>
 
-<p>And how exactly do you set these X resources? For Debian, there's
-<code>/etc/X11/Xresources/xterm</code> file where you can put them and it's
-read automatically when X starts. <code>~/.Xresources</code> and 
-<code>~/.Xdefaults</code> files might also work. If you can't get anything
-else to work, just copy and paste those lines to <code>~/.Xresources</code>
-and directly call <code>xrdb -merge ~/.Xresources</code> in some xterm. 
-The resources affect only the new xterms you start, not existing ones.</p> 
+<p>And how exactly do you set these X resources? For Debian, there’s <code>/etc/X11/Xresources/xterm</code> file where you can put them and it’s read automatically when X starts. <code>~/.Xresources</code> and <code>~/.Xdefaults</code> files might also work. If you can’t get anything else to work, just copy and paste those lines to <code>~/.Xresources</code> and directly call <code>xrdb -merge ~/.Xresources</code> in some xterm. The resources affect only the new xterms you start, not existing ones.</p>
 
-<p>Many windows SSH clients also don't allow usage of ALT. One excellent
-client that does allow is putty, you can download it from
-<a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/">
-http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>.</p>
+<p>Many windows SSH clients also don’t allow usage of ALT. One excellent client that does allow is putty, you can download it from <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/"> http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>.</p>
 
-<p>Irssi also supports split windows, they've had some problems in past
-but I think they should work pretty well now :) Here's some commands
-related to them:</p>
+<p>Irssi also supports split windows, they’ve had some problems in past but I think they should work pretty well now :) Here’s some commands related to them:</p>
 
-<pre>
-/WINDOW NEW                    - Create new split window
-/WINDOW NEW HIDE               - Create new hidden window
-/WINDOW CLOSE                  - Close split or hidden window
+<pre><code> /WINDOW NEW                    - Create new split window
+ /WINDOW NEW HIDE               - Create new hidden window
+ /WINDOW CLOSE                  - Close split or hidden window
 
-/WINDOW HIDE [&lt;number&gt;|&lt;name&gt;] - Make the split window hidden window
-/WINDOW SHOW &lt;number&gt;|&lt;name&gt;   - Make the hidden window a split window
+ /WINDOW HIDE [&lt;number&gt;|&lt;name&gt;] - Make the split window hidden window
+ /WINDOW SHOW &lt;number&gt;|&lt;name&gt;   - Make the hidden window a split window
 
-/WINDOW SHRINK [&lt;lines&gt;]       - Shrink the split window
-/WINDOW GROW [&lt;lines&gt;]         - Grow the split window
-/WINDOW BALANCE                - Balance the sizes of all split windows
-</pre>
+ /WINDOW SHRINK [&lt;lines&gt;]       - Shrink the split window
+ /WINDOW GROW [&lt;lines&gt;]         - Grow the split window
+ /WINDOW BALANCE                - Balance the sizes of all split windows
+</code></pre>
 
-<p>By default, irssi uses "sticky windowing" for split windows. This means
-that windows created inside one split window cannot be moved to another
-split window without some effort. For example you could have following
-window layout:</p>
+<p>By default, irssi uses “sticky windowing” for split windows. This means that windows created inside one split window cannot be moved to another split window without some effort. For example you could have following window layout:</p>
 
-<pre>
-Split window 1: win#1 - Status window, win#2 - Messages window
-Split window 2: win#3 - IRCnet/#channel1, win#4 - IRCnet/#channel2
-Split window 3: win#5 - efnet/#channel1, win#6 - efnet/#channel2
-</pre>
+<pre><code> Split window 1: win#1 - Status window, win#2 - Messages window
+ Split window 2: win#3 - IRCnet/#channel1, win#4 - IRCnet/#channel2
+ Split window 3: win#5 - efnet/#channel1, win#6 - efnet/#channel2
+</code></pre>
 
-<p>When you are in win#1 and press ALT-6, irssi jumps to split window
-#3 and moves the efnet/#channel2 the active window.</p>
+<p>When you are in win#1 and press ALT-6, irssi jumps to split window #3 and moves the efnet/#channel2 the active window.</p>
 
-<p>With non-sticky windowing the windows don't have any relationship with
-split windows, pressing ALT-6 in win#1 moves win#6 to split window 1
-and sets it active, except if win#6 was already visible in some other
-split window irssi just changes to that split window. This it the way
-windows work with ircii, if you prefer it you can set it with</p>
+<p>With non-sticky windowing the windows don’t have any relationship with split windows, pressing ALT-6 in win#1 moves win#6 to split window 1 and sets it active, except if win#6 was already visible in some other split window irssi just changes to that split window. This it the way windows work with ircii, if you prefer it you can set it with</p>
 
-<pre>
-/SET autostick_split_windows OFF
-</pre>
+<pre><code> /SET autostick_split_windows OFF
+</code></pre>
 
-<p>Each window can have multiple channels, queries and other "window
-items" inside them. If you don't like windows at all, you disable
-automatic creating of them with</p>
+<p>Each window can have multiple channels, queries and other “window items” inside them. If you don’t like windows at all, you disable automatic creating of them with</p>
 
-<pre>
-/SET autocreate_windows OFF
-</pre>
+<pre><code> /SET autocreate_windows OFF
+</code></pre>
 
-<p>And if you keep all channels in one window, you most probably want
-the channel name printed in each line:</p>
+<p>And if you keep all channels in one window, you most probably want the channel name printed in each line:</p>
 
-<pre>
-/SET print_active_channel ON
-</pre>
+<pre><code> /SET print_active_channel ON
+</code></pre>
 
-<p>If you want to group only some channels or queries in one window,
-use</p>
+<p>If you want to group only some channels or queries in one window, use</p>
 
-<pre>
-/JOIN -window #channel
-/QUERY -window nick
-</pre>
+<pre><code> /JOIN -window #channel
+ /QUERY -window nick
+</code></pre>
 
-<h3><a id="c3">3. Server and channel automation</a></h3>
+<h2 id="server-and-channel-automation">3. Server and channel automation</h2>
 
-<p>Irssi's multiple IRC network support is IMHO very good - at least
-compared to other clients :) Even if you're only in one IRC network you
-should group all your servers to be in the same IRC network as this
-helps with reconnecting if your primary server breaks and is probably
-useful in some other ways too :) For information how to actually use
-irssi correctly with multiple servers see the chapter 6.</p>
+<p>Irssi’s multiple IRC network support is IMHO very good - at least compared to other clients :) Even if you’re only in one IRC network you should group all your servers to be in the same IRC network as this helps with reconnecting if your primary server breaks and is probably useful in some other ways too :) For information how to actually use irssi correctly with multiple servers see the chapter 6.</p>
 
-<p>First you need to have your IRC network set, use <code>/NETWORK</code>
-command to see if it's already there. If it isn't, use <code>/NETWORK ADD
-yournetwork</code>. If you want to execute some commands automatically when
-you're connected to some network, use <code>-autosendcmd</code> option.
-(NOTE: use /IRCNET with 0.8.9 and older.) Here's some examples:</p>
+<p>First you need to have your IRC network set, use <code>/NETWORK</code> command to see if it’s already there. If it isn’t, use <code>/NETWORK ADD yournetwork</code>. If you want to execute some commands automatically when you’re connected to some network, use <code>-autosendcmd</code> option. (NOTE: use /IRCNET with 0.8.9 and older.) Here’s some examples:</p>
 
-<pre>
-/NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
-/NETWORK ADD -autosendcmd "/^msg nickserv identify pass;wait 2000" OFTC
-</pre>
+<pre><code> /NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
+ /NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
+</code></pre>
 
 <p>After that you need to add your servers. For example:</p>
 
-<pre>
-/SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
-/SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
-</pre>
+<pre><code> /SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
+ /SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
+</code></pre>
 
-<p>The <code>-auto</code> option specifies that this server is
-automatically connected at startup. You don't need to make more than one
-server with <code>-auto</code> option to one IRC network, other servers are
-automatically connected in same network if the <code>-auto</code> server
-fails.</p>
+<p>The <code>-auto</code> option specifies that this server is automatically connected at startup. You don’t need to make more than one server with <code>-auto</code> option to one IRC network, other servers are automatically connected in same network if the <code>-auto</code> server fails.</p>
 
 <p>And finally channels:</p>
 
-<pre>
-/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
-/CHANNEL ADD -auto #secret IRCnet password
-</pre>
-
-<p><code>-bots</code> and <code>-botcmd</code> should be the only ones
-needing a bit of explaining. They're used to send commands automatically to
-bot when channel is joined, usually to get ops automatically. You can
-specify multiple bot masks with <code>-bots</code> option separated with
-spaces (and remember to quote the string then). The $0 in
-<code>-botcmd</code> specifies the first found bot in the list. If you
-don't need the bot masks (ie. the bot is always with the same nick, like
-chanserv) you can give only the <code>-botcmd</code> option and the command
-is always sent.</p>
-
-<h3><a id="c4">4. Setting up windows and automatically restoring them at startup</a></h3>
-
-<p>First connect to all the servers, join the channels and create the
-queries you want. If you want to move the windows or channels around
-use commands:</p>
-
-<pre>
-/WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
-/WINDOW ITEM MOVE &lt;number&gt;|&lt;name&gt; - move channel/query to another window
-</pre>
-
-<p>When everything looks the way you like, use <code>/LAYOUT SAVE</code>
-command (and <code>/SAVE</code>, if you don't have autosaving enabled) and
-when you start irssi next time, irssi remembers the positions of the
-channels, queries and everything. This "remembering" doesn't mean that
-simply using <code>/LAYOUT SAVE</code> would automatically make irssi
-reconnect to all servers and join all channels, you'll need the
-<code>/SERVER ADD -auto</code> and <code>/CHANNEL ADD -auto</code> commands
-to do that.</p>
-
-<p>If you want to change the layout, you just rearrange the layout like
-you want it and use <code>/LAYOUT SAVE</code> again. If you want to remove
-the layout for some reason, use <code>/LAYOUT RESET.</code></p>
-
-
-<h3><a id="c5">5. Status and msgs windows &amp; message levels</a></h3>
-
-<p>By default, all the "extra messages" go to status window. This means
-pretty much all messages that don't clearly belong to some channel or
-query. Some people like it, some don't. If you want to remove it, use</p>
-
-<pre>
-/SET use_status_window OFF
-</pre>
-
-<p>This doesn't have any effect until you restart irssi. If you want to
-remove it immediately, just <code>/WINDOW CLOSE</code> it.</p>
-
-<p>Another common window is "messages window", where all private
-messages go. By default it's disabled and query windows are created
-instead. To make all private messages go to msgs window, say:</p>
-
-<pre>
-/SET use_msgs_window ON
-/SET autocreate_query_level DCCMSGS  (or if you don't want queries to
-				      dcc chats either, say NONE)
-</pre>
-
-<p>use_msgs_window either doesn't have any effect until restarting
-irssi. To create it immediately say:</p>
-
-<pre>
-/WINDOW NEW HIDE     - create the window
-/WINDOW NAME (msgs)  - name it to "(msgs)"
-/WINDOW LEVEL MSGS   - make all private messages go to this window
-/WINDOW MOVE 1       - move it to first window
-</pre>
-
-<p>Note that neither use_msgs_window nor use_status_window have any
-effect at all if <code>/LAYOUT SAVE</code> has been used.</p>
-
-<p>This brings us to message levels.. What are they? All messages that
-irssi prints have one or more "message levels". Most common are PUBLIC
-for public messages in channels, MSGS for private messages and CRAP for
-all sorts of messages with no real classification. You can get a whole
-list of levels with</p>
-
-<pre>
-/HELP levels
-</pre>
-
-<p>Status window has message level <code>ALL -MSGS</code>, meaning that all
-messages, except private messages, without more specific place go to status
-window. The <code>-MSGS</code> is there so it doesn't conflict with
-messages window.</p>
-
-
-<h3><a id="c6">6. How support for multiple servers works in irssi</a></h3>
-
-<p>ircii and several other clients support multiple servers by placing
-the connection into some window. IRSSI DOES NOT. There is no required
-relationship between window and server. You can connect to 10 servers
-and manage them all in just one window, or join channel in each one of
-them to one single window if you really want to. That being said, here's
-how you do connect to new server without closing the old connection:</p>
-
-<pre>
-/CONNECT irc.server.org
-</pre>
-
-<p>Instead of the <code>/SERVER</code> which disconnects the existing
-connection. To see list of all active connections, use <code>/SERVER</code>
-without any parameters. You should see a list of something like:</p>
-
-<pre>
--!- IRCNet: irc.song.fi:6667 (IRCNet)
--!- OFTC: irc.oftc.net:6667 (OFTC)
--!- RECON-1: 192.168.0.1:6667 () (02:59 left before reconnecting)
-</pre>
-
-<p>Here you see that we're connected to IRCNet and OFTC networks.
-The IRCNet at the beginning is called the "server tag" while the
-(IRCnet) at the end shows the IRC network. Server tag specifies unique
-tag to refer to the server, usually it's the same as the IRC network.
-When the IRC network isn't known it's some part of the server name.
-When there's multiple connections to same IRC network or server, irssi
-adds a number after the tag so there could be network, network2, network3
-etc.</p>
-
-<p>Server tags beginning with <code>RECON-</code> mean server
-reconnections. Above we see that connection to server at 192.168.0.1 wasn't
-successful and irssi will try to connect it again in 3 minutes.</p>
-
-<p>To disconnect one of the servers, or to stop irssi from
-reconnecting, use</p>
-
-<pre>
-/DISCONNECT network   - disconnect server with tag "network"
-/DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
-/RMRECONNS           - stop all server reconnections
-
-/RECONNECT recon-1   - immediately try reconnecting back to RECON-1
-/RECONNECT ALL       - immediately try reconnecting back to all
-		       servers in reconnection queue
-</pre>
-
-<p>Now that you're connected to all your servers, you'll have to know how
-to specify which one of them you want to use. One way is to have an
-empty window, like status or msgs window. In it, you can specify which
-server to set active with</p>
-
-<pre>
-/WINDOW SERVER tag    - set server "tag" active
-Ctrl-X                - set the next server in list active
-</pre>
-
-<p>When the server is active, you can use it normally. When there's
-multiple connected servers, irssi adds [servertag] prefix to all
-messages in non-channel/query messages so you'll know where it came
-from.</p>
-
-<p>Several commands also accept <code>-servertag</code> option to specify
-which server it should use:</p>
-
-<pre>
-/MSG -tag nick message
-/JOIN -tag #channel
-/QUERY -tag nick
-</pre>
-
-<p><code>/MSG</code> tab completion also automatically adds the
-<code>-tag</code> option when nick isn't in active server.</p>
-
-<p>Window's server can be made sticky. When sticky, it will never
-automatically change to anything else, and if server gets disconnected, the
-window won't have any active server. When the server gets connected again,
-it is automatically set active in the window. To set the window's server
-sticky use</p>
-
-<pre>
-/WINDOW SERVER -sticky tag
-</pre>
-
-<p>This is useful if you wish to have multiple status or msgs windows, one
-for each server. Here's how to do them (repeat for each server)</p>
-
-<pre>
-/WINDOW NEW HIDE
-/WINDOW NAME (status)
-/WINDOW LEVEL ALL -MSGS
-/WINDOW SERVER -sticky network
-
-/WINDOW NEW HIDE
-/WINDOW NAME (msgs)
-/WINDOW LEVEL MSGS
-/WINDOW SERVER -sticky network
-</pre>
-
-<h3><a id="c7">7. /LASTLOG and jumping around in scrollback</a></h3>
-
-<p><code>/LASTLOG</code> command can be used for searching texts in
-scrollback buffer. Simplest usages are</p>
-
-<pre>
-/LASTLOG word     - print all lines with "word" in them
-/LASTLOG word 10  - print last 10 occurrences of "word"
-/LASTLOG -topics  - print all topic changes
-</pre>
-
-<p>If there's more than 1000 lines to be printed, irssi thinks that you
-probably made some mistake and won't print them without <code>-force</code>
-option. If you want to save the full lastlog to file, use</p>
-
-<pre>
-/LASTLOG -file ~/irc.log
-</pre>
-
-<p>With <code>-file</code> option you don't need <code>-force</code> even
-if there's more than 1000 lines. <code>/LASTLOG</code> has a lot of other
-options too, see <code>/HELP lastlog</code> for details.</p>
-
-<p>Once you've found the lines you were interested in, you might want
-to check the discussion around them. Irssi has <code>/SCROLLBACK</code> (or
-alias <code>/SB</code>) command for jumping around in scrollback buffer.
-Since <code>/LASTLOG</code> prints the timestamp when the message was
-originally printed, you can use <code>/SB GOTO hh:mm</code> to jump
-directly there. To get back to the bottom of scrollback, use <code>/SB
-END</code> command.</p>
-
-
-<h3><a id="c8">8. Logging</a></h3>
-
-<p>Irssi can automatically log important messages when you're set away
-(<code>/AWAY reason</code>). When you set yourself unaway
-(<code>/AWAY</code>), the new messages in away log are printed to screen.
-You can configure it with:</p>
-
-<pre>
-/SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
-/SET awaylog_file ~/.irssi/away.log - Specifies the file to use
-</pre>
-
-<p>Easiest way to start logging with Irssi is to use autologging. With it
-Irssi logs all channels and private messages to specified directory.
-You can turn it on with</p>
-
-<pre>
-/SET autolog ON
-</pre>
-
-<p>By default it logs pretty much everything execept CTCPS or CRAP
-(<code>/WHOIS</code> requests, etc). You can specify the logging level
-yourself with</p>
-
-<pre>
-/SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
-</pre>
-
-<p>By default irssi logs to ~/irclogs/&lt;servertag&gt;/&lt;target&gt;.log.
-You can change this with</p>
-
-<pre>
-/SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
-</pre>
-
-<p>The path is automatically created if it doesn't exist. $0 specifies
-the target (channel/nick). You can make irssi automatically rotate the
-logs by adding date/time formats to the file name. The formats are in
-"man strftime" format. For example</p>
-
-<pre>
-/SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
-</pre>
-
-<p>For logging only some specific channels or nicks, see <code>/HELP
-log</code></p>
-
-
-<h3><a id="c9">9. Changing keyboard bindings</a></h3>
-
-<p>You can change any keyboard binding that terminal lets irssi know
-about. It doesn't let irssi know everything, so for example
-shift-backspace can't be bound unless you modify xterm resources
-somehow.</p>
-
-<p><code>/HELP bind</code> tells pretty much everything there is to know
-about keyboard bindings. However, there's the problem of how to bind some
-non-standard keys. They might differ a bit with each terminal, so you'll
-need to find out what exactly the keypress produces. Easiest way to check
-that would be to see what it prints in <code>cat</code>. Here's an example
-for pressing F1 key:</p>
-
-<pre>
-[cras@hurina] ~% cat
-^[OP
-</pre>
-
-<p>So in irssi you would use <code>/BIND ^[OP /ECHO F1 pressed</code>. If
-you use multiple terminals which have different bindings for the key, it
-would be better to use eg.:</p>
-
-<pre>
-/BIND ^[OP key F1
-/BIND ^[11~ key F1
-/BIND F1 /ECHO F1 pressed.
-</pre>
-
-<h3><a id="c10">10. Proxies and IRC bouncers</a></h3>
-
-<p>Irssi supports connecting to IRC servers via a proxy. All server
-connections are then made through it, and if you've set up everything
-properly, you don't need to do any <code>/QUOTE SERVER</code> commands
-manually.</p>
-
-<p>Here's an example: You have your bouncer (lets say, BNC or BNC-like)
-listening in irc.bouncer.org port 5000. You want to use it to connect
-to servers irc.dalnet and irc.efnet.org. First you'd need to setup the
-bouncer:</p>
-
-<pre>
-/SET use_proxy ON
-/SET proxy_address irc.bouncer.org
-/SET proxy_port 5000
-
-/SET proxy_password YOUR_BNC_PASSWORD_HERE
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-</pre>
+<pre><code> /CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
+ /CHANNEL ADD -auto #secret IRCnet password
+</code></pre>
 
-<p>Then you'll need to add the server connections. These are done
-exactly as if you'd want to connect directly to them. Nothing special
-about them:</p>
-
-<pre>
-/SERVER ADD -auto -network dalnet irc.dal.net
-/SERVER ADD -auto -network efnet irc.efnet.org
-</pre>
-
-<p>With the proxy <code>/SET</code>s however, irssi now connects to those
-servers through your BNC. All server connections are made through them so
-you can just forget that your bouncer even exists.</p>
-
-<p>If you don't want to use the proxy for some reason, there's
-<code>-noproxy</code> option which you can give to <code>/SERVER</code> and
-<code>/SERVER ADD</code> commands.</p>
+<p><code>-bots</code> and <code>-botcmd</code> should be the only ones needing a bit of explaining. They’re used to send commands automatically to bot when channel is joined, usually to get ops automatically. You can specify multiple bot masks with <code>-bots</code> option separated with spaces (and remember to quote the string then). The $0 in <code>-botcmd</code> specifies the first found bot in the list. If you don’t need the bot masks (ie. the bot is always with the same nick, like chanserv) you can give only the <code>-botcmd</code> option and the command is always sent.</p>
+
+<h2 id="setting-up-windows-and-automatically-restoring-them-at-startup">4. Setting up windows and automatically restoring them at startup</h2>
+
+<p>First connect to all the servers, join the channels and create the queries you want. If you want to move the windows or channels around use commands:</p>
+
+<pre><code> /WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
+ /WINDOW ITEM MOVE &lt;number&gt;|&lt;name&gt; - move channel/query to another window
+</code></pre>
+
+<p>When everything looks the way you like, use <code>/LAYOUT SAVE</code> command (and <code>/SAVE</code>, if you don’t have autosaving enabled) and when you start irssi next time, irssi remembers the positions of the channels, queries and everything. This “remembering” doesn’t mean that simply using <code>/LAYOUT SAVE</code> would automatically make irssi reconnect to all servers and join all channels, you’ll need the <code>/SERVER ADD -auto</code> and <code>/CHANNEL ADD -auto</code> commands to do that.</p>
+
+<p>If you want to change the layout, you just rearrange the layout like you want it and use <code>/LAYOUT SAVE</code> again. If you want to remove the layout for some reason, use <code>/LAYOUT RESET.</code></p>
+
+<h2 id="status-and-msgs-windows--message-levels">5. Status and msgs windows &amp; message levels</h2>
+
+<p>By default, all the “extra messages” go to status window. This means pretty much all messages that don’t clearly belong to some channel or query. Some people like it, some don’t. If you want to remove it, use</p>
+
+<pre><code> /SET use_status_window OFF
+</code></pre>
+
+<p>This doesn’t have any effect until you restart irssi. If you want to remove it immediately, just <code>/WINDOW CLOSE</code> it.</p>
+
+<p>Another common window is “messages window”, where all private messages go. By default it’s disabled and query windows are created instead. To make all private messages go to msgs window, say:</p>
+
+<pre><code> /SET use_msgs_window ON
+ /SET autocreate_query_level DCCMSGS  (or if you don't want queries to
+ 				      dcc chats either, say NONE)
+</code></pre>
+
+<p>use_msgs_window either doesn’t have any effect until restarting irssi. To create it immediately say:</p>
+
+<pre><code> /WINDOW NEW HIDE     - create the window
+ /WINDOW NAME (msgs)  - name it to "(msgs)"
+ /WINDOW LEVEL MSGS   - make all private messages go to this window
+ /WINDOW MOVE 1       - move it to first window
+</code></pre>
+
+<p>Note that neither use_msgs_window nor use_status_window have any effect at all if <code>/LAYOUT SAVE</code> has been used.</p>
+
+<p>This brings us to message levels.. What are they? All messages that irssi prints have one or more “message levels”. Most common are PUBLIC for public messages in channels, MSGS for private messages and CRAP for all sorts of messages with no real classification. You can get a whole list of levels with</p>
+
+<pre><code> /HELP levels
+</code></pre>
+
+<p>Status window has message level <code>ALL -MSGS</code>, meaning that all messages, except private messages, without more specific place go to status window. The <code>-MSGS</code> is there so it doesn’t conflict with messages window.</p>
+
+<h2 id="how-support-for-multiple-servers-works-in-irssi">6. How support for multiple servers works in irssi</h2>
+
+<p>ircii and several other clients support multiple servers by placing the connection into some window. IRSSI DOES NOT. There is no required relationship between window and server. You can connect to 10 servers and manage them all in just one window, or join channel in each one of them to one single window if you really want to. That being said, here’s how you do connect to new server without closing the old connection:</p>
+
+<pre><code> /CONNECT irc.server.org
+</code></pre>
+
+<p>Instead of the <code>/SERVER</code> which disconnects the existing connection. To see list of all active connections, use <code>/SERVER</code> without any parameters. You should see a list of something like:</p>
+
+<pre><code> -!- IRCNet: irc.song.fi:6667 (IRCNet)
+ -!- OFTC: irc.oftc.net:6667 (OFTC)
+ -!- RECON-1: 192.168.0.1:6667 () (02:59 left before reconnecting)
+</code></pre>
+
+<p>Here you see that we’re connected to IRCNet and OFTC networks. The IRCNet at the beginning is called the “server tag” while the (IRCnet) at the end shows the IRC network. Server tag specifies unique tag to refer to the server, usually it’s the same as the IRC network. When the IRC network isn’t known it’s some part of the server name. When there’s multiple connections to same IRC network or server, irssi adds a number after the tag so there could be network, network2, network3 etc.</p>
+
+<p>Server tags beginning with <code>RECON-</code> mean server reconnections. Above we see that connection to server at 192.168.0.1 wasn’t successful and irssi will try to connect it again in 3 minutes.</p>
+
+<p>To disconnect one of the servers, or to stop irssi from reconnecting, use</p>
+
+<pre><code> /DISCONNECT network   - disconnect server with tag "network"
+ /DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
+ /RMRECONNS           - stop all server reconnections
+
+ /RECONNECT recon-1   - immediately try reconnecting back to RECON-1
+ /RECONNECT ALL       - immediately try reconnecting back to all
+ 		       servers in reconnection queue
+</code></pre>
+
+<p>Now that you’re connected to all your servers, you’ll have to know how to specify which one of them you want to use. One way is to have an empty window, like status or msgs window. In it, you can specify which server to set active with</p>
+
+<pre><code> /WINDOW SERVER tag    - set server "tag" active
+ Ctrl-X                - set the next server in list active
+</code></pre>
+
+<p>When the server is active, you can use it normally. When there’s multiple connected servers, irssi adds [servertag] prefix to all messages in non-channel/query messages so you’ll know where it came from.</p>
+
+<p>Several commands also accept <code>-servertag</code> option to specify which server it should use:</p>
+
+<pre><code> /MSG -tag nick message
+ /JOIN -tag #channel
+ /QUERY -tag nick
+</code></pre>
+
+<p><code>/MSG</code> tab completion also automatically adds the <code>-tag</code> option when nick isn’t in active server.</p>
+
+<p>Window’s server can be made sticky. When sticky, it will never automatically change to anything else, and if server gets disconnected, the window won’t have any active server. When the server gets connected again, it is automatically set active in the window. To set the window’s server sticky use</p>
+
+<pre><code> /WINDOW SERVER -sticky tag
+</code></pre>
+
+<p>This is useful if you wish to have multiple status or msgs windows, one for each server. Here’s how to do them (repeat for each server)</p>
+
+<pre><code> /WINDOW NEW HIDE
+ /WINDOW NAME (status)
+ /WINDOW LEVEL ALL -MSGS
+ /WINDOW SERVER -sticky network
+
+ /WINDOW NEW HIDE
+ /WINDOW NAME (msgs)
+ /WINDOW LEVEL MSGS
+ /WINDOW SERVER -sticky network
+</code></pre>
+
+<h2 id="lastlog-and-jumping-around-in-scrollback">7. /LASTLOG and jumping around in scrollback</h2>
+
+<p><code>/LASTLOG</code> command can be used for searching texts in scrollback buffer. Simplest usages are</p>
+
+<pre><code> /LASTLOG word     - print all lines with "word" in them
+ /LASTLOG word 10  - print last 10 occurances of "word"
+ /LASTLOG -topics  - print all topic changes
+</code></pre>
+
+<p>If there’s more than 1000 lines to be printed, irssi thinks that you probably made some mistake and won’t print them without <code>-force</code> option. If you want to save the full lastlog to file, use</p>
+
+<pre><code> /LASTLOG -file ~/irc.log
+</code></pre>
+
+<p>With <code>-file</code> option you don’t need <code>-force</code> even if there’s more than 1000 lines. <code>/LASTLOG</code> has a lot of other options too, see <code>/HELP lastlog</code> for details.</p>
+
+<p>Once you’ve found the lines you were interested in, you might want to check the discussion around them. Irssi has <code>/SCROLLBACK</code> (or alias <code>/SB</code>) command for jumping around in scrollback buffer. Since <code>/LASTLOG</code> prints the timestamp when the message was originally printed, you can use <code>/SB GOTO hh:mm</code> to jump directly there. To get back to the bottom of scrollback, use <code>/SB END</code> command.</p>
+
+<h2 id="logging">8. Logging</h2>
+
+<p>Irssi can automatically log important messages when you’re set away (<code>/AWAY reason</code>). When you set yourself unaway (<code>/AWAY</code>), the new messages in away log are printed to screen. You can configure it with:</p>
+
+<pre><code> /SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
+ /SET awaylog_file ~/.irssi/away.log - Specifies the file to use
+</code></pre>
+
+<p>Easiest way to start logging with Irssi is to use autologging. With it Irssi logs all channels and private messages to specified directory. You can turn it on with</p>
+
+<pre><code> /SET autolog ON
+</code></pre>
+
+<p>By default it logs pretty much everything execept CTCPS or CRAP (<code>/WHOIS</code> requests, etc). You can specify the logging level yourself with</p>
+
+<pre><code> /SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
+</code></pre>
+
+<p>By default irssi logs to ~/irclogs/<servertag>/<target>.log. You can change this with</target></servertag></p>
+
+<pre><code> /SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
+</code></pre>
+
+<p>The path is automatically created if it doesn’t exist. $0 specifies the target (channel/nick). You can make irssi automatically rotate the logs by adding date/time formats to the file name. The formats are in “man strftime” format. For example</p>
+
+<pre><code> /SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
+</code></pre>
+
+<p>For logging only some specific channels or nicks, see <code>/HELP log</code></p>
+
+<h2 id="changing-keyboard-bindings">9. Changing keyboard bindings</h2>
+
+<p>You can change any keyboard binding that terminal lets irssi know about. It doesn’t let irssi know everything, so for example shift-backspace can’t be bound unless you modify xterm resources somehow.</p>
+
+<p><code>/HELP bind</code> tells pretty much everything there is to know about keyboard bindings. However, there’s the problem of how to bind some non-standard keys. They might differ a bit with each terminal, so you’ll need to find out what exactly the keypress produces. Easiest way to check that would be to see what it prints in <code>cat</code>. Here’s an example for pressing F1 key:</p>
+
+<pre><code> [cras@hurina] ~% cat
+ ^[OP
+</code></pre>
+
+<p>So in irssi you would use <code>/BIND ^[OP /ECHO F1 pressed</code>. If you use multiple terminals which have different bindings for the key, it would be better to use eg.:</p>
+
+<pre><code> /BIND ^[OP key F1
+ /BIND ^[11~ key F1
+ /BIND F1 /ECHO F1 pressed.
+</code></pre>
+
+<h2 id="proxies-and-irc-bouncers">10. Proxies and IRC bouncers</h2>
+
+<p>Irssi supports connecting to IRC servers via a proxy. All server connections are then made through it, and if you’ve set up everything properly, you don’t need to do any <code>/QUOTE SERVER</code> commands manually.</p>
+
+<p>Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:</p>
+
+<pre><code> /SET use_proxy ON
+ /SET proxy_address irc.bouncer.org
+ /SET proxy_port 5000
+
+ /SET proxy_password YOUR_BNC_PASSWORD_HERE
+ /SET -clear proxy_string
+ /SET proxy_string_after conn %s %d
+</code></pre>
+
+<p>Then you’ll need to add the server connections. These are done exactly as if you’d want to connect directly to them. Nothing special about them:</p>
+
+<pre><code> /SERVER ADD -auto -network dalnet irc.dal.net
+ /SERVER ADD -auto -network efnet irc.efnet.org
+</code></pre>
+
+<p>With the proxy <code>/SET</code>s however, irssi now connects to those servers through your BNC. All server connections are made through them so you can just forget that your bouncer even exists.</p>
+
+<p>If you don’t want to use the proxy for some reason, there’s <code>-noproxy</code> option which you can give to <code>/SERVER</code> and <code>/SERVER ADD</code> commands.</p>
 
 <p><strong>Proxy specific settings:</strong></p>
 
 <p>All proxies have these settings in common:</p>
 
-<pre>
-/SET use_proxy ON
-/SET proxy_address &lt;Proxy host address&gt;
-/SET proxy_port &lt;Proxy port&gt;
-</pre>
+<pre><code> /SET use_proxy ON
+ /SET proxy_address &lt;Proxy host address&gt;
+ /SET proxy_port &lt;Proxy port&gt;
+</code></pre>
 
 <p><strong>HTTP proxy</strong></p>
 
 <p>Use these settings with HTTP proxies:</p>
 
-<pre>
-/SET -clear proxy_password
-/EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
-</pre>
+<pre><code> /SET -clear proxy_password
+ /EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
+</code></pre>
 
 <p><strong>BNC</strong></p>
 
-<pre>
-/SET proxy_password your_pass
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-</pre>
+<pre><code> /SET proxy_password your_pass
+ /SET -clear proxy_string
+ /SET proxy_string_after conn %s %d
+</code></pre>
 
 <p><strong>dircproxy</strong></p>
 
-<p>dircproxy separates the server connections by passwords. So, if you
-for example have network connection with password ircpass and
-OFTC connection with oftcpass, you would do something like
-this:</p>
+<p>dircproxy separates the server connections by passwords. So, if you for example have network connection with password ircpass and OFTC connection with oftcpass, you would do something like this:</p>
 
-<pre>
-/SET -clear proxy_password
-/SET -clear proxy_string
+<pre><code> /SET -clear proxy_password
+ /SET -clear proxy_string
 
-/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
-/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-</pre>
+ /SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+ /SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+</code></pre>
 
-<p>The server name and port you give isn't used anywhere, so you can
-put anything you want in there.</p>
+<p>The server name and port you give isn’t used anywhere, so you can put anything you want in there.</p>
 
 <p><strong>psyBNC</strong></p>
 
-<p>psyBNC has internal support for multiple servers. However, it could
-be a bit annoying to use, and some people just use different users for
-connecting to different servers. You can manage this in a bit same way
-as with dircproxy, by creating fake connections:</p>
+<p>psyBNC has internal support for multiple servers. However, it could be a bit annoying to use, and some people just use different users for connecting to different servers. You can manage this in a bit same way as with dircproxy, by creating fake connections:</p>
 
-<pre>
-/SET -clear proxy_password
-/SET -clear proxy_string
+<pre><code> /SET -clear proxy_password
+ /SET -clear proxy_string
 
-/NETWORK ADD -user networkuser IRCnet
-/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
-/NETWORK ADD -user oftcuser OFTC
-/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-</pre>
+ /NETWORK ADD -user networkuser IRCnet
+ /SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+ /NETWORK ADD -user oftcuser OFTC
+ /SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+</code></pre>
 
-<p>So, you'll specify the usernames with <code>/NETWORK ADD</code> command,
-and the user's password with <code>/SERVER ADD</code>.</p>
+<p>So, you’ll specify the usernames with <code>/NETWORK ADD</code> command, and the user’s password with <code>/SERVER ADD</code>.</p>
 
 <p>(NOTE: use /IRCNET with 0.8.9 and older.)</p>
 
 <p><strong>Irssi proxy</strong></p>
 
-<p>Irssi contains it's own proxy which you can build giving
-<code>--with-proxy</code> option to configure. You'll still need to run
-irssi in a screen to use it though.</p>
+<p>Irssi contains it’s own proxy which you can build giving <code>\--with-proxy</code> option to configure. You’ll still need to run irssi in a screen to use it though.</p>
 
-<p>Irssi proxy is a bit different than most proxies, normally proxies
-create a new connection to IRC server when you connect to it, but
-<strong>irssi proxy shares your existing IRC connection(s) to multiple
-clients</strong>. And even more clearly: <strong>You can use only one IRC
-server connection to IRC with as many clients as you want</strong>. Can
-anyone figure out even more easier ways to say this, so I wouldn't need to
-try to explain this thing for minutes every time? :)</p>
+<p>Irssi proxy is a bit different than most proxies, normally proxies create a new connection to IRC server when you connect to it, but <strong>irssi proxy shares your existing IRC connection(s) to multiple clients</strong>. And even more clearly: <strong>You can use only one IRC server connection to IRC with as many clients as you want</strong>. Can anyone figure out even more easier ways to say this, so I wouldn’t need to try to explain this thing for minutes every time? :)</p>
 
-<p>Irssi proxy supports sharing multiple server connections in different
-ports, like you can share network in port 2777 and efnet in port 2778.</p>
+<p>Irssi proxy supports sharing multiple server connections in different ports, like you can share network in port 2777 and efnet in port 2778.</p>
 
 <p>Usage in proxy side:</p>
 
-<pre>
-/LOAD proxy
-/SET irssiproxy_password &lt;password&gt;
-/SET irssiproxy_ports &lt;network&gt;=&lt;port&gt; ... (eg. IRCnet=2777 efnet=2778)
-</pre>
+<pre><code> /LOAD proxy
+ /SET irssiproxy_password &lt;password&gt;
+ /SET irssiproxy_ports &lt;network&gt;=&lt;port&gt; ... (eg. IRCnet=2777 efnet=2778)
+</code></pre>
 
-<p><strong>NOTE</strong>: you <strong>MUST</strong> add all the servers you
-are using to server and network lists with <code>/SERVER ADD</code> and 
-<code>/NETWORK ADD</code>. ..Except if you really don't want to for some
-reason, and you only use one server connection, you may simply set:</p>
+<p><strong>NOTE</strong>: you <strong>MUST</strong> add all the servers you are using to server and network lists with <code>/SERVER ADD</code> and <code>/NETWORK ADD</code>. ..Except if you really don’t want to for some reason, and you only use one server connection, you may simply set:</p>
 
-<pre>
-/SET irssiproxy_ports *=2777
-</pre>
+<pre><code> /SET irssiproxy_ports *=2777
+</code></pre>
 
 <p>Usage in client side:</p>
 
-<p>Just connect to the irssi proxy like it is a normal server with password
-specified in <code>/SET irssiproxy_password</code>. For example:</p>
+<p>Just connect to the irssi proxy like it is a normal server with password specified in <code>/SET irssiproxy_password</code>. For example:</p>
 
-<pre>
-/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
-/SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
-</pre>
+<pre><code> /SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
+ /SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
+</code></pre>
 
 <p>Irssi proxy works fine with other IRC clients as well.</p>
 
 <p><strong>SOCKS</strong></p>
 
-Irssi can be compiled with socks support (<code>--with-socks</code> option
-to configure), but I don't really know how it works, if at all. <code>/SET
-proxy</code> settings don't have anything to do with socks however.
+<p>Irssi can be compiled with socks support (<code>\--with-socks</code> option to configure), but I don’t really know how it works, if at all. <code>/SET proxy</code> settings don’t have anything to do with socks however.</p>
 
 <p><strong>Others</strong></p>
 
-<p>IRC bouncers usually work like IRC servers, and want a password. You can
-give it with:</p>
+<p>IRC bouncers usually work like IRC servers, and want a password. You can give it with:</p>
 
-<pre>
-/SET proxy_password &lt;password&gt;
-</pre>
+<pre><code> /SET proxy_password &lt;password&gt;
+</code></pre>
 
-<p>Irssi's defaults for connect strings are</p>
+<p>Irssi’s defaults for connect strings are</p>
 
-<pre>
-/SET proxy_string CONNECT %s %d
-/SET proxy_string_after
-</pre>
+<pre><code> /SET proxy_string CONNECT %s %d
+ /SET proxy_string_after
+</code></pre>
 
-<p>The proxy_string is sent before NICK/USER commands, the
-proxy_string_after is sent after them. %s and %d can be used with both
-of them.</p>
+<p>The proxy_string is sent before NICK/USER commands, the proxy_string_after is sent after them. %s and %d can be used with both of them.</p>
 
-<h3><a id="c11">11. Irssi's settings</a></h3>
+<h2 id="irssis-settings">11. Irssi’s settings</h2>
 
-<p>You probably don't like Irssi's default settings. I don't like them.
-But I'm still convinced that they're pretty good defaults. Here's some
-of them you might want to change (the default value is shown):</p>
+<p>You probably don’t like Irssi’s default settings. I don’t like them. But I’m still convinced that they’re pretty good defaults. Here’s some of them you might want to change (the default value is shown): Also check the <a href="/documentation/settings/">Settings Documentation</a></p>
 
 <p><strong>Queries</strong></p>
 
 <dl>
-<dt>/SET autocreate_own_query ON</dt>
-  <dd>Should new query window be created when you send message to someone
-  (with <code>/MSG</code>).</dd>
-
-<dt>/SET autocreate_query_level MSGS</dt>
-  <dd>New query window should be created when receiving messages with
-  this level. MSGS, DCCMSGS and NOTICES levels work currently. You can
-  disable this with <code>/SET -clear autocreate_query_level</code>.</dd>
-
-<dt>/SET autoclose_query 0</dt>
-  <dd>Query windows can be automatically closed after certain time of
-  inactivity. Queries with unread messages aren't closed and active
-  window is neither never closed. The value is given in seconds.</dd>
+  <dt>/SET autocreate_own_query ON</dt>
+  <dd>Should new query window be created when you send message to someone (with <code>/MSG</code>).</dd>
+  <dt>/SET autocreate_query_level MSGS</dt>
+  <dd>New query window should be created when receiving messages with this level. MSGS, DCCMSGS and NOTICES levels work currently. You can disable this with <code>/SET -clear autocreate_query_level</code>.</dd>
+  <dt>/SET autoclose_query 0</dt>
+  <dd>Query windows can be automatically closed after certain time of inactivity. Queries with unread messages aren’t closed and active window is neither never closed. The value is given in seconds.</dd>
 </dl>
 
 <p><strong>Windows</strong></p>
 
 <dl>
-<dt>/SET use_msgs_window OFF</dt>
-  <dd>Create messages window at startup. All private messages go to this
-  window. This only makes sense if you've disabled automatic query
-  windows. Message window can also be created manually with /WINDOW LEVEL
-  MSGS, /WINDOW NAME (msgs).</dd>
-
-<dt>/SET use_status_window ON</dt>
-  <dd>Create status window at startup. All messages that don't really
-  have better place go here, like all /WHOIS replies etc. Status window
-  can also be created manually with <code>/WINDOW LEVEL ALL -MSGS</code>,
-  <code>/WINDOW NAME (status)</code>.</dd>
-
-<dt>/SET autocreate_windows ON</dt>
-  <dd>Should we create new windows for new window items or just place
-  everything in one window</dd>
-
-<dt>/SET autoclose_windows ON</dt>
-  <dd>Should window be automatically closed when the last item in them is
-  removed (ie. <code>/PART</code>, <code>/UNQUERY</code>).</dd>
-
-<dt>/SET reuse_unused_windows OFF</dt>
-  <dd>When finding where to place new window item (channel, query) Irssi
-  first tries to use already existing empty windows. If this is set ON,
-  new window will always be created for all window items. This setting is
-  ignored if autoclose_windows is set ON.</dd>
-
-<dt>/SET window_auto_change OFF</dt>
-  <dd>Should Irssi automatically change to automatically created windows -
-  usually queries when someone sends you a message. To prevent
-  accidentally sending text meant to some other channel/nick, Irssi
-  clears the input buffer when changing the window. The text is still in
-  scrollback buffer, you can get it back with pressing arrow up key.</dd>
-
-<dt>/SET print_active_channel OFF</dt>
-  <dd>When you keep more than one channel in same window, Irssi prints
-  the messages coming to active channel as <code>&lt;nick&gt; text</code>
-  and other channels as <code>&lt;nick:channel&gt; text</code>. If this
-  setting is set ON, the messages to active channels are also printed in
-  the latter way.</dd>
-
-<dt>/SET window_history OFF</dt>
+  <dt>/SET use_msgs_window OFF</dt>
+  <dd>Create messages window at startup. All private messages go to this window. This only makes sense if you’ve disabled automatic query windows. Message window can also be created manually with /WINDOW LEVEL MSGS, /WINDOW NAME (msgs).</dd>
+  <dt>/SET use_status_window ON</dt>
+  <dd>Create status window at startup. All messages that don’t really have better place go here, like all /WHOIS replies etc. Status window can also be created manually with <code>/WINDOW LEVEL ALL -MSGS</code>, <code>/WINDOW NAME (status)</code>.</dd>
+  <dt>/SET autocreate_windows ON</dt>
+  <dd>Should we create new windows for new window items or just place everything in one window</dd>
+  <dt>/SET autoclose_windows ON</dt>
+  <dd>Should window be automatically closed when the last item in them is removed (ie. <code>/PART</code>, <code>/UNQUERY</code>).</dd>
+  <dt>/SET reuse_unused_windows OFF</dt>
+  <dd>When finding where to place new window item (channel, query) Irssi first tries to use already existing empty windows. If this is set ON, new window will always be created for all window items. This setting is ignored if autoclose_windows is set ON.</dd>
+  <dt>/SET window_auto_change OFF</dt>
+  <dd>Should Irssi automatically change to automatically created windows - usually queries when someone sends you a message. To prevent accidentally sending text meant to some other channel/nick, Irssi clears the input buffer when changing the window. The text is still in scrollback buffer, you can get it back with pressing arrow up key.</dd>
+  <dt>/SET print_active_channel OFF</dt>
+  <dd>When you keep more than one channel in same window, Irssi prints the messages coming to active channel as <code>&lt;nick&gt; text</code> and other channels as <code>&lt;nick:channel&gt; text</code>. If this setting is set ON, the messages to active channels are also printed in the latter way.</dd>
+  <dt>/SET window_history OFF</dt>
   <dd>Should command history be kept separate for each window.</dd>
 </dl>
 
-
 <p><strong>User information</strong></p>
 
 <dl>
-<dt>/SET nick</dt>
+  <dt>/SET nick</dt>
   <dd>Your nick name</dd>
-
-<dt>/SET alternate_nick</dt>
+  <dt>/SET alternate_nick</dt>
   <dd>Your alternate nick.</dd>
-
-<dt>/SET user_name</dt>
-  <dd>Your username, if you have ident enabled this doesn't affect 
-  anything</dd>
-
-<dt>/SET real_name</dt>
+  <dt>/SET user_name</dt>
+  <dd>Your username, if you have ident enabled this doesn’t affect anything</dd>
+  <dt>/SET real_name</dt>
   <dd>Your real name.</dd>
 </dl>
 
-
 <p><strong>Server information</strong></p>
 
 <dl>
-<dt>/SET skip_motd OFF</dt>
-  <dd>Should we hide server's MOTD (Message Of The Day).</dd>
-
-<dt>/SET server_reconnect_time 300</dt>
-  <dd>Seconds to wait before connecting to same server again. Don't set
-  this too low since it usually doesn't help at all - if the host is
-  down, the few extra minutes of waiting won't hurt much.</dd>
-
-<dt>/SET lag_max_before_disconnect 300</dt>
-  <dd>Maximum server lag in seconds before disconnecting and trying to
-  reconnect. This happens mostly only when network breaks between you and
-  IRC server.</dd>
+  <dt>/SET skip_motd OFF</dt>
+  <dd>Should we hide server’s MOTD (Message Of The Day).</dd>
+  <dt>/SET server_reconnect_time 300</dt>
+  <dd>Seconds to wait before connecting to same server again. Don’t set this too low since it usually doesn’t help at all - if the host is down, the few extra minutes of waiting won’t hurt much.</dd>
+  <dt>/SET lag_max_before_disconnect 300</dt>
+  <dd>Maximum server lag in seconds before disconnecting and trying to reconnect. This happens mostly only when network breaks between you and IRC server.</dd>
 </dl>
 
-
 <p><strong>Appearance</strong></p>
 
 <dl>
-<dt>/SET timestamps ON</dt>
+  <dt>/SET timestamps ON</dt>
   <dd>Show timestamps before each message.</dd>
-
-<dt>/SET hide_text_style OFF</dt>
+  <dt>/SET hide_text_style OFF</dt>
   <dd>Hide all bolds, underlines, MIRC colors, etc.</dd>
-
-<dt>/SET show_nickmode ON</dt>
-  <dd>Show the nick's mode before nick in channels, ie. ops have
-  <code>&lt;@nick&gt;</code>, voices <code>&lt;+nick&gt;</code> and others
-  <code>&lt;&nbsp;nick&gt;</code></dd>
-
-<dt>/SET show_nickmode_empty ON</dt>
-  <dd>If the nick doesn't have a mode, use one space. ie. ON:
-  <code>&lt;&nbsp;nick&gt;</code>, OFF: <code>&lt;nick&gt;</code></dd>
-
-<dt>/SET show_quit_once OFF</dt>
-  <dd>Show quit message only once in some of the channel windows the
-  nick was in instead of in all windows.</dd>
-
-<dt>/SET lag_min_show 100</dt>
-  <dd>Show the server lag in status bar if it's bigger than this, the
-  unit is 1/100 of seconds (ie. the default value of 100 = 1 second).</dd>
-
-<dt>/SET indent 10</dt>
-  <dd>When lines are longer than screen width they have to be split to
-  multiple lines. This specifies how much space to put at the beginning
-  of the line before the text begins. This can be overridden in text
-  formats with <code>%|</code> format.</dd>
-
-<dt>/SET activity_hide_targets</dt>
-  <dd>If you don't want to see window activity in some certain channels
-  or queries, list them here. For example <code>#boringchannel =bot1
-  =bot2</code>. If any highlighted text or message for you appears in that
-  window, this setting is ignored and the activity is shown.</dd>
+  <dt>/SET show_nickmode ON</dt>
+  <dd>Show the nick’s mode before nick in channels, ie. ops have <code>&lt;@nick&gt;</code>, voices <code>&lt;+nick&gt;</code> and others <code>&lt; nick&gt;</code></dd>
+  <dt>/SET show_nickmode_empty ON</dt>
+  <dd>If the nick doesn’t have a mode, use one space. ie. ON: <code>&lt; nick&gt;</code>, OFF: <code>&lt;nick&gt;</code></dd>
+  <dt>/SET show_quit_once OFF</dt>
+  <dd>Show quit message only once in some of the channel windows the nick was in instead of in all windows.</dd>
+  <dt>/SET lag_min_show 100</dt>
+  <dd>Show the server lag in status bar if it’s bigger than this, the unit is 1/100 of seconds (ie. the default value of 100 = 1 second).</dd>
+  <dt>/SET indent 10</dt>
+  <dd>When lines are longer than screen width they have to be split to multiple lines. This specifies how much space to put at the beginning of the line before the text begins. This can be overridden in text formats with <code>%|</code> format.</dd>
+  <dt>/SET activity_hide_targets</dt>
+  <dd>If you don’t want to see window activity in some certain channels or queries, list them here. For example <code>#boringchannel =bot1 =bot2</code>. If any highlighted text or message for you appears in that window, this setting is ignored and the activity is shown.</dd>
 </dl>
 
 <p><strong>Nick completion</strong></p>
 
 <dl>
-<dt>/SET completion_auto OFF</dt>
-  <dd>Automatically complete the nick if line begins with start of nick
-  and the completion character. Learn to use the tab-completion instead,
-  it's a lot better ;)</dd>
-
-<dt>/SET completion_char :</dt>
+  <dt>/SET completion_auto OFF</dt>
+  <dd>Automatically complete the nick if line begins with start of nick and the completion character. Learn to use the tab-completion instead, it’s a lot better ;)</dd>
+  <dt>/SET completion_char :</dt>
   <dd>Completion character to use.</dd>
 </dl>
 
-<h3><a id="c12">12. Statusbar</a></h3>
+<h2 id="statusbar">12. Statusbar</h2>
 
 <p><code>/STATUSBAR</code> displays a list of statusbars:</p>
 
-<pre>
-Name                           Type   Placement Position Visible
-window                         window bottom    0        always
-window_inact                   window bottom    1        inactive
-prompt                         root   bottom    100      always
-topic                          root   top       1        always
-</pre>
+<pre><code> Name                           Type   Placement Position Visible
+ window                         window bottom    0        always
+ window_inact                   window bottom    1        inactive
+ prompt                         root   bottom    100      always
+ topic                          root   top       1        always
+</code></pre>
 
-<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings and
-it's items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code>
-enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code>
-resets the statusbar to it's default settings, or if the statusbar was
-created by you, it will be removed.</p>
+<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings and it’s items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to it’s default settings, or if the statusbar was created by you, it will be removed.</p>
 
-<p>Type can be window or root, meaning if the statusbar should be
-created for each split window, or just once. Placement can be top or
-bottom. Position is a number, the higher the value the lower in screen
-it is. Visible can be always, active or inactive. Active/inactive is
-useful only with split windows, one split window is active and the rest
-are inactive. These settings can be changed with:</p>
+<p>Type can be window or root, meaning if the statusbar should be created for each split window, or just once. Placement can be top or bottom. Position is a number, the higher the value the lower in screen it is. Visible can be always, active or inactive. Active/inactive is useful only with split windows, one split window is active and the rest are inactive. These settings can be changed with:</p>
 
-<pre>
-/STATUSBAR &lt;name&gt; TYPE window|root
-/STATUSBAR &lt;name&gt; PLACEMENT top|bottom
-/STATUSBAR &lt;name&gt; POSITION &lt;num&gt;
-/STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
-</pre>
+<pre><code> /STATUSBAR &lt;name&gt; TYPE window|root
+ /STATUSBAR &lt;name&gt; PLACEMENT top|bottom
+ /STATUSBAR &lt;name&gt; POSITION &lt;num&gt;
+ /STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
+</code></pre>
 
-<p>When loading a new statusbar scripts, you'll need to also specify
-where you want to show it. Statusbar items can be modified with:</p>
+<p>When loading a new statusbar scripts, you’ll need to also specify where you want to show it. Statusbar items can be modified with:</p>
 
-<pre>
-/STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
-/STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
-</pre>
+<pre><code> /STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
+ /STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
+</code></pre>
 
-<p>The item name with statusbar scripts is usually same as the script's
-name. Script's documentation should tell if this isn't the case. So, to
-add mail.pl before the window activity item (see the list with
-<code>/STATUSBAR</code> window), use: <code>/STATUSBAR window ADD -before
-act mail</code>.</p>
+<p>The item name with statusbar scripts is usually same as the script’s name. Script’s documentation should tell if this isn’t the case. So, to add mail.pl before the window activity item (see the list with <code>/STATUSBAR</code> window), use: <code>/STATUSBAR window ADD -before act mail</code>.</p>

From b91f3c3025dc5cace2c14cb5b2da005400b5cd6a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 8 Feb 2016 14:53:17 +0100
Subject: [PATCH 0272/1650] tag as 0.8.18

---
 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 405e8b4c..e442a979 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v0.8.18-beta2 2016-01-13  The Irssi team <staff@irssi.org>
+v0.8.18 2016-02-13  The Irssi team <staff@irssi.org>
 	* Modules will now require to define a
 	      void MODULENAME ## _abicheck(int *version)
 	  method to ensure that they are compiled against the correct Irssi
diff --git a/configure.ac b/configure.ac
index bf39c95f..5f36a7f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.18-beta2)
+AC_INIT(irssi, 0.8.18)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 8723c0fb339dcf58c164fbc741122f9c3657ddea Mon Sep 17 00:00:00 2001
From: "Todd A. Pratt" <toddpratt978@gmail.com>
Date: Wed, 10 Feb 2016 09:47:10 -0500
Subject: [PATCH 0273/1650] fix whitespace

---
 src/fe-text/gui-entry.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 78b9166d..27778b2b 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -582,11 +582,11 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	if (size == 0 || entry->pos < size)
 		return;
 
-        if (entry->cutbuffer_len == 0) {
-          update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
-        }
-        int cutbuffer_new_size = entry->cutbuffer_len + size;
-        unichar *tmpcutbuffer = entry->cutbuffer;
+	if (entry->cutbuffer_len == 0) {
+		update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
+	}
+	int cutbuffer_new_size = entry->cutbuffer_len + size;
+	unichar *tmpcutbuffer = entry->cutbuffer;
 	switch (update_cutbuffer) {
 		case CUTBUFFER_UPDATE_APPEND:
 			entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
@@ -621,8 +621,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 
 			entry->cutbuffer_len = size;
 			entry->cutbuffer[size] = '\0';
-			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
-			       size * sizeof(unichar));
+			memcpy(entry->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar));
 			break;
 
 		case CUTBUFFER_UPDATE_NOOP:

From 88e2449f832d5c64b8ea30047f15319a66b17c1f Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Wed, 17 Feb 2016 22:34:44 +0100
Subject: [PATCH 0274/1650] fix formatting

---
 src/irc/proxy/listen.c | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 5dc9a704..ad1e4588 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -48,7 +48,7 @@ static void remove_client(CLIENT_REC *rec)
 
 	signal_emit("proxy client disconnected", 1, rec);
 	printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE,
-		  "Proxy: Client %s:%d disconnected", rec->host, rec->port);
+	          "Proxy: Client %s:%d disconnected", rec->host, rec->port);
 
 	g_free(rec->proxy_address);
 	net_sendbuffer_destroy(rec->handle, TRUE);
@@ -59,7 +59,7 @@ static void remove_client(CLIENT_REC *rec)
 }
 
 static void proxy_redirect_event(CLIENT_REC *client, const char *command,
-				 int count, const char *arg, int remote)
+                                 int count, const char *arg, int remote)
 {
 	char *str;
 
@@ -67,7 +67,7 @@ static void proxy_redirect_event(CLIENT_REC *client, const char *command,
 
 	str = g_strdup_printf("proxy %p", client);
 	server_redirect_event(client->server, command, count,
-			      arg, remote, NULL, "", str, NULL);
+	                      arg, remote, NULL, "", str, NULL);
 	g_free(str);
 }
 
@@ -94,15 +94,15 @@ static void grab_who(CLIENT_REC *client, const char *channel)
 	}
 
 	proxy_redirect_event(client, "who",
-			     client->server->one_endofwho ? 1 : count,
-			     arg->str, -1);
+	                     client->server->one_endofwho ? 1 : count,
+	                     arg->str, -1);
 
 	g_strfreev(list);
 	g_string_free(arg, TRUE);
 }
 
 static void handle_client_connect_cmd(CLIENT_REC *client,
-				      const char *cmd, const char *args)
+                                      const char *cmd, const char *args)
 {
 	const char *password;
 
@@ -114,7 +114,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 		else {
 			/* wrong password! */
 			remove_client(client);
-                        return;
+			return;
 		}
 	} else if (g_strcmp0(cmd, "NICK") == 0) {
 		g_free_not_null(client->nick);
@@ -130,8 +130,8 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 		} else {
 			signal_emit("proxy client connected", 1, client);
 			printtext(client->server, NULL, MSGLEVEL_CLIENTNOTICE,
-				  "Proxy: Client %s:%d connected",
-				  client->host, client->port);
+			          "Proxy: Client %s:%d connected",
+			          client->host, client->port);
 			client->connected = TRUE;
 			proxy_dump_data(client);
 		}
@@ -139,7 +139,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 }
 
 static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
-			      const char *data)
+                              const char *data)
 {
 	GSList *tmp;
 	if (!client->connected) {
@@ -162,8 +162,8 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		    g_ascii_strcasecmp(target, client->proxy_address) == 0 ||
 		    g_ascii_strcasecmp(target, client->nick) == 0) {
 			proxy_outdata(client, ":%s PONG %s :%s\r\n",
-				      client->proxy_address,
-                                      client->proxy_address, origin);
+			              client->proxy_address,
+			              client->proxy_address, origin);
 			g_free(params);
 			return;
 		}
@@ -174,25 +174,25 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		if (g_ascii_strcasecmp(args, "CTCP ON") == 0) {
                         /* client wants all ctcps */
 			client->want_ctcp = 1;
-	                for (tmp = proxy_clients; tmp != NULL; tmp = tmp->next) {
+			for (tmp = proxy_clients; tmp != NULL; tmp = tmp->next) {
 				CLIENT_REC *rec = tmp->data;
-				if ((g_ascii_strcasecmp(client->listen->ircnet,rec->listen->ircnet) == 0) &&
-					/* kludgy way to check if the clients aren't the same */
-					(client->recv_tag != rec->recv_tag)) {
-						if (rec->want_ctcp == 1)
-							proxy_outdata(rec, ":%s NOTICE %s :Another client is now receiving CTCPs sent to %s\r\n",
-			                                      rec->proxy_address, rec->nick, rec->listen->ircnet);
-						rec->want_ctcp = 0;
-		                }
+				if (g_ascii_strcasecmp(client->listen->ircnet, rec->listen->ircnet) == 0 &&
+				    /* kludgy way to check if the clients aren't the same */
+				    client->recv_tag != rec->recv_tag) {
+					if (rec->want_ctcp == 1)
+						proxy_outdata(rec, ":%s NOTICE %s :Another client is now receiving CTCPs sent to %s\r\n",
+						              rec->proxy_address, rec->nick, rec->listen->ircnet);
+					rec->want_ctcp = 0;
+				}
 
 			}
 			proxy_outdata(client, ":%s NOTICE %s :You're now receiving CTCPs sent to %s\r\n",
-				      client->proxy_address, client->nick,client->listen->ircnet);
+			              client->proxy_address, client->nick, client->listen->ircnet);
 		} else if (g_ascii_strcasecmp(args, "CTCP OFF") == 0) {
-                        /* client wants proxy to handle all ctcps */
+			/* client wants proxy to handle all ctcps */
 			client->want_ctcp = 0;
 			proxy_outdata(client, ":%s NOTICE %s :Proxy is now handling itself CTCPs sent to %s\r\n",
-				      client->proxy_address, client->nick, client->listen->ircnet);
+			              client->proxy_address, client->nick, client->listen->ircnet);
 		} else {
 			signal_emit("proxy client command", 3, client, args, data);
 		}
@@ -201,11 +201,11 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 
 	if (client->server == NULL || !client->server->connected) {
 		proxy_outdata(client, ":%s NOTICE %s :Not connected to server\r\n",
-			      client->proxy_address, client->nick);
-                return;
+		              client->proxy_address, client->nick);
+		return;
 	}
 
-        /* check if the command could be redirected */
+	/* check if the command could be redirected */
 	if (g_strcmp0(cmd, "WHO") == 0)
 		grab_who(client, args);
 	else if (g_strcmp0(cmd, "WHOWAS") == 0)
@@ -263,29 +263,29 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 		char *params, *target, *msg;
 
 		params = event_get_params(args, 2 | PARAM_FLAG_GETREST,
-					  &target, &msg);
+		                          &target, &msg);
 		proxy_outserver_all_except(client, "PRIVMSG %s", args);
 
 		ignore_next = TRUE;
 		if (*msg != '\001' || msg[strlen(msg)-1] != '\001') {
 			signal_emit(server_ischannel(SERVER(client->server), target) ?
-				    "message own_public" : "message own_private", 4,
-				    client->server, msg, target, target);
+			            "message own_public" : "message own_private", 4,
+			            client->server, msg, target, target);
 		} else if (strncmp(msg+1, "ACTION ", 7) == 0) {
 			/* action */
-                        msg[strlen(msg)-1] = '\0';
+			msg[strlen(msg)-1] = '\0';
 			signal_emit("message irc own_action", 3,
-				    client->server, msg+8, target);
+			            client->server, msg+8, target);
 		} else {
-                        /* CTCP */
+			/* CTCP */
 			char *p;
 
 			msg[strlen(msg)-1] = '\0';
 			p = strchr(msg, ' ');
-                        if (p != NULL) *p++ = '\0'; else p = "";
+			if (p != NULL) *p++ = '\0'; else p = "";
 
 			signal_emit("message irc own_ctcp", 4,
-				    client->server, msg+1, p, target);
+			            client->server, msg+1, p, target);
 		}
 		ignore_next = FALSE;
 		g_free(params);

From 4732e33ca9c9f9a48b57062ab254bf3aa90078bf Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Wed, 17 Feb 2016 23:06:51 +0100
Subject: [PATCH 0275/1650] irssi proxy: allow multiplexing multiple networks
 over a single port

---
 src/irc/proxy/listen.c | 58 +++++++++++++++++++++++++++++++++---------
 src/irc/proxy/proxy.h  |  1 +
 src/perl/irc/Irc.xs    |  1 +
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index ad1e4588..2322d47a 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -108,14 +108,44 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 
 	password = settings_get_str("irssiproxy_password");
 
-	if (password != NULL && g_strcmp0(cmd, "PASS") == 0) {
-		if (g_strcmp0(password, args) == 0)
-			client->pass_sent = TRUE;
-		else {
+	if (g_strcmp0(cmd, "PASS") == 0) {
+		const char *args_pass;
+
+		if (!client->multiplex) {
+			args_pass = args;
+		} else {
+			IRC_SERVER_REC *server;
+			char *tag;
+			const char *tag_end;
+
+			if ((tag_end = strchr(args, ':'))) {
+				args_pass = tag_end + 1;
+			} else {
+				tag_end = args + strlen(args);
+				args_pass = "";
+			}
+
+			tag = g_strndup(args, tag_end - args);
+			server = IRC_SERVER(server_find_chatnet(tag));
+			g_free(tag);
+
+			if (!server) {
+				/* an invalid network was specified */
+				remove_client(client);
+				return;
+			}
+
+			client->server = server;
+			g_free(client->proxy_address);
+			client->proxy_address = g_strdup_printf("%*s.proxy", (int)(tag_end - args), args);
+		}
+
+		if (password && g_strcmp0(password, args_pass) != 0) {
 			/* wrong password! */
 			remove_client(client);
 			return;
 		}
+		client->pass_sent = TRUE;
 	} else if (g_strcmp0(cmd, "NICK") == 0) {
 		g_free_not_null(client->nick);
 		client->nick = g_strdup(args);
@@ -124,7 +154,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 	}
 
 	if (client->nick != NULL && client->user_sent) {
-		if (*password != '\0' && !client->pass_sent) {
+		if ((*password != '\0' || client->multiplex) && !client->pass_sent) {
 			/* client didn't send us PASS, kill it */
 			remove_client(client);
 		} else {
@@ -337,7 +367,7 @@ static void sig_listen(LISTEN_REC *listen)
 	CLIENT_REC *rec;
 	IPADDR ip;
 	NET_SENDBUF_REC *sendbuf;
-        GIOChannel *handle;
+	GIOChannel *handle;
 	char host[MAX_IP_LEN];
 	int port;
 
@@ -352,9 +382,13 @@ static void sig_listen(LISTEN_REC *listen)
 	rec = g_new0(CLIENT_REC, 1);
 	rec->listen = listen;
 	rec->handle = sendbuf;
-        rec->host = g_strdup(host);
+	rec->host = g_strdup(host);
 	rec->port = port;
-	if (g_strcmp0(listen->ircnet, "*") == 0) {
+	if (g_strcmp0(listen->ircnet, "?") == 0) {
+		rec->multiplex = TRUE;
+		rec->proxy_address = g_strdup("multiplex.proxy");
+		rec->server = NULL;
+	} else if (g_strcmp0(listen->ircnet, "*") == 0) {
 		rec->proxy_address = g_strdup("irc.proxy");
 		rec->server = servers == NULL ? NULL : IRC_SERVER(servers->data);
 	} else {
@@ -363,15 +397,15 @@ static void sig_listen(LISTEN_REC *listen)
 			IRC_SERVER(server_find_chatnet(listen->ircnet));
 	}
 	rec->recv_tag = g_input_add(handle, G_INPUT_READ,
-			       (GInputFunction) sig_listen_client, rec);
+	                            (GInputFunction) sig_listen_client, rec);
 
 	proxy_clients = g_slist_prepend(proxy_clients, rec);
-	rec->listen->clients = g_slist_prepend(rec->listen->clients, rec);
+	listen->clients = g_slist_prepend(listen->clients, rec);
 
 	signal_emit("proxy client connecting", 1, rec);
 	printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE,
-		  "Proxy: New client %s:%d on port %d (%s)",
-		  rec->host, rec->port, listen->port, listen->ircnet);
+	          "Proxy: New client %s:%d on port %d (%s)",
+	          rec->host, rec->port, listen->port, listen->ircnet);
 }
 
 static void sig_incoming(IRC_SERVER_REC *server, const char *line)
diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h
index 158b0675..f37e9c95 100644
--- a/src/irc/proxy/proxy.h
+++ b/src/irc/proxy/proxy.h
@@ -29,6 +29,7 @@ typedef struct {
 	unsigned int user_sent:1;
 	unsigned int connected:1;
 	unsigned int want_ctcp:1;
+	unsigned int multiplex:1;
 } CLIENT_REC;
 
 #endif
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index db5c5f79..4217b4eb 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -157,6 +157,7 @@ static void perl_client_fill_hash(HV *hv, CLIENT_REC *client)
 	(void) hv_store(hv, "user_sent", 9, newSViv(client->user_sent), 0);
 	(void) hv_store(hv, "connected", 9, newSViv(client->connected), 0);
 	(void) hv_store(hv, "want_ctcp", 9, newSViv(client->want_ctcp), 0);
+	(void) hv_store(hv, "multiplex", 9, newSViv(client->multiplex), 0);
 	(void) hv_store(hv, "ircnet", 6, new_pv(client->listen->ircnet), 0);
 }
 

From effb00b858db17b3abf27661682255bd8139a95a Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Thu, 18 Feb 2016 01:17:24 +0100
Subject: [PATCH 0276/1650] add some documentation

---
 docs/proxy.txt          | 12 ++++++++++++
 docs/startup-HOWTO.html | 17 +++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/docs/proxy.txt b/docs/proxy.txt
index e6360a82..224d24e3 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -30,6 +30,18 @@ There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
 make it work properly.
 
+The special network name "?" allows the client to select the network
+dynamically on connect:
+
+  /SET irssiproxy_ports ?=2777
+
+Now the client can send <network>:<password> as the server password, e.g.
+
+  /CONNECT ... 2777 efnet:secret
+
+to connect to efnet. If there is no irssiproxy_password set, you can
+omit the ":" and just send the network name as the password.
+
 By default, the proxy binds to all available interfaces. To make it
 only listen on (for example) the loopback address:
 
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index deff3116..1b912b96 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -735,6 +735,13 @@ reason, and you only use one server connection, you may simply set:</p>
 /SET irssiproxy_ports *=2777
 </pre>
 
+<p>The special network name <code>?</code> allows the client to select the
+network dynamically on connect (see below):</p>
+
+<pre>
+/SET irssiproxy_ports ?=2777
+</pre>
+
 <p>Usage in client side:</p>
 
 <p>Just connect to the irssi proxy like it is a normal server with password
@@ -745,6 +752,16 @@ specified in <code>/SET irssiproxy_password</code>. For example:</p>
 /SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
 </pre>
 
+<p>Or, if you used <code>?</code> in <code>irssiproxy_ports</code>:</p>
+
+<pre>
+/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 IRCnet:secret
+/SERVER ADD -network efnet my.irssi-proxy.org 2777 efnet:secret
+</pre>
+
+<p>I.e. the network to connect to is specified as part of the password,
+separated by <code>:</code> from the actual proxy password.</p>
+
 <p>Irssi proxy works fine with other IRC clients as well.</p>
 
 <p><strong>SOCKS</strong></p>

From c9ce0c521a559727493b42f422b5cc10ede2d9b2 Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Thu, 18 Feb 2016 02:23:00 +0100
Subject: [PATCH 0277/1650] make pointer check explicit

---
 src/irc/proxy/listen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 2322d47a..cd946baa 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -118,7 +118,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 			char *tag;
 			const char *tag_end;
 
-			if ((tag_end = strchr(args, ':'))) {
+			if ((tag_end = strchr(args, ':')) != NULL) {
 				args_pass = tag_end + 1;
 			} else {
 				tag_end = args + strlen(args);

From 3167ccfbc21e6918133e5898f5e76596bb6de788 Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Thu, 18 Feb 2016 02:23:09 +0100
Subject: [PATCH 0278/1650] remove redundant check

---
 src/irc/proxy/listen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index cd946baa..3ec83773 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -140,7 +140,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 			client->proxy_address = g_strdup_printf("%*s.proxy", (int)(tag_end - args), args);
 		}
 
-		if (password && g_strcmp0(password, args_pass) != 0) {
+		if (g_strcmp0(password, args_pass) != 0) {
 			/* wrong password! */
 			remove_client(client);
 			return;

From 9f0e5da208f9ee775b82d50ff959d8599d1e1151 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Wed, 24 Feb 2016 00:35:27 +0530
Subject: [PATCH 0279/1650] use a #define'd LINE_SPLIT_LIMIT instead of
 hardcoding 400

---
 src/fe-text/gui-readline.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 0dd17394..51ccab5e 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -40,6 +40,9 @@
 #include <string.h>
 #include <signal.h>
 
+/* After LINE_SPLIT_LIMIT characters, the message will be split into multiple lines */
+#define LINE_SPLIT_LIMIT 400
+
 typedef void (*ENTRY_REDIRECT_KEY_FUNC) (int key, void *data, SERVER_REC *server, WI_ITEM_REC *item);
 typedef void (*ENTRY_REDIRECT_ENTRY_FUNC) (const char *line, void *data, SERVER_REC *server, WI_ITEM_REC *item);
 
@@ -227,7 +230,7 @@ static void paste_buffer_join_lines(GArray *buf)
 	}
 
 	/* all looks fine - now remove the whitespace, but don't let lines
-	   get longer than 400 chars */
+	   get longer than LINE_SPLIT_LIMIT chars */
 	dest = arr; last_lf = TRUE; last_lf_pos = NULL; line_len = 0;
 	for (i = 0; i < buf->len; i++) {
 		if (last_lf && isblank(arr[i])) {
@@ -245,7 +248,7 @@ static void paste_buffer_join_lines(GArray *buf)
 			last_lf = TRUE;
 		} else {
 			last_lf = FALSE;
-			if (++line_len >= 400 && last_lf_pos != NULL) {
+			if (++line_len >= LINE_SPLIT_LIMIT && last_lf_pos != NULL) {
 				memmove(last_lf_pos+1, last_lf_pos,
 					(dest - last_lf_pos) * sizeof(unichar));
 				*last_lf_pos = '\n'; last_lf_pos = NULL;

From ef0c7d3e7a6df6de1f8280ae8ae777a068d073c7 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Wed, 24 Feb 2016 00:36:35 +0530
Subject: [PATCH 0280/1650] Make pasting warning appear when long pastes are
 going to be split into many lines

---
 src/fe-text/gui-readline.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 51ccab5e..ff91f9e3 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -360,11 +360,24 @@ static void insert_paste_prompt(void)
 {
 	char *str;
 
+	/* The actual number of lines that will show up post-line-split */
+	int actual_line_count = paste_line_count;
+	int split_lines = paste_buffer->len / LINE_SPLIT_LIMIT;
+
+	/* in case this prompt is happening due to line-splitting, calculate the
+	   number of lines obtained from this. The number isn't entirely accurate;
+	   we just choose the greater of the two since the exact value isn't
+	   important */
+	if (split_lines > paste_verify_line_count &&
+		split_lines > paste_line_count) {
+		actual_line_count = split_lines;
+	}
+
 	paste_prompt = TRUE;
 	paste_old_prompt = g_strdup(active_entry->prompt);
 	printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
 			   TXT_PASTE_WARNING,
-			   paste_line_count,
+			   actual_line_count,
 			   active_win->active == NULL ? "window" :
 			   active_win->active->visible_name);
 
@@ -641,7 +654,11 @@ static gboolean paste_timeout(gpointer data)
 {
 	paste_was_bracketed_mode = paste_bracketed_mode;
 
-	if (paste_line_count == 0) {
+	/* number of lines after splitting extra-long messages */
+	int split_lines = paste_buffer->len / LINE_SPLIT_LIMIT;
+
+	/* Take into account the fact that a line may be split every LINE_SPLIT_LIMIT characters */
+	if (paste_line_count == 0 && split_lines <= paste_verify_line_count) {
 		int i;
 
 		for (i = 0; i < paste_buffer->len; i++) {
@@ -650,8 +667,9 @@ static gboolean paste_timeout(gpointer data)
 		}
 		g_array_set_size(paste_buffer, 0);
 	} else if (paste_verify_line_count > 0 &&
-		   paste_line_count >= paste_verify_line_count &&
-		   active_win->active != NULL)
+				(paste_line_count >= paste_verify_line_count ||
+				split_lines > paste_verify_line_count) &&
+				active_win->active != NULL)
 		insert_paste_prompt();
 	else
 		paste_flush(TRUE);

From 4d234c175c69d3bcc80d9918fad98e3c6f69d23e Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Fri, 26 Feb 2016 18:40:51 +0100
Subject: [PATCH 0281/1650] fix proxy server name

---
 src/irc/proxy/listen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 3ec83773..ef288201 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -137,7 +137,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 
 			client->server = server;
 			g_free(client->proxy_address);
-			client->proxy_address = g_strdup_printf("%*s.proxy", (int)(tag_end - args), args);
+			client->proxy_address = g_strdup_printf("%.*s.proxy", (int)(tag_end - args), args);
 		}
 
 		if (g_strcmp0(password, args_pass) != 0) {

From 3fc7e4d4ea7faaf3a14206c8b7c46ccc4b96309c Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Wed, 24 Feb 2016 18:59:00 +0100
Subject: [PATCH 0282/1650] reindent

---
 src/irc/proxy/listen.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index ef288201..43cef27f 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -202,7 +202,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
 
 	if (g_strcmp0(cmd, "PROXY") == 0) {
 		if (g_ascii_strcasecmp(args, "CTCP ON") == 0) {
-                        /* client wants all ctcps */
+			/* client wants all ctcps */
 			client->want_ctcp = 1;
 			for (tmp = proxy_clients; tmp != NULL; tmp = tmp->next) {
 				CLIENT_REC *rec = tmp->data;
@@ -494,12 +494,12 @@ static void sig_server_event(IRC_SERVER_REC *server, const char *line,
 static void event_connected(IRC_SERVER_REC *server)
 {
 	GSList *tmp;
-        const char *chatnet;
+	const char *chatnet;
 
 	if (!IS_IRC_SERVER(server))
 		return;
 
-        chatnet = server->connrec->chatnet;
+	chatnet = server->connrec->chatnet;
 	for (tmp = proxy_clients; tmp != NULL; tmp = tmp->next) {
 		CLIENT_REC *rec = tmp->data;
 
@@ -508,7 +508,7 @@ static void event_connected(IRC_SERVER_REC *server)
 		     (chatnet != NULL &&
 		      g_ascii_strcasecmp(chatnet, rec->listen->ircnet) == 0))) {
 			proxy_outdata(rec, ":%s NOTICE %s :Connected to server\r\n",
-				      rec->proxy_address, rec->nick);
+			                    rec->proxy_address, rec->nick);
 			rec->server = server;
 			proxy_client_reset_nick(rec);
 		}
@@ -516,7 +516,7 @@ static void event_connected(IRC_SERVER_REC *server)
 }
 
 static void proxy_server_disconnected(CLIENT_REC *client,
-				      IRC_SERVER_REC *server)
+                                      IRC_SERVER_REC *server)
 {
 	GSList *tmp;
 
@@ -655,9 +655,9 @@ static void add_listen(const char *ircnet, int port)
 	}
 
 	rec->tag = g_input_add(rec->handle, G_INPUT_READ,
-			       (GInputFunction) sig_listen, rec);
+	                       (GInputFunction) sig_listen, rec);
 
-        proxy_listens = g_slist_append(proxy_listens, rec);
+	proxy_listens = g_slist_append(proxy_listens, rec);
 }
 
 static void remove_listen(LISTEN_REC *rec)

From 8c1da2890c4ccbeac70d7798f29f00a81a770728 Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Wed, 24 Feb 2016 19:00:31 +0100
Subject: [PATCH 0283/1650] irssi proxy: allow listening on unix sockets

---
 src/common.h           |   2 +-
 src/irc/proxy/listen.c | 188 ++++++++++++++++++++++++++++++-----------
 src/irc/proxy/proxy.c  |   6 +-
 src/irc/proxy/proxy.h  |   5 +-
 src/perl/irc/Irc.xs    |   3 +-
 5 files changed, 148 insertions(+), 56 deletions(-)

diff --git a/src/common.h b/src/common.h
index 966e28d0..729049ab 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 1
+#define IRSSI_ABI_VERSION 2
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 43cef27f..cde4c0be 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -31,6 +31,8 @@
 
 #include "fe-common/core/printtext.h" /* FIXME: evil. need to do fe-proxy */
 
+#include <sys/un.h>
+
 GSList *proxy_listens;
 GSList *proxy_clients;
 
@@ -39,6 +41,66 @@ static int ignore_next;
 
 static int enabled = FALSE;
 
+static int is_all_digits(const char *s)
+{
+	return strspn(s, "0123456789") == strlen(s);
+}
+
+static GIOChannel *net_listen_unix(const char *path)
+{
+	struct sockaddr_un sa;
+	int saved_errno, handle;
+
+	g_return_val_if_fail(path != NULL, NULL);
+
+	handle = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (handle == -1) {
+		return NULL;
+	}
+
+	fcntl(handle, F_SETFL, O_NONBLOCK);
+
+	memset(&sa, '\0', sizeof sa);
+	sa.sun_family = AF_UNIX;
+	strncpy(sa.sun_path, path, sizeof sa.sun_path - 1);
+	if (bind(handle, (struct sockaddr *)&sa, sizeof sa) == -1) {
+		saved_errno = errno;
+		goto error_close;
+	}
+
+	if (listen(handle, 1) == -1) {
+		saved_errno = errno;
+		goto error_unlink;
+	}
+
+	return g_io_channel_new(handle);
+
+error_unlink:
+	unlink(sa.sun_path);
+error_close:
+	close(handle);
+	errno = saved_errno;
+	return NULL;
+}
+
+static GIOChannel *net_accept_unix(GIOChannel *handle)
+{
+	struct sockaddr_un sa;
+	int ret;
+	socklen_t addrlen;
+
+	g_return_val_if_fail(handle != NULL, NULL);
+
+	addrlen = sizeof sa;
+	ret = accept(g_io_channel_unix_get_fd(handle), (struct sockaddr *)&sa, &addrlen);
+
+	if (ret < 0)
+		return NULL;
+
+	fcntl(ret, F_SETFL, O_NONBLOCK);
+	return g_io_channel_new(ret);
+}
+
 static void remove_client(CLIENT_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
@@ -48,13 +110,13 @@ static void remove_client(CLIENT_REC *rec)
 
 	signal_emit("proxy client disconnected", 1, rec);
 	printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE,
-	          "Proxy: Client %s:%d disconnected", rec->host, rec->port);
+	          "Proxy: Client %s disconnected", rec->addr);
 
 	g_free(rec->proxy_address);
 	net_sendbuffer_destroy(rec->handle, TRUE);
 	g_source_remove(rec->recv_tag);
 	g_free_not_null(rec->nick);
-	g_free_not_null(rec->host);
+	g_free_not_null(rec->addr);
 	g_free(rec);
 }
 
@@ -160,8 +222,8 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 		} else {
 			signal_emit("proxy client connected", 1, client);
 			printtext(client->server, NULL, MSGLEVEL_CLIENTNOTICE,
-			          "Proxy: Client %s:%d connected",
-			          client->host, client->port);
+			          "Proxy: Client %s connected",
+			          client->addr);
 			client->connected = TRUE;
 			proxy_dump_data(client);
 		}
@@ -370,20 +432,30 @@ static void sig_listen(LISTEN_REC *listen)
 	GIOChannel *handle;
 	char host[MAX_IP_LEN];
 	int port;
+	char *addr;
 
 	g_return_if_fail(listen != NULL);
 
 	/* accept connection */
-	handle = net_accept(listen->handle, &ip, &port);
-	if (handle == NULL)
-		return;
-	net_ip2host(&ip, host);
+	if (listen->port) {
+		handle = net_accept(listen->handle, &ip, &port);
+		if (handle == NULL)
+			return;
+		net_ip2host(&ip, host);
+		addr = g_strdup_printf("%s:%d", host, port);
+	} else {
+		/* no port => this is a unix socket */
+		handle = net_accept_unix(listen->handle);
+		if (handle == NULL)
+			return;
+		addr = g_strdup("(local)");
+	}
+
 	sendbuf = net_sendbuffer_create(handle, 0);
 	rec = g_new0(CLIENT_REC, 1);
 	rec->listen = listen;
 	rec->handle = sendbuf;
-	rec->host = g_strdup(host);
-	rec->port = port;
+	rec->addr = addr;
 	if (g_strcmp0(listen->ircnet, "?") == 0) {
 		rec->multiplex = TRUE;
 		rec->proxy_address = g_strdup("multiplex.proxy");
@@ -404,8 +476,8 @@ static void sig_listen(LISTEN_REC *listen)
 
 	signal_emit("proxy client connecting", 1, rec);
 	printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE,
-	          "Proxy: New client %s:%d on port %d (%s)",
-	          rec->host, rec->port, listen->port, listen->ircnet);
+	          "Proxy: New client %s on port %s (%s)",
+	          rec->addr, listen->port_or_path, listen->ircnet);
 }
 
 static void sig_incoming(IRC_SERVER_REC *server, const char *line)
@@ -601,14 +673,19 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
 		proxy_outserver_all(server, "PRIVMSG %s :\001ACTION %s\001", target, msg);
 }
 
-static LISTEN_REC *find_listen(const char *ircnet, int port)
+static LISTEN_REC *find_listen(const char *ircnet, int port, const char *port_or_path)
 {
 	GSList *tmp;
 
 	for (tmp = proxy_listens; tmp != NULL; tmp = tmp->next) {
 		LISTEN_REC *rec = tmp->data;
 
-		if (rec->port == port &&
+		if ((port
+		        ? /* a tcp port */
+		          rec->port == port
+		        : /* a unix socket path */
+		          g_strcmp0(rec->port_or_path, port_or_path) == 0
+		    ) &&
 		    g_ascii_strcasecmp(rec->ircnet, ircnet) == 0)
 			return rec;
 	}
@@ -616,43 +693,48 @@ static LISTEN_REC *find_listen(const char *ircnet, int port)
 	return NULL;
 }
 
-static void add_listen(const char *ircnet, int port)
+static void add_listen(const char *ircnet, int port, const char *port_or_path)
 {
 	LISTEN_REC *rec;
 	IPADDR ip4, ip6, *my_ip;
+	GIOChannel *handle;
 
-	if (port <= 0 || *ircnet == '\0')
+	if (*port_or_path == '\0' || port < 0 || *ircnet == '\0')
 		return;
 
-	/* bind to specific host/ip? */
-	my_ip = NULL;
-	if (*settings_get_str("irssiproxy_bind") != '\0') {
-		if (net_gethostbyname(settings_get_str("irssiproxy_bind"),
-				      &ip4, &ip6) != 0) {
-			printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
-				  "Proxy: can not resolve '%s' - aborting",
-				  settings_get_str("irssiproxy_bind"));
-			return;
-		}
+	if (port == 0) {
+		/* listening on a unix socket */
+		handle = net_listen_unix(port_or_path);
+	} else {
+		/* bind to specific host/ip? */
+		my_ip = NULL;
+		if (*settings_get_str("irssiproxy_bind") != '\0') {
+			if (net_gethostbyname(settings_get_str("irssiproxy_bind"),
+				                 &ip4, &ip6) != 0) {
+				printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
+				          "Proxy: can not resolve '%s' - aborting",
+				          settings_get_str("irssiproxy_bind"));
+				return;
+			}
 
-		my_ip = ip6.family == 0 ? &ip4 : ip4.family == 0 ||
-			settings_get_bool("resolve_prefer_ipv6") ? &ip6 : &ip4;
+			my_ip = ip6.family == 0 ? &ip4 : ip4.family == 0 ||
+				settings_get_bool("resolve_prefer_ipv6") ? &ip6 : &ip4;
+		}
+		handle = net_listen(my_ip, &port);
+	}
+
+	if (handle == NULL) {
+		printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
+		          "Proxy: Listen in port %s failed: %s",
+		          port_or_path, g_strerror(errno));
+		return;
 	}
 
 	rec = g_new0(LISTEN_REC, 1);
+	rec->handle = handle;
 	rec->ircnet = g_strdup(ircnet);
 	rec->port = port;
-
-	rec->handle = net_listen(my_ip, &rec->port);
-
-	if (rec->handle == NULL) {
-		printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			  "Proxy: Listen in port %d failed: %s",
-			  rec->port, g_strerror(errno));
-		g_free(rec->ircnet);
-                g_free(rec);
-		return;
-	}
+	rec->port_or_path = g_strdup(port_or_path);
 
 	rec->tag = g_input_add(rec->handle, G_INPUT_READ,
 	                       (GInputFunction) sig_listen, rec);
@@ -667,8 +749,13 @@ static void remove_listen(LISTEN_REC *rec)
 	while (rec->clients != NULL)
 		remove_client(rec->clients->data);
 
+	/* remove unix socket because bind wants to (re)create it */
+	if (rec->port == 0)
+		unlink(rec->port_or_path);
+
 	net_disconnect(rec->handle);
 	g_source_remove(rec->tag);
+	g_free(rec->port_or_path);
 	g_free(rec->ircnet);
 	g_free(rec);
 }
@@ -678,7 +765,7 @@ static void read_settings(void)
 	LISTEN_REC *rec;
 	GSList *remove_listens = NULL;
 	GSList *add_listens = NULL;
-	char **ports, **tmp, *ircnet, *port;
+	char **ports, **tmp, *ircnet, *port_or_path;
 	int portnum;
 
 	remove_listens = g_slist_copy(proxy_listens);
@@ -686,20 +773,25 @@ static void read_settings(void)
 	ports = g_strsplit(settings_get_str("irssiproxy_ports"), " ", -1);
 	for (tmp = ports; *tmp != NULL; tmp++) {
 		ircnet = *tmp;
-		port = strchr(ircnet, '=');
-		if (port == NULL)
+		port_or_path = strchr(ircnet, '=');
+		if (port_or_path == NULL)
 			continue;
 
-		*port++ = '\0';
-		portnum = atoi(port);
-		if (portnum <=  0)
-			continue;
+		*port_or_path++ = '\0';
+		if (is_all_digits(port_or_path)) {
+			portnum = atoi(port_or_path);
+			if (portnum <= 0)
+				continue;
+		} else {
+			portnum = 0;
+		}
 
-		rec = find_listen(ircnet, portnum);
+		rec = find_listen(ircnet, portnum, port_or_path);
 		if (rec == NULL) {
 			rec = g_new0(LISTEN_REC, 1);
 			rec->ircnet = ircnet; /* borrow */
 			rec->port = portnum;
+			rec->port_or_path = port_or_path; /* borrow */
 			add_listens = g_slist_prepend(add_listens, rec);
 		} else {
 			/* remove from the list of listens to remove == keep it */
@@ -714,7 +806,7 @@ static void read_settings(void)
 
 	while (add_listens != NULL) {
 		rec = add_listens->data;
-		add_listen(rec->ircnet, rec->port);
+		add_listen(rec->ircnet, rec->port, rec->port_or_path);
 		add_listens = g_slist_remove(add_listens, rec);
 		g_free(rec);
 	}
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index 50a41b21..1a714045 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -44,10 +44,10 @@ static void cmd_irssiproxy_status(const char *data, IRC_SERVER_REC *server)
 		CLIENT_REC *rec = tmp->data;
 
 		printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
-			  "  %s:%d connect%s to %d (%s)",
-			  rec->host, rec->port,
+			  "  %s connect%s to %s (%s)",
+			  rec->addr,
 			  rec->connected ? "ed" : "ing",
-			  rec->listen->port, rec->listen->ircnet);
+			  rec->listen->port_or_path, rec->listen->ircnet);
 	}
 }
 
diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h
index f37e9c95..620ea605 100644
--- a/src/irc/proxy/proxy.h
+++ b/src/irc/proxy/proxy.h
@@ -9,17 +9,18 @@
 
 typedef struct {
 	int port;
+	char *port_or_path;
 	char *ircnet;
 
 	int tag;
 	GIOChannel *handle;
 
 	GSList *clients;
+
 } LISTEN_REC;
 
 typedef struct {
-	char *nick, *host;
-	int port;
+	char *nick, *addr;
 	NET_SENDBUF_REC *handle;
 	int recv_tag;
 	char *proxy_address;
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 4217b4eb..3f8ccc2e 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -149,8 +149,7 @@ static void perl_notifylist_fill_hash(HV *hv, NOTIFYLIST_REC *notify)
 static void perl_client_fill_hash(HV *hv, CLIENT_REC *client)
 {
 	(void) hv_store(hv, "nick", 4, new_pv(client->nick), 0);
-	(void) hv_store(hv, "host", 4, new_pv(client->host), 0);
-	(void) hv_store(hv, "port", 4, newSViv(client->port), 0);
+	(void) hv_store(hv, "addr", 4, new_pv(client->addr), 0);
 	(void) hv_store(hv, "proxy_address", 13, new_pv(client->proxy_address), 0);
 	(void) hv_store(hv, "server", 6, iobject_bless(client->server), 0);
 	(void) hv_store(hv, "pass_sent", 9, newSViv(client->pass_sent), 0);

From 4baefd25747df116c19ea1301c5fe8fb7eef3716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity@gmail.com>
Date: Tue, 8 Mar 2016 23:00:20 +0200
Subject: [PATCH 0284/1650] Fix SASL EXTERNAL authentication
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "AUTHENTICATE" command is always required – it's part of the IRCv3
SASL framing. RFC 4422 only documents the Base64 payload.
---
 src/irc/core/sasl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index a04eaf45..8fba9ba2 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -145,7 +145,7 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
 
 		case SASL_MECHANISM_EXTERNAL:
 			/* Empty response */
-			irc_send_cmdv(server, "+");
+			irc_send_cmdv(server, "AUTHENTICATE +");
 			break;
 	}
 

From e853392f430b9635cd7e8ada28c68426c2625298 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 11 Mar 2016 14:55:31 -0300
Subject: [PATCH 0285/1650] Remove sasl timeout source when the server
 disconnects

---
 src/irc/core/sasl.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 8fba9ba2..db099368 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -153,6 +153,20 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
 	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
 }
 
+static void sasl_disconnected(IRC_SERVER_REC *server)
+{
+	g_return_if_fail(server != NULL);
+
+	if (!IS_IRC_SERVER(server)) {
+		return;
+	}
+
+	if (server->sasl_timeout != -1) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = -1;
+	}
+}
+
 void sasl_init(void)
 {
 	signal_add_first("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
@@ -163,6 +177,7 @@ void sasl_init(void)
 	signal_add_first("event 905", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 907", (SIGNAL_FUNC) sasl_already);
+	signal_add_first("server disconnected", (SIGNAL_FUNC) sasl_disconnected);
 }
 
 void sasl_deinit(void)
@@ -175,4 +190,5 @@ void sasl_deinit(void)
 	signal_remove("event 905", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 907", (SIGNAL_FUNC) sasl_already);
+	signal_remove("server disconnected", (SIGNAL_FUNC) sasl_disconnected);
 }

From be733d24824fe2a3502a1e4ab76d50699052dd65 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sun, 13 Mar 2016 13:28:04 -0700
Subject: [PATCH 0286/1650] Clear error queue before SSL I/O operations

Otherwise we can see errors that are not related to the operation
we check for. SSL_get_error() inspects the thread's error queue.
See https://www.openssl.org/docs/manmaster/ssl/SSL_get_error.html for
more information.
---
 src/core/network-openssl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 465c4154..d0f23253 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -289,6 +289,7 @@ static GIOStatus irssi_ssl_read(GIOChannel *handle, gchar *buf, gsize len, gsize
 	const char *errstr;
 	gchar *errmsg;
 
+	ERR_clear_error();
 	ret1 = SSL_read(chan->ssl, buf, len);
 	if(ret1 <= 0)
 	{
@@ -334,6 +335,7 @@ static GIOStatus irssi_ssl_write(GIOChannel *handle, const gchar *buf, gsize len
 	const char *errstr;
 	gchar *errmsg;
 
+	ERR_clear_error();
 	ret1 = SSL_write(chan->ssl, (const char *)buf, len);
 	if(ret1 <= 0)
 	{
@@ -581,6 +583,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	X509 *cert;
 	const char *errstr;
 
+	ERR_clear_error();
 	ret = SSL_connect(chan->ssl);
 	if (ret <= 0) {
 		err = SSL_get_error(chan->ssl, ret);

From 8ab6bdf2ce884fa7363272805287c341b2b2fb01 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sun, 13 Mar 2016 15:09:52 -0700
Subject: [PATCH 0287/1650] Add clear error calls to irssi_ssl_get_iochannel

---
 src/core/network-openssl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index d0f23253..a18e6fc7 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -473,6 +473,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	if(!(fd = g_io_channel_unix_get_fd(handle)))
 		return NULL;
 
+	ERR_clear_error();
 	ctx = SSL_CTX_new(SSLv23_client_method());
 	if (ctx == NULL) {
 		g_error("Could not allocate memory for SSL context");
@@ -491,6 +492,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		scert = convert_home(mycert);
 		if (mypkey && *mypkey)
 			spkey = convert_home(mypkey);
+		ERR_clear_error();
 		if (! SSL_CTX_use_certificate_file(ctx, scert, SSL_FILETYPE_PEM))
 			g_warning("Loading of client certificate '%s' failed: %s", mycert, ERR_reason_error_string(ERR_get_error()));
 		else if (! SSL_CTX_use_PrivateKey_file(ctx, spkey ? spkey : scert, SSL_FILETYPE_PEM))

From 27c37cb3f39578b473a0684e6e55bf23d1910903 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sun, 13 Mar 2016 22:04:59 +0100
Subject: [PATCH 0288/1650] Return -1 from null-test to comply with the rest of
 strarray_find

---
 src/core/misc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index aaa470f5..c26610ec 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -169,8 +169,8 @@ int strarray_find(char **array, const char *item)
 	char **tmp;
 	int index;
 
-	g_return_val_if_fail(array != NULL, 0);
-	g_return_val_if_fail(item != NULL, 0);
+	g_return_val_if_fail(array != NULL, -1);
+	g_return_val_if_fail(item != NULL, -1);
 
 	index = 0;
 	for (tmp = array; *tmp != NULL; tmp++, index++) {

From 94b823c3cd410abb2fa54ecbcf298550d5e2ba88 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Fri, 11 Mar 2016 09:12:38 +0100
Subject: [PATCH 0289/1650] Use glob matching for activity_hide_targets

spaces vs tabs!

strarray_find* needs to return -1 if no index found
---
 src/core/misc.c                     | 18 ++++++++++++++++++
 src/core/misc.h                     |  1 +
 src/fe-common/core/fe-common-core.c |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index aaa470f5..2284d3b1 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -181,6 +181,24 @@ int strarray_find(char **array, const char *item)
 	return -1;
 }
 
+
+int strarray_find_glob(char **array, const char *item)
+{
+	char **tmp;
+	int index;
+
+	g_return_val_if_fail(array != NULL, -1);
+	g_return_val_if_fail(item != NULL, -1);
+
+	index = 0;
+	for (tmp = array; *tmp != NULL; tmp++, index++) {
+		if (g_pattern_match_simple(*tmp, item))
+			return index;
+	}
+
+	return -1;
+}
+
 GSList *gslist_find_string(GSList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
diff --git a/src/core/misc.h b/src/core/misc.h
index 7e78d3b9..dd8bb14c 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -111,6 +111,7 @@ char *replace_chars(char *str, char from, char to);
 int strarray_length(char **array);
 /* return index of `item' in `array' or -1 if not found */
 int strarray_find(char **array, const char *item);
+int strarray_find_glob(char **array, const char *item);
 
 /* string -> uoff_t */
 uoff_t str_to_uofft(const char *str);
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index ee7f9424..f0549358 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -464,7 +464,7 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 
 	if (dest->server_tag != NULL) {
 		char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
-		int ret = strarray_find(array, tagtarget);
+		int ret = strarray_find_glob(array, tagtarget);
 		g_free(tagtarget);
 		if (ret != -1)
 			return TRUE;

From bcebed5a72308f57de8f96f6ab9ad5ccad93a811 Mon Sep 17 00:00:00 2001
From: KindOne <lostinwhatever@outlook.com>
Date: Mon, 14 Mar 2016 21:23:37 -0400
Subject: [PATCH 0290/1650] Replace spaces with tabs

---
 src/core/chat-commands.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 8e881679..7f000cf5 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -117,8 +117,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 	if (g_hash_table_lookup(optlist, "!") != NULL)
 		conn->no_autojoin_channels = TRUE;
 
-    if (g_hash_table_lookup(optlist, "noautosendcmd") != NULL)
-        conn->no_autosendcmd = TRUE;
+	if (g_hash_table_lookup(optlist, "noautosendcmd") != NULL)
+		conn->no_autosendcmd = TRUE;
 
 	if (g_hash_table_lookup(optlist, "noproxy") != NULL)
                 g_free_and_null(conn->proxy);

From f6c2805b91161a01378c9bbe853521c08d460c60 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 17 Mar 2016 22:27:05 +0100
Subject: [PATCH 0291/1650] Do not assume any default value for statusmsg.

If the server didn't send it then just skip the check, the old value it
defaulted to was possibly overlapping with the CHANTYPES leading to an
incorrect behaviour. Fixes #435.
---
 src/irc/core/irc-servers.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 81f0c269..d6fb8018 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -81,12 +81,12 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 	chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
 	if (chantypes == NULL)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
-	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg == NULL)
-		statusmsg = "@+";
 
-	while (strchr(statusmsg, *data) != NULL)
-		data++;
+	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
+	if (statusmsg != NULL) {
+		while (strchr(statusmsg, *data) != NULL)
+			data++;
+	}
 
 	return strchr(chantypes, *data) != NULL;
 }

From 857e27aef6d04edc1e47d52d74031ba279d2da1a Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Thu, 17 Mar 2016 23:58:46 +0100
Subject: [PATCH 0292/1650] Don't use glob matching, just regular string
 comparisons

---
 src/core/misc.c                     | 20 +-------------------
 src/core/misc.h                     |  1 -
 src/fe-common/core/fe-common-core.c | 13 +++++++++++--
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 2284d3b1..c26610ec 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -169,30 +169,12 @@ int strarray_find(char **array, const char *item)
 	char **tmp;
 	int index;
 
-	g_return_val_if_fail(array != NULL, 0);
-	g_return_val_if_fail(item != NULL, 0);
-
-	index = 0;
-	for (tmp = array; *tmp != NULL; tmp++, index++) {
-		if (g_ascii_strcasecmp(*tmp, item) == 0)
-			return index;
-	}
-
-	return -1;
-}
-
-
-int strarray_find_glob(char **array, const char *item)
-{
-	char **tmp;
-	int index;
-
 	g_return_val_if_fail(array != NULL, -1);
 	g_return_val_if_fail(item != NULL, -1);
 
 	index = 0;
 	for (tmp = array; *tmp != NULL; tmp++, index++) {
-		if (g_pattern_match_simple(*tmp, item))
+		if (g_ascii_strcasecmp(*tmp, item) == 0)
 			return index;
 	}
 
diff --git a/src/core/misc.h b/src/core/misc.h
index dd8bb14c..7e78d3b9 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -111,7 +111,6 @@ char *replace_chars(char *str, char from, char to);
 int strarray_length(char **array);
 /* return index of `item' in `array' or -1 if not found */
 int strarray_find(char **array, const char *item);
-int strarray_find_glob(char **array, const char *item);
 
 /* string -> uoff_t */
 uoff_t str_to_uofft(const char *str);
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index f0549358..1b2ab1e2 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -459,12 +459,21 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 {
 	g_return_val_if_fail(array != NULL, FALSE);
 
+	if (strarray_find(array, "*") != -1)
+		return TRUE;
+
 	if (strarray_find(array, dest->target) != -1)
 		return TRUE;
 
 	if (dest->server_tag != NULL) {
-		char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
-		int ret = strarray_find_glob(array, tagtarget);
+		char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, "*");
+		int ret = strarray_find(array, tagtarget);
+		g_free(tagtarget);
+		if (ret != -1)
+			return TRUE;
+
+		tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
+		ret = strarray_find(array, tagtarget);
 		g_free(tagtarget);
 		if (ret != -1)
 			return TRUE;

From f31d37a85271e0196aeefd409f0ab361ffd8c2ff Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 18 Mar 2016 22:50:00 +0100
Subject: [PATCH 0293/1650] Make ischannel_func return false for empty strings

---
 src/irc/core/irc-servers.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index d6fb8018..1df95f70 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -78,17 +78,23 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 	IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server;
 	char *chantypes, *statusmsg;
 
+	g_return_val_if_fail(data != NULL, FALSE);
+
+	/* empty string is no channel */
+	if (*data == '\0')
+		return FALSE;
+
 	chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
 	if (chantypes == NULL)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
 	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg != NULL) {
-		while (strchr(statusmsg, *data) != NULL)
-			data++;
-	}
+	if (statusmsg != NULL)
+		data += strspn(data, statusmsg);
 
-	return strchr(chantypes, *data) != NULL;
+	/* strchr(3) considers the trailing NUL as part of the string, make sure
+	 * we didn't advance too much. */
+	return *data != '\0' && strchr(chantypes, *data) != NULL;
 }
 
 static char **split_line(const SERVER_REC *server, const char *line,

From 6745dd6159afc6ff220d09d7adc1923218fa756b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 18 Mar 2016 20:18:58 +0100
Subject: [PATCH 0294/1650] Throw an error when a chatnet has no available url

If you type /connect <CN> and the chatnet <CN> has no url available
let's just throw an error instead of trying to process <CN> as a url.
---
 src/core/chat-commands.c              | 7 +++++++
 src/core/commands.h                   | 3 ++-
 src/core/servers-setup.c              | 2 ++
 src/fe-common/core/fe-core-commands.c | 3 ++-
 src/fe-common/core/module-formats.c   | 1 +
 src/fe-common/core/module-formats.h   | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 7f000cf5..a9404fa3 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -73,6 +73,13 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 
 	conn = server_create_conn(proto != NULL ? proto->id : -1, addr,
 				  atoi(portstr), chatnet, password, nick);
+	if (conn == NULL) {
+		signal_emit("error command", 1,
+			    GINT_TO_POINTER(CMDERR_NO_SERVER_DEFINED));
+		cmd_params_free(free_arg);
+		return NULL;
+	}
+
 	if (proto == NULL)
 		proto = chat_protocol_find_id(conn->chat_type);
 
diff --git a/src/core/commands.h b/src/core/commands.h
index 72105ad3..93d6276b 100644
--- a/src/core/commands.h
+++ b/src/core/commands.h
@@ -41,7 +41,8 @@ enum {
 	CMDERR_INVALID_TIME, /* invalid time specification */
 	CMDERR_INVALID_CHARSET, /* invalid charset specification */
 	CMDERR_EVAL_MAX_RECURSE, /* eval hit recursion limit */
-	CMDERR_PROGRAM_NOT_FOUND /* program not found */
+	CMDERR_PROGRAM_NOT_FOUND, /* program not found */
+	CMDERR_NO_SERVER_DEFINED, /* no server has been defined for a given chatnet */
 };
 
 /* Return the full command for `alias' */
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 4a048282..990d2d4b 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -323,6 +323,8 @@ server_create_conn(int chat_type, const char *dest, int port,
 		rec = create_chatnet_conn(chatrec->name, port, password, nick);
 		if (rec != NULL)
 			return rec;
+		/* The chatnet has no url to connect to */
+		return NULL;
 	}
 
 	chatrec = chatnet == NULL ? NULL : chatnet_find(chatnet);
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 7b1d7b94..97a246ec 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -51,7 +51,8 @@ static int ret_texts[] = {
         TXT_INVALID_TIME,
         TXT_INVALID_CHARSET,
         TXT_EVAL_MAX_RECURSE,
-        TXT_PROGRAM_NOT_FOUND
+        TXT_PROGRAM_NOT_FOUND,
+	TXT_NO_SERVER_DEFINED,
 };
 
 int command_hide_output;
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index e6d32b6d..b897b0c6 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -223,6 +223,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "invalid_charset", "Invalid charset: $0", 1, { 0 } },
 	{ "eval_max_recurse", "/eval hit maximum recursion limit", 0 },
 	{ "program_not_found", "Could not find file or file is not executable", 0 },
+	{ "no_server_defined", "No servers defined for this network, see /help server for how to add one", 0 },
 
 	/* ---- */
 	{ NULL, "Themes", 0 },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 3f06bb97..de1e13f2 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -192,6 +192,7 @@ enum {
 	TXT_INVALID_CHARSET,
 	TXT_EVAL_MAX_RECURSE,
 	TXT_PROGRAM_NOT_FOUND,
+	TXT_NO_SERVER_DEFINED,
 
 	TXT_FILL_11,
 

From 8394973d5a3f37523e95fb5b51620de9284d743f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 20 Mar 2016 12:16:48 +0100
Subject: [PATCH 0295/1650] Bump the ABI version

Since a new format has been added.
---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 729049ab..33dbd481 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 2
+#define IRSSI_ABI_VERSION 3
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 

From 550fe6f010f682d352077579d5056609a68e9814 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 20 Mar 2016 21:47:02 +0100
Subject: [PATCH 0296/1650] Use 0 as a sentinel value for sasl_timeout

If sasl_timeout is never initialized with a valid timeout id then
calling /disconnect on the server calls g_source_remove() with 0 as tag,
causing an harmless error message to be printed.
Beside that, the sasl_timeout field is defined as a unsigned int.
We can use 0 as sentiel since g_timeout_add returns tags that are always
greater than zero.
---
 src/irc/core/sasl.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index db099368..b74b6a8c 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -34,7 +34,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
 	irc_send_cmd_now(server, "AUTHENTICATE *");
 	cap_finish_negotiation(server);
 
-	server->sasl_timeout = -1;
+	server->sasl_timeout = 0;
 
 	signal_emit("server sasl failure", 2, server, "The authentication timed out");
 
@@ -64,9 +64,9 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 	char *params, *error;
 
 	/* Stop any pending timeout, if any */
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	params = event_get_params(data, 2, NULL, &error);
@@ -81,9 +81,9 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 
 static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	signal_emit("server sasl success", 1, server);
@@ -94,9 +94,9 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
 
 static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	signal_emit("server sasl success", 1, server);
@@ -114,9 +114,9 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
 	conn = server->connrec;
 
 	/* Stop the timer */
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	switch (conn->sasl_mechanism) {
@@ -161,9 +161,9 @@ static void sasl_disconnected(IRC_SERVER_REC *server)
 		return;
 	}
 
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 }
 

From 132d3c49f302a87d1357ba91ba715faa6bfcea29 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 20 Mar 2016 22:39:06 +0100
Subject: [PATCH 0297/1650] strip less whitespace from commands

fixes #445
---
 src/fe-common/core/completion.c  | 2 +-
 src/fe-common/core/fe-settings.c | 2 +-
 src/irc/dcc/dcc.c                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 1e7833a4..861054b5 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -762,7 +762,7 @@ static void cmd_completion(const char *data)
 	int len;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
+			    PARAM_FLAG_GETREST,
 			    "completion", &optlist, &key, &value))
 		return;
 
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index 3bb43bf7..b689cbf9 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -109,7 +109,7 @@ static void cmd_set(char *data)
 	SETTINGS_REC *rec;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
+			    PARAM_FLAG_OPTIONS,
 			    "set", &optlist, &key, &value))
 		return;
 
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 7f35585e..17f6c477 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -496,8 +496,8 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
 
 	g_return_if_fail(data != NULL);
 
-	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_STRIP_TRAILING_WS, &typestr, &nick, &arg))
+	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
+			    &typestr, &nick, &arg))
 		return;
 
 	if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

From 7baf3a28bbcc1f92707ecb06f1d8e648388a474c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 20 Mar 2016 22:43:12 +0100
Subject: [PATCH 0298/1650] correct quoting in /help dcc

---
 docs/help/in/dcc.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/dcc.in b/docs/help/in/dcc.in
index 649cb12b..dac31e58 100644
--- a/docs/help/in/dcc.in
+++ b/docs/help/in/dcc.in
@@ -36,10 +36,10 @@
 %9Examples:%9
 
     /DCC CHAT mike
-    /DCC GET bob 'summer vacation.mkv'
-    /DCC SEND sarah documents/resume.pdf
+    /DCC GET bob summer vacation.mkv
+    /DCC SEND sarah "summer vacation.mkv"
     /DCC CLOSE get mike
-    /DCC CLOSE send bob 'summer vacation.mkv'
+    /DCC CLOSE send bob summer vacation.mkv
 
 %9See also:%9 CD
 

From 117c890d98d54fdee85a56f851acd6f4b3bd3be3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 14:43:31 +0100
Subject: [PATCH 0299/1650] cutbuffer: do not unconditionally use replace when
 noop was requested

---
 src/fe-text/gui-entry.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 27778b2b..f275c235 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -582,7 +582,8 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	if (size == 0 || entry->pos < size)
 		return;
 
-	if (entry->cutbuffer_len == 0) {
+	if (update_cutbuffer != CUTBUFFER_UPDATE_NOOP
+	    && entry->cutbuffer_len == 0) {
 		update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
 	}
 	int cutbuffer_new_size = entry->cutbuffer_len + size;

From 938d0071c6119f7ec9aeaa88913c47f7af267131 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 15:21:20 +0100
Subject: [PATCH 0300/1650] fix race condition in terminal init

remove the tcgetattr call to a single time on irssi load instead of
querying it each time. Fixes #450
---
 src/fe-text/terminfo-core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 60927f1a..4db68cc7 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -496,7 +496,7 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	}
 }
 
-static void terminfo_input_init(TERM_REC *term)
+static void terminfo_input_init0(TERM_REC *term)
 {
 	tcgetattr(fileno(term->in), &term->old_tio);
 	memcpy(&term->tio, &term->old_tio, sizeof(term->tio));
@@ -518,8 +518,11 @@ static void terminfo_input_init(TERM_REC *term)
 	term->tio.c_cc[VSUSP] = _POSIX_VDISABLE;
 #endif
 
-        tcsetattr(fileno(term->in), TCSADRAIN, &term->tio);
+}
 
+static void terminfo_input_init(TERM_REC *term)
+{
+        tcsetattr(fileno(term->in), TCSADRAIN, &term->tio);
 }
 
 static void terminfo_input_deinit(TERM_REC *term)
@@ -673,6 +676,7 @@ static int term_setup(TERM_REC *term)
 	term->beep = term->TI_bel ? _beep : _ignore;
 
 	terminfo_setup_colors(term, FALSE);
+	terminfo_input_init0(term);
         terminfo_cont(term);
         return 1;
 }

From e5ee243ab6ff7f640bdd45a232ad81ed97520a46 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 22 Mar 2016 15:45:08 +0100
Subject: [PATCH 0301/1650] Simplify some logic in server_create_conn

---
 src/core/servers-setup.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 990d2d4b..0cecfece 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -321,10 +321,8 @@ server_create_conn(int chat_type, const char *dest, int port,
         chatrec = chatnet_find(dest);
 	if (chatrec != NULL) {
 		rec = create_chatnet_conn(chatrec->name, port, password, nick);
-		if (rec != NULL)
-			return rec;
-		/* The chatnet has no url to connect to */
-		return NULL;
+		/* If rec is NULL the chatnet has no url to connect to */
+		return rec;
 	}
 
 	chatrec = chatnet == NULL ? NULL : chatnet_find(chatnet);

From 8b54366d9525d94ae4b1d0d6914b22b7bf73112e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 21 Mar 2016 15:23:12 +0100
Subject: [PATCH 0302/1650] Support quoted filenames in some /DCC commands

---
 src/irc/dcc/dcc-get.c | 8 +++++---
 src/irc/dcc/dcc.c     | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index a8b1c967..ac281683 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -526,14 +526,14 @@ void cmd_dcc_receive(const char *data, DCC_GET_FUNC accept_func,
 {
 	GET_DCC_REC *dcc;
 	GSList *tmp, *next;
-	char *nick, *fname;
+	char *nick, *arg, *fname;
 	void *free_arg;
 	int found;
 
 	g_return_if_fail(data != NULL);
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
-			    &nick, &fname))
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
+			    PARAM_FLAG_STRIP_TRAILING_WS, &nick, &arg))
 		return;
 
 	if (*nick == '\0') {
@@ -548,6 +548,8 @@ void cmd_dcc_receive(const char *data, DCC_GET_FUNC accept_func,
 		return;
 	}
 
+	fname = cmd_get_quoted_param(&arg);
+
 	found = FALSE;
 	for (tmp = dcc_conns; tmp != NULL; tmp = next) {
 		GET_DCC_REC *dcc = tmp->data;
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 17f6c477..c51f7c7a 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -490,7 +490,7 @@ static void event_no_such_nick(IRC_SERVER_REC *server, char *data)
 static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
 {
 	GSList *tmp, *next;
-	char *typestr, *nick, *arg;
+	char *typestr, *nick, *arg, *fname;
 	void *free_arg;
 	int found, type;
 
@@ -510,13 +510,15 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
 		return;
 	}
 
+	fname = cmd_get_quoted_param(&arg);
+
 	found = FALSE;
 	for (tmp = dcc_conns; tmp != NULL; tmp = next) {
 		DCC_REC *dcc = tmp->data;
 
 		next = tmp->next;
 		if (dcc->type == type && g_ascii_strcasecmp(dcc->nick, nick) == 0 &&
-		    (*arg == '\0' || g_strcmp0(dcc->arg, arg) == 0)) {
+		    (*fname == '\0' || g_strcmp0(dcc->arg, fname) == 0)) {
 			dcc_reject(dcc, server);
 			found = TRUE;
 		}

From be93c8d5bee1b923faa63e13957764e3f06e2ded Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 22 Mar 2016 16:03:05 +0100
Subject: [PATCH 0303/1650] Update the documentation about DCC

---
 docs/help/in/dcc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/dcc.in b/docs/help/in/dcc.in
index dac31e58..18a77ee9 100644
--- a/docs/help/in/dcc.in
+++ b/docs/help/in/dcc.in
@@ -36,10 +36,10 @@
 %9Examples:%9
 
     /DCC CHAT mike
-    /DCC GET bob summer vacation.mkv
+    /DCC GET bob "summer vacation.mkv"
     /DCC SEND sarah "summer vacation.mkv"
     /DCC CLOSE get mike
-    /DCC CLOSE send bob summer vacation.mkv
+    /DCC CLOSE send bob "summer vacation.mkv"
 
 %9See also:%9 CD
 

From 35d255fc8c2bc585bacbe59afb8cf9c6cc3cadc8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 16:05:14 +0100
Subject: [PATCH 0304/1650] Properly toggle bracketed paste mode on stop/cont

Fixes #449
---
 src/common.h                |  2 +-
 src/fe-text/term-terminfo.c |  8 --------
 src/fe-text/terminfo-core.c | 23 +++++++++++++++++++++++
 src/fe-text/terminfo-core.h |  3 +++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/common.h b/src/common.h
index 729049ab..33dbd481 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 2
+#define IRSSI_ABI_VERSION 3
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 3582b9e4..27be904e 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -710,11 +710,3 @@ void term_gets(GArray *buffer, int *line_count)
 		}
 	}
 }
-
-void term_set_bracketed_paste_mode(int enable)
-{
-	if (enable)
-		tputs("\e[?2004h", 0, term_putchar);
-	else
-		tputs("\e[?2004l", 0, term_putchar);
-}
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 60927f1a..086c8801 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -395,6 +395,14 @@ static void _ignore_parm(TERM_REC *term, int param)
 {
 }
 
+static void term_dec_set_bracketed_paste_mode(int enable)
+{
+	if (enable)
+		tputs("\e[?2004h", 0, term_putchar);
+	else
+		tputs("\e[?2004l", 0, term_putchar);
+}
+
 static void term_fill_capabilities(TERM_REC *term)
 {
 	int i, ival;
@@ -535,6 +543,9 @@ void terminfo_cont(TERM_REC *term)
 	if (term->TI_smkx)
 		tput(tparm(term->TI_smkx));
 
+	if (term->bracketed_paste_enabled)
+		term_dec_set_bracketed_paste_mode(TRUE);
+
         terminfo_input_init(term);
 }
 
@@ -545,6 +556,9 @@ void terminfo_stop(TERM_REC *term)
         /* move cursor to bottom of the screen */
 	terminfo_move(0, term->height-1);
 
+	if (term->bracketed_paste_enabled)
+		term_dec_set_bracketed_paste_mode(FALSE);
+
 	/* stop cup-mode */
 	if (term->TI_rmcup)
 		tput(tparm(term->TI_rmcup));
@@ -677,6 +691,15 @@ static int term_setup(TERM_REC *term)
         return 1;
 }
 
+void term_set_bracketed_paste_mode(int enable)
+{
+	if (current_term->bracketed_paste_enabled == enable)
+		return;
+
+	current_term->bracketed_paste_enabled = enable;
+	term_dec_set_bracketed_paste_mode(enable);
+}
+
 TERM_REC *terminfo_core_init(FILE *in, FILE *out)
 {
 	TERM_REC *old_term, *term;
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index 21398791..0ef280a1 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -92,6 +92,9 @@ struct _TERM_REC {
 	/* Keyboard-transmit mode */
 	const char *TI_smkx;
 	const char *TI_rmkx;
+
+	/* Terminal mode states */
+	int bracketed_paste_enabled;
 };
 
 extern TERM_REC *current_term;

From 897016131eb2712095a7facaf9ab307164976450 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 21 Mar 2016 14:19:43 +0100
Subject: [PATCH 0305/1650] Don't call terminfo_cont() twice on resume

Fixes some weirdness when using ^Z with zsh.
---
 src/fe-text/term-terminfo.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 3582b9e4..ed9c8d32 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -611,8 +611,6 @@ void term_stop(void)
 {
 	terminfo_stop(current_term);
 	kill(getpid(), SIGTSTP);
-	terminfo_cont(current_term);
-	irssi_redraw();
 }
 
 static int input_utf8(const unsigned char *buffer, int size, unichar *result)

From b9914abbf3a7fae6d15f26650a98d8e74aa1fa05 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 16:54:34 +0100
Subject: [PATCH 0306/1650] Make use of terminal application keys configurable

adds a new setting term_appkey_mode which can enable or disable the use
of keyboard transmit (application keys) mode. Fixes #430
---
 src/fe-text/gui-readline.c  |  2 ++
 src/fe-text/term.h          |  1 +
 src/fe-text/terminfo-core.c | 23 +++++++++++++++++++----
 src/fe-text/terminfo-core.h |  1 +
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index ff91f9e3..b93e5f0f 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -1060,6 +1060,7 @@ static void setup_changed(void)
 	paste_join_multiline = settings_get_bool("paste_join_multiline");
 	paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
 
+	term_set_appkey_mode(settings_get_bool("term_appkey_mode"));
 	/* Enable the bracketed paste mode on demand */
 	term_set_bracketed_paste_mode(paste_use_bracketed_mode);
 }
@@ -1082,6 +1083,7 @@ void gui_readline_init(void)
 	g_get_current_time(&last_keypress);
         input_listen_init(STDIN_FILENO);
 
+	settings_add_bool("lookandfeel", "term_appkey_mode", TRUE);
 	settings_add_str("history", "scroll_page_count", "/2");
 	settings_add_time("misc", "paste_detect_time", "5msecs");
 	settings_add_bool("misc", "paste_use_bracketed_mode", FALSE);
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index 5f0a799e..9b726d82 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -94,6 +94,7 @@ void term_refresh(TERM_WINDOW *window);
 
 void term_stop(void);
 
+void term_set_appkey_mode(int enable);
 void term_set_bracketed_paste_mode(int enable);
 
 /* keyboard input handling */
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index aa833abf..15b00081 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -395,6 +395,12 @@ static void _ignore_parm(TERM_REC *term, int param)
 {
 }
 
+static void terminfo_set_appkey_mode(TERM_REC *term, int set)
+{
+	if (term->TI_smkx && term->TI_rmkx)
+		tput(tparm(set ? term->TI_smkx : term->TI_rmkx));
+}
+
 static void term_dec_set_bracketed_paste_mode(int enable)
 {
 	if (enable)
@@ -543,8 +549,8 @@ void terminfo_cont(TERM_REC *term)
 	if (term->TI_smcup)
 		tput(tparm(term->TI_smcup));
 
-	if (term->TI_smkx)
-		tput(tparm(term->TI_smkx));
+	if (term->appkey_enabled)
+		terminfo_set_appkey_mode(term, TRUE);
 
 	if (term->bracketed_paste_enabled)
 		term_dec_set_bracketed_paste_mode(TRUE);
@@ -566,8 +572,8 @@ void terminfo_stop(TERM_REC *term)
 	if (term->TI_rmcup)
 		tput(tparm(term->TI_rmcup));
 
-	if (term->TI_rmkx)
-		tput(tparm(term->TI_rmkx));
+	if (term->appkey_enabled)
+		terminfo_set_appkey_mode(term, FALSE);
 
         /* reset input settings */
 	terminfo_input_deinit(term);
@@ -695,6 +701,15 @@ static int term_setup(TERM_REC *term)
         return 1;
 }
 
+void term_set_appkey_mode(int enable)
+{
+	if (current_term->appkey_enabled == enable)
+		return;
+
+	current_term->appkey_enabled = enable;
+	terminfo_set_appkey_mode(current_term, enable);
+}
+
 void term_set_bracketed_paste_mode(int enable)
 {
 	if (current_term->bracketed_paste_enabled == enable)
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index 0ef280a1..1253fd9d 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -94,6 +94,7 @@ struct _TERM_REC {
 	const char *TI_rmkx;
 
 	/* Terminal mode states */
+	int appkey_enabled;
 	int bracketed_paste_enabled;
 };
 

From 15f79a713f3e100a3b96b65e951fb37ae8994bdd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 23 Mar 2016 00:07:43 +0100
Subject: [PATCH 0307/1650] set version to 0.8.18a-head

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5f36a7f0..44a986f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.18)
+AC_INIT(irssi, 0.8.18a-head)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 22d772890e6f3b9622485fd83529f73891567e71 Mon Sep 17 00:00:00 2001
From: dx <dx@dxzone.com.ar>
Date: Tue, 26 Jan 2016 03:25:07 -0300
Subject: [PATCH 0308/1650] Merge pull request #405 from
 LemonBoy/serialize-channel-name

Serialize the 'name' attribute of the CHANNEL_REC.
---
 src/fe-common/core/windows-layout.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 8ebcc12d..ce6b9910 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -168,12 +168,12 @@ static void sig_layout_save_item(WINDOW_REC *window, WI_ITEM_REC *item,
 		chat_protocol_find_id(item->chat_type);
 	if (proto != NULL)
 		iconfig_node_set_str(subnode, "chat_type", proto->name);
-	iconfig_node_set_str(subnode, "name", item->visible_name);
+	iconfig_node_set_str(subnode, "name", item->name);
 
 	if (item->server != NULL) {
 		iconfig_node_set_str(subnode, "tag", item->server->tag);
 		if (IS_CHANNEL(item)) {
-			rec = window_bind_add(window, item->server->tag, item->visible_name);
+			rec = window_bind_add(window, item->server->tag, item->name);
 			if (rec != NULL)
 				rec->sticky = TRUE;
 		}

From 025f08d5fc69d6e9c28004f8f7af26f613b0e0fb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 29 Jan 2016 05:33:14 +0100
Subject: [PATCH 0309/1650] Merge pull request #407 from
 irssi/ailin-nemui-perl-bugs

Mention known Perl Bugs in perl.txt
---
 docs/perl.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/perl.txt b/docs/perl.txt
index 9688341f..59f65462 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -1193,3 +1193,7 @@ Client->{}
  --------------------
 * Calling die in 'script error' handler causes segfault (#101)
 * Storing and later using any Irssi object may result in use-after-free related crash
+  - Workaround: always acquire fresh objects
+* Calling $dcc->close from the "dcc created" signal will cause unstable behaviour and crashes (#386)
+  - Workaround: use "dcc request" signal instead AND call
+    &Irssi::signal_continue(@_); as the first thing

From 4416942fcdd426385cc3ef7a912f9260627b8a39 Mon Sep 17 00:00:00 2001
From: Giuseppe <LemonBoy@users.noreply.github.com>
Date: Tue, 8 Mar 2016 22:49:05 +0100
Subject: [PATCH 0310/1650] Merge pull request #432 from grawity/fix-external

fix SASL EXTERNAL
---
 src/irc/core/sasl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index a04eaf45..8fba9ba2 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -145,7 +145,7 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
 
 		case SASL_MECHANISM_EXTERNAL:
 			/* Empty response */
-			irc_send_cmdv(server, "+");
+			irc_send_cmdv(server, "AUTHENTICATE +");
 			break;
 	}
 

From d20872ac27c63f2c92775a12c99a7494148901ca Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 17 Mar 2016 16:14:34 +0100
Subject: [PATCH 0311/1650] Merge pull request #438 from
 dequis/sasl-timeout-disconnect

Remove sasl timeout source when the server disconnects
---
 src/irc/core/sasl.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 8fba9ba2..db099368 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -153,6 +153,20 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
 	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
 }
 
+static void sasl_disconnected(IRC_SERVER_REC *server)
+{
+	g_return_if_fail(server != NULL);
+
+	if (!IS_IRC_SERVER(server)) {
+		return;
+	}
+
+	if (server->sasl_timeout != -1) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = -1;
+	}
+}
+
 void sasl_init(void)
 {
 	signal_add_first("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
@@ -163,6 +177,7 @@ void sasl_init(void)
 	signal_add_first("event 905", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_add_first("event 907", (SIGNAL_FUNC) sasl_already);
+	signal_add_first("server disconnected", (SIGNAL_FUNC) sasl_disconnected);
 }
 
 void sasl_deinit(void)
@@ -175,4 +190,5 @@ void sasl_deinit(void)
 	signal_remove("event 905", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 906", (SIGNAL_FUNC) sasl_fail);
 	signal_remove("event 907", (SIGNAL_FUNC) sasl_already);
+	signal_remove("server disconnected", (SIGNAL_FUNC) sasl_disconnected);
 }

From 7d3fe66e50fc3c47783d9beb0474a4ed9d2d9953 Mon Sep 17 00:00:00 2001
From: TheLemonMan <LemonBoy@users.noreply.github.com>
Date: Thu, 17 Mar 2016 22:07:57 +0100
Subject: [PATCH 0312/1650] Merge pull request #439 from horgh/ssl-errors

Clear error queue before SSL I/O operations
---
 src/core/network-openssl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 465c4154..a18e6fc7 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -289,6 +289,7 @@ static GIOStatus irssi_ssl_read(GIOChannel *handle, gchar *buf, gsize len, gsize
 	const char *errstr;
 	gchar *errmsg;
 
+	ERR_clear_error();
 	ret1 = SSL_read(chan->ssl, buf, len);
 	if(ret1 <= 0)
 	{
@@ -334,6 +335,7 @@ static GIOStatus irssi_ssl_write(GIOChannel *handle, const gchar *buf, gsize len
 	const char *errstr;
 	gchar *errmsg;
 
+	ERR_clear_error();
 	ret1 = SSL_write(chan->ssl, (const char *)buf, len);
 	if(ret1 <= 0)
 	{
@@ -471,6 +473,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	if(!(fd = g_io_channel_unix_get_fd(handle)))
 		return NULL;
 
+	ERR_clear_error();
 	ctx = SSL_CTX_new(SSLv23_client_method());
 	if (ctx == NULL) {
 		g_error("Could not allocate memory for SSL context");
@@ -489,6 +492,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		scert = convert_home(mycert);
 		if (mypkey && *mypkey)
 			spkey = convert_home(mypkey);
+		ERR_clear_error();
 		if (! SSL_CTX_use_certificate_file(ctx, scert, SSL_FILETYPE_PEM))
 			g_warning("Loading of client certificate '%s' failed: %s", mycert, ERR_reason_error_string(ERR_get_error()));
 		else if (! SSL_CTX_use_PrivateKey_file(ctx, spkey ? spkey : scert, SSL_FILETYPE_PEM))
@@ -581,6 +585,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	X509 *cert;
 	const char *errstr;
 
+	ERR_clear_error();
 	ret = SSL_connect(chan->ssl);
 	if (ret <= 0) {
 		err = SSL_get_error(chan->ssl, ret);

From 15296a0165007aece5ac732c1f53b0fc78ba9ba1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 20 Mar 2016 22:00:43 +0100
Subject: [PATCH 0313/1650] Merge pull request #444 from LemonBoy/timeout-id

Use 0 as a sentinel value for sasl_timeout
---
 src/irc/core/sasl.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index db099368..b74b6a8c 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -34,7 +34,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
 	irc_send_cmd_now(server, "AUTHENTICATE *");
 	cap_finish_negotiation(server);
 
-	server->sasl_timeout = -1;
+	server->sasl_timeout = 0;
 
 	signal_emit("server sasl failure", 2, server, "The authentication timed out");
 
@@ -64,9 +64,9 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 	char *params, *error;
 
 	/* Stop any pending timeout, if any */
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	params = event_get_params(data, 2, NULL, &error);
@@ -81,9 +81,9 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 
 static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	signal_emit("server sasl success", 1, server);
@@ -94,9 +94,9 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
 
 static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	signal_emit("server sasl success", 1, server);
@@ -114,9 +114,9 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
 	conn = server->connrec;
 
 	/* Stop the timer */
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 
 	switch (conn->sasl_mechanism) {
@@ -161,9 +161,9 @@ static void sasl_disconnected(IRC_SERVER_REC *server)
 		return;
 	}
 
-	if (server->sasl_timeout != -1) {
+	if (server->sasl_timeout != 0) {
 		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = -1;
+		server->sasl_timeout = 0;
 	}
 }
 

From fe600dd5dc11c839c1fd90e77c4020c937e7c453 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 20 Mar 2016 22:06:41 +0100
Subject: [PATCH 0314/1650] Merge pull request #442 from LemonBoy/fix-435

Do not assume any default value for statusmsg.
---
 src/irc/core/irc-servers.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 81f0c269..1df95f70 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -78,17 +78,23 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 	IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server;
 	char *chantypes, *statusmsg;
 
+	g_return_val_if_fail(data != NULL, FALSE);
+
+	/* empty string is no channel */
+	if (*data == '\0')
+		return FALSE;
+
 	chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
 	if (chantypes == NULL)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
+
 	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg == NULL)
-		statusmsg = "@+";
+	if (statusmsg != NULL)
+		data += strspn(data, statusmsg);
 
-	while (strchr(statusmsg, *data) != NULL)
-		data++;
-
-	return strchr(chantypes, *data) != NULL;
+	/* strchr(3) considers the trailing NUL as part of the string, make sure
+	 * we didn't advance too much. */
+	return *data != '\0' && strchr(chantypes, *data) != NULL;
 }
 
 static char **split_line(const SERVER_REC *server, const char *line,

From 4a2ee3c34471c29b884f5b0bc2b6ad95b56f500b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 15:23:37 +0100
Subject: [PATCH 0315/1650] Merge pull request #446 from ailin-nemui/fix_445

strip less whitespace from commands
---
 src/fe-common/core/completion.c  | 2 +-
 src/fe-common/core/fe-settings.c | 2 +-
 src/irc/dcc/dcc.c                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index a4715d23..4461de92 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -757,7 +757,7 @@ static void cmd_completion(const char *data)
 	int len;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
+			    PARAM_FLAG_GETREST,
 			    "completion", &optlist, &key, &value))
 		return;
 
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index 3bb43bf7..b689cbf9 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -109,7 +109,7 @@ static void cmd_set(char *data)
 	SETTINGS_REC *rec;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
+			    PARAM_FLAG_OPTIONS,
 			    "set", &optlist, &key, &value))
 		return;
 
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 7f35585e..17f6c477 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -496,8 +496,8 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
 
 	g_return_if_fail(data != NULL);
 
-	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_STRIP_TRAILING_WS, &typestr, &nick, &arg))
+	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
+			    &typestr, &nick, &arg))
 		return;
 
 	if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

From c657b9c3b1bf867722f63892251b2294d6a87d56 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 15:25:13 +0100
Subject: [PATCH 0316/1650] Merge pull request #447 from
 ailin-nemui/fix_dcc_help

correct quoting in /help dcc
---
 docs/help/in/dcc.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/dcc.in b/docs/help/in/dcc.in
index 649cb12b..dac31e58 100644
--- a/docs/help/in/dcc.in
+++ b/docs/help/in/dcc.in
@@ -36,10 +36,10 @@
 %9Examples:%9
 
     /DCC CHAT mike
-    /DCC GET bob 'summer vacation.mkv'
-    /DCC SEND sarah documents/resume.pdf
+    /DCC GET bob summer vacation.mkv
+    /DCC SEND sarah "summer vacation.mkv"
     /DCC CLOSE get mike
-    /DCC CLOSE send bob 'summer vacation.mkv'
+    /DCC CLOSE send bob summer vacation.mkv
 
 %9See also:%9 CD
 

From 5ef2b958d94af940746f607fb56776852c6b0a4d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 22:57:28 +0100
Subject: [PATCH 0317/1650] Merge pull request #457 from ailin-nemui/fix_450

fix race condition in terminal init
---
 src/fe-text/terminfo-core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 60927f1a..4db68cc7 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -496,7 +496,7 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	}
 }
 
-static void terminfo_input_init(TERM_REC *term)
+static void terminfo_input_init0(TERM_REC *term)
 {
 	tcgetattr(fileno(term->in), &term->old_tio);
 	memcpy(&term->tio, &term->old_tio, sizeof(term->tio));
@@ -518,8 +518,11 @@ static void terminfo_input_init(TERM_REC *term)
 	term->tio.c_cc[VSUSP] = _POSIX_VDISABLE;
 #endif
 
-        tcsetattr(fileno(term->in), TCSADRAIN, &term->tio);
+}
 
+static void terminfo_input_init(TERM_REC *term)
+{
+        tcsetattr(fileno(term->in), TCSADRAIN, &term->tio);
 }
 
 static void terminfo_input_deinit(TERM_REC *term)
@@ -673,6 +676,7 @@ static int term_setup(TERM_REC *term)
 	term->beep = term->TI_bel ? _beep : _ignore;
 
 	terminfo_setup_colors(term, FALSE);
+	terminfo_input_init0(term);
         terminfo_cont(term);
         return 1;
 }

From 6572005d3d8071dc7faa1637986ed81692203e13 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 22:54:43 +0100
Subject: [PATCH 0318/1650] Merge pull request #458 from ailin-nemui/fix_449

Properly toggle bracketed paste mode on stop/cont
---
 src/common.h                |  2 +-
 src/fe-text/term-terminfo.c |  8 --------
 src/fe-text/terminfo-core.c | 23 +++++++++++++++++++++++
 src/fe-text/terminfo-core.h |  3 +++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/common.h b/src/common.h
index 966e28d0..729049ab 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 1
+#define IRSSI_ABI_VERSION 2
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 3582b9e4..27be904e 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -710,11 +710,3 @@ void term_gets(GArray *buffer, int *line_count)
 		}
 	}
 }
-
-void term_set_bracketed_paste_mode(int enable)
-{
-	if (enable)
-		tputs("\e[?2004h", 0, term_putchar);
-	else
-		tputs("\e[?2004l", 0, term_putchar);
-}
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 4db68cc7..aa833abf 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -395,6 +395,14 @@ static void _ignore_parm(TERM_REC *term, int param)
 {
 }
 
+static void term_dec_set_bracketed_paste_mode(int enable)
+{
+	if (enable)
+		tputs("\e[?2004h", 0, term_putchar);
+	else
+		tputs("\e[?2004l", 0, term_putchar);
+}
+
 static void term_fill_capabilities(TERM_REC *term)
 {
 	int i, ival;
@@ -538,6 +546,9 @@ void terminfo_cont(TERM_REC *term)
 	if (term->TI_smkx)
 		tput(tparm(term->TI_smkx));
 
+	if (term->bracketed_paste_enabled)
+		term_dec_set_bracketed_paste_mode(TRUE);
+
         terminfo_input_init(term);
 }
 
@@ -548,6 +559,9 @@ void terminfo_stop(TERM_REC *term)
         /* move cursor to bottom of the screen */
 	terminfo_move(0, term->height-1);
 
+	if (term->bracketed_paste_enabled)
+		term_dec_set_bracketed_paste_mode(FALSE);
+
 	/* stop cup-mode */
 	if (term->TI_rmcup)
 		tput(tparm(term->TI_rmcup));
@@ -681,6 +695,15 @@ static int term_setup(TERM_REC *term)
         return 1;
 }
 
+void term_set_bracketed_paste_mode(int enable)
+{
+	if (current_term->bracketed_paste_enabled == enable)
+		return;
+
+	current_term->bracketed_paste_enabled = enable;
+	term_dec_set_bracketed_paste_mode(enable);
+}
+
 TERM_REC *terminfo_core_init(FILE *in, FILE *out)
 {
 	TERM_REC *old_term, *term;
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index 21398791..0ef280a1 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -92,6 +92,9 @@ struct _TERM_REC {
 	/* Keyboard-transmit mode */
 	const char *TI_smkx;
 	const char *TI_rmkx;
+
+	/* Terminal mode states */
+	int bracketed_paste_enabled;
 };
 
 extern TERM_REC *current_term;

From 6c0c0c60ad62e45664ee0c77ae3c926892de267c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Mar 2016 16:54:34 +0100
Subject: [PATCH 0319/1650] Make use of terminal application keys configurable

adds a new setting term_appkey_mode which can enable or disable the use
of keyboard transmit (application keys) mode. Fixes #430
---
 src/fe-text/gui-readline.c  |  2 ++
 src/fe-text/term.h          |  1 +
 src/fe-text/terminfo-core.c | 23 +++++++++++++++++++----
 src/fe-text/terminfo-core.h |  1 +
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 5acfaf60..af560894 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -1039,6 +1039,7 @@ static void setup_changed(void)
 	paste_join_multiline = settings_get_bool("paste_join_multiline");
 	paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
 
+	term_set_appkey_mode(settings_get_bool("term_appkey_mode"));
 	/* Enable the bracketed paste mode on demand */
 	term_set_bracketed_paste_mode(paste_use_bracketed_mode);
 }
@@ -1061,6 +1062,7 @@ void gui_readline_init(void)
 	g_get_current_time(&last_keypress);
         input_listen_init(STDIN_FILENO);
 
+	settings_add_bool("lookandfeel", "term_appkey_mode", TRUE);
 	settings_add_str("history", "scroll_page_count", "/2");
 	settings_add_time("misc", "paste_detect_time", "5msecs");
 	settings_add_bool("misc", "paste_use_bracketed_mode", FALSE);
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index 5f0a799e..9b726d82 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -94,6 +94,7 @@ void term_refresh(TERM_WINDOW *window);
 
 void term_stop(void);
 
+void term_set_appkey_mode(int enable);
 void term_set_bracketed_paste_mode(int enable);
 
 /* keyboard input handling */
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index aa833abf..15b00081 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -395,6 +395,12 @@ static void _ignore_parm(TERM_REC *term, int param)
 {
 }
 
+static void terminfo_set_appkey_mode(TERM_REC *term, int set)
+{
+	if (term->TI_smkx && term->TI_rmkx)
+		tput(tparm(set ? term->TI_smkx : term->TI_rmkx));
+}
+
 static void term_dec_set_bracketed_paste_mode(int enable)
 {
 	if (enable)
@@ -543,8 +549,8 @@ void terminfo_cont(TERM_REC *term)
 	if (term->TI_smcup)
 		tput(tparm(term->TI_smcup));
 
-	if (term->TI_smkx)
-		tput(tparm(term->TI_smkx));
+	if (term->appkey_enabled)
+		terminfo_set_appkey_mode(term, TRUE);
 
 	if (term->bracketed_paste_enabled)
 		term_dec_set_bracketed_paste_mode(TRUE);
@@ -566,8 +572,8 @@ void terminfo_stop(TERM_REC *term)
 	if (term->TI_rmcup)
 		tput(tparm(term->TI_rmcup));
 
-	if (term->TI_rmkx)
-		tput(tparm(term->TI_rmkx));
+	if (term->appkey_enabled)
+		terminfo_set_appkey_mode(term, FALSE);
 
         /* reset input settings */
 	terminfo_input_deinit(term);
@@ -695,6 +701,15 @@ static int term_setup(TERM_REC *term)
         return 1;
 }
 
+void term_set_appkey_mode(int enable)
+{
+	if (current_term->appkey_enabled == enable)
+		return;
+
+	current_term->appkey_enabled = enable;
+	terminfo_set_appkey_mode(current_term, enable);
+}
+
 void term_set_bracketed_paste_mode(int enable)
 {
 	if (current_term->bracketed_paste_enabled == enable)
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index 0ef280a1..1253fd9d 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -94,6 +94,7 @@ struct _TERM_REC {
 	const char *TI_rmkx;
 
 	/* Terminal mode states */
+	int appkey_enabled;
 	int bracketed_paste_enabled;
 };
 

From c43831574187cdb2323d123702aa687af24664d8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 23 Mar 2016 00:08:24 +0100
Subject: [PATCH 0320/1650] tag as 0.8.19

---
 NEWS         | 13 +++++++++++++
 configure.ac |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e442a979..65aab5ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
+	- Fixed regression when joining and parting channels on IRCnet (#435)
+	- Fixed SASL EXTERNAL (#432)
+	- Fixed regression when not using SASL (#438)
+	- Fixed incorrect SSL disconnects when using SSL from modules/scripts
+	  (#439)
+	- Fixed regression where proxy_string could not be configured or
+	  certain file transfers could not be accepted (#445)
+	- Fixed storing layout of !channels (#183)
+	- Fixed restoration of bracketed paste mode on quit (#449)
+	- Make the usage of meta-O for cursor keys configurable with
+	      /set term_appkey_mode off
+
 v0.8.18 2016-02-13  The Irssi team <staff@irssi.org>
 	* Modules will now require to define a
 	      void MODULENAME ## _abicheck(int *version)
diff --git a/configure.ac b/configure.ac
index 44a986f2..b25e7286 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.18a-head)
+AC_INIT(irssi, 0.8.19)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From aec2466e36ec32e97ec2eb8e1279e27a3d0fe0cb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 21 Mar 2016 09:14:01 +0100
Subject: [PATCH 0321/1650] Improve cutbuffer handling

* Adds two new keys which you can bind in /bind:
  yank_next_cutbuffer: Revert to the previous last deleted text
  append_next_kill: Append next deletion
* Consecutive kills are now appended to the current cutbuffer
---
 src/fe-text/gui-entry.c    | 171 ++++++++++++++++++++++++++-----------
 src/fe-text/gui-entry.h    |  15 +++-
 src/fe-text/gui-readline.c |  62 ++++++++++++--
 3 files changed, 190 insertions(+), 58 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index f275c235..63dda34e 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -32,6 +32,8 @@
 #undef i_tolower
 #undef i_isalnum
 
+#define KILL_RING_MAX 10
+
 static unichar i_toupper(unichar c)
 {
 	if (term_type == TERM_TYPE_UTF8)
@@ -82,11 +84,22 @@ GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
 
 void gui_entry_destroy(GUI_ENTRY_REC *entry)
 {
+	GSList *tmp;
+
         g_return_if_fail(entry != NULL);
 
 	if (active_entry == entry)
 		gui_entry_set_active(NULL);
 
+	for (tmp = entry->kill_ring; tmp != NULL; tmp = tmp->next) {
+		GUI_ENTRY_CUTBUFFER_REC *rec = tmp->data;
+		if (rec != NULL) {
+			g_free(rec->cutbuffer);
+			g_free(rec);
+		}
+	}
+	g_slist_free(entry->kill_ring);
+
         g_free(entry->text);
 	g_free(entry->prompt);
         g_free(entry);
@@ -546,22 +559,42 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
 
 	g_return_val_if_fail(entry != NULL, NULL);
 
-	if (entry->cutbuffer == NULL)
+	if (entry->kill_ring == NULL || entry->kill_ring->data == NULL)
+		return NULL;
+
+	GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
+
+	if (tmp->cutbuffer == NULL)
                 return NULL;
 
 	if (entry->utf8)
-		buf = g_ucs4_to_utf8(entry->cutbuffer, -1, NULL, NULL, NULL);
+		buf = g_ucs4_to_utf8(tmp->cutbuffer, -1, NULL, NULL, NULL);
 	else {
-		buf = g_malloc(entry->cutbuffer_len*6 + 1);
+		buf = g_malloc(tmp->cutbuffer_len*6 + 1);
 		if (term_type == TERM_TYPE_BIG5)
-			unichars_to_big5(entry->cutbuffer, buf);
+			unichars_to_big5(tmp->cutbuffer, buf);
 		else
-			for (i = 0; i <= entry->cutbuffer_len; i++)
-				buf[i] = entry->cutbuffer[i];
+			for (i = 0; i <= tmp->cutbuffer_len; i++)
+				buf[i] = tmp->cutbuffer[i];
 	}
 	return buf;
 }
 
+char *gui_entry_get_next_cutbuffer(GUI_ENTRY_REC *entry)
+{
+	g_return_val_if_fail(entry != NULL, NULL);
+
+	if (entry->kill_ring == NULL)
+		return NULL;
+
+	GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
+
+	entry->kill_ring = g_slist_remove(entry->kill_ring, tmp);
+	entry->kill_ring = g_slist_append(entry->kill_ring, tmp);
+
+	return gui_entry_get_cutbuffer(entry);
+}
+
 void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
 	int newpos, size = 0;
@@ -573,6 +606,40 @@ void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP updat
 	gui_entry_erase(entry, size, update_cutbuffer);
 }
 
+static GUI_ENTRY_CUTBUFFER_REC *get_cutbuffer_rec(GUI_ENTRY_REC *entry, CUTBUFFER_UPDATE_OP update_cutbuffer)
+{
+	GUI_ENTRY_CUTBUFFER_REC *tmp = NULL;
+
+	g_return_val_if_fail(entry != NULL, NULL);
+
+	if (entry->kill_ring == NULL) {
+		/* no kill ring exists */
+		entry->kill_ring = g_slist_prepend(entry->kill_ring, (void *)NULL);
+	} else {
+		tmp = entry->kill_ring->data;
+
+		if (tmp != NULL && tmp->cutbuffer_len > 0
+		    && (!entry->previous_append_next_kill
+			|| update_cutbuffer == CUTBUFFER_UPDATE_REPLACE)) {
+			/* a cutbuffer exists and should be replaced */
+			entry->kill_ring = g_slist_prepend(entry->kill_ring, (void *)NULL);
+		}
+	}
+
+	if (g_slist_length(entry->kill_ring) > KILL_RING_MAX) {
+		GUI_ENTRY_CUTBUFFER_REC *rec = g_slist_last(entry->kill_ring)->data;
+		entry->kill_ring = g_slist_remove(entry->kill_ring, rec);
+		if (rec != NULL) g_free(rec->cutbuffer);
+		g_free(rec);
+	}
+
+	if (entry->kill_ring->data == NULL) {
+		entry->kill_ring->data = g_new0(GUI_ENTRY_CUTBUFFER_REC, 1);
+	}
+
+	return entry->kill_ring->data;
+}
+
 void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
 	size_t w = 0;
@@ -582,51 +649,59 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	if (size == 0 || entry->pos < size)
 		return;
 
-	if (update_cutbuffer != CUTBUFFER_UPDATE_NOOP
-	    && entry->cutbuffer_len == 0) {
-		update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
-	}
-	int cutbuffer_new_size = entry->cutbuffer_len + size;
-	unichar *tmpcutbuffer = entry->cutbuffer;
-	switch (update_cutbuffer) {
-		case CUTBUFFER_UPDATE_APPEND:
-			entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-			memcpy(entry->cutbuffer, tmpcutbuffer,
-					entry->cutbuffer_len * sizeof(unichar));
-			memcpy(entry->cutbuffer + entry->cutbuffer_len * sizeof(unichar),
-					entry->text + entry->pos - size, size * sizeof(unichar));
+	if (update_cutbuffer != CUTBUFFER_UPDATE_NOOP) {
+		int cutbuffer_new_size;
+		unichar *tmpcutbuffer;
+		GUI_ENTRY_CUTBUFFER_REC *tmp = get_cutbuffer_rec(entry, update_cutbuffer);
 
-			entry->cutbuffer_len = cutbuffer_new_size;
-			entry->cutbuffer[cutbuffer_new_size] = '\0';
-			g_free(tmpcutbuffer);
-			break;
+		if (tmp->cutbuffer_len == 0) {
+			update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
+		}
 
-		case CUTBUFFER_UPDATE_PREPEND:
-			entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-			memcpy(entry->cutbuffer, entry->text + entry->pos - size,
-					size * sizeof(unichar));
-			memcpy(entry->cutbuffer + size, tmpcutbuffer,
-					entry->cutbuffer_len * sizeof(unichar));
+		cutbuffer_new_size = tmp->cutbuffer_len + size;
+		tmpcutbuffer = tmp->cutbuffer;
+		entry->append_next_kill = TRUE;
+		switch (update_cutbuffer) {
+			case CUTBUFFER_UPDATE_APPEND:
+				tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+				memcpy(tmp->cutbuffer, tmpcutbuffer,
+				       tmp->cutbuffer_len * sizeof(unichar));
+				memcpy(tmp->cutbuffer + tmp->cutbuffer_len * sizeof(unichar),
+				       entry->text + entry->pos - size, size * sizeof(unichar));
 
-			entry->cutbuffer_len = cutbuffer_new_size;
-			entry->cutbuffer[cutbuffer_new_size] = '\0';
-			g_free(tmpcutbuffer);
-			break;
+				tmp->cutbuffer_len = cutbuffer_new_size;
+				tmp->cutbuffer[cutbuffer_new_size] = '\0';
+				g_free(tmpcutbuffer);
+				break;
 
-		case CUTBUFFER_UPDATE_REPLACE:
-			/* put erased text to cutbuffer */
-			if (entry->cutbuffer_len < size) {
-				g_free(entry->cutbuffer);
-				entry->cutbuffer = g_new(unichar, size+1);
-			}
+			case CUTBUFFER_UPDATE_PREPEND:
+				tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
+				memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
+				       size * sizeof(unichar));
+				memcpy(tmp->cutbuffer + size, tmpcutbuffer,
+				       tmp->cutbuffer_len * sizeof(unichar));
 
-			entry->cutbuffer_len = size;
-			entry->cutbuffer[size] = '\0';
-			memcpy(entry->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar));
-			break;
+				tmp->cutbuffer_len = cutbuffer_new_size;
+				tmp->cutbuffer[cutbuffer_new_size] = '\0';
+				g_free(tmpcutbuffer);
+				break;
 
-		case CUTBUFFER_UPDATE_NOOP:
-			break;
+			case CUTBUFFER_UPDATE_REPLACE:
+				/* put erased text to cutbuffer */
+				if (tmp->cutbuffer_len < size) {
+					g_free(tmp->cutbuffer);
+					tmp->cutbuffer = g_new(unichar, size+1);
+				}
+
+				tmp->cutbuffer_len = size;
+				tmp->cutbuffer[size] = '\0';
+				memcpy(tmp->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar));
+				break;
+
+			case CUTBUFFER_UPDATE_NOOP:
+				/* cannot happen, handled in "if" */
+				break;
+		}
 	}
 
 	if (entry->utf8)
@@ -686,10 +761,10 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_O
 	}
 	if (to > 0) to++;
 
-	gui_entry_erase(entry, entry->pos-to, CUTBUFFER_UPDATE_REPLACE);
+	gui_entry_erase(entry, entry->pos-to, cutbuffer_op);
 }
 
-void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)
+void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op)
 {
 	int to, size;
 
@@ -712,7 +787,7 @@ void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)
 
         size = to-entry->pos;
 	entry->pos = to;
-        gui_entry_erase(entry, size, CUTBUFFER_UPDATE_REPLACE);
+        gui_entry_erase(entry, size, cutbuffer_op);
 }
 
 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index d22a7fb8..8777f083 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -1,12 +1,16 @@
 #ifndef __GUI_ENTRY_H
 #define __GUI_ENTRY_H
 
+typedef struct {
+        int cutbuffer_len;
+	unichar *cutbuffer;
+} GUI_ENTRY_CUTBUFFER_REC;
+
 typedef struct {
 	int text_len, text_alloc; /* as shorts, not chars */
 	unichar *text;
 
-        int cutbuffer_len;
-	unichar *cutbuffer;
+	GSList *kill_ring;
 
         /* all as shorts, not chars */
 	int xpos, ypos, width; /* entry position in screen */
@@ -18,6 +22,10 @@ typedef struct {
 
 	int redraw_needed_from;
 	unsigned int utf8:1;
+
+	unsigned int previous_append_next_kill:1;
+	unsigned int append_next_kill:1;
+	unsigned int yank_preceded:1;
 } GUI_ENTRY_REC;
 
 typedef enum {
@@ -47,11 +55,12 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str);
 void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr);
 
 char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry);
+char *gui_entry_get_next_cutbuffer(GUI_ENTRY_REC *entry);
 void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer);
 void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer);
 void gui_entry_erase_cell(GUI_ENTRY_REC *entry);
 void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op);
-void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space);
+void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op);
 
 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry);
 void gui_entry_transpose_words(GUI_ENTRY_REC *entry);
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index b93e5f0f..e0ffb4f1 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -73,6 +73,7 @@ static int paste_timeout_id;
 static int paste_use_bracketed_mode;
 static int paste_bracketed_mode;
 static int paste_was_bracketed_mode;
+static int previous_yank_preceded;
 
 /* Terminal sequences that surround the input when the terminal has the
  * bracketed paste mode active. Fror more details see
@@ -440,11 +441,20 @@ static void sig_gui_key_pressed(gpointer keyp)
 		gui_entry_insert_char(active_entry, key);
 		ret = 1;
 	} else {
+		previous_yank_preceded = active_entry->yank_preceded;
+		active_entry->yank_preceded = FALSE;
+		active_entry->previous_append_next_kill = active_entry->append_next_kill;
+		active_entry->append_next_kill = FALSE;
 		ret = key_pressed(keyboard, str);
 		if (ret < 0) {
 			/* key wasn't used for anything, print it */
 			gui_entry_insert_char(active_entry, key);
 		}
+		if (ret == 0) {
+			/* combo not complete, ignore append_next_kill and yank_preceded */
+			active_entry->append_next_kill = active_entry->previous_append_next_kill;
+			active_entry->yank_preceded = previous_yank_preceded;
+		}
 	}
 
 	/* ret = 0 : some key create multiple characters - we're in the middle
@@ -571,7 +581,7 @@ static void key_erase_to_beg_of_line(void)
 	int pos;
 
 	pos = gui_entry_get_pos(active_entry);
-	gui_entry_erase(active_entry, pos, CUTBUFFER_UPDATE_REPLACE);
+	gui_entry_erase(active_entry, pos, CUTBUFFER_UPDATE_PREPEND);
 }
 
 static void key_erase_to_end_of_line(void)
@@ -580,7 +590,7 @@ static void key_erase_to_end_of_line(void)
 
 	pos = gui_entry_get_pos(active_entry);
 	gui_entry_set_pos(active_entry, active_entry->text_len);
-	gui_entry_erase(active_entry, active_entry->text_len - pos, CUTBUFFER_UPDATE_REPLACE);
+	gui_entry_erase(active_entry, active_entry->text_len - pos, CUTBUFFER_UPDATE_APPEND);
 }
 
 static void key_yank_from_cutbuffer(void)
@@ -590,7 +600,36 @@ static void key_yank_from_cutbuffer(void)
         cutbuffer = gui_entry_get_cutbuffer(active_entry);
 	if (cutbuffer != NULL) {
 		gui_entry_insert_text(active_entry, cutbuffer);
-                g_free(cutbuffer);
+		active_entry->yank_preceded = TRUE;
+		g_free(cutbuffer);
+	}
+}
+
+static void key_yank_next_cutbuffer(void)
+{
+	GUI_ENTRY_CUTBUFFER_REC *rec;
+	guint length = 0;
+	char *cutbuffer;
+
+	if (!previous_yank_preceded) {
+		if (settings_get_bool("bell_beeps")) {
+			signal_emit("beep", 0);
+		}
+		return;
+	}
+
+	if (active_entry->kill_ring == NULL)
+		return;
+
+	rec = active_entry->kill_ring->data;
+	if (rec != NULL) length = rec->cutbuffer_len;
+
+	cutbuffer = gui_entry_get_next_cutbuffer(active_entry);
+	if (cutbuffer != NULL) {
+		gui_entry_erase(active_entry, length, CUTBUFFER_UPDATE_NOOP);
+		gui_entry_insert_text(active_entry, cutbuffer);
+		active_entry->yank_preceded = TRUE;
+		g_free(cutbuffer);
 	}
 }
 
@@ -632,22 +671,27 @@ static void key_backspace(void)
 
 static void key_delete_previous_word(void)
 {
-	gui_entry_erase_word(active_entry, FALSE, CUTBUFFER_UPDATE_REPLACE);
+	gui_entry_erase_word(active_entry, FALSE, CUTBUFFER_UPDATE_PREPEND);
 }
 
 static void key_delete_next_word(void)
 {
-	gui_entry_erase_next_word(active_entry, FALSE);
+	gui_entry_erase_next_word(active_entry, FALSE, CUTBUFFER_UPDATE_APPEND);
 }
 
 static void key_delete_to_previous_space(void)
 {
-	gui_entry_erase_word(active_entry, TRUE, CUTBUFFER_UPDATE_REPLACE);
+	gui_entry_erase_word(active_entry, TRUE, CUTBUFFER_UPDATE_PREPEND);
 }
 
 static void key_delete_to_next_space(void)
 {
-	gui_entry_erase_next_word(active_entry, TRUE);
+	gui_entry_erase_next_word(active_entry, TRUE, CUTBUFFER_UPDATE_APPEND);
+}
+
+static void key_append_next_kill(void)
+{
+	active_entry->append_next_kill = TRUE;
 }
 
 static gboolean paste_timeout(gpointer data)
@@ -1191,6 +1235,8 @@ void gui_readline_init(void)
 	key_bind("erase_to_beg_of_line", "Erase everything before the cursor", NULL, NULL, (SIGNAL_FUNC) key_erase_to_beg_of_line);
 	key_bind("erase_to_end_of_line", "Erase everything after the cursor", "^K", NULL, (SIGNAL_FUNC) key_erase_to_end_of_line);
 	key_bind("yank_from_cutbuffer", "\"Undelete\", paste the last deleted text", "^Y", NULL, (SIGNAL_FUNC) key_yank_from_cutbuffer);
+	key_bind("yank_next_cutbuffer", "Revert to the previous last deleted text", NULL, NULL, (SIGNAL_FUNC) key_yank_next_cutbuffer);
+	key_bind("append_next_kill", "Append next deletion", NULL, NULL, (SIGNAL_FUNC) key_append_next_kill);
 	key_bind("transpose_characters", "Swap current and previous character", "^T", NULL, (SIGNAL_FUNC) key_transpose_characters);
 	key_bind("transpose_words", "Swap current and previous word", NULL, NULL, (SIGNAL_FUNC) key_transpose_words);
 	key_bind("capitalize_word", "Capitalize the current word", NULL, NULL, (SIGNAL_FUNC) key_capitalize_word);
@@ -1280,6 +1326,8 @@ void gui_readline_deinit(void)
 	key_unbind("erase_to_beg_of_line", (SIGNAL_FUNC) key_erase_to_beg_of_line);
 	key_unbind("erase_to_end_of_line", (SIGNAL_FUNC) key_erase_to_end_of_line);
 	key_unbind("yank_from_cutbuffer", (SIGNAL_FUNC) key_yank_from_cutbuffer);
+	key_unbind("yank_next_cutbuffer", (SIGNAL_FUNC) key_yank_next_cutbuffer);
+	key_unbind("append_next_kill", (SIGNAL_FUNC) key_append_next_kill);
 	key_unbind("transpose_characters", (SIGNAL_FUNC) key_transpose_characters);
 	key_unbind("transpose_words", (SIGNAL_FUNC) key_transpose_words);
 

From ec4ecd844bbc9c3254963862b0fff6be290db4ad Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 24 Mar 2016 16:01:07 +0100
Subject: [PATCH 0322/1650] Revert "Removed the obsolete SQUERY and SERVLIST
 commands"

This reverts commit 4beebe3238dda96efd4c3a0a6f6002ad5afc96e7.
---
 docs/help/in/list.in        |  6 +++---
 docs/help/in/servlist.in    | 23 +++++++++++++++++++++++
 docs/help/in/squery.in      | 16 ++++++++++++++++
 src/irc/core/irc-commands.c |  6 ++++++
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 docs/help/in/servlist.in
 create mode 100644 docs/help/in/squery.in

diff --git a/docs/help/in/list.in b/docs/help/in/list.in
index 33f05e8b..b796eed0 100644
--- a/docs/help/in/list.in
+++ b/docs/help/in/list.in
@@ -25,10 +25,10 @@
 %9Remarks:%9
 
     Not all networks support server-side filtering and may provide a network
-    service instead; on IRCnet, you may use the ALIS service:
+    service or service bot instead; on IRCnet, you may use the List service:
 
-    /QUOTE SQUERY ALIS :HELP
+    /SQUERY List HELP
     /MSG ALIS HELP
 
-%9See also:%9 QUOTE, STATS, WHOIS
+%9See also:%9 STATS, SQUERY, WHOIS
 
diff --git a/docs/help/in/servlist.in b/docs/help/in/servlist.in
new file mode 100644
index 00000000..0a0d025f
--- /dev/null
+++ b/docs/help/in/servlist.in
@@ -0,0 +1,23 @@
+
+%9Syntax:%9
+
+@SYNTAX:servlist@
+
+%9Parameters:%9
+
+    <mask> limits the output to the services which names matches
+           the mask.
+    <type> limits the output to the services of the specified type.
+
+%9Description:%9
+
+    List the network services currently present on the
+    IRC network.
+
+%9Examples:%9
+
+    /SERVLIST *@javairc.*
+    /SERVLIST * 0xD000
+
+%9See also:%9 SQUERY
+
diff --git a/docs/help/in/squery.in b/docs/help/in/squery.in
new file mode 100644
index 00000000..59ee8008
--- /dev/null
+++ b/docs/help/in/squery.in
@@ -0,0 +1,16 @@
+
+%9Syntax:%9
+
+@SYNTAX:squery@
+
+%9Parameters:%9
+
+    <service> - Service nickname or full hostmask of service to query.
+    <message> - Message to send to the service.
+
+%9Description:%9
+
+    /SQUERY sends a query to the specified service.
+
+%9See also:%9 SERVLIST, LIST, MSG
+
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 6baf2f6d..32ee8845 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -1018,11 +1018,15 @@ void irc_commands_init(void)
 	command_bind_irc("trace", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: VERSION [<server>|<nick>] */
 	command_bind_irc("version", NULL, (SIGNAL_FUNC) command_self);
+	/* SYNTAX: SERVLIST [<mask> [<type>]] */
+	command_bind_irc("servlist", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: SILENCE [[+|-]<nick!user@host>]
 	           SILENCE [<nick>] */
 	command_bind_irc("silence", NULL, (SIGNAL_FUNC) command_self);
 	command_bind_irc("unsilence", NULL, (SIGNAL_FUNC) cmd_unsilence);
 	command_bind_irc("sconnect", NULL, (SIGNAL_FUNC) cmd_sconnect);
+	/* SYNTAX: SQUERY <service> [<message>] */
+	command_bind_irc("squery", NULL, (SIGNAL_FUNC) command_2self);
 	/* SYNTAX: DIE */
 	command_bind_irc("die", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: HASH */
@@ -1091,9 +1095,11 @@ void irc_commands_deinit(void)
 	command_unbind("time", (SIGNAL_FUNC) command_self);
 	command_unbind("trace", (SIGNAL_FUNC) command_self);
 	command_unbind("version", (SIGNAL_FUNC) command_self);
+	command_unbind("servlist", (SIGNAL_FUNC) command_self);
 	command_unbind("silence", (SIGNAL_FUNC) command_self);
 	command_unbind("unsilence", (SIGNAL_FUNC) cmd_unsilence);
 	command_unbind("sconnect", (SIGNAL_FUNC) cmd_sconnect);
+	command_unbind("squery", (SIGNAL_FUNC) command_2self);
 	command_unbind("die", (SIGNAL_FUNC) command_self);
 	command_unbind("hash", (SIGNAL_FUNC) command_self);
 	command_unbind("oper", (SIGNAL_FUNC) cmd_oper);

From 2ba4b9d26afb87c2e661b1c07313ca78b3c5618e Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 4 Apr 2016 03:47:48 -0300
Subject: [PATCH 0323/1650] net_gethosterror: Handle EAI_SYSTEM ("System
 error") properly

That error code means "check errno". A few users got it and we never
figured out what happened - it usually fixed itself after restarting
something - so hopefully with this we'll have more information the next
time.
---
 src/core/network.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/network.c b/src/core/network.c
index 76659f3e..3e1b7c70 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -510,7 +510,11 @@ const char *net_gethosterror(int error)
 {
 	g_return_val_if_fail(error != 0, NULL);
 
-	return gai_strerror(error);
+	if (error == EAI_SYSTEM) {
+		return strerror(errno);
+	} else {
+		return gai_strerror(error);
+	}
 }
 
 /* return TRUE if host lookup failed because it didn't exist (ie. not

From 9fa3869a97be7b79c0aa5f7a7e80d655b0a7f8d8 Mon Sep 17 00:00:00 2001
From: B Thibault <isundil@knacki.info>
Date: Fri, 29 Apr 2016 00:12:28 +0200
Subject: [PATCH 0324/1650] retab

---
 src/fe-common/core/hilight-text.c | 120 +++++++++++++++---------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index b746f636..6aa19b88 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -49,7 +49,7 @@ static void reset_level_cache(void)
 		HILIGHT_REC *rec = tmp->data;
 
 		if (never_hilight_level & rec->level)
-                        never_hilight_level &= ~rec->level;
+			never_hilight_level &= ~rec->level;
 	}
 }
 
@@ -68,17 +68,17 @@ static void hilight_add_config(HILIGHT_REC *rec)
 	node = iconfig_node_traverse("(hilights", TRUE);
 	node = iconfig_node_section(node, NULL, NODE_TYPE_BLOCK);
 
-        iconfig_node_set_str(node, "text", rec->text);
-        if (rec->level > 0) iconfig_node_set_int(node, "level", rec->level);
-        if (rec->color) iconfig_node_set_str(node, "color", rec->color);
-        if (rec->act_color) iconfig_node_set_str(node, "act_color", rec->act_color);
-        if (rec->priority > 0) iconfig_node_set_int(node, "priority", rec->priority);
-        iconfig_node_set_bool(node, "nick", rec->nick);
-        iconfig_node_set_bool(node, "word", rec->word);
-        if (rec->nickmask) iconfig_node_set_bool(node, "mask", TRUE);
-        if (rec->fullword) iconfig_node_set_bool(node, "fullword", TRUE);
-        if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE);
-        if (rec->servertag) iconfig_node_set_str(node, "servertag", rec->servertag);
+	iconfig_node_set_str(node, "text", rec->text);
+	if (rec->level > 0) iconfig_node_set_int(node, "level", rec->level);
+	if (rec->color) iconfig_node_set_str(node, "color", rec->color);
+	if (rec->act_color) iconfig_node_set_str(node, "act_color", rec->act_color);
+	if (rec->priority > 0) iconfig_node_set_int(node, "priority", rec->priority);
+	iconfig_node_set_bool(node, "nick", rec->nick);
+	iconfig_node_set_bool(node, "word", rec->word);
+	if (rec->nickmask) iconfig_node_set_bool(node, "mask", TRUE);
+	if (rec->fullword) iconfig_node_set_bool(node, "fullword", TRUE);
+	if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE);
+	if (rec->servertag) iconfig_node_set_str(node, "servertag", rec->servertag);
 
 	if (rec->channels != NULL && *rec->channels != NULL) {
 		node = iconfig_node_section(node, "channels", NODE_TYPE_LIST);
@@ -191,7 +191,7 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
 }
 
 static int hilight_match_text(HILIGHT_REC *rec, const char *text,
-			      int *match_beg, int *match_end)
+				  int *match_beg, int *match_end)
 {
 	char *match;
 
@@ -200,9 +200,9 @@ static int hilight_match_text(HILIGHT_REC *rec, const char *text,
 		regmatch_t rmatch[1];
 
 		if (rec->regexp_compiled &&
-		    regexec(&rec->preg, text, 1, rmatch, 0) == 0) {
+			regexec(&rec->preg, text, 1, rmatch, 0) == 0) {
 			if (rmatch[0].rm_so > 0 &&
-			    match_beg != NULL && match_end != NULL) {
+				match_beg != NULL && match_end != NULL) {
 				*match_beg = rmatch[0].rm_so;
 				*match_end = rmatch[0].rm_eo;
 			}
@@ -222,7 +222,7 @@ static int hilight_match_text(HILIGHT_REC *rec, const char *text,
 		}
 	}
 
-        return FALSE;
+	return FALSE;
 }
 
 #define hilight_match_level(rec, level) \
@@ -267,14 +267,14 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 		HILIGHT_REC *rec = tmp->data;
 
 		if (!rec->nickmask && hilight_match_level(rec, level) &&
-		    hilight_match_channel(rec, channel) &&
-		    (rec->servertag == NULL ||
-		     (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
-		    hilight_match_text(rec, str, match_beg, match_end))
+			hilight_match_channel(rec, channel) &&
+			(rec->servertag == NULL ||
+			 (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
+			hilight_match_text(rec, str, match_beg, match_end))
 			return rec;
 	}
 
-        return NULL;
+	return NULL;
 }
 
 static char *hilight_get_act_color(HILIGHT_REC *rec)
@@ -308,7 +308,7 @@ void hilight_update_text_dest(TEXT_DEST_REC *dest, HILIGHT_REC *rec)
 	g_free_and_null(dest->hilight_color);
 	if (rec->act_color != NULL && g_strcmp0(rec->act_color, "%n") == 0)
 		dest->level |= MSGLEVEL_NO_ACT;
-        else
+	else
 		dest->hilight_color = hilight_get_act_color(rec);
 }
 
@@ -362,29 +362,29 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 		/* hilight whole line */
 		char *tmp = strip_codes(text);
 		newstr = g_strconcat(color, tmp, NULL);
-                g_free(tmp);
+		g_free(tmp);
 	} else {
 		/* hilight part of the line */
-                GString *tmp;
-                char *middle;
+		GString *tmp;
+		char *middle;
 		int pos, color_pos, color_len;
 
-                tmp = g_string_new(NULL);
+		tmp = g_string_new(NULL);
 
-                /* start of the line */
+		/* start of the line */
 		pos = strip_real_length(text, hilight_start, NULL, NULL);
 		g_string_append(tmp, text);
-                g_string_truncate(tmp, pos);
+		g_string_truncate(tmp, pos);
 
 		/* color */
-                g_string_append(tmp, color);
+		g_string_append(tmp, color);
 
 		/* middle of the line, stripped */
 		middle = strip_codes(text+pos);
-                pos = tmp->len;
+		pos = tmp->len;
 		g_string_append(tmp, middle);
-                g_string_truncate(tmp, pos+hilight_len);
-                g_free(middle);
+		g_string_truncate(tmp, pos+hilight_len);
+		g_free(middle);
 
 		/* end of the line */
 		pos = strip_real_length(text, hilight_end,
@@ -398,8 +398,8 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 		}
 		g_string_append(tmp, text+pos);
 
-                newstr = tmp->str;
-                g_string_free(tmp, FALSE);
+		newstr = tmp->str;
+		g_string_free(tmp, FALSE);
 	}
 
 	signal_emit("print text", 3, dest, newstr, stripped);
@@ -417,7 +417,7 @@ HILIGHT_REC *hilight_match_nick(SERVER_REC *server, const char *channel,
         HILIGHT_REC *rec;
 
 	rec = hilight_match(server, channel, nick, address,
-			    level, msg, NULL, NULL);
+				level, msg, NULL, NULL);
 	return (rec == NULL || !rec->nick) ? NULL : rec;
 }
 
@@ -475,7 +475,7 @@ static void read_hilight_config(void)
 		if (node != NULL) rec->channels = config_node_get_list(node);
 	}
 
-        reset_cache();
+	reset_cache();
 }
 
 static void hilight_print(int index, HILIGHT_REC *rec)
@@ -519,10 +519,10 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 	if (levelstr != NULL)
 		levelstr = g_strconcat(levelstr, " ", NULL);
 	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP,
-		    TXT_HILIGHT_LINE, index, rec->text,
-		    chans != NULL ? chans : "",
-		    levelstr != NULL ? levelstr : "",
-		    options->str);
+			TXT_HILIGHT_LINE, index, rec->text,
+			chans != NULL ? chans : "",
+			levelstr != NULL ? levelstr : "",
+			options->str);
 	g_free_not_null(chans);
 	g_free_not_null(levelstr);
 	g_string_free(options, TRUE);
@@ -548,7 +548,7 @@ static void cmd_hilight_show(void)
 		   [-network <network>] [-channels <channels>] <text> */
 static void cmd_hilight(const char *data)
 {
-        GHashTable *optlist;
+	GHashTable *optlist;
 	HILIGHT_REC *rec;
 	char *colorarg, *actcolorarg, *levelarg, *priorityarg, *chanarg, *text, *servertag;
 	char **channels;
@@ -562,7 +562,7 @@ static void cmd_hilight(const char *data)
 	}
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_GETREST, "hilight", &optlist, &text))
+				PARAM_FLAG_GETREST, "hilight", &optlist, &text))
 		return;
 
 	chanarg = g_hash_table_lookup(optlist, "channels");
@@ -582,7 +582,7 @@ static void cmd_hilight(const char *data)
 		rec = g_new0(HILIGHT_REC, 1);
 
 		/* default to nick/word hilighting */
-                rec->nick = TRUE;
+		rec->nick = TRUE;
 		rec->word = TRUE;
 
 		rec->text = g_strdup(text);
@@ -602,11 +602,11 @@ static void cmd_hilight(const char *data)
 
 	if (g_hash_table_lookup(optlist, "word") != NULL) {
 		rec->word = TRUE;
-                rec->nick = FALSE;
+		rec->nick = FALSE;
 	}
 
 	if (g_hash_table_lookup(optlist, "nick") != NULL)
-                rec->nick = TRUE;
+		rec->nick = TRUE;
 
 	rec->nickmask = g_hash_table_lookup(optlist, "mask") != NULL;
 	rec->fullword = g_hash_table_lookup(optlist, "full") != NULL;
@@ -631,7 +631,7 @@ static void cmd_hilight(const char *data)
 	hilight_create(rec);
 
 	hilight_print(g_slist_index(hilights, rec)+1, rec);
-        cmd_params_free(free_arg);
+	cmd_params_free(free_arg);
 
 	reset_cache();
 }
@@ -649,7 +649,7 @@ static void cmd_dehilight(const char *data)
 	} else {
 		/* with mask */
 		char *chans[2] = { "*", NULL };
-                rec = hilight_find(data, chans);
+		rec = hilight_find(data, chans);
 	}
 
 	if (rec == NULL)
@@ -657,20 +657,20 @@ static void cmd_dehilight(const char *data)
 	else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_HILIGHT_REMOVED, rec->text);
 		hilight_remove(rec);
-                reset_cache();
+		reset_cache();
 	}
 }
 
 static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
-			       NICK_REC *nick)
+				   NICK_REC *nick)
 {
 	GSList *tmp;
 	HILIGHT_REC *match;
-        char *nickmask;
+	char *nickmask;
 	int len, best_match;
 
 	if (nick->host == NULL)
-                return; /* don't check until host is known */
+		return; /* don't check until host is known */
 
 	nickmask = g_strconcat(nick->nick, "!", nick->host, NULL);
 
@@ -679,8 +679,8 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 		HILIGHT_REC *rec = tmp->data;
 
 		if (rec->nickmask &&
-		    hilight_match_channel(rec, channel->name) &&
-		    match_wildcards(rec->text, nickmask)) {
+			hilight_match_channel(rec, channel->name) &&
+			match_wildcards(rec->text, nickmask)) {
 			len = strlen(rec->text);
 			if (best_match < len) {
 				best_match = len;
@@ -691,7 +691,7 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 	g_free_not_null(nickmask);
 
 	if (match != NULL)
-                g_hash_table_insert(list, nick, match);
+		g_hash_table_insert(list, nick, match);
 }
 
 static void read_settings(void)
@@ -706,14 +706,14 @@ void hilight_text_init(void)
 	settings_add_str("lookandfeel", "hilight_act_color", "%M");
 	settings_add_level("lookandfeel", "hilight_level", "PUBLIC DCCMSGS");
 
-        read_settings();
+	read_settings();
 
 	nickmatch = nickmatch_init(hilight_nick_cache);
 	read_hilight_config();
 
 	signal_add_first("print text", (SIGNAL_FUNC) sig_print_text);
-        signal_add("setup reread", (SIGNAL_FUNC) read_hilight_config);
-        signal_add("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_add("setup reread", (SIGNAL_FUNC) read_hilight_config);
+	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 
 	command_bind("hilight", NULL, (SIGNAL_FUNC) cmd_hilight);
 	command_bind("dehilight", NULL, (SIGNAL_FUNC) cmd_dehilight);
@@ -723,11 +723,11 @@ void hilight_text_init(void)
 void hilight_text_deinit(void)
 {
 	hilights_destroy_all();
-        nickmatch_deinit(nickmatch);
+	nickmatch_deinit(nickmatch);
 
 	signal_remove("print text", (SIGNAL_FUNC) sig_print_text);
-        signal_remove("setup reread", (SIGNAL_FUNC) read_hilight_config);
-        signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_remove("setup reread", (SIGNAL_FUNC) read_hilight_config);
+	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 
 	command_unbind("hilight", (SIGNAL_FUNC) cmd_hilight);
 	command_unbind("dehilight", (SIGNAL_FUNC) cmd_dehilight);

From d8a6e666994ec4265459ed1e6665c01eb651eb82 Mon Sep 17 00:00:00 2001
From: B Thibault <isundil@knacki.info>
Date: Fri, 29 Apr 2016 01:01:34 +0200
Subject: [PATCH 0325/1650] Ref #421 (Add an option to make /hilight case
 sensitive) Allow use of /hilight -case exAMPle (compatible with other
 options) Added matchcase to hilight config file (exemple: { text = exAMPle;
 matchcase = yes; } )

---
 docs/help/in/hilight.in           |  1 +
 src/fe-common/core/hilight-text.c | 21 ++++++++++++++++-----
 src/fe-common/core/hilight-text.h |  1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/help/in/hilight.in b/docs/help/in/hilight.in
index fabbc2ea..677e64c3 100644
--- a/docs/help/in/hilight.in
+++ b/docs/help/in/hilight.in
@@ -10,6 +10,7 @@
     -line:        Highlights the whole line.
     -mask:        Highlights all messages from users matching the mask.
     -full:        The text must match the full word.
+    -case:        The text must match case.
     -regexp:      The text is a regular expression.
     -color:       The color the display the highlight in.
     -actcolor:    The color to mark the highlight activity in the statusbar.
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 6aa19b88..13c7c64d 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -78,6 +78,7 @@ static void hilight_add_config(HILIGHT_REC *rec)
 	if (rec->nickmask) iconfig_node_set_bool(node, "mask", TRUE);
 	if (rec->fullword) iconfig_node_set_bool(node, "fullword", TRUE);
 	if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE);
+	if (rec->case_sensitive) iconfig_node_set_bool(node, "matchcase", TRUE);
 	if (rec->servertag) iconfig_node_set_str(node, "servertag", rec->servertag);
 
 	if (rec->channels != NULL && *rec->channels != NULL) {
@@ -210,9 +211,16 @@ static int hilight_match_text(HILIGHT_REC *rec, const char *text,
 		}
 #endif
 	} else {
-		match = rec->fullword ?
-			stristr_full(text, rec->text) :
-			stristr(text, rec->text);
+		if (rec->case_sensitive) {
+			match = rec->fullword ?
+				strstr_full(text, rec->text) :
+				strstr(text, rec->text);
+		}
+		else {
+			match = rec->fullword ?
+				stristr_full(text, rec->text) :
+				stristr(text, rec->text);
+		}
 		if (match != NULL) {
 			if (match_beg != NULL && match_end != NULL) {
 				*match_beg = (int) (match-text);
@@ -464,6 +472,7 @@ static void read_hilight_config(void)
 		rec->priority = config_node_get_int(node, "priority", 0);
 		rec->nick = config_node_get_bool(node, "nick", TRUE);
 		rec->word = config_node_get_bool(node, "word", TRUE);
+		rec->case_sensitive = config_node_get_bool(node, "matchcase", FALSE);
 
 		rec->nickmask = config_node_get_bool(node, "mask", FALSE);
 		rec->fullword = config_node_get_bool(node, "fullword", FALSE);
@@ -495,6 +504,7 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 
 	if (rec->nickmask) g_string_append(options, "-mask ");
 	if (rec->fullword) g_string_append(options, "-full ");
+	if (rec->case_sensitive) g_string_append(options, "-case ");
 	if (rec->regexp) {
 		g_string_append(options, "-regexp ");
 #ifdef HAVE_REGEX_H
@@ -543,7 +553,7 @@ static void cmd_hilight_show(void)
 	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_HILIGHT_FOOTER);
 }
 
-/* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -regexp]
+/* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -case | -regexp]
                    [-color <color>] [-actcolor <color>] [-level <level>]
 		   [-network <network>] [-channels <channels>] <text> */
 static void cmd_hilight(const char *data)
@@ -611,6 +621,7 @@ static void cmd_hilight(const char *data)
 	rec->nickmask = g_hash_table_lookup(optlist, "mask") != NULL;
 	rec->fullword = g_hash_table_lookup(optlist, "full") != NULL;
 	rec->regexp = g_hash_table_lookup(optlist, "regexp") != NULL;
+	rec->case_sensitive = g_hash_table_lookup(optlist, "case") != NULL;
 
 	if (colorarg != NULL) {
 		g_free_and_null(rec->color);
@@ -717,7 +728,7 @@ void hilight_text_init(void)
 
 	command_bind("hilight", NULL, (SIGNAL_FUNC) cmd_hilight);
 	command_bind("dehilight", NULL, (SIGNAL_FUNC) cmd_dehilight);
-	command_set_options("hilight", "-color -actcolor -level -priority -network -channels nick word line mask full regexp");
+	command_set_options("hilight", "-color -actcolor -level -priority -network -channels nick word line mask full regexp case");
 }
 
 void hilight_text_deinit(void)
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 3c897def..ae05e1ca 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -23,6 +23,7 @@ struct _HILIGHT_REC {
 	unsigned int nickmask:1; /* `text' is a nick mask */
 	unsigned int fullword:1; /* match `text' only for full words */
 	unsigned int regexp:1; /* `text' is a regular expression */
+	unsigned int case_sensitive:1;/* `text' must match case */
 #ifdef HAVE_REGEX_H
 	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
 	regex_t preg;

From ddd54164304e8d4bc3b709dbe6d2eca7832cff81 Mon Sep 17 00:00:00 2001
From: B Thibault <isundil@knacki.info>
Date: Fri, 29 Apr 2016 11:00:34 +0200
Subject: [PATCH 0326/1650] changed command-line -case to -matchcase

---
 docs/help/in/hilight.in           | 2 +-
 src/fe-common/core/hilight-text.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/help/in/hilight.in b/docs/help/in/hilight.in
index 677e64c3..2f396430 100644
--- a/docs/help/in/hilight.in
+++ b/docs/help/in/hilight.in
@@ -10,7 +10,7 @@
     -line:        Highlights the whole line.
     -mask:        Highlights all messages from users matching the mask.
     -full:        The text must match the full word.
-    -case:        The text must match case.
+    -matchcase:   The text must match case.
     -regexp:      The text is a regular expression.
     -color:       The color the display the highlight in.
     -actcolor:    The color to mark the highlight activity in the statusbar.
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 13c7c64d..78815a42 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -504,7 +504,7 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 
 	if (rec->nickmask) g_string_append(options, "-mask ");
 	if (rec->fullword) g_string_append(options, "-full ");
-	if (rec->case_sensitive) g_string_append(options, "-case ");
+	if (rec->case_sensitive) g_string_append(options, "-matchcase ");
 	if (rec->regexp) {
 		g_string_append(options, "-regexp ");
 #ifdef HAVE_REGEX_H
@@ -553,7 +553,7 @@ static void cmd_hilight_show(void)
 	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_HILIGHT_FOOTER);
 }
 
-/* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -case | -regexp]
+/* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -matchcase | -regexp]
                    [-color <color>] [-actcolor <color>] [-level <level>]
 		   [-network <network>] [-channels <channels>] <text> */
 static void cmd_hilight(const char *data)
@@ -621,7 +621,7 @@ static void cmd_hilight(const char *data)
 	rec->nickmask = g_hash_table_lookup(optlist, "mask") != NULL;
 	rec->fullword = g_hash_table_lookup(optlist, "full") != NULL;
 	rec->regexp = g_hash_table_lookup(optlist, "regexp") != NULL;
-	rec->case_sensitive = g_hash_table_lookup(optlist, "case") != NULL;
+	rec->case_sensitive = g_hash_table_lookup(optlist, "matchcase") != NULL;
 
 	if (colorarg != NULL) {
 		g_free_and_null(rec->color);
@@ -728,7 +728,7 @@ void hilight_text_init(void)
 
 	command_bind("hilight", NULL, (SIGNAL_FUNC) cmd_hilight);
 	command_bind("dehilight", NULL, (SIGNAL_FUNC) cmd_dehilight);
-	command_set_options("hilight", "-color -actcolor -level -priority -network -channels nick word line mask full regexp case");
+	command_set_options("hilight", "-color -actcolor -level -priority -network -channels nick word line mask full regexp matchcase");
 }
 
 void hilight_text_deinit(void)

From e7a18759ecb02a0b1fcbb118b9e732e604268afd Mon Sep 17 00:00:00 2001
From: isundil <isundil@knacki.info>
Date: Fri, 29 Apr 2016 22:17:48 +0000
Subject: [PATCH 0327/1650] Added case-sensitive regexp matching for hilights

---
 src/fe-common/core/hilight-text.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 78815a42..d1c4718c 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -122,8 +122,11 @@ static void hilight_init_rec(HILIGHT_REC *rec)
 {
 #ifdef HAVE_REGEX_H
 	if (rec->regexp_compiled) regfree(&rec->preg);
-	rec->regexp_compiled = !rec->regexp ? FALSE :
-		regcomp(&rec->preg, rec->text, REG_EXTENDED|REG_ICASE) == 0;
+	if (!rec->regexp)
+		rec->regexp_compiled = FALSE;
+	else
+		rec->regexp_compiled = regcomp(&rec->preg, rec->text,
+				rec->case_sensitive ? REG_EXTENDED : (REG_EXTENDED|REG_ICASE)) == 0;
 #endif
 }
 

From b24921db7a49d01ce30245999483589bcea47d53 Mon Sep 17 00:00:00 2001
From: dennisschagt <dennisschagt@gmail.com>
Date: Sat, 30 Apr 2016 09:44:26 +0200
Subject: [PATCH 0328/1650] Correct error/typo "You"->"Your" in help message

---
 docs/help/in/away.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/away.in b/docs/help/in/away.in
index e0cf3685..75bc46c4 100644
--- a/docs/help/in/away.in
+++ b/docs/help/in/away.in
@@ -8,8 +8,8 @@
    -one:    Marks yourself as away on the active server.
    -all:    Marks yourself as away on all the servers you are connected to.
 
-   You away message; if no argument is given, your away status will be removed.
-   
+   Your away message; if no argument is given, your away status will be removed.
+
 %9Description:%9
 
     Marks yourself as 'away'; this method is used to inform people that you

From b63339af89abc9830ecf8c56916db9eb1a42e005 Mon Sep 17 00:00:00 2001
From: isundil <isundil@knacki.info>
Date: Sat, 30 Apr 2016 18:26:26 +0000
Subject: [PATCH 0329/1650] Increased ABI version

---
 src/common.h                      | 2 +-
 src/fe-common/core/hilight-text.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/common.h b/src/common.h
index 33dbd481..4fd6d331 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 3
+#define IRSSI_ABI_VERSION 4
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index d1c4718c..36e1e78c 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -218,8 +218,7 @@ static int hilight_match_text(HILIGHT_REC *rec, const char *text,
 			match = rec->fullword ?
 				strstr_full(text, rec->text) :
 				strstr(text, rec->text);
-		}
-		else {
+		} else {
 			match = rec->fullword ?
 				stristr_full(text, rec->text) :
 				stristr(text, rec->text);

From 47e792da05f79c624a190fd5780e07f171fd7bd1 Mon Sep 17 00:00:00 2001
From: pisculichi <pisculichi@openmailbox.com>
Date: Mon, 2 May 2016 16:01:48 +0000
Subject: [PATCH 0330/1650] Fix some ANSI C issues.

---
 src/fe-common/core/fe-messages.c | 5 +++--
 src/fe-common/core/themes.c      | 2 +-
 src/fe-text/gui-entry.c          | 9 ++++++---
 src/fe-text/gui-readline.c       | 3 ++-
 src/fe-text/statusbar.c          | 2 +-
 src/irc/proxy/proxy.c            | 3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 3240fd10..bc2a30d6 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -175,6 +175,7 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	int for_me, print_channel, level;
 	char *nickmode, *color, *freemsg = NULL;
 	HILIGHT_REC *hilight;
+	TEXT_DEST_REC dest;
 
 	/* NOTE: this may return NULL if some channel is just closed with
 	   /WINDOW CLOSE and server still sends the few last messages */
@@ -214,7 +215,6 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	if (printnick == NULL)
 		printnick = nick;
 
-	TEXT_DEST_REC dest;
 	format_create_dest(&dest, server, target, level, NULL);
 	dest.address = address;
 	dest.nick = nick;
@@ -396,8 +396,9 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 	count = 0; windows = NULL;
 	chans = g_string_new(NULL);
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
+		CHANNEL_REC *rec;
 		level = MSGLEVEL_QUITS;
-		CHANNEL_REC *rec = tmp->data;
+		rec = tmp->data;
 
 		if (!nicklist_find(rec, nick))
 			continue;
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 58e7b557..2b1459be 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -365,9 +365,9 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format)
 	GString *str;
 	char *ret;
 	theme_rm_col dummy, reset;
+	int braces = 1; /* we start with one brace opened */
 	dummy.m[0] = '\0';
 	strcpy(reset.m, "n");
-	int braces = 1; /* we start with one brace opened */
 
 	str = g_string_new(NULL);
 	while (**format != '\0' && braces != 0) {
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 63dda34e..31fe0e1e 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -554,6 +554,7 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 
 char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
 {
+	GUI_ENTRY_CUTBUFFER_REC *tmp;
 	char *buf;
         int i;
 
@@ -562,7 +563,7 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
 	if (entry->kill_ring == NULL || entry->kill_ring->data == NULL)
 		return NULL;
 
-	GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
+	tmp = entry->kill_ring->data;
 
 	if (tmp->cutbuffer == NULL)
                 return NULL;
@@ -582,12 +583,14 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
 
 char *gui_entry_get_next_cutbuffer(GUI_ENTRY_REC *entry)
 {
+	GUI_ENTRY_CUTBUFFER_REC *tmp;
+
 	g_return_val_if_fail(entry != NULL, NULL);
 
 	if (entry->kill_ring == NULL)
 		return NULL;
 
-	GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
+	tmp = entry->kill_ring->data;
 
 	entry->kill_ring = g_slist_remove(entry->kill_ring, tmp);
 	entry->kill_ring = g_slist_append(entry->kill_ring, tmp);
@@ -608,7 +611,7 @@ void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP updat
 
 static GUI_ENTRY_CUTBUFFER_REC *get_cutbuffer_rec(GUI_ENTRY_REC *entry, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
-	GUI_ENTRY_CUTBUFFER_REC *tmp = NULL;
+	GUI_ENTRY_CUTBUFFER_REC *tmp;
 
 	g_return_val_if_fail(entry != NULL, NULL);
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index e0ffb4f1..7c71edd7 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -696,10 +696,11 @@ static void key_append_next_kill(void)
 
 static gboolean paste_timeout(gpointer data)
 {
+	int split_lines;
 	paste_was_bracketed_mode = paste_bracketed_mode;
 
 	/* number of lines after splitting extra-long messages */
-	int split_lines = paste_buffer->len / LINE_SPLIT_LIMIT;
+	split_lines = paste_buffer->len / LINE_SPLIT_LIMIT;
 
 	/* Take into account the fact that a line may be split every LINE_SPLIT_LIMIT characters */
 	if (paste_line_count == 0 && split_lines <= paste_verify_line_count) {
diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c
index 5448243a..f0dff828 100644
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@@ -671,8 +671,8 @@ void statusbar_item_default_handler(SBAR_ITEM_REC *item, int get_size_only,
 	WI_ITEM_REC *wiitem;
 	char *tmpstr, *tmpstr2;
 	theme_rm_col reset;
-	strcpy(reset.m, "n");
 	int len;
+	strcpy(reset.m, "n");
 
 	if (str == NULL)
 		str = statusbar_item_get_value(item);
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index 1a714045..2875d2c2 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -28,13 +28,14 @@
 /* SYNTAX: IRSSIPROXY STATUS */
 static void cmd_irssiproxy_status(const char *data, IRC_SERVER_REC *server)
 {
+	GSList *tmp;
+
 	if (!settings_get_bool("irssiproxy")) {
 		printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
 			  "Proxy is currently disabled");
 		return;
 	}
 
-	GSList *tmp;
 
 	printtext(server, NULL, MSGLEVEL_CLIENTNOTICE,
 		  "Proxy: Currently connected clients: %d",

From 3376d324e1e174e2885efbb7f1f056bc2a0d2857 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 9 May 2016 16:55:35 +0200
Subject: [PATCH 0331/1650] improve perl @INC detection

---
 acconfig.h   | 30 ---------------------
 configure.ac | 74 ++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 58 insertions(+), 46 deletions(-)
 delete mode 100644 acconfig.h

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 53e268d7..00000000
--- a/acconfig.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* misc.. */
-#undef HAVE_SOCKS_H
-#undef HAVE_STATIC_PERL
-#undef HAVE_GMODULE
-
-/* macros/curses checks */
-#undef HAS_CURSES
-#undef USE_SUNOS_CURSES
-#undef USE_BSD_CURSES
-#undef USE_SYSV_CURSES
-#undef USE_NCURSES
-#undef NO_COLOR_CURSES
-#undef SCO_FLAVOR
-
-/* our own curses checks */
-#undef HAVE_NCURSES_USE_DEFAULT_COLORS
-#undef HAVE_CURSES_IDCOK
-#undef HAVE_CURSES_RESIZETERM
-#undef HAVE_CURSES_WRESIZE
-
-/* terminfo/termcap */
-#undef HAVE_TERMINFO
-
-/* What type should be used for uoff_t */
-#undef UOFF_T_INT
-#undef UOFF_T_LONG
-#undef UOFF_T_LONG_LONG
-
-/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */
-#undef PRIuUOFF_T
diff --git a/configure.ac b/configure.ac
index 2c47bd2b..0e5f2f0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,6 @@ AC_ARG_WITH(modules,
 if test "x$prefix" != "xNONE"; then
 	prefix=`eval echo $prefix`
 	PERL_MM_PARAMS="INSTALLDIRS=perl INSTALL_BASE=$prefix"
-	perl_library_dir="PERL_USE_LIB"
 	perl_set_use_lib=yes
 
 	perl_prefix_note=yes
@@ -97,30 +96,35 @@ AC_ARG_WITH(perl-staticlib,
 
 
 AC_ARG_WITH(perl-lib,
-[  --with-perl-lib=[site|vendor|DIR]  Specify where to install the
+[  --with-perl-lib=[perl|site|vendor|DIR]  Specify where to install the
                           Perl libraries for irssi, default is site],
 	if test "x$withval" = xyes; then
 		want_perl=yes
 	elif test "x$withval" = xno; then
 		want_perl=no
+	elif test "x$withval" = xperl; then
+		want_perl=yes
+		perl_prefix_note=no
+		PERL_MM_PARAMS="INSTALLDIRS=perl"
+		perl_set_use_lib=no
 	elif test "x$withval" = xsite; then
 		want_perl=yes
 		perl_prefix_note=no
 		PERL_MM_PARAMS=""
+		perl_set_use_lib=no
 	elif test "x$withval" = xvendor; then
 		want_perl=yes
 		perl_prefix_note=no
 		if test -z "`$perlpath -v|grep '5\.0'`"; then
 			PERL_MM_PARAMS="INSTALLDIRS=vendor"
 		else
-			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`perl -e 'use Config; print $Config{prefix}'`"
+			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`"
 		fi
-		perl_library_dir="(vendor default - `$perlpath -e 'use Config; print $Config{archlib}'`)"
+		perl_set_use_lib=no
 	else
 		want_perl=yes
 		perl_prefix_note=no
 		PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
-		perl_library_dir="PERL_USE_LIB"
 		perl_set_use_lib=yes
 	fi,
 	want_perl=yes)
@@ -371,7 +375,7 @@ if test "$want_perl" != "no"; then
 		dnl * complain about them. Normally there's only few options
 		dnl * that we want to keep:
 		dnl * -Ddefine -Uundef -I/path -fopt -mopt
-		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-[^DUIfm][^ ]+/\1/g; s/^(.* )?\+[^ ]+/\1/g'`
+		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIfm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
 
 		PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
 		AC_SUBST(PERL_EXTRA_OPTS)
@@ -455,13 +459,37 @@ if test "$want_perl" != "no"; then
 			PERL_STATIC_LIBS=0
 		fi
 
+		# remove any prefix from PERL_MM_OPT
+		PERL_MM_OPT=`perl -MText::ParseWords -e 'sub qu{$_=shift;s{^(.*?)=(.*)$}{($a,$b)=($1,$2);$b=~s/"/\\\\"/g;qq{$a="$b"}}ge if /@<:@\s"@:>@/;$_} local $,=" "; print map qu($_), grep !/^(INSTALL_BASE|PREFIX)=/, shellwords(@ARGV)' "$PERL_MM_OPT"`
 		# figure out the correct @INC path - we'll need to do this
 		# through MakeMaker since it's difficult to get it right
 		# otherwise.
+		$perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null
+		echo 'show-INSTALLDIRS:' >> Makefile.test
+		echo '	@echo $(INSTALLDIRS)' >> Makefile.test
+		perl_INSTALLDIRS=`$am_make -f Makefile.test show-INSTALLDIRS`
+		if test "x$perl_INSTALLDIRS" = "xsite"; then
+			perl_library_dir="site default"
+			perl_INSTALL_VAR=INSTALLSITEARCH
+		elif test "x$perl_INSTALLDIRS" = "xvendor"; then
+			perl_library_dir="vendor default"
+			perl_INSTALL_VAR=INSTALLVENDORARCH
+		else
+			perl_library_dir="module default"
+			perl_INSTALL_VAR=INSTALLARCHLIB
+		fi
+		echo 'show-ARCHLIB:' >> Makefile.test
+		echo '	@echo $('"$perl_INSTALL_VAR"')' >> Makefile.test
+		perl_use_lib=`$am_make -f Makefile.test show-ARCHLIB`
+		rm -f Makefile.test
 		if test "x$perl_set_use_lib" = "xyes"; then
-			perl -e 'use ExtUtils::MakeMaker; WriteMakefile("NAME" => "test", "MAKEFILE" => "Makefile.test");' $PERL_MM_PARAMS >/dev/null
-			PERL_USE_LIB=`perl -e 'open(F, "Makefile.test"); while (<F>) { chomp; if (/^(\w+) = (.*$)/) { $keys{$1} = $2; } }; $key = $keys{INSTALLARCHLIB}; while ($key =~ /\\$\((\w+)\)/) { $value = $keys{$1}; $key =~ s/\\$\($1\)/$value/; }; print $key;'`
-			rm -f Makefile.test
+			if $perlpath -e 'exit ! grep $_ eq $ARGV@<:@0@:>@, grep /^\//, @INC' "$perl_use_lib"; then
+				perl_library_dir="other path in @INC"
+				perl_set_use_lib=no
+			else
+				perl_library_dir="prepends to @INC with /set perl_use_lib"
+				PERL_USE_LIB="$perl_use_lib"
+			fi
 		fi
 
 		AC_SUBST(perl_module_lib)
@@ -477,6 +505,7 @@ if test "$want_perl" != "no"; then
 		AC_SUBST(PERL_CFLAGS)
 
 		AC_SUBST(PERL_USE_LIB)
+		AC_SUBST(PERL_MM_OPT)
 		AC_SUBST(PERL_MM_PARAMS)
 		AC_SUBST(PERL_STATIC_LIBS)
 	fi
@@ -591,6 +620,25 @@ else
 	want_truecolor=no
 fi
 
+AH_TEMPLATE(HAS_CURSES, [macros/curses checks])
+AH_TEMPLATE(HAVE_CURSES_IDCOK)
+AH_TEMPLATE(HAVE_CURSES_RESIZETERM)
+AH_TEMPLATE(HAVE_CURSES_WRESIZE)
+AH_TEMPLATE(HAVE_GMODULE)
+AH_TEMPLATE(HAVE_NCURSES_USE_DEFAULT_COLORS, [our own curses checks])
+AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
+AH_TEMPLATE(HAVE_STATIC_PERL)
+AH_TEMPLATE(HAVE_TERMINFO, [terminfo/termcap])
+AH_TEMPLATE(NO_COLOR_CURSES)
+AH_TEMPLATE(PRIuUOFF_T, [printf()-format for uoff_t, eg. "u" or "lu" or "llu"])
+AH_TEMPLATE(SCO_FLAVOR)
+AH_TEMPLATE(UOFF_T_INT, [What type should be used for uoff_t])
+AH_TEMPLATE(UOFF_T_LONG)
+AH_TEMPLATE(UOFF_T_LONG_LONG)
+AH_TEMPLATE(USE_NCURSES)
+AH_TEMPLATE(USE_SUNOS_CURSES)
+AH_TEMPLATE(USE_SYSV_CURSES)
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
@@ -692,13 +740,7 @@ if test "x$want_perl" != "xno" -a "x$perl_mod_error" != "x"; then
 fi
 
 if test "x$want_perl" != "xno"; then
-	if test "$perl_library_dir" = "PERL_USE_LIB"; then
-		perl_library_dir=$PERL_USE_LIB
-	fi
-	if test -z "$perl_library_dir"; then
-		perl_library_dir="(site default - `$perlpath -e 'use Config; print $Config{sitearch}'`)"
-	fi
-	echo "Perl library directory ........... : $perl_library_dir"
+	echo "Perl library directory ........... : ($perl_library_dir - $perl_use_lib)"
 	if test "x$perl_prefix_note" = "xyes"; then
 		echo "  - NOTE: This was automatically set to the same directory you gave with"
 		echo "  --prefix. If you want the perl libraries to install to their 'correct'"

From affbf71f102cc740aeda180fd3297c1cc6c8f7de Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 11 May 2016 11:43:08 +0200
Subject: [PATCH 0332/1650] add silent flag to make, should stop GNU make from
 turning on -w

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0e5f2f0d..04e2b0b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,7 +467,7 @@ if test "$want_perl" != "no"; then
 		$perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null
 		echo 'show-INSTALLDIRS:' >> Makefile.test
 		echo '	@echo $(INSTALLDIRS)' >> Makefile.test
-		perl_INSTALLDIRS=`$am_make -f Makefile.test show-INSTALLDIRS`
+		perl_INSTALLDIRS=`$am_make -s -f Makefile.test show-INSTALLDIRS`
 		if test "x$perl_INSTALLDIRS" = "xsite"; then
 			perl_library_dir="site default"
 			perl_INSTALL_VAR=INSTALLSITEARCH
@@ -480,7 +480,7 @@ if test "$want_perl" != "no"; then
 		fi
 		echo 'show-ARCHLIB:' >> Makefile.test
 		echo '	@echo $('"$perl_INSTALL_VAR"')' >> Makefile.test
-		perl_use_lib=`$am_make -f Makefile.test show-ARCHLIB`
+		perl_use_lib=`$am_make -s -f Makefile.test show-ARCHLIB`
 		rm -f Makefile.test
 		if test "x$perl_set_use_lib" = "xyes"; then
 			if $perlpath -e 'exit ! grep $_ eq $ARGV@<:@0@:>@, grep /^\//, @INC' "$perl_use_lib"; then

From 5538578820550c1a62dc4d0e6451332229eeee75 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 01:26:33 +0200
Subject: [PATCH 0333/1650] Move utf8.{h,c} from fe-common/core to core.

---
 src/core/Makefile.am               | 1 +
 src/{fe-common => }/core/utf8.c    | 2 ++
 src/{fe-common => }/core/utf8.h    | 3 +++
 src/{fe-common => }/core/wcwidth.c | 0
 src/fe-common/core/Makefile.am     | 5 -----
 src/fe-common/core/module.h        | 2 +-
 src/fe-text/term.h                 | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)
 rename src/{fe-common => }/core/utf8.c (96%)
 rename src/{fe-common => }/core/utf8.h (93%)
 rename src/{fe-common => }/core/wcwidth.c (100%)

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index fc32e17e..cc200034 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -44,6 +44,7 @@ libcore_a_SOURCES = \
 	settings.c \
 	signals.c \
 	special-vars.c \
+	utf8.c \
 	write-buffer.c
 
 structure_headers = \
diff --git a/src/fe-common/core/utf8.c b/src/core/utf8.c
similarity index 96%
rename from src/fe-common/core/utf8.c
rename to src/core/utf8.c
index 2d07ea8e..1ab6def9 100644
--- a/src/fe-common/core/utf8.c
+++ b/src/core/utf8.c
@@ -22,5 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "utf8.h"
 #include "module.h"
+#include "wcwidth.c"
 
diff --git a/src/fe-common/core/utf8.h b/src/core/utf8.h
similarity index 93%
rename from src/fe-common/core/utf8.h
rename to src/core/utf8.h
index 3c15dc7d..63261a24 100644
--- a/src/fe-common/core/utf8.h
+++ b/src/core/utf8.h
@@ -8,6 +8,9 @@
 #define is_big5_hi(hi)  (0x81 <= (hi) && (hi) <= 0xFE)
 #define is_big5(hi,lo) (is_big5_hi(hi) && is_big5_lo(lo))
 
+#include <glib.h>
+typedef guint32 unichar;
+
 /* Returns width for character (0-2). */
 int mk_wcwidth(unichar c);
 
diff --git a/src/fe-common/core/wcwidth.c b/src/core/wcwidth.c
similarity index 100%
rename from src/fe-common/core/wcwidth.c
rename to src/core/wcwidth.c
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index e755b510..63f91fa6 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -24,8 +24,6 @@ libfe_common_core_a_SOURCES = \
 	fe-queries.c \
 	fe-server.c \
 	fe-settings.c \
-	utf8.c \
-	wcwidth.c \
 	formats.c \
 	hilight-text.c \
 	keyboard.c \
@@ -62,6 +60,3 @@ pkginc_fe_common_core_HEADERS = \
 	window-items.h \
 	windows-layout.h \
 	fe-windows.h
-
-noinst_HEADERS = \
-	utf8.h
diff --git a/src/fe-common/core/module.h b/src/fe-common/core/module.h
index 51b61b3e..db712ec7 100644
--- a/src/fe-common/core/module.h
+++ b/src/fe-common/core/module.h
@@ -2,7 +2,7 @@
 
 #define MODULE_NAME "fe-common/core"
 
-typedef guint32 unichar;
+#include "utf8.h"
 typedef struct {
 	time_t time;
 	char *nick;
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index 9b726d82..0c7847f6 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -27,7 +27,7 @@ typedef struct _TERM_WINDOW TERM_WINDOW;
 #define TERM_TYPE_UTF8		1
 #define TERM_TYPE_BIG5		2
 
-typedef guint32 unichar;
+#include "utf8.h"
 
 extern TERM_WINDOW *root_window;
 extern int term_width, term_height;

From 5c74a3bb88db0fa32c459f8494e9f5a62a821baa Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 01:39:14 +0200
Subject: [PATCH 0334/1650] Move advance() from fe-common/core to core.

---
 src/core/utf8.c              | 15 +++++++++++++++
 src/core/utf8.h              |  5 +++++
 src/fe-common/core/formats.c | 16 ----------------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/core/utf8.c b/src/core/utf8.c
index 1ab6def9..6daa878a 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -26,3 +26,18 @@
 #include "module.h"
 #include "wcwidth.c"
 
+int advance(char const **str, gboolean utf8)
+{
+	if (utf8) {
+		gunichar c;
+
+		c = g_utf8_get_char(*str);
+		*str = g_utf8_next_char(*str);
+
+		return unichar_isprint(c) ? mk_wcwidth(c) : 1;
+	} else {
+		*str += 1;
+
+		return 1;
+	}
+}
diff --git a/src/core/utf8.h b/src/core/utf8.h
index 63261a24..09397f69 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -14,6 +14,11 @@ typedef guint32 unichar;
 /* Returns width for character (0-2). */
 int mk_wcwidth(unichar c);
 
+/* Advance the str pointer one character further; return the number of columns
+ * occupied by the skipped character.
+ */
+int advance(char const **str, gboolean utf8);
+
 #define unichar_isprint(c) (((c) & ~0x80) >= 32)
 #define is_utf8_leading(c) (((c) & 0xc0) != 0x80)
 
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index ccf48394..7daecfcf 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -420,22 +420,6 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
 		window_find_closest(server, target, level);
 }
 
-static int advance (char const **str, gboolean utf8)
-{
-	if (utf8) {
-		gunichar c;
-
-		c = g_utf8_get_char(*str);
-		*str = g_utf8_next_char(*str);
-
-		return unichar_isprint(c) ? mk_wcwidth(c) : 1;
-	} else {
-		*str += 1;
-
-		return 1;
-	}
-}
-
 /* Return length of text part in string (ie. without % codes) */
 int format_get_length(const char *str)
 {

From b0afcc96dbc13cf3a5ed94686bb227ab0d86ceaa Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 01:52:37 +0200
Subject: [PATCH 0335/1650] Rename advance() into string_advance().

---
 src/core/utf8.c              | 2 +-
 src/core/utf8.h              | 2 +-
 src/fe-common/core/formats.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/utf8.c b/src/core/utf8.c
index 6daa878a..1daaf03f 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -26,7 +26,7 @@
 #include "module.h"
 #include "wcwidth.c"
 
-int advance(char const **str, gboolean utf8)
+int string_advance(char const **str, gboolean utf8)
 {
 	if (utf8) {
 		gunichar c;
diff --git a/src/core/utf8.h b/src/core/utf8.h
index 09397f69..50ee0886 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -17,7 +17,7 @@ int mk_wcwidth(unichar c);
 /* Advance the str pointer one character further; return the number of columns
  * occupied by the skipped character.
  */
-int advance(char const **str, gboolean utf8);
+int string_advance(char const **str, gboolean utf8);
 
 #define unichar_isprint(c) (((c) & ~0x80) >= 32)
 #define is_utf8_leading(c) (((c) & 0xc0) != 0x80)
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 7daecfcf..def03e10 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -449,7 +449,7 @@ int format_get_length(const char *str)
 				len++;
 		}
 
-		len += advance(&str, utf8);
+		len += string_advance(&str, utf8);
 	}
 
 	g_string_free(tmp, TRUE);
@@ -491,7 +491,7 @@ int format_real_length(const char *str, int len)
 		}
 
 		oldstr = str;
-		len -= advance(&str, utf8);
+		len -= string_advance(&str, utf8);
 		if (len < 0)
 			str = oldstr;
 	}

From 2c8648a9c889fc0a7c4b24367a3f81f08dedccb2 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 02:10:02 +0200
Subject: [PATCH 0336/1650] Introduce string_policy().

---
 src/core/utf8.c | 13 +++++++++++++
 src/core/utf8.h | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/core/utf8.c b/src/core/utf8.c
index 1daaf03f..d931ba19 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -25,6 +25,8 @@
 #include "utf8.h"
 #include "module.h"
 #include "wcwidth.c"
+/* Provide is_utf8(): */
+#include "recode.h"
 
 int string_advance(char const **str, gboolean utf8)
 {
@@ -41,3 +43,14 @@ int string_advance(char const **str, gboolean utf8)
 		return 1;
 	}
 }
+
+int string_policy(const char *str)
+{
+	if (is_utf8()) {
+		if (!str || g_utf8_validate(str, -1, NULL)) {
+			/* No string provided or valid UTF-8 string: treat as UTF-8: */
+			return TREAT_STRING_AS_UTF8;
+		}
+	}
+	return TREAT_STRING_AS_BYTES;
+}
diff --git a/src/core/utf8.h b/src/core/utf8.h
index 50ee0886..fa11b737 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -19,6 +19,20 @@ int mk_wcwidth(unichar c);
  */
 int string_advance(char const **str, gboolean utf8);
 
+/* TREAT_STRING_AS_BYTES means strings are to be treated using strncpy,
+ * strnlen, etc.
+ * TREAT_STRING_AS_UTF8 means strings are to be treated using g_utf8_*
+ * functions.
+ */
+#define TREAT_STRING_AS_BYTES 0
+#define TREAT_STRING_AS_UTF8  1
+
+/* Return how the str string ought to be treated: TREAT_STRING_AS_UTF8 if the
+ * terminal handles UTF-8 and if the string appears to be a valid UTF-8 string;
+ * TREAT_STRING_AS_BYTES otherwise.
+ */
+int string_policy(const char *str);
+
 #define unichar_isprint(c) (((c) & ~0x80) >= 32)
 #define is_utf8_leading(c) (((c) & 0xc0) != 0x80)
 

From 21c07c006066115af4604e26cd89cf60f94a7d53 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 02:27:19 +0200
Subject: [PATCH 0337/1650] Leverage string_policy().

---
 src/core/utf8.c              | 5 +++--
 src/core/utf8.h              | 2 +-
 src/fe-common/core/formats.c | 8 ++++----
 src/fe-text/gui-entry.c      | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/core/utf8.c b/src/core/utf8.c
index d931ba19..c9303d19 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -28,9 +28,9 @@
 /* Provide is_utf8(): */
 #include "recode.h"
 
-int string_advance(char const **str, gboolean utf8)
+int string_advance(char const **str, int policy)
 {
-	if (utf8) {
+	if (policy == TREAT_STRING_AS_UTF8) {
 		gunichar c;
 
 		c = g_utf8_get_char(*str);
@@ -38,6 +38,7 @@ int string_advance(char const **str, gboolean utf8)
 
 		return unichar_isprint(c) ? mk_wcwidth(c) : 1;
 	} else {
+		/* Assume TREAT_STRING_AS_BYTES: */
 		*str += 1;
 
 		return 1;
diff --git a/src/core/utf8.h b/src/core/utf8.h
index fa11b737..f1a8f0e1 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -17,7 +17,7 @@ int mk_wcwidth(unichar c);
 /* Advance the str pointer one character further; return the number of columns
  * occupied by the skipped character.
  */
-int string_advance(char const **str, gboolean utf8);
+int string_advance(char const **str, int policy);
 
 /* TREAT_STRING_AS_BYTES means strings are to be treated using strncpy,
  * strnlen, etc.
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index def03e10..3e88426f 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -425,12 +425,12 @@ int format_get_length(const char *str)
 {
 	GString *tmp;
 	int len;
-	gboolean utf8;
+	int utf8;
 	int adv = 0;
 
 	g_return_val_if_fail(str != NULL, 0);
 
-	utf8 = is_utf8() && g_utf8_validate(str, -1, NULL);
+	utf8 = string_policy(str);
 
 	tmp = g_string_new(NULL);
 	len = 0;
@@ -464,12 +464,12 @@ int format_real_length(const char *str, int len)
 	GString *tmp;
 	const char *start;
 	const char *oldstr;
-	gboolean utf8;
+	int utf8;
 	int adv = 0;
 	g_return_val_if_fail(str != NULL, 0);
 	g_return_val_if_fail(len >= 0, 0);
 
-	utf8 = is_utf8() && g_utf8_validate(str, -1, NULL);
+	utf8 = string_policy(str);
 
 	start = str;
 	tmp = g_string_new(NULL);
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 63dda34e..beea2273 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -367,7 +367,7 @@ static int scrlen_str(const char *str)
 	g_return_val_if_fail(str != NULL, 0);
 
 	str = stripped = strip_codes(str);
-	if (is_utf8() && g_utf8_validate(str, -1, NULL)) {
+	if (string_policy(str) == TREAT_STRING_AS_UTF8) {
 
 		while (*str != '\0') {
 			gunichar c;

From 35b3ccc6a407f83eba4f0c3787cc5c174bd3385c Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 02:47:26 +0200
Subject: [PATCH 0338/1650] Introduce string_length() and string_width().

---
 src/core/utf8.c | 34 ++++++++++++++++++++++++++++++++++
 src/core/utf8.h |  9 +++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/core/utf8.c b/src/core/utf8.c
index c9303d19..7c75c374 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -55,3 +55,37 @@ int string_policy(const char *str)
 	}
 	return TREAT_STRING_AS_BYTES;
 }
+
+int string_length(const char *str, int policy)
+{
+	g_return_val_if_fail(str != NULL, 0);
+
+	if (policy == -1) {
+		policy = string_policy(str);
+	}
+
+	if (policy == TREAT_STRING_AS_UTF8) {
+		return g_utf8_strlen(str, -1);
+	}
+	else {
+		/* Assume TREAT_STRING_AS_BYTES: */
+		return strlen(str);
+	}
+}
+
+int string_width(const char *str, int policy)
+{
+	int len;
+
+	g_return_val_if_fail(str != NULL, 0);
+
+	if (policy == -1) {
+		policy = string_policy(str);
+	}
+
+	len = 0;
+	while (*str != '\0') {
+		len += string_advance(&str, policy);
+	}
+	return len;
+}
diff --git a/src/core/utf8.h b/src/core/utf8.h
index f1a8f0e1..6f02c5a0 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -33,6 +33,15 @@ int string_advance(char const **str, int policy);
  */
 int string_policy(const char *str);
 
+/* Return the length of the str string according to the given policy; if policy
+ * is -1, this function will call string_policy().
+ */
+int string_length(const char *str, int policy);
+/* Return the screen width of the str string according to the given policy; if
+ * policy is -1, this function will call string_policy().
+ */
+int string_width(const char *str, int policy);
+
 #define unichar_isprint(c) (((c) & ~0x80) >= 32)
 #define is_utf8_leading(c) (((c) & 0xc0) != 0x80)
 

From 719efc44a3c3c3db8f12b6ff40d2021837d9a902 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 03:04:08 +0200
Subject: [PATCH 0339/1650] Introduce string_chars_for_width().

---
 src/core/utf8.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/core/utf8.h |  6 ++++++
 2 files changed, 50 insertions(+)

diff --git a/src/core/utf8.c b/src/core/utf8.c
index 7c75c374..d1f58599 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -89,3 +89,47 @@ int string_width(const char *str, int policy)
 	}
 	return len;
 }
+
+int string_chars_for_width(const char *str, int policy, unsigned int n, unsigned int *bytes)
+{
+	const char *c, *previous_c;
+	int str_width, char_width, char_count;
+
+	g_return_val_if_fail(str != NULL, -1);
+
+	/* Handle the dummy case where n is 0: */
+	if (!n) {
+		if (bytes) {
+			*bytes = 0;
+		}
+		return 0;
+	}
+
+	if (policy == -1) {
+		policy = string_policy(str);
+	}
+
+	/* Iterate over characters until we reach n: */
+	char_count = 0;
+	str_width = 0;
+	c = str;
+	while (*c != '\0') {
+		previous_c = c;
+		char_width = string_advance(&c, policy);
+		if (str_width + char_width > n) {
+			/* We stepped beyond n, get one step back and stop there: */
+			c = previous_c;
+			break;
+		}
+		++ char_count;
+		str_width += char_width;
+	}
+	/* At this point, we know that char_count characters reach str_width
+	 * columns, which is less than or equal to n. */
+
+	/* Optionally provide the equivalent amount of bytes: */
+	if (bytes) {
+		*bytes = c - str;
+	}
+	return char_count;
+}
diff --git a/src/core/utf8.h b/src/core/utf8.h
index 6f02c5a0..411b2048 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -42,6 +42,12 @@ int string_length(const char *str, int policy);
  */
 int string_width(const char *str, int policy);
 
+/* Return the amount of characters from str it takes to reach n columns, or -1 if
+ * str is NULL. Optionally return the equivalent amount of bytes.
+ * If policy is -1, this function will call string_policy().
+ */
+int string_chars_for_width(const char *str, int policy, unsigned int n, unsigned int *bytes);
+
 #define unichar_isprint(c) (((c) & ~0x80) >= 32)
 #define is_utf8_leading(c) (((c) & 0xc0) != 0x80)
 

From 09ca3ad48f57b7febd6ad353fb38dbe9234e7e70 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 03:31:23 +0200
Subject: [PATCH 0340/1650] Fix indentation of display_sorted_nicks().

This was done assuming an "indent with tab, align with spaces" approach.
get_alignment also benefited from a minor indentation fix.
---
 src/core/special-vars.c          |  2 +-
 src/fe-common/core/fe-channels.c | 64 ++++++++++++++++----------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index 4dcc3d2f..d6794d96 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -340,7 +340,7 @@ static char *get_alignment(const char *text, int align, int flags, char pad)
 	}
 
 	ret = str->str;
-        g_string_free(str, FALSE);
+	g_string_free(str, FALSE);
 	return ret;
 }
 
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 046d641a..fd44be11 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -328,35 +328,35 @@ static int get_nick_length(void *data)
 
 static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 {
-        WINDOW_REC *window;
+	WINDOW_REC *window;
 	TEXT_DEST_REC dest;
 	GString *str;
 	GSList *tmp;
-        char *format, *stripped, *prefix_format;
+	char *format, *stripped, *prefix_format;
 	char *linebuf, nickmode[2] = { 0, 0 };
 	int *columns, cols, rows, last_col_rows, col, row, max_width;
-        int item_extra, linebuf_size, formatnum;
+	int item_extra, linebuf_size, formatnum;
 
 	window = window_find_closest(channel->server, channel->visible_name,
-				     MSGLEVEL_CLIENTCRAP);
-        max_width = window->width;
+	                             MSGLEVEL_CLIENTCRAP);
+	max_width = window->width;
 
-        /* get the length of item extra stuff ("[ ] ") */
+	/* get the length of item extra stuff ("[ ] ") */
 	format = format_get_text(MODULE_NAME, NULL,
-				 channel->server, channel->visible_name,
-				 TXT_NAMES_NICK, " ", "");
+	                         channel->server, channel->visible_name,
+	                         TXT_NAMES_NICK, " ", "");
 	stripped = strip_codes(format);
 	item_extra = strlen(stripped);
-        g_free(stripped);
+	g_free(stripped);
 	g_free(format);
 
 	if (settings_get_int("names_max_width") > 0 &&
 	    settings_get_int("names_max_width") < max_width)
 		max_width = settings_get_int("names_max_width");
 
-        /* remove width of the timestamp from max_width */
+	/* remove width of the timestamp from max_width */
 	format_create_dest(&dest, channel->server, channel->visible_name,
-			   MSGLEVEL_CLIENTCRAP, NULL);
+	                   MSGLEVEL_CLIENTCRAP, NULL);
 	format = format_get_line_start(current_theme, &dest, time(NULL));
 	if (format != NULL) {
 		stripped = strip_codes(format);
@@ -365,11 +365,11 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 		g_free(format);
 	}
 
-        /* remove width of the prefix from max_width */
+	/* remove width of the prefix from max_width */
 	prefix_format = format_get_text(MODULE_NAME, NULL,
-					channel->server, channel->visible_name,
-					TXT_NAMES_PREFIX,
-					channel->visible_name);
+	                                channel->server, channel->visible_name,
+	                                TXT_NAMES_PREFIX,
+	                                channel->visible_name);
 	if (prefix_format != NULL) {
 		stripped = strip_codes(prefix_format);
 		max_width -= strlen(stripped);
@@ -384,19 +384,19 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 
 	/* calculate columns */
 	cols = get_max_column_count(nicklist, get_nick_length, max_width,
-				    settings_get_int("names_max_columns"),
-				    item_extra, 3, &columns, &rows);
+	                            settings_get_int("names_max_columns"),
+	                            item_extra, 3, &columns, &rows);
 	nicklist = columns_sort_list(nicklist, rows);
 
-        /* rows in last column */
+	/* rows in last column */
 	last_col_rows = rows-(cols*rows-g_slist_length(nicklist));
 	if (last_col_rows == 0)
-                last_col_rows = rows;
+		last_col_rows = rows;
 
 	str = g_string_new(prefix_format);
 	linebuf_size = max_width+1; linebuf = g_malloc(linebuf_size);
 
-        col = 0; row = 0;
+	col = 0; row = 0;
 	for (tmp = nicklist; tmp != NULL; tmp = tmp->next) {
 		NICK_REC *rec = tmp->data;
 
@@ -407,39 +407,39 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 
 		if (linebuf_size < columns[col]-item_extra+1) {
 			linebuf_size = (columns[col]-item_extra+1)*2;
-                        linebuf = g_realloc(linebuf, linebuf_size);
+			linebuf = g_realloc(linebuf, linebuf_size);
 		}
 		memset(linebuf, ' ', columns[col]-item_extra);
 		linebuf[columns[col]-item_extra] = '\0';
 		memcpy(linebuf, rec->nick, strlen(rec->nick));
 
-		formatnum = rec->op ? TXT_NAMES_NICK_OP :
-			rec->halfop ? TXT_NAMES_NICK_HALFOP :
-			rec->voice ? TXT_NAMES_NICK_VOICE :
-                        TXT_NAMES_NICK;
+		formatnum = rec->op     ? TXT_NAMES_NICK_OP :
+		            rec->halfop ? TXT_NAMES_NICK_HALFOP :
+		            rec->voice  ? TXT_NAMES_NICK_VOICE :
+		                          TXT_NAMES_NICK;
 		format = format_get_text(MODULE_NAME, NULL,
-					 channel->server,
-					 channel->visible_name,
-					 formatnum, nickmode, linebuf);
+		                         channel->server,
+		                         channel->visible_name,
+		                         formatnum, nickmode, linebuf);
 		g_string_append(str, format);
 		g_free(format);
 
 		if (++col == cols) {
 			printtext(channel->server, channel->visible_name,
-				  MSGLEVEL_CLIENTCRAP, "%s", str->str);
+			          MSGLEVEL_CLIENTCRAP, "%s", str->str);
 			g_string_truncate(str, 0);
 			if (prefix_format != NULL)
-                                g_string_assign(str, prefix_format);
+				g_string_assign(str, prefix_format);
 			col = 0; row++;
 
 			if (row == last_col_rows)
-                                cols--;
+				cols--;
 		}
 	}
 
 	if (str->len > strlen(prefix_format)) {
 		printtext(channel->server, channel->visible_name,
-			  MSGLEVEL_CLIENTCRAP, "%s", str->str);
+		          MSGLEVEL_CLIENTCRAP, "%s", str->str);
 	}
 
 	g_slist_free(nicklist);

From 97a4ee78fd08e58fce62c6c0b22de94b625c90f6 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 03:42:56 +0200
Subject: [PATCH 0341/1650] get_alignment: handle UTF-8 strings.

get_alignment now works with columns (width), not bytes, although it is liable
to work with bytes if the given text is not a valid UTF-8 string.
---
 src/core/special-vars.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index d6794d96..64011b8e 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -25,6 +25,7 @@
 #include "settings.h"
 #include "servers.h"
 #include "misc.h"
+#include "utf8.h"
 
 #define ALIGN_RIGHT 0x01
 #define ALIGN_CUT   0x02
@@ -320,18 +321,24 @@ static char *get_alignment(const char *text, int align, int flags, char pad)
 {
 	GString *str;
 	char *ret;
+	int policy;
+	unsigned int cut_bytes;
 
 	g_return_val_if_fail(text != NULL, NULL);
 
+	policy = string_policy(text);
+
 	str = g_string_new(text);
 
 	/* cut */
-	if ((flags & ALIGN_CUT) && align > 0 && str->len > align)
-		g_string_truncate(str, align);
+	if ((flags & ALIGN_CUT) && align > 0 && string_width(text, policy) > align) {
+		string_chars_for_width(text, policy, align, &cut_bytes);
+		g_string_truncate(str, cut_bytes);
+	}
 
 	/* add pad characters */
 	if (flags & ALIGN_PAD) {
-		while (str->len < align) {
+		while (string_width(str->str, policy) < align) {
 			if (flags & ALIGN_RIGHT)
 				g_string_prepend_c(str, pad);
 			else

From f1b5b515b9f91866d241ba6dbf5e1db6827ff61a Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 03:51:48 +0200
Subject: [PATCH 0342/1650] Make get_alignment() available outside
 special-vars.c

---
 src/core/special-vars.c | 6 +-----
 src/core/special-vars.h | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index 64011b8e..fe6bbed2 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -27,10 +27,6 @@
 #include "misc.h"
 #include "utf8.h"
 
-#define ALIGN_RIGHT 0x01
-#define ALIGN_CUT   0x02
-#define ALIGN_PAD   0x04
-
 #define isvarchar(c) \
         (i_isalnum(c) || (c) == '_')
 
@@ -317,7 +313,7 @@ static int get_alignment_args(char **data, int *align, int *flags, char *pad)
 }
 
 /* return the aligned text */
-static char *get_alignment(const char *text, int align, int flags, char pad)
+char *get_alignment(const char *text, int align, int flags, char pad)
 {
 	GString *str;
 	char *ret;
diff --git a/src/core/special-vars.h b/src/core/special-vars.h
index 11262dad..300dae0e 100644
--- a/src/core/special-vars.h
+++ b/src/core/special-vars.h
@@ -9,9 +9,16 @@
 #define PARSE_FLAG_ESCAPE_THEME 0x08 /* if any arguments/variables contain { or } chars, escape them with % */
 #define PARSE_FLAG_ONLY_ARGS	0x10 /* expand only arguments ($0 $1 etc.) but no other $variables */
 
+#define ALIGN_RIGHT 0x01
+#define ALIGN_CUT   0x02
+#define ALIGN_PAD   0x04
+
 typedef char* (*SPECIAL_HISTORY_FUNC)
 	(const char *text, void *item, int *free_ret);
 
+/* Cut and/or pad text so it takes exactly "align" characters on the screen */
+char *get_alignment(const char *text, int align, int flags, char pad);
+
 /* Parse and expand text after '$' character. return value has to be
    g_free()'d if `free_ret' is TRUE. */
 char *parse_special(char **cmd, SERVER_REC *server, void *item,

From 29beafcf6fd50ecb8a9f3b2b642c2d29c022a4e3 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 04:08:15 +0200
Subject: [PATCH 0343/1650] Improve UTF-8 handling in display_sorted_nicks().

---
 src/fe-common/core/fe-channels.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index fd44be11..d87c4ce5 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -26,6 +26,8 @@
 #include "levels.h"
 #include "misc.h"
 #include "settings.h"
+#include "special-vars.h"
+#include "utf8.h"
 
 #include "chat-protocols.h"
 #include "chatnets.h"
@@ -323,7 +325,7 @@ static void cmd_channel_remove(const char *data)
 
 static int get_nick_length(void *data)
 {
-        return strlen(((NICK_REC *) data)->nick);
+        return string_width(((NICK_REC *) data)->nick, -1);
 }
 
 static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
@@ -333,9 +335,9 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 	GString *str;
 	GSList *tmp;
 	char *format, *stripped, *prefix_format;
-	char *linebuf, nickmode[2] = { 0, 0 };
+	char *aligned_nick, nickmode[2] = { 0, 0 };
 	int *columns, cols, rows, last_col_rows, col, row, max_width;
-	int item_extra, linebuf_size, formatnum;
+	int item_extra, formatnum;
 
 	window = window_find_closest(channel->server, channel->visible_name,
 	                             MSGLEVEL_CLIENTCRAP);
@@ -394,7 +396,6 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 		last_col_rows = rows;
 
 	str = g_string_new(prefix_format);
-	linebuf_size = max_width+1; linebuf = g_malloc(linebuf_size);
 
 	col = 0; row = 0;
 	for (tmp = nicklist; tmp != NULL; tmp = tmp->next) {
@@ -405,13 +406,9 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 		else
 			nickmode[0] = ' ';
 
-		if (linebuf_size < columns[col]-item_extra+1) {
-			linebuf_size = (columns[col]-item_extra+1)*2;
-			linebuf = g_realloc(linebuf, linebuf_size);
-		}
-		memset(linebuf, ' ', columns[col]-item_extra);
-		linebuf[columns[col]-item_extra] = '\0';
-		memcpy(linebuf, rec->nick, strlen(rec->nick));
+		aligned_nick = get_alignment(rec->nick,
+		                             columns[col]-item_extra,
+		                             ALIGN_PAD, ' ');
 
 		formatnum = rec->op     ? TXT_NAMES_NICK_OP :
 		            rec->halfop ? TXT_NAMES_NICK_HALFOP :
@@ -420,8 +417,9 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 		format = format_get_text(MODULE_NAME, NULL,
 		                         channel->server,
 		                         channel->visible_name,
-		                         formatnum, nickmode, linebuf);
+		                         formatnum, nickmode, aligned_nick);
 		g_string_append(str, format);
+		g_free(aligned_nick);
 		g_free(format);
 
 		if (++col == cols) {
@@ -446,7 +444,6 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 	g_string_free(str, TRUE);
 	g_free_not_null(columns);
 	g_free_not_null(prefix_format);
-	g_free(linebuf);
 }
 
 void fe_channels_nicklist(CHANNEL_REC *channel, int flags)

From 72064de9fe064a7536b501fc470edf75fc393314 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 04:19:38 +0200
Subject: [PATCH 0344/1650] Simplify scrlen_str() using string_width().

---
 src/fe-text/gui-entry.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index beea2273..949a43d3 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -366,22 +366,8 @@ static int scrlen_str(const char *str)
 	char *stripped;
 	g_return_val_if_fail(str != NULL, 0);
 
-	str = stripped = strip_codes(str);
-	if (string_policy(str) == TREAT_STRING_AS_UTF8) {
-
-		while (*str != '\0') {
-			gunichar c;
-
-			c = g_utf8_get_char(str);
-			str = g_utf8_next_char(str);
-
-			len += unichar_isprint(c) ? mk_wcwidth(c) : 1;
-		}
-
-	} else {
-		len = strlen(str);
-	}
-
+	stripped = strip_codes(str);
+	len = string_width(stripped, -1);
 	g_free(stripped);
 	return len;
 }

From a26a387545ae530cb3222fd4daa5ed088e068de2 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 17:31:11 +0200
Subject: [PATCH 0345/1650] Adjust some conditions.

---
 src/core/utf8.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/utf8.c b/src/core/utf8.c
index d1f58599..29b277e1 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -48,7 +48,7 @@ int string_advance(char const **str, int policy)
 int string_policy(const char *str)
 {
 	if (is_utf8()) {
-		if (!str || g_utf8_validate(str, -1, NULL)) {
+		if (str == NULL || g_utf8_validate(str, -1, NULL)) {
 			/* No string provided or valid UTF-8 string: treat as UTF-8: */
 			return TREAT_STRING_AS_UTF8;
 		}
@@ -98,8 +98,8 @@ int string_chars_for_width(const char *str, int policy, unsigned int n, unsigned
 	g_return_val_if_fail(str != NULL, -1);
 
 	/* Handle the dummy case where n is 0: */
-	if (!n) {
-		if (bytes) {
+	if (n == 0) {
+		if (bytes != NULL) {
 			*bytes = 0;
 		}
 		return 0;
@@ -128,7 +128,7 @@ int string_chars_for_width(const char *str, int policy, unsigned int n, unsigned
 	 * columns, which is less than or equal to n. */
 
 	/* Optionally provide the equivalent amount of bytes: */
-	if (bytes) {
+	if (bytes != NULL) {
 		*bytes = c - str;
 	}
 	return char_count;

From 5d69b4c4a7d334ca29e61969712f5f8eedfa5cd9 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 17:35:47 +0200
Subject: [PATCH 0346/1650] Convert string policies from #define to enum.

---
 src/core/utf8.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/utf8.h b/src/core/utf8.h
index 411b2048..5bb53193 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -24,8 +24,10 @@ int string_advance(char const **str, int policy);
  * TREAT_STRING_AS_UTF8 means strings are to be treated using g_utf8_*
  * functions.
  */
-#define TREAT_STRING_AS_BYTES 0
-#define TREAT_STRING_AS_UTF8  1
+enum str_policy {
+	TREAT_STRING_AS_BYTES,
+	TREAT_STRING_AS_UTF8
+};
 
 /* Return how the str string ought to be treated: TREAT_STRING_AS_UTF8 if the
  * terminal handles UTF-8 and if the string appears to be a valid UTF-8 string;

From 8b847034efa20f23c96f35522f9f7615a5ab498c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 11 May 2016 21:51:41 +0200
Subject: [PATCH 0347/1650] update news and authors

---
 AUTHORS |  1 +
 NEWS    | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 7ded5017..cb48e07a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -97,3 +97,4 @@ Other patches (grep for "patch" in ChangeLog) by:
   Paul Johnson
   KindOne
   Fabian Kurz
+  Todd Pratt
diff --git a/NEWS b/NEWS
index 0d450b02..00d35f9d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,27 @@
 v0.8.20-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	* Removed --disable-ipv6
+	* /connect Network now aborts with an error if no servers have been
+	  added to that network.
+	* /dcc commands now use quotes around spaces consistently.
 	+ irssiproxy can now forward all tags through a single port.
+	+ irssiproxy can also listen on unix sockets.
 	+ send channel -botcmds immediately when no mask is specified (#175).
+	+ the kill buffer now remembers consecutive kills.
+	  New bindings were added: yank_next_cutbuffer and append_next_kill
+	+ connections will avoid looking up IPv6 addresses if the machine does
+	  not have an IPv6 address assigned (exact behaviour is implementation
+	  defined).
+	+ Fix potential crash if scripts insert undef values into the completion
+	  list.
+	+ Paste warning is now also shown on pasting overlong lines.
+	+ autolog_ignore_targets and activity_hide_targets learn a new syntax
+	      tag/* and * to ignore whole networks or everything.
+	+ /hilight got a -matchcase flag to hilight case sensitively (#421).
+	- /squery and /servlist commands have been restored.
+	- Where Irssi would previously only report "System error" on connect,
+	  it will now try harder to retrieve the system error message.
+	- IP addresses are no longer stored when resolve_reverse_lookup is
+	  used.
 
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 	- Fixed regression when joining and parting channels on IRCnet (#435)

From 5995c0619dc2bf6d789e5b93abe8a531ceb1f45a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 18 May 2016 14:39:52 +0200
Subject: [PATCH 0348/1650] abi increase for #480

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 4fd6d331..66892b78 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 4
+#define IRSSI_ABI_VERSION 5
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 

From 8d5edff5151761d5b069badad836cb26724ae1ae Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 18 May 2016 14:43:54 +0200
Subject: [PATCH 0349/1650] update news and authors

---
 AUTHORS | 1 +
 NEWS    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index cb48e07a..eea359cc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -98,3 +98,4 @@ Other patches (grep for "patch" in ChangeLog) by:
   KindOne
   Fabian Kurz
   Todd Pratt
+  xavierog
diff --git a/NEWS b/NEWS
index 00d35f9d..5312aef5 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ v0.8.20-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	  it will now try harder to retrieve the system error message.
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
+	- /names and $[...] now uses utf8 string operations (#40, #411).
 
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 	- Fixed regression when joining and parting channels on IRCnet (#435)

From 36beddc64f881c2c9618b449ed5c590d41872455 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 18 May 2016 15:32:35 +0200
Subject: [PATCH 0350/1650] test make dist in travis

---
 .travis.yml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46f58766..804dc58c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,31 @@ addons:
 
 before_install:
     - perl -V
+    - ./autogen.sh --with-proxy --with-bot --with-perl=module
+    - make dist
+    - cd ..
+    - tar xaf */irssi-*.tar.*
+    - cd irssi-*
 
-install: true
-
-script:
-    - ./autogen.sh --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
-    - cat config.log
+install:
+    - ./configure --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
     - make CFLAGS="-Wall -Werror"
     - make install
+
+before_script:
+    - cd
+    - mkdir irssi-test
+    - echo echo automated irssi launch test > irssi-test/startup;
+      echo ^set settings_autosave off >> irssi-test/startup;
+      echo ^set -clear log_close_string >> irssi-test/startup;
+      echo ^set -clear log_day_changed >> irssi-test/startup;
+      echo ^set -clear log_open_string >> irssi-test/startup;
+      echo ^set log_timestamp '* ' >> irssi-test/startup;
+      echo ^window log on >> irssi-test/startup
+    - echo load perl >> irssi-test/startup
+    - echo load proxy >> irssi-test/startup
+    - echo ^quit >> irssi-test/startup
+    - irssi-build/bin/irssi --home irssi-test
+    - cat irc.log.*
+
+script: true

From 02221eae373c5db93d1c715d836d79c724d361c7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 18 May 2016 15:42:09 +0200
Subject: [PATCH 0351/1650] fix dist compilation failure

remove illegal wcwidth.c include and compile wcwidth.c
correct #include in wcwidth.c
fallout from #480
---
 src/core/Makefile.am | 2 ++
 src/core/utf8.c      | 2 +-
 src/core/wcwidth.c   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index cc200034..af323234 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -45,6 +45,7 @@ libcore_a_SOURCES = \
 	signals.c \
 	special-vars.c \
 	utf8.c \
+	wcwidth.c \
 	write-buffer.c
 
 structure_headers = \
@@ -94,6 +95,7 @@ pkginc_core_HEADERS = \
 	settings.h \
 	signals.h \
 	special-vars.h \
+	utf8.h \
 	window-item-def.h \
 	write-buffer.h \
 	$(structure_headers)
diff --git a/src/core/utf8.c b/src/core/utf8.c
index 29b277e1..c53d8816 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -24,7 +24,7 @@
 
 #include "utf8.h"
 #include "module.h"
-#include "wcwidth.c"
+
 /* Provide is_utf8(): */
 #include "recode.h"
 
diff --git a/src/core/wcwidth.c b/src/core/wcwidth.c
index 80d20fa1..711c4646 100644
--- a/src/core/wcwidth.c
+++ b/src/core/wcwidth.c
@@ -59,7 +59,7 @@
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
  */
 
-#include "module.h"
+#include "utf8.h"
 
 struct interval {
   int first;

From f1d0c8ff99c4a0627d96c6ae0db39d917689fb07 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 1 Jun 2016 22:29:13 +0200
Subject: [PATCH 0352/1650] Correct the name of the emitted signal.

There's a typo in 'sasl_fail', the signal that's emitted should be
'server sasl failure' and not 'server sasl fail'.
---
 src/irc/core/sasl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index b74b6a8c..f080ae59 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -71,7 +71,7 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 
 	params = event_get_params(data, 2, NULL, &error);
 
-	signal_emit("server sasl fail", 2, server, error);
+	signal_emit("server sasl failure", 2, server, error);
 
 	/* Terminate the negotiation */
 	cap_finish_negotiation(server);

From 03aec7d3b369231b52960db7238f30cc46dd8e01 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 10 Dec 2015 14:07:07 +0100
Subject: [PATCH 0353/1650] silent make perl

---
 src/perl/Makefile.am           | 14 ++++++-
 src/perl/Makefile_silent.pm    | 76 ++++++++++++++++++++++++++++++++++
 src/perl/common/Makefile.PL.in |  2 +-
 src/perl/irc/Makefile.PL.in    |  2 +-
 src/perl/textui/Makefile.PL.in |  2 +-
 src/perl/ui/Makefile.PL.in     |  2 +-
 6 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 src/perl/Makefile_silent.pm

diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index a09c49a5..b17fd664 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -117,16 +117,26 @@ textui_sources = \
 EXTRA_DIST = \
 	get-signals.pl \
 	irssi-core.pl \
+	Makefile_silent.pm \
 	$(common_sources) \
 	$(irc_sources) \
 	$(ui_sources) \
 	$(textui_sources)
 
+am_v_pl__show_gen = $(am__v_pl__show_gen_$(V))
+am_v_pl__hide_gen = $(am__v_pl__hide_gen_$(V))
+am__v_pl__show_gen_ = $(am__v_pl__show_gen_$(AM_DEFAULT_VERBOSITY))
+am__v_pl__hide_gen_ = $(am__v_pl__hide_gen_$(AM_DEFAULT_VERBOSITY))
+am__v_pl__show_gen_0 = echo "  GEN  " $$dir ;
+am__v_pl__hide_gen_0 = > /dev/null
+am__v_pl__show_gen_1 = 
+am__v_pl__hide_gen_1 = 
+
 all-local:
-	for dir in $(perl_dirs); do \
+	$(AM_V_GEN)for dir in $(perl_dirs); do \
 	  cd $$dir && \
 	  if [ ! -f Makefile ]; then \
-	    $(perlpath) Makefile.PL $(PERL_MM_PARAMS); \
+	    $(am_v_pl__show_gen)$(perlpath) Makefile.PL $(PERL_MM_PARAMS) $(am_v_pl__hide_gen); \
 	  fi && \
 	  ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
 	   $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
diff --git a/src/perl/Makefile_silent.pm b/src/perl/Makefile_silent.pm
new file mode 100644
index 00000000..e6036c98
--- /dev/null
+++ b/src/perl/Makefile_silent.pm
@@ -0,0 +1,76 @@
+push @ExtUtils::MakeMaker::Overridable, qw(pm_to_blib);
+my $verb = $AM_DEFAULT_VERBOSITY;
+package MY {
+    sub _center {
+	my $z = shift;
+	length $z == 2 ? "  $z   " : length $z == 4 ? " $z  " : " $z "
+    }
+    sub _silent_cmd {
+	my $z = shift;
+	$z =~ s{\t(?:- ?)?\K(?=\$\((?|(CC)CMD|(XS)UBPPRUN|(LD|MV|CHMOD)|(RM)_R?F|(CP)_NONEMPTY|FULL_(AR)\)))}{\$(PL_AM_V_$1)}g;
+	$z
+    }
+    sub c_o { _silent_cmd(shift->SUPER::c_o(@_)) }
+    sub xs_c { _silent_cmd(shift->SUPER::xs_c(@_)) }
+    sub xs_o { _silent_cmd(shift->SUPER::xs_o(@_)) }
+    sub dynamic_lib { _silent_cmd(shift->SUPER::dynamic_lib(@_)) }
+    sub static_lib { _silent_cmd(shift->SUPER::static_lib(@_)) }
+    sub dynamic_bs {
+	my $ret = shift->SUPER::dynamic_bs(@_);
+	$ret =~ s{Running Mkbootstrap for}{\$(PL_AM_V_BS_Text)}g;
+	_silent_cmd($ret)
+    }
+    sub pm_to_blib {
+	my $ret = shift->SUPER::pm_to_blib(@_);
+	$ret =~ s{^(\t(?:- ?)?)(?:\$\(NOECHO\) ?)?(.*-e ['"]pm_to_blib(.*\\\n)*.*)$}{$1\$(PL_AM_V_BLIB)$2\$(PL_AM_V_BLIB_Hide)}mg;
+	$ret
+    }
+    sub post_constants {
+	my $ret = shift->SUPER::post_constants(@_);
+	my @terse = qw(cc xs ld chmod cp ar blib);
+	my @silent = qw(mv rm);
+	my @special = qw(BLIB_Hide);
+
+	#default verbosity from command line parameter
+	$ret .= "
+AM_DEFAULT_VERBOSITY = @{[$verb ? 1 : 0]}
+";
+	#default options forward
+	$ret .= "
+PL_AM_V_${_} = \$(pl_am__v_${_}_\$(V))
+pl_am__v_${_}_ = \$(pl_am__v_${_}_\$(AM_DEFAULT_VERBOSITY))
+" for @special, map uc, @terse, @silent;
+
+	#quoted plain text needs extra quotes
+	$ret .= "
+PL_AM_V_BS_Text = \"\$(pl_am__v_BS_Text_\$(V))\"
+pl_am__v_BS_Text_ = \$(pl_am__v_BS_Text_\$(AM_DEFAULT_VERBOSITY))
+"
+	#hide pm_to_blib output
+. "
+pl_am__v_BLIB_Hide_0 = \$(DEV_NULL)
+pl_am__v_BLIB_Hide_1 = 
+"
+	#text for Mkbootstrap
+. "
+pl_am__v_BS_Text_0 = \"@{[_center('BS')]}\"
+pl_am__v_BS_Text_1 = \"Running Mkbootstrap for\"
+";
+	#"terse" output
+	$ret .= "
+pl_am__v_${_}_0 = \$(NOECHO)echo \"@{[_center($_)]}\" \$\@;
+" for map uc, @terse;
+
+	#no output
+	$ret .= "
+pl_am__v_${_}_0 = \$(NOECHO)
+" for map uc, @silent;
+
+	#in verbose mode the "terse" echo expands to nothing
+	$ret .= "
+pl_am__v_${_}_1 = 
+" for map uc, @terse, @silent;
+	$ret
+    }
+};
+1;
diff --git a/src/perl/common/Makefile.PL.in b/src/perl/common/Makefile.PL.in
index 4e545e7c..84a80403 100644
--- a/src/perl/common/Makefile.PL.in
+++ b/src/perl/common/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi',
               'LIBS' => '',
diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in
index 8f1e94d5..0fbc5241 100644
--- a/src/perl/irc/Makefile.PL.in
+++ b/src/perl/irc/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::Irc',
               'LIBS' => '',
diff --git a/src/perl/textui/Makefile.PL.in b/src/perl/textui/Makefile.PL.in
index 9e80274b..3541f75c 100644
--- a/src/perl/textui/Makefile.PL.in
+++ b/src/perl/textui/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::TextUI',
               'LIBS' => '',
diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in
index a349918e..ed87d528 100644
--- a/src/perl/ui/Makefile.PL.in
+++ b/src/perl/ui/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::UI',
               'LIBS' => '',

From e0c8a9f3986249d8abde462bccdb00cd3d914ebc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 5 Jun 2016 11:36:13 +0200
Subject: [PATCH 0354/1650] perl 5.10 fix

---
 src/perl/Makefile_silent.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/perl/Makefile_silent.pm b/src/perl/Makefile_silent.pm
index e6036c98..372e4046 100644
--- a/src/perl/Makefile_silent.pm
+++ b/src/perl/Makefile_silent.pm
@@ -1,6 +1,6 @@
 push @ExtUtils::MakeMaker::Overridable, qw(pm_to_blib);
 my $verb = $AM_DEFAULT_VERBOSITY;
-package MY {
+{ package MY;
     sub _center {
 	my $z = shift;
 	length $z == 2 ? "  $z   " : length $z == 4 ? " $z  " : " $z "
@@ -72,5 +72,5 @@ pl_am__v_${_}_1 =
 " for map uc, @terse, @silent;
 	$ret
     }
-};
+}
 1;

From bb190be0bfac956ada4f74a514ff70f28b114efa Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 13 Feb 2016 13:12:29 +0100
Subject: [PATCH 0355/1650] Replace mkpath with g_mkdir_with_parents

---
 src/core/log.c              |  2 +-
 src/core/misc.c             | 38 -------------------------------------
 src/core/misc.h             |  2 --
 src/core/rawlog.c           |  2 +-
 src/core/settings.c         |  2 +-
 src/fe-common/core/fe-log.c |  2 +-
 6 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/src/core/log.c b/src/core/log.c
index 8306d2df..6af1effc 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -114,7 +114,7 @@ int log_start_logging(LOG_REC *log)
 		/* path may contain variables (%time, $vars),
 		   make sure the directory is created */
 		dir = g_path_get_dirname(log->real_fname);
-		mkpath(dir, log_dir_create_mode);
+		g_mkdir_with_parents(dir, log_dir_create_mode);
 		g_free(dir);
 	}
 
diff --git a/src/core/misc.c b/src/core/misc.c
index c26610ec..a8a0975a 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -407,44 +407,6 @@ int regexp_match(const char *str, const char *regexp)
 #endif
 }
 
-/* Create the directory and all it's parent directories */
-int mkpath(const char *path, int mode)
-{
-	struct stat statbuf;
-	const char *p;
-	char *dir;
-
-	g_return_val_if_fail(path != NULL, -1);
-
-	p = g_path_skip_root((char *) path);
-	if (p == NULL) {
-		/* not a full path, maybe not what we wanted
-		   but continue anyway.. */
-                p = path;
-	}
-	for (;;) {
-		if (*p != G_DIR_SEPARATOR && *p != '\0') {
-			p++;
-			continue;
-		}
-
-		dir = g_strndup(path, (int) (p-path));
-		if (stat(dir, &statbuf) != 0) {
-			if (mkdir(dir, mode) == -1)
-			{
-				g_free(dir);
-				return -1;
-			}
-		}
-		g_free(dir);
-
-		if (*p++ == '\0')
-			break;
-	}
-
-	return 0;
-}
-
 /* convert ~/ to $HOME */
 char *convert_home(const char *path)
 {
diff --git a/src/core/misc.h b/src/core/misc.h
index 7e78d3b9..58b665bf 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -39,8 +39,6 @@ GSList *hashtable_get_keys(GHashTable *hash);
 /* easy way to check if regexp matches */
 int regexp_match(const char *str, const char *regexp);
 
-/* Create the directory and all it's parent directories */
-int mkpath(const char *path, int mode);
 /* convert ~/ to $HOME */
 char *convert_home(const char *path);
 
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 875c0ef2..2b46c50d 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -150,7 +150,7 @@ void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
 	int f;
 
         dir = g_path_get_dirname(fname);
-        mkpath(dir, log_dir_create_mode);
+        g_mkdir_with_parents(dir, log_dir_create_mode);
         g_free(dir);
 
 	path = convert_home(fname);
diff --git a/src/core/settings.c b/src/core/settings.c
index 8e493124..17fc4115 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -683,7 +683,7 @@ static void init_configfile(void)
 
 	if (stat(get_irssi_dir(), &statbuf) != 0) {
 		/* ~/.irssi not found, create it. */
-		if (mkpath(get_irssi_dir(), 0700) != 0) {
+		if (g_mkdir_with_parents(get_irssi_dir(), 0700) != 0) {
 			g_error("Couldn't create %s directory", get_irssi_dir());
 		}
 	} else if (!S_ISDIR(statbuf.st_mode)) {
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index f2c4c014..5bc5c4e1 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -453,7 +453,7 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
 		log_item_add(log, LOG_ITEM_TARGET, target, server_tag);
 
 		dir = g_path_get_dirname(log->real_fname);
-		mkpath(dir, log_dir_create_mode);
+		g_mkdir_with_parents(dir, log_dir_create_mode);
 		g_free(dir);
 
 		log->temp = TRUE;

From 8289f360757870b56a15576a20e79e1f2ca30fef Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 13 Feb 2016 13:15:33 +0100
Subject: [PATCH 0356/1650] Check the return value of open() in rawlog.c

---
 src/core/rawlog.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 2b46c50d..5927e730 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -157,6 +157,11 @@ void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
 	f = open(path, O_WRONLY | O_APPEND | O_CREAT, log_file_create_mode);
 	g_free(path);
 
+	if (f < 0) {
+		g_warning("rawlog open() failed: %s", strerror(errno));
+		return;
+	}
+
 	rawlog_dump(rawlog, f);
 	close(f);
 }

From 72712a0c62b0403f0fa472ccbe34fda8fb2cd530 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 13 Feb 2016 13:18:24 +0100
Subject: [PATCH 0357/1650] Replace strocpy with g_strlcpy

The only difference was that the former returned 1 if the buffer was
overflown, but the return value was never checked.
---
 src/core/misc.c             | 14 --------------
 src/core/misc.h             |  3 ---
 src/irc/core/irc-nicklist.c |  2 +-
 src/irc/dcc/dcc-get.c       |  6 +++---
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index a8a0975a..682d006c 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -773,20 +773,6 @@ char *escape_string(const char *str)
 	return ret;
 }
 
-int strocpy(char *dest, const char *src, size_t dstsize)
-{
-	if (dstsize == 0)
-		return -1;
-
-	while (*src != '\0' && dstsize > 1) {
-		*dest++ = *src++;
-		dstsize--;
-	}
-
-	*dest++ = '\0';
-	return *src == '\0' ? 0 : -1;
-}
-
 int nearest_power(int num)
 {
 	int n = 1;
diff --git a/src/core/misc.h b/src/core/misc.h
index 58b665bf..fdb16a49 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -83,9 +83,6 @@ int parse_size(const char *size, int *bytes);
    Stop when `end_char' is found from string. */
 int is_numeric(const char *str, char end_char);
 
-/* Like strlcpy(), but return -1 if buffer was overflown, 0 if not. */
-int strocpy(char *dest, const char *src, size_t dstsize);
-
 /* strstr() with case-ignoring */
 char *stristr(const char *data, const char *key);
 
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index bcb9d1f6..b22f3269 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -48,7 +48,7 @@ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
 	rec->send_massjoin = send_massjoin;
 
 	if (prefixes != NULL) {
-		strocpy(rec->prefixes, prefixes, sizeof(rec->prefixes));
+		g_strlcpy(rec->prefixes, prefixes, sizeof(rec->prefixes));
 	}
 
 	nicklist_insert(CHANNEL(channel), rec);
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index ac281683..e7b796bb 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -473,8 +473,8 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 				net_ip2host(&temp_dcc->addr, temp_dcc->addrstr);
 			else {
 				/* with IPv6, show it to us as it was sent */
-				strocpy(temp_dcc->addrstr, address,
-					sizeof(temp_dcc->addrstr));
+				g_strlcpy(temp_dcc->addrstr, address,
+					  sizeof(temp_dcc->addrstr));
 			}
 
 			/* This new signal is added to let us invoke
@@ -508,7 +508,7 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 		net_ip2host(&dcc->addr, dcc->addrstr);
 	else {
 		/* with IPv6, show it to us as it was sent */
-		strocpy(dcc->addrstr, address, sizeof(dcc->addrstr));
+		g_strlcpy(dcc->addrstr, address, sizeof(dcc->addrstr));
 	}
 	dcc->port = port;
 	dcc->size = size;

From 7a3c6fe86ca55b4ef69b11443b87359b333bc20b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 13 Feb 2016 14:16:05 +0100
Subject: [PATCH 0358/1650] Replace strarray_length with g_strv_length

---
 src/core/ignore.c                 |  2 +-
 src/core/misc.c                   | 14 --------------
 src/core/misc.h                   |  2 --
 src/core/special-vars.c           |  2 +-
 src/fe-common/core/hilight-text.c |  2 +-
 src/irc/dcc/dcc-chat.c            |  2 +-
 src/irc/dcc/dcc-get.c             |  2 +-
 src/irc/dcc/dcc-resume.c          |  2 +-
 src/irc/dcc/dcc-server.c          |  2 +-
 9 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 8d5a27c2..2047dc9d 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -241,7 +241,7 @@ IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char
 		if (channels == NULL || rec->channels == NULL)
 			continue; /* other doesn't have channels */
 
-		if (strarray_length(channels) != strarray_length(rec->channels))
+		if (g_strv_length(channels) != g_strv_length(rec->channels))
 			continue; /* different amount of channels */
 
 		/* check that channels match */
diff --git a/src/core/misc.c b/src/core/misc.c
index 682d006c..70d09e55 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -150,20 +150,6 @@ int find_substr(const char *list, const char *item)
 	return FALSE;
 }
 
-int strarray_length(char **array)
-{
-	int len;
-
-	g_return_val_if_fail(array != NULL, 0);
-
-	len = 0;
-	while (*array) {
-		len++;
-                array++;
-	}
-        return len;
-}
-
 int strarray_find(char **array, const char *item)
 {
 	char **tmp;
diff --git a/src/core/misc.h b/src/core/misc.h
index fdb16a49..f8f1786f 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -102,8 +102,6 @@ char *show_lowascii(const char *str);
 /* replace all `from' chars in string to `to' chars. returns `str' */
 char *replace_chars(char *str, char from, char to);
 
-/* return how many items `array' has */
-int strarray_length(char **array);
 /* return index of `item' in `array' or -1 if not found */
 int strarray_find(char **array, const char *item);
 
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index fe6bbed2..6ca080fc 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -44,7 +44,7 @@ static char *get_argument(char **cmd, char **arglist)
 	arg = 0;
 	max = -1;
 
-	argcount = arglist == NULL ? 0 : strarray_length(arglist);
+	argcount = arglist == NULL ? 0 : g_strv_length(arglist);
 
 	if (**cmd == '*') {
 		/* get all arguments */
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 36e1e78c..4691a708 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -178,7 +178,7 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
 		if (channels == NULL || rec->channels == NULL)
 			continue; /* other doesn't have channels */
 
-		if (strarray_length(channels) != strarray_length(rec->channels))
+		if (g_strv_length(channels) != g_strv_length(rec->channels))
 			continue; /* different amount of channels */
 
 		/* check that channels match */
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index e3dbe72d..ca90b8d8 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -619,7 +619,7 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
         /* CHAT <unused> <address> <port> */
 	/* CHAT <unused> <address> 0 <id> (DCC CHAT passive protocol) */
 	params = g_strsplit(data, " ", -1);
-	paramcount = strarray_length(params);
+	paramcount = g_strv_length(params);
 
 	if (paramcount < 3) {
 		g_strfreev(params);
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index e7b796bb..f7a95bb9 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -423,7 +423,7 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 	/* SEND <file name> <address> <port> <size> [...] */
 	/* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */
 	params = g_strsplit(data, " ", -1);
-	paramcount = strarray_length(params);
+	paramcount = g_strv_length(params);
 
 	if (paramcount < 4) {
 		signal_emit("dcc error ctcp", 5, "SEND", data,
diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c
index 11b28aef..36f84ddf 100644
--- a/src/irc/dcc/dcc-resume.c
+++ b/src/irc/dcc/dcc-resume.c
@@ -88,7 +88,7 @@ static int dcc_ctcp_resume_parse(int type, const char *data, const char *nick,
 	/* RESUME|ACCEPT <file name> <port> <size> */
 	/* RESUME|ACCEPT <file name> 0 <size> <id> (passive protocol) */
 	params = g_strsplit(data, " ", -1);
-	paramcount = strarray_length(params);
+	paramcount = g_strv_length(params);
 
 	if (paramcount < 3)
 		return 0;
diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c
index 30224ff9..7ae572cd 100644
--- a/src/irc/dcc/dcc-server.c
+++ b/src/irc/dcc/dcc-server.c
@@ -245,7 +245,7 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg)
 
 			/* 120 clientnickname filesize filename */
 			params = g_strsplit(msg, " ", -1);
-			paramcount = strarray_length(params);
+			paramcount = g_strv_length(params);
 
 			if (paramcount < 3) {
 				g_strfreev(params);

From 0f9d2b35700db69c66c5878b5562852565753dd2 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 13 Feb 2016 16:26:36 +0100
Subject: [PATCH 0359/1650] Remove unused regexp_match

---
 src/core/misc.c | 18 ------------------
 src/core/misc.h |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 70d09e55..48a49fa3 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -375,24 +375,6 @@ char *stristr_full(const char *data, const char *key)
         return strstr_full_case(data, key, TRUE);
 }
 
-int regexp_match(const char *str, const char *regexp)
-{
-#ifdef HAVE_REGEX_H
-	regex_t preg;
-	int ret;
-
-	if (regcomp(&preg, regexp, REG_EXTENDED|REG_ICASE|REG_NOSUB) != 0)
-                return 0;
-
-	ret = regexec(&preg, str, 0, NULL, 0);
-	regfree(&preg);
-
-	return ret == 0;
-#else
-	return FALSE;
-#endif
-}
-
 /* convert ~/ to $HOME */
 char *convert_home(const char *path)
 {
diff --git a/src/core/misc.h b/src/core/misc.h
index f8f1786f..df17998f 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -36,9 +36,6 @@ char *gslist_to_string(GSList *list, const char *delimiter);
    items while using this list, use g_slist_free() after you're done with it */
 GSList *hashtable_get_keys(GHashTable *hash);
 
-/* easy way to check if regexp matches */
-int regexp_match(const char *str, const char *regexp);
-
 /* convert ~/ to $HOME */
 char *convert_home(const char *path);
 

From e0b290c34fc116c043f51396e2770821ec357522 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 17 Feb 2016 23:21:38 +0100
Subject: [PATCH 0360/1650] Update the g_istr_hash function to use the djb hash

---
 src/core/misc.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 48a49fa3..74ca4725 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -401,22 +401,15 @@ int g_istr_cmp(gconstpointer v, gconstpointer v2)
 	return g_ascii_strcasecmp((const char *) v, (const char *) v2);
 }
 
-/* a char* hash function from ASU */
-unsigned int g_istr_hash(gconstpointer v)
+guint g_istr_hash(gconstpointer v)
 {
-	const char *s = (const char *) v;
-	unsigned int h = 0, g;
+	const signed char *p;
+	guint32 h = 5381;
 
-	while (*s != '\0') {
-		h = (h << 4) + i_toupper(*s);
-		if ((g = h & 0xf0000000UL)) {
-			h = h ^ (g >> 24);
-			h = h ^ g;
-		}
-		s++;
-	}
+	for (p = v; *p != '\0'; p++)
+		h = (h << 5) + h + g_ascii_toupper(*p);
 
-	return h /* % M */;
+	return h;
 }
 
 /* Find `mask' from `data', you can use * and ? wildcards. */

From cc70e8c581713309c64eb15c3999341d17988e19 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 5 Jun 2016 16:48:27 +0200
Subject: [PATCH 0361/1650] Clean up some GTimeVal juggling

---
 src/irc/core/irc-servers.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 1df95f70..5b4af2ac 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -212,7 +212,6 @@ static void server_init(IRC_SERVER_REC *server)
 {
 	IRC_SERVER_CONNECT_REC *conn;
 	char *address, *ptr, *username, *cmd;
-	GTimeVal now;
 
 	g_return_if_fail(server != NULL);
 
@@ -287,9 +286,8 @@ static void server_init(IRC_SERVER_REC *server)
 
 	/* prevent the queue from sending too early, we have a max cut off of 120 secs */
 	/* this will reset to 1 sec after we get the 001 event */
-	g_get_current_time(&now);
-	memcpy(&((IRC_SERVER_REC *)server)->wait_cmd, &now, sizeof(GTimeVal));
-	((IRC_SERVER_REC *)server)->wait_cmd.tv_sec += 120;
+	g_get_current_time(&server->wait_cmd);
+	g_time_val_add(&server->wait_cmd, 120 * G_USEC_PER_SEC);
 }
 
 SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
@@ -535,7 +533,7 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
 		server->wait_cmd.tv_sec = 0;
 	else {
 		memcpy(&server->wait_cmd, &server->last_cmd, sizeof(GTimeVal));
-		server->wait_cmd.tv_sec += 2 + len/100;
+		g_time_val_add(&server->wait_cmd, (2 + len/100) * G_USEC_PER_SEC);
 	}
 }
 
@@ -695,7 +693,6 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 static void event_connected(IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	char *params, *nick;
-	GTimeVal now;
 
 	g_return_if_fail(server != NULL);
 
@@ -718,8 +715,7 @@ static void event_connected(IRC_SERVER_REC *server, const char *data, const char
 	server->real_connect_time = time(NULL);
 
 	/* let the queue send now that we are identified */
-	g_get_current_time(&now);
-	memcpy(&server->wait_cmd, &now, sizeof(GTimeVal));
+	g_get_current_time(&server->wait_cmd);
 
 	if (server->connrec->usermode != NULL) {
 		/* Send the user mode, before the autosendcmd.

From 2e8744319d5e5e47799ec20b2f737c437e8c6398 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 5 Jun 2016 16:54:20 +0200
Subject: [PATCH 0362/1650] str_to_uofft is a tiny wrapper over strtoul{,l}

---
 src/core/misc.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 74ca4725..9081abe1 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -515,15 +515,11 @@ int dec2octal(int decimal)
 /* string -> uoff_t */
 uoff_t str_to_uofft(const char *str)
 {
-	uoff_t ret;
-
-	ret = 0;
-	while (*str != '\0') {
-		ret = ret*10 + (*str - '0');
-		str++;
-	}
-
-	return ret;
+#ifdef UOFF_T_LONG_LONG
+	return (uoff_t)strtoull(str, NULL, 10);
+#else
+	return (uoff_t)strtoul(str, NULL, 10);
+#endif
 }
 
 /* convert all low-ascii (<32) to ^<A..> combinations */

From 0060f682c213dc25901f4c0ab01a01176e14da9e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 5 Jun 2016 17:24:27 +0200
Subject: [PATCH 0363/1650] Factor out some redundant code and remove
 hashtable_get_keys

---
 src/core/misc.c              | 22 ++++++++++++++++------
 src/core/misc.h              |  4 +---
 src/core/servers.c           | 16 +++-------------
 src/fe-common/core/fe-exec.c | 15 +++------------
 src/fe-text/lastlog.c        | 17 +++--------------
 5 files changed, 26 insertions(+), 48 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 9081abe1..bc9f504e 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include "misc.h"
+#include "commands.h"
 
 #ifdef HAVE_REGEX_H
 #  include <regex.h>
@@ -265,14 +266,23 @@ void hash_save_key(char *key, void *value, GSList **list)
         *list = g_slist_append(*list, key);
 }
 
-/* save all keys in hash table to linked list - you shouldn't remove any
-   items while using this list, use g_slist_free() after you're done with it */
-GSList *hashtable_get_keys(GHashTable *hash)
+/* remove all the options from the optlist hash table that are valid for the
+ * command cmd */
+GList *optlist_remove_known(const char *cmd, GHashTable *optlist)
 {
-	GSList *list;
+	GList *list, *tmp, *next;
+
+	list = g_hash_table_get_keys(optlist);
+	if (cmd != NULL && list != NULL) {
+		for (tmp = list; tmp != NULL; tmp = next) {
+			char *option = tmp->data;
+			next = tmp->next;
+
+			if (command_have_option(cmd, option))
+				list = g_list_remove(list, option);
+		}
+	}
 
-	list = NULL;
-	g_hash_table_foreach(hash, (GHFunc) hash_save_key, &list);
 	return list;
 }
 
diff --git a/src/core/misc.h b/src/core/misc.h
index df17998f..c095e131 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -32,9 +32,7 @@ char *gslistptr_to_string(GSList *list, int offset, const char *delimiter);
 /* `list' contains char* */
 char *gslist_to_string(GSList *list, const char *delimiter);
 
-/* save all keys in hash table to linked list - you shouldn't remove any
-   items while using this list, use g_slist_free() after you're done with it */
-GSList *hashtable_get_keys(GHashTable *hash);
+GList *optlist_remove_known(const char *cmd, GHashTable *optlist);
 
 /* convert ~/ to $HOME */
 char *convert_home(const char *path);
diff --git a/src/core/servers.c b/src/core/servers.c
index 3342304e..d6297c4d 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -684,21 +684,11 @@ SERVER_REC *cmd_options_get_server(const char *cmd,
 				   SERVER_REC *defserver)
 {
 	SERVER_REC *server;
-	GSList *list, *tmp, *next;
+	GList *list;
 
 	/* get all the options, then remove the known ones. there should
 	   be only one left - the server tag. */
-	list = hashtable_get_keys(optlist);
-	if (cmd != NULL) {
-		for (tmp = list; tmp != NULL; tmp = next) {
-			char *option = tmp->data;
-			next = tmp->next;
-
-			if (command_have_option(cmd, option))
-				list = g_slist_remove(list, option);
-		}
-	}
-
+	list = optlist_remove_known(cmd, optlist);
 	if (list == NULL)
 		return defserver;
 
@@ -713,7 +703,7 @@ SERVER_REC *cmd_options_get_server(const char *cmd,
 		server = NULL;
 	}
 
-	g_slist_free(list);
+	g_list_free(list);
 	return server;
 }
 
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index b5f289ce..36990866 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -237,22 +237,13 @@ static int signal_name_to_id(const char *name)
 static int cmd_options_get_signal(const char *cmd,
 				  GHashTable *optlist)
 {
-	GSList *list, *tmp, *next;
+	GList *list;
 	char *signame;
         int signum;
 
 	/* get all the options, then remove the known ones. there should
 	   be only one left - the signal */
-	list = hashtable_get_keys(optlist);
-	if (cmd != NULL) {
-		for (tmp = list; tmp != NULL; tmp = next) {
-			char *option = tmp->data;
-			next = tmp->next;
-
-			if (command_have_option(cmd, option))
-				list = g_slist_remove(list, option);
-		}
-	}
+	list = optlist_remove_known(cmd, optlist);
 
 	if (list == NULL)
 		return -1;
@@ -272,7 +263,7 @@ static int cmd_options_get_signal(const char *cmd,
                 return -2;
 	}
 
-	g_slist_free(list);
+	g_list_free(list);
 	return signum;
 }
 
diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index 166d2847..c0b1dde8 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -39,21 +39,10 @@
    Returns -1 if unknown option was given. */
 int cmd_options_get_level(const char *cmd, GHashTable *optlist)
 {
-	GSList *list, *tmp, *next;
+	GList *list;
         int level, retlevel;
 
-	/* get all the options, then remove the known ones. there should
-	   be only one left - the server tag. */
-	list = hashtable_get_keys(optlist);
-	if (cmd != NULL) {
-		for (tmp = list; tmp != NULL; tmp = next) {
-			char *option = tmp->data;
-			next = tmp->next;
-
-			if (command_have_option(cmd, option))
-				list = g_slist_remove(list, option);
-		}
-	}
+	list = optlist_remove_known(cmd, optlist);
 
         retlevel = 0;
 	while (list != NULL) {
@@ -68,7 +57,7 @@ int cmd_options_get_level(const char *cmd, GHashTable *optlist)
 		}
 
 		retlevel |= level;
-                list = g_slist_remove(list, list->data);
+                list = g_list_remove(list, list->data);
 	}
 
 	return retlevel;

From 98fce5f8074abcf5d35a1834952e42cd79384db2 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 5 Jun 2016 22:47:04 +0200
Subject: [PATCH 0364/1650] Deprecate net_connect()

---
 src/core/network.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/network.h b/src/core/network.h
index fb627b4d..03f3b813 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -37,7 +37,7 @@ GIOChannel *g_io_channel_new(int handle);
 int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 
 /* Connect to socket */
-GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
+GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip) G_GNUC_DEPRECATED;
 /* Connect to socket with ip address and SSL*/
 GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server);
 int irssi_ssl_handshake(GIOChannel *handle);

From 9fd286fed8d231f9c78353f5d746ed82e3bc05c4 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 5 Jun 2016 22:47:29 +0200
Subject: [PATCH 0365/1650] Bump the ABI

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 66892b78..0a7b72f0 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 5
+#define IRSSI_ABI_VERSION 6
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 

From d6d74c0da981af22fb8cbfa68d3bdc5446c55155 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 6 Jun 2016 16:58:40 +0200
Subject: [PATCH 0366/1650] Do not crash on OPTCHAN when item has no server

May fix bugs.debian.org#826525
---
 src/core/commands.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/commands.c b/src/core/commands.c
index 88d1208c..607baf77 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -666,7 +666,7 @@ get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name)
 	const char *ret;
 	char *tmp, *origtmp, *channel;
 
-	if (active_item == NULL) {
+	if (active_item == NULL || active_item->server == NULL) {
                 /* no active channel in window, channel required */
 		return cmd_get_param(data);
 	}
@@ -674,11 +674,13 @@ get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name)
 	origtmp = tmp = g_strdup(*data);
 	channel = cmd_get_param(&tmp);
 
-	if (g_strcmp0(channel, "*") == 0 && !require_name) {
+	if (g_strcmp0(channel, "*") == 0 && IS_CHANNEL(active_item) &&
+	    !require_name) {
                 /* "*" means active channel */
 		cmd_get_param(data);
 		ret = window_item_get_target(active_item);
-	} else if (!server_ischannel(active_item->server, channel)) {
+	} else if (IS_CHANNEL(active_item) &&
+		   !server_ischannel(active_item->server, channel)) {
                 /* we don't have channel parameter - use active channel */
 		ret = window_item_get_target(active_item);
 	} else {

From 97e9347ee704bdcd790002f2629cf6cea3e2bf40 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 7 Jun 2016 02:47:57 +0200
Subject: [PATCH 0367/1650] Merge pull request #485 from ailin-nemui/bdo826525

Do not crash on OPTCHAN when item has no server
---
 src/core/commands.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/commands.c b/src/core/commands.c
index 88d1208c..607baf77 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -666,7 +666,7 @@ get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name)
 	const char *ret;
 	char *tmp, *origtmp, *channel;
 
-	if (active_item == NULL) {
+	if (active_item == NULL || active_item->server == NULL) {
                 /* no active channel in window, channel required */
 		return cmd_get_param(data);
 	}
@@ -674,11 +674,13 @@ get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name)
 	origtmp = tmp = g_strdup(*data);
 	channel = cmd_get_param(&tmp);
 
-	if (g_strcmp0(channel, "*") == 0 && !require_name) {
+	if (g_strcmp0(channel, "*") == 0 && IS_CHANNEL(active_item) &&
+	    !require_name) {
                 /* "*" means active channel */
 		cmd_get_param(data);
 		ret = window_item_get_target(active_item);
-	} else if (!server_ischannel(active_item->server, channel)) {
+	} else if (IS_CHANNEL(active_item) &&
+		   !server_ischannel(active_item->server, channel)) {
                 /* we don't have channel parameter - use active channel */
 		ret = window_item_get_target(active_item);
 	} else {

From 750e3249038409607b0a57d21e21612e546539ed Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Jun 2016 22:56:26 +0200
Subject: [PATCH 0368/1650] Merge pull request #484 from LemonBoy/sasl-misc-adj

Correct the name of the emitted signal.
---
 src/irc/core/sasl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index b74b6a8c..f080ae59 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -71,7 +71,7 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 
 	params = event_get_params(data, 2, NULL, &error);
 
-	signal_emit("server sasl fail", 2, server, error);
+	signal_emit("server sasl failure", 2, server, error);
 
 	/* Terminate the negotiation */
 	cap_finish_negotiation(server);

From bf9d9494db89e7de45653e4797e2977c6e185c13 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 12 Jun 2016 15:26:07 +0200
Subject: [PATCH 0369/1650] Add a CHOICE type to the settings system.

This is useful to let the user choose an option between a finite set of
valid alternatives.
---
 src/core/settings.c              | 95 ++++++++++++++++++++++++++++----
 src/core/settings.h              | 14 ++++-
 src/fe-common/core/completion.c  | 17 +++++-
 src/fe-common/core/fe-settings.c |  5 ++
 4 files changed, 113 insertions(+), 18 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 8e493124..9c2389bc 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -148,11 +148,34 @@ int settings_get_size(const char *key)
 	return str == NULL ? 0 : bytes;
 }
 
+int settings_get_choice(const char *key)
+{
+	SETTINGS_REC *rec;
+	CONFIG_NODE *node;
+	char *str;
+	int idx;
+
+	rec = settings_get(key, SETTING_TYPE_CHOICE);
+	if (rec == NULL) return -1;
+
+	node = iconfig_node_traverse("settings", FALSE);
+	node = node == NULL ? NULL : iconfig_node_section(node, rec->module, -1);
+
+	str = node == NULL ? rec->default_value.v_string :
+		config_node_get_str(node, key, rec->default_value.v_string);
+
+	idx = strarray_find(rec->choices, str);
+	return (idx < 0) ? rec->default_value.v_int : idx;
+}
+
 char *settings_get_print(SETTINGS_REC *rec)
 {
 	char *value = NULL;
 
 	switch(rec->type) {
+	case SETTING_TYPE_CHOICE:
+		value = g_strdup(rec->choices[settings_get_choice(rec->key)]);
+		break;
 	case SETTING_TYPE_BOOLEAN:
 		value = g_strdup(settings_get_bool(rec->key) ? "ON" : "OFF");
 		break;
@@ -172,13 +195,31 @@ char *settings_get_print(SETTINGS_REC *rec)
 
 static void settings_add(const char *module, const char *section,
 			 const char *key, SettingType type,
-			 const SettingValue *default_value)
+			 const SettingValue *default_value,
+			 const char *choices)
 {
 	SETTINGS_REC *rec;
+	char **choices_vec = NULL;
 
 	g_return_if_fail(key != NULL);
 	g_return_if_fail(section != NULL);
 
+	if (type == SETTING_TYPE_CHOICE) {
+		if (choices == NULL) {
+			g_warning("Trying to add setting '%s' with no choices.", key);
+			return;
+		}
+
+		choices_vec = g_strsplit(choices, ",", -1);
+
+		/* validate the default value */
+		if (default_value->v_int < 0 || default_value->v_int >= g_strv_length(choices_vec)) {
+			g_warning("Trying to add setting '%s' with an invalid default value.", key);
+			g_strfreev(choices_vec);
+			return;
+		}
+	}
+
 	rec = g_hash_table_lookup(settings, key);
 	if (rec != NULL) {
 		/* Already exists, make sure it's correct type */
@@ -197,6 +238,7 @@ static void settings_add(const char *module, const char *section,
                 rec->type = type;
 
 		rec->default_value = *default_value;
+		rec->choices = choices_vec;
 		g_hash_table_insert(settings, rec->key, rec);
 	}
 }
@@ -208,7 +250,17 @@ void settings_add_str_module(const char *module, const char *section,
 
 	memset(&default_value, 0, sizeof(default_value));
 	default_value.v_string = g_strdup(def);
-	settings_add(module, section, key, SETTING_TYPE_STRING, &default_value);
+	settings_add(module, section, key, SETTING_TYPE_STRING, &default_value, NULL);
+}
+
+void settings_add_choice_module(const char *module, const char *section,
+				const char *key, int def, const char *choices)
+{
+	SettingValue default_value;
+
+	memset(&default_value, 0, sizeof(default_value));
+	default_value.v_int = def;
+	settings_add(module, section, key, SETTING_TYPE_CHOICE, &default_value, choices);
 }
 
 void settings_add_int_module(const char *module, const char *section,
@@ -218,7 +270,7 @@ void settings_add_int_module(const char *module, const char *section,
 
 	memset(&default_value, 0, sizeof(default_value));
         default_value.v_int = def;
-	settings_add(module, section, key, SETTING_TYPE_INT, &default_value);
+	settings_add(module, section, key, SETTING_TYPE_INT, &default_value, NULL);
 }
 
 void settings_add_bool_module(const char *module, const char *section,
@@ -228,8 +280,7 @@ void settings_add_bool_module(const char *module, const char *section,
 
 	memset(&default_value, 0, sizeof(default_value));
         default_value.v_bool = def;
-	settings_add(module, section, key, SETTING_TYPE_BOOLEAN,
-		     &default_value);
+	settings_add(module, section, key, SETTING_TYPE_BOOLEAN, &default_value, NULL);
 }
 
 void settings_add_time_module(const char *module, const char *section,
@@ -239,7 +290,7 @@ void settings_add_time_module(const char *module, const char *section,
 
 	memset(&default_value, 0, sizeof(default_value));
 	default_value.v_string = g_strdup(def);
-	settings_add(module, section, key, SETTING_TYPE_TIME, &default_value);
+	settings_add(module, section, key, SETTING_TYPE_TIME, &default_value, NULL);
 }
 
 void settings_add_level_module(const char *module, const char *section,
@@ -249,7 +300,7 @@ void settings_add_level_module(const char *module, const char *section,
 
 	memset(&default_value, 0, sizeof(default_value));
 	default_value.v_string = g_strdup(def);
-	settings_add(module, section, key, SETTING_TYPE_LEVEL, &default_value);
+	settings_add(module, section, key, SETTING_TYPE_LEVEL, &default_value, NULL);
 }
 
 void settings_add_size_module(const char *module, const char *section,
@@ -259,14 +310,16 @@ void settings_add_size_module(const char *module, const char *section,
 
 	memset(&default_value, 0, sizeof(default_value));
 	default_value.v_string = g_strdup(def);
-	settings_add(module, section, key, SETTING_TYPE_SIZE, &default_value);
+	settings_add(module, section, key, SETTING_TYPE_SIZE, &default_value, NULL);
 }
 
 static void settings_destroy(SETTINGS_REC *rec)
 {
 	if (rec->type != SETTING_TYPE_INT &&
-	    rec->type != SETTING_TYPE_BOOLEAN)
+	    rec->type != SETTING_TYPE_BOOLEAN &&
+	    rec->type != SETTING_TYPE_CHOICE)
 		g_free(rec->default_value.v_string);
+	g_strfreev(rec->choices);
         g_free(rec->module);
         g_free(rec->section);
         g_free(rec->key);
@@ -328,6 +381,24 @@ static CONFIG_NODE *settings_get_node(const char *key)
 	return iconfig_node_section(node, rec->module, NODE_TYPE_BLOCK);
 }
 
+gboolean settings_set_choice(const char *key, const char *value)
+{
+	SETTINGS_REC *rec;
+
+	rec = settings_get_record(key);
+	/* XXX: The leading/trailing whitespace makes the test fail */
+	if (rec != NULL && g_strv_contains((const char **)rec->choices, value) == FALSE) {
+		char *msg = g_strjoinv(",", rec->choices);
+		g_warning("Invalid value for '%s', must be one of: %s", key, msg);
+		g_free(msg);
+
+		return FALSE;
+	}
+
+	settings_set_str(key, value);
+	return TRUE;
+}
+
 void settings_set_str(const char *key, const char *value)
 {
         iconfig_node_set_str(settings_get_node(key), key, value);
@@ -343,7 +414,7 @@ void settings_set_bool(const char *key, int value)
         iconfig_node_set_bool(settings_get_node(key), key, value);
 }
 
-int settings_set_time(const char *key, const char *value)
+gboolean settings_set_time(const char *key, const char *value)
 {
 	int msecs;
 
@@ -354,7 +425,7 @@ int settings_set_time(const char *key, const char *value)
 	return TRUE;
 }
 
-int settings_set_level(const char *key, const char *value)
+gboolean settings_set_level(const char *key, const char *value)
 {
 	int iserror;
 
@@ -366,7 +437,7 @@ int settings_set_level(const char *key, const char *value)
 	return TRUE;
 }
 
-int settings_set_size(const char *key, const char *value)
+gboolean settings_set_size(const char *key, const char *value)
 {
 	int size;
 
diff --git a/src/core/settings.h b/src/core/settings.h
index 6f2cf129..d174f250 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -8,6 +8,7 @@ typedef enum {
 	SETTING_TYPE_TIME,
 	SETTING_TYPE_LEVEL,
 	SETTING_TYPE_SIZE,
+	SETTING_TYPE_CHOICE,
 	SETTING_TYPE_ANY
 } SettingType;
 
@@ -26,6 +27,7 @@ typedef struct {
 
 	SettingType type;
 	SettingValue default_value;
+	char **choices;
 } SETTINGS_REC;
 
 /* macros for handling the default Irssi configuration */
@@ -58,6 +60,7 @@ int settings_get_bool(const char *key);
 int settings_get_time(const char *key); /* as milliseconds */
 int settings_get_level(const char *key);
 int settings_get_size(const char *key); /* as bytes */
+int settings_get_choice(const char *key);
 char *settings_get_print(SETTINGS_REC *rec);
 
 /* Functions to add/remove settings */
@@ -73,6 +76,8 @@ void settings_add_level_module(const char *module, const char *section,
 			       const char *key, const char *def);
 void settings_add_size_module(const char *module, const char *section,
 			      const char *key, const char *def);
+void settings_add_choice_module(const char *module, const char *section,
+				const char *key, int def, const char *choices);
 void settings_remove(const char *key);
 void settings_remove_module(const char *module);
 
@@ -88,13 +93,16 @@ void settings_remove_module(const char *module);
 	settings_add_level_module(MODULE_NAME, section, key, def)
 #define settings_add_size(section, key, def) \
 	settings_add_size_module(MODULE_NAME, section, key, def)
+#define settings_add_choice(section, key, def, choices) \
+	settings_add_choice_module(MODULE_NAME, section, key, def, choices)
 
 void settings_set_str(const char *key, const char *value);
 void settings_set_int(const char *key, int value);
 void settings_set_bool(const char *key, int value);
-int settings_set_time(const char *key, const char *value);
-int settings_set_level(const char *key, const char *value);
-int settings_set_size(const char *key, const char *value);
+gboolean settings_set_time(const char *key, const char *value);
+gboolean settings_set_level(const char *key, const char *value);
+gboolean settings_set_size(const char *key, const char *value);
+gboolean settings_set_choice(const char *key, const char *value);
 
 /* Get the type (SETTING_TYPE_xxx) of `key' */
 SettingType settings_get_type(const char *key);
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 861054b5..0e9982d5 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -690,9 +690,20 @@ static void sig_complete_set(GList **list, WINDOW_REC *window,
 	else if (*line != '\0' && *word == '\0') {
 		SETTINGS_REC *rec = settings_get_record(line);
 		if (rec != NULL) {
-			char *value = settings_get_print(rec);
-			if (value != NULL)
-				*list = g_list_append(*list, value);
+			/* show the whole list of valid options */
+			if (rec->type == SETTING_TYPE_CHOICE) {
+				char **tmp = rec->choices;
+
+				while (*tmp)
+					*list = g_list_append(*list, g_strdup(*tmp++));
+			}
+			/* show the current option */
+			else {
+				char *value = settings_get_print(rec);
+
+				if (value != NULL)
+					*list = g_list_append(*list, value);
+			}
 		}
 	}
 
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index b689cbf9..e25886ec 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -142,6 +142,11 @@ static void cmd_set(char *data)
 				else
 					set_int(key, value);
 				break;
+			case SETTING_TYPE_CHOICE:
+				settings_set_choice(key, clear ? "" :
+						    set_default ? rec->choices[rec->default_value.v_int] :
+						    value);
+				break;
 			case SETTING_TYPE_STRING:
 				settings_set_str(key, clear ? "" :
 						 set_default ? rec->default_value.v_string :

From 86c5e56ef41c70030e43d03b4c01e2df8188c30b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 12 Jun 2016 16:26:18 +0200
Subject: [PATCH 0370/1650] Make rejoin_channels_mode of type CHOICE

---
 src/irc/core/irc-servers.c | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 1df95f70..6f5803ed 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -623,39 +623,25 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 	GString *chans, *keys;
 	char *ret;
 	int use_keys;
-	char *rejoin_channels_mode;
+	int rejoin_channels_mode;
 
 	g_return_val_if_fail(server != NULL, FALSE);
 
-	rejoin_channels_mode = g_strdup(settings_get_str("rejoin_channels_on_reconnect"));
+	rejoin_channels_mode = settings_get_choice("rejoin_channels_on_reconnect");
 
-	if (rejoin_channels_mode == NULL ||
-	    (g_ascii_strcasecmp(rejoin_channels_mode, "on") != 0 &&
-	     g_ascii_strcasecmp(rejoin_channels_mode, "off") != 0 &&
-	     g_ascii_strcasecmp(rejoin_channels_mode, "auto") != 0)) {
-		g_warning("Invalid value for 'rejoin_channels_on_reconnect', valid values are 'on', 'off', 'auto', using 'on' as default value.");
-		g_free(rejoin_channels_mode);
-		rejoin_channels_mode = g_strdup("on");
-	}
+	/* do we want to rejoin channels in the first place? */
+	if(rejoin_channels_mode == 0)
+		return g_strdup("");
 
 	chans = g_string_new(NULL);
 	keys = g_string_new(NULL);
 	use_keys = FALSE;
 
-	/* do we want to rejoin channels in the first place? */
-	if(g_ascii_strcasecmp(rejoin_channels_mode, "off") == 0) {
-		g_string_free(chans, TRUE);
-		g_string_free(keys, TRUE);
-		g_free(rejoin_channels_mode);
-		return g_strdup("");
-	}
-
 	/* get currently joined channels */
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *channel = tmp->data;
 		CHANNEL_SETUP_REC *setup = channel_setup_find(channel->name, channel->server->connrec->chatnet);
-		if ((setup != NULL && setup->autojoin && g_ascii_strcasecmp(rejoin_channels_mode, "auto") == 0) ||
-		    g_ascii_strcasecmp(rejoin_channels_mode, "on") == 0) {
+		if ((setup != NULL && setup->autojoin && rejoin_channels_mode == 2) || rejoin_channels_mode == 1) {
 			g_string_append_printf(chans, "%s,", channel->name);
 			g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" : channel->key);
 			if (channel->key != NULL)
@@ -668,8 +654,7 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 		REJOIN_REC *rec = tmp->data;
 		CHANNEL_SETUP_REC *setup = channel_setup_find(rec->channel, server->tag);
 
-		if ((setup != NULL && setup->autojoin && g_ascii_strcasecmp(rejoin_channels_mode, "auto") == 0) ||
-		    g_ascii_strcasecmp(rejoin_channels_mode, "on") == 0) {
+		if ((setup != NULL && setup->autojoin && rejoin_channels_mode == 2) || rejoin_channels_mode == 1) {
 			g_string_append_printf(chans, "%s,", rec->channel);
 			g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" :
 									rec->key);
@@ -687,7 +672,6 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 	ret = chans->str;
 	g_string_free(chans, FALSE);
 	g_string_free(keys, TRUE);
-	g_free(rejoin_channels_mode);
 
 	return ret;
 }
@@ -1033,7 +1017,7 @@ void irc_server_init_isupport(IRC_SERVER_REC *server)
 
 void irc_servers_init(void)
 {
-	settings_add_str("servers", "rejoin_channels_on_reconnect", "on");
+	settings_add_choice("servers", "rejoin_channels_on_reconnect", 1, "off,on,auto");
 	settings_add_str("misc", "usermode", DEFAULT_USER_MODE);
 	settings_add_str("misc", "split_line_start", "");
 	settings_add_str("misc", "split_line_end", "");

From 31f12c10df52e44e7cef0245fc55ae38159ce9e3 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 12 Jun 2016 16:38:34 +0200
Subject: [PATCH 0371/1650] Use strarray_find instead of g_strv_contains

---
 src/core/settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 9c2389bc..9871ad30 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -387,7 +387,7 @@ gboolean settings_set_choice(const char *key, const char *value)
 
 	rec = settings_get_record(key);
 	/* XXX: The leading/trailing whitespace makes the test fail */
-	if (rec != NULL && g_strv_contains((const char **)rec->choices, value) == FALSE) {
+	if (rec != NULL && strarray_find(rec->choices, value) < 0) {
 		char *msg = g_strjoinv(",", rec->choices);
 		g_warning("Invalid value for '%s', must be one of: %s", key, msg);
 		g_free(msg);

From 7307b48bd6928207ded9e186af3f3b97625f00bb Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 12 Jun 2016 22:58:35 +0200
Subject: [PATCH 0372/1650] Sort the completion results

Make sure the current option is shown first.
---
 src/fe-common/core/completion.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 0e9982d5..c87fdb50 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -690,19 +690,20 @@ static void sig_complete_set(GList **list, WINDOW_REC *window,
 	else if (*line != '\0' && *word == '\0') {
 		SETTINGS_REC *rec = settings_get_record(line);
 		if (rec != NULL) {
+			char *value = settings_get_print(rec);
+
+			/* show the current option first */
+			if (value != NULL)
+				*list = g_list_append(*list, value);
+
 			/* show the whole list of valid options */
 			if (rec->type == SETTING_TYPE_CHOICE) {
-				char **tmp = rec->choices;
+				char **tmp;
 
-				while (*tmp)
-					*list = g_list_append(*list, g_strdup(*tmp++));
-			}
-			/* show the current option */
-			else {
-				char *value = settings_get_print(rec);
-
-				if (value != NULL)
-					*list = g_list_append(*list, value);
+				for (tmp = rec->choices; *tmp; tmp++) {
+					if (g_ascii_strcasecmp(*tmp, value) != 0)
+						*list = g_list_append(*list, g_strdup(*tmp));
+				}
 			}
 		}
 	}

From 6f795f020d5c374023dc9ca647b267aef0a76950 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 12 Jun 2016 23:39:22 +0200
Subject: [PATCH 0373/1650] Strip the surrounding whitespace.

---
 src/core/settings.c              |  2 +-
 src/fe-common/core/fe-settings.c | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 9871ad30..8509a9ff 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -386,7 +386,7 @@ gboolean settings_set_choice(const char *key, const char *value)
 	SETTINGS_REC *rec;
 
 	rec = settings_get_record(key);
-	/* XXX: The leading/trailing whitespace makes the test fail */
+
 	if (rec != NULL && strarray_find(rec->choices, value) < 0) {
 		char *msg = g_strjoinv(",", rec->choices);
 		g_warning("Invalid value for '%s', must be one of: %s", key, msg);
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index e25886ec..ca1f871d 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -67,6 +67,7 @@ static void set_print_pattern(const char *pattern)
 static void set_boolean(const char *key, const char *value)
 {
 	char *stripped_value;
+
 	stripped_value = g_strdup(value);
 	g_strstrip(stripped_value);
 
@@ -79,7 +80,7 @@ static void set_boolean(const char *key, const char *value)
 	else
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_NOT_TOGGLE);
 
-    g_free(stripped_value);
+	g_free(stripped_value);
 }
 
 static void set_int(const char *key, const char *value)
@@ -99,6 +100,16 @@ static void set_int(const char *key, const char *value)
 		settings_set_int(key, (int)longval);
 }
 
+static void set_choice(const char *key, const char *value)
+{
+	char *stripped_value;
+
+	stripped_value = g_strdup(value);
+	g_strstrip(stripped_value);
+	settings_set_choice(key, stripped_value);
+	g_free(stripped_value);
+}
+
 /* SYNTAX: SET [-clear | -default] [<key> [<value>]] */
 static void cmd_set(char *data)
 {
@@ -143,9 +154,10 @@ static void cmd_set(char *data)
 					set_int(key, value);
 				break;
 			case SETTING_TYPE_CHOICE:
-				settings_set_choice(key, clear ? "" :
-						    set_default ? rec->choices[rec->default_value.v_int] :
-						    value);
+				if (clear || set_default)
+					settings_set_choice(key, rec->choices[rec->default_value.v_int]);
+				else
+					set_choice(key, value);
 				break;
 			case SETTING_TYPE_STRING:
 				settings_set_str(key, clear ? "" :

From 9ea155f8df5fe9b3d67e8729f611b87a0c2a82c9 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 12 Jun 2016 20:28:06 -0300
Subject: [PATCH 0374/1650] servers-reconnect: pass unix_socket attribute to
 new connection

Trying to /reconnect unix sockets turned them into inet.
---
 src/core/servers-reconnect.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index f419035b..58c9dd09 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -190,6 +190,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->away_reason = g_strdup(src->away_reason);
 	dest->no_autojoin_channels = src->no_autojoin_channels;
 	dest->no_autosendcmd = src->no_autosendcmd;
+	dest->unix_socket = src->unix_socket;
 
 	dest->use_ssl = src->use_ssl;
 	dest->ssl_cert = g_strdup(src->ssl_cert);

From 9a30ab53df226acb4586a2f214f3994a7b8b32ea Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 13 Jun 2016 14:03:00 +0200
Subject: [PATCH 0375/1650] Move the validation of the CHOICE setting value

Also, use a FORMAT to show the error message.
---
 src/core/settings.c                 |  8 ++------
 src/fe-common/core/fe-settings.c    | 10 +++++++++-
 src/fe-common/core/module-formats.c |  1 +
 src/fe-common/core/module-formats.h |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 8509a9ff..0716103a 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -387,15 +387,11 @@ gboolean settings_set_choice(const char *key, const char *value)
 
 	rec = settings_get_record(key);
 
-	if (rec != NULL && strarray_find(rec->choices, value) < 0) {
-		char *msg = g_strjoinv(",", rec->choices);
-		g_warning("Invalid value for '%s', must be one of: %s", key, msg);
-		g_free(msg);
-
+	if (rec != NULL && strarray_find(rec->choices, value) < 0)
 		return FALSE;
-	}
 
 	settings_set_str(key, value);
+
 	return TRUE;
 }
 
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index ca1f871d..6f69d930 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -106,7 +106,15 @@ static void set_choice(const char *key, const char *value)
 
 	stripped_value = g_strdup(value);
 	g_strstrip(stripped_value);
-	settings_set_choice(key, stripped_value);
+
+	if (settings_set_choice(key, stripped_value) == FALSE) {
+		SETTINGS_REC *rec = settings_get_record(key);
+		char *msg = g_strjoinv(",", rec->choices);
+
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_INVALID_CHOICE, msg);
+		g_free(msg);
+	}
+
 	g_free(stripped_value);
 }
 
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index b897b0c6..5c07f14c 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -221,6 +221,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "invalid_level", "Invalid message level", 0 },
 	{ "invalid_size", "Invalid size", 0 },
 	{ "invalid_charset", "Invalid charset: $0", 1, { 0 } },
+	{ "invalid_choice", "Invalid choice, must be one of $0", 1, { 0 } },
 	{ "eval_max_recurse", "/eval hit maximum recursion limit", 0 },
 	{ "program_not_found", "Could not find file or file is not executable", 0 },
 	{ "no_server_defined", "No servers defined for this network, see /help server for how to add one", 0 },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index de1e13f2..2b45ff6b 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -190,6 +190,7 @@ enum {
 	TXT_INVALID_LEVEL,
 	TXT_INVALID_SIZE,
 	TXT_INVALID_CHARSET,
+	TXT_INVALID_CHOICE,
 	TXT_EVAL_MAX_RECURSE,
 	TXT_PROGRAM_NOT_FOUND,
 	TXT_NO_SERVER_DEFINED,

From 439e21f12746519d36e205a3ac053c882d67c024 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 13 Jun 2016 14:07:04 +0200
Subject: [PATCH 0376/1650] Use ; as separator instead of ,

---
 src/core/settings.c        | 2 +-
 src/irc/core/irc-servers.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 0716103a..e6b5d16f 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -210,7 +210,7 @@ static void settings_add(const char *module, const char *section,
 			return;
 		}
 
-		choices_vec = g_strsplit(choices, ",", -1);
+		choices_vec = g_strsplit(choices, ";", -1);
 
 		/* validate the default value */
 		if (default_value->v_int < 0 || default_value->v_int >= g_strv_length(choices_vec)) {
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 6f5803ed..c8ba0a48 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -1017,7 +1017,7 @@ void irc_server_init_isupport(IRC_SERVER_REC *server)
 
 void irc_servers_init(void)
 {
-	settings_add_choice("servers", "rejoin_channels_on_reconnect", 1, "off,on,auto");
+	settings_add_choice("servers", "rejoin_channels_on_reconnect", 1, "off;on;auto");
 	settings_add_str("misc", "usermode", DEFAULT_USER_MODE);
 	settings_add_str("misc", "split_line_start", "");
 	settings_add_str("misc", "split_line_end", "");

From 5c8423a08cd9ffbe3363f3b0e5722e4a32157914 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 13 Jun 2016 20:27:37 +0200
Subject: [PATCH 0377/1650] Add a space after the comma when listing the
 options.

---
 src/fe-common/core/fe-settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index 6f69d930..abbd45a8 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -109,7 +109,7 @@ static void set_choice(const char *key, const char *value)
 
 	if (settings_set_choice(key, stripped_value) == FALSE) {
 		SETTINGS_REC *rec = settings_get_record(key);
-		char *msg = g_strjoinv(",", rec->choices);
+		char *msg = g_strjoinv(", ", rec->choices);
 
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_INVALID_CHOICE, msg);
 		g_free(msg);

From 78c1c1518a7382628368b09f8744189edf3ceef3 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 6 Jun 2016 22:25:32 +0200
Subject: [PATCH 0378/1650] Be smart about case-matching the nicks.

If the prefix contains an uppercase letter then don't use the
case-insensitive search functions.
---
 src/fe-common/core/chat-completion.c | 38 +++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index c37c77cd..b212de5f 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -52,6 +52,18 @@ static int completion_auto, completion_strict;
 	last_msg_add(&((MODULE_CHANNEL_REC *) MODULE_DATA(channel))->lastmsgs, \
 		     nick, own, keep_publics_count)
 
+static int contains_uppercase(const char *s1)
+{
+	const char *ch;
+
+	for (ch = s1; *ch != '\0'; ch++) {
+		if (g_ascii_isupper(*ch))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
 static LAST_MSG_REC *last_msg_find(GSList *list, const char *nick)
 {
 	while (list != NULL) {
@@ -336,7 +348,8 @@ GList *completion_msg(SERVER_REC *win_server,
 }
 
 static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
-				   const char *nick, const char *suffix)
+				   const char *nick, const char *suffix,
+				   const int match_case)
 {
         MODULE_CHANNEL_REC *mchannel;
 	GSList *tmp;
@@ -352,8 +365,10 @@ static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
 	for (tmp = mchannel->lastmsgs; tmp != NULL; tmp = tmp->next) {
 		LAST_MSG_REC *rec = tmp->data;
 
-		if (g_ascii_strncasecmp(rec->nick, nick, len) == 0 &&
-		    glist_find_icase_string(*outlist, rec->nick) == NULL) {
+		if ((match_case? strncmp(rec->nick, nick, len)
+		     : g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
+		    (match_case? glist_find_string(*outlist, rec->nick)
+		     : glist_find_icase_string(*outlist, rec->nick)) == NULL) {
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase) ascii_strdown(str);
 			if (rec->own)
@@ -368,7 +383,8 @@ static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
 
 static GList *completion_nicks_nonstrict(CHANNEL_REC *channel,
 					 const char *nick,
-					 const char *suffix)
+					 const char *suffix,
+					 const int match_case)
 {
 	GSList *nicks, *tmp;
 	GList *list;
@@ -404,7 +420,8 @@ static GList *completion_nicks_nonstrict(CHANNEL_REC *channel,
                 *out = '\0';
 
 		/* add to list if 'cleaned' nick matches */
-		if (g_ascii_strncasecmp(str, nick, len) == 0) {
+		if ((match_case? strncmp(str, nick, len)
+		     : g_ascii_strncasecmp(str, nick, len)) == 0) {
 			tnick = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase)
 				ascii_strdown(tnick);
@@ -428,7 +445,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	GSList *nicks, *tmp;
 	GList *list;
 	char *str;
-	int len;
+	int len, match_case;
 
 	g_return_val_if_fail(channel != NULL, NULL);
 	g_return_val_if_fail(nick != NULL, NULL);
@@ -437,9 +454,11 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	if (suffix != NULL && *suffix == '\0')
 		suffix = NULL;
 
+	match_case = contains_uppercase(nick);
+
 	/* put first the nicks who have recently said something */
 	list = NULL;
-	complete_from_nicklist(&list, channel, nick, suffix);
+	complete_from_nicklist(&list, channel, nick, suffix, match_case);
 
 	/* and add the rest of the nicks too */
 	len = strlen(nick);
@@ -447,7 +466,8 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
 		NICK_REC *rec = tmp->data;
 
-		if (g_ascii_strncasecmp(rec->nick, nick, len) == 0 &&
+		if ((match_case? strncmp(rec->nick, nick, len)
+		     : g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
 		    rec != channel->ownnick) {
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase)
@@ -463,7 +483,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	/* remove non alphanum chars from nick and search again in case
 	   list is still NULL ("foo<tab>" would match "_foo_" f.e.) */
 	if (!completion_strict)
-		list = g_list_concat(list, completion_nicks_nonstrict(channel, nick, suffix));
+		list = g_list_concat(list, completion_nicks_nonstrict(channel, nick, suffix, match_case));
 	return list;
 }
 

From 862729d7a39be25aee3524a52e19f9735dec6e1f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 7 Jun 2016 15:45:39 +0200
Subject: [PATCH 0379/1650] Add a completion_match_case setting.

---
 src/fe-common/core/chat-completion.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index b212de5f..3e144602 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -38,11 +38,18 @@
 #include "chat-completion.h"
 #include "window-items.h"
 
+enum {
+	COMPLETE_MCASE_NEVER = 0,
+	COMPLETE_MCASE_ALWAYS,
+	COMPLETE_MCASE_AUTO,
+};
+
 static int keep_privates_count, keep_publics_count;
 static int completion_lowercase;
 static char *completion_char, *cmdchars;
 static GSList *global_lastmsgs;
 static int completion_auto, completion_strict;
+static int completion_match_case;
 
 #define SERVER_LAST_MSG_ADD(server, nick) \
 	last_msg_add(&((MODULE_SERVER_REC *) MODULE_DATA(server))->lastmsgs, \
@@ -52,7 +59,7 @@ static int completion_auto, completion_strict;
 	last_msg_add(&((MODULE_CHANNEL_REC *) MODULE_DATA(channel))->lastmsgs, \
 		     nick, own, keep_publics_count)
 
-static int contains_uppercase(const char *s1)
+static gboolean contains_uppercase(const char *s1)
 {
 	const char *ch;
 
@@ -454,7 +461,8 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	if (suffix != NULL && *suffix == '\0')
 		suffix = NULL;
 
-	match_case = contains_uppercase(nick);
+	match_case = completion_match_case == COMPLETE_MCASE_ALWAYS ||
+		(completion_match_case == COMPLETE_MCASE_AUTO && contains_uppercase(nick));
 
 	/* put first the nicks who have recently said something */
 	list = NULL;
@@ -1150,6 +1158,8 @@ static void read_settings(void)
 	completion_auto = settings_get_bool("completion_auto");
 	completion_strict = settings_get_bool("completion_strict");
 
+	completion_match_case = settings_get_choice("completion_nicks_match_case");
+
 	g_free_not_null(completion_char);
 	completion_char = g_strdup(settings_get_str("completion_char"));
 
@@ -1170,6 +1180,7 @@ void chat_completion_init(void)
 	settings_add_int("completion", "completion_keep_privates", 10);
 	settings_add_bool("completion", "completion_nicks_lowercase", FALSE);
 	settings_add_bool("completion", "completion_strict", FALSE);
+	settings_add_choice("completion", "completion_nicks_match_case", COMPLETE_MCASE_AUTO, "never;always;auto");
 
 	settings_add_bool("lookandfeel", "expand_escapes", FALSE);
 

From 2da49e3ca6357b65e31fb494b2edb0d22e73c62c Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 13 Jun 2016 22:14:08 +0200
Subject: [PATCH 0380/1650] Don't crash when the key isn't found.

---
 src/core/settings.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index e6b5d16f..1242293d 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -153,7 +153,7 @@ int settings_get_choice(const char *key)
 	SETTINGS_REC *rec;
 	CONFIG_NODE *node;
 	char *str;
-	int idx;
+	int index;
 
 	rec = settings_get(key, SETTING_TYPE_CHOICE);
 	if (rec == NULL) return -1;
@@ -164,8 +164,10 @@ int settings_get_choice(const char *key)
 	str = node == NULL ? rec->default_value.v_string :
 		config_node_get_str(node, key, rec->default_value.v_string);
 
-	idx = strarray_find(rec->choices, str);
-	return (idx < 0) ? rec->default_value.v_int : idx;
+	if (str == NULL || (index = strarray_find(rec->choices, str)) < 0)
+		return rec->default_value.v_int;
+
+	return index;
 }
 
 char *settings_get_print(SETTINGS_REC *rec)

From 77ad62fadbcd9d5ce33889417de0099e035d8ddc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 16 Jun 2016 21:30:46 +0200
Subject: [PATCH 0381/1650] completion fixes

---
 src/fe-common/core/completion.c | 56 ++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index c87fdb50..46fd9db7 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -37,8 +37,11 @@ static int last_want_space, last_line_pos;
 #define isseparator_notspace(c) \
         ((c) == ',')
 
+#define isseparator_space(c) \
+        ((c) == ' ')
+
 #define isseparator(c) \
-	((c) == ' ' || isseparator_notspace(c))
+	(isseparator_space(c) || isseparator_notspace(c))
 
 void chat_completion_init(void);
 void chat_completion_deinit(void);
@@ -153,20 +156,23 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 		word = NULL;
                 linestart = NULL;
 	} else {
+		char* old_wordstart;
+
 		/* get the word we want to complete */
 		word = get_word_at(line, *pos, &wordstart);
+		old_wordstart = wordstart;
+
 		startpos = (int) (wordstart-line);
 		wordlen = strlen(word);
 
-		/* get the start of line until the word we're completing */
-		if (isseparator(*line)) {
-			/* empty space at the start of line */
-			if (wordstart == line)
-				wordstart += strlen(wordstart);
-		} else {
-			while (wordstart > line && isseparator(wordstart[-1]))
-				wordstart--;
-		}
+		/* remove trailing spaces from linestart */
+		while (wordstart > line && isseparator_space(wordstart[-1]))
+			wordstart--;
+
+		/* unless everything was spaces */
+		if (old_wordstart > line && wordstart == line)
+			wordstart = old_wordstart - 1;
+
 		linestart = g_strndup(line, (int) (wordstart-line));
 
 		/* completions usually add space after the word, that makes
@@ -175,19 +181,24 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 		   BUT if we start completion with "/msg "<tab>, we don't
 		   want to complete the /msg word, but instead complete empty
 		   word with /msg being in linestart. */
-		if (!erase && *pos > 0 && line[*pos-1] == ' ' &&
-		    (*linestart == '\0' || wordstart[-1] != ' ')) {
+		if (!erase && *pos > 0 && isseparator_space(line[*pos-1]) &&
+		    (*linestart == '\0' || !isseparator_space(wordstart[-1]))) {
 			char *old;
 
-                        old = linestart;
+			old = linestart;
 			linestart = *linestart == '\0' ?
 				g_strdup(word) :
-				g_strconcat(linestart, " ", word, NULL);
+				g_strdup_printf("%s%c%s",
+						/* do not accidentally duplicate the word separator */
+						line == wordstart - 1 ? "" : linestart,
+						wordstart[-1], word);
 			g_free(old);
 
 			g_free(word);
 			word = g_strdup("");
-			startpos = strlen(linestart)+1;
+
+			startpos = *linestart == '\0' ? 0 :
+				strlen(linestart)+1;
 			wordlen = 0;
 		}
 
@@ -397,7 +408,8 @@ static GList *completion_get_aliases(const char *alias, char cmdchar)
 			continue;
 
 		if (g_ascii_strncasecmp(node->key, alias, len) == 0) {
-			word = g_strdup_printf("%c%s", cmdchar, node->key);
+			word = cmdchar == '\0' ? g_strdup(node->key) :
+				g_strdup_printf("%c%s", cmdchar, node->key);
 			/* add matching alias to completion list, aliases will
 			   be appended after command completions and kept in
 			   uppercase to show it's an alias */
@@ -589,13 +601,19 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
 
 	/* command completion? */
 	cmdchars = settings_get_str("cmdchars");
-	if (*word != '\0' && *linestart == '\0' && strchr(cmdchars, *word)) {
+	if (*word != '\0' && ((*linestart == '\0' && strchr(cmdchars, *word)) ||
+			      (*linestart != '\0' && linestart[1] == '\0' &&
+			       strchr(cmdchars, *linestart)))) {
+		gboolean skip = *linestart == '\0' ? TRUE : FALSE;
+
 		/* complete /command */
-		*list = completion_get_commands(word+1, *word);
+		*list = completion_get_commands(word + (skip ? 1 : 0),
+						skip ? *word : '\0');
 
 		/* complete aliases, too */
 		*list = g_list_concat(*list,
-				      completion_get_aliases(word+1, *word));
+				      completion_get_aliases(word + (skip ? 1 : 0),
+							     skip ? *word : '\0'));
 
 		if (*list != NULL) signal_stop();
 		return;

From 92a2384ab06c542c8f6a3d0f80a54892d74dc649 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 18 Jun 2016 17:51:58 +0200
Subject: [PATCH 0382/1650] Add /channel modify

---
 src/fe-common/core/fe-channels.c | 38 +++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 046d641a..fe8e4807 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -246,9 +246,7 @@ static void cmd_channel(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	}
 }
 
-/* SYNTAX: CHANNEL ADD [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
-                       <channel> <network> [<password>] */
-static void cmd_channel_add(const char *data)
+static void cmd_channel_add_modify(const char *data, gboolean add)
 {
 	GHashTable *optlist;
         CHATNET_REC *chatnetrec;
@@ -257,18 +255,19 @@ static void cmd_channel_add(const char *data)
 	void *free_arg;
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_OPTIONS,
-			    "channel add", &optlist, &channel, &chatnet, &password))
+		"channel add", &optlist, &channel, &chatnet, &password))
 		return;
 
-	if (*chatnet == '\0' || *channel == '\0')
+	if (*chatnet == '\0' || *channel == '\0') {
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
 
 	chatnetrec = chatnet_find(chatnet);
 	if (chatnetrec == NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-			    TXT_UNKNOWN_CHATNET, chatnet);
+			TXT_UNKNOWN_CHATNET, chatnet);
 		cmd_params_free(free_arg);
-                return;
+		return;
 	}
 
 	botarg = g_hash_table_lookup(optlist, "bots");
@@ -276,10 +275,17 @@ static void cmd_channel_add(const char *data)
 
 	rec = channel_setup_find(channel, chatnet);
 	if (rec == NULL) {
+		if (!add) {
+			cmd_params_free(free_arg);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
+				TXT_CHANSETUP_NOT_FOUND, channel, chatnet);
+			return;
+		}
+
 		rec = CHAT_PROTOCOL(chatnetrec)->create_channel_setup();
 		rec->name = g_strdup(channel);
 		rec->chatnet = g_strdup(chatnet);
-	} else {
+	} else if (!add) {
 		if (g_hash_table_lookup(optlist, "bots")) g_free_and_null(rec->botmasks);
 		if (g_hash_table_lookup(optlist, "botcmd")) g_free_and_null(rec->autosendcmd);
 		if (*password != '\0') g_free_and_null(rec->password);
@@ -299,6 +305,20 @@ static void cmd_channel_add(const char *data)
 	cmd_params_free(free_arg);
 }
 
+/* SYNTAX: CHANNEL ADD [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
+                       <channel> <network> [<password>] */
+static void cmd_channel_add(const char *data)
+{
+	cmd_channel_add_modify(data, 1);
+}
+
+/* SYNTAX: CHANNEL MODIFY [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
+                          <channel> <network> [<password>] */
+static void cmd_channel_modify(const char *data)
+{
+	cmd_channel_add_modify(data, 0);
+}
+
 /* SYNTAX: CHANNEL REMOVE <channel> <network> */
 static void cmd_channel_remove(const char *data)
 {
@@ -622,6 +642,7 @@ void fe_channels_init(void)
 	command_bind("join", NULL, (SIGNAL_FUNC) cmd_join);
 	command_bind("channel", NULL, (SIGNAL_FUNC) cmd_channel);
 	command_bind("channel add", NULL, (SIGNAL_FUNC) cmd_channel_add);
+	command_bind("channel modify", NULL, (SIGNAL_FUNC) cmd_channel_modify);
 	command_bind("channel remove", NULL, (SIGNAL_FUNC) cmd_channel_remove);
 	command_bind("channel list", NULL, (SIGNAL_FUNC) cmd_channel_list);
 	command_bind("names", NULL, (SIGNAL_FUNC) cmd_names);
@@ -643,6 +664,7 @@ void fe_channels_deinit(void)
 	command_unbind("join", (SIGNAL_FUNC) cmd_join);
 	command_unbind("channel", (SIGNAL_FUNC) cmd_channel);
 	command_unbind("channel add", (SIGNAL_FUNC) cmd_channel_add);
+	command_unbind("channel modify", (SIGNAL_FUNC) cmd_channel_modify);
 	command_unbind("channel remove", (SIGNAL_FUNC) cmd_channel_remove);
 	command_unbind("channel list", (SIGNAL_FUNC) cmd_channel_list);
 	command_unbind("names", (SIGNAL_FUNC) cmd_names);

From 1dd1dde1d46439dac17bb7f053f2665ed31a4a5e Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 18 Jun 2016 17:52:26 +0200
Subject: [PATCH 0383/1650] Add /server modify

---
 src/fe-common/core/fe-server.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 429e6dac..f3792b47 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -104,7 +104,7 @@ static SERVER_SETUP_REC *create_server_setup(GHashTable *optlist)
 	return server;
 }
 
-static void cmd_server_add(const char *data)
+static void cmd_server_add_modify(const char *data, gboolean add)
 {
         GHashTable *optlist;
 	SERVER_SETUP_REC *rec;
@@ -113,7 +113,7 @@ static void cmd_server_add(const char *data)
 	int port;
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_OPTIONS,
-			    "server add", &optlist, &addr, &portstr, &password))
+		"server add", &optlist, &addr, &portstr, &password))
 		return;
 
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -124,6 +124,13 @@ static void cmd_server_add(const char *data)
 	rec = server_setup_find(addr, port, chatnet);
 
 	if (rec == NULL) {
+		if (!add) {
+			cmd_params_free(free_arg);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
+				TXT_SETUPSERVER_NOT_FOUND, addr, port);
+			return;
+		}
+
 		rec = create_server_setup(optlist);
 		if (rec == NULL) {
 			cmd_params_free(free_arg);
@@ -131,7 +138,7 @@ static void cmd_server_add(const char *data)
 		}
 		rec->address = g_strdup(addr);
 		rec->port = port;
-	} else {
+	} else if (!add) {
 		value = g_hash_table_lookup(optlist, "port");
 		if (value != NULL && *value != '\0') rec->port = atoi(value);
 
@@ -205,6 +212,16 @@ static void cmd_server_add(const char *data)
 	cmd_params_free(free_arg);
 }
 
+static void cmd_server_add(const char *data)
+{
+	cmd_server_add_modify(data, 1);
+}
+
+static void cmd_server_modify(const char *data)
+{
+	cmd_server_add_modify(data, 0);
+}
+
 /* SYNTAX: SERVER REMOVE <address> [<port>] [<network>] */
 static void cmd_server_remove(const char *data)
 {
@@ -388,6 +405,7 @@ void fe_server_init(void)
 	command_bind("server", NULL, (SIGNAL_FUNC) cmd_server);
 	command_bind("server connect", NULL, (SIGNAL_FUNC) cmd_server_connect);
 	command_bind("server add", NULL, (SIGNAL_FUNC) cmd_server_add);
+	command_bind("server modify", NULL, (SIGNAL_FUNC) cmd_server_modify);
 	command_bind("server remove", NULL, (SIGNAL_FUNC) cmd_server_remove);
 	command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
 	command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
@@ -412,6 +430,7 @@ void fe_server_deinit(void)
 	command_unbind("server", (SIGNAL_FUNC) cmd_server);
 	command_unbind("server connect", (SIGNAL_FUNC) cmd_server_connect);
 	command_unbind("server add", (SIGNAL_FUNC) cmd_server_add);
+	command_unbind("server modify", (SIGNAL_FUNC) cmd_server_modify);
 	command_unbind("server remove", (SIGNAL_FUNC) cmd_server_remove);
 	command_unbind("server", (SIGNAL_FUNC) server_command);
 	command_unbind("disconnect", (SIGNAL_FUNC) server_command);

From 421288cf5066267b60580af2b6ae511c46570bf0 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 18 Jun 2016 17:52:47 +0200
Subject: [PATCH 0384/1650] Add /network modify

---
 src/fe-common/irc/fe-ircnet.c | 47 +++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 4d7037d5..90697bba 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -88,14 +88,7 @@ static void cmd_network_list(void)
 	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_NETWORK_FOOTER);
 }
 
-/* SYNTAX: NETWORK ADD [-nick <nick>] [-user <user>] [-realname <name>]
-                       [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
-                       [-querychans <count>] [-whois <count>] [-msgs <count>]
-                       [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
-                       [-cmdmax <count>] [-sasl_mechanism <mechanism>]
-                       [-sasl_username <username>] [-sasl_password <password>]
-                       <name> */
-static void cmd_network_add(const char *data)
+static void cmd_network_add_modify(const char *data, gboolean add)
 {
 	GHashTable *optlist;
 	char *name, *value;
@@ -103,15 +96,23 @@ static void cmd_network_add(const char *data)
 	IRC_CHATNET_REC *rec;
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS,
-			    "network add", &optlist, &name))
+		"network add", &optlist, &name))
 		return;
+
 	if (*name == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	rec = ircnet_find(name);
 	if (rec == NULL) {
+		if (!add) {
+			cmd_params_free(free_arg);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
+				IRCTXT_NETWORK_NOT_FOUND, name);
+			return;
+		}
+
 		rec = g_new0(IRC_CHATNET_REC, 1);
 		rec->name = g_strdup(name);
-	} else {
+	} else if (!add) {
 		if (g_hash_table_lookup(optlist, "nick")) g_free_and_null(rec->nick);
 		if (g_hash_table_lookup(optlist, "user")) g_free_and_null(rec->username);
 		if (g_hash_table_lookup(optlist, "realname")) g_free_and_null(rec->realname);
@@ -174,6 +175,30 @@ static void cmd_network_add(const char *data)
 	cmd_params_free(free_arg);
 }
 
+/* SYNTAX: NETWORK ADD [-nick <nick>] [-user <user>] [-realname <name>]
+                       [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
+                       [-querychans <count>] [-whois <count>] [-msgs <count>]
+                       [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
+                       [-cmdmax <count>] [-sasl_mechanism <mechanism>]
+                       [-sasl_username <username>] [-sasl_password <password>]
+                       <name> */
+static void cmd_network_add(const char *data)
+{
+	cmd_network_add_modify(data, 1);
+}
+
+/* SYNTAX: NETWORK MODIFY [-nick <nick>] [-user <user>] [-realname <name>]
+                          [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
+                          [-querychans <count>] [-whois <count>] [-msgs <count>]
+                          [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
+                          [-cmdmax <count>] [-sasl_mechanism <mechanism>]
+                          [-sasl_username <username>] [-sasl_password <password>]
+                          <name> */
+static void cmd_network_modify(const char *data)
+{
+	cmd_network_add_modify(data, 0);
+}
+
 /* SYNTAX: NETWORK REMOVE <network> */
 static void cmd_network_remove(const char *data)
 {
@@ -206,6 +231,7 @@ void fe_ircnet_init(void)
 	command_bind("network", NULL, (SIGNAL_FUNC) cmd_network);
 	command_bind("network list", NULL, (SIGNAL_FUNC) cmd_network_list);
 	command_bind("network add", NULL, (SIGNAL_FUNC) cmd_network_add);
+	command_bind("network modify", NULL, (SIGNAL_FUNC) cmd_network_modify);
 	command_bind("network remove", NULL, (SIGNAL_FUNC) cmd_network_remove);
 
 	command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed "
@@ -218,5 +244,6 @@ void fe_ircnet_deinit(void)
 	command_unbind("network", (SIGNAL_FUNC) cmd_network);
 	command_unbind("network list", (SIGNAL_FUNC) cmd_network_list);
 	command_unbind("network add", (SIGNAL_FUNC) cmd_network_add);
+	command_unbind("network modify", (SIGNAL_FUNC) cmd_network_modify);
 	command_unbind("network remove", (SIGNAL_FUNC) cmd_network_remove);
 }

From 1d2113a6387d70caa399cb3311b15203d2d99fda Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 18 Jun 2016 17:53:35 +0200
Subject: [PATCH 0385/1650] Add /server modify SYNTAX

---
 src/fe-common/irc/fe-irc-server.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 2cb99a2f..360fe212 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -50,12 +50,19 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 
 	return target;
 }
+
 /* SYNTAX: SERVER ADD [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
                       [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
                       [-ssl_ciphers <list>]
                       [-auto | -noauto] [-network <network>] [-host <hostname>]
                       [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
                       <address> [<port> [<password>]] */
+/* SYNTAX: SERVER MODIFY [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
+                         [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
+                         [-ssl_ciphers <list>]
+                         [-auto | -noauto] [-network <network>] [-host <hostname>]
+                         [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
+                         <address> [<port> [<password>]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 				GHashTable *optlist)

From 054a98b0ac9bd7f828cd0878687d53e01a3438da Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 18 Jun 2016 17:59:59 +0200
Subject: [PATCH 0386/1650] Add info about MODIFY to help files

---
 docs/help/in/channel.in | 2 ++
 docs/help/in/network.in | 2 ++
 docs/help/in/server.in  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 01bea3c1..86e824c2 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -7,6 +7,7 @@
 
     LIST:       Displays the list of configured channels.
     ADD:        Adds a channel to your configuration.
+    MODIFY:     Modifies a channel in your configuration.
     REMOVE:     Removes a channel from your configuration.
 
     -auto:      Automatically join the channel.
@@ -36,6 +37,7 @@
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
     /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
+    /CHANNEL MODIFY -noauto #irssi Freenode
     /CHANNEL REMOVE #hideout Freenode
 
 %9Special Example:%9
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 2918f6ae..ba08ef69 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -7,6 +7,7 @@
 
     LIST:            Displays the list of configured networks.
     ADD:             Adds a network to your configuration.
+    MODIFY:          Modifies a network in your configuration.
     REMOVE:          Removes a network from your configuration.
 
     -nick:           Specifies the nickname to use.
@@ -59,6 +60,7 @@
     /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
     /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
+    /NETWORK MODIFY -usermode +gi EFnet
     /NETWORK REMOVE Freenode
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index e407b6a9..68a62e2d 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -8,6 +8,7 @@
     LIST:              Displays the list of servers you are connected to.
     CONNECT:           Connects to the given server.
     ADD:               Adds a server to your configuration.
+    MODIFY:            Modifies a server in your configuration.
     REMOVE:            Removes a server from your configuration.
     PURGE:             Purges the commands queued to be sent to the server.
 
@@ -62,6 +63,7 @@
     /SERVER CONNECT +chat.freenode.net
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
     /SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode -noproxy orwell.freenode.net
+    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
     /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
     /SERVER PURGE orwell.freenode.net

From 79e30405e6b22b116d9d2c8ac5af0f4a4dfdc9c7 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 18 Jun 2016 18:02:04 +0200
Subject: [PATCH 0387/1650] Let ADD still work as modify

---
 src/fe-common/core/fe-channels.c | 2 +-
 src/fe-common/core/fe-server.c   | 2 +-
 src/fe-common/irc/fe-ircnet.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index fe8e4807..b79938eb 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -285,7 +285,7 @@ static void cmd_channel_add_modify(const char *data, gboolean add)
 		rec = CHAT_PROTOCOL(chatnetrec)->create_channel_setup();
 		rec->name = g_strdup(channel);
 		rec->chatnet = g_strdup(chatnet);
-	} else if (!add) {
+	} else {
 		if (g_hash_table_lookup(optlist, "bots")) g_free_and_null(rec->botmasks);
 		if (g_hash_table_lookup(optlist, "botcmd")) g_free_and_null(rec->autosendcmd);
 		if (*password != '\0') g_free_and_null(rec->password);
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index f3792b47..e0f05980 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -138,7 +138,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		}
 		rec->address = g_strdup(addr);
 		rec->port = port;
-	} else if (!add) {
+	} else {
 		value = g_hash_table_lookup(optlist, "port");
 		if (value != NULL && *value != '\0') rec->port = atoi(value);
 
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 90697bba..6778cb02 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -112,7 +112,7 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 
 		rec = g_new0(IRC_CHATNET_REC, 1);
 		rec->name = g_strdup(name);
-	} else if (!add) {
+	} else {
 		if (g_hash_table_lookup(optlist, "nick")) g_free_and_null(rec->nick);
 		if (g_hash_table_lookup(optlist, "user")) g_free_and_null(rec->username);
 		if (g_hash_table_lookup(optlist, "realname")) g_free_and_null(rec->realname);

From 4292dbd20250faa4736ab9871bddd97dd7d6c80a Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sat, 18 Jun 2016 18:47:11 +0200
Subject: [PATCH 0388/1650] Add command_set_options for modify commands to
 allow completion

---
 src/fe-common/core/fe-channels.c | 1 +
 src/fe-common/core/fe-server.c   | 1 +
 src/fe-common/irc/fe-ircnet.c    | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index b79938eb..dc7d1ee7 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -649,6 +649,7 @@ void fe_channels_init(void)
 	command_bind("cycle", NULL, (SIGNAL_FUNC) cmd_cycle);
 
 	command_set_options("channel add", "auto noauto -bots -botcmd");
+	command_set_options("channel modify", "auto noauto -bots -botcmd");
 	command_set_options("names", "count ops halfops voices normal");
 	command_set_options("join", "invite window");
 }
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index e0f05980..827b237e 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -410,6 +410,7 @@ void fe_server_init(void)
 	command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
 	command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
 	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options("server modify", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
 
 	signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
 	signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting);
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 6778cb02..e82fa27f 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -236,6 +236,8 @@ void fe_ircnet_init(void)
 
 	command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed "
 			    "-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
+	command_set_options("network modify", "-kicks -msgs -modes -whois -cmdspeed "
+			    "-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
 }
 
 void fe_ircnet_deinit(void)

From 2bb913f0c128dbb37737b7c2d7af99ed70801993 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sun, 19 Jun 2016 16:35:13 +0200
Subject: [PATCH 0389/1650] Fix minor nits

---
 src/fe-common/core/fe-channels.c  | 10 ++++------
 src/fe-common/core/fe-server.c    |  4 ++--
 src/fe-common/irc/fe-irc-server.c | 18 ++++++------------
 src/fe-common/irc/fe-ircnet.c     | 25 +++++++++----------------
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index dc7d1ee7..2802e933 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -305,18 +305,16 @@ static void cmd_channel_add_modify(const char *data, gboolean add)
 	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: CHANNEL ADD [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
-                       <channel> <network> [<password>] */
+/* SYNTAX: CHANNEL ADD|MODIFY [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
+                              <channel> <network> [<password>] */
 static void cmd_channel_add(const char *data)
 {
-	cmd_channel_add_modify(data, 1);
+	cmd_channel_add_modify(data, TRUE);
 }
 
-/* SYNTAX: CHANNEL MODIFY [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
-                          <channel> <network> [<password>] */
 static void cmd_channel_modify(const char *data)
 {
-	cmd_channel_add_modify(data, 0);
+	cmd_channel_add_modify(data, FALSE);
 }
 
 /* SYNTAX: CHANNEL REMOVE <channel> <network> */
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 827b237e..d6f2841b 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -214,12 +214,12 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 static void cmd_server_add(const char *data)
 {
-	cmd_server_add_modify(data, 1);
+	cmd_server_add_modify(data, TRUE);
 }
 
 static void cmd_server_modify(const char *data)
 {
-	cmd_server_add_modify(data, 0);
+	cmd_server_add_modify(data, FALSE);
 }
 
 /* SYNTAX: SERVER REMOVE <address> [<port>] [<network>] */
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 360fe212..2e22d6f2 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -51,18 +51,12 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 	return target;
 }
 
-/* SYNTAX: SERVER ADD [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
-                      [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
-                      [-ssl_ciphers <list>]
-                      [-auto | -noauto] [-network <network>] [-host <hostname>]
-                      [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
-                      <address> [<port> [<password>]] */
-/* SYNTAX: SERVER MODIFY [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
-                         [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
-                         [-ssl_ciphers <list>]
-                         [-auto | -noauto] [-network <network>] [-host <hostname>]
-                         [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
-                         <address> [<port> [<password>]] */
+/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
+                             [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
+                             [-ssl_ciphers <list>]
+                             [-auto | -noauto] [-network <network>] [-host <hostname>]
+                             [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
+                             <address> [<port> [<password>]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 				GHashTable *optlist)
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index e82fa27f..b2605379 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -175,28 +175,21 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: NETWORK ADD [-nick <nick>] [-user <user>] [-realname <name>]
-                       [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
-                       [-querychans <count>] [-whois <count>] [-msgs <count>]
-                       [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
-                       [-cmdmax <count>] [-sasl_mechanism <mechanism>]
-                       [-sasl_username <username>] [-sasl_password <password>]
-                       <name> */
+/* SYNTAX: NETWORK ADD|MODIFY [-nick <nick>] [-user <user>] [-realname <name>]
+                              [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
+                              [-querychans <count>] [-whois <count>] [-msgs <count>]
+                              [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
+                              [-cmdmax <count>] [-sasl_mechanism <mechanism>]
+                              [-sasl_username <username>] [-sasl_password <password>]
+                              <name> */
 static void cmd_network_add(const char *data)
 {
-	cmd_network_add_modify(data, 1);
+	cmd_network_add_modify(data, TRUE);
 }
 
-/* SYNTAX: NETWORK MODIFY [-nick <nick>] [-user <user>] [-realname <name>]
-                          [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
-                          [-querychans <count>] [-whois <count>] [-msgs <count>]
-                          [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
-                          [-cmdmax <count>] [-sasl_mechanism <mechanism>]
-                          [-sasl_username <username>] [-sasl_password <password>]
-                          <name> */
 static void cmd_network_modify(const char *data)
 {
-	cmd_network_add_modify(data, 0);
+	cmd_network_add_modify(data, FALSE);
 }
 
 /* SYNTAX: NETWORK REMOVE <network> */

From a4223a3b2e5f5689c61633542f05e70c28226717 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Tue, 21 Jun 2016 22:05:21 +0200
Subject: [PATCH 0390/1650] use TRUE/FALSE in if statements for gboolean

---
 src/fe-common/core/fe-channels.c | 2 +-
 src/fe-common/core/fe-server.c   | 2 +-
 src/fe-common/irc/fe-ircnet.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 2802e933..532b1bf8 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -275,7 +275,7 @@ static void cmd_channel_add_modify(const char *data, gboolean add)
 
 	rec = channel_setup_find(channel, chatnet);
 	if (rec == NULL) {
-		if (!add) {
+		if (add == FALSE) {
 			cmd_params_free(free_arg);
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				TXT_CHANSETUP_NOT_FOUND, channel, chatnet);
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index d6f2841b..468cb707 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -124,7 +124,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	rec = server_setup_find(addr, port, chatnet);
 
 	if (rec == NULL) {
-		if (!add) {
+		if (add == FALSE) {
 			cmd_params_free(free_arg);
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				TXT_SETUPSERVER_NOT_FOUND, addr, port);
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index b2605379..b70a9ea7 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -103,7 +103,7 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 
 	rec = ircnet_find(name);
 	if (rec == NULL) {
-		if (!add) {
+		if (add == FALSE) {
 			cmd_params_free(free_arg);
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				IRCTXT_NETWORK_NOT_FOUND, name);

From c2c32e39559e4081ea2ebfecbfc67d9553a9ad12 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 25 Jun 2016 16:06:50 +0200
Subject: [PATCH 0391/1650] check for NULL in statusbar_more_updated

fixes crash due to invalid access of active_win members when the more
indicator is triggered without an active window
---
 src/fe-text/statusbar-items.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index e3e0c2a6..0db4f63a 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -289,6 +289,10 @@ static void sig_statusbar_more_updated(void)
 {
 	int visible;
 
+	 /* no active window, for example during /window hide */
+	if (active_win == NULL)
+		return;
+
         visible = g_slist_find(more_visible, WINDOW_MAIN(active_win)) != NULL;
 	if (WINDOW_GUI(active_win)->view->more_text != visible)
                 statusbar_items_redraw("more");

From ed06e43ec816eb4b9f1a736ecba6802a586887a8 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 2 Apr 2016 16:14:01 +0200
Subject: [PATCH 0392/1650] Some small adjustments to the netsplit code.

By making the signal handler hooked to the "print starting" event
smarter we can avoid dumping the whole netsplit stats for every
server/channel when a message arrives.

Issue #420
---
 src/fe-common/irc/fe-netjoin.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index f5cb081e..6e54b313 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -164,7 +164,7 @@ static void print_channel_netjoins(char *channel, TEMP_PRINT_REC *rec,
 	g_free(channel);
 }
 
-static void print_netjoins(NETJOIN_SERVER_REC *server)
+static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
 {
 	TEMP_PRINT_REC *temp;
 	GHashTable *channels;
@@ -186,6 +186,9 @@ static void print_netjoins(NETJOIN_SERVER_REC *server)
 			char *channel = rec->now_channels->data;
 			char *realchannel = channel + 1;
 
+			if (channel != NULL && strcasecmp(realchannel, channel) != 0)
+				continue;
+
 			temp = g_hash_table_lookup(channels, realchannel);
 			if (temp == NULL) {
 				temp = g_new0(TEMP_PRINT_REC, 1);
@@ -235,20 +238,31 @@ static void print_netjoins(NETJOIN_SERVER_REC *server)
 
 /* something is going to be printed to screen, print our current netsplit
    message before it. */
-static void sig_print_starting(void)
+static void sig_print_starting(TEXT_DEST_REC *dest)
 {
-	GSList *tmp, *next;
+	NETJOIN_SERVER_REC *rec;
 
 	if (printing_joins)
 		return;
 
-	for (tmp = joinservers; tmp != NULL; tmp = next) {
-		NETJOIN_SERVER_REC *server = tmp->data;
+	/* Do not dump the netsplit stats unless:
+	 * a) This is an IRC server
+	 * b) The message level is high enough
+	 * b) The message belongs to a channel
+	 * c) There's a NETJOIN record for this server
+	 */
+	if (!IS_IRC_SERVER(dest->server))
+		return;
 
-		next = tmp->next;
-		if (server->netjoins != NULL)
-			print_netjoins(server);
-	}
+	if (dest->level != MSGLEVEL_MSGS)
+		return;
+
+	if (!server_ischannel(dest->server, dest->target))
+		return;
+
+	rec = netjoin_find_server(IRC_SERVER(dest->server));
+	if (rec != NULL && rec->netjoins != NULL)
+		print_netjoins(rec, dest->target);
 }
 
 static int sig_check_netjoins(void)
@@ -272,7 +286,7 @@ static int sig_check_netjoins(void)
 		}
 
                 if (server->netjoins != NULL)
-			print_netjoins(server);
+			print_netjoins(server, NULL);
 	}
 
 	/* now remove all netjoins which haven't had any new joins

From 8f5e2005516023f5c96cf95ac5e9f917bda33172 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 19 Apr 2016 15:29:16 +0200
Subject: [PATCH 0393/1650] Avoid entering an endless loop while traversing the
 channel list

---
 src/fe-common/irc/fe-netjoin.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 6e54b313..807a4345 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -168,7 +168,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
 {
 	TEMP_PRINT_REC *temp;
 	GHashTable *channels;
-	GSList *tmp, *next, *old;
+	GSList *tmp, *tmp2, *next, *next2, *old;
 
 	g_return_if_fail(server != NULL);
 
@@ -181,11 +181,14 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
 	for (tmp = server->netjoins; tmp != NULL; tmp = next) {
 		NETJOIN_REC *rec = tmp->data;
 
-		next = tmp->next;
-		while (rec->now_channels != NULL) {
-			char *channel = rec->now_channels->data;
+		next = g_slist_next(tmp);
+
+		for (tmp2 = rec->now_channels; tmp2 != NULL; tmp2 = next2) {
+			char *channel = tmp2->data;
 			char *realchannel = channel + 1;
 
+			next2 = g_slist_next(tmp2);
+
 			if (channel != NULL && strcasecmp(realchannel, channel) != 0)
 				continue;
 
@@ -217,8 +220,8 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
 				g_free(data);
 			}
 
-			rec->now_channels =
-				g_slist_remove(rec->now_channels, channel);
+			/* drop tmp2 from the list */
+			rec->now_channels = g_slist_delete_link(rec->now_channels, tmp2);
 			g_free(channel);
 		}
 

From c0f66c95ff00bdc22155a8ac53d887a9c1bbc90f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 26 Jun 2016 21:44:40 +0200
Subject: [PATCH 0394/1650] Such draft. Very wow.

---
 src/fe-common/irc/fe-netjoin.c  |  8 +-------
 src/fe-common/irc/fe-netsplit.c | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 807a4345..22ca642c 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -248,16 +248,10 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
 	if (printing_joins)
 		return;
 
-	/* Do not dump the netsplit stats unless:
-	 * a) This is an IRC server
-	 * b) The message level is high enough
-	 * b) The message belongs to a channel
-	 * c) There's a NETJOIN record for this server
-	 */
 	if (!IS_IRC_SERVER(dest->server))
 		return;
 
-	if (dest->level != MSGLEVEL_MSGS)
+	if (dest->level != MSGLEVEL_PUBLIC)
 		return;
 
 	if (!server_ischannel(dest->server, dest->target))
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index 3eb30796..aa05639b 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -142,7 +142,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split,
 	}
 }
 
-static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec)
+static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, const char *channel)
 {
 	GString *destservers;
 	char *sourceserver;
@@ -168,6 +168,9 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec)
 	for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) {
 		TEMP_SPLIT_CHAN_REC *chan = tmp->data;
 
+		if (channel != NULL && strcasecmp(channel, chan->name) != 0)
+			continue;
+
 		g_string_truncate(chan->nicks, chan->nicks->len-2);
 
 		if (netsplit_max_nicks > 0 &&
@@ -193,7 +196,7 @@ static void temp_split_chan_free(TEMP_SPLIT_CHAN_REC *rec)
 	g_free(rec);
 }
 
-static void print_splits(IRC_SERVER_REC *server)
+static void print_splits(IRC_SERVER_REC *server, const char *channel)
 {
 	TEMP_SPLIT_REC temp;
 	GSList *servers;
@@ -212,7 +215,7 @@ static void print_splits(IRC_SERVER_REC *server)
 
 		g_hash_table_foreach(server->splits,
 				     (GHFunc) get_server_splits, &temp);
-		print_server_splits(server, &temp);
+		print_server_splits(server, &temp, channel);
 
 		g_slist_foreach(temp.channels,
 				(GFunc) temp_split_chan_free, NULL);
@@ -233,25 +236,31 @@ static int check_server_splits(IRC_SERVER_REC *server)
 	if (time(NULL)-last < SPLIT_WAIT_TIME)
 		return FALSE;
 
-	print_splits(server);
+	print_splits(server, NULL);
         return TRUE;
 }
 
 /* something is going to be printed to screen, print our current netsplit
    message before it. */
-static void sig_print_starting(void)
+static void sig_print_starting(TEXT_DEST_REC *dest)
 {
-	GSList *tmp;
+	IRC_SERVER_REC *rec;
 
 	if (printing_splits)
 		return;
 
-	for (tmp = servers; tmp != NULL; tmp = tmp->next) {
-		IRC_SERVER_REC *rec = tmp->data;
+	if (IS_IRC_SERVER(dest->server) == FALSE)
+		return;
 
-		if (IS_IRC_SERVER(rec) && rec->split_servers != NULL)
-			print_splits(rec);
-	}
+	if (dest->level != MSGLEVEL_PUBLIC)
+		return;
+
+	if (server_ischannel(dest->server, dest->target) == FALSE)
+		return;
+
+	rec = IRC_SERVER(dest->server);
+	if (rec->split_servers != NULL)
+		print_splits(rec, dest->target);
 }
 
 static int sig_check_splits(void)

From 9559a8ead9048433783a453ca47c63514a39b205 Mon Sep 17 00:00:00 2001
From: Tom Feist <shabble@metavore.org>
Date: Tue, 12 Jul 2016 12:42:15 +0200
Subject: [PATCH 0395/1650] Allow Irssi::signal_remove to work properly with
 coderefs

---
 src/perl/perl-signals.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 007f7ad5..8f993660 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -433,8 +433,9 @@ static void perl_signal_remove_list_one(GSList **siglist, PERL_SIGNAL_REC *rec)
 }
 
 #define sv_func_cmp(f1, f2) \
-	(f1 == f2 || (SvPOK(f1) && SvPOK(f2) && \
-		g_strcmp0(SvPV_nolen(f1), SvPV_nolen(f2)) == 0))
+	((SvROK(f1) && SvROK(f2) && SvRV(f1) == SvRV(f2)) || \
+	 (SvPOK(f1) && SvPOK(f2) && \
+	  g_strcmp0(SvPV_nolen(f1), SvPV_nolen(f2)) == 0))
 
 static void perl_signal_remove_list(GSList **list, SV *func)
 {

From 0fe81cae83f1b981e6544be6fcaa924f2ce7caad Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 12 Jul 2016 15:46:36 +0200
Subject: [PATCH 0396/1650] Correct the prototype for the 'message private'
 signal.

---
 docs/signals.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 8b71fd95..5e03d901 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -260,7 +260,7 @@ fe-exec.c:
 
 fe-messages.c:
  "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
- "message private", SERVER_REC, char *msg, char *nick, char *address
+ "message private", SERVER_REC, char *msg, char *nick, char *address, char *target
  "message own_public", SERVER_REC, char *msg, char *target
  "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
  "message join", SERVER_REC, char *channel, char *nick, char *address

From dab3246db91a6f17a7da192c10f9b369fa057ef5 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 12 Jul 2016 16:35:43 +0200
Subject: [PATCH 0397/1650] Fix the tab completion for paths starting with ./

---
 src/fe-common/core/completion.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 46fd9db7..76dfbb79 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -345,7 +345,9 @@ GList *filename_complete(const char *path, const char *default_path)
 			    (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))
 				continue; /* skip . and .. */
 
-			if (basename[0] != '.')
+			/* Skip the dotfiles unless the user explicitly asked us
+			 * to do so. Basename might be './', beware of that */
+			if (basename[0] != '.' || basename[1] == '\0')
 				continue;
 		}
 

From bd4189907eceed6a2c3252c7099985f975fc1654 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 12 Jul 2016 17:38:05 +0200
Subject: [PATCH 0398/1650] Minor cosmetic fix in /unignore error message.

Reported here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577202
---
 src/fe-common/core/fe-ignore.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index a809ac91..52b11e6b 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -215,7 +215,7 @@ static void cmd_unignore(const char *data)
 {
 	IGNORE_REC *rec;
 	GSList *tmp;
-        char *mask;
+        char *mask, *mask_orig;
 	void *free_arg;
 
 	if (!cmd_get_params(data, &free_arg, 1, &mask))
@@ -224,6 +224,10 @@ static void cmd_unignore(const char *data)
 	if (*mask == '\0')
                 cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
+	/* Save the mask string here since it might be modified in the code
+	 * below and we need it to print meaningful error messages. */
+	mask_orig = mask;
+
 	if (is_numeric(mask, ' ')) {
 		/* with index number */
 		tmp = g_slist_nth(ignores, atoi(mask)-1);
@@ -248,7 +252,7 @@ static void cmd_unignore(const char *data)
 		ignore_update_rec(rec);
 	} else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-			    TXT_IGNORE_NOT_FOUND, mask);
+			    TXT_IGNORE_NOT_FOUND, mask_orig);
 	}
 	cmd_params_free(free_arg);
 }

From ccf1ca124b780d18caad88d3c460d066c12e3eec Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@gmail.com>
Date: Sun, 17 Jul 2016 17:28:21 +0200
Subject: [PATCH 0399/1650] Wrong order in the arguments in /hilight example,
 -mask doesn't take a parameter

---
 docs/help/in/hilight.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/hilight.in b/docs/help/in/hilight.in
index 2f396430..0726e5e7 100644
--- a/docs/help/in/hilight.in
+++ b/docs/help/in/hilight.in
@@ -32,7 +32,7 @@
     /HILIGHT
     /HILIGHT mike
     /HILIGHT -regexp mi+ke+
-    /HILIGHT -mask bob!*@*.irssi.org -color %%G
+    /HILIGHT -mask -color %%G bob!*@*.irssi.org
     /HILIGHT -full -color %%G -actcolor %%Y redbull
 
 %9References:%9

From 9ee480377055c04ae687c08d17f2c6b191d34db0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 30 Mar 2016 10:14:57 +0200
Subject: [PATCH 0400/1650] remove curses terminal and ncurses macro

---
 INSTALL                     |  10 +-
 NEWS                        |   1 +
 configure.ac                |  81 +---
 m4/curses.m4                | 298 ---------------
 src/fe-text/Makefile.am     |  22 +-
 src/fe-text/term-curses.c   | 415 --------------------
 src/fe-text/terminfo-core.c |  23 --
 src/fe-text/tparm.c         | 740 ------------------------------------
 src/perl/Makefile.am        |   2 +-
 src/perl/Makefile_silent.pm |   2 +-
 10 files changed, 19 insertions(+), 1575 deletions(-)
 delete mode 100644 m4/curses.m4
 delete mode 100644 src/fe-text/term-curses.c
 delete mode 100644 src/fe-text/tparm.c

diff --git a/INSTALL b/INSTALL
index 4b20c1ba..4c6f5681 100644
--- a/INSTALL
+++ b/INSTALL
@@ -59,17 +59,11 @@ configure options
 
   Build without text frontend
 
-If ncurses is installed in a non-standard path you can specify it with
---with-ncurses=/path. If anything else is in non-standard path, you can just
-give the paths in CPPFLAGS and LIBS environment variable, eg.:
+If anything is in non-standard path, you can just give the paths in
+CPPFLAGS and LIBS environment variable, eg.:
 
   CPPFLAGS=-I/opt/openssl/include LDFLAGS=-L/opt/openssl/lib ./configure
 
-Irssi doesn't really need curses anymore, by default it uses
-terminfo/termcap directly. The functions for using terminfo/termcap
-however are usually only in curses library, some systems use libtermcap
-as well. If you want to use only curses calls for some reason, use
---without-terminfo.
 
 
  Perl problems
diff --git a/NEWS b/NEWS
index 5312aef5..6666400d 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ v0.8.20-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
+	- Removed broken support for curses.
 
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 	- Fixed regression when joining and parting channels on IRCnet (#435)
diff --git a/configure.ac b/configure.ac
index 04e2b0b3..653dfc99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,15 +61,6 @@ AC_ARG_WITH(proxy,
 	fi,
 	want_irssiproxy=no)
 
-AC_ARG_WITH(terminfo,
-[  --without-terminfo      Use curses backend instead of terminfo],
-	if test x$withval = xno; then
-		want_terminfo=no
-	else
-		want_terminfo=yes
-	fi,
-	want_terminfo=yes)
-
 AC_ARG_WITH(modules,
 [  --with-modules          Specify what modules to build in binary],
 	if test x$withval != xyes -a x$withval != xno; then
@@ -314,45 +305,19 @@ dnl **
 dnl ** curses checks
 dnl **
 
-if test "x$want_textui" = "xyes"; then
-	AC_CHECK_CURSES
+if test "x$want_textui" != "xno"; then
 
-	TEXTUI_LIBS="$CURSES_LIBS"
-	if test "x$has_curses" = "xtrue"; then
-		old_libs=$LIBS
-		LIBS="$LIBS $CURSES_LIBS"
-		if test $want_terminfo = no; then
-			AC_CHECK_FUNC(use_default_colors, AC_DEFINE(HAVE_NCURSES_USE_DEFAULT_COLORS))
-			AC_CHECK_FUNC(idcok, AC_DEFINE(HAVE_CURSES_IDCOK))
-			AC_CHECK_FUNC(resizeterm, AC_DEFINE(HAVE_CURSES_RESIZETERM))
-			AC_CHECK_FUNC(wresize, AC_DEFINE(HAVE_CURSES_WRESIZE))
-		fi
-		AC_CHECK_FUNC(setupterm,, [
-			want_termcap=yes
-		])
-		LIBS=$old_libs
-	else
-		AC_CHECK_LIB(tinfo, setupterm, [
-		  TEXTUI_LIBS="-ltinfo"
-		  want_terminfo=yes
-		], AC_CHECK_LIB(termlib, tgetent, [
-		  TEXTUI_LIBS="-ltermlib"
-		  want_termcap=yes
-		], AC_CHECK_LIB(termcap, tgetent, [
-		  TEXTUI_LIBS="-ltermcap"
-		  want_termcap=yes
-		], [
-		  AC_ERROR(Terminfo/termcap not found - install libncurses-dev or ncurses-devel package)
-		  want_textui=no
-		])))
-	fi
+	TEXTUI_NO_LIBS="$LIBS"
+	LIBS=
+	AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses], [want_textui=yes], [
+		AC_ERROR(Terminfo not found - install libncurses-dev or ncurses-devel package)
+		want_textui="no, Terminfo not found"
+	])
+
+	TEXTUI_LIBS="$LIBS"
 	AC_SUBST(TEXTUI_LIBS)
+	LIBS="$TEXTUI_NO_LIBS"
 
-	if test "x$want_termcap" = "xyes"; then
-		AC_CHECK_FUNC(tparm,, need_tparm=yes)
-	else
-		AC_DEFINE(HAVE_TERMINFO)
-	fi
 fi
 
 dnl **
@@ -516,8 +481,6 @@ AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
 AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
-AM_CONDITIONAL(NEED_TPARM, test "$need_tparm" = "yes")
-AM_CONDITIONAL(USE_CURSES, test "$want_terminfo" != "yes" -a "$want_termcap" != "yes")
 
 # move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
 PROG_LIBS=$LIBS
@@ -614,30 +577,19 @@ if test "x$want_dane" = "xyes"; then
 	fi
 fi
 
-if test "x$want_truecolor" = "xyes" -a "x$want_termcap" != "xyes" -a "x$want_terminfo" = "xyes" ; then
+if test "x$want_truecolor" = "xyes"; then
 	AC_DEFINE([TERM_TRUECOLOR], [], [true color support in terminal])
 else
 	want_truecolor=no
 fi
 
-AH_TEMPLATE(HAS_CURSES, [macros/curses checks])
-AH_TEMPLATE(HAVE_CURSES_IDCOK)
-AH_TEMPLATE(HAVE_CURSES_RESIZETERM)
-AH_TEMPLATE(HAVE_CURSES_WRESIZE)
 AH_TEMPLATE(HAVE_GMODULE)
-AH_TEMPLATE(HAVE_NCURSES_USE_DEFAULT_COLORS, [our own curses checks])
 AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
 AH_TEMPLATE(HAVE_STATIC_PERL)
-AH_TEMPLATE(HAVE_TERMINFO, [terminfo/termcap])
-AH_TEMPLATE(NO_COLOR_CURSES)
 AH_TEMPLATE(PRIuUOFF_T, [printf()-format for uoff_t, eg. "u" or "lu" or "llu"])
-AH_TEMPLATE(SCO_FLAVOR)
 AH_TEMPLATE(UOFF_T_INT, [What type should be used for uoff_t])
 AH_TEMPLATE(UOFF_T_LONG)
 AH_TEMPLATE(UOFF_T_LONG_LONG)
-AH_TEMPLATE(USE_NCURSES)
-AH_TEMPLATE(USE_SUNOS_CURSES)
-AH_TEMPLATE(USE_SYSV_CURSES)
 
 AC_CONFIG_FILES([
 Makefile
@@ -691,16 +643,7 @@ fi
 
 echo
 
-if test "x$want_textui" = "xno"; then
-	text=no
-elif test "x$want_termcap" = "xyes"; then
-	text="yes, using termcap"
-elif test "x$want_terminfo" = "xyes"; then
-	text="yes, using terminfo"
-else
-	text="yes, using curses"
-fi
-echo "Building text frontend ........... : $text"
+echo "Building text frontend ........... : $want_textui"
 echo "Building irssi bot ............... : $want_irssibot"
 echo "Building irssi proxy ............. : $want_irssiproxy"
 if test "x$have_gmodule" = "xyes"; then
diff --git a/m4/curses.m4 b/m4/curses.m4
deleted file mode 100644
index 41c0e6c8..00000000
--- a/m4/curses.m4
+++ /dev/null
@@ -1,298 +0,0 @@
-dnl Curses detection: Munged from Midnight Commander's configure.in
-dnl
-dnl What it does:
-dnl =============
-dnl
-dnl - Determine which version of curses is installed on your system
-dnl   and set the -I/-L/-l compiler entries and add a few preprocessor
-dnl   symbols
-dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that
-dnl   @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
-dnl   Makefile.in's
-dnl - Modify the following configure variables (these are the only
-dnl   curses.m4 variables you can access from within configure.in)
-dnl   CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
-dnl                       an ncurses.h that's been renamed to curses.h
-dnl                       is found.
-dnl   CURSES_LIBS       - sets -L and -l's appropriately
-dnl   CFLAGS            - if --with-sco, add -D_SVID3
-dnl   has_curses        - exports result of tests to rest of configure
-dnl
-dnl Usage:
-dnl ======
-dnl 1) Add lines indicated below to acconfig.h
-dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.in
-dnl 3) Instead of #include <curses.h> you should use the following to
-dnl    properly locate ncurses or curses header file
-dnl
-dnl    #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-dnl    #include <ncurses.h>
-dnl    #else
-dnl    #include <curses.h>
-dnl    #endif
-dnl
-dnl 4) Make sure to add @CURSES_INCLUDEDIR@ to your preprocessor flags
-dnl 5) Make sure to add @CURSES_LIBS@ to your linker flags or LIBS
-dnl
-dnl Notes with automake:
-dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from
-dnl   configure.in
-dnl - your Makefile.am can look something like this
-dnl   -----------------------------------------------
-dnl   INCLUDES= blah blah blah $(CURSES_INCLUDEDIR)
-dnl   if HAS_CURSES
-dnl   CURSES_TARGETS=name_of_curses_prog
-dnl   endif
-dnl   bin_PROGRAMS = other_programs $(CURSES_TARGETS)
-dnl   other_programs_SOURCES = blah blah blah
-dnl   name_of_curses_prog_SOURCES = blah blah blah
-dnl   other_programs_LDADD = blah
-dnl   name_of_curses_prog_LDADD = blah $(CURSES_LIBS)
-dnl   -----------------------------------------------
-dnl
-dnl
-dnl The following lines should be added to acconfig.h:
-dnl ==================================================
-dnl
-dnl /*=== Curses version detection defines ===*/
-dnl /* Found some version of curses that we're going to use */
-dnl #undef HAS_CURSES
-dnl   
-dnl /* Use SunOS SysV curses? */
-dnl #undef USE_SUNOS_CURSES
-dnl
-dnl /* Use old BSD curses - not used right now */
-dnl #undef USE_BSD_CURSES
-dnl
-dnl /* Use SystemV curses? */
-dnl #undef USE_SYSV_CURSES
-dnl
-dnl /* Use Ncurses? */
-dnl #undef USE_NCURSES
-dnl
-dnl /* If you Curses does not have color define this one */
-dnl #undef NO_COLOR_CURSES
-dnl
-dnl /* Define if you want to turn on SCO-specific code */
-dnl #undef SCO_FLAVOR
-dnl
-dnl /* Set to reflect version of ncurses *
-dnl  *   0 = version 1.*
-dnl  *   1 = version 1.9.9g
-dnl  *   2 = version 4.0/4.1 */
-dnl #undef NCURSES_970530
-dnl
-dnl /*=== End new stuff for acconfig.h ===*/
-dnl
-
-
-AC_DEFUN([AC_CHECK_CURSES],[
-	search_ncurses=true
-	screen_manager=""
-	has_curses=false
-
-	CFLAGS=${CFLAGS--O}
-
-	AC_SUBST(CURSES_LIBS)
-	AC_SUBST(CURSES_INCLUDEDIR)
-
-	AC_ARG_WITH(sco,
-	  [  --with-sco              Use this to turn on SCO-specific code],[
-	  if test x$withval = xyes; then
-		AC_DEFINE(SCO_FLAVOR)
-		CFLAGS="$CFLAGS -D_SVID3"
-	  fi
-	])
-
-	AC_ARG_WITH(sunos-curses,
-	  [  --with-sunos-curses     Used to force SunOS 4.x curses],[
-	  if test x$withval = xyes; then
-		AC_USE_SUNOS_CURSES
-	  fi
-	])
-
-	AC_ARG_WITH(osf1-curses,
-	  [  --with-osf1-curses      Used to force OSF/1 curses],[
-	  if test x$withval = xyes; then
-		AC_USE_OSF1_CURSES
-	  fi
-	])
-
-	AC_ARG_WITH(vcurses,
-	  [[  --with-vcurses[=incdir] Used to force SysV curses]],
-	  if test x$withval != xyes; then
-		CURSES_INCLUDEDIR="-I$withval"
-	  fi
-	  AC_USE_SYSV_CURSES
-	)
-
-	AC_ARG_WITH(ncurses,
-	  [[  --with-ncurses[=dir]    Compile with ncurses/locate base dir]],
-	  if test x$withval = xno ; then
-		search_ncurses=false
-	  elif test x$withval != xyes ; then
-		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, [ncurses on $withval/include])
-	  fi
-	)
-
-	if $search_ncurses
-	then
-		AC_SEARCH_NCURSES()
-	fi
-])
-
-
-AC_DEFUN([AC_USE_SUNOS_CURSES], [
-	search_ncurses=false
-	screen_manager="SunOS 4.x /usr/5include curses"
-	AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses)
-	AC_DEFINE(USE_SUNOS_CURSES)
-	AC_DEFINE(HAS_CURSES)
-	has_curses=true
-	AC_DEFINE(NO_COLOR_CURSES)
-	AC_DEFINE(USE_SYSV_CURSES)
-	CURSES_INCLUDEDIR="-I/usr/5include"
-	CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
-	AC_MSG_RESULT(Please note that some screen refreshs may fail)
-])
-
-AC_DEFUN([AC_USE_OSF1_CURSES], [
-       AC_MSG_RESULT(Using OSF1 curses)
-       search_ncurses=false
-       screen_manager="OSF1 curses"
-       AC_DEFINE(HAS_CURSES)
-       has_curses=true
-       AC_DEFINE(NO_COLOR_CURSES)
-       AC_DEFINE(USE_SYSV_CURSES)
-       CURSES_LIBS="-lcurses"
-])
-
-AC_DEFUN([AC_USE_SYSV_CURSES], [
-	AC_MSG_RESULT(Using SysV curses)
-	AC_DEFINE(HAS_CURSES)
-	has_curses=true
-	AC_DEFINE(USE_SYSV_CURSES)
-	search_ncurses=false
-	screen_manager="SysV/curses"
-	CURSES_LIBS="-lcurses"
-])
-
-dnl AC_ARG_WITH(bsd-curses,
-dnl [--with-bsd-curses         Used to compile with bsd curses, not very fancy],
-dnl 	search_ncurses=false
-dnl	screen_manager="Ultrix/cursesX"
-dnl	if test $system = ULTRIX
-dnl	then
-dnl	    THIS_CURSES=cursesX
-dnl        else
-dnl	    THIS_CURSES=curses
-dnl	fi
-dnl
-dnl	CURSES_LIBS="-l$THIS_CURSES -ltermcap"
-dnl	AC_DEFINE(HAS_CURSES)
-dnl	has_curses=true
-dnl	AC_DEFINE(USE_BSD_CURSES)
-dnl	AC_MSG_RESULT(Please note that some screen refreshs may fail)
-dnl	AC_WARN(Use of the bsdcurses extension has some)
-dnl	AC_WARN(display/input problems.)
-dnl	AC_WARN(Reconsider using xcurses)
-dnl)
-
-
-dnl
-dnl Parameters: directory filename curses_LIBS curses_INCLUDEDIR nicename
-dnl
-AC_DEFUN([AC_NCURSES], [
-    if $search_ncurses
-    then
-        if test -f $1/$2
-	then
-	    AC_MSG_RESULT(Found ncurses on $1/$2)
-
-	    CURSES_LIBS="$3"
-	    AC_CHECK_LIB(ncurses, initscr, [
-	        true;
-	    ], [
-                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lcurses/g'`
-		AC_CHECK_LIB(curses, initscr, [
-			CURSES_LIBS="$CHECKLIBS"
-		],, $CHECKLIBS)
-	    ], $CURSES_LIBS)
-	    CURSES_INCLUDEDIR="$4"
-	    search_ncurses=false
-	    screen_manager="$5"
-            AC_DEFINE(HAS_CURSES)
-            has_curses=true
-	    has_ncurses=true
-	    AC_DEFINE(USE_NCURSES)
-	fi
-    fi
-])
-
-AC_DEFUN([AC_SEARCH_NCURSES], [
-    AC_CHECKING("location of ncurses.h file")
-
-    AC_NCURSES(/usr/include, ncurses.h, -lncurses,,
-	       [ncurses in /usr/include])
-    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,
-	       [ncurses in /usr/include/ncurses])
-    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include,
-	       [ncurses in /usr/local/include])
-    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses,
-	       [ncurses in /usr/local/include/ncurses])
-    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES,
-	       [renamed ncurses in /usr/local/include/ncurses])
-    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES,
-	       [renamed ncurses in /usr/include/ncurses])
-
-    dnl
-    dnl We couldn't find ncurses, try SysV curses
-    dnl
-    if $search_ncurses
-    then
-        AC_EGREP_HEADER(init_color, /usr/include/curses.h,
-	    AC_USE_SYSV_CURSES)
-	AC_EGREP_CPP(USE_NCURSES,[
-#include <curses.h>
-#ifdef __NCURSES_H
-#undef USE_NCURSES
-USE_NCURSES
-#endif
-],[
-	CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES"
-        AC_DEFINE(HAS_CURSES)
-	has_curses=true
-	has_ncurses=true
-        AC_DEFINE(USE_NCURSES)
-        search_ncurses=false
-        screen_manager="ncurses installed as curses"
-])
-    fi
-
-    dnl
-    dnl Try SunOS 4.x /usr/5{lib,include} ncurses
-    dnl The flags USE_SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES
-    dnl should be replaced by a more fine grained selection routine
-    dnl
-    if $search_ncurses
-    then
-	if test -f /usr/5include/curses.h
-	then
-	    AC_USE_SUNOS_CURSES
-        fi
-    fi
-
-    dnl use whatever curses there happens to be
-    if $search_ncurses
-    then
-	if test -f /usr/include/curses.h
-	then
-	  CURSES_LIBS="-lcurses"
-	  AC_DEFINE(HAS_CURSES)
-	  has_curses=true
-	  search_ncurses=false
-	  screen_manager="curses"
-	fi
-    fi
-])
-
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index b9538e60..847df150 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/core/ \
 	-I$(top_srcdir)/src/fe-common/core/ \
-	$(GLIB_CFLAGS) \
-	$(CURSES_INCLUDEDIR)
+	$(GLIB_CFLAGS)
 
 irssi_DEPENDENCIES = \
 	@COMMON_LIBS@ \
@@ -22,25 +21,11 @@ irssi_LDADD = \
 	@PROG_LIBS@ \
 	@TEXTUI_LIBS@
 
-tparm_sources = \
-	tparm.c
-
 terminfo_sources = \
         term-terminfo.c \
         terminfo-core.c
 
-curses_sources = \
-	term-curses.c
-
-if NEED_TPARM
-use_tparm_sources = $(tparm_sources)
-endif
-
-if USE_CURSES
-use_term_sources = $(curses_sources)
-else
 use_term_sources = $(terminfo_sources)
-endif
 
 irssi_SOURCES = \
         gui-entry.c \
@@ -57,7 +42,6 @@ irssi_SOURCES = \
         statusbar-items.c \
         term.c \
 	term-dummy.c \
-	$(use_tparm_sources) \
 	$(use_term_sources) \
         textbuffer.c \
         textbuffer-commands.c \
@@ -85,6 +69,4 @@ noinst_HEADERS = \
 	module-formats.h
 
 EXTRA_DIST = \
-	$(tparm_sources) \
-	$(terminfo_sources) \
-	$(curses_sources)
+	$(terminfo_sources)
diff --git a/src/fe-text/term-curses.c b/src/fe-text/term-curses.c
deleted file mode 100644
index 752edd7f..00000000
--- a/src/fe-text/term-curses.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- term-curses.c : irssi
-
-    Copyright (C) 1999-2001 Timo Sirainen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "module.h"
-#include "signals.h"
-#include "settings.h"
-
-#include "term.h"
-#include "mainwindows.h"
-
-#if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-#  include <ncurses.h>
-#else
-#  include <curses.h>
-#endif
-#include <termios.h>
-#include <signal.h>
-
-#ifndef COLOR_PAIRS
-#  define COLOR_PAIRS 64
-#endif
-
-#if defined (TIOCGWINSZ) && defined (HAVE_CURSES_RESIZETERM)
-#  define USE_RESIZE_TERM
-#endif
-
-#ifndef _POSIX_VDISABLE
-#  define _POSIX_VDISABLE 0
-#endif
-
-struct _TERM_WINDOW {
-	int x, y;
-        int width, height;
-	WINDOW *win;
-};
-
-TERM_WINDOW *root_window;
-
-static int curs_x, curs_y;
-static int freeze_refresh;
-static struct termios old_tio;
-
-static int init_curses(void)
-{
-	char ansi_tab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
-	int num;
-        struct termios tio;
-
-	if (!initscr())
-		return FALSE;
-
-	cbreak(); noecho(); idlok(stdscr, 1);
-#ifdef HAVE_CURSES_IDCOK
-	/*idcok(stdscr, 1); - disabled currently, causes redrawing problems with NetBSD */
-#endif
-	intrflush(stdscr, FALSE); nodelay(stdscr, TRUE);
-
-        /* Disable INTR, QUIT, VDSUSP and SUSP keys */
-	if (tcgetattr(0, &old_tio) == 0) {
-                memcpy(&tio, &old_tio, sizeof(tio));
-		tio.c_cc[VINTR] = _POSIX_VDISABLE;
-                tio.c_cc[VQUIT] = _POSIX_VDISABLE;
-#ifdef VDSUSP
-		tio.c_cc[VDSUSP] = _POSIX_VDISABLE;
-#endif
-#ifdef VSUSP
-		tio.c_cc[VSUSP] = _POSIX_VDISABLE;
-#endif
-		tcsetattr(0, TCSADRAIN, &tio);
-	}
-
-	if (has_colors())
-		start_color();
-	else if (term_use_colors)
-                term_use_colors = FALSE;
-
-#ifdef HAVE_NCURSES_USE_DEFAULT_COLORS
-	/* this lets us to use the "default" background color for colors <= 7 so
-	   background pixmaps etc. show up right */
-	use_default_colors();
-
-	for (num = 1; num < COLOR_PAIRS; num++)
-		init_pair(num, ansi_tab[num & 7], num <= 7 ? -1 : ansi_tab[num >> 3]);
-
-	init_pair(63, 0, -1); /* hm.. not THAT good idea, but probably more
-	                         people want dark grey than white on white.. */
-#else
-	for (num = 1; num < COLOR_PAIRS; num++)
-		init_pair(num, ansi_tab[num & 7], ansi_tab[num >> 3]);
-	init_pair(63, 0, 0);
-#endif
-
-	clear();
-	return TRUE;
-}
-
-static int term_init_int(void)
-{
-	int ret;
-
-	ret = init_curses();
-	if (!ret) return 0;
-
-        curs_x = curs_y = 0;
-	freeze_refresh = 0;
-
-	root_window = g_new0(TERM_WINDOW, 1);
-        root_window->win = stdscr;
-
-	term_width = COLS;
-	term_height = LINES;
-        return ret;
-}
-
-static void term_deinit_int(void)
-{
-        tcsetattr(0, TCSADRAIN, &old_tio);
-
-	endwin();
-	g_free_and_null(root_window);
-}
-
-int term_init(void)
-{
-	if (!term_init_int())
-                return FALSE;
-
-        settings_add_int("lookandfeel", "default_color", 7);
-	term_common_init();
-        return TRUE;
-}
-
-void term_deinit(void)
-{
-        term_common_deinit();
-	term_deinit_int();
-}
-
-/* Resize terminal - if width or height is negative,
-   the new size is unknown and should be figured out somehow */
-void term_resize(int width, int height)
-{
-#ifdef HAVE_CURSES_RESIZETERM
-	if (width < 0 || height < 0) {
-#endif
-		term_deinit_int();
-		term_init_int();
-#ifdef HAVE_CURSES_RESIZETERM
-	} else if (term_width != width || term_height != height) {
-		term_width = width;
-		term_height = height;
-                resizeterm(term_height, term_width);
-	}
-#endif
-}
-
-void term_resize_final(int width, int height)
-{
-#ifdef HAVE_CURSES_RESIZETERM
-        if (width < 0 || height < 0)
-		mainwindows_recreate();
-#else
-	mainwindows_recreate();
-#endif
-}
-
-/* Returns TRUE if terminal has colors */
-int term_has_colors(void)
-{
-        return has_colors();
-}
-
-/* Force the colors on any way you can */
-void term_force_colors(int set)
-{
-        /* don't do anything with curses */
-}
-
-/* Clear screen */
-void term_clear(void)
-{
-        term_set_color(root_window, 0);
-        clear();
-}
-
-/* Beep */
-void term_beep(void)
-{
-        beep();
-}
-
-/* Create a new window in terminal */
-TERM_WINDOW *term_window_create(int x, int y, int width, int height)
-{
-        TERM_WINDOW *window;
-
-	window = g_new0(TERM_WINDOW, 1);
-	window->x = x; window->y = y;
-        window->width = width; window->height = height;
-	window->win = newwin(height, width, y, x);
-	if (window->win == NULL)
-		g_error("newwin() failed: %d,%d %d,%d", x, y, width, height);
-	idlok(window->win, 1);
-
-        return window;
-}
-
-/* Destroy a terminal window */
-void term_window_destroy(TERM_WINDOW *window)
-{
-	delwin(window->win);
-        g_free(window);
-}
-
-/* Move/resize a window */
-void term_window_move(TERM_WINDOW *window, int x, int y,
-		      int width, int height)
-{
-	/* some checks to make sure the window is visible in screen,
-	   otherwise curses could get nasty and not show our window anymore. */
-        if (width < 1) width = 1;
-	if (height < 1) height = 1;
-	if (x+width > term_width) x = term_width-width;
-	if (y+height > term_height) y = term_height-height;
-
-#ifdef HAVE_CURSES_WRESIZE
-	if (window->width != width || window->height != height)
-		wresize(window->win, height, width);
-        if (window->x != x || window->y != y)
-		mvwin(window->win, y, x);
-#else
-	if (window->width != width || window->height != height ||
-	    window->x != x || window->y != y) {
-		delwin(window->win);
-		window->win = newwin(height, width, y, x);
-		idlok(window->win, 1);
-	}
-#endif
-        window->x = x; window->y = y;
-        window->width = width; window->height = height;
-}
-
-/* Clear window */
-void term_window_clear(TERM_WINDOW *window)
-{
-        werase(window->win);
-}
-
-/* Scroll window up/down */
-void term_window_scroll(TERM_WINDOW *window, int count)
-{
-	scrollok(window->win, TRUE);
-	wscrl(window->win, count);
-	scrollok(window->win, FALSE);
-}
-
-static int get_attr(int color)
-{
-	int attr;
-
-	if ((color & FG_MASK) >> 4)
-		color = (color & ~FG_MASK) | term_color256map[color & FG_MASK];
-	if ((color & BG_MASK) >> (BG_SHIFT + 4))
-		color = (color & ~BG_MASK) | (term_color256map[(color & BG_MASK) >> BG_SHIFT] << BG_SHIFT);
-	if (!term_use_colors)
-		attr = (color & (0x7 << BG_SHIFT)) ? A_REVERSE : 0;
-	else if ((color & ((0xf << BG_SHIFT) | 0xf)) == 8 || (color & (FG_MASK | BG_MASK | ATTR_RESETFG)) == 0)
-		attr = COLOR_PAIR(63);
-	else if ((color & ((0x7 << BG_SHIFT) | 0x7)) == 0)
-		attr = A_NORMAL;
-	else {
-		if (color & ATTR_RESETFG) {
-			color &= ~FG_MASK;
-			color |= settings_get_int("default_color");
-		}
-		attr = COLOR_PAIR((color&0x7) | ((color&(0x7<<BG_SHIFT))>>BG_SHIFT<<3));
-	}
-
-	if ((color & 0x8) || (color & ATTR_BOLD)) attr |= A_BOLD;
-	if (color & ATTR_BLINK) attr |= A_BLINK;
-
-	if (color & ATTR_UNDERLINE) attr |= A_UNDERLINE;
-	if (color & ATTR_REVERSE) attr |= A_REVERSE;
-#ifdef A_ITALIC
-	if (color & ATTR_ITALIC) attr |= A_ITALIC;
-#endif
-        return attr;
-}
-
-/* Change active color */
-void term_set_color(TERM_WINDOW *window, int col)
-{
-	wattrset(window->win, get_attr(col));
-	wbkgdset(window->win, ' ' | get_attr(col));
-}
-
-void term_move(TERM_WINDOW *window, int x, int y)
-{
-        wmove(window->win, y, x);
-}
-
-void term_addch(TERM_WINDOW *window, char chr)
-{
-        waddch(window->win, chr);
-}
-
-void term_add_unichar(TERM_WINDOW *window, unichar chr)
-{
-#ifdef WIDEC_CURSES
-	cchar_t wch;
-	wchar_t temp[2];
-	temp[0] = chr;
-	temp[1] = 0;
-	if (setcchar(&wch, temp, A_NORMAL, 0, NULL) == OK)
-		wadd_wch(window->win, &wch);
-	else
-#endif
-        waddch(window->win, chr);
-}
-
-void term_addstr(TERM_WINDOW *window, const char *str)
-{
-        waddstr(window->win, (const char *) str);
-}
-
-void term_clrtoeol(TERM_WINDOW *window)
-{
-        wclrtoeol(window->win);
-}
-
-void term_move_cursor(int x, int y)
-{
-	curs_x = x;
-        curs_y = y;
-}
-
-void term_refresh_freeze(void)
-{
-	freeze_refresh++;
-}
-
-void term_refresh_thaw(void)
-{
-	if (freeze_refresh > 0) {
-		freeze_refresh--;
-		if (freeze_refresh == 0) term_refresh(NULL);
-	}
-}
-
-void term_refresh(TERM_WINDOW *window)
-{
-	if (window != NULL)
-		wnoutrefresh(window->win);
-
-	if (freeze_refresh == 0) {
-		move(curs_y, curs_x);
-		wnoutrefresh(stdscr);
-		doupdate();
-	}
-}
-
-void term_stop(void)
-{
-	term_deinit_int();
-	kill(getpid(), SIGTSTP);
-        term_init_int();
-	irssi_redraw();
-}
-
-void term_set_input_type(int type)
-{
-}
-
-void term_gets(GArray *buffer, int *line_count)
-{
-#ifdef WIDEC_CURSES
-	wint_t key;
-#else
-	int key;
-#endif
-
-	for (;;) {
-#ifdef WIDEC_CURSES
-		if (get_wch(&key) == ERR)
-#else
-		if ((key = getch()) == ERR)
-#endif
-			break;
-#ifdef KEY_RESIZE
-		if (key == KEY_RESIZE)
-			continue;
-#endif
-
-		g_array_append_val(buffer, key);
-		if (key == '\r' || key == '\n')
-			(*line_count)++;
-	}
-}
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 15b00081..9c9179a5 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -17,7 +17,6 @@ inline static int term_putchar(int c)
 char *tparm();
 int tputs();
 
-#ifdef HAVE_TERMINFO
 int setupterm();
 char *tigetstr();
 int tigetnum();
@@ -25,15 +24,6 @@ int tigetflag();
 #define term_getstr(x, buffer) tigetstr(x.ti_name)
 #define term_getnum(x) tigetnum(x.ti_name);
 #define term_getflag(x) tigetflag(x.ti_name);
-#else
-int tgetent();
-char *tgetstr();
-int tgetnum();
-int tgetflag();
-#define term_getstr(x, buffer) tgetstr(x.tc_name, &buffer)
-#define term_getnum(x) tgetnum(x.tc_name)
-#define term_getflag(x) tgetflag(x.tc_name)
-#endif
 
 #define CAP_TYPE_FLAG	0
 #define CAP_TYPE_INT	1
@@ -415,9 +405,6 @@ static void term_fill_capabilities(TERM_REC *term)
 	char *sval;
         void *ptr;
 
-#ifndef HAVE_TERMINFO
-	char *tptr = term->buffer2;
-#endif
 	for (i = 0; i < sizeof(tcaps)/sizeof(tcaps[0]); i++) {
 		ptr = G_STRUCT_MEMBER_P(term, tcaps[i].offset);
 
@@ -583,9 +570,7 @@ void terminfo_stop(TERM_REC *term)
 static int term_setup(TERM_REC *term)
 {
 	GString *str;
-#ifdef HAVE_TERMINFO
 	int err;
-#endif
         char *term_env;
 
 	term_env = getenv("TERM");
@@ -594,18 +579,10 @@ static int term_setup(TERM_REC *term)
                 return 0;
 	}
 
-#ifdef HAVE_TERMINFO
 	if (setupterm(term_env, 1, &err) != 0) {
 		fprintf(stderr, "setupterm() failed for TERM=%s: %d\n", term_env, err);
 		return 0;
 	}
-#else
-	if (tgetent(term->buffer1, term_env) < 1)
-	{
-		fprintf(stderr, "Termcap not found for TERM=%s\n", term_env);
-		return 0;
-	}
-#endif
 
         term_fill_capabilities(term);
 
diff --git a/src/fe-text/tparm.c b/src/fe-text/tparm.c
deleted file mode 100644
index 97c790da..00000000
--- a/src/fe-text/tparm.c
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * tparm.c
- *
- * By Ross Ridge
- * Public Domain
- * 92/02/01 07:30:36
- *
- */
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifndef MAX_PUSHED
-#define MAX_PUSHED	32
-#endif
-
-#define ARG	1
-#define NUM	2
-
-#define INTEGER	1
-#define STRING	2
-
-#define MAX_LINE 640
-
-typedef void* anyptr;
-
-typedef struct stack_str {
-	int	type;
-	int	argnum;
-	int	value;
-} stack;
-
-static stack S[MAX_PUSHED];
-static stack vars['z'-'a'+1];
-static int pos = 0;
-
-static struct arg_str {
-	int type;
-	int	integer;
-	char	*string;
-} arg_list[10];
-
-static int argcnt;
-
-static va_list tparm_args;
-
-static int pusharg(int arg)
-{
-	if (pos == MAX_PUSHED)
-		return 1;
-	S[pos].type = ARG;
-	S[pos++].argnum = arg;
-	return 0;
-}
-
-static int pushnum(int num)
-{
-	if (pos == MAX_PUSHED)
-		return 1;
-	S[pos].type = NUM;
-	S[pos++].value = num;
-	return 0;
-}
-
-/* VARARGS2 */
-static int getarg(int argnum, int type, anyptr p)
-{
-	while (argcnt < argnum) {
-		arg_list[argcnt].type = INTEGER;
-		arg_list[argcnt++].integer = (int) va_arg(tparm_args, int);
-	}
-	if (argcnt > argnum) {
-		if (arg_list[argnum].type != type)
-			return 1;
-		else if (type == STRING)
-			*(char **)p = arg_list[argnum].string;
-		else
-			*(int *)p = arg_list[argnum].integer;
-	} else {
-		arg_list[argcnt].type = type;
-		if (type == STRING)
-			*(char **)p = arg_list[argcnt++].string
-				= (char *) va_arg(tparm_args, char *);
-		else
-			*(int *)p = arg_list[argcnt++].integer = (int) va_arg(tparm_args, int);
-	}
-	return 0;
-}
-
-
-static int popstring(char **str)
-{
-	if (pos-- == 0)
-		return 1;
-	if (S[pos].type != ARG)
-		return 1;
-	return(getarg(S[pos].argnum, STRING, (anyptr) str));
-}
-
-static int popnum(int *num)
-{
-	if (pos-- == 0)
-		return 1;
-	switch (S[pos].type) {
-	case ARG:
-		return (getarg(S[pos].argnum, INTEGER, (anyptr) num));
-	case NUM:
-		*num = S[pos].value;
-		return 0;
-	}
-	return 1;
-}
-
-static int cvtchar(const char *sp, char *c)
-{
-	switch(*sp) {
-	case '\\':
-		switch(*++sp) {
-		case '\'':
-		case '$':
-		case '\\':
-		case '%':
-			*c = *sp;
-			return 2;
-		case '\0':
-			*c = '\\';
-			return 1;
-		case '0':
-			if (sp[1] == '0' && sp[2] == '0') {
-				*c = '\0';
-				return 4;
-			}
-			*c = '\200'; /* '\0' ???? */
-			return 2;
-		default:
-			*c = *sp;
-			return 2;
-		}
-	default:
-		*c = *sp;
-		return 1;
-	}
-}
-
-static int termcap;
-
-/* sigh... this has got to be the ugliest code I've ever written.
-   Trying to handle everything has its cost, I guess.
-
-   It actually isn't to hard to figure out if a given % code is supposed
-   to be interpeted with its termcap or terminfo meaning since almost
-   all terminfo codes are invalid unless something has been pushed on
-   the stack and termcap strings will never push things on the stack
-   (%p isn't used by termcap). So where we have a choice we make the
-   decision by whether or not somthing has been pushed on the stack.
-   The static variable termcap keeps track of this; it starts out set
-   to 1 and is incremented as each argument processed by a termcap % code,
-   however if something is pushed on the stack it's set to 0 and the
-   rest of the % codes are interpeted as terminfo % codes. Another way
-   of putting it is that if termcap equals one we haven't decided either
-   way yet, if it equals zero we're looking for terminfo codes, and if
-   its greater than 1 we're looking for termcap codes.
-
-   Terminfo % codes:
-
-	%%	output a '%'
-	%[[:][-+# ][width][.precision]][doxXs]
-		output pop according to the printf format
-	%c	output pop as a char
-	%'c'	push character constant c.
-	%{n}	push decimal constant n.
-	%p[1-9] push parameter [1-9]
-	%g[a-z] push variable [a-z]
-	%P[a-z] put pop in variable [a-z]
-	%l	push the length of pop (a string)
-	%+	add pop to pop and push the result
-	%-	subtract pop from pop and push the result
-	%*	multiply pop and pop and push the result
-	%&	bitwise and pop and pop and push the result
-	%|	bitwise or pop and pop and push the result
-	%^	bitwise xor pop and pop and push the result
-	%~	push the bitwise not of pop
-	%=	compare if pop and pop are equal and push the result
-	%>	compare if pop is less than pop and push the result
-	%<	compare if pop is greater than pop and push the result
-	%A	logical and pop and pop and push the result
-	%O	logical or pop and pop and push the result
-	%!	push the logical not of pop
-	%? condition %t if_true [%e if_false] %;
-		if condition evaulates as true then evaluate if_true,
-		else evaluate if_false. elseif's can be done:
-%? cond %t true [%e cond2 %t true2] ... [%e condN %t trueN] [%e false] %;
-	%i	add one to parameters 1 and 2. (ANSI)
-
-  Termcap Codes:
-
-	%%	output a %
-	%.	output parameter as a character
-	%d	output parameter as a decimal number
-	%2	output parameter in printf format %02d
-	%3	output parameter in printf format %03d
-	%+x	add the character x to parameter and output it as a character
-(UW)	%-x	subtract parameter FROM the character x and output it as a char
-(UW)	%ax	add the character x to parameter
-(GNU)	%a[+*-/=][cp]x
-		GNU arithmetic.
-(UW)	%sx	subtract parameter FROM the character x
-	%>xy	if parameter > character x then add character y to parameter
-	%B	convert to BCD (parameter = (parameter/10)*16 + parameter%16)
-	%D	Delta Data encode (parameter = parameter - 2*(parameter%16))
-	%i	increment the first two parameters by one
-	%n	xor the first two parameters by 0140
-(GNU)	%m	xor the first two parameters by 0177
-	%r	swap the first two parameters
-(GNU)	%b	backup to previous parameter
-(GNU)	%f	skip this parameter
-
-  Note the two definitions of %a, the GNU definition is used if the characters
-  after the 'a' are valid, otherwise the UW definition is used.
-
-  (GNU) used by GNU Emacs termcap libraries
-  (UW) used by the University of Waterloo (MFCF) termcap libraries
-
-*/
-
-char *tparm(const char *str, ...) {
-	static char OOPS[] = "OOPS";
-	static char buf[MAX_LINE];
-	register const char *sp;
-	register char *dp;
-	register char *fmt;
-	char conv_char;
-	char scan_for;
-	int scan_depth = 0, if_depth;
-	static int i, j;
-	static char *s, c;
-	char fmt_buf[MAX_LINE];
-	char sbuf[MAX_LINE];
-
-	va_start(tparm_args, str);
-
-	sp = str;
-	dp = buf;
-	scan_for = 0;
-	if_depth = 0;
-	argcnt = 0;
-	pos = 0;
-	termcap = 1;
-	while (*sp != '\0') {
-		switch(*sp) {
-		case '\\':
-			if (scan_for) {
-				if (*++sp != '\0')
-					sp++;
-				break;
-			}
-			*dp++ = *sp++;
-			if (*sp != '\0')
-				*dp++ = *sp++;
-			break;
-		case '%':
-			sp++;
-			if (scan_for) {
-				if (*sp == scan_for && if_depth == scan_depth) {
-					if (scan_for == ';')
-						if_depth--;
-					scan_for = 0;
-				} else if (*sp == '?')
-					if_depth++;
-				else if (*sp == ';') {
-					if (if_depth == 0)
-						return OOPS;
-					else
-						if_depth--;
-				}
-				sp++;
-				break;
-			}
-			fmt = NULL;
-			switch(*sp) {
-			case '%':
-				*dp++ = *sp++;
-				break;
-			case '+':
-				if (!termcap) {
-					if (popnum(&j) || popnum(&i))
-						return OOPS;
-					i += j;
-					if (pushnum(i))
-						return OOPS;
-					sp++;
-					break;
-				}
-				;/* FALLTHROUGH */
-			case 'C':
-				if (*sp == 'C') {
-					if (getarg(termcap - 1, INTEGER, &i))
-						return OOPS;
-					if (i >= 96) {
-						i /= 96;
-						if (i == '$')
-							*dp++ = '\\';
-						*dp++ = i;
-					}
-				}
-				fmt = "%c";
-				/* FALLTHROUGH */
-			case 'a':
-				if (!termcap)
-					return OOPS;
-				if (getarg(termcap - 1, INTEGER, (anyptr) &i))
-					return OOPS;
-				if (*++sp == '\0')
-					return OOPS;
-				if ((sp[1] == 'p' || sp[1] == 'c')
-			            && sp[2] != '\0' && fmt == NULL) {
-					/* GNU aritmitic parameter, what they
-					   really need is terminfo.	      */
-					int val, lc;
-					if (sp[1] == 'p'
-					    && getarg(termcap - 1 + sp[2] - '@',
-						      INTEGER, (anyptr) &val))
-						return OOPS;
-					if (sp[1] == 'c') {
-						lc = cvtchar(sp + 2, &c) + 2;
-					/* Mask out 8th bit so \200 can be
-					   used for \0 as per GNU doc's    */
-						val = c & 0177;
-					} else
-						lc = 2;
-					switch(sp[0]) {
-					case '=':
-						break;
-					case '+':
-						val = i + val;
-						break;
-					case '-':
-						val = i - val;
-						break;
-					case '*':
-						val = i * val;
-						break;
-					case '/':
-						val = i / val;
-						break;
-					default:
-					/* Not really GNU's %a after all... */
-						lc = cvtchar(sp, &c);
-						val = c + i;
-						break;
-					}
-					arg_list[termcap - 1].integer = val;
-					sp += lc;
-					break;
-				}
-				sp += cvtchar(sp, &c);
-				arg_list[termcap - 1].integer = c + i;
-				if (fmt == NULL)
-					break;
-				sp--;
-				/* FALLTHROUGH */
-			case '-':
-				if (!termcap) {
-					if (popnum(&j) || popnum(&i))
-						return OOPS;
-					i -= j;
-					if (pushnum(i))
-						return OOPS;
-					sp++;
-					break;
-				}
-				fmt = "%c";
-				/* FALLTHROUGH */
-			case 's':
-				if (termcap && (fmt == NULL || *sp == '-')) {
-					if (getarg(termcap - 1, INTEGER, &i))
-						return OOPS;
-					if (*++sp == '\0')
-						return OOPS;
-					sp += cvtchar(sp, &c);
-					arg_list[termcap - 1].integer = c - i;
-					if (fmt == NULL)
-						break;
-					sp--;
-				}
-				if (!termcap)
-					return OOPS;
-				;/* FALLTHROUGH */
-			case '.':
-				if (termcap && fmt == NULL)
-					fmt = "%c";
-				;/* FALLTHROUGH */
-			case 'd':
-				if (termcap && fmt == NULL)
-					fmt = "%d";
-				;/* FALLTHROUGH */
-			case '2':
-				if (termcap && fmt == NULL)
-					fmt = "%02d";
-				;/* FALLTHROUGH */
-			case '3':
-				if (termcap && fmt == NULL)
-					fmt = "%03d";
-				;/* FALLTHROUGH */
-			case ':': case ' ': case '#': case 'u':
-			case 'x': case 'X': case 'o': case 'c':
-			case '0': case '1': case '4': case '5':
-			case '6': case '7': case '8': case '9':
-				if (fmt == NULL) {
-					if (termcap)
-						return OOPS;
-					if (*sp == ':')
-						sp++;
-					fmt = fmt_buf;
-					*fmt++ = '%';
-					while(*sp != 's' && *sp != 'x' && *sp != 'X' && *sp != 'd' && *sp != 'o' && *sp != 'c' && *sp != 'u') {
-						if (*sp == '\0')
-							return OOPS;
-						*fmt++ = *sp++;
-					}
-					*fmt++ = *sp;
-					*fmt = '\0';
-					fmt = fmt_buf;
-				}
-				conv_char = fmt[strlen(fmt) - 1];
-				if (conv_char == 's') {
-					if (popstring(&s))
-						return OOPS;
-					sprintf(sbuf, fmt, s);
-				} else {
-					if (termcap) {
-						if (getarg(termcap++ - 1,
-							   INTEGER, &i))
-							return OOPS;
-					} else
-						if (popnum(&i))
-							return OOPS;
-					if (i == 0 && conv_char == 'c')
-						*sbuf = 0;
-					else
-						sprintf(sbuf, fmt, i);
-				}
-				sp++;
-				fmt = sbuf;
-				while(*fmt != '\0') {
-					if (*fmt == '$')
-						*dp++ = '\\';
-					*dp++ = *fmt++;
-				}
-				break;
-			case 'r':
-				if (!termcap || getarg(1, INTEGER, &i))
-					return OOPS;
-				arg_list[1].integer = arg_list[0].integer;
-				arg_list[0].integer = i;
-				sp++;
-				break;
-			case 'i':
-				if (getarg(1, INTEGER, &i)
-				    || arg_list[0].type != INTEGER)
-					return OOPS;
-				arg_list[1].integer++;
-				arg_list[0].integer++;
-				sp++;
-				break;
-			case 'n':
-				if (!termcap || getarg(1, INTEGER, &i))
-					return OOPS;
-				arg_list[0].integer ^= 0140;
-				arg_list[1].integer ^= 0140;
-				sp++;
-				break;
-			case '>':
-				if (!termcap) {
-					if (popnum(&j) || popnum(&i))
-						return OOPS;
-					i = (i > j);
-					if (pushnum(i))
-						return OOPS;
-					sp++;
-					break;
-				}
-				if (getarg(termcap-1, INTEGER, &i))
-					return OOPS;
-				sp += cvtchar(sp, &c);
-				if (i > c) {
-					sp += cvtchar(sp, &c);
-					arg_list[termcap-1].integer += c;
-				} else
-					sp += cvtchar(sp, &c);
-				sp++;
-				break;
-			case 'B':
-				if (!termcap || getarg(termcap-1, INTEGER, &i))
-					return OOPS;
-				arg_list[termcap-1].integer = 16*(i/10)+i%10;
-				sp++;
-				break;
-			case 'D':
-				if (!termcap || getarg(termcap-1, INTEGER, &i))
-					return OOPS;
-				arg_list[termcap-1].integer = i - 2 * (i % 16);
-				sp++;
-				break;
-			case 'p':
-				if (termcap > 1)
-					return OOPS;
-				if (*++sp == '\0')
-					return OOPS;
-				if (*sp == '0')
-					i = 9;
-				else
-					i = *sp - '1';
-				if (i < 0 || i > 9)
-					return OOPS;
-				if (pusharg(i))
-					return OOPS;
-				termcap = 0;
-				sp++;
-				break;
-			case 'P':
-				if (termcap || *++sp == '\0')
-					return OOPS;
-				i = *sp++ - 'a';
-				if (i < 0 || i > 25)
-					return OOPS;
-				if (pos-- == 0)
-					return OOPS;
-				switch(vars[i].type = S[pos].type) {
-				case ARG:
-					vars[i].argnum = S[pos].argnum;
-					break;
-				case NUM:
-					vars[i].value = S[pos].value;
-					break;
-				}
-				break;
-			case 'g':
-				if (termcap || *++sp == '\0')
-					return OOPS;
-				i = *sp++ - 'a';
-				if (i < 0 || i > 25)
-					return OOPS;
-				switch(vars[i].type) {
-				case ARG:
-					if (pusharg(vars[i].argnum))
-						return OOPS;
-					break;
-				case NUM:
-					if (pushnum(vars[i].value))
-						return OOPS;
-					break;
-				}
-				break;
-			case '\'':
-				if (termcap > 1)
-					return OOPS;
-				if (*++sp == '\0')
-					return OOPS;
-				sp += cvtchar(sp, &c);
-				if (pushnum(c) || *sp++ != '\'')
-					return OOPS;
-				termcap = 0;
-				break;
-			case '{':
-				if (termcap > 1)
-					return OOPS;
-				i = 0;
-				sp++;
-				while(isdigit((int) (unsigned char) *sp))
-					i = 10 * i + *sp++ - '0';
-				if (*sp++ != '}' || pushnum(i))
-					return OOPS;
-				termcap = 0;
-				break;
-			case 'l':
-				if (termcap || popstring(&s))
-					return OOPS;
-				i = strlen(s);
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '*':
-				if (termcap || popnum(&j) || popnum(&i))
-					return OOPS;
-				i *= j;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '/':
-				if (termcap || popnum(&j) || popnum(&i))
-					return OOPS;
-				i /= j;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case 'm':
-				if (termcap) {
-					if (getarg(1, INTEGER, &i))
-						return OOPS;
-					arg_list[0].integer ^= 0177;
-					arg_list[1].integer ^= 0177;
-					sp++;
-					break;
-				}
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i %= j;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '&':
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i &= j;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '|':
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i |= j;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '^':
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i ^= j;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '=':
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i = (i == j);
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '<':
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i = (i < j);
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case 'A':
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i = (i && j);
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case 'O':
-				if (popnum(&j) || popnum(&i))
-					return OOPS;
-				i = (i || j);
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '!':
-				if (popnum(&i))
-					return OOPS;
-				i = !i;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '~':
-				if (popnum(&i))
-					return OOPS;
-				i = ~i;
-				if (pushnum(i))
-					return OOPS;
-				sp++;
-				break;
-			case '?':
-				if (termcap > 1)
-					return OOPS;
-				termcap = 0;
-				if_depth++;
-				sp++;
-				break;
-			case 't':
-				if (popnum(&i) || if_depth == 0)
-					return OOPS;
-				if (!i) {
-					scan_for = 'e';
-					scan_depth = if_depth;
-				}
-				sp++;
-				break;
-			case 'e':
-				if (if_depth == 0)
-					return OOPS;
-				scan_for = ';';
-				scan_depth = if_depth;
-				sp++;
-				break;
-			case ';':
-				if (if_depth-- == 0)
-					return OOPS;
-				sp++;
-				break;
-			case 'b':
-				if (--termcap < 1)
-					return OOPS;
-				sp++;
-				break;
-			case 'f':
-				if (!termcap++)
-					return OOPS;
-				sp++;
-				break;
-			}
-			break;
-		default:
-			if (scan_for)
-				sp++;
-			else
-				*dp++ = *sp++;
-			break;
-		}
-	}
-	va_end(tparm_args);
-	*dp = '\0';
-	return buf;
-}
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index b17fd664..427c5492 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -127,7 +127,7 @@ am_v_pl__show_gen = $(am__v_pl__show_gen_$(V))
 am_v_pl__hide_gen = $(am__v_pl__hide_gen_$(V))
 am__v_pl__show_gen_ = $(am__v_pl__show_gen_$(AM_DEFAULT_VERBOSITY))
 am__v_pl__hide_gen_ = $(am__v_pl__hide_gen_$(AM_DEFAULT_VERBOSITY))
-am__v_pl__show_gen_0 = echo "  GEN  " $$dir ;
+am__v_pl__show_gen_0 = echo "  GEN     " $$dir ;
 am__v_pl__hide_gen_0 = > /dev/null
 am__v_pl__show_gen_1 = 
 am__v_pl__hide_gen_1 = 
diff --git a/src/perl/Makefile_silent.pm b/src/perl/Makefile_silent.pm
index 372e4046..b5d71d66 100644
--- a/src/perl/Makefile_silent.pm
+++ b/src/perl/Makefile_silent.pm
@@ -3,7 +3,7 @@ my $verb = $AM_DEFAULT_VERBOSITY;
 { package MY;
     sub _center {
 	my $z = shift;
-	length $z == 2 ? "  $z   " : length $z == 4 ? " $z  " : " $z "
+	(length $z == 2 ? "  $z   " : length $z == 4 ? " $z  " : " $z ").'   '
     }
     sub _silent_cmd {
 	my $z = shift;

From b411f943a081b7c7fde0548f8c7ee5e93c0638a9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 12 Aug 2016 18:24:58 +0200
Subject: [PATCH 0401/1650] fix use after free in expando error

---
 src/perl/common/Expando.xs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs
index e8e8f751..bb5d185b 100644
--- a/src/perl/common/Expando.xs
+++ b/src/perl/common/Expando.xs
@@ -74,15 +74,18 @@ static char *perl_expando_event(PerlExpando *rec, SERVER_REC *server,
 
 	ret = NULL;
 	if (SvTRUE(ERRSV)) {
+		PERL_SCRIPT_REC *script = rec->script;
+
 		(void) POPs;
 		/* call putback before emitting script error signal as that
 		 * could manipulate the perl stack. */
 		PUTBACK;
 		/* make sure we don't get back here */
-		if (rec->script != NULL)
-			script_unregister_expandos(rec->script);
+		if (script != NULL)
+			script_unregister_expandos(script);
+		/* rec has been freed now */
 
-		signal_emit("script error", 2, rec->script, SvPV_nolen(ERRSV));
+		signal_emit("script error", 2, script, SvPV_nolen(ERRSV));
 	} else if (retcount > 0) {
 		ret = g_strdup(POPp);
 		*free_ret = TRUE;

From de11e0f4f2196d5bbb692ffe6fd0dd9afaa69e46 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 12 Aug 2016 19:33:56 +0200
Subject: [PATCH 0402/1650] remove broken dummy mode

---
 docs/irssi.1             |   3 --
 src/fe-text/Makefile.am  |   1 -
 src/fe-text/irssi.c      |  85 +++++++++++++------------------
 src/fe-text/term-dummy.c | 106 ---------------------------------------
 4 files changed, 35 insertions(+), 160 deletions(-)
 delete mode 100644 src/fe-text/term-dummy.c

diff --git a/docs/irssi.1 b/docs/irssi.1
index f38b639e..e1fab0d8 100644
--- a/docs/irssi.1
+++ b/docs/irssi.1
@@ -51,9 +51,6 @@ use
 .I HOSTNAME
 for your irc session
 .TP
-.BI "\-d, \-\-dummy"
-use dummy terminal mode
-.TP
 .BI "\-v, \-\-version"
 display the version of Irssi
 .TP
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 847df150..bdd3df22 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -41,7 +41,6 @@ irssi_SOURCES = \
         statusbar-config.c \
         statusbar-items.c \
         term.c \
-	term-dummy.c \
 	$(use_term_sources) \
         textbuffer.c \
         textbuffer-commands.c \
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index cad271c9..ad79e0c4 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -74,10 +74,7 @@ void mainwindow_activity_deinit(void);
 void mainwindows_layout_init(void);
 void mainwindows_layout_deinit(void);
 
-void term_dummy_init(void);
-void term_dummy_deinit(void);
-
-static int dirty, full_redraw, dummy;
+static int dirty, full_redraw;
 
 static GMainLoop *main_loop;
 int quitting;
@@ -122,7 +119,7 @@ void irssi_set_dirty(void)
 
 static void dirty_check(void)
 {
-	if (!dirty || dummy)
+	if (!dirty)
 		return;
 
         term_resize_dirty();
@@ -171,27 +168,22 @@ static void textui_finish_init(void)
 {
 	quitting = FALSE;
 
-	if (dummy)
-		term_dummy_init();
-	else {
-		term_refresh_freeze();
-	        textbuffer_init();
-	        textbuffer_view_init();
-		textbuffer_commands_init();
-		gui_expandos_init();
-		gui_printtext_init();
-		gui_readline_init();
-	        lastlog_init();
-		mainwindows_init();
-		mainwindow_activity_init();
-		mainwindows_layout_init();
-		gui_windows_init();
-		statusbar_init();
-		term_refresh_thaw();
+	term_refresh_freeze();
+	textbuffer_init();
+	textbuffer_view_init();
+	textbuffer_commands_init();
+	gui_expandos_init();
+	gui_printtext_init();
+	gui_readline_init();
+	lastlog_init();
+	mainwindows_init();
+	mainwindow_activity_init();
+	mainwindows_layout_init();
+	gui_windows_init();
+	statusbar_init();
+	term_refresh_thaw();
 
-		/* don't check settings with dummy mode */
-		settings_check();
-	}
+	settings_check();
 
 	module_register("core", "fe-text");
 
@@ -233,25 +225,21 @@ static void textui_deinit(void)
         dirty_check(); /* one last time to print any quit messages */
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
 
-	if (dummy)
-		term_dummy_deinit();
-	else {
-	        lastlog_deinit();
-		statusbar_deinit();
-		gui_printtext_deinit();
-		gui_readline_deinit();
-		gui_windows_deinit();
-		mainwindows_layout_deinit();
-		mainwindow_activity_deinit();
-		mainwindows_deinit();
-		gui_expandos_deinit();
-		textbuffer_commands_deinit();
-	        textbuffer_view_deinit();
-	        textbuffer_deinit();
+	lastlog_deinit();
+	statusbar_deinit();
+	gui_printtext_deinit();
+	gui_readline_deinit();
+	gui_windows_deinit();
+	mainwindows_layout_deinit();
+	mainwindow_activity_deinit();
+	mainwindows_deinit();
+	gui_expandos_deinit();
+	textbuffer_commands_deinit();
+	textbuffer_view_deinit();
+	textbuffer_deinit();
 
-	        term_refresh_thaw();
-	        term_deinit();
-	}
+	term_refresh_thaw();
+	term_deinit();
 
 	theme_unregister();
 
@@ -276,7 +264,6 @@ int main(int argc, char **argv)
 {
 	static int version = 0;
 	static GOptionEntry options[] = {
-		{ "dummy", 'd', 0, G_OPTION_ARG_NONE, &dummy, "Use the dummy terminal mode", NULL },
 		{ "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Display irssi version", NULL },
 		{ NULL }
 	};
@@ -295,7 +282,6 @@ int main(int argc, char **argv)
 
 	srand(time(NULL));
 
-	dummy = FALSE;
 	quitting = FALSE;
 	core_preinit(argv[0]);
 
@@ -319,9 +305,8 @@ int main(int argc, char **argv)
 	loglev = g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
 	textui_init();
 
-	if (!dummy && !term_init()) {
-		fprintf(stderr, "Can't initialize screen handling, quitting.\n");
-		fprintf(stderr, "You can still use the dummy mode with -d parameter\n");
+	if (!term_init()) {
+		fprintf(stderr, "Can't initialize screen handling.\n");
 		return 1;
 	}
 
@@ -332,9 +317,9 @@ int main(int argc, char **argv)
 	/* Does the same as g_main_run(main_loop), except we
 	   can call our dirty-checker after each iteration */
 	while (!quitting) {
-		if (!dummy) term_refresh_freeze();
+		term_refresh_freeze();
 		g_main_iteration(TRUE);
-                if (!dummy) term_refresh_thaw();
+                term_refresh_thaw();
 
 		if (reload_config) {
                         /* SIGHUP received, do /RELOAD */
diff --git a/src/fe-text/term-dummy.c b/src/fe-text/term-dummy.c
deleted file mode 100644
index 6a56af88..00000000
--- a/src/fe-text/term-dummy.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- term-dummy.c : irssi
-
-    Copyright (C) 2001 Timo Sirainen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "module.h"
-#include "signals.h"
-
-#include "fe-windows.h"
-
-static int newline;
-
-static GIOChannel *stdin_channel;
-static int readtag;
-static GString *input;
-
-static void sig_gui_printtext(WINDOW_REC *window, void *fgcolor,
-                              void *bgcolor, void *pflags,
-                              char *str, void *level)
-{
-	if (newline) {
-		newline = FALSE;
-		printf("\r");
-	}
-
-	printf("%s", str);
-}
-
-static void sig_gui_printtext_finished(WINDOW_REC *window)
-{
-	printf("\n");
-	newline = TRUE;
-}
-
-static void sig_window_created(WINDOW_REC *window)
-{
-	window->width = 80;
-	window->height = 25;
-}
-
-static void readline(void)
-{
-        unsigned char buffer[128];
-	char *p;
-	int ret, i;
-
-	ret = read(0, buffer, sizeof(buffer));
-	if (ret == 0 || (ret == -1 && errno != EINTR)) {
-		/* lost terminal */
-		signal_emit("command quit", 1, "Lost terminal");
-                return;
-	}
-
-	for (i = 0; i < ret; i++)
-		g_string_append_c(input, buffer[i]);
-
-	p = strchr(input->str, '\n');
-	if (p != NULL) {
-		*p = '\0';
-		signal_emit("send command", 3, input->str,
-			    active_win->active_server, active_win->active);
-		*p = '\n';
-		g_string_erase(input, 0, (int) (p-input->str)+1);
-	}
-}
-
-void term_dummy_init(void)
-{
-	newline = TRUE;
-	input = g_string_new(NULL);
-
-	signal_add("gui print text", (SIGNAL_FUNC) sig_gui_printtext);
-	signal_add("gui print text finished", (SIGNAL_FUNC) sig_gui_printtext_finished);
-	signal_add("window created", (SIGNAL_FUNC) sig_window_created);
-
-        stdin_channel = g_io_channel_unix_new(0);
-	readtag = g_input_add_full(stdin_channel,
-				   G_PRIORITY_HIGH, G_INPUT_READ,
-				   (GInputFunction) readline, NULL);
-        g_io_channel_unref(stdin_channel);
-}
-
-void term_dummy_deinit(void)
-{
-	signal_remove("gui print text", (SIGNAL_FUNC) sig_gui_printtext);
-	signal_remove("gui print text finished", (SIGNAL_FUNC) sig_gui_printtext_finished);
-	signal_remove("window created", (SIGNAL_FUNC) sig_window_created);
-
-	g_source_remove(readtag);
-	g_string_free(input, TRUE);
-}

From 681caf2b587b88d1fcf953386b2432ce5b9bbea4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 22 Aug 2016 12:27:10 +0200
Subject: [PATCH 0403/1650] fix nick->host == NULL crash

---
 src/fe-common/core/fe-messages.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index bc2a30d6..487a5754 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -603,9 +603,6 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
 	char *nickhost, *p;
 	int n;
 
-	if (nick->host == NULL)
-                return;
-
 	firstnick = g_hash_table_lookup(channel->nicks, nick->nick);
 	if (firstnick->next == NULL)
 		return;
@@ -618,6 +615,9 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
                         return; /* nope, we have it */
 	}
 
+	if (nick->host == NULL)
+                return;
+
 	/* identical nick already exists, have to change it somehow.. */
 	p = strchr(nick->host, '@');
 	if (p == NULL) p = nick->host; else p++;

From 251d8a686a2717c4b1ab9dfc3599eab75105c076 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 24 Aug 2016 22:29:52 +0200
Subject: [PATCH 0404/1650] Fix an OOB access in the cutbuffer implementation.

---
 src/fe-text/gui-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 82645a8e..f05decd2 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -655,7 +655,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 				tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
 				memcpy(tmp->cutbuffer, tmpcutbuffer,
 				       tmp->cutbuffer_len * sizeof(unichar));
-				memcpy(tmp->cutbuffer + tmp->cutbuffer_len * sizeof(unichar),
+				memcpy(tmp->cutbuffer + tmp->cutbuffer_len,
 				       entry->text + entry->pos - size, size * sizeof(unichar));
 
 				tmp->cutbuffer_len = cutbuffer_new_size;

From 3429c1a0a0dd336505e068dcea2a15efbf5a3c57 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 24 Aug 2016 19:48:35 -0300
Subject: [PATCH 0405/1650] Set the default STATUSMSG to @ instead of @+ if
 it's missing

This fixes two issues:

- IRCNet doesn't have STATUSMSG, but it supports +channels, and
  including + in the default value meant processing those incorrectly

- The "bahamut hack", for old servers that support but don't advertise
  STATUSMSG, didn't work since ischannel_func doesn't use the default.

The choice of @ intentionally leaves out support for other STATUSMSG
(for example, AzzurraNet's bahamut 1.4 fork seemed to support + and % in
any order, contradicting the comment in the code).

I think this is a decent tradeoff, given how those servers are uncommon
and relying on +# or %# is even less common than @#.

Fixes #531
---
 src/fe-common/irc/fe-irc-channels.c | 9 +++------
 src/irc/core/irc-servers.c          | 6 ++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index a2737fc3..0ec30003 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -41,7 +41,7 @@ int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
 
 	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
 	if (statusmsg == NULL)
-		statusmsg = "@+";
+		statusmsg = "@";
 
 	return strchr(statusmsg, *target) != NULL;
 }
@@ -61,12 +61,9 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
 	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
 
 	/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
-	 * WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
-	if (statusmsg == NULL && *target != '@')
-		return target;
-
+	 * WALLCHOPS in 005 */
 	if (statusmsg == NULL)
-		statusmsg = "@+";
+		statusmsg = "@";
 
 	/* Strip the leading statusmsg prefixes */
 	while (strchr(statusmsg, *target) != NULL) {
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index feb7cee8..8148997b 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -89,8 +89,10 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
 	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg != NULL)
-		data += strspn(data, statusmsg);
+	if (statusmsg == NULL)
+		statusmsg = "@";
+
+	data += strspn(data, statusmsg);
 
 	/* strchr(3) considers the trailing NUL as part of the string, make sure
 	 * we didn't advance too much. */

From 5d9af40ea761850839fc22e495e68d90663c012d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 29 Aug 2016 23:25:26 +0200
Subject: [PATCH 0406/1650] Update INSTALL

---
 INSTALL | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4c6f5681..5e6e2be0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -85,10 +85,11 @@ things that can go wrong:
  - If configure complains that it doesn't find some perl stuff, you're
    probably missing libperl.so or libperl.a. In debian, you'll need to do
    apt-get install libperl-dev
- - For unprivileged home directory installations, using the local::lib CPAN
-   module is recommended. Read its docs, bootstrap it if needed, ensure that
-   the environment variables are set before running the configure script, and
-   append "--with-perl-lib=site" to the configure parameters to use it.
+ - For unprivileged home directory installations, you probably do not want 
+   to specify --with-perl-lib=(site|vendor). Instead, you can use the 
+   default perl installation target (below the irssi prefix). If you are
+   using local::lib you can also choose to install there by specifying
+   --with-perl-lib=$PERL_LOCAL_LIB_ROOT/lib/perl5
 
 You can verify that the perl module is loaded and working with "/LOAD"
 command. It should print something like:

From 60d9ec621ff81ac68b9d2066fb77eaefc8d02ccb Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 3 Jul 2016 22:02:02 -0700
Subject: [PATCH 0407/1650] SASL: handle fragmentation

The IRCv3 SASL extension says that AUTHENTICATION payloads of exactly
400 bytes in length indicate that the message is fragmented and will
continue in a subsequent message. Handle the reassembly and splitting of
these messages so that we are compliant with the specification.
---
 src/irc/core/irc-servers.c |   2 +
 src/irc/core/irc-servers.h |   3 +-
 src/irc/core/sasl.c        | 172 ++++++++++++++++++++++++++++++++-----
 3 files changed, 154 insertions(+), 23 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index feb7cee8..9a3e9a67 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -444,6 +444,8 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
 	server->cap_queue = NULL;
 
+	g_free_and_null(server->sasl_buffer);
+
 	/* these are dynamically allocated only if isupport was sent */
 	g_hash_table_foreach(server->isupport,
 			     (GHFunc) isupport_destroy_hash, server);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 41c4b9c2..ecf65ac2 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -78,7 +78,8 @@ struct _IRC_SERVER_REC {
 	GSList *cap_queue;     /* A list of caps to request on connection */ 
 	int cap_complete:1;    /* We've done the initial CAP negotiation */
 
-	guint sasl_timeout; /* Holds the source id of the running timeout */
+	GString *sasl_buffer; /* Buffer used to reassemble a fragmented SASL payload */
+	guint sasl_timeout;   /* Holds the source id of the running timeout */
 
 	/* Command sending queue */
 	int cmdcount; /* number of commands in `cmdqueue'. Can be more than
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index f080ae59..a1c16cdd 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -26,6 +26,19 @@
 #include "irc-servers.h"
 #include "sasl.h"
 
+/*
+ * Based on IRCv3 SASL Extension Specification:
+ * http://ircv3.net/specs/extensions/sasl-3.1.html
+ */
+#define AUTHENTICATE_CHUNK_SIZE 400 // bytes
+
+/*
+ * Maximum size to allow the buffer to grow to before the next fragment comes in. Note that
+ * due to the way fragmentation works, the maximum message size will actually be:
+ * floor(AUTHENTICATE_MAX_SIZE / AUTHENTICATE_CHUNK_SIZE) + AUTHENTICATE_CHUNK_SIZE - 1
+ */
+#define AUTHENTICATE_MAX_SIZE 8192 // bytes
+
 #define SASL_TIMEOUT (20 * 1000) // ms
 
 static gboolean sasl_timeout(IRC_SERVER_REC *server)
@@ -105,49 +118,164 @@ static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *f
 	cap_finish_negotiation(server);
 }
 
-static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from)
+/*
+ * Responsible for reassembling incoming SASL requests. SASL requests must be split
+ * into 400 byte requests to stay below the IRC command length limit of 512 bytes.
+ * The spec says that if there is 400 bytes, then there is expected to be a
+ * continuation in the next chunk. If a message is exactly a multiple of 400 bytes,
+ * there must be a blank message of "AUTHENTICATE +" to indicate the end.
+ *
+ * This function returns the fully reassembled and decoded AUTHENTICATION message if
+ * completed or NULL if there are more messages expected.
+ */
+static gboolean sasl_reassemble_incoming(IRC_SERVER_REC *server, const char *fragment, GString **decoded)
+{
+	GString *enc_req;
+	gsize fragment_len;
+
+	fragment_len = strlen(fragment);
+
+	/* Check if there is an existing fragment to prepend. */
+	if (server->sasl_buffer != NULL) {
+		if (g_strcmp0("+", fragment) == 0) {
+			enc_req = server->sasl_buffer;
+		} else {
+			enc_req = g_string_append_len(server->sasl_buffer, fragment, fragment_len);
+		}
+		server->sasl_buffer = NULL;
+	} else {
+		enc_req = g_string_new_len(fragment, fragment_len);
+	}
+
+	/*
+	 * Fail authentication with this server. They have sent too much data.
+	 */
+	if (enc_req->len > AUTHENTICATE_MAX_SIZE) {
+		return FALSE;
+	}
+
+	/*
+	 * If the the request is exactly the chunk size, this is a fragment
+	 * and more data is expected.
+	 */
+	if (fragment_len == AUTHENTICATE_CHUNK_SIZE) {
+		server->sasl_buffer = enc_req;
+		return TRUE;
+	}
+
+	if (enc_req->len == 1 && *enc_req->str == '+') {
+		*decoded = g_string_new_len("", 0);
+	} else {
+		gsize dec_len;
+		gchar *tmp;
+
+		tmp = (gchar *) g_base64_decode(enc_req->str, &dec_len);
+		*decoded = g_string_new_len(tmp, dec_len);
+	}
+
+	g_string_free(enc_req, TRUE);
+	return TRUE;
+}
+
+/*
+ * Splits the response into appropriately sized chunks for the AUTHENTICATION
+ * command to be sent to the IRC server. If |response| is NULL, then the empty
+ * response is sent to the server.
+ */
+void sasl_send_response(IRC_SERVER_REC *server, GString *response)
+{
+	char *enc;
+	size_t offset, enc_len, chunk_len;
+
+	if (response == NULL) {
+		irc_send_cmdv(server, "AUTHENTICATE +");
+		return;
+	}
+
+	enc = g_base64_encode((guchar *) response->str, response->len);
+	enc_len = strlen(enc);
+
+	for (offset = 0; offset < enc_len; offset += AUTHENTICATE_CHUNK_SIZE) {
+		chunk_len = enc_len - offset;
+		if (chunk_len > AUTHENTICATE_CHUNK_SIZE)
+			chunk_len = AUTHENTICATE_CHUNK_SIZE;
+
+		irc_send_cmdv(server, "AUTHENTICATE %.*s", (int) chunk_len, enc + offset);
+	}
+
+	if (offset == enc_len) {
+		irc_send_cmdv(server, "AUTHENTICATE +");
+	}
+	g_free(enc);
+}
+
+/*
+ * Called when the incoming SASL request is completely received.
+ */
+static void sasl_step_complete(IRC_SERVER_REC *server, GString *data)
 {
 	IRC_SERVER_CONNECT_REC *conn;
-	GString *req;
-	char *enc_req;
+	GString *resp;
 
 	conn = server->connrec;
 
-	/* Stop the timer */
-	if (server->sasl_timeout != 0) {
-		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = 0;
-	}
-
 	switch (conn->sasl_mechanism) {
 		case SASL_MECHANISM_PLAIN:
 			/* At this point we assume that conn->sasl_{username, password} are non-NULL.
 			 * The PLAIN mechanism expects a NULL-separated string composed by the authorization identity, the
 			 * authentication identity and the password.
 			 * The authorization identity field is explicitly set to the user provided username.
-			 * The whole request is then encoded in base64. */
+			 */
 
-			req = g_string_new(NULL);
+			resp = g_string_new(NULL);
 
-			g_string_append(req, conn->sasl_username);
-			g_string_append_c(req, '\0');
-			g_string_append(req, conn->sasl_username);
-			g_string_append_c(req, '\0');
-			g_string_append(req, conn->sasl_password);
+			g_string_append(resp, conn->sasl_username);
+			g_string_append_c(resp, '\0');
+			g_string_append(resp, conn->sasl_username);
+			g_string_append_c(resp, '\0');
+			g_string_append(resp, conn->sasl_password);
 
-			enc_req = g_base64_encode((const guchar *)req->str, req->len);
+			sasl_send_response(server, resp);
+			g_string_free(resp, TRUE);
 
-			irc_send_cmdv(server, "AUTHENTICATE %s", enc_req);
-
-			g_free(enc_req);
-			g_string_free(req, TRUE);
 			break;
 
 		case SASL_MECHANISM_EXTERNAL:
 			/* Empty response */
-			irc_send_cmdv(server, "AUTHENTICATE +");
+			sasl_send_response(server, NULL);
 			break;
 	}
+}
+
+static void sasl_step_fail(IRC_SERVER_REC *server)
+{
+	irc_send_cmd_now(server, "AUTHENTICATE *");
+	cap_finish_negotiation(server);
+
+	server->sasl_timeout = 0;
+
+	signal_emit("server sasl failure", 2, server, "The server sent an invalid payload");
+}
+
+static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	GString *req = NULL;
+
+	/* Stop the timer */
+	if (server->sasl_timeout != 0) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = 0;
+	}
+
+	if (!sasl_reassemble_incoming(server, data, &req)) {
+		sasl_step_fail(server);
+		return;
+	}
+
+	if (req != NULL) {
+		sasl_step_complete(server, req);
+		g_string_free(req, TRUE);
+	}
 
 	/* We expect a response within a reasonable time */
 	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);

From b2424f31933309a0b3dfa6cb541c2917443a38d4 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 11 Sep 2016 16:59:21 +0200
Subject: [PATCH 0408/1650] Add a '-autorun' switch to /script reset

This way we reload all the scripts in the autorun folder.
---
 src/perl/perl-core.c |  2 +-
 src/perl/perl-core.h |  2 ++
 src/perl/perl-fe.c   | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index cb690906..2c61df70 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -393,7 +393,7 @@ int perl_get_api_version(void)
         return IRSSI_PERL_API_VERSION;
 }
 
-static void perl_scripts_autorun(void)
+void perl_scripts_autorun(void)
 {
 	DIR *dirp;
 	struct dirent *dp;
diff --git a/src/perl/perl-core.h b/src/perl/perl-core.h
index b451cc5c..7390a6fd 100644
--- a/src/perl/perl-core.h
+++ b/src/perl/perl-core.h
@@ -16,6 +16,8 @@ extern GSList *perl_scripts;
 void perl_scripts_init(void);
 /* Destroy all perl scripts and deinitialize perl interpreter */
 void perl_scripts_deinit(void);
+/* Load all the scripts in the autorun/ folder */
+void perl_scripts_autorun(void);
 
 /* Load a perl script, path must be a full path. */
 PERL_SCRIPT_REC *perl_script_load_file(const char *path);
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index 04305b63..396c80b7 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -119,8 +119,20 @@ static void cmd_script_unload(const char *data)
 
 static void cmd_script_reset(const char *data)
 {
+	void *free_arg;
+	GHashTable *optlist;
+
+	if (!cmd_get_params(data, &free_arg, 0 | PARAM_FLAG_OPTIONS,
+			    "script reset", &optlist))
+		return;
+
 	perl_scripts_deinit();
 	perl_scripts_init();
+
+	if (g_hash_table_lookup(optlist, "autorun") != NULL)
+		perl_scripts_autorun();
+
+	cmd_params_free(free_arg);
 }
 
 static void cmd_script_list(void)
@@ -251,6 +263,7 @@ void fe_perl_init(void)
 	command_bind("script list", NULL, (SIGNAL_FUNC) cmd_script_list);
 	command_bind("load", NULL, (SIGNAL_FUNC) cmd_load);
 	command_set_options("script exec", "permanent");
+	command_set_options("script reset", "autorun");
 
         signal_add("script error", (SIGNAL_FUNC) sig_script_error);
 	signal_add("complete command script load", (SIGNAL_FUNC) sig_complete_load);

From f492ec8abfad770e2566188e7d8721d75680e28e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 11 Sep 2016 17:05:03 +0200
Subject: [PATCH 0409/1650] Document the addition of the -autorun switch for
 /script reset.

---
 docs/help/in/script.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/help/in/script.in b/docs/help/in/script.in
index 6e94ef7f..e90135ad 100644
--- a/docs/help/in/script.in
+++ b/docs/help/in/script.in
@@ -12,6 +12,8 @@
     RESET:         Unloads all the scripts.
     -permanent:    In combination with EXEC, the code will be loaded into the
                    memory.
+    -autorun:      When passed to RESET the scripts in the autorun folder are
+                   reloaded.
 
     If no argument is given, the list of active scripts will be displayed.
 

From 9591afcb4b7157dd4b06b9c6390f70c725067b50 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 13 Sep 2016 16:07:48 +0200
Subject: [PATCH 0410/1650] Expose the CAP fields to the perl scripts.

---
 src/perl/irc/Irc.xs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 3f8ccc2e..8b3b0c45 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -11,12 +11,15 @@ static void perl_irc_connect_fill_hash(HV *hv, IRC_SERVER_CONNECT_REC *conn)
 
 static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 {
-       	perl_irc_connect_fill_hash(hv, server->connrec);
-       	perl_server_fill_hash(hv, (SERVER_REC *) server);
+	AV *av;
+	GSList *tmp;
 
-       	(void) hv_store(hv, "real_address", 12, new_pv(server->real_address), 0);
-       	(void) hv_store(hv, "usermode", 8, new_pv(server->usermode), 0);
-       	(void) hv_store(hv, "userhost", 8, new_pv(server->userhost), 0);
+	perl_irc_connect_fill_hash(hv, server->connrec);
+	perl_server_fill_hash(hv, (SERVER_REC *) server);
+
+	(void) hv_store(hv, "real_address", 12, new_pv(server->real_address), 0);
+	(void) hv_store(hv, "usermode", 8, new_pv(server->usermode), 0);
+	(void) hv_store(hv, "userhost", 8, new_pv(server->userhost), 0);
 
 	(void) hv_store(hv, "max_cmds_at_once", 16, newSViv(server->max_cmds_at_once), 0);
 	(void) hv_store(hv, "cmd_queue_speed", 15, newSViv(server->cmd_queue_speed), 0);
@@ -27,6 +30,18 @@ static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 	(void) hv_store(hv, "max_modes_in_cmd", 16, newSViv(server->max_modes_in_cmd), 0);
 	(void) hv_store(hv, "max_whois_in_cmd", 16, newSViv(server->max_whois_in_cmd), 0);
 	(void) hv_store(hv, "isupport_sent", 13, newSViv(server->isupport_sent), 0);
+
+	(void) hv_store(hv, "cap_complete", 12, newSViv(server->cap_complete), 0);
+
+	av = newAV();
+	for (tmp = server->cap_supported; tmp != NULL; tmp = tmp->next)
+		av_push(av, new_pv(tmp->data));
+	(void) hv_store(hv, "cap_supported", 13, newRV_noinc((SV*)av), 0);
+
+	av = newAV();
+	for (tmp = server->cap_active; tmp != NULL; tmp = tmp->next)
+		av_push(av, new_pv(tmp->data));
+	(void) hv_store(hv, "cap_active", 10, newRV_noinc((SV*)av), 0);
 }
 
 static void perl_ban_fill_hash(HV *hv, BAN_REC *ban)

From 21539019dd46ec88a3369b53cc0069b372c6d7d1 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 13 Sep 2016 17:11:05 +0200
Subject: [PATCH 0411/1650] Make sure to make a copy of ERRSV content.

Otherwise we might end up showing an empty message.
Fixes #522.
---
 src/perl/common/Expando.xs   | 4 +++-
 src/perl/textui/Statusbar.xs | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs
index bb5d185b..26800b05 100644
--- a/src/perl/common/Expando.xs
+++ b/src/perl/common/Expando.xs
@@ -85,7 +85,9 @@ static char *perl_expando_event(PerlExpando *rec, SERVER_REC *server,
 			script_unregister_expandos(script);
 		/* rec has been freed now */
 
-		signal_emit("script error", 2, script, SvPV_nolen(ERRSV));
+		char *error = g_strdup(SvPV_nolen(ERRSV));
+		signal_emit("script error", 2, script, error);
+		g_free(error);
 	} else if (retcount > 0) {
 		ret = g_strdup(POPp);
 		*free_ret = TRUE;
diff --git a/src/perl/textui/Statusbar.xs b/src/perl/textui/Statusbar.xs
index a449e11d..8b0e5f65 100644
--- a/src/perl/textui/Statusbar.xs
+++ b/src/perl/textui/Statusbar.xs
@@ -77,7 +77,10 @@ static void perl_statusbar_event(char *function, SBAR_ITEM_REC *item,
                         /* make sure we don't get back here */
 			script_unregister_statusbars(script);
 		}
-		signal_emit("script error", 2, script, SvPV_nolen(ERRSV));
+
+		char *error = g_strdup(SvPV_nolen(ERRSV));
+		signal_emit("script error", 2, script, error);
+		g_free(error);
 	} else {
 		/* min_size and max_size can be changed, move them to SBAR_ITEM_REC */
 		hv = hvref(item_sv);

From 31c0a9d7e8368e8cfa10356bd9dbc1f9024d9c70 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Sun, 4 Sep 2016 12:11:02 +0200
Subject: [PATCH 0412/1650] Merge pull request #533 from dequis/statusmess

Set the default STATUSMSG to @ instead of @+ if it's missing
---
 src/fe-common/irc/fe-irc-channels.c | 9 +++------
 src/irc/core/irc-servers.c          | 6 ++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index a2737fc3..0ec30003 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -41,7 +41,7 @@ int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
 
 	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
 	if (statusmsg == NULL)
-		statusmsg = "@+";
+		statusmsg = "@";
 
 	return strchr(statusmsg, *target) != NULL;
 }
@@ -61,12 +61,9 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
 	statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
 
 	/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
-	 * WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
-	if (statusmsg == NULL && *target != '@')
-		return target;
-
+	 * WALLCHOPS in 005 */
 	if (statusmsg == NULL)
-		statusmsg = "@+";
+		statusmsg = "@";
 
 	/* Strip the leading statusmsg prefixes */
 	while (strchr(statusmsg, *target) != NULL) {
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 1df95f70..f905a862 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -89,8 +89,10 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
 	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg != NULL)
-		data += strspn(data, statusmsg);
+	if (statusmsg == NULL)
+		statusmsg = "@";
+
+	data += strspn(data, statusmsg);
 
 	/* strchr(3) considers the trailing NUL as part of the string, make sure
 	 * we didn't advance too much. */

From 3c29b4440841e867fe804ec5351884d90d9d8bcf Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 25 Aug 2016 04:24:07 +0200
Subject: [PATCH 0413/1650] Merge pull request #529 from ailin-nemui/issue500

fix nick->host == NULL crash
---
 src/fe-common/core/fe-messages.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 3240fd10..8ad83753 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -602,9 +602,6 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
 	char *nickhost, *p;
 	int n;
 
-	if (nick->host == NULL)
-                return;
-
 	firstnick = g_hash_table_lookup(channel->nicks, nick->nick);
 	if (firstnick->next == NULL)
 		return;
@@ -617,6 +614,9 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
                         return; /* nope, we have it */
 	}
 
+	if (nick->host == NULL)
+                return;
+
 	/* identical nick already exists, have to change it somehow.. */
 	p = strchr(nick->host, '@');
 	if (p == NULL) p = nick->host; else p++;

From 6b212be112e33a536d08f31abf186a699ee8da51 Mon Sep 17 00:00:00 2001
From: dx <dx@dxzone.com.ar>
Date: Sun, 17 Jul 2016 12:37:57 -0300
Subject: [PATCH 0414/1650] Merge pull request #518 from vague666/hilight_help
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wrong order in the arguments in /hilight example, -mask doesn't take …
---
 docs/help/in/hilight.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/hilight.in b/docs/help/in/hilight.in
index fabbc2ea..cd91560b 100644
--- a/docs/help/in/hilight.in
+++ b/docs/help/in/hilight.in
@@ -31,7 +31,7 @@
     /HILIGHT
     /HILIGHT mike
     /HILIGHT -regexp mi+ke+
-    /HILIGHT -mask bob!*@*.irssi.org -color %%G
+    /HILIGHT -mask -color %%G bob!*@*.irssi.org
     /HILIGHT -full -color %%G -actcolor %%Y redbull
 
 %9References:%9

From e68817f82bc9dde71bb28975cee7ed70cc98ff30 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 12 Jul 2016 16:11:04 +0200
Subject: [PATCH 0415/1650] Merge pull request #515 from LemonBoy/signal-proto

Correct the prototype for the 'message private' signal.
---
 docs/signals.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 8b71fd95..5e03d901 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -260,7 +260,7 @@ fe-exec.c:
 
 fe-messages.c:
  "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
- "message private", SERVER_REC, char *msg, char *nick, char *address
+ "message private", SERVER_REC, char *msg, char *nick, char *address, char *target
  "message own_public", SERVER_REC, char *msg, char *target
  "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
  "message join", SERVER_REC, char *channel, char *nick, char *address

From 8cbf5f28f2028fd6fc58232c76f67ab574ecab11 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 29 Mar 2016 22:45:47 +0200
Subject: [PATCH 0416/1650] Merge pull request #461 from ailin-nemui/fix_squery

Revert "Removed the obsolete SQUERY and SERVLIST commands"
---
 docs/help/in/list.in        |  6 +++---
 docs/help/in/servlist.in    | 23 +++++++++++++++++++++++
 docs/help/in/squery.in      | 16 ++++++++++++++++
 src/irc/core/irc-commands.c |  6 ++++++
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 docs/help/in/servlist.in
 create mode 100644 docs/help/in/squery.in

diff --git a/docs/help/in/list.in b/docs/help/in/list.in
index 33f05e8b..b796eed0 100644
--- a/docs/help/in/list.in
+++ b/docs/help/in/list.in
@@ -25,10 +25,10 @@
 %9Remarks:%9
 
     Not all networks support server-side filtering and may provide a network
-    service instead; on IRCnet, you may use the ALIS service:
+    service or service bot instead; on IRCnet, you may use the List service:
 
-    /QUOTE SQUERY ALIS :HELP
+    /SQUERY List HELP
     /MSG ALIS HELP
 
-%9See also:%9 QUOTE, STATS, WHOIS
+%9See also:%9 STATS, SQUERY, WHOIS
 
diff --git a/docs/help/in/servlist.in b/docs/help/in/servlist.in
new file mode 100644
index 00000000..0a0d025f
--- /dev/null
+++ b/docs/help/in/servlist.in
@@ -0,0 +1,23 @@
+
+%9Syntax:%9
+
+@SYNTAX:servlist@
+
+%9Parameters:%9
+
+    <mask> limits the output to the services which names matches
+           the mask.
+    <type> limits the output to the services of the specified type.
+
+%9Description:%9
+
+    List the network services currently present on the
+    IRC network.
+
+%9Examples:%9
+
+    /SERVLIST *@javairc.*
+    /SERVLIST * 0xD000
+
+%9See also:%9 SQUERY
+
diff --git a/docs/help/in/squery.in b/docs/help/in/squery.in
new file mode 100644
index 00000000..59ee8008
--- /dev/null
+++ b/docs/help/in/squery.in
@@ -0,0 +1,16 @@
+
+%9Syntax:%9
+
+@SYNTAX:squery@
+
+%9Parameters:%9
+
+    <service> - Service nickname or full hostmask of service to query.
+    <message> - Message to send to the service.
+
+%9Description:%9
+
+    /SQUERY sends a query to the specified service.
+
+%9See also:%9 SERVLIST, LIST, MSG
+
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 6baf2f6d..32ee8845 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -1018,11 +1018,15 @@ void irc_commands_init(void)
 	command_bind_irc("trace", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: VERSION [<server>|<nick>] */
 	command_bind_irc("version", NULL, (SIGNAL_FUNC) command_self);
+	/* SYNTAX: SERVLIST [<mask> [<type>]] */
+	command_bind_irc("servlist", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: SILENCE [[+|-]<nick!user@host>]
 	           SILENCE [<nick>] */
 	command_bind_irc("silence", NULL, (SIGNAL_FUNC) command_self);
 	command_bind_irc("unsilence", NULL, (SIGNAL_FUNC) cmd_unsilence);
 	command_bind_irc("sconnect", NULL, (SIGNAL_FUNC) cmd_sconnect);
+	/* SYNTAX: SQUERY <service> [<message>] */
+	command_bind_irc("squery", NULL, (SIGNAL_FUNC) command_2self);
 	/* SYNTAX: DIE */
 	command_bind_irc("die", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: HASH */
@@ -1091,9 +1095,11 @@ void irc_commands_deinit(void)
 	command_unbind("time", (SIGNAL_FUNC) command_self);
 	command_unbind("trace", (SIGNAL_FUNC) command_self);
 	command_unbind("version", (SIGNAL_FUNC) command_self);
+	command_unbind("servlist", (SIGNAL_FUNC) command_self);
 	command_unbind("silence", (SIGNAL_FUNC) command_self);
 	command_unbind("unsilence", (SIGNAL_FUNC) cmd_unsilence);
 	command_unbind("sconnect", (SIGNAL_FUNC) cmd_sconnect);
+	command_unbind("squery", (SIGNAL_FUNC) command_2self);
 	command_unbind("die", (SIGNAL_FUNC) command_self);
 	command_unbind("hash", (SIGNAL_FUNC) command_self);
 	command_unbind("oper", (SIGNAL_FUNC) cmd_oper);

From 2c5856d832c9cc7f2a995e9017b4436d752c68c3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 7 Apr 2016 12:33:03 +0200
Subject: [PATCH 0417/1650] Merge pull request #467 from dequis/EAI_SYSTEM

net_gethosterror: Handle EAI_SYSTEM ("System error") properly
---
 src/core/network.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/network.c b/src/core/network.c
index 0751aa95..c3ad4e23 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -585,7 +585,11 @@ const char *net_gethosterror(int error)
 #ifdef HAVE_IPV6
 	g_return_val_if_fail(error != 0, NULL);
 
-	return gai_strerror(error);
+	if (error == EAI_SYSTEM) {
+		return strerror(errno);
+	} else {
+		return gai_strerror(error);
+	}
 #else
 	switch (error) {
 	case HOST_NOT_FOUND:

From 7455ad51d43ad925a613ff90e3b6d3c866b2fe7b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 30 Apr 2016 10:19:57 +0200
Subject: [PATCH 0418/1650] Merge pull request #477 from dennisschagt/master

Correct error/typo "You"->"Your" in help message
---
 docs/help/in/away.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/away.in b/docs/help/in/away.in
index e0cf3685..75bc46c4 100644
--- a/docs/help/in/away.in
+++ b/docs/help/in/away.in
@@ -8,8 +8,8 @@
    -one:    Marks yourself as away on the active server.
    -all:    Marks yourself as away on all the servers you are connected to.
 
-   You away message; if no argument is given, your away status will be removed.
-   
+   Your away message; if no argument is given, your away status will be removed.
+
 %9Description:%9
 
     Marks yourself as 'away'; this method is used to inform people that you

From 52fedeaf0229e27f9d86b72b23f16120c92c1fea Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Sep 2016 13:34:39 +0200
Subject: [PATCH 0419/1650] Update NEWS for 0.8.20

---
 NEWS | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/NEWS b/NEWS
index 65aab5ed..265827b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+v0.8.20 2016-09-16  The Irssi team <staff@irssi.org>
+	- Correct the name of an emitted sasl signal (#484)
+	- Correct the prototype for the 'message private' signal (#515)
+	- Corrections in away and hilight help text (#477, #518)
+	- /squery and /servlist commands have been restored.
+	- Where Irssi would previously only report "System error" on connect,
+	  it will now try harder to retrieve the system error message.
+	- Fixed issue with +channels not working properly (#533)
+	- Fixed crash in optchan when item has no server (#485)
+	- Fixed random remote crash in the nicklist handling (#529)
+	- Fixed remote crash due to incorrect bounds checking on
+	  formats, reported by Gabriel Campana and Adrien Guinet from
+	  Quarkslab.
+
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 	- Fixed regression when joining and parting channels on IRCnet (#435)
 	- Fixed SASL EXTERNAL (#432)

From 9de7a9b3284b06631a47609a83e608cfe0541de1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Sep 2016 13:44:51 +0200
Subject: [PATCH 0420/1650] Merge branch 'quarkslab'

---
 src/fe-common/core/formats.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index ccf48394..d9a51201 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -131,6 +131,8 @@ void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *
 	unsigned char rgbx[4];
 	unsigned int i;
 	for (i = 0; i < 4; ++i) {
+		if ((*ptr)[i + off] == '\0')
+			return;
 		rgbx[i] = (*ptr)[i + off];
 	}
 	rgbx[3] -= 0x20;
@@ -1357,6 +1359,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 					bgcolor = *ptr==(char)0xff ? -1 : *ptr-'0';
 				}
 			}
+			if (*ptr == '\0')
+				break;
+
 			ptr++;
 			break;
 		case 6:

From 13f4026ae0f0d5422f3163576d4c2eff8754176a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Sep 2016 13:55:20 +0200
Subject: [PATCH 0421/1650] tag as 0.8.20

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b25e7286..458c8aa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.19)
+AC_INIT(irssi, 0.8.20)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 0e0d99587a9e2daa091d48adedfbf420cad21758 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 15 Sep 2016 13:59:52 +0200
Subject: [PATCH 0422/1650] Expose 'cap_toggle' to the perl scripts.

---
 src/perl/irc/Server.xs | 9 +++++++++
 src/perl/irc/module.h  | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs
index 0e9ec672..33417bf5 100644
--- a/src/perl/irc/Server.xs
+++ b/src/perl/irc/Server.xs
@@ -149,3 +149,12 @@ CODE:
 OUTPUT:
 	RETVAL
 
+int
+irc_server_cap_toggle(server, cap, enable)
+	Irssi::Irc::Server server
+	char *cap
+	int enable
+CODE:
+	RETVAL = cap_toggle(server, cap, enable);
+OUTPUT:
+	RETVAL
diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h
index 91c19c7a..a2454545 100644
--- a/src/perl/irc/module.h
+++ b/src/perl/irc/module.h
@@ -6,6 +6,7 @@
 #include "irc-queries.h"
 #include "irc-nicklist.h"
 #include "irc-masks.h"
+#include "irc-cap.h"
 
 #include "bans.h"
 #include "modes.h"

From 295a4b77f07f14602eeaa371f00ddbf09910c82b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Sep 2016 13:37:29 +0200
Subject: [PATCH 0423/1650] Patches for heap corruption and missing bounds
 check

By Gabriel Campana and Adrien Guinet from Quarkslab.
---
 src/fe-common/core/formats.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 3e88426f..9aa7698d 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -131,6 +131,8 @@ void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *
 	unsigned char rgbx[4];
 	unsigned int i;
 	for (i = 0; i < 4; ++i) {
+		if ((*ptr)[i + off] == '\0')
+			return;
 		rgbx[i] = (*ptr)[i + off];
 	}
 	rgbx[3] -= 0x20;
@@ -1341,6 +1343,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 					bgcolor = *ptr==(char)0xff ? -1 : *ptr-'0';
 				}
 			}
+			if (*ptr == '\0')
+				break;
+
 			ptr++;
 			break;
 		case 6:

From 20b5d4d9826add4f1fc6949a0b1406953fa7bacb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Sep 2016 13:34:39 +0200
Subject: [PATCH 0424/1650] Update NEWS for 0.8.20

---
 NEWS | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 6666400d..a76771e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v0.8.20-head 2016-xx-xx  The Irssi team <staff@irssi.org>
+v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	* Removed --disable-ipv6
 	* /connect Network now aborts with an error if no servers have been
 	  added to that network.
@@ -17,14 +17,25 @@ v0.8.20-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	+ autolog_ignore_targets and activity_hide_targets learn a new syntax
 	      tag/* and * to ignore whole networks or everything.
 	+ /hilight got a -matchcase flag to hilight case sensitively (#421).
-	- /squery and /servlist commands have been restored.
-	- Where Irssi would previously only report "System error" on connect,
-	  it will now try harder to retrieve the system error message.
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
 	- Removed broken support for curses.
 
+v0.8.20 2016-09-16  The Irssi team <staff@irssi.org>
+	- Correct the name of an emitted sasl signal (#484)
+	- Correct the prototype for the 'message private' signal (#515)
+	- Corrections in away and hilight help text (#477, #518)
+	- /squery and /servlist commands have been restored.
+	- Where Irssi would previously only report "System error" on connect,
+	  it will now try harder to retrieve the system error message.
+	- Fixed issue with +channels not working properly (#533)
+	- Fixed crash in optchan when item has no server (#485)
+	- Fixed random remote crash in the nicklist handling (#529)
+	- Fixed remote crash due to incorrect bounds checking on
+	  formats, reported by Gabriel Campana and Adrien Guinet from
+	  Quarkslab.
+
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 	- Fixed regression when joining and parting channels on IRCnet (#435)
 	- Fixed SASL EXTERNAL (#432)

From d39ad6e559ae91cf1654c1c8371ad75f8ae7afad Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 22 Sep 2016 04:21:15 +0200
Subject: [PATCH 0425/1650] sync buf.pl

---
 scripts/buf.pl | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/scripts/buf.pl b/scripts/buf.pl
index da50e821..6d907f12 100644
--- a/scripts/buf.pl
+++ b/scripts/buf.pl
@@ -5,7 +5,7 @@ use Irssi qw(command signal_add signal_add_first active_win
              settings_get_str settings_get_bool channels windows
 	     settings_add_str settings_add_bool get_irssi_dir
 	     window_find_refnum signal_stop);
-$VERSION = '2.13';
+$VERSION = '2.20';
 %IRSSI = (
     authors	=> 'Juerd',
     contact	=> 'juerd@juerd.nl',
@@ -13,10 +13,8 @@ $VERSION = '2.13';
     description	=> 'Saves the buffer for /upgrade, so that no information is lost',
     license	=> 'Public Domain',
     url		=> 'http://juerd.nl/irssi/',
-    changed	=> 'Mon May 13 19:41 CET 2002',
-    changes	=> 'Severe formatting bug removed * oops, I ' .
-                   'exposed Irssi to ircII foolishness * sorry ' .
-		   '** removed logging stuff (this is a fix)',
+    changed	=> 'Thu Sep 22 01:37 CEST 2016',
+    changes	=> 'Fixed file permissions (leaked everything via filesystem)',
     note1	=> 'This script HAS TO BE in your scripts/autorun!',
     note2	=> 'Perl support must be static or in startup',
 );
@@ -39,9 +37,15 @@ use Data::Dumper;
 
 my %suppress;
 
+sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir }
+
 sub upgrade {
-    open BUF, q{>}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
-    print BUF join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
+    my $fn = _filename;
+    my $old_umask = umask 0077;
+    open my $fh, q{>}, $fn or die "open $fn: $!";
+    umask $old_umask;
+
+    print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
     for my $window (windows) {
 	next unless defined $window;
 	next if $window->{name} eq 'status';
@@ -57,36 +61,39 @@ sub upgrade {
 		redo if defined $line;
 	    }
 	}
-	printf BUF "%s:%s\n%s", $window->{refnum}, $lines, $buf;
+	printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf;
     }
-    close BUF;
+    close $fh;
     unlink sprintf("%s/sessionconfig", get_irssi_dir);
     command 'layout save';
     command 'save';
 }
 
 sub restore {
-    open BUF, q{<}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
-    my @suppress = split /\0/, <BUF>;
+    my $fn = _filename;
+    open my $fh, q{<}, $fn or die "open $fn: $!";
+    unlink $fn or warn "unlink $fn: $!";
+
+    my @suppress = split /\0/, readline $fh;
     if (settings_get_bool 'upgrade_suppress_join') {
 	chomp $suppress[-1];
 	@suppress{@suppress} = (2) x @suppress;
     }
     active_win->command('^window scroll off');
-    while (my $bla = <BUF>){
+    while (my $bla = readline $fh){
 	chomp $bla;
 	my ($refnum, $lines) = split /:/, $bla;
 	next unless $lines;
 	my $window = window_find_refnum $refnum;
 	unless (defined $window){
-	    <BUF> for 1..$lines;
+	    readline $fh for 1..$lines;
 	    next;
 	}
 	my $view = $window->view;
 	$view->remove_all_lines();
 	$view->redraw();
 	my $buf = '';
-	$buf .= <BUF> for 1..$lines;
+	$buf .= readline $fh for 1..$lines;
 	my $sep = settings_get_str 'upgrade_separator';
 	$sep .= "\n" if $sep ne '';
 	$window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep");
@@ -119,3 +126,10 @@ signal_add       'event join'      => 'suppress';
 unless (-f sprintf('%s/scripts/autorun/buf.pl', get_irssi_dir)) {
     Irssi::print('PUT THIS SCRIPT IN ~/.irssi/scripts/autorun/ BEFORE /UPGRADING!!');
 }
+
+# Remove any left-over file. If 'session' doesn't exist (created by irssi
+# during /UPGRADE), neither should our file.
+unless (-e sprintf('%s/session', get_irssi_dir)) {
+    my $fn = _filename;
+    unlink $fn or warn "unlink $fn: $!" if -e $fn;
+}

From f9fd50a35711f8f5637c57c276f12410dde9ec9e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 25 Sep 2016 23:17:20 +0200
Subject: [PATCH 0426/1650] nullptr when doing module backward compat on
 invalid config

---
 src/core/settings.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/settings.c b/src/core/settings.c
index e65ceb2c..4e0717cd 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -585,6 +585,7 @@ void settings_check_module(const char *module)
 	for (; tmp != NULL; tmp = next) {
 		node = tmp->data;
 		next = config_node_next(tmp);
+		if (node->key == NULL) continue;
 
 		set = g_hash_table_lookup(settings, node->key);
 		if (backwards_compatibility(module, node, parent))

From eb20a6c846373bbfba4cd80e6aef017b56409047 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 22 Sep 2016 04:27:35 +0200
Subject: [PATCH 0427/1650] Merge pull request #548 from ailin-nemui/buf-fix

sync buf.pl
---
 scripts/buf.pl | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/scripts/buf.pl b/scripts/buf.pl
index da50e821..6d907f12 100644
--- a/scripts/buf.pl
+++ b/scripts/buf.pl
@@ -5,7 +5,7 @@ use Irssi qw(command signal_add signal_add_first active_win
              settings_get_str settings_get_bool channels windows
 	     settings_add_str settings_add_bool get_irssi_dir
 	     window_find_refnum signal_stop);
-$VERSION = '2.13';
+$VERSION = '2.20';
 %IRSSI = (
     authors	=> 'Juerd',
     contact	=> 'juerd@juerd.nl',
@@ -13,10 +13,8 @@ $VERSION = '2.13';
     description	=> 'Saves the buffer for /upgrade, so that no information is lost',
     license	=> 'Public Domain',
     url		=> 'http://juerd.nl/irssi/',
-    changed	=> 'Mon May 13 19:41 CET 2002',
-    changes	=> 'Severe formatting bug removed * oops, I ' .
-                   'exposed Irssi to ircII foolishness * sorry ' .
-		   '** removed logging stuff (this is a fix)',
+    changed	=> 'Thu Sep 22 01:37 CEST 2016',
+    changes	=> 'Fixed file permissions (leaked everything via filesystem)',
     note1	=> 'This script HAS TO BE in your scripts/autorun!',
     note2	=> 'Perl support must be static or in startup',
 );
@@ -39,9 +37,15 @@ use Data::Dumper;
 
 my %suppress;
 
+sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir }
+
 sub upgrade {
-    open BUF, q{>}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
-    print BUF join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
+    my $fn = _filename;
+    my $old_umask = umask 0077;
+    open my $fh, q{>}, $fn or die "open $fn: $!";
+    umask $old_umask;
+
+    print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
     for my $window (windows) {
 	next unless defined $window;
 	next if $window->{name} eq 'status';
@@ -57,36 +61,39 @@ sub upgrade {
 		redo if defined $line;
 	    }
 	}
-	printf BUF "%s:%s\n%s", $window->{refnum}, $lines, $buf;
+	printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf;
     }
-    close BUF;
+    close $fh;
     unlink sprintf("%s/sessionconfig", get_irssi_dir);
     command 'layout save';
     command 'save';
 }
 
 sub restore {
-    open BUF, q{<}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
-    my @suppress = split /\0/, <BUF>;
+    my $fn = _filename;
+    open my $fh, q{<}, $fn or die "open $fn: $!";
+    unlink $fn or warn "unlink $fn: $!";
+
+    my @suppress = split /\0/, readline $fh;
     if (settings_get_bool 'upgrade_suppress_join') {
 	chomp $suppress[-1];
 	@suppress{@suppress} = (2) x @suppress;
     }
     active_win->command('^window scroll off');
-    while (my $bla = <BUF>){
+    while (my $bla = readline $fh){
 	chomp $bla;
 	my ($refnum, $lines) = split /:/, $bla;
 	next unless $lines;
 	my $window = window_find_refnum $refnum;
 	unless (defined $window){
-	    <BUF> for 1..$lines;
+	    readline $fh for 1..$lines;
 	    next;
 	}
 	my $view = $window->view;
 	$view->remove_all_lines();
 	$view->redraw();
 	my $buf = '';
-	$buf .= <BUF> for 1..$lines;
+	$buf .= readline $fh for 1..$lines;
 	my $sep = settings_get_str 'upgrade_separator';
 	$sep .= "\n" if $sep ne '';
 	$window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep");
@@ -119,3 +126,10 @@ signal_add       'event join'      => 'suppress';
 unless (-f sprintf('%s/scripts/autorun/buf.pl', get_irssi_dir)) {
     Irssi::print('PUT THIS SCRIPT IN ~/.irssi/scripts/autorun/ BEFORE /UPGRADING!!');
 }
+
+# Remove any left-over file. If 'session' doesn't exist (created by irssi
+# during /UPGRADE), neither should our file.
+unless (-e sprintf('%s/session', get_irssi_dir)) {
+    my $fn = _filename;
+    unlink $fn or warn "unlink $fn: $!" if -e $fn;
+}

From 3667fd9fd1decef637ef28fdc8d89fe3595e009a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 30 Sep 2016 19:30:43 +0200
Subject: [PATCH 0428/1650] Make the cap_complete field unsigned.

Fixes a problem where the field would end up as a negative number when
exposed to the perl scripts.
And move it near the other bit-packed fields so we take advantage of the
packing.
---
 src/irc/core/irc-servers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index ecf65ac2..bb100f86 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -67,6 +67,7 @@ struct _IRC_SERVER_REC {
 	unsigned int nick_collision:1; /* We're just now being killed because of nick collision */
 	unsigned int motd_got:1; /* We've received MOTD */
 	unsigned int isupport_sent:1; /* Server has sent us an isupport reply */
+	unsigned int cap_complete:1; /* We've done the initial CAP negotiation */
 
 	int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */
 	int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */
@@ -76,7 +77,6 @@ struct _IRC_SERVER_REC {
 	GSList *cap_supported; /* A list of caps supported by the server */
 	GSList *cap_active;    /* A list of caps active for this session */
 	GSList *cap_queue;     /* A list of caps to request on connection */ 
-	int cap_complete:1;    /* We've done the initial CAP negotiation */
 
 	GString *sasl_buffer; /* Buffer used to reassemble a fragmented SASL payload */
 	guint sasl_timeout;   /* Holds the source id of the running timeout */

From d02ef83d03d8ef1c8bd577ef3bbb8325ed3ca8d3 Mon Sep 17 00:00:00 2001
From: Thomas Samson <tsamson@advanced-schema.com>
Date: Wed, 5 Oct 2016 01:01:25 +0200
Subject: [PATCH 0429/1650] update INSTALL requirement: terminfo or ncurses for
 text frontend

---
 INSTALL | 1 +
 1 file changed, 1 insertion(+)

diff --git a/INSTALL b/INSTALL
index 5e6e2be0..629a75c6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,6 +8,7 @@ To compile irssi you need:
 - pkg-config
 - openssl (for ssl support)
 - perl-5.6 or greater (for perl support)
+- terminfo or ncurses (for text frontend)
 
 For most people, this should work just fine:
 

From 6300dfec71d376c96351708f76a6c4ee4a187eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 13:13:02 +0200
Subject: [PATCH 0430/1650] Always build irssi with TLS support.

This patch removes the optional checks for whether to build irssi with
TLS support or not. This will allow us to ship a default configuration
file where we connect to TLS enabled IRC servers out of the box.
---
 NEWS                       |  1 +
 configure.ac               | 51 +++++---------------------------------
 src/core/network-openssl.c | 10 --------
 src/core/servers.c         |  4 ---
 4 files changed, 7 insertions(+), 59 deletions(-)

diff --git a/NEWS b/NEWS
index a76771e7..ca6ecce3 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	+ autolog_ignore_targets and activity_hide_targets learn a new syntax
 	      tag/* and * to ignore whole networks or everything.
 	+ /hilight got a -matchcase flag to hilight case sensitively (#421).
+	+ Always build irssi with TLS support.
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
diff --git a/configure.ac b/configure.ac
index ee03eb82..629dd590 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,14 +153,6 @@ AC_ARG_ENABLE(true-color,
 	fi,
 	want_truecolor=no)
 
-dnl **
-dnl ** SSL Library checks (OpenSSL)
-dnl **
-
-AC_ARG_ENABLE(ssl,
-[  --disable-ssl           Disable Secure Sockets Layer support],,
-	enable_ssl=yes)
-
 dnl **
 dnl ** just some generic stuff...
 dnl **
@@ -238,6 +230,11 @@ if test "x$want_socks" = "xyes"; then
 	])
 fi
 
+dnl **
+dnl ** OpenSSL checks
+dnl **
+AC_CHECK_LIB([ssl], [SSL_library_init])
+
 dnl **
 dnl ** fe-text checks
 dnl **
@@ -279,27 +276,7 @@ if test -z "$GLIB_LIBS"; then
   AC_ERROR([GLIB is required to build irssi.])
 fi
 
-LIBS="$LIBS $GLIB_LIBS"
-
-have_openssl=no
-if test "$enable_ssl" = "yes"; then
-  PKG_CHECK_MODULES(SSL, openssl, :, :)
-  if test "$SSL_LIBS"; then
-    CFLAGS="$CFLAGS $SSL_CFLAGS"
-    have_openssl=yes
-  else
-    AC_CHECK_LIB(ssl, SSL_read, [
-      AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [
-	SSL_LIBS="-lssl -lcrypto"
-	have_openssl=yes
-      ])
-    ],, -lcrypto)
-  fi
-  if test "$have_openssl" = "yes"; then
-    AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support)
-    LIBS="$LIBS $SSL_LIBS"
-  fi
-fi
+LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto"
 
 dnl **
 dnl ** curses checks
@@ -569,12 +546,6 @@ if test "x$want_dane" = "xyes"; then
 		AC_DEFINE([HAVE_DANE], [], [DANE support])
 		have_dane=yes
 	], [], [-lssl -lcrypto -lsres -lpthread])
-
-	if test x$have_dane = "xyes" ; then
-		if test x$have_openssl = "xno" ; then
-			AC_ERROR([SSL is required to build Irssi with DANE support enabled.])
-		fi
-	fi
 fi
 
 if test "x$want_truecolor" = "xyes"; then
@@ -695,16 +666,6 @@ echo "Install prefix ................... : $prefix"
 
 echo
 
-echo "Building with SSL support ........ : $have_openssl"
-if test "x$have_openssl" = "xno" -a "x$enable_ssl" = "xyes"; then
-  if test -f /etc/debian_version; then
-    echo " - Try: sudo apt-get install libssl-dev"
-  elif test -f /etc/redhat-release; then
-    echo " - Try installing openssl-devel"
-  else
-    echo " - Try installing OpenSSL development headers"
-  fi
-fi
 echo "Building with 64bit DCC support .. : $offt_64bit"
 echo "Building with DANE support ....... : $have_dane"
 echo "Building with true color support.. : $want_truecolor"
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index a18e6fc7..014f0a28 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -23,8 +23,6 @@
 #include "misc.h"
 #include "servers.h"
 
-#ifdef HAVE_OPENSSL
-
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
@@ -620,13 +618,5 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	return ret ? 0 : -1;
 }
 
-#else /* HAVE_OPENSSL */
 
-GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server)
-{
-	g_warning("Connection failed: SSL support not enabled in this build.");
-	errno = ENOSYS;
-	return NULL;
-}
 
-#endif /* ! HAVE_OPENSSL */
diff --git a/src/core/servers.c b/src/core/servers.c
index d6297c4d..dfcbcde0 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -167,7 +167,6 @@ static void server_connect_callback_init(SERVER_REC *server, GIOChannel *handle)
 	server_connect_finished(server);
 }
 
-#ifdef HAVE_OPENSSL
 static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *handle)
 {
 	int error;
@@ -198,7 +197,6 @@ static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *han
 
 	server_connect_finished(server);
 }
-#endif
 
 static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 				const char *unix_socket)
@@ -247,11 +245,9 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		g_free(errmsg2);
 	} else {
 		server->handle = net_sendbuffer_create(handle, 0);
-#ifdef HAVE_OPENSSL
 		if (server->connrec->use_ssl)
 			server_connect_callback_init_ssl(server, handle);
 		else
-#endif
 		server->connect_tag =
 			g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
 				    (GInputFunction)

From da67d3e8e69eb5fb702a3dd39356d38a1ee9d8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 13:20:14 +0200
Subject: [PATCH 0431/1650] Add function to convert a buffer to a
 colon-delimited hex string.

This patch adds binary_to_hex(), which can take an input buffer and
convert it to colon-delimited hex strings suitable for printing for
fingerprints.
---
 src/core/misc.c | 20 ++++++++++++++++++++
 src/core/misc.h |  4 ++++
 2 files changed, 24 insertions(+)

diff --git a/src/core/misc.c b/src/core/misc.c
index bc9f504e..0bb1f7e6 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -930,3 +930,23 @@ char **strsplit_len(const char *str, int len, gboolean onspace)
 
 	return ret;
 }
+
+char *binary_to_hex(unsigned char *buffer, size_t size)
+{
+	static const char hex[] = "0123456789ABCDEF";
+	char *result = NULL;
+	int i;
+
+	if (buffer == NULL || size == 0)
+		return NULL;
+
+	result = g_malloc(3 * size);
+
+	for (i = 0; i < size; i++) {
+		result[i * 3 + 0] = hex[(buffer[i] >> 4) & 0xf];
+		result[i * 3 + 1] = hex[(buffer[i] >> 0) & 0xf];
+		result[i * 3 + 2] = i == size - 1 ? '\0' : ':';
+	}
+
+	return result;
+}
diff --git a/src/core/misc.h b/src/core/misc.h
index c095e131..00637da0 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -109,4 +109,8 @@ int find_substr(const char *list, const char *item);
 /* split `str' into `len' sized substrings */
 char **strsplit_len(const char *str, int len, gboolean onspace);
 
+/* Convert a given buffer to a printable, colon-delimited, hex string and
+ * return a pointer to the newly allocated buffer */
+char *binary_to_hex(unsigned char *buffer, size_t size);
+
 #endif

From 2be7289085d6969e6774ce3909f0224b1d689f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 13:46:58 +0200
Subject: [PATCH 0432/1650] Rename SSL to TLS.

This patch changes the internal name of SSL to TLS. We also add -tls_*
options to /CONNECT and /SERVER, but make sure that the -ssl_* versions
of the commands continue to work like before.
---
 NEWS                              |   3 +
 docs/help/in/connect.in           |  33 +++++----
 docs/help/in/server.in            |  64 ++++++++---------
 src/core/chat-commands.c          |  44 ++++++------
 src/core/network-openssl.c        |  17 ++---
 src/core/server-connect-rec.h     |  16 ++---
 src/core/server-setup-rec.h       |  16 ++---
 src/core/servers-reconnect.c      |  14 ++--
 src/core/servers-setup.c          | 114 +++++++++++++++++++-----------
 src/core/servers.c                |  28 ++++----
 src/core/session.c                |  17 +++--
 src/fe-common/core/fe-server.c    |  60 ++++++++++------
 src/fe-common/irc/fe-irc-server.c |  30 ++++----
 src/irc/core/irc-servers.c        |   4 +-
 src/perl/perl-common.c            |   3 +-
 15 files changed, 255 insertions(+), 208 deletions(-)

diff --git a/NEWS b/NEWS
index ca6ecce3..8ecccc57 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	      tag/* and * to ignore whole networks or everything.
 	+ /hilight got a -matchcase flag to hilight case sensitively (#421).
 	+ Always build irssi with TLS support.
+	+ Rename SSL to TLS in the code and add -tls_* versions of the -ssl_*
+	  options to /CONNECT and /SERVER, but make sure the -ssl_* options continue
+	  to work.
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index df50d1b9..a0d793d2 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -5,23 +5,22 @@
 
 %9Parameters:%9
 
-    -4:             Connects using IPv4.
-    -6:             Connects using IPv6.
-    -ssl:           Connects using SSL encryption.
-    -ssl_cert:      The SSL client certificate file.
-    -ssl_pkey:      The SSL client private key, if not included in the
-                    certificate file.
-    -ssl_pass:      The password for the SSL client private key or certificate.
-    -ssl_verify:    Verifies the SSL certificate of the server.
-    -ssl_cafile:    The file with the list of CA certificates.
-    -ssl_capath:    The directory which contains the CA certificates.
-    -ssl_ciphers:   SSL cipher suite preference lists.
-    -noproxy:       Ignores the global proxy configuration.
-    -network:       The network this connection belongs to.
-    -host:          The hostname you would like to connect from.
-    -rawlog:        Immediately open rawlog after connecting.
-    -!:             Doesn't autojoin channels.
-    -noautosendcmd: Doesn't execute autosendcmd.
+    -4:                 Connects using IPv4.
+    -6:                 Connects using IPv6.
+    -tls:               Connects using TLS encryption.
+    -tls_cert:          The TLS client certificate file.
+    -tls_pkey:          The TLS client private key, if not included in the certificate file.
+    -tls_pass:          The password for the TLS client private key or certificate.
+    -tls_verify:        Verifies the TLS certificate of the server.
+    -tls_cafile:        The file with the list of CA certificates.
+    -tls_capath:        The directory which contains the CA certificates.
+    -tls_ciphers:       TLS cipher suite preference lists.
+    -noproxy:           Ignores the global proxy configuration.
+    -network:           The network this connection belongs to.
+    -host:              The hostname you would like to connect from.
+    -rawlog:            Immediately open rawlog after connecting.
+    -!:                 Doesn't autojoin channels.
+    -noautosendcmd:     Doesn't execute autosendcmd.
 
     A network or server to connect to; you can optionally specify a custom port,
     password and nickname.
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 68a62e2d..ee1a30e1 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -5,45 +5,45 @@
 
 %9Parameters:%9
 
-    LIST:              Displays the list of servers you are connected to.
-    CONNECT:           Connects to the given server.
-    ADD:               Adds a server to your configuration.
-    MODIFY:            Modifies a server in your configuration.
-    REMOVE:            Removes a server from your configuration.
-    PURGE:             Purges the commands queued to be sent to the server.
+    LIST:               Displays the list of servers you are connected to.
+    CONNECT:            Connects to the given server.
+    ADD:                Adds a server to your configuration.
+    MODIFY:             Modifies a server in your configuration.
+    REMOVE:             Removes a server from your configuration.
+    PURGE:              Purges the commands queued to be sent to the server.
 
-    -!:                Doesn't autojoin the channels.
-    -4:                Connects using IPv4.
-    -6:                Connects using IPv6.
-    -ssl:              Connects using SSL encryption.
-    -ssl_cert:         The SSL client certificate file.
-    -ssl_pkey:         The SSL client private key, if not included in the
-                       certificate file.
-    -ssl_pass:         The password for the SSL client private key or certificate.
-    -ssl_verify:       Verifies the SSL certificate of the server.
-    -ssl_cafile:       The file with the list of CA certificates.
-    -ssl_capath:       The directory which contains the CA certificates.
-    -ssl_ciphers:      SSL cipher suite preference lists.
-    -auto:             Automatically connects to the server on startup.
-    -noauto:           Doesn't connect to the server on startup.
-    -network:          The network the server belongs to.
-    -host:             The hostname you would like to connect from.
-    -cmdspeed:         Specifies the minimum amount of time, expressed in
-                       milliseconds, that the client must wait before sending
-                       additional commands to the server.
-    -cmdmax:           Specifies the maximum number of commands to perform
-                       before starting the internal flood protection.
-    -port:             Specifies the port to connect to the server.
-    -noproxy:          Ignores the global proxy configuration.
-    -rawlog:           Immediately open rawlog after connecting.
-    -noautosendcmd:    Doesn't execute autosendcmd.
+    -!:                 Doesn't autojoin the channels.
+    -4:                 Connects using IPv4.
+    -6:                 Connects using IPv6.
+    -tls:               Connects using TLS encryption.
+    -tls_cert:          The TLS client certificate file.
+    -tls_pkey:          The TLS client private key, if not included in the
+                        certificate file.
+    -tls_pass:          The password for the TLS client private key or certificate.
+    -tls_verify:        Verifies the TLS certificate of the server.
+    -tls_cafile:        The file with the list of CA certificates.
+    -tls_capath:        The directory which contains the CA certificates.
+    -tls_ciphers:       TLS cipher suite preference lists.
+    -auto:              Automatically connects to the server on startup.
+    -noauto:            Doesn't connect to the server on startup.
+    -network:           The network the server belongs to.
+    -host:              The hostname you would like to connect from.
+    -cmdspeed:          Specifies the minimum amount of time, expressed in
+                        milliseconds, that the client must wait before sending
+                        additional commands to the server.
+    -cmdmax:            Specifies the maximum number of commands to perform
+                        before starting the internal flood protection.
+    -port:              Specifies the port to connect to the server.
+    -noproxy:           Ignores the global proxy configuration.
+    -rawlog:            Immediately open rawlog after connecting.
+    -noautosendcmd:     Doesn't execute autosendcmd.
 
     The server, port and network to add, modify or remove; if no argument is
     given, the list of servers you are connected to will be returned.
 
 %9Description:%9
 
-    Displays, adds, modifies or removes the network configuration of IRC 
+    Displays, adds, modifies or removes the network configuration of IRC
     servers.
 
     When using the ADD parameter on a server that already exists, the
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index a9404fa3..db60e46f 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -99,27 +99,27 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 	else if (g_hash_table_lookup(optlist, "4") != NULL)
 		conn->family = AF_INET;
 
-	if (g_hash_table_lookup(optlist, "ssl") != NULL)
-		conn->use_ssl = TRUE;
-	if ((tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL)
-		conn->ssl_cert = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL)
-		conn->ssl_pkey = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "ssl_pass")) != NULL)
-		conn->ssl_pass = g_strdup(tmp);
-	if (g_hash_table_lookup(optlist, "ssl_verify") != NULL)
-		conn->ssl_verify = TRUE;
-	if ((tmp = g_hash_table_lookup(optlist, "ssl_cafile")) != NULL)
-		conn->ssl_cafile = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "ssl_capath")) != NULL)
-		conn->ssl_capath = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "ssl_ciphers")) != NULL)
-		conn->ssl_ciphers = g_strdup(tmp);
-	if ((conn->ssl_capath != NULL && conn->ssl_capath[0] != '\0')
-	||  (conn->ssl_cafile != NULL && conn->ssl_cafile[0] != '\0'))
-		conn->ssl_verify = TRUE;
-	if ((conn->ssl_cert != NULL && conn->ssl_cert[0] != '\0') || conn->ssl_verify)
-		conn->use_ssl = TRUE;
+	if (g_hash_table_lookup(optlist, "tls") != NULL || g_hash_table_lookup(optlist, "ssl") != NULL)
+		conn->use_tls = TRUE;
+	if ((tmp = g_hash_table_lookup(optlist, "tls_cert")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL)
+		conn->tls_cert = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pkey")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL)
+		conn->tls_pkey = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pass")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pass")) != NULL)
+		conn->tls_pass = g_strdup(tmp);
+	if (g_hash_table_lookup(optlist, "tls_verify") != NULL || g_hash_table_lookup(optlist, "ssl_verify") != NULL)
+		conn->tls_verify = TRUE;
+	if ((tmp = g_hash_table_lookup(optlist, "tls_cafile")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_cafile")) != NULL)
+		conn->tls_cafile = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_capath")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_capath")) != NULL)
+		conn->tls_capath = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_ciphers")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_ciphers")) != NULL)
+		conn->tls_ciphers = g_strdup(tmp);
+	if ((conn->tls_capath != NULL && conn->tls_capath[0] != '\0')
+	||  (conn->tls_cafile != NULL && conn->tls_cafile[0] != '\0'))
+		conn->tls_verify = TRUE;
+	if ((conn->tls_cert != NULL && conn->tls_cert[0] != '\0') || conn->tls_verify)
+		conn->use_tls = TRUE;
 
 	if (g_hash_table_lookup(optlist, "!") != NULL)
 		conn->no_autojoin_channels = TRUE;
@@ -494,7 +494,7 @@ void chat_commands_init(void)
 	signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server);
 	signal_add("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
 
-	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +host noproxy -rawlog noautosendcmd");
+	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +host noproxy -rawlog noautosendcmd");
 	command_set_options("msg", "channel nick");
 }
 
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 014f0a28..82fd65b0 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -455,13 +455,13 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	SSL *ssl;
 	SSL_CTX *ctx = NULL;
 
-	const char *mycert = server->connrec->ssl_cert;
-	const char *mypkey = server->connrec->ssl_pkey;
-	const char *mypass = server->connrec->ssl_pass;
-	const char *cafile = server->connrec->ssl_cafile;
-	const char *capath = server->connrec->ssl_capath;
-	const char *ciphers = server->connrec->ssl_ciphers;
-	gboolean verify = server->connrec->ssl_verify;
+	const char *mycert = server->connrec->tls_cert;
+	const char *mypkey = server->connrec->tls_pkey;
+	const char *mypass = server->connrec->tls_pass;
+	const char *cafile = server->connrec->tls_cafile;
+	const char *capath = server->connrec->tls_capath;
+	const char *ciphers = server->connrec->tls_ciphers;
+	gboolean verify = server->connrec->tls_verify;
 
 	g_return_val_if_fail(handle != NULL, NULL);
 
@@ -480,7 +480,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 	SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback);
 	SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass);
-	if (ciphers && *ciphers) {
+
+	if (ciphers != NULL && ciphers[0] != '\0') {
 		if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1)
 			g_warning("No valid SSL cipher suite could be selected");
 	}
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 80c5761b..35577fd4 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -23,12 +23,12 @@ char *nick;
 char *username;
 char *realname;
 
-char *ssl_cert;
-char *ssl_pkey;
-char *ssl_pass;
-char *ssl_cafile;
-char *ssl_capath;
-char *ssl_ciphers;
+char *tls_cert;
+char *tls_pkey;
+char *tls_pass;
+char *tls_cafile;
+char *tls_capath;
+char *tls_ciphers;
 
 GIOChannel *connect_handle; /* connect using this handle */
 
@@ -38,8 +38,8 @@ unsigned int reconnecting:1; /* we're trying to reconnect any connection */
 unsigned int no_autojoin_channels:1; /* don't autojoin any channels */
 unsigned int no_autosendcmd:1; /* don't execute autosendcmd */
 unsigned int unix_socket:1; /* Connect using named unix socket */
-unsigned int use_ssl:1; /* this connection uses SSL */
-unsigned int ssl_verify:1;
+unsigned int use_tls:1; /* this connection uses TLS */
+unsigned int tls_verify:1;
 unsigned int no_connect:1; /* don't connect() at all, it's done by plugin */
 char *channels;
 char *away_reason;
diff --git a/src/core/server-setup-rec.h b/src/core/server-setup-rec.h
index 2c9614c7..22876d4e 100644
--- a/src/core/server-setup-rec.h
+++ b/src/core/server-setup-rec.h
@@ -11,12 +11,12 @@ char *password;
 int sasl_mechanism;
 char *sasl_password;
 
-char *ssl_cert;
-char *ssl_pkey;
-char *ssl_pass;
-char *ssl_cafile;
-char *ssl_capath;
-char *ssl_ciphers;
+char *tls_cert;
+char *tls_pkey;
+char *tls_pass;
+char *tls_cafile;
+char *tls_capath;
+char *tls_ciphers;
 
 char *own_host; /* address to use when connecting this server */
 IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
@@ -28,7 +28,7 @@ unsigned int no_proxy:1;
 unsigned int last_failed:1; /* if last connection attempt failed */
 unsigned int banned:1; /* if we're banned from this server */
 unsigned int dns_error:1; /* DNS said the host doesn't exist */
-unsigned int use_ssl:1; /* this connection uses SSL */
-unsigned int ssl_verify:1;
+unsigned int use_tls:1; /* this connection uses TLS */
+unsigned int tls_verify:1;
 
 GHashTable *module_data;
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 58c9dd09..16ec1fac 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -192,13 +192,13 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->no_autosendcmd = src->no_autosendcmd;
 	dest->unix_socket = src->unix_socket;
 
-	dest->use_ssl = src->use_ssl;
-	dest->ssl_cert = g_strdup(src->ssl_cert);
-	dest->ssl_pkey = g_strdup(src->ssl_pkey);
-	dest->ssl_verify = src->ssl_verify;
-	dest->ssl_cafile = g_strdup(src->ssl_cafile);
-	dest->ssl_capath = g_strdup(src->ssl_capath);
-	dest->ssl_ciphers = g_strdup(src->ssl_ciphers);
+	dest->use_tls = src->use_tls;
+	dest->tls_cert = g_strdup(src->tls_cert);
+	dest->tls_pkey = g_strdup(src->tls_pkey);
+	dest->tls_verify = src->tls_verify;
+	dest->tls_cafile = g_strdup(src->tls_cafile);
+	dest->tls_capath = g_strdup(src->tls_capath);
+	dest->tls_ciphers = g_strdup(src->tls_ciphers);
 
 	return dest;
 }
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 0cecfece..01a36e1c 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -167,20 +167,20 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
 	if (sserver->port > 0 && conn->port <= 0)
 		conn->port = sserver->port;
 
-	conn->use_ssl = sserver->use_ssl;
-	if (conn->ssl_cert == NULL && sserver->ssl_cert != NULL && sserver->ssl_cert[0] != '\0')
-		conn->ssl_cert = g_strdup(sserver->ssl_cert);
-	if (conn->ssl_pkey == NULL && sserver->ssl_pkey != NULL && sserver->ssl_pkey[0] != '\0')
-		conn->ssl_pkey = g_strdup(sserver->ssl_pkey);
-	if (conn->ssl_pass == NULL && sserver->ssl_pass != NULL && sserver->ssl_pass[0] != '\0')
-		conn->ssl_pass = g_strdup(sserver->ssl_pass);
-	conn->ssl_verify = sserver->ssl_verify;
-	if (conn->ssl_cafile == NULL && sserver->ssl_cafile != NULL && sserver->ssl_cafile[0] != '\0')
-		conn->ssl_cafile = g_strdup(sserver->ssl_cafile);
-	if (conn->ssl_capath == NULL && sserver->ssl_capath != NULL && sserver->ssl_capath[0] != '\0')
-		conn->ssl_capath = g_strdup(sserver->ssl_capath);
-	if (conn->ssl_ciphers == NULL && sserver->ssl_ciphers != NULL && sserver->ssl_ciphers[0] != '\0')
-		conn->ssl_ciphers = g_strdup(sserver->ssl_ciphers);
+	conn->use_tls = sserver->use_tls;
+	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
+		conn->tls_cert = g_strdup(sserver->tls_cert);
+	if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
+		conn->tls_pkey = g_strdup(sserver->tls_pkey);
+	if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
+		conn->tls_pass = g_strdup(sserver->tls_pass);
+	conn->tls_verify = sserver->tls_verify;
+	if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
+		conn->tls_cafile = g_strdup(sserver->tls_cafile);
+	if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
+		conn->tls_capath = g_strdup(sserver->tls_capath);
+	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
+		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
 
 	server_setup_fill_reconn(conn, sserver);
 
@@ -362,9 +362,10 @@ SERVER_SETUP_REC *server_setup_find(const char *address, int port,
 static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 {
 	SERVER_SETUP_REC *rec;
-        CHATNET_REC *chatnetrec;
+	CHATNET_REC *chatnetrec;
 	char *server, *chatnet, *family;
 	int port;
+	char *value = NULL;
 
 	g_return_val_if_fail(node != NULL, NULL);
 
@@ -390,7 +391,7 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 		chatnet_create(chatnetrec);
 	}
 
-        family = config_node_get_str(node, "family", "");
+	family = config_node_get_str(node, "family", "");
 
 	rec = CHAT_PROTOCOL(chatnetrec)->create_server_setup();
 	rec->type = module_get_uniq_id("SERVER SETUP", 0);
@@ -400,18 +401,45 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 		(g_ascii_strcasecmp(family, "inet") == 0 ? AF_INET : 0);
 	rec->address = g_strdup(server);
 	rec->password = g_strdup(config_node_get_str(node, "password", NULL));
-	rec->use_ssl = config_node_get_bool(node, "use_ssl", FALSE);
-	rec->ssl_cert = g_strdup(config_node_get_str(node, "ssl_cert", NULL));
-	rec->ssl_pkey = g_strdup(config_node_get_str(node, "ssl_pkey", NULL));
-	rec->ssl_pass = g_strdup(config_node_get_str(node, "ssl_pass", NULL));
-	rec->ssl_verify = config_node_get_bool(node, "ssl_verify", FALSE);
-	rec->ssl_cafile = g_strdup(config_node_get_str(node, "ssl_cafile", NULL));
-	rec->ssl_capath = g_strdup(config_node_get_str(node, "ssl_capath", NULL));
-	rec->ssl_ciphers = g_strdup(config_node_get_str(node, "ssl_ciphers", NULL));
-	if (rec->ssl_cafile || rec->ssl_capath)
-		rec->ssl_verify = TRUE;
-	if (rec->ssl_cert != NULL || rec->ssl_verify)
-		rec->use_ssl = TRUE;
+
+	rec->use_tls = config_node_get_bool(node, "use_tls", FALSE) || config_node_get_bool(node, "use_ssl", FALSE);
+	rec->tls_verify = config_node_get_bool(node, "tls_verify", FALSE) || config_node_get_bool(node, "ssl_verify", FALSE);
+
+	value = config_node_get_str(node, "tls_cert", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_cert", NULL);
+	rec->tls_cert = g_strdup(value);
+
+	value = config_node_get_str(node, "tls_pkey", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_pkey", NULL);
+	rec->tls_pkey = g_strdup(value);
+
+	value = config_node_get_str(node, "tls_pass", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_pass", NULL);
+	rec->tls_pass = g_strdup(value);
+
+	value = config_node_get_str(node, "tls_cafile", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_cafile", NULL);
+	rec->tls_cafile = g_strdup(value);
+
+	value = config_node_get_str(node, "tls_capath", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_capath", NULL);
+	rec->tls_capath = g_strdup(value);
+
+	value = config_node_get_str(node, "tls_ciphers", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_ciphers", NULL);
+	rec->tls_ciphers = g_strdup(value);
+
+	if (rec->tls_cafile || rec->tls_capath)
+		rec->tls_verify = TRUE;
+	if (rec->tls_cert != NULL || rec->tls_verify)
+		rec->use_tls = TRUE;
+
 	rec->port = port;
 	rec->autoconnect = config_node_get_bool(node, "autoconnect", FALSE);
 	rec->no_proxy = config_node_get_bool(node, "no_proxy", FALSE);
@@ -463,14 +491,16 @@ static void server_setup_save(SERVER_SETUP_REC *rec)
 
 	iconfig_node_set_int(node, "port", rec->port);
 	iconfig_node_set_str(node, "password", rec->password);
-	iconfig_node_set_bool(node, "use_ssl", rec->use_ssl);
-	iconfig_node_set_str(node, "ssl_cert", rec->ssl_cert);
-	iconfig_node_set_str(node, "ssl_pkey", rec->ssl_pkey);
-	iconfig_node_set_str(node, "ssl_pass", rec->ssl_pass);
-	iconfig_node_set_bool(node, "ssl_verify", rec->ssl_verify);
-	iconfig_node_set_str(node, "ssl_cafile", rec->ssl_cafile);
-	iconfig_node_set_str(node, "ssl_capath", rec->ssl_capath);
-	iconfig_node_set_str(node, "ssl_ciphers", rec->ssl_ciphers);
+
+	iconfig_node_set_bool(node, "use_tls", rec->use_tls);
+	iconfig_node_set_str(node, "tls_cert", rec->tls_cert);
+	iconfig_node_set_str(node, "tls_pkey", rec->tls_pkey);
+	iconfig_node_set_str(node, "tls_pass", rec->tls_pass);
+	iconfig_node_set_bool(node, "tls_verify", rec->tls_verify);
+	iconfig_node_set_str(node, "tls_cafile", rec->tls_cafile);
+	iconfig_node_set_str(node, "tls_capath", rec->tls_capath);
+	iconfig_node_set_str(node, "tls_ciphers", rec->tls_ciphers);
+
 	iconfig_node_set_str(node, "own_host", rec->own_host);
 
 	iconfig_node_set_str(node, "family",
@@ -514,12 +544,12 @@ static void server_setup_destroy(SERVER_SETUP_REC *rec)
 	g_free_not_null(rec->own_ip6);
 	g_free_not_null(rec->chatnet);
 	g_free_not_null(rec->password);
-	g_free_not_null(rec->ssl_cert);
-	g_free_not_null(rec->ssl_pkey);
-	g_free_not_null(rec->ssl_pass);
-	g_free_not_null(rec->ssl_cafile);
-	g_free_not_null(rec->ssl_capath);
-	g_free_not_null(rec->ssl_ciphers);
+	g_free_not_null(rec->tls_cert);
+	g_free_not_null(rec->tls_pkey);
+	g_free_not_null(rec->tls_pass);
+	g_free_not_null(rec->tls_cafile);
+	g_free_not_null(rec->tls_capath);
+	g_free_not_null(rec->tls_ciphers);
 	g_free(rec->address);
 	g_free(rec);
 }
diff --git a/src/core/servers.c b/src/core/servers.c
index dfcbcde0..2a14d510 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -219,7 +219,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
-		handle = server->connrec->use_ssl ?
+		handle = server->connrec->use_tls ?
 			net_connect_ip_ssl(ip, port, own_ip, server) : net_connect_ip(ip, port, own_ip);
 	} else {
 		handle = net_connect_unix(unix_socket);
@@ -237,7 +237,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 			}
 			server->no_reconnect = TRUE;
 		}
-		if (server->connrec->use_ssl && errno == ENOSYS)
+		if (server->connrec->use_tls && errno == ENOSYS)
 			server->no_reconnect = TRUE;
 
 		server->connection_lost = TRUE;
@@ -245,7 +245,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		g_free(errmsg2);
 	} else {
 		server->handle = net_sendbuffer_create(handle, 0);
-		if (server->connrec->use_ssl)
+		if (server->connrec->use_tls)
 			server_connect_callback_init_ssl(server, handle);
 		else
 		server->connect_tag =
@@ -622,22 +622,22 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->own_ip4);
 	g_free_not_null(conn->own_ip6);
 
-        g_free_not_null(conn->password);
-        g_free_not_null(conn->nick);
-        g_free_not_null(conn->username);
+	g_free_not_null(conn->password);
+	g_free_not_null(conn->nick);
+	g_free_not_null(conn->username);
 	g_free_not_null(conn->realname);
 
-	g_free_not_null(conn->ssl_cert);
-	g_free_not_null(conn->ssl_pkey);
-	g_free_not_null(conn->ssl_pass);
-	g_free_not_null(conn->ssl_cafile);
-	g_free_not_null(conn->ssl_capath);
-	g_free_not_null(conn->ssl_ciphers);
+	g_free_not_null(conn->tls_cert);
+	g_free_not_null(conn->tls_pkey);
+	g_free_not_null(conn->tls_pass);
+	g_free_not_null(conn->tls_cafile);
+	g_free_not_null(conn->tls_capath);
+	g_free_not_null(conn->tls_ciphers);
 
 	g_free_not_null(conn->channels);
-        g_free_not_null(conn->away_reason);
+	g_free_not_null(conn->away_reason);
 
-        conn->type = 0;
+	conn->type = 0;
 	g_free(conn);
 }
 
diff --git a/src/core/session.c b/src/core/session.c
index 17d80076..5b3303bb 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -150,8 +150,7 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config,
 
 	node = config_node_section(config, node, NULL, NODE_TYPE_BLOCK);
 
-	config_node_set_str(config, node, "chat_type",
-			    chat_protocol_find_id(server->chat_type)->name);
+	config_node_set_str(config, node, "chat_type", chat_protocol_find_id(server->chat_type)->name);
 	config_node_set_str(config, node, "address", server->connrec->address);
 	config_node_set_int(config, node, "port", server->connrec->port);
 	config_node_set_str(config, node, "chatnet", server->connrec->chatnet);
@@ -159,13 +158,13 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config,
 	config_node_set_str(config, node, "nick", server->nick);
 	config_node_set_str(config, node, "version", server->version);
 
-	config_node_set_bool(config, node, "use_ssl", server->connrec->use_ssl);
-	config_node_set_str(config, node, "ssl_cert", server->connrec->ssl_cert);
-	config_node_set_str(config, node, "ssl_pkey", server->connrec->ssl_pkey);
-	config_node_set_bool(config, node, "ssl_verify", server->connrec->ssl_verify);
-	config_node_set_str(config, node, "ssl_cafile", server->connrec->ssl_cafile);
-	config_node_set_str(config, node, "ssl_capath", server->connrec->ssl_capath);
-	config_node_set_str(config, node, "ssl_ciphers", server->connrec->ssl_ciphers);
+	config_node_set_bool(config, node, "use_tls", server->connrec->use_tls);
+	config_node_set_str(config, node, "tls_cert", server->connrec->tls_cert);
+	config_node_set_str(config, node, "tls_pkey", server->connrec->tls_pkey);
+	config_node_set_bool(config, node, "tls_verify", server->connrec->tls_verify);
+	config_node_set_str(config, node, "tls_cafile", server->connrec->tls_cafile);
+	config_node_set_str(config, node, "tls_capath", server->connrec->tls_capath);
+	config_node_set_str(config, node, "tls_ciphers", server->connrec->tls_ciphers);
 
 	handle = g_io_channel_unix_get_fd(net_sendbuffer_handle(server->handle));
 	config_node_set_int(config, node, "handle", handle);
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 468cb707..b9522bc1 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -154,42 +154,55 @@ static void cmd_server_add_modify(const char *data, gboolean add)
         else if (g_hash_table_lookup(optlist, "4"))
 		rec->family = AF_INET;
 
-	if (g_hash_table_lookup(optlist, "ssl"))
-		rec->use_ssl = TRUE;
+	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl"))
+		rec->use_tls = TRUE;
 
-	value = g_hash_table_lookup(optlist, "ssl_cert");
+	value = g_hash_table_lookup(optlist, "tls_cert");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_cert");
 	if (value != NULL && *value != '\0')
-		rec->ssl_cert = g_strdup(value);
+		rec->tls_cert = g_strdup(value);
 
-	value = g_hash_table_lookup(optlist, "ssl_pkey");
+	value = g_hash_table_lookup(optlist, "tls_pkey");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_pkey");
 	if (value != NULL && *value != '\0')
-		rec->ssl_pkey = g_strdup(value);
+		rec->tls_pkey = g_strdup(value);
 
-	value = g_hash_table_lookup(optlist, "ssl_pass");
+	value = g_hash_table_lookup(optlist, "tls_pass");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_pass");
 	if (value != NULL && *value != '\0')
-		rec->ssl_pass = g_strdup(value);
+		rec->tls_pass = g_strdup(value);
 
-	if (g_hash_table_lookup(optlist, "ssl_verify"))
-		rec->ssl_verify = TRUE;
+	if (g_hash_table_lookup(optlist, "tls_verify") || g_hash_table_lookup(optlist, "ssl_verify"))
+		rec->tls_verify = TRUE;
 
-	value = g_hash_table_lookup(optlist, "ssl_cafile");
+	value = g_hash_table_lookup(optlist, "tls_cafile");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_cafile");
 	if (value != NULL && *value != '\0')
-		rec->ssl_cafile = g_strdup(value);
+		rec->tls_cafile = g_strdup(value);
 
-	value = g_hash_table_lookup(optlist, "ssl_capath");
+	value = g_hash_table_lookup(optlist, "tls_capath");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_capath");
 	if (value != NULL && *value != '\0')
-		rec->ssl_capath = g_strdup(value);
+		rec->tls_capath = g_strdup(value);
 
-	value = g_hash_table_lookup(optlist, "ssl_ciphers");
+	value = g_hash_table_lookup(optlist, "tls_ciphers");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_ciphers");
 	if (value != NULL && *value != '\0')
-		rec->ssl_ciphers = g_strdup(value);
+		rec->tls_ciphers = g_strdup(value);
 
-	if ((rec->ssl_cafile != NULL && rec->ssl_cafile[0] != '\0')
-	||  (rec->ssl_capath != NULL && rec->ssl_capath[0] != '\0'))
-		rec->ssl_verify = TRUE;
 
-	if ((rec->ssl_cert != NULL && rec->ssl_cert[0] != '\0') || rec->ssl_verify == TRUE)
-		rec->use_ssl = TRUE;
+	if ((rec->tls_cafile != NULL && rec->tls_cafile[0] != '\0')
+	||  (rec->tls_capath != NULL && rec->tls_capath[0] != '\0'))
+		rec->tls_verify = TRUE;
+
+	if ((rec->tls_cert != NULL && rec->tls_cert[0] != '\0') || rec->tls_verify == TRUE)
+		rec->use_tls = TRUE;
 
 	if (g_hash_table_lookup(optlist, "auto")) rec->autoconnect = TRUE;
 	if (g_hash_table_lookup(optlist, "noauto")) rec->autoconnect = FALSE;
@@ -409,8 +422,9 @@ void fe_server_init(void)
 	command_bind("server remove", NULL, (SIGNAL_FUNC) cmd_server_remove);
 	command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
 	command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
-	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
-	command_set_options("server modify", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
+
+	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options("server modify", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
 
 	signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
 	signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting);
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 2e22d6f2..36ed2bdc 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -108,23 +108,23 @@ static void cmd_server_list(const char *data)
 			g_string_append(str, "autoconnect, ");
 		if (rec->no_proxy)
 			g_string_append(str, "noproxy, ");
-		if (rec->use_ssl) {
-			g_string_append(str, "ssl, ");
-			if (rec->ssl_cert) {
-				g_string_append_printf(str, "ssl_cert: %s, ", rec->ssl_cert);
-				if (rec->ssl_pkey)
-					g_string_append_printf(str, "ssl_pkey: %s, ", rec->ssl_pkey);
-				if (rec->ssl_pass)
+		if (rec->use_tls) {
+			g_string_append(str, "tls, ");
+			if (rec->tls_cert) {
+				g_string_append_printf(str, "tls_cert: %s, ", rec->tls_cert);
+				if (rec->tls_pkey)
+					g_string_append_printf(str, "tls_pkey: %s, ", rec->tls_pkey);
+				if (rec->tls_pass)
 					g_string_append_printf(str, "(pass), ");
 			}
-			if (rec->ssl_verify)
-				g_string_append(str, "ssl_verify, ");
-			if (rec->ssl_cafile)
-				g_string_append_printf(str, "ssl_cafile: %s, ", rec->ssl_cafile);
-			if (rec->ssl_capath)
-				g_string_append_printf(str, "ssl_capath: %s, ", rec->ssl_capath);
-			if (rec->ssl_ciphers)
-				g_string_append_printf(str, "ssl_ciphers: %s, ", rec->ssl_ciphers);
+			if (rec->tls_verify)
+				g_string_append(str, "tls_verify, ");
+			if (rec->tls_cafile)
+				g_string_append_printf(str, "tls_cafile: %s, ", rec->tls_cafile);
+			if (rec->tls_capath)
+				g_string_append_printf(str, "tls_capath: %s, ", rec->tls_capath);
+			if (rec->tls_ciphers)
+				g_string_append_printf(str, "tls_ciphers: %s, ", rec->tls_ciphers);
 
 		}
 		if (rec->max_cmds_at_once > 0)
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 79aeb227..3117e345 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -310,7 +310,7 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 
 	if (server->connrec->port <= 0) {
 		server->connrec->port =
-			server->connrec->use_ssl ? 6697 : 6667;
+			server->connrec->use_tls ? 6697 : 6667;
 	}
 
 	server->cmd_queue_speed = ircconn->cmd_queue_speed > 0 ?
@@ -328,7 +328,7 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 		ircconn->max_whois : DEFAULT_MAX_WHOIS;
 	server->max_msgs_in_cmd = ircconn->max_msgs > 0 ?
 		ircconn->max_msgs : DEFAULT_MAX_MSGS;
-	server->connrec->use_ssl = conn->use_ssl;
+	server->connrec->use_tls = conn->use_tls;
 
 	modes_server_init(server);
 
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index b641867f..1d08319f 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -301,7 +301,8 @@ void perl_connect_fill_hash(HV *hv, SERVER_CONNECT_REC *conn)
 	(void) hv_store(hv, "no_autojoin_channels", 20, newSViv(conn->no_autojoin_channels), 0);
 	(void) hv_store(hv, "no_autosendcmd", 14, newSViv(conn->no_autosendcmd), 0);
 	(void) hv_store(hv, "unix_socket", 11, newSViv(conn->unix_socket), 0);
-	(void) hv_store(hv, "use_ssl", 7, newSViv(conn->use_ssl), 0);
+	(void) hv_store(hv, "use_ssl", 7, newSViv(conn->use_tls), 0);
+	(void) hv_store(hv, "use_tls", 7, newSViv(conn->use_tls), 0);
 	(void) hv_store(hv, "no_connect", 10, newSViv(conn->no_connect), 0);
 }
 

From 6a286a4eb284cda4dce9ed97fec2aca643a139b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 13:48:43 +0200
Subject: [PATCH 0433/1650] Use TLS by default for Freenode, IRC6, OFTC,
 EsperNet, EFnet, and Rizon.

---
 NEWS       |  2 ++
 irssi.conf | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 8ecccc57..f94ede27 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	+ Rename SSL to TLS in the code and add -tls_* versions of the -ssl_*
 	  options to /CONNECT and /SERVER, but make sure the -ssl_* options continue
 	  to work.
+	+ Use TLS for Freenode, EFnet, EsperNet, OFTC, Rizon, and IRC6 in the default
+	  configuration.
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
diff --git a/irssi.conf b/irssi.conf
index ba159f34..0e486807 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,16 +1,16 @@
 servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
-  { address = "irc.efnet.org";     chatnet = "EFNet";     port = "6667"; },
-  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6667"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6667"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; },
+  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
-  { address = "eu.irc6.net";       chatnet = "IRCnet";    port = "6667"; },
+  { address = "eu.irc6.net";       chatnet = "IRCnet";    port = "6667"; use_tls = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
   { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
   { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
-  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6667"; },
+  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.quakenet.org";  chatnet = "QuakeNet";  port = "6667"; },
-  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6667"; },
+  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "silc.silcnet.org";  chatnet = "SILC";      port = "706";  },
   { address = "irc.undernet.org";  chatnet = "Undernet";  port = "6667"; }
 );

From 99d017720dd162122754bfbedc96744f4af8ce6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 14:07:22 +0200
Subject: [PATCH 0434/1650] Add TLS_REC.

This patch adds the TLS_REC structure. This structure is used to emit
information about the TLS handshake from the core of irssi to the
front-end layers such that we can display connection information to the
user.
---
 docs/signals.txt        |   1 +
 src/core/Makefile.am    |   2 +
 src/core/tls.c          | 219 ++++++++++++++++++++++++++++++++++++++++
 src/core/tls.h          |  95 +++++++++++++++++
 src/perl/get-signals.pl |   1 +
 5 files changed, 318 insertions(+)
 create mode 100644 src/core/tls.c
 create mode 100644 src/core/tls.h

diff --git a/docs/signals.txt b/docs/signals.txt
index 5e03d901..47db3575 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -59,6 +59,7 @@ network-openssl.c:
  "tlsa available", SERVER_REC
  "tlsa verification success", SERVER_REC
  "tlsa verification failed", SERVER_REC
+ "tls handshake finished", SERVER_REC, TLS_REC
 
 nicklist.c:
  "nicklist new", CHANNEL_REC, NICK_REC
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index af323234..10bd035a 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -46,6 +46,7 @@ libcore_a_SOURCES = \
 	special-vars.c \
 	utf8.c \
 	wcwidth.c \
+	tls.c \
 	write-buffer.c
 
 structure_headers = \
@@ -97,5 +98,6 @@ pkginc_core_HEADERS = \
 	special-vars.h \
 	utf8.h \
 	window-item-def.h \
+	tls.h \
 	write-buffer.h \
 	$(structure_headers)
diff --git a/src/core/tls.c b/src/core/tls.c
new file mode 100644
index 00000000..8aad0c89
--- /dev/null
+++ b/src/core/tls.c
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2015 Alexander Færøy <ahf@irssi.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#include "module.h"
+
+#include "tls.h"
+
+TLS_REC *tls_create_rec()
+{
+	TLS_REC *rec = g_new0(TLS_REC, 1);
+	g_return_val_if_fail(rec != NULL, NULL);
+
+	return rec;
+}
+
+void tls_rec_free(TLS_REC *tls_rec)
+{
+	if (tls_rec == NULL)
+		return;
+
+	g_free_and_null(tls_rec->protocol_version);
+	g_free_and_null(tls_rec->cipher);
+	g_free_and_null(tls_rec->public_key_algorithm);
+	g_free_and_null(tls_rec->public_key_fingerprint);
+	g_free_and_null(tls_rec->public_key_fingerprint_algorithm);
+	g_free_and_null(tls_rec->certificate_fingerprint);
+	g_free_and_null(tls_rec->certificate_fingerprint_algorithm);
+	g_free_and_null(tls_rec->not_after);
+	g_free_and_null(tls_rec->not_before);
+
+#ifdef SSL_get_server_tmp_key
+	g_free_and_null(tls_rec->ephemeral_key_algorithm);
+#endif
+
+	if (tls_rec->certs != NULL) {
+		g_slist_foreach(tls_rec->certs, (GFunc)tls_cert_rec_free, NULL);
+		g_slist_free(tls_rec->certs);
+		tls_rec->certs = NULL;
+	}
+
+	g_free(tls_rec);
+}
+
+void tls_rec_set_protocol_version(TLS_REC *tls_rec, const char *protocol_version)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->protocol_version = g_strdup(protocol_version);
+}
+
+void tls_rec_set_cipher(TLS_REC *tls_rec, const char *cipher)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->cipher = g_strdup(cipher);
+}
+
+void tls_rec_set_cipher_size(TLS_REC *tls_rec, size_t size)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->cipher_size = size;
+}
+
+void tls_rec_set_public_key_algorithm(TLS_REC *tls_rec, const char *algorithm)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->public_key_algorithm = g_strdup(algorithm);
+}
+
+void tls_rec_set_public_key_fingerprint(TLS_REC *tls_rec, const char *fingerprint)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->public_key_fingerprint = g_strdup(fingerprint);
+}
+
+void tls_rec_set_public_key_fingerprint_algorithm(TLS_REC *tls_rec, const char *algorithm)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->public_key_fingerprint_algorithm = g_strdup(algorithm);
+}
+
+void tls_rec_set_public_key_size(TLS_REC *tls_rec, size_t size)
+{
+	g_return_if_fail(tls_rec != NULL);
+	tls_rec->public_key_size = size;
+}
+
+void tls_rec_set_certificate_fingerprint(TLS_REC *tls_rec, const char *fingerprint)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->certificate_fingerprint = g_strdup(fingerprint);
+}
+
+void tls_rec_set_certificate_fingerprint_algorithm(TLS_REC *tls_rec, const char *algorithm)
+{
+	g_return_if_fail(tls_rec != NULL);
+
+	tls_rec->certificate_fingerprint_algorithm = g_strdup(algorithm);
+}
+
+void tls_rec_set_not_after(TLS_REC *tls_rec, const char *not_after)
+{
+	g_return_if_fail(tls_rec != NULL);
+	tls_rec->not_after = g_strdup(not_after);
+}
+
+void tls_rec_set_not_before(TLS_REC *tls_rec, const char *not_before)
+{
+	g_return_if_fail(tls_rec != NULL);
+	tls_rec->not_before = g_strdup(not_before);
+}
+
+#ifdef SSL_get_server_tmp_key
+void tls_rec_set_ephemeral_key_algorithm(TLS_REC *tls_rec, const char *algorithm)
+{
+	g_return_if_fail(tls_rec != NULL);
+	tls_rec->ephemeral_key_algorithm = g_strdup(algorithm);
+}
+
+void tls_rec_set_ephemeral_key_size(TLS_REC *tls_rec, size_t size)
+{
+	g_return_if_fail(tls_rec != NULL);
+	tls_rec->ephemeral_key_size = size;
+}
+#endif
+
+void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec)
+{
+	g_return_if_fail(tls_rec != NULL);
+	g_return_if_fail(tls_cert_rec != NULL);
+
+	tls_rec->certs = g_slist_append(tls_rec->certs, tls_cert_rec);
+}
+
+TLS_CERT_REC *tls_cert_create_rec()
+{
+	TLS_CERT_REC *rec = g_new0(TLS_CERT_REC, 1);
+	g_return_val_if_fail(rec != NULL, NULL);
+
+	return rec;
+}
+
+void tls_cert_rec_append_subject_entry(TLS_CERT_REC *tls_cert_rec, TLS_CERT_ENTRY_REC *tls_cert_entry_rec)
+{
+	g_return_if_fail(tls_cert_rec != NULL);
+	g_return_if_fail(tls_cert_entry_rec != NULL);
+
+	tls_cert_rec->subject = g_slist_append(tls_cert_rec->subject, tls_cert_entry_rec);
+}
+
+void tls_cert_rec_append_issuer_entry(TLS_CERT_REC *tls_cert_rec, TLS_CERT_ENTRY_REC *tls_cert_entry_rec)
+{
+	g_return_if_fail(tls_cert_rec != NULL);
+	g_return_if_fail(tls_cert_entry_rec != NULL);
+
+	tls_cert_rec->issuer = g_slist_append(tls_cert_rec->issuer, tls_cert_entry_rec);
+}
+
+void tls_cert_rec_free(TLS_CERT_REC *tls_cert_rec)
+{
+	if (tls_cert_rec == NULL)
+		return;
+
+	if (tls_cert_rec->subject != NULL) {
+		g_slist_foreach(tls_cert_rec->subject, (GFunc)tls_cert_entry_rec_free, NULL);
+		g_slist_free(tls_cert_rec->subject);
+		tls_cert_rec->subject = NULL;
+	}
+
+	if (tls_cert_rec->issuer != NULL) {
+		g_slist_foreach(tls_cert_rec->issuer, (GFunc)tls_cert_entry_rec_free, NULL);
+		g_slist_free(tls_cert_rec->issuer);
+		tls_cert_rec->issuer = NULL;
+	}
+
+	g_free(tls_cert_rec);
+}
+
+TLS_CERT_ENTRY_REC *tls_cert_entry_create_rec(const char *name, const char *value)
+{
+	TLS_CERT_ENTRY_REC *rec = g_new0(TLS_CERT_ENTRY_REC, 1);
+	g_return_val_if_fail(rec != NULL, NULL);
+
+	rec->name  = g_strdup(name);
+	rec->value = g_strdup(value);
+
+	return rec;
+}
+
+void tls_cert_entry_rec_free(TLS_CERT_ENTRY_REC *tls_cert_entry)
+{
+	if (tls_cert_entry == NULL)
+		return;
+
+	g_free_and_null(tls_cert_entry->name);
+	g_free_and_null(tls_cert_entry->value);
+
+	g_free(tls_cert_entry);
+}
diff --git a/src/core/tls.h b/src/core/tls.h
new file mode 100644
index 00000000..4991f7ed
--- /dev/null
+++ b/src/core/tls.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2015 Alexander Færøy <ahf@irssi.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef __TLS_H
+#define __TLS_H
+
+#include <openssl/ssl.h>
+
+#include <stdbool.h>
+
+typedef struct _TLS_REC TLS_REC;
+typedef struct _TLS_CERT_REC TLS_CERT_REC;
+typedef struct _TLS_CERT_ENTRY_REC TLS_CERT_ENTRY_REC;
+
+struct _TLS_REC {
+	char *protocol_version;
+	char *cipher;
+	size_t cipher_size;
+
+	char *public_key_algorithm;
+	char *public_key_fingerprint;
+	char *public_key_fingerprint_algorithm;
+	size_t public_key_size;
+
+	char *certificate_fingerprint;
+	char *certificate_fingerprint_algorithm;
+
+	char *not_after;
+	char *not_before;
+
+#ifdef SSL_get_server_tmp_key
+	char *ephemeral_key_algorithm;
+	size_t ephemeral_key_size;
+#endif
+
+	GSList *certs;
+};
+
+struct _TLS_CERT_REC {
+	GSList *subject;
+	GSList *issuer;
+};
+
+struct _TLS_CERT_ENTRY_REC {
+	char *name;
+	char *value;
+};
+
+TLS_REC *tls_create_rec();
+void tls_rec_free(TLS_REC *tls_rec);
+
+void tls_rec_set_protocol_version(TLS_REC *tls_rec, const char *protocol_version);
+void tls_rec_set_cipher(TLS_REC *tls_rec, const char *cipher);
+void tls_rec_set_cipher_size(TLS_REC *tls_rec, size_t size);
+void tls_rec_set_public_key_algorithm(TLS_REC *tls_rec, const char *algorithm);
+void tls_rec_set_public_key_fingerprint(TLS_REC *tls_rec, const char *fingerprint);
+void tls_rec_set_public_key_fingerprint_algorithm(TLS_REC *tls_rec, const char *algorithm);
+void tls_rec_set_public_key_size(TLS_REC *tls_rec, size_t size);
+void tls_rec_set_certificate_fingerprint(TLS_REC *tls_rec, const char *fingerprint);
+void tls_rec_set_certificate_fingerprint_algorithm(TLS_REC *tls_rec, const char *algorithm);
+void tls_rec_set_not_after(TLS_REC *tls_rec, const char *not_after);
+void tls_rec_set_not_before(TLS_REC *tls_rec, const char *not_before);
+
+#ifdef SSL_get_server_tmp_key
+void tls_rec_set_ephemeral_key_algorithm(TLS_REC *tls_rec, const char *algorithm);
+void tls_rec_set_ephemeral_key_size(TLS_REC *tls_rec, size_t size);
+#endif
+
+void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec);
+
+TLS_CERT_REC *tls_cert_create_rec();
+void tls_cert_rec_free(TLS_CERT_REC *tls_cert_rec);
+
+void tls_cert_rec_append_subject_entry(TLS_CERT_REC *tls_cert_rec, TLS_CERT_ENTRY_REC *tls_cert_entry_rec);
+void tls_cert_rec_append_issuer_entry(TLS_CERT_REC *tls_cert_rec, TLS_CERT_ENTRY_REC *tls_cert_entry_rec);
+
+TLS_CERT_ENTRY_REC *tls_cert_entry_create_rec(const char *name, const char *value);
+void tls_cert_entry_rec_free(TLS_CERT_ENTRY_REC *tls_cert_entry);
+
+#endif
diff --git a/src/perl/get-signals.pl b/src/perl/get-signals.pl
index 529d35b1..806bcafa 100755
--- a/src/perl/get-signals.pl
+++ b/src/perl/get-signals.pl
@@ -37,6 +37,7 @@ while (<STDIN>) {
 		RAWLOG_REC    => 'Irssi::Rawlog',
 		IGNORE_REC    => 'Irssi::Ignore',
 		MODULE_REC    => 'Irssi::Module',
+		TLS_REC       => 'iobject',
 
 		# irc
 		BAN_REC		    => 'Irssi::Irc::Ban',

From b630fd1703ef3a87060bb6d2acbc562b9c1c9081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 14:14:07 +0200
Subject: [PATCH 0435/1650] Populate and emit TLS_REC after TLS handshake have
 completed.

---
 src/core/network-openssl.c | 258 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 251 insertions(+), 7 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 82fd65b0..55fb1157 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -22,6 +22,8 @@
 #include "network.h"
 #include "misc.h"
 #include "servers.h"
+#include "signals.h"
+#include "tls.h"
 
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
@@ -201,9 +203,10 @@ static gboolean irssi_ssl_verify_hostname(X509 *cert, const char *hostname)
 	return matched;
 }
 
-static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, const char* hostname, int port, X509 *cert, SERVER_REC *server)
+static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, const char* hostname, int port, X509 *cert, SERVER_REC *server, TLS_REC *tls_rec)
 {
 	long result;
+
 #ifdef HAVE_DANE
 	int dane_ret;
 	struct val_daneparams daneparams;
@@ -564,6 +567,197 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	return gchan;
 }
 
+static void set_cipher_info(TLS_REC *tls, SSL *ssl)
+{
+	g_return_if_fail(tls != NULL);
+	g_return_if_fail(ssl != NULL);
+
+	tls_rec_set_protocol_version(tls, SSL_get_version(ssl));
+
+	tls_rec_set_cipher(tls, SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)));
+	tls_rec_set_cipher_size(tls, SSL_get_cipher_bits(ssl, NULL));
+}
+
+static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_fingerprint, size_t cert_fingerprint_size, unsigned char *public_key_fingerprint, size_t public_key_fingerprint_size)
+{
+	g_return_if_fail(tls != NULL);
+	g_return_if_fail(cert != NULL);
+
+	EVP_PKEY *pubkey = NULL;
+	char *cert_fingerprint_hex = NULL;
+	char *public_key_fingerprint_hex = NULL;
+
+	BIO *bio = NULL;
+	char buffer[128];
+	size_t length;
+
+	pubkey = X509_get_pubkey(cert);
+
+	cert_fingerprint_hex = binary_to_hex(cert_fingerprint, cert_fingerprint_size);
+	tls_rec_set_certificate_fingerprint(tls, cert_fingerprint_hex);
+	tls_rec_set_certificate_fingerprint_algorithm(tls, "SHA256");
+
+	// Show algorithm.
+	switch (EVP_PKEY_id(pubkey)) {
+		case EVP_PKEY_RSA:
+			tls_rec_set_public_key_algorithm(tls, "RSA");
+			break;
+
+		case EVP_PKEY_DSA:
+			tls_rec_set_public_key_algorithm(tls, "DSA");
+			break;
+
+		case EVP_PKEY_EC:
+			tls_rec_set_public_key_algorithm(tls, "EC");
+			break;
+
+		default:
+			tls_rec_set_public_key_algorithm(tls, "Unknown");
+			break;
+	}
+
+	public_key_fingerprint_hex = binary_to_hex(public_key_fingerprint, public_key_fingerprint_size);
+	tls_rec_set_public_key_fingerprint(tls, public_key_fingerprint_hex);
+	tls_rec_set_public_key_size(tls, EVP_PKEY_bits(pubkey));
+	tls_rec_set_public_key_fingerprint_algorithm(tls, "SHA256");
+
+	// Read the NotBefore timestamp.
+	bio = BIO_new(BIO_s_mem());
+	ASN1_TIME_print(bio, X509_get_notBefore(cert));
+	length = BIO_read(bio, buffer, sizeof(buffer));
+	buffer[length] = '\0';
+	BIO_free(bio);
+	tls_rec_set_not_before(tls, buffer);
+
+	// Read the NotAfter timestamp.
+	bio = BIO_new(BIO_s_mem());
+	ASN1_TIME_print(bio, X509_get_notAfter(cert));
+	length = BIO_read(bio, buffer, sizeof(buffer));
+	buffer[length] = '\0';
+	BIO_free(bio);
+	tls_rec_set_not_after(tls, buffer);
+
+	g_free(cert_fingerprint_hex);
+	g_free(public_key_fingerprint_hex);
+	EVP_PKEY_free(pubkey);
+}
+
+static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
+{
+	g_return_if_fail(tls != NULL);
+	g_return_if_fail(ssl != NULL);
+
+	STACK_OF(X509) *chain = NULL;
+	int i;
+
+	chain = SSL_get_peer_cert_chain(ssl);
+
+	if (chain == NULL)
+		return;
+
+	for (i = 0; i < sk_X509_num(chain); i++) {
+		TLS_CERT_REC *cert_rec = NULL;
+		X509_NAME *name = NULL;
+
+		int j;
+		int nid;
+
+		char *key = NULL;
+		char *value = NULL;
+
+		cert_rec = tls_cert_create_rec();
+
+		// Subject.
+		name = X509_get_subject_name(sk_X509_value(chain, i));
+
+		for (j = 0; j < X509_NAME_entry_count(name); j++) {
+			X509_NAME_ENTRY *entry = NULL;
+			TLS_CERT_ENTRY_REC *tls_cert_entry_rec = NULL;
+
+			entry = X509_NAME_get_entry(name, j);
+
+			nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(entry));
+			key = (char *)OBJ_nid2sn(nid);
+
+			if (key == NULL)
+				key = (char *)OBJ_nid2ln(nid);
+
+			ASN1_STRING *d = X509_NAME_ENTRY_get_data(entry);
+			value = (char *)ASN1_STRING_data(d);
+
+			tls_cert_entry_rec = tls_cert_entry_create_rec(key, value);
+			tls_cert_rec_append_subject_entry(cert_rec, tls_cert_entry_rec);
+		}
+
+		// Issuer.
+		name = X509_get_issuer_name(sk_X509_value(chain, i));
+
+		for (j = 0; j < X509_NAME_entry_count(name); j++) {
+			X509_NAME_ENTRY *entry = NULL;
+			TLS_CERT_ENTRY_REC *tls_cert_entry_rec = NULL;
+
+			entry = X509_NAME_get_entry(name, j);
+
+			nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(entry));
+			key = (char *)OBJ_nid2sn(nid);
+
+			if (key == NULL)
+				key = (char *)OBJ_nid2ln(nid);
+
+			ASN1_STRING *d = X509_NAME_ENTRY_get_data(entry);
+			value = (char *)ASN1_STRING_data(d);
+
+			tls_cert_entry_rec = tls_cert_entry_create_rec(key, value);
+			tls_cert_rec_append_issuer_entry(cert_rec, tls_cert_entry_rec);
+		}
+
+		tls_rec_append_cert(tls, cert_rec);
+	}
+}
+
+static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
+{
+	g_return_if_fail(tls != NULL);
+	g_return_if_fail(ssl != NULL);
+
+#ifdef SSL_get_server_tmp_key
+	// Show ephemeral key information.
+	EVP_PKEY *ephemeral_key = NULL;
+
+	if (SSL_get_server_tmp_key(ssl, &ephemeral_key)) {
+		switch (EVP_PKEY_id(ephemeral_key)) {
+			case EVP_PKEY_DH:
+				tls_rec_set_ephemeral_key_algorithm(tls, "DH");
+				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+				break;
+
+			case EVP_PKEY_EC:
+			{
+				EC_KEY *ec = EVP_PKEY_get1_EC_KEY(ephemeral_key);
+				int nid;
+				const char *cname;
+				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
+				EC_KEY_free(ec);
+				cname = OBJ_nid2sn(nid);
+				char *ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);
+
+				tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm);
+				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+
+				g_free_and_null(ephemeral_key_algorithm);
+				break;
+
+			default:
+				tls_rec_set_ephemeral_key_algorithm(tls, "Unknown");
+				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+				break;
+		}
+
+		EVP_PKEY_free(ephemeral_key);
+	}
+#endif // SSL_get_server_tmp_key.
+}
+
 GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server)
 {
 	GIOChannel *handle, *ssl_handle;
@@ -581,8 +775,17 @@ int irssi_ssl_handshake(GIOChannel *handle)
 {
 	GIOSSLChannel *chan = (GIOSSLChannel *)handle;
 	int ret, err;
-	X509 *cert;
-	const char *errstr;
+	const char *errstr = NULL;
+	X509 *cert = NULL;
+	X509_PUBKEY *pubkey = NULL;
+	int pubkey_size = 0;
+	unsigned char *pubkey_der = NULL;
+	unsigned char *pubkey_der_tmp = NULL;
+	unsigned char pubkey_fingerprint[EVP_MAX_MD_SIZE];
+	unsigned int pubkey_fingerprint_size;
+	unsigned char cert_fingerprint[EVP_MAX_MD_SIZE];
+	unsigned int cert_fingerprint_size;
+	TLS_REC *tls = NULL;
 
 	ERR_clear_error();
 	ret = SSL_connect(chan->ssl);
@@ -610,14 +813,55 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	}
 
 	cert = SSL_get_peer_certificate(chan->ssl);
+	pubkey = X509_get_X509_PUBKEY(cert);
+
 	if (cert == NULL) {
 		g_warning("SSL server supplied no certificate");
 		return -1;
 	}
-	ret = !chan->verify || irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server);
+
+	if (pubkey == NULL) {
+		g_warning("SSL server supplied no certificate public key");
+		return -1;
+	}
+
+	if (! X509_digest(cert, EVP_sha256(), cert_fingerprint, &cert_fingerprint_size)) {
+		g_warning("Unable to generate certificate fingerprint");
+		X509_free(cert);
+		return -1;
+	}
+
+	pubkey_size = i2d_X509_PUBKEY(pubkey, NULL);
+	pubkey_der = pubkey_der_tmp = g_new(unsigned char, pubkey_size);
+	i2d_X509_PUBKEY(pubkey, &pubkey_der_tmp);
+
+	EVP_Digest(pubkey_der, pubkey_size, pubkey_fingerprint, &pubkey_fingerprint_size, EVP_sha256(), 0);
+
+	tls = tls_create_rec();
+	set_cipher_info(tls, chan->ssl);
+	set_pubkey_info(tls, cert, cert_fingerprint, cert_fingerprint_size, pubkey_fingerprint, pubkey_fingerprint_size);
+	set_peer_cert_chain_info(tls, chan->ssl);
+	set_server_temporary_key_info(tls, chan->ssl);
+
+	ret = 1;
+
+	do {
+		if (chan->verify) {
+			ret = irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server, tls);
+
+			if (! ret) {
+				// irssi_ssl_verify emits a warning itself.
+				continue;
+			}
+		}
+	} while (0);
+
+	// Emit the TLS rec.
+	signal_emit("tls handshake finished", 2, chan->server, tls);
+
+	tls_rec_free(tls);
 	X509_free(cert);
+	g_free(pubkey_der);
+
 	return ret ? 0 : -1;
 }
-
-
-

From 13f75d49e05b4e29104ef52ee1742564c7eed8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 14:15:29 +0200
Subject: [PATCH 0436/1650] Simplify TLS verification error handling.

---
 src/core/network-openssl.c | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 55fb1157..8e12bd53 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -243,39 +243,7 @@ static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, const char* hostname, i
 
 	result = SSL_get_verify_result(ssl);
 	if (result != X509_V_OK) {
-		unsigned char md[EVP_MAX_MD_SIZE];
-		unsigned int n;
-		char *str;
-
-		g_warning("Could not verify SSL servers certificate: %s",
-				X509_verify_cert_error_string(result));
-		if ((str = X509_NAME_oneline(X509_get_subject_name(cert), 0, 0)) == NULL)
-			g_warning("  Could not get subject-name from peer certificate");
-		else {
-			g_warning("  Subject : %s", str);
-			free(str);
-		}
-		if ((str = X509_NAME_oneline(X509_get_issuer_name(cert), 0, 0)) == NULL)
-			g_warning("  Could not get issuer-name from peer certificate");
-		else {
-			g_warning("  Issuer  : %s", str);
-			free(str);
-		}
-		if (! X509_digest(cert, EVP_md5(), md, &n))
-			g_warning("  Could not get fingerprint from peer certificate");
-		else {
-			char hex[] = "0123456789ABCDEF";
-			char fp[EVP_MAX_MD_SIZE*3];
-			if (n < sizeof(fp)) {
-				unsigned int i;
-				for (i = 0; i < n; i++) {
-					fp[i*3+0] = hex[(md[i] >> 4) & 0xF];
-					fp[i*3+1] = hex[(md[i] >> 0) & 0xF];
-					fp[i*3+2] = i == n - 1 ? '\0' : ':';
-				}
-				g_warning("  MD5 Fingerprint : %s", fp);
-			}
-		}
+		g_warning("Could not verify TLS servers certificate: %s", X509_verify_cert_error_string(result));
 		return FALSE;
 	} else if (! irssi_ssl_verify_hostname(cert, hostname)){
 		return FALSE;

From 1d101afe0d5e552f08bf87bcc242bcaf2db972f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 14:25:19 +0200
Subject: [PATCH 0437/1650] s/SSL/TLS/ for warning strings.

---
 src/core/network-openssl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 8e12bd53..c221624f 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -481,7 +481,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		if (capath && *capath)
 			scapath = convert_home(capath);
 		if (! SSL_CTX_load_verify_locations(ctx, scafile, scapath)) {
-			g_warning("Could not load CA list for verifying SSL server certificate");
+			g_warning("Could not load CA list for verifying TLS server certificate");
 			g_free(scafile);
 			g_free(scapath);
 			SSL_CTX_free(ctx);
@@ -784,12 +784,12 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	pubkey = X509_get_X509_PUBKEY(cert);
 
 	if (cert == NULL) {
-		g_warning("SSL server supplied no certificate");
+		g_warning("TLS server supplied no certificate");
 		return -1;
 	}
 
 	if (pubkey == NULL) {
-		g_warning("SSL server supplied no certificate public key");
+		g_warning("TLS server supplied no certificate public key");
 		return -1;
 	}
 

From c6c2e795376e4659810360deaa3dd28475d0f7c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 14:33:25 +0200
Subject: [PATCH 0438/1650] Display TLS connection information when connected
 to a TLS enabled server.

---
 NEWS                                |  2 +
 src/fe-common/core/Makefile.am      |  2 +
 src/fe-common/core/fe-common-core.c |  5 ++
 src/fe-common/core/fe-tls.c         | 82 +++++++++++++++++++++++++++++
 src/fe-common/core/fe-tls.h         | 25 +++++++++
 src/fe-common/core/module-formats.c | 14 +++++
 src/fe-common/core/module-formats.h | 15 +++++-
 7 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 src/fe-common/core/fe-tls.c
 create mode 100644 src/fe-common/core/fe-tls.h

diff --git a/NEWS b/NEWS
index f94ede27..4dad1712 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,8 @@ v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	  to work.
 	+ Use TLS for Freenode, EFnet, EsperNet, OFTC, Rizon, and IRC6 in the default
 	  configuration.
+	+ Display TLS connection information upon connect. You can disable this by
+	  setting tls_verbose_connect to FALSE.
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 63f91fa6..6efff411 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -24,6 +24,7 @@ libfe_common_core_a_SOURCES = \
 	fe-queries.c \
 	fe-server.c \
 	fe-settings.c \
+	fe-tls.c \
 	formats.c \
 	hilight-text.c \
 	keyboard.c \
@@ -48,6 +49,7 @@ pkginc_fe_common_core_HEADERS = \
 	fe-exec.h \
 	fe-messages.h \
 	fe-queries.h \
+	fe-tls.h \
 	formats.h \
 	hilight-text.h \
 	keyboard.h \
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 1b2ab1e2..fd0e6cf0 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -88,6 +88,9 @@ void fe_server_deinit(void);
 void fe_settings_init(void);
 void fe_settings_deinit(void);
 
+void fe_tls_init(void);
+void fe_tls_deinit(void);
+
 void window_commands_init(void);
 void window_commands_deinit(void);
 
@@ -176,6 +179,7 @@ void fe_common_core_init(void)
 	fe_modules_init();
 	fe_server_init();
 	fe_settings_init();
+	fe_tls_init();
 	windows_init();
 	window_activity_init();
 	window_commands_init();
@@ -217,6 +221,7 @@ void fe_common_core_deinit(void)
 	fe_modules_deinit();
 	fe_server_deinit();
 	fe_settings_deinit();
+	fe_tls_deinit();
 	windows_deinit();
 	window_activity_deinit();
 	window_commands_deinit();
diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c
new file mode 100644
index 00000000..ce9bddbf
--- /dev/null
+++ b/src/fe-common/core/fe-tls.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015 Alexander Færøy <ahf@irssi.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#include "module.h"
+#include "signals.h"
+#include "settings.h"
+#include "levels.h"
+#include "tls.h"
+
+#include "module-formats.h"
+#include "printtext.h"
+
+#include "fe-tls.h"
+
+static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
+{
+	if (! settings_get_bool("tls_verbose_connect"))
+		return;
+
+	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_HEADER);
+
+	GSList *certs = NULL;
+	for (certs = tls->certs; certs != NULL; certs = certs->next) {
+		TLS_CERT_REC *tls_cert_rec = certs->data;
+
+		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_SUBJECT_HEADER);
+
+		GSList *subject = NULL;
+		for (subject = tls_cert_rec->subject; subject != NULL; subject = subject->next) {
+			TLS_CERT_ENTRY_REC *subject_data = subject->data;
+			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, subject_data->name, subject_data->value);
+		}
+
+		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_ISSUER_HEADER);
+
+		GSList *issuer = NULL;
+		for (issuer = tls_cert_rec->issuer; issuer != NULL; issuer = issuer->next) {
+			TLS_CERT_ENTRY_REC *issuer_data = issuer->data;
+			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, issuer_data->name, issuer_data->value);
+		}
+	}
+
+	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PROTOCOL_VERSION, tls->protocol_version, tls->cipher_size, tls->cipher);
+
+#ifdef SSL_get_server_tmp_key
+	if (tls->ephemeral_key_algorithm != NULL)
+		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY, tls->ephemeral_key_size, tls->ephemeral_key_algorithm);
+	else
+		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY_UNAVAILBLE);
+#endif
+
+	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PUBKEY, tls->public_key_size, tls->public_key_algorithm, tls->not_before, tls->not_after);
+	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PUBKEY_FINGERPRINT, tls->public_key_fingerprint, tls->public_key_fingerprint_algorithm);
+	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_FINGERPRINT, tls->certificate_fingerprint, tls->certificate_fingerprint_algorithm);
+}
+
+void fe_tls_init(void)
+{
+	settings_add_bool("lookandfeel", "tls_verbose_connect", TRUE);
+
+	signal_add("tls handshake finished", (SIGNAL_FUNC)tls_handshake_finished);
+}
+
+void fe_tls_deinit(void)
+{
+	signal_remove("tls handshake finished", (SIGNAL_FUNC)tls_handshake_finished);
+}
diff --git a/src/fe-common/core/fe-tls.h b/src/fe-common/core/fe-tls.h
new file mode 100644
index 00000000..f0082477
--- /dev/null
+++ b/src/fe-common/core/fe-tls.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2015 Alexander Færøy <ahf@irssi.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef __FE_TLS_H
+#define __FE_TLS_H
+
+void fe_tls_init(void);
+void fe_tls_deinit(void);
+
+#endif
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 5c07f14c..b4747d16 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -291,5 +291,19 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "completion_line", "%#$[10]0 $[!40]1 $2", 3, { 0, 0, 0 } },
 	{ "completion_footer", "", 0 },
 
+	/* ---- */
+	{ NULL, "TLS", 0 },
+
+	{ "tls_ephemeral_key", "EDH Key: {hilight $0} bit {hilight $1}", 2, { 1, 0 } },
+	{ "tls_ephemeral_key_unavailable", "EDH Key: {error N/A}", 0 },
+	{ "tls_pubkey",       "Public Key: {hilight $0} bit {hilight $1}, valid from {hilight $2} to {hilight $3}", 4, { 1, 0, 0, 0 } },
+	{ "tls_cert_header", "Certificate Chain:", 0 },
+	{ "tls_cert_subject_header", "  Subject:", 0 },
+	{ "tls_cert_issuer_header", "  Issuer:", 0 },
+	{ "tls_cert_named_entry", "    $[-2]0: {hilight $1}", 2, { 0, 0 } },
+	{ "tls_pubkey_fingerprint", "Public Key Fingerprint:  {hilight $0} ({hilight $1})", 2, { 0, 0 } },
+	{ "tls_cert_fingerprint", "Certificate Fingerprint: {hilight $0} ({hilight $1})", 2, { 0, 0 } },
+	{ "tls_protocol_version", "Protocol: {hilight $0} ({hilight $1} bit, {hilight $2})", 3, { 0, 1, 0 } },
+
 	{ NULL, NULL, 0 }
 };
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 2b45ff6b..4cdeb407 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -254,7 +254,20 @@ enum {
         TXT_COMPLETION_REMOVED,
 	TXT_COMPLETION_HEADER,
         TXT_COMPLETION_LINE,
-	TXT_COMPLETION_FOOTER
+	TXT_COMPLETION_FOOTER,
+
+	TLS_FILL_15,
+
+	TXT_TLS_EPHEMERAL_KEY,
+	TXT_TLS_EPHEMERAL_KEY_UNAVAILBLE,
+	TXT_TLS_PUBKEY,
+	TXT_TLS_CERT_HEADER,
+	TXT_TLS_CERT_SUBJECT_HEADER,
+	TXT_TLS_CERT_ISSUER_HEADER,
+	TXT_TLS_CERT_NAMED_ENTRY,
+	TXT_TLS_PUBKEY_FINGERPRINT,
+	TXT_TLS_CERT_FINGERPRINT,
+	TXT_TLS_PROTOCOL_VERSION
 };
 
 extern FORMAT_REC fecommon_core_formats[];

From 5146ce96318bc9a2513d104ea76ab3277a540074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 14:39:00 +0200
Subject: [PATCH 0439/1650] Add x509 certificate and public key pinning
 support.

This patch adds two new options to /CONNECT and /SERVER to let the user
pin either an x509 certificate and/or the public key of a given server.

It is possible to fetch the certificate outside of Irssi itself to
verify the checksum. To fetch the certificate call:

    $ openssl s_client -connect chat.freenode.net:6697 < /dev/null 2>/dev/null | \
      openssl x509 > freenode.cert

This will download chat.freenode.net:6697's TLS certificate and put it into the
file freenode.cert.

-tls_pinned_cert
----------------

This option allows you to specify the SHA-256 hash of the x509
certificate. When succesfully connected to the server, irssi will verify
that the given server certificate matches the pin set by the user.

The SHA-256 hash of a given certificate can be verified outside of irssi
using the OpenSSL command line tool:

    $ openssl x509 -in freenode.cert -fingerprint -sha256 -noout

-tls_pinned_pubkey
------------------

This option allows you to specify the SHA-256 hash of the subject public key
information section of the server certificate. This section contains both the
cryptographic parameters for the public key, but also information about the
algorithm used together with the public key parameters.

When succesfully connected to the server, irssi will verify that the
given public key matches the pin set by the user.

The SHA-256 hash of a public key can be verified outside of irssi using
the OpenSSL command line tool:

    $ openssl x509 -in freenode.cert -pubkey -noout | \
      openssl pkey -pubin -outform der | \
      openssl dgst -sha256 -c | \
      tr a-z A-Z

It is possible to specify both -tls_pinned_cert and -tls_pinned_pubkey
together.
---
 NEWS                              | 21 +++++++++++++++++++++
 docs/help/in/connect.in           |  2 ++
 docs/help/in/server.in            |  2 ++
 src/core/chat-commands.c          |  6 +++++-
 src/core/network-openssl.c        | 20 ++++++++++++++++++++
 src/core/server-connect-rec.h     |  2 ++
 src/core/server-setup-rec.h       |  2 ++
 src/core/servers-reconnect.c      |  2 ++
 src/core/servers-setup.c          | 18 ++++++++++++++++++
 src/core/servers.c                |  2 ++
 src/core/session.c                |  2 ++
 src/fe-common/core/fe-server.c    | 15 +++++++++++++--
 src/fe-common/irc/fe-irc-server.c |  4 ++++
 13 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 4dad1712..e4431839 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,27 @@ v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	  configuration.
 	+ Display TLS connection information upon connect. You can disable this by
 	  setting tls_verbose_connect to FALSE.
+	+ Add -tls_pinned_cert and -tls_pinned_pubkey for x509 and public key pinning.
+
+	  The values needed for -tls_pinned_cert and -tls_pinned_pubkey is shown
+	  when connecting to a TLS enabled IRC server, but you can also find the
+	  values like this: Start by downloading the certificate from a given IRC
+	  server:
+
+	      $ openssl s_client -connect chat.freenode.net:6697 < /dev/null 2>/dev/null | \
+	        openssl x509 > freenode.cert
+
+	  Find the value for -tls_pinned_cert:
+
+	      $ openssl x509 -in freenode.cert -fingerprint -sha256 -noout
+
+	  Find the value for -tls_pinned_pubkey:
+
+	      $ openssl x509 -in freenode.cert -pubkey -noout | \
+	        openssl pkey -pubin -outform der | \
+	        openssl dgst -sha256 -c | \
+	        tr a-z A-Z
+
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index a0d793d2..e861ad74 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -15,6 +15,8 @@
     -tls_cafile:        The file with the list of CA certificates.
     -tls_capath:        The directory which contains the CA certificates.
     -tls_ciphers:       TLS cipher suite preference lists.
+    -tls_pinned_cert:   Pinned x509 certificate fingerprint.
+    -tls_pinned_pubkey: Pinned public key fingerprint.
     -noproxy:           Ignores the global proxy configuration.
     -network:           The network this connection belongs to.
     -host:              The hostname you would like to connect from.
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index ee1a30e1..60870111 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -24,6 +24,8 @@
     -tls_cafile:        The file with the list of CA certificates.
     -tls_capath:        The directory which contains the CA certificates.
     -tls_ciphers:       TLS cipher suite preference lists.
+    -tls_pinned_cert:   Pinned x509 certificate fingerprint.
+    -tls_pinned_pubkey: Pinned public key fingerprint.
     -auto:              Automatically connects to the server on startup.
     -noauto:            Doesn't connect to the server on startup.
     -network:           The network the server belongs to.
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index db60e46f..c737b810 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -115,6 +115,10 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 		conn->tls_capath = g_strdup(tmp);
 	if ((tmp = g_hash_table_lookup(optlist, "tls_ciphers")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_ciphers")) != NULL)
 		conn->tls_ciphers = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pinned_cert")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pinned_cert")) != NULL)
+		conn->tls_pinned_cert = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pinned_pubkey")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pinned_pubkey")) != NULL)
+		conn->tls_pinned_pubkey = g_strdup(tmp);
 	if ((conn->tls_capath != NULL && conn->tls_capath[0] != '\0')
 	||  (conn->tls_cafile != NULL && conn->tls_cafile[0] != '\0'))
 		conn->tls_verify = TRUE;
@@ -494,7 +498,7 @@ void chat_commands_init(void)
 	signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server);
 	signal_add("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
 
-	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +host noproxy -rawlog noautosendcmd");
+	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_pinned_cert +ssl_pinned_pubkey tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey +host noproxy -rawlog noautosendcmd");
 	command_set_options("msg", "channel nick");
 }
 
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index c221624f..13db6e25 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -753,6 +753,8 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	unsigned int pubkey_fingerprint_size;
 	unsigned char cert_fingerprint[EVP_MAX_MD_SIZE];
 	unsigned int cert_fingerprint_size;
+	const char *pinned_cert_fingerprint = chan->server->connrec->tls_pinned_cert;
+	const char *pinned_pubkey_fingerprint = chan->server->connrec->tls_pinned_pubkey;
 	TLS_REC *tls = NULL;
 
 	ERR_clear_error();
@@ -814,6 +816,24 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	ret = 1;
 
 	do {
+		if (pinned_cert_fingerprint != NULL && pinned_cert_fingerprint[0] != '\0') {
+			ret = g_ascii_strcasecmp(pinned_cert_fingerprint, tls->certificate_fingerprint) == 0;
+
+			if (! ret) {
+				g_warning("  Pinned certificate mismatch");
+				continue;
+			}
+		}
+
+		if (pinned_pubkey_fingerprint != NULL && pinned_pubkey_fingerprint[0] != '\0') {
+			ret = g_ascii_strcasecmp(pinned_pubkey_fingerprint, tls->public_key_fingerprint) == 0;
+
+			if (! ret) {
+				g_warning("  Pinned public key mismatch");
+				continue;
+			}
+		}
+
 		if (chan->verify) {
 			ret = irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server, tls);
 
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 35577fd4..fa348769 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -29,6 +29,8 @@ char *tls_pass;
 char *tls_cafile;
 char *tls_capath;
 char *tls_ciphers;
+char *tls_pinned_cert;
+char *tls_pinned_pubkey;
 
 GIOChannel *connect_handle; /* connect using this handle */
 
diff --git a/src/core/server-setup-rec.h b/src/core/server-setup-rec.h
index 22876d4e..e6b0431c 100644
--- a/src/core/server-setup-rec.h
+++ b/src/core/server-setup-rec.h
@@ -17,6 +17,8 @@ char *tls_pass;
 char *tls_cafile;
 char *tls_capath;
 char *tls_ciphers;
+char *tls_pinned_cert;
+char *tls_pinned_pubkey;
 
 char *own_host; /* address to use when connecting this server */
 IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 16ec1fac..1727704c 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -199,6 +199,8 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->tls_cafile = g_strdup(src->tls_cafile);
 	dest->tls_capath = g_strdup(src->tls_capath);
 	dest->tls_ciphers = g_strdup(src->tls_ciphers);
+	dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
+	dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
 
 	return dest;
 }
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 01a36e1c..9492c58c 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -181,6 +181,10 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
 		conn->tls_capath = g_strdup(sserver->tls_capath);
 	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
 		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
+	if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
+		conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
+	if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
+		conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
 
 	server_setup_fill_reconn(conn, sserver);
 
@@ -435,6 +439,16 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 		value = config_node_get_str(node, "ssl_ciphers", NULL);
 	rec->tls_ciphers = g_strdup(value);
 
+	value = config_node_get_str(node, "tls_pinned_cert", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_pinned_cert", NULL);
+	rec->tls_pinned_cert = g_strdup(value);
+
+	value = config_node_get_str(node, "tls_pinned_pubkey", NULL);
+	if (value == NULL)
+		value = config_node_get_str(node, "ssl_pinned_pubkey", NULL);
+	rec->tls_pinned_pubkey = g_strdup(value);
+
 	if (rec->tls_cafile || rec->tls_capath)
 		rec->tls_verify = TRUE;
 	if (rec->tls_cert != NULL || rec->tls_verify)
@@ -500,6 +514,8 @@ static void server_setup_save(SERVER_SETUP_REC *rec)
 	iconfig_node_set_str(node, "tls_cafile", rec->tls_cafile);
 	iconfig_node_set_str(node, "tls_capath", rec->tls_capath);
 	iconfig_node_set_str(node, "tls_ciphers", rec->tls_ciphers);
+	iconfig_node_set_str(node, "tls_pinned_cert", rec->tls_pinned_cert);
+	iconfig_node_set_str(node, "tls_pinned_pubkey", rec->tls_pinned_pubkey);
 
 	iconfig_node_set_str(node, "own_host", rec->own_host);
 
@@ -550,6 +566,8 @@ static void server_setup_destroy(SERVER_SETUP_REC *rec)
 	g_free_not_null(rec->tls_cafile);
 	g_free_not_null(rec->tls_capath);
 	g_free_not_null(rec->tls_ciphers);
+	g_free_not_null(rec->tls_pinned_cert);
+	g_free_not_null(rec->tls_pinned_pubkey);
 	g_free(rec->address);
 	g_free(rec);
 }
diff --git a/src/core/servers.c b/src/core/servers.c
index 2a14d510..b9faab81 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -633,6 +633,8 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->tls_cafile);
 	g_free_not_null(conn->tls_capath);
 	g_free_not_null(conn->tls_ciphers);
+	g_free_not_null(conn->tls_pinned_cert);
+	g_free_not_null(conn->tls_pinned_pubkey);
 
 	g_free_not_null(conn->channels);
 	g_free_not_null(conn->away_reason);
diff --git a/src/core/session.c b/src/core/session.c
index 5b3303bb..34190c52 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -165,6 +165,8 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config,
 	config_node_set_str(config, node, "tls_cafile", server->connrec->tls_cafile);
 	config_node_set_str(config, node, "tls_capath", server->connrec->tls_capath);
 	config_node_set_str(config, node, "tls_ciphers", server->connrec->tls_ciphers);
+	config_node_set_str(config, node, "tls_pinned_cert", server->connrec->tls_pinned_cert);
+	config_node_set_str(config, node, "tls_pinned_pubkey", server->connrec->tls_pinned_pubkey);
 
 	handle = g_io_channel_unix_get_fd(net_sendbuffer_handle(server->handle));
 	config_node_set_int(config, node, "handle", handle);
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index b9522bc1..f4c1d3ee 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -196,6 +196,17 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	if (value != NULL && *value != '\0')
 		rec->tls_ciphers = g_strdup(value);
 
+	value = g_hash_table_lookup(optlist, "tls_pinned_cert");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_pinned_cert");
+	if (value != NULL && *value != '\0')
+		rec->tls_pinned_cert = g_strdup(value);
+
+	value = g_hash_table_lookup(optlist, "tls_pinned_pubkey");
+	if (value == NULL)
+		value = g_hash_table_lookup(optlist, "ssl_pinned_pubkey");
+	if (value != NULL && *value != '\0')
+		rec->tls_pinned_pubkey = g_strdup(value);
 
 	if ((rec->tls_cafile != NULL && rec->tls_cafile[0] != '\0')
 	||  (rec->tls_capath != NULL && rec->tls_capath[0] != '\0'))
@@ -423,8 +434,8 @@ void fe_server_init(void)
 	command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
 	command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
 
-	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
-	command_set_options("server modify", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options("server modify", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
 
 	signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
 	signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting);
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 36ed2bdc..c4435d8f 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -125,6 +125,10 @@ static void cmd_server_list(const char *data)
 				g_string_append_printf(str, "tls_capath: %s, ", rec->tls_capath);
 			if (rec->tls_ciphers)
 				g_string_append_printf(str, "tls_ciphers: %s, ", rec->tls_ciphers);
+			if (rec->tls_pinned_cert)
+				g_string_append_printf(str, "tls_pinned_cert: %s, ", rec->tls_pinned_cert);
+			if (rec->tls_pinned_pubkey)
+				g_string_append_printf(str, "tls_pinned_pubkey: %s, ", rec->tls_pinned_pubkey);
 
 		}
 		if (rec->max_cmds_at_once > 0)

From 53d772e48b16e34a82bd9b051f02252f900bb8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 15:04:55 +0200
Subject: [PATCH 0440/1650] Make sure we clean-up after ourself upon failure.

---
 src/core/network-openssl.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 13db6e25..3be33b2f 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -787,18 +787,20 @@ int irssi_ssl_handshake(GIOChannel *handle)
 
 	if (cert == NULL) {
 		g_warning("TLS server supplied no certificate");
-		return -1;
+		ret = 0;
+		goto done;
 	}
 
 	if (pubkey == NULL) {
 		g_warning("TLS server supplied no certificate public key");
-		return -1;
+		ret = 0;
+		goto done;
 	}
 
 	if (! X509_digest(cert, EVP_sha256(), cert_fingerprint, &cert_fingerprint_size)) {
 		g_warning("Unable to generate certificate fingerprint");
-		X509_free(cert);
-		return -1;
+		ret = 0;
+		goto done;
 	}
 
 	pubkey_size = i2d_X509_PUBKEY(pubkey, NULL);
@@ -847,6 +849,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	// Emit the TLS rec.
 	signal_emit("tls handshake finished", 2, chan->server, tls);
 
+done:
 	tls_rec_free(tls);
 	X509_free(cert);
 	g_free(pubkey_der);

From 4e170c52335d06456aba65b46842aa98f8aabe7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 16 Oct 2016 15:18:47 +0200
Subject: [PATCH 0441/1650] Declare variables in the beginning of the function.

---
 src/core/network-openssl.c  | 32 +++++++++++++-------------------
 src/fe-common/core/fe-tls.c | 16 +++++++++-------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 3be33b2f..428881df 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -615,8 +615,16 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 	g_return_if_fail(tls != NULL);
 	g_return_if_fail(ssl != NULL);
 
+	int nid;
+	char *key = NULL;
+	char *value = NULL;
 	STACK_OF(X509) *chain = NULL;
 	int i;
+	int j;
+	TLS_CERT_REC *cert_rec = NULL;
+	X509_NAME *name = NULL;
+	X509_NAME_ENTRY *entry = NULL;
+	TLS_CERT_ENTRY_REC *tls_cert_entry_rec = NULL;
 
 	chain = SSL_get_peer_cert_chain(ssl);
 
@@ -624,24 +632,12 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 		return;
 
 	for (i = 0; i < sk_X509_num(chain); i++) {
-		TLS_CERT_REC *cert_rec = NULL;
-		X509_NAME *name = NULL;
-
-		int j;
-		int nid;
-
-		char *key = NULL;
-		char *value = NULL;
-
 		cert_rec = tls_cert_create_rec();
 
 		// Subject.
 		name = X509_get_subject_name(sk_X509_value(chain, i));
 
 		for (j = 0; j < X509_NAME_entry_count(name); j++) {
-			X509_NAME_ENTRY *entry = NULL;
-			TLS_CERT_ENTRY_REC *tls_cert_entry_rec = NULL;
-
 			entry = X509_NAME_get_entry(name, j);
 
 			nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(entry));
@@ -661,9 +657,6 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 		name = X509_get_issuer_name(sk_X509_value(chain, i));
 
 		for (j = 0; j < X509_NAME_entry_count(name); j++) {
-			X509_NAME_ENTRY *entry = NULL;
-			TLS_CERT_ENTRY_REC *tls_cert_entry_rec = NULL;
-
 			entry = X509_NAME_get_entry(name, j);
 
 			nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(entry));
@@ -691,6 +684,9 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 #ifdef SSL_get_server_tmp_key
 	// Show ephemeral key information.
 	EVP_PKEY *ephemeral_key = NULL;
+	char *ephemeral_key_algorithm = NULL;
+	char *cname = NULL;
+	int nid;
 
 	if (SSL_get_server_tmp_key(ssl, &ephemeral_key)) {
 		switch (EVP_PKEY_id(ephemeral_key)) {
@@ -702,12 +698,10 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 			case EVP_PKEY_EC:
 			{
 				EC_KEY *ec = EVP_PKEY_get1_EC_KEY(ephemeral_key);
-				int nid;
-				const char *cname;
 				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
 				EC_KEY_free(ec);
-				cname = OBJ_nid2sn(nid);
-				char *ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);
+				cname = (char *)OBJ_nid2sn(nid);
+				ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);
 
 				tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm);
 				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c
index ce9bddbf..7a7c537a 100644
--- a/src/fe-common/core/fe-tls.c
+++ b/src/fe-common/core/fe-tls.c
@@ -29,29 +29,31 @@
 
 static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
 {
+	GSList *certs = NULL;
+	GSList *subject = NULL;
+	GSList *issuer = NULL;
+	TLS_CERT_ENTRY_REC *data = NULL;
+
 	if (! settings_get_bool("tls_verbose_connect"))
 		return;
 
 	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_HEADER);
 
-	GSList *certs = NULL;
 	for (certs = tls->certs; certs != NULL; certs = certs->next) {
 		TLS_CERT_REC *tls_cert_rec = certs->data;
 
 		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_SUBJECT_HEADER);
 
-		GSList *subject = NULL;
 		for (subject = tls_cert_rec->subject; subject != NULL; subject = subject->next) {
-			TLS_CERT_ENTRY_REC *subject_data = subject->data;
-			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, subject_data->name, subject_data->value);
+			data = subject->data;
+			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, data->name, data->value);
 		}
 
 		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_ISSUER_HEADER);
 
-		GSList *issuer = NULL;
 		for (issuer = tls_cert_rec->issuer; issuer != NULL; issuer = issuer->next) {
-			TLS_CERT_ENTRY_REC *issuer_data = issuer->data;
-			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, issuer_data->name, issuer_data->value);
+			data = issuer->data;
+			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, data->name, data->value);
 		}
 	}
 

From 25824e2d3fb42def5efbb59ff34a51e31af04ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Wed, 19 Oct 2016 23:37:04 +0200
Subject: [PATCH 0442/1650] Lift ASN1_STRING declaration onto the entry of the
 function.

---
 src/core/network-openssl.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 428881df..8c258eca 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -625,6 +625,7 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 	X509_NAME *name = NULL;
 	X509_NAME_ENTRY *entry = NULL;
 	TLS_CERT_ENTRY_REC *tls_cert_entry_rec = NULL;
+	ASN1_STRING *data = NULL;
 
 	chain = SSL_get_peer_cert_chain(ssl);
 
@@ -646,8 +647,8 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 			if (key == NULL)
 				key = (char *)OBJ_nid2ln(nid);
 
-			ASN1_STRING *d = X509_NAME_ENTRY_get_data(entry);
-			value = (char *)ASN1_STRING_data(d);
+			data = X509_NAME_ENTRY_get_data(entry);
+			value = (char *)ASN1_STRING_data(data);
 
 			tls_cert_entry_rec = tls_cert_entry_create_rec(key, value);
 			tls_cert_rec_append_subject_entry(cert_rec, tls_cert_entry_rec);
@@ -665,8 +666,8 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 			if (key == NULL)
 				key = (char *)OBJ_nid2ln(nid);
 
-			ASN1_STRING *d = X509_NAME_ENTRY_get_data(entry);
-			value = (char *)ASN1_STRING_data(d);
+			data = X509_NAME_ENTRY_get_data(entry);
+			value = (char *)ASN1_STRING_data(data);
 
 			tls_cert_entry_rec = tls_cert_entry_create_rec(key, value);
 			tls_cert_rec_append_issuer_entry(cert_rec, tls_cert_entry_rec);

From f533baa191428b3cbdbba151d575b69e3a783f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Wed, 19 Oct 2016 23:38:21 +0200
Subject: [PATCH 0443/1650] Lift EC_KEY declaration onto the entry of the
 function.

---
 src/core/network-openssl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 8c258eca..4c6b75dd 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -685,6 +685,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 #ifdef SSL_get_server_tmp_key
 	// Show ephemeral key information.
 	EVP_PKEY *ephemeral_key = NULL;
+	EC_KEY *ec_key = NULL;
 	char *ephemeral_key_algorithm = NULL;
 	char *cname = NULL;
 	int nid;
@@ -697,10 +698,9 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 				break;
 
 			case EVP_PKEY_EC:
-			{
-				EC_KEY *ec = EVP_PKEY_get1_EC_KEY(ephemeral_key);
-				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
-				EC_KEY_free(ec);
+				ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
+				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
+				EC_KEY_free(ec_key);
 				cname = (char *)OBJ_nid2sn(nid);
 				ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);
 

From 5a04430998ada5ae800aa0a88638206de51287ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 21 Oct 2016 01:17:35 +0200
Subject: [PATCH 0444/1650] Kill support for DANE.

This patch removes support for DANE validation of TLS certificates.

There wasn't enough support in the IRC community to push for this on the
majority of bigger IRC networks. If you believe this should be
reintroduced into irssi, then please come up with an implementation that
does not rely on the libval library. It is causing a lot of troubles for
our downstream maintainers.
---
 NEWS                       |  8 ++++++++
 configure.ac               | 21 --------------------
 docs/signals.txt           |  3 ---
 src/core/network-openssl.c | 39 --------------------------------------
 4 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/NEWS b/NEWS
index e4431839..1709fbc3 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,14 @@ v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	        openssl dgst -sha256 -c | \
 	        tr a-z A-Z
 
+	+ Remove support for DANE validation of TLS certificates.
+
+	  There wasn't enough support in the IRC community to push for this on the
+	  majority of bigger IRC networks. If you believe this should be
+	  reintroduced into irssi, then please come up with an implementation that
+	  does not rely on the libval library. It is causing a lot of troubles for
+	  our downstream maintainers.
+
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
 	- /names and $[...] now uses utf8 string operations (#40, #411).
diff --git a/configure.ac b/configure.ac
index 629dd590..32a3ebfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,15 +135,6 @@ AC_ARG_WITH(perl,
 	fi,
 	want_perl=static)
 
-AC_ARG_ENABLE(dane,
-[  --enable-dane           Enable DANE support],
-	if test x$enableval = xno ; then
-		want_dane=no
-	else
-		want_dane=yes
-	fi,
-	want_dane=no)
-
 AC_ARG_ENABLE(true-color,
 [  --enable-true-color     Build with true color support in terminal],
 	if test x$enableval = xno ; then
@@ -537,17 +528,6 @@ COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS"
 AC_SUBST(COMMON_NOUI_LIBS)
 AC_SUBST(COMMON_LIBS)
 
-have_dane=no
-if test "x$want_dane" = "xyes"; then
-	AC_MSG_CHECKING([for DANE])
-	AC_CHECK_LIB(val-threads, val_getdaneinfo,
-	[
-		LIBS="$LIBS -lval-threads -lsres"
-		AC_DEFINE([HAVE_DANE], [], [DANE support])
-		have_dane=yes
-	], [], [-lssl -lcrypto -lsres -lpthread])
-fi
-
 if test "x$want_truecolor" = "xyes"; then
 	AC_DEFINE([TERM_TRUECOLOR], [], [true color support in terminal])
 else
@@ -667,7 +647,6 @@ echo "Install prefix ................... : $prefix"
 echo
 
 echo "Building with 64bit DCC support .. : $offt_64bit"
-echo "Building with DANE support ....... : $have_dane"
 echo "Building with true color support.. : $want_truecolor"
 
 echo
diff --git a/docs/signals.txt b/docs/signals.txt
index 47db3575..7776dad7 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -56,9 +56,6 @@ modules.c:
  "module error", int error, char *text, char *rootmodule, char *submodule
 
 network-openssl.c:
- "tlsa available", SERVER_REC
- "tlsa verification success", SERVER_REC
- "tlsa verification failed", SERVER_REC
  "tls handshake finished", SERVER_REC, TLS_REC
 
 nicklist.c:
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 4c6b75dd..e28c8c14 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -32,11 +32,6 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#ifdef HAVE_DANE
-#include <validator/validator.h>
-#include <validator/val_dane.h>
-#endif
-
 /* ssl i/o channel object */
 typedef struct
 {
@@ -207,40 +202,6 @@ static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, const char* hostname, i
 {
 	long result;
 
-#ifdef HAVE_DANE
-	int dane_ret;
-	struct val_daneparams daneparams;
-	struct val_danestatus *danestatus = NULL;
-
-	// Check if a TLSA record is available.
-	daneparams.port = port;
-	daneparams.proto = DANE_PARAM_PROTO_TCP;
-
-	dane_ret = val_getdaneinfo(NULL, hostname, &daneparams, &danestatus);
-
-	if (dane_ret == VAL_DANE_NOERROR) {
-		signal_emit("tlsa available", 1, server);
-	}
-
-	if (danestatus != NULL) {
-		int do_certificate_check = 1;
-
-		if (val_dane_check(NULL, ssl, danestatus, &do_certificate_check) != VAL_DANE_NOERROR) {
-			g_warning("DANE: TLSA record for hostname %s port %d could not be verified", hostname, port);
-			signal_emit("tlsa verification failed", 1, server);
-			val_free_dane(danestatus);
-			return FALSE;
-		}
-
-		signal_emit("tlsa verification success", 1, server);
-		val_free_dane(danestatus);
-
-		if (do_certificate_check == 0) {
-			return TRUE;
-		}
-	}
-#endif
-
 	result = SSL_get_verify_result(ssl);
 	if (result != X509_V_OK) {
 		g_warning("Could not verify TLS servers certificate: %s", X509_verify_cert_error_string(result));

From d501a54f4f256d55ae0a3cd5272d5bb8a42daee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 21 Oct 2016 01:22:09 +0200
Subject: [PATCH 0445/1650] Emit the TLS handshake finished signal before we do
 verification.

This patch moves the emitted "tls handshake finished" signal to before
we do validation of the given TLS certificate. This ensures that we
display certificate information before we possibly error out and
disconnects from the server.
---
 src/core/network-openssl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index e28c8c14..df84772c 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -771,6 +771,9 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	set_peer_cert_chain_info(tls, chan->ssl);
 	set_server_temporary_key_info(tls, chan->ssl);
 
+	// Emit the TLS rec.
+	signal_emit("tls handshake finished", 2, chan->server, tls);
+
 	ret = 1;
 
 	do {
@@ -802,9 +805,6 @@ int irssi_ssl_handshake(GIOChannel *handle)
 		}
 	} while (0);
 
-	// Emit the TLS rec.
-	signal_emit("tls handshake finished", 2, chan->server, tls);
-
 done:
 	tls_rec_free(tls);
 	X509_free(cert);

From 0a6e66f8b794de76bd48bda199977b977a377e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 21 Oct 2016 17:56:29 +0200
Subject: [PATCH 0446/1650] Kill do { ... } while (0); and replace it with
 goto's.

---
 src/core/network-openssl.c | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index df84772c..7a1d6e34 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -776,34 +776,32 @@ int irssi_ssl_handshake(GIOChannel *handle)
 
 	ret = 1;
 
-	do {
-		if (pinned_cert_fingerprint != NULL && pinned_cert_fingerprint[0] != '\0') {
-			ret = g_ascii_strcasecmp(pinned_cert_fingerprint, tls->certificate_fingerprint) == 0;
+	if (pinned_cert_fingerprint != NULL && pinned_cert_fingerprint[0] != '\0') {
+		ret = g_ascii_strcasecmp(pinned_cert_fingerprint, tls->certificate_fingerprint) == 0;
 
-			if (! ret) {
-				g_warning("  Pinned certificate mismatch");
-				continue;
-			}
+		if (! ret) {
+			g_warning("  Pinned certificate mismatch");
+			goto done;
 		}
+	}
 
-		if (pinned_pubkey_fingerprint != NULL && pinned_pubkey_fingerprint[0] != '\0') {
-			ret = g_ascii_strcasecmp(pinned_pubkey_fingerprint, tls->public_key_fingerprint) == 0;
+	if (pinned_pubkey_fingerprint != NULL && pinned_pubkey_fingerprint[0] != '\0') {
+		ret = g_ascii_strcasecmp(pinned_pubkey_fingerprint, tls->public_key_fingerprint) == 0;
 
-			if (! ret) {
-				g_warning("  Pinned public key mismatch");
-				continue;
-			}
+		if (! ret) {
+			g_warning("  Pinned public key mismatch");
+			goto done;
 		}
+	}
 
-		if (chan->verify) {
-			ret = irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server, tls);
+	if (chan->verify) {
+		ret = irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server, tls);
 
-			if (! ret) {
-				// irssi_ssl_verify emits a warning itself.
-				continue;
-			}
+		if (! ret) {
+			// irssi_ssl_verify emits a warning itself.
+			goto done;
 		}
-	} while (0);
+	}
 
 done:
 	tls_rec_free(tls);

From 322625b5487527420cae0a6a1c0da8ecdc87fd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Fri, 21 Oct 2016 17:58:28 +0200
Subject: [PATCH 0447/1650] Only do checks for SSL_get_server_tmp_key in
 network-openssl.c.

---
 src/core/tls.c              | 5 -----
 src/core/tls.h              | 5 -----
 src/fe-common/core/fe-tls.c | 2 --
 3 files changed, 12 deletions(-)

diff --git a/src/core/tls.c b/src/core/tls.c
index 8aad0c89..3bddd773 100644
--- a/src/core/tls.c
+++ b/src/core/tls.c
@@ -42,10 +42,7 @@ void tls_rec_free(TLS_REC *tls_rec)
 	g_free_and_null(tls_rec->certificate_fingerprint_algorithm);
 	g_free_and_null(tls_rec->not_after);
 	g_free_and_null(tls_rec->not_before);
-
-#ifdef SSL_get_server_tmp_key
 	g_free_and_null(tls_rec->ephemeral_key_algorithm);
-#endif
 
 	if (tls_rec->certs != NULL) {
 		g_slist_foreach(tls_rec->certs, (GFunc)tls_cert_rec_free, NULL);
@@ -130,7 +127,6 @@ void tls_rec_set_not_before(TLS_REC *tls_rec, const char *not_before)
 	tls_rec->not_before = g_strdup(not_before);
 }
 
-#ifdef SSL_get_server_tmp_key
 void tls_rec_set_ephemeral_key_algorithm(TLS_REC *tls_rec, const char *algorithm)
 {
 	g_return_if_fail(tls_rec != NULL);
@@ -142,7 +138,6 @@ void tls_rec_set_ephemeral_key_size(TLS_REC *tls_rec, size_t size)
 	g_return_if_fail(tls_rec != NULL);
 	tls_rec->ephemeral_key_size = size;
 }
-#endif
 
 void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec)
 {
diff --git a/src/core/tls.h b/src/core/tls.h
index 4991f7ed..9ba4ac47 100644
--- a/src/core/tls.h
+++ b/src/core/tls.h
@@ -43,10 +43,8 @@ struct _TLS_REC {
 	char *not_after;
 	char *not_before;
 
-#ifdef SSL_get_server_tmp_key
 	char *ephemeral_key_algorithm;
 	size_t ephemeral_key_size;
-#endif
 
 	GSList *certs;
 };
@@ -75,11 +73,8 @@ void tls_rec_set_certificate_fingerprint(TLS_REC *tls_rec, const char *fingerpri
 void tls_rec_set_certificate_fingerprint_algorithm(TLS_REC *tls_rec, const char *algorithm);
 void tls_rec_set_not_after(TLS_REC *tls_rec, const char *not_after);
 void tls_rec_set_not_before(TLS_REC *tls_rec, const char *not_before);
-
-#ifdef SSL_get_server_tmp_key
 void tls_rec_set_ephemeral_key_algorithm(TLS_REC *tls_rec, const char *algorithm);
 void tls_rec_set_ephemeral_key_size(TLS_REC *tls_rec, size_t size);
-#endif
 
 void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec);
 
diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c
index 7a7c537a..608666f0 100644
--- a/src/fe-common/core/fe-tls.c
+++ b/src/fe-common/core/fe-tls.c
@@ -59,12 +59,10 @@ static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
 
 	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PROTOCOL_VERSION, tls->protocol_version, tls->cipher_size, tls->cipher);
 
-#ifdef SSL_get_server_tmp_key
 	if (tls->ephemeral_key_algorithm != NULL)
 		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY, tls->ephemeral_key_size, tls->ephemeral_key_algorithm);
 	else
 		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY_UNAVAILBLE);
-#endif
 
 	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PUBKEY, tls->public_key_size, tls->public_key_algorithm, tls->not_before, tls->not_after);
 	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PUBKEY_FINGERPRINT, tls->public_key_fingerprint, tls->public_key_fingerprint_algorithm);

From bc4e2c9ade41182ff643a94bbcb72ffe86b0e67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 23 Oct 2016 02:51:08 +0200
Subject: [PATCH 0448/1650] Shorten the certificate chain output.

---
 src/fe-common/core/fe-tls.c         | 22 +++++++++++++++++-----
 src/fe-common/core/module-formats.c |  5 ++---
 src/fe-common/core/module-formats.h |  5 ++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c
index 608666f0..ed206d18 100644
--- a/src/fe-common/core/fe-tls.c
+++ b/src/fe-common/core/fe-tls.c
@@ -32,6 +32,7 @@ static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
 	GSList *certs = NULL;
 	GSList *subject = NULL;
 	GSList *issuer = NULL;
+	GString *str = NULL;
 	TLS_CERT_ENTRY_REC *data = NULL;
 
 	if (! settings_get_bool("tls_verbose_connect"))
@@ -41,20 +42,31 @@ static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
 
 	for (certs = tls->certs; certs != NULL; certs = certs->next) {
 		TLS_CERT_REC *tls_cert_rec = certs->data;
-
-		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_SUBJECT_HEADER);
+		str = g_string_new(NULL);
 
 		for (subject = tls_cert_rec->subject; subject != NULL; subject = subject->next) {
 			data = subject->data;
-			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, data->name, data->value);
+			g_string_append_printf(str, "%s: %s, ", data->name, data->value);
 		}
 
-		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_ISSUER_HEADER);
+		if (str->len > 1)
+			g_string_truncate(str, str->len - 2);
+
+		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_SUBJECT, str->str);
+		g_string_free(str, TRUE);
+
+		str = g_string_new(NULL);
 
 		for (issuer = tls_cert_rec->issuer; issuer != NULL; issuer = issuer->next) {
 			data = issuer->data;
-			printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_NAMED_ENTRY, data->name, data->value);
+			g_string_append_printf(str, "%s: %s, ", data->name, data->value);
 		}
+
+		if (str->len > 1)
+			g_string_truncate(str, str->len - 2);
+
+		printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_CERT_ISSUER, str->str);
+		g_string_free(str, TRUE);
 	}
 
 	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PROTOCOL_VERSION, tls->protocol_version, tls->cipher_size, tls->cipher);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index b4747d16..da9705be 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -298,9 +298,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "tls_ephemeral_key_unavailable", "EDH Key: {error N/A}", 0 },
 	{ "tls_pubkey",       "Public Key: {hilight $0} bit {hilight $1}, valid from {hilight $2} to {hilight $3}", 4, { 1, 0, 0, 0 } },
 	{ "tls_cert_header", "Certificate Chain:", 0 },
-	{ "tls_cert_subject_header", "  Subject:", 0 },
-	{ "tls_cert_issuer_header", "  Issuer:", 0 },
-	{ "tls_cert_named_entry", "    $[-2]0: {hilight $1}", 2, { 0, 0 } },
+	{ "tls_cert_subject", "  Subject: {hilight $0}", 1, { 0 } },
+	{ "tls_cert_issuer",  "  Issuer:  {hilight $0}", 1, { 0 } },
 	{ "tls_pubkey_fingerprint", "Public Key Fingerprint:  {hilight $0} ({hilight $1})", 2, { 0, 0 } },
 	{ "tls_cert_fingerprint", "Certificate Fingerprint: {hilight $0} ({hilight $1})", 2, { 0, 0 } },
 	{ "tls_protocol_version", "Protocol: {hilight $0} ({hilight $1} bit, {hilight $2})", 3, { 0, 1, 0 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 4cdeb407..a9ed28c5 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -262,9 +262,8 @@ enum {
 	TXT_TLS_EPHEMERAL_KEY_UNAVAILBLE,
 	TXT_TLS_PUBKEY,
 	TXT_TLS_CERT_HEADER,
-	TXT_TLS_CERT_SUBJECT_HEADER,
-	TXT_TLS_CERT_ISSUER_HEADER,
-	TXT_TLS_CERT_NAMED_ENTRY,
+	TXT_TLS_CERT_SUBJECT,
+	TXT_TLS_CERT_ISSUER,
 	TXT_TLS_PUBKEY_FINGERPRINT,
 	TXT_TLS_CERT_FINGERPRINT,
 	TXT_TLS_PROTOCOL_VERSION

From 6a6196eebe791e193d5f625c0a87f381b4100f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 23 Oct 2016 21:23:52 +0200
Subject: [PATCH 0449/1650] Kill bell_beeps.

Fixes #524
---
 src/fe-common/core/fe-common-core.c | 1 -
 src/fe-common/core/formats.c        | 6 +-----
 src/fe-text/gui-readline.c          | 6 +-----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 1b2ab1e2..74b3f0c7 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -147,7 +147,6 @@ void fe_common_core_init(void)
 	settings_add_level("lookandfeel", "timestamp_level", "ALL");
 	settings_add_time("lookandfeel", "timestamp_timeout", "0");
 
-	settings_add_bool("lookandfeel", "bell_beeps", FALSE);
 	settings_add_level("lookandfeel", "beep_msg_level", "");
 	settings_add_bool("lookandfeel", "beep_when_window_active", TRUE);
 	settings_add_bool("lookandfeel", "beep_when_away", TRUE);
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 9aa7698d..a58d839a 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1224,11 +1224,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 			}
 		}
 
-		if (type == 7) {
-			/* bell */
-			if (settings_get_bool("bell_beeps"))
-				signal_emit("beep", 0);
-		} else if (type == 4 && *ptr == FORMAT_STYLE_CLRTOEOL) {
+		if (type == 4 && *ptr == FORMAT_STYLE_CLRTOEOL) {
 			/* clear to end of line */
 			flags |= GUI_PRINT_FLAG_CLRTOEOL;
 		}
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 7c71edd7..2c2eac21 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -611,12 +611,8 @@ static void key_yank_next_cutbuffer(void)
 	guint length = 0;
 	char *cutbuffer;
 
-	if (!previous_yank_preceded) {
-		if (settings_get_bool("bell_beeps")) {
-			signal_emit("beep", 0);
-		}
+	if (!previous_yank_preceded)
 		return;
-	}
 
 	if (active_entry->kill_ring == NULL)
 		return;

From c98f5f23ea6c711898288779d1d1670b81770317 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 27 Oct 2016 11:18:37 -0400
Subject: [PATCH 0450/1650] enforce check that chatnets are nodelists to handle
 invalid config

---
 src/core/chatnets.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index dd4d94b3..e0a7a8d9 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -132,7 +132,7 @@ static void chatnet_read(CONFIG_NODE *node)
 	CHATNET_REC *rec;
         char *type;
 
-	if (node == NULL || node->key == NULL)
+	if (node == NULL || node->key == NULL || !is_node_list(node))
 		return;
 
 	type = config_node_get_str(node, "type", NULL);

From 43934ae9ad00d911a0347360479f15946344ffad Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 1 Nov 2016 17:08:28 +0100
Subject: [PATCH 0451/1650] add missing inheritance to Exec item from 3532fc46

---
 src/perl/common/Irssi.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/perl/common/Irssi.pm b/src/perl/common/Irssi.pm
index e2d9f963..1d7ed2f3 100644
--- a/src/perl/common/Irssi.pm
+++ b/src/perl/common/Irssi.pm
@@ -159,6 +159,7 @@ if (!in_irssi()) {
 
   @Irssi::Channel::ISA = qw(Irssi::Windowitem);
   @Irssi::Query::ISA = qw(Irssi::Windowitem);
+  @Irssi::UI::Exec::ISA = qw(Irssi::Windowitem);
   @Irssi::Chatnet::ISA = qw();
   @Irssi::Nick::ISA = qw();
 

From 4cbf279d88248d600d22b8cff474a9dc4a455b31 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Tue, 8 Nov 2016 16:27:38 +0200
Subject: [PATCH 0452/1650] add completion_empty_line setting

---
 src/fe-common/core/chat-completion.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 3e144602..1f00feaf 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -48,7 +48,7 @@ static int keep_privates_count, keep_publics_count;
 static int completion_lowercase;
 static char *completion_char, *cmdchars;
 static GSList *global_lastmsgs;
-static int completion_auto, completion_strict;
+static int completion_auto, completion_strict, completion_empty_line;
 static int completion_match_case;
 
 #define SERVER_LAST_MSG_ADD(server, nick) \
@@ -669,6 +669,8 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
 		return;
 
 	if (*linestart == '\0' && *word == '\0') {
+		if (!completion_empty_line)
+			return;
 		/* pressed TAB at the start of line - add /MSG */
                 prefix = g_strdup_printf("%cmsg", *cmdchars);
 		*list = completion_msg(server, NULL, "", prefix);
@@ -1157,6 +1159,7 @@ static void read_settings(void)
 
 	completion_auto = settings_get_bool("completion_auto");
 	completion_strict = settings_get_bool("completion_strict");
+	completion_empty_line = settings_get_bool("completion_empty_line");
 
 	completion_match_case = settings_get_choice("completion_nicks_match_case");
 
@@ -1180,6 +1183,7 @@ void chat_completion_init(void)
 	settings_add_int("completion", "completion_keep_privates", 10);
 	settings_add_bool("completion", "completion_nicks_lowercase", FALSE);
 	settings_add_bool("completion", "completion_strict", FALSE);
+	settings_add_bool("completion", "completion_empty_line", TRUE);
 	settings_add_choice("completion", "completion_nicks_match_case", COMPLETE_MCASE_AUTO, "never;always;auto");
 
 	settings_add_bool("lookandfeel", "expand_escapes", FALSE);

From 7574bed26c98069945b3fbc3938819c10e65b045 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 23 Nov 2016 16:11:38 +0100
Subject: [PATCH 0453/1650] Minor corrections to the netsplit code.

---
 src/fe-common/irc/fe-netjoin.c  | 2 +-
 src/fe-common/irc/fe-netsplit.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 22ca642c..79a8d5ec 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -251,7 +251,7 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
 	if (!IS_IRC_SERVER(dest->server))
 		return;
 
-	if (dest->level != MSGLEVEL_PUBLIC)
+	if (!(dest->level & MSGLEVEL_PUBLIC))
 		return;
 
 	if (!server_ischannel(dest->server, dest->target))
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index aa05639b..b44fa249 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -249,13 +249,13 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
 	if (printing_splits)
 		return;
 
-	if (IS_IRC_SERVER(dest->server) == FALSE)
+	if (!IS_IRC_SERVER(dest->server))
 		return;
 
-	if (dest->level != MSGLEVEL_PUBLIC)
+	if (!(dest->level & MSGLEVEL_PUBLIC))
 		return;
 
-	if (server_ischannel(dest->server, dest->target) == FALSE)
+	if (!server_ischannel(dest->server, dest->target))
 		return;
 
 	rec = IRC_SERVER(dest->server);

From dcffa98d4629ee1810900d0dde1234050e68d39e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 23 Nov 2016 16:23:35 +0100
Subject: [PATCH 0454/1650] add a static buffer for dcc received data

increased buffersize might make irssi freeze less / #159
---
 src/irc/dcc/dcc-get.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index f7a95bb9..73c1b864 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -30,6 +30,8 @@
 #include "dcc-get.h"
 #include "dcc-send.h"
 
+static char *dcc_get_recv_buffer;
+
 GET_DCC_REC *dcc_get_create(IRC_SERVER_REC *server, CHAT_DCC_REC *chat,
 				   const char *nick, const char *arg)
 {
@@ -139,14 +141,20 @@ static void sig_dccget_send(GET_DCC_REC *dcc)
                 dcc_get_send_received(dcc);
 }
 
+#define DCC_GET_RECV_BUFFER_SIZE 32768
+
 /* input function: DCC GET received data */
 static void sig_dccget_receive(GET_DCC_REC *dcc)
 {
-        char buffer[512];
 	int ret;
 
+	if (dcc_get_recv_buffer == NULL) {
+		dcc_get_recv_buffer = g_malloc(DCC_GET_RECV_BUFFER_SIZE);
+	}
+
 	for (;;) {
-		ret = net_receive(dcc->handle, buffer, sizeof(buffer));
+		ret = net_receive(dcc->handle, dcc_get_recv_buffer,
+				  DCC_GET_RECV_BUFFER_SIZE);
 		if (ret == 0) break;
 
 		if (ret < 0) {
@@ -156,7 +164,7 @@ static void sig_dccget_receive(GET_DCC_REC *dcc)
 			return;
 		}
 
-		if (write(dcc->fhandle, buffer, ret) != ret) {
+		if (write(dcc->fhandle, dcc_get_recv_buffer, ret) != ret) {
 			/* most probably out of disk space */
 			signal_emit("dcc error write", 2,
 				    dcc, g_strerror(errno));
@@ -596,4 +604,5 @@ void dcc_get_deinit(void)
 	signal_remove("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
 	signal_remove("ctcp msg dcc send", (SIGNAL_FUNC) ctcp_msg_dcc_send);
 	command_unbind("dcc get", (SIGNAL_FUNC) cmd_dcc_get);
+	g_free_and_null(dcc_get_recv_buffer);
 }

From 5f0e755a00c7cb0e85e167cd455bb3ce16b4d14b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 23 Nov 2016 22:22:37 +0100
Subject: [PATCH 0455/1650] Don't shadow the 'channel' variable when printing
 the netjoins.

This is the root cause of #567
---
 src/fe-common/irc/fe-netjoin.c  | 6 ++++--
 src/fe-common/irc/fe-netsplit.c | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 79a8d5ec..4eb388c0 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -164,7 +164,7 @@ static void print_channel_netjoins(char *channel, TEMP_PRINT_REC *rec,
 	g_free(channel);
 }
 
-static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
+static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channel)
 {
 	TEMP_PRINT_REC *temp;
 	GHashTable *channels;
@@ -189,7 +189,9 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel)
 
 			next2 = g_slist_next(tmp2);
 
-			if (channel != NULL && strcasecmp(realchannel, channel) != 0)
+			/* Filter the results by channel if asked to do so */
+			if (filter_channel != NULL &&
+			    strcasecmp(realchannel, filter_channel) != 0)
 				continue;
 
 			temp = g_hash_table_lookup(channels, realchannel);
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index b44fa249..17fb1994 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -142,7 +142,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split,
 	}
 }
 
-static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, const char *channel)
+static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, const char *filter_channel)
 {
 	GString *destservers;
 	char *sourceserver;
@@ -168,7 +168,8 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, con
 	for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) {
 		TEMP_SPLIT_CHAN_REC *chan = tmp->data;
 
-		if (channel != NULL && strcasecmp(channel, chan->name) != 0)
+		if (filter_channel != NULL &&
+		    strcasecmp(chan->name, filter_channel) != 0)
 			continue;
 
 		g_string_truncate(chan->nicks, chan->nicks->len-2);

From 0d7b3877e46cda8e960cab30397f15003e9c7527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 22 Jul 2014 01:39:16 +0200
Subject: [PATCH 0456/1650] Check for socket() in libnetwork for Haiku

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 32a3ebfd..bf87f5aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ case "$host_os" in
 esac
 
 
-AC_SEARCH_LIBS([socket], [socket])
+AC_SEARCH_LIBS([socket], [network socket])
 
 AC_SEARCH_LIBS([inet_addr], [nsl])
 

From 7fb84b5b7d471d62333a94bc0d6e5032ede7c2c7 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 29 Nov 2016 23:08:45 +0100
Subject: [PATCH 0457/1650] Enforce the is_node_list contract in lib-config
 setters.

An assertion failure is better than a segfault.
---
 src/lib-config/set.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib-config/set.c b/src/lib-config/set.c
index 7ca55871..0de6c503 100644
--- a/src/lib-config/set.c
+++ b/src/lib-config/set.c
@@ -82,6 +82,7 @@ void config_node_clear(CONFIG_REC *rec, CONFIG_NODE *node)
 void config_nodes_remove_all(CONFIG_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
+	g_return_if_fail(is_node_list(rec->mainnode));
 
 	while (rec->mainnode->value != NULL)
 		config_node_remove(rec, rec->mainnode, ((GSList *) rec->mainnode->value)->data);
@@ -94,6 +95,7 @@ void config_node_set_str(CONFIG_REC *rec, CONFIG_NODE *parent, const char *key,
 
 	g_return_if_fail(rec != NULL);
 	g_return_if_fail(parent != NULL);
+	g_return_if_fail(is_node_list(parent));
 
 	no_key = key == NULL;
 	node = no_key ? NULL : config_node_find(parent, key);

From 91c9e871c78e203aed834edd1e1f558680a6ccfa Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 12 Jul 2016 13:59:46 +0200
Subject: [PATCH 0458/1650] Add an option to stop the connection when SASL
 fails.

---
 src/fe-common/irc/fe-sasl.c | 17 +++++++++++++++++
 src/irc/core/irc-servers.h  |  1 +
 src/irc/core/sasl.c         |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
index 331b38b0..dfbfc84a 100644
--- a/src/fe-common/irc/fe-sasl.c
+++ b/src/fe-common/irc/fe-sasl.c
@@ -23,6 +23,9 @@
 #include "signals.h"
 #include "levels.h"
 
+#include "irc-servers.h"
+#include "settings.h"
+
 #include "printtext.h"
 
 static void sig_sasl_success(IRC_SERVER_REC *server)
@@ -35,14 +38,28 @@ static void sig_sasl_failure(IRC_SERVER_REC *server, const char *reason)
 	printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_ERROR, reason);
 }
 
+static void sig_cap_end(IRC_SERVER_REC *server)
+{
+	/* The negotiation has now been terminated, if we didn't manage to
+	 * authenticate successfully with the server just disconnect. */
+	if (server->sasl_success == FALSE &&
+	    settings_get_bool("sasl_disconnect_on_failure"))
+		server_disconnect(SERVER(server));
+
+}
+
 void fe_sasl_init(void)
 {
+	settings_add_bool("server", "sasl_disconnect_on_failure", TRUE);
+
 	signal_add("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
 	signal_add("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
+	signal_add_first("server cap end", (SIGNAL_FUNC) sig_cap_end);
 }
 
 void fe_sasl_deinit(void)
 {
 	signal_remove("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
 	signal_remove("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
+	signal_remove("server cap end", (SIGNAL_FUNC) sig_cap_end);
 }
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index bb100f86..09f3f81d 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -68,6 +68,7 @@ struct _IRC_SERVER_REC {
 	unsigned int motd_got:1; /* We've received MOTD */
 	unsigned int isupport_sent:1; /* Server has sent us an isupport reply */
 	unsigned int cap_complete:1; /* We've done the initial CAP negotiation */
+	unsigned int sasl_success:1; /* Did we authenticate successfully ? */
 
 	int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */
 	int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index a1c16cdd..1021bea4 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -48,6 +48,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
 	cap_finish_negotiation(server);
 
 	server->sasl_timeout = 0;
+	server->sasl_success = FALSE;
 
 	signal_emit("server sasl failure", 2, server, "The authentication timed out");
 
@@ -84,6 +85,8 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 
 	params = event_get_params(data, 2, NULL, &error);
 
+	server->sasl_success = FALSE;
+
 	signal_emit("server sasl failure", 2, server, error);
 
 	/* Terminate the negotiation */
@@ -99,6 +102,8 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
 		server->sasl_timeout = 0;
 	}
 
+	server->sasl_success = TRUE;
+
 	signal_emit("server sasl success", 1, server);
 
 	/* We're already authenticated, do nothing */
@@ -112,6 +117,8 @@ static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *f
 		server->sasl_timeout = 0;
 	}
 
+	server->sasl_success = TRUE;
+
 	signal_emit("server sasl success", 1, server);
 
 	/* The authentication succeeded, time to finish the CAP negotiation */

From 4ccffd85ffd06325687546f78b78e3e7fce575c5 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 20 Oct 2016 21:41:36 +0200
Subject: [PATCH 0459/1650] Expose 'sasl_success' to the perl side.

---
 src/fe-common/irc/fe-sasl.c | 2 +-
 src/perl/irc/Irc.xs         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
index dfbfc84a..4c86f850 100644
--- a/src/fe-common/irc/fe-sasl.c
+++ b/src/fe-common/irc/fe-sasl.c
@@ -42,7 +42,7 @@ static void sig_cap_end(IRC_SERVER_REC *server)
 {
 	/* The negotiation has now been terminated, if we didn't manage to
 	 * authenticate successfully with the server just disconnect. */
-	if (server->sasl_success == FALSE &&
+	if (!server->sasl_success &&
 	    settings_get_bool("sasl_disconnect_on_failure"))
 		server_disconnect(SERVER(server));
 
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 8b3b0c45..41690010 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -32,6 +32,7 @@ static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 	(void) hv_store(hv, "isupport_sent", 13, newSViv(server->isupport_sent), 0);
 
 	(void) hv_store(hv, "cap_complete", 12, newSViv(server->cap_complete), 0);
+	(void) hv_store(hv, "sasl_success", 12, newSViv(server->sasl_success), 0);
 
 	av = newAV();
 	for (tmp = server->cap_supported; tmp != NULL; tmp = tmp->next)

From 560283ba4e4d355daa32dc970021845260d2dca9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 12 Dec 2016 21:07:56 +0100
Subject: [PATCH 0460/1650] g_sequence backing for window list

---
 configure.ac                    |   2 +-
 src/fe-common/core/fe-windows.c | 204 ++++++++++++++++++++++----------
 2 files changed, 145 insertions(+), 61 deletions(-)

diff --git a/configure.ac b/configure.ac
index bf87f5aa..464f6288 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,7 @@ for try in 1 2; do
     echo "*** trying without -lgmodule"
     glib_modules=
   fi
-  AM_PATH_GLIB_2_0(2.16.0,,, $glib_modules)
+  AM_PATH_GLIB_2_0(2.28.0,,, $glib_modules)
   if test "$GLIB_LIBS"; then
     if test $glib_modules = gmodule; then
       AC_DEFINE(HAVE_GMODULE)
diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 46c1593b..ff45f141 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -35,6 +35,7 @@
 
 GSList *windows; /* first in the list is the active window,
                     next is the last active, etc. */
+GSequence *windows_seq;
 WINDOW_REC *active_win;
 
 static int daytag;
@@ -44,21 +45,23 @@ static int daycheck; /* 0 = don't check, 1 = time is 00:00, check,
 static int window_get_new_refnum(void)
 {
 	WINDOW_REC *win;
-	GSList *tmp;
+	GSequenceIter *iter, *end;
 	int refnum;
 
 	refnum = 1;
-	tmp = windows;
-	while (tmp != NULL) {
-		win = tmp->data;
+	for (iter = g_sequence_get_begin_iter(windows_seq),
+	     end = g_sequence_get_end_iter(windows_seq);
+
+	     iter != end;
+
+	     refnum++,
+	     iter = g_sequence_iter_next(iter)) {
+
+		win = g_sequence_get(iter);
 
 		if (refnum != win->refnum) {
-			tmp = tmp->next;
-			continue;
+			return refnum;
 		}
-
-		refnum++;
-		tmp = windows;
 	}
 
 	return refnum;
@@ -73,6 +76,7 @@ WINDOW_REC *window_create(WI_ITEM_REC *item, int automatic)
 	rec->level = settings_get_level("window_default_level");
 
 	windows = g_slist_prepend(windows, rec);
+	g_sequence_insert_sorted(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
 	signal_emit("window created", 2, rec, GINT_TO_POINTER(automatic));
 
 	if (item != NULL) window_item_add(rec, item, automatic);
@@ -84,6 +88,25 @@ WINDOW_REC *window_create(WI_ITEM_REC *item, int automatic)
 	return rec;
 }
 
+static void window_set_refnum0(WINDOW_REC *window, int refnum)
+{
+	int old_refnum;
+
+	g_return_if_fail(window != NULL);
+	g_return_if_fail(refnum >= 1);
+	if (window->refnum == refnum) return;
+
+	old_refnum = window->refnum;
+	window->refnum = refnum;
+	signal_emit("window refnum changed", 2, window, GINT_TO_POINTER(old_refnum));
+}
+
+static int window_refnum_lookup(WINDOW_REC *window, void *refnum_p)
+{
+	int refnum = GPOINTER_TO_INT(refnum_p);
+	return window->refnum == refnum ? 0 : window->refnum < refnum ? -1 : 1;
+}
+
 /* removed_refnum was removed from the windows list, pack the windows so
    there won't be any holes. If there is any holes after removed_refnum,
    leave the windows behind it alone. */
@@ -91,23 +114,34 @@ static void windows_pack(int removed_refnum)
 {
 	WINDOW_REC *window;
 	int refnum;
+	GSequenceIter *iter, *end;
 
-	for (refnum = removed_refnum+1;; refnum++) {
-		window = window_find_refnum(refnum);
-		if (window == NULL || window->sticky_refnum)
+	refnum = removed_refnum+1;
+	end = g_sequence_get_end_iter(windows_seq);
+	iter = g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+	if (iter == NULL) iter = end;
+
+	for (; iter != end; refnum++, iter = g_sequence_iter_next(iter)) {
+		window = g_sequence_get(iter);
+
+		if (window == NULL || window->sticky_refnum || window->refnum != refnum)
 			break;
 
-		window_set_refnum(window, refnum-1);
+		window_set_refnum0(window, refnum-1);
+		g_sequence_sort_changed(iter, (GCompareDataFunc)window_refnum_cmp, NULL);
 	}
 }
 
 void window_destroy(WINDOW_REC *window)
 {
+	GSequenceIter *iter;
 	g_return_if_fail(window != NULL);
 
 	if (window->destroying) return;
 	window->destroying = TRUE;
 	windows = g_slist_remove(windows, window);
+	iter = g_sequence_lookup(windows_seq, window, (GCompareDataFunc)window_refnum_cmp, NULL);
+	if (iter != NULL) g_sequence_remove(iter);
 
 	if (active_win == window) {
 		active_win = NULL; /* it's corrupted */
@@ -189,26 +223,32 @@ void window_change_server(WINDOW_REC *window, void *server)
 
 void window_set_refnum(WINDOW_REC *window, int refnum)
 {
-	GSList *tmp;
+	GSequenceIter *oiter, *witer;
 	int old_refnum;
 
 	g_return_if_fail(window != NULL);
 	g_return_if_fail(refnum >= 1);
 	if (window->refnum == refnum) return;
 
-	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
-		WINDOW_REC *rec = tmp->data;
+	oiter = g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+	witer = g_sequence_lookup(windows_seq, GINT_TO_POINTER(window->refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
 
-		if (rec->refnum == refnum) {
-			rec->refnum = window->refnum;
-                        signal_emit("window refnum changed", 2, rec, GINT_TO_POINTER(refnum));
-			break;
-		}
+	if (oiter != NULL) {
+		WINDOW_REC *rec = g_sequence_get(oiter);
+
+		rec->refnum = window->refnum;
+		signal_emit("window refnum changed", 2, rec, GINT_TO_POINTER(refnum));
 	}
 
 	old_refnum = window->refnum;
 	window->refnum = refnum;
 	signal_emit("window refnum changed", 2, window, GINT_TO_POINTER(old_refnum));
+
+	if (witer != NULL && oiter != NULL) {
+		g_sequence_swap(oiter, witer);
+	} else {
+		g_sequence_sort_changed(witer, (GCompareDataFunc)window_refnum_cmp, NULL);
+	}
 }
 
 void window_set_name(WINDOW_REC *window, const char *name)
@@ -346,13 +386,13 @@ WINDOW_REC *window_find_closest(void *server, const char *name, int level)
 
 WINDOW_REC *window_find_refnum(int refnum)
 {
-	GSList *tmp;
+	GSequenceIter *iter;
 
-	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
-		WINDOW_REC *rec = tmp->data;
+	iter = g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+	if (iter != NULL) {
+		WINDOW_REC *rec = g_sequence_get(iter);
 
-		if (rec->refnum == refnum)
-			return rec;
+		return rec;
 	}
 
 	return NULL;
@@ -400,71 +440,112 @@ WINDOW_REC *window_find_item(SERVER_REC *server, const char *name)
 
 int window_refnum_prev(int refnum, int wrap)
 {
-	GSList *tmp;
-	int prev, max;
+	GSequenceIter *iter, *end;
 
-	max = prev = -1;
-	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
-		WINDOW_REC *rec = tmp->data;
+	iter = g_sequence_search(windows_seq, GINT_TO_POINTER(refnum-1), (GCompareDataFunc)window_refnum_lookup, NULL);
+	end = g_sequence_get_end_iter(windows_seq);
 
-		if (rec->refnum < refnum && (prev == -1 || rec->refnum > prev))
-			prev = rec->refnum;
-		if (wrap && (max == -1 || rec->refnum > max))
-			max = rec->refnum;
+	if (iter != NULL) {
+		WINDOW_REC *rec;
+		if (iter != end) {
+			rec = g_sequence_get(iter);
+
+			if (rec->refnum < refnum)
+				return rec->refnum;
+		}
+
+		iter = g_sequence_iter_prev(iter);
+		rec = g_sequence_get(iter);
+
+		if (rec->refnum < refnum)
+			return rec->refnum;
 	}
 
-	return prev != -1 ? prev : max;
+	if (wrap) {
+		WINDOW_REC *rec;
+		iter = g_sequence_iter_prev(end);
+		if (iter != end) {
+			rec = g_sequence_get(iter);
+
+			return rec->refnum;
+		}
+	}
+
+	return -1;
 }
 
 int window_refnum_next(int refnum, int wrap)
 {
-	GSList *tmp;
-	int min, next;
+	GSequenceIter *iter, *end;
 
-	min = next = -1;
-	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
-		WINDOW_REC *rec = tmp->data;
+	iter = g_sequence_search(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+	end = g_sequence_get_end_iter(windows_seq);
 
-		if (rec->refnum > refnum && (next == -1 || rec->refnum < next))
-			next = rec->refnum;
-		if (wrap && (min == -1 || rec->refnum < min))
-			min = rec->refnum;
+	if (iter != NULL && iter != end) {
+		WINDOW_REC *rec = g_sequence_get(iter);
+
+		if (rec->refnum > refnum)
+			return rec->refnum;
+
+		iter = g_sequence_iter_next(iter);
+		if (iter != end) {
+			rec = g_sequence_get(iter);
+
+			if (rec->refnum > refnum)
+				return rec->refnum;
+		}
 	}
 
-	return next != -1 ? next : min;
+	if (wrap) {
+		WINDOW_REC *rec;
+		iter = g_sequence_get_begin_iter(windows_seq);
+		if (iter != end) {
+			rec = g_sequence_get(iter);
+
+			return rec->refnum;
+		}
+	}
+
+	return -1;
 }
 
 int windows_refnum_last(void)
 {
-	GSList *tmp;
-	int max;
+	GSequenceIter *end, *iter;
+	WINDOW_REC *rec;
 
-	max = -1;
-	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
-		WINDOW_REC *rec = tmp->data;
+	end = g_sequence_get_end_iter(windows_seq);
+	iter = g_sequence_iter_prev(end);
+	if (iter != end) {
+		rec = g_sequence_get(iter);
 
-		if (rec->refnum > max)
-			max = rec->refnum;
+		return rec->refnum;
 	}
 
-	return max;
+	return -1;
 }
 
 int window_refnum_cmp(WINDOW_REC *w1, WINDOW_REC *w2)
 {
-	return w1->refnum < w2->refnum ? -1 : 1;
+	return w1 == w2 ? 0 : w1->refnum < w2->refnum ? -1 : 1;
 }
 
 GSList *windows_get_sorted(void)
 {
-	GSList *tmp, *sorted;
+	GSequenceIter *iter, *begin;
+	GSList *sorted;
 
         sorted = NULL;
-	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
-		WINDOW_REC *rec = tmp->data;
+	for (iter = g_sequence_get_end_iter(windows_seq),
+	     begin = g_sequence_get_begin_iter(windows_seq);
 
-		sorted = g_slist_insert_sorted(sorted, rec, (GCompareFunc)
-					       window_refnum_cmp);
+	     iter != begin;
+
+	     ) {
+		iter = g_sequence_iter_prev(iter);
+		WINDOW_REC *rec = g_sequence_get(iter);
+
+		sorted = g_slist_prepend(sorted, rec);
 	}
 
         return sorted;
@@ -709,6 +790,7 @@ static void read_settings(void)
 void windows_init(void)
 {
 	active_win = NULL;
+	windows_seq = g_sequence_new(NULL);
 	daycheck = 0; daytag = -1;
 	settings_add_bool("lookandfeel", "window_auto_change", FALSE);
 	settings_add_bool("lookandfeel", "windows_auto_renumber", TRUE);
@@ -733,4 +815,6 @@ void windows_deinit(void)
 	signal_remove("server disconnected", (SIGNAL_FUNC) sig_server_disconnected);
 	signal_remove("server connect failed", (SIGNAL_FUNC) sig_server_disconnected);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+	g_sequence_free(windows_seq);
+	windows_seq = NULL;
 }

From 365097319f2bf57d7d01c2c4c912fca124fbedf9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Dec 2016 03:04:01 +0100
Subject: [PATCH 0461/1650] manually redraw the activity list on expose only

might speed up /foreach query /unquery
---
 src/fe-text/statusbar-items.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 0db4f63a..de4499b4 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -143,16 +143,34 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 static void item_act(SBAR_ITEM_REC *item, int get_size_only)
 {
 	char *actlist;
+	int max_size;
 
-	actlist = get_activity_list(item->bar->parent_window, TRUE, TRUE);
-	if (actlist == NULL) {
-		if (get_size_only)
+	if (get_size_only) {
+		if (activity_list == NULL)
 			item->min_size = item->max_size = 0;
+		/* Skip activity calculation on regular trigger, only
+		   set dirty */
 		return;
 	}
 
-	statusbar_item_default_handler(item, get_size_only,
+	actlist = get_activity_list(item->bar->parent_window, TRUE, TRUE);
+	if (actlist == NULL) {
+		return;
+	}
+
+	max_size = item->max_size;
+	statusbar_item_default_handler(item, TRUE,
 				       NULL, actlist, FALSE);
+	statusbar_item_default_handler(item, FALSE,
+				       NULL, actlist, FALSE);
+	if (max_size != item->max_size) {
+		/* Due to above hack of skipping the calculation, we
+		   need to manually trigger the redraw process now or
+		   we won't see the item */
+		item->bar->dirty = item->dirty = TRUE;
+		statusbar_redraw(item->bar, TRUE);
+		statusbar_redraw_dirty();
+	}
 
 	g_free_not_null(actlist);
 }

From 59242cb595716bf34966ee71aca81e0c9a2a5284 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Dec 2016 16:59:38 +0100
Subject: [PATCH 0462/1650] add assertion to statusbar_read_group

fix #564
---
 src/fe-text/statusbar-config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index a47a709e..48f4aa61 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -194,6 +194,8 @@ static void statusbar_read_group(CONFIG_NODE *node)
 	STATUSBAR_GROUP_REC *group;
 	GSList *tmp;
 
+	g_return_if_fail(is_node_list(node));
+
 	group = statusbar_group_find(node->key);
 	if (group == NULL) {
 		group = statusbar_group_create(node->key);

From 17e42649bb514fa0e12e094032cb27e3289204c6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Dec 2016 17:06:40 +0100
Subject: [PATCH 0463/1650] reset background for mirc colour 99

fix #571
---
 src/fe-text/gui-printtext.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 775e6044..a07451fa 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -169,7 +169,8 @@ static void get_colors(int flags, int *fg, int *bg, int *attr)
                 if (*bg >= 0) {
 			*bg = mirc_colors[*bg % 100];
 			flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
-			if (settings_get_bool("mirc_blink_fix")) {
+			/* ignore mirc color 99 = -1 (reset) */
+			if (*bg != -1 && settings_get_bool("mirc_blink_fix")) {
 				if (*bg < 16) /* ansi bit flip :-( */
 					*bg = (*bg&8) | (*bg&4)>>2 | (*bg&2) | (*bg&1)<<2;
 				*bg = term_color256map[*bg&0xff] & 7;

From 7b856d628bfd6c775dfaee2138a3542ee13b1960 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Dec 2016 18:01:26 +0100
Subject: [PATCH 0464/1650] check for end of string in ansi 48

---
 src/fe-common/core/formats.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index a58d839a..a789c0e3 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -956,6 +956,7 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 			str++;
 			for (num2 = 0; i_isdigit(*str); str++)
 				num2 = num2*10 + (*str-'0');
+			if (*str == '\0') return start;
 
 			switch (num2) {
 			case 2:
@@ -973,6 +974,8 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 					for (; i_isdigit(*str); str++)
 						num2 = (num2&~0xff) |
 							(((num2&0xff) * 10 + (*str-'0'))&0xff);
+
+					if (*str == '\0') return start;
 				}
 
 				if (i == -1) break;
@@ -1001,6 +1004,7 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 				str++;
 				for (num2 = 0; i_isdigit(*str); str++)
 					num2 = num2*10 + (*str-'0');
+				if (*str == '\0') return start;
 
 				if (num == 38) {
 					flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;

From 0d6add02cf1a1e0dc3905a482d259a8851b4939c Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 15 Dec 2016 15:22:30 +0100
Subject: [PATCH 0465/1650] Process the nick changes in queries before the
 PRIVMSG is handled.

Otherwise we end up with the message in the status window since the
frontend knows jack shit about the casemapping option when it tries to
find the associated window for the query.
---
 src/fe-common/irc/fe-irc-queries.c |  7 +++++++
 src/irc/core/irc-queries.c         | 16 ----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c
index b2faefbc..c928a94a 100644
--- a/src/fe-common/irc/fe-irc-queries.c
+++ b/src/fe-common/irc/fe-irc-queries.c
@@ -78,6 +78,13 @@ static void event_privmsg(SERVER_REC *server, const char *data,
 			if (!server_has_nick(server, query->name))
 				query_change_nick(query, nick);
 		}
+	} else {
+		/* process the changes to the query structure now, before the
+		 * privmsg is dispatched. */
+		if (g_strcmp0(query->name, nick) != 0)
+			query_change_nick(query, nick);
+		if (address != NULL && g_strcmp0(query->address, address) != 0)
+			query_change_address(query, address);
 	}
 }
 
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 12861744..b611e621 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -79,20 +79,6 @@ static void check_query_changes(IRC_SERVER_REC *server, const char *nick,
 	}
 }
 
-static void event_privmsg(IRC_SERVER_REC *server, const char *data,
-			  const char *nick, const char *address)
-{
-	char *params, *target, *msg;
-
-	g_return_if_fail(data != NULL);
-	if (nick == NULL)
-		return;
-
-	params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
-        check_query_changes(server, nick, address, target);
-	g_free(params);
-}
-
 static void ctcp_action(IRC_SERVER_REC *server, const char *msg,
 			const char *nick, const char *address,
 			const char *target)
@@ -117,14 +103,12 @@ static void event_nick(SERVER_REC *server, const char *data,
 
 void irc_queries_init(void)
 {
-	signal_add_last("event privmsg", (SIGNAL_FUNC) event_privmsg);
 	signal_add_last("ctcp action", (SIGNAL_FUNC) ctcp_action);
 	signal_add("event nick", (SIGNAL_FUNC) event_nick);
 }
 
 void irc_queries_deinit(void)
 {
-	signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
 	signal_remove("ctcp action", (SIGNAL_FUNC) ctcp_action);
 	signal_remove("event nick", (SIGNAL_FUNC) event_nick);
 }

From 7a7f6abc168b571a0db4fa65c760fe6e46edf199 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 15 Dec 2016 22:41:57 +0100
Subject: [PATCH 0466/1650] Prevent a UaF by calling server_disconnect in a
 signal handler.

---
 src/fe-common/irc/fe-sasl.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
index 4c86f850..6cba1887 100644
--- a/src/fe-common/irc/fe-sasl.c
+++ b/src/fe-common/irc/fe-sasl.c
@@ -43,8 +43,15 @@ static void sig_cap_end(IRC_SERVER_REC *server)
 	/* The negotiation has now been terminated, if we didn't manage to
 	 * authenticate successfully with the server just disconnect. */
 	if (!server->sasl_success &&
-	    settings_get_bool("sasl_disconnect_on_failure"))
-		server_disconnect(SERVER(server));
+	    settings_get_bool("sasl_disconnect_on_failure")) {
+		/* We can't use server_disconnect() here because we'd end up
+		 * freeing the 'server' object and be guilty of a slew of UaF. */
+		server->connection_lost = TRUE;
+		/* By setting connection_lost we make sure the communication is
+		 * halted and when the control goes back to irc_parse_incoming
+		 * the server object is safely destroyed. */
+		signal_stop();
+	}
 
 }
 

From a39e210ea8e0b0cdccb37eae212d1ade8c036ae2 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 18 Dec 2016 15:46:48 +0100
Subject: [PATCH 0467/1650] Minor cleanup in the highlighting signal.

---
 src/fe-common/core/hilight-text.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 4691a708..46b416e6 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -379,34 +379,29 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 		char *middle;
 		int pos, color_pos, color_len;
 
-		tmp = g_string_new(NULL);
-
 		/* start of the line */
 		pos = strip_real_length(text, hilight_start, NULL, NULL);
-		g_string_append(tmp, text);
-		g_string_truncate(tmp, pos);
+		tmp = g_string_new_len(text, pos);
 
 		/* color */
 		g_string_append(tmp, color);
 
 		/* middle of the line, stripped */
-		middle = strip_codes(text+pos);
-		pos = tmp->len;
-		g_string_append(tmp, middle);
-		g_string_truncate(tmp, pos+hilight_len);
+		middle = strip_codes(text + pos);
+		g_string_append_len(tmp, middle, hilight_len);
 		g_free(middle);
 
 		/* end of the line */
 		pos = strip_real_length(text, hilight_end,
 					&color_pos, &color_len);
 		if (color_pos > 0)
-			g_string_append_len(tmp, text+color_pos, color_len);
+			g_string_append_len(tmp, text + color_pos, color_len);
                 else {
                         /* no colors in line, change back to default */
 			g_string_append_c(tmp, 4);
 			g_string_append_c(tmp, FORMAT_STYLE_DEFAULTS);
 		}
-		g_string_append(tmp, text+pos);
+		g_string_append(tmp, text + pos);
 
 		newstr = tmp->str;
 		g_string_free(tmp, FALSE);

From 77aab7905791823f6ce2c19b4aaacd4231324841 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Dec 2016 21:16:37 +0100
Subject: [PATCH 0468/1650] avoid server_disconnect

Closes #4
---
 src/irc/core/irc-nicklist.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index b22f3269..1cb1f3e9 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -314,7 +314,11 @@ static void event_whois_ircop(SERVER_REC *server, const char *data)
 static void event_nick_invalid(IRC_SERVER_REC *server, const char *data)
 {
 	if (!server->connected)
-		server_disconnect((SERVER_REC *) server);
+		/* we used to call server_disconnect but that crashes
+		   irssi because of undefined memory access. instead,
+		   indicate that the connection should be dropped and
+		   let the irc method to the clean-up. */
+		server->connection_lost = server->no_reconnect = TRUE;
 }
 
 static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)

From 508d2e0860992d6906b5a7b73017edbaa8c94d98 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Dec 2016 16:06:13 +0100
Subject: [PATCH 0469/1650] bail out if nick is NULL in irc_query_find

Closes #1
---
 src/irc/core/irc-queries.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 12861744..77a5289d 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -45,6 +45,8 @@ QUERY_REC *irc_query_find(IRC_SERVER_REC *server, const char *nick)
 {
 	GSList *tmp;
 
+	g_return_val_if_fail(nick != NULL, NULL);
+
 	for (tmp = server->queries; tmp != NULL; tmp = tmp->next) {
 		QUERY_REC *rec = tmp->data;
 

From 8007e9e61d67044a6b29a266300a936e4c86fdd9 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 19 Dec 2016 09:31:38 -0500
Subject: [PATCH 0470/1650] Fix oob read on invalid utf8 in term_addstr

---
 src/fe-text/term-terminfo.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index b2478c62..3098a4e4 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -539,9 +539,16 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 
 	if (term_type == TERM_TYPE_UTF8) {
 		while (*ptr != '\0') {
-			tmp = g_utf8_get_char(ptr);
-			len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
-			ptr = g_utf8_next_char(ptr);
+			tmp = g_utf8_get_char_validated(ptr, -1);
+			/* On utf8 error, treat as single byte and try to
+			   continue interpretting rest of string as utf8 */
+			if (tmp == (gunichar)-1 || tmp == (gunichar)-2) {
+				len++;
+				ptr++;
+			} else {
+				len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
+				ptr = g_utf8_next_char(ptr);
+			}
 		}
 	} else
 		len = raw_len;

From 2f59fe206233c0f45256e9e541c121f4d63385dd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Dec 2016 22:03:46 +0100
Subject: [PATCH 0471/1650] add some sequence helper functions

---
 src/fe-common/core/fe-windows.c | 85 +++++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index ff45f141..d02048be 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -42,6 +42,16 @@ static int daytag;
 static int daycheck; /* 0 = don't check, 1 = time is 00:00, check,
                         2 = time is 00:00, already checked */
 
+static GSequenceIter *windows_seq_begin(void)
+{
+	return g_sequence_get_begin_iter(windows_seq);
+}
+
+static GSequenceIter *windows_seq_end(void)
+{
+	return g_sequence_get_end_iter(windows_seq);
+}
+
 static int window_get_new_refnum(void)
 {
 	WINDOW_REC *win;
@@ -49,8 +59,8 @@ static int window_get_new_refnum(void)
 	int refnum;
 
 	refnum = 1;
-	for (iter = g_sequence_get_begin_iter(windows_seq),
-	     end = g_sequence_get_end_iter(windows_seq);
+	for (iter = windows_seq_begin(),
+	     end = windows_seq_end();
 
 	     iter != end;
 
@@ -67,6 +77,11 @@ static int window_get_new_refnum(void)
 	return refnum;
 }
 
+static GSequenceIter *windows_seq_insert(WINDOW_REC *rec)
+{
+	return g_sequence_insert_sorted(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
+}
+
 WINDOW_REC *window_create(WI_ITEM_REC *item, int automatic)
 {
 	WINDOW_REC *rec;
@@ -76,7 +91,7 @@ WINDOW_REC *window_create(WI_ITEM_REC *item, int automatic)
 	rec->level = settings_get_level("window_default_level");
 
 	windows = g_slist_prepend(windows, rec);
-	g_sequence_insert_sorted(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
+	windows_seq_insert(rec);
 	signal_emit("window created", 2, rec, GINT_TO_POINTER(automatic));
 
 	if (item != NULL) window_item_add(rec, item, automatic);
@@ -107,6 +122,16 @@ static int window_refnum_lookup(WINDOW_REC *window, void *refnum_p)
 	return window->refnum == refnum ? 0 : window->refnum < refnum ? -1 : 1;
 }
 
+static GSequenceIter *windows_seq_refnum_lookup(int refnum)
+{
+	return g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+}
+
+static void windows_seq_changed(GSequenceIter *iter)
+{
+	g_sequence_sort_changed(iter, (GCompareDataFunc)window_refnum_cmp, NULL);
+}
+
 /* removed_refnum was removed from the windows list, pack the windows so
    there won't be any holes. If there is any holes after removed_refnum,
    leave the windows behind it alone. */
@@ -117,9 +142,9 @@ static void windows_pack(int removed_refnum)
 	GSequenceIter *iter, *end;
 
 	refnum = removed_refnum+1;
-	end = g_sequence_get_end_iter(windows_seq);
-	iter = g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
-	if (iter == NULL) iter = end;
+	end = windows_seq_end();
+	iter = windows_seq_refnum_lookup(refnum);
+	if (iter == NULL) return;
 
 	for (; iter != end; refnum++, iter = g_sequence_iter_next(iter)) {
 		window = g_sequence_get(iter);
@@ -128,10 +153,15 @@ static void windows_pack(int removed_refnum)
 			break;
 
 		window_set_refnum0(window, refnum-1);
-		g_sequence_sort_changed(iter, (GCompareDataFunc)window_refnum_cmp, NULL);
+		windows_seq_changed(iter);
 	}
 }
 
+static GSequenceIter *windows_seq_window_lookup(WINDOW_REC *rec)
+{
+	return g_sequence_lookup(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
+}
+
 void window_destroy(WINDOW_REC *window)
 {
 	GSequenceIter *iter;
@@ -140,7 +170,7 @@ void window_destroy(WINDOW_REC *window)
 	if (window->destroying) return;
 	window->destroying = TRUE;
 	windows = g_slist_remove(windows, window);
-	iter = g_sequence_lookup(windows_seq, window, (GCompareDataFunc)window_refnum_cmp, NULL);
+	iter = windows_seq_window_lookup(window);
 	if (iter != NULL) g_sequence_remove(iter);
 
 	if (active_win == window) {
@@ -223,18 +253,18 @@ void window_change_server(WINDOW_REC *window, void *server)
 
 void window_set_refnum(WINDOW_REC *window, int refnum)
 {
-	GSequenceIter *oiter, *witer;
+	GSequenceIter *other_iter, *window_iter;
 	int old_refnum;
 
 	g_return_if_fail(window != NULL);
 	g_return_if_fail(refnum >= 1);
 	if (window->refnum == refnum) return;
 
-	oiter = g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
-	witer = g_sequence_lookup(windows_seq, GINT_TO_POINTER(window->refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+	other_iter = windows_seq_refnum_lookup(refnum);
+	window_iter = windows_seq_refnum_lookup(window->refnum);
 
-	if (oiter != NULL) {
-		WINDOW_REC *rec = g_sequence_get(oiter);
+	if (other_iter != NULL) {
+		WINDOW_REC *rec = g_sequence_get(other_iter);
 
 		rec->refnum = window->refnum;
 		signal_emit("window refnum changed", 2, rec, GINT_TO_POINTER(refnum));
@@ -244,10 +274,10 @@ void window_set_refnum(WINDOW_REC *window, int refnum)
 	window->refnum = refnum;
 	signal_emit("window refnum changed", 2, window, GINT_TO_POINTER(old_refnum));
 
-	if (witer != NULL && oiter != NULL) {
-		g_sequence_swap(oiter, witer);
+	if (window_iter != NULL && other_iter != NULL) {
+		g_sequence_swap(other_iter, window_iter);
 	} else {
-		g_sequence_sort_changed(witer, (GCompareDataFunc)window_refnum_cmp, NULL);
+		windows_seq_changed(window_iter);
 	}
 }
 
@@ -388,7 +418,7 @@ WINDOW_REC *window_find_refnum(int refnum)
 {
 	GSequenceIter *iter;
 
-	iter = g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+	iter = windows_seq_refnum_lookup(refnum);
 	if (iter != NULL) {
 		WINDOW_REC *rec = g_sequence_get(iter);
 
@@ -438,12 +468,17 @@ WINDOW_REC *window_find_item(SERVER_REC *server, const char *name)
 	return window_item_window(item);
 }
 
+static GSequenceIter *windows_seq_refnum_search_right(int refnum)
+{
+	return g_sequence_search(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+}
+
 int window_refnum_prev(int refnum, int wrap)
 {
 	GSequenceIter *iter, *end;
 
-	iter = g_sequence_search(windows_seq, GINT_TO_POINTER(refnum-1), (GCompareDataFunc)window_refnum_lookup, NULL);
-	end = g_sequence_get_end_iter(windows_seq);
+	iter = windows_seq_refnum_search_right(refnum-1);
+	end = windows_seq_end();
 
 	if (iter != NULL) {
 		WINDOW_REC *rec;
@@ -478,8 +513,8 @@ int window_refnum_next(int refnum, int wrap)
 {
 	GSequenceIter *iter, *end;
 
-	iter = g_sequence_search(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
-	end = g_sequence_get_end_iter(windows_seq);
+	iter = windows_seq_refnum_search_right(refnum);
+	end = windows_seq_end();
 
 	if (iter != NULL && iter != end) {
 		WINDOW_REC *rec = g_sequence_get(iter);
@@ -498,7 +533,7 @@ int window_refnum_next(int refnum, int wrap)
 
 	if (wrap) {
 		WINDOW_REC *rec;
-		iter = g_sequence_get_begin_iter(windows_seq);
+		iter = windows_seq_begin();
 		if (iter != end) {
 			rec = g_sequence_get(iter);
 
@@ -514,7 +549,7 @@ int windows_refnum_last(void)
 	GSequenceIter *end, *iter;
 	WINDOW_REC *rec;
 
-	end = g_sequence_get_end_iter(windows_seq);
+	end = windows_seq_end();
 	iter = g_sequence_iter_prev(end);
 	if (iter != end) {
 		rec = g_sequence_get(iter);
@@ -536,8 +571,8 @@ GSList *windows_get_sorted(void)
 	GSList *sorted;
 
         sorted = NULL;
-	for (iter = g_sequence_get_end_iter(windows_seq),
-	     begin = g_sequence_get_begin_iter(windows_seq);
+	for (iter = windows_seq_end(),
+	     begin = windows_seq_begin();
 
 	     iter != begin;
 

From 7dc2f832c19d8b5c682f5c9abd106ab6be53bf62 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Dec 2016 16:41:57 +0100
Subject: [PATCH 0472/1650] fix %[

---
 src/fe-common/core/formats.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index a58d839a..9ce9bce5 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -68,7 +68,7 @@ static void format_expand_code(const char **format, GString *out, int *flags)
 
 	if (flags == NULL) {
 		/* flags are being ignored - skip the code */
-		while (**format != ']')
+		while (**format != ']' && **format != '\0')
 			(*format)++;
 		return;
 	}
@@ -246,6 +246,10 @@ int format_expand_styles(GString *out, const char **format, int *flags)
 	case '[':
 		/* code */
 		format_expand_code(format, out, flags);
+		if ((*format)[0] == '\0')
+			/* oops, reached end prematurely */
+			(*format)--;
+
 		break;
 	case 'x':
 	case 'X':

From 9004265e5417c509e55c5141d5880ebd1e1c3281 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Dec 2016 21:01:16 +0100
Subject: [PATCH 0473/1650] clean up window_refnum_{prev,next}

---
 src/fe-common/core/fe-windows.c | 46 ++++++++++-----------------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index d02048be..97034192 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -473,35 +473,29 @@ static GSequenceIter *windows_seq_refnum_search_right(int refnum)
 	return g_sequence_search(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
 }
 
+static GSequenceIter *windows_seq_refnum_search_left(int refnum)
+{
+	GSequenceIter *iter = windows_seq_refnum_search_right(refnum-1);
+	return iter == windows_seq_begin() ? NULL : g_sequence_iter_prev(iter);
+}
+
 int window_refnum_prev(int refnum, int wrap)
 {
+	WINDOW_REC *rec;
 	GSequenceIter *iter, *end;
 
-	iter = windows_seq_refnum_search_right(refnum-1);
+	iter = windows_seq_refnum_search_left(refnum);
 	end = windows_seq_end();
 
 	if (iter != NULL) {
-		WINDOW_REC *rec;
-		if (iter != end) {
-			rec = g_sequence_get(iter);
-
-			if (rec->refnum < refnum)
-				return rec->refnum;
-		}
-
-		iter = g_sequence_iter_prev(iter);
 		rec = g_sequence_get(iter);
-
-		if (rec->refnum < refnum)
-			return rec->refnum;
+		return rec->refnum;
 	}
 
 	if (wrap) {
-		WINDOW_REC *rec;
 		iter = g_sequence_iter_prev(end);
 		if (iter != end) {
 			rec = g_sequence_get(iter);
-
 			return rec->refnum;
 		}
 	}
@@ -511,32 +505,21 @@ int window_refnum_prev(int refnum, int wrap)
 
 int window_refnum_next(int refnum, int wrap)
 {
+	WINDOW_REC *rec;
 	GSequenceIter *iter, *end;
 
 	iter = windows_seq_refnum_search_right(refnum);
 	end = windows_seq_end();
 
-	if (iter != NULL && iter != end) {
-		WINDOW_REC *rec = g_sequence_get(iter);
-
-		if (rec->refnum > refnum)
-			return rec->refnum;
-
-		iter = g_sequence_iter_next(iter);
-		if (iter != end) {
-			rec = g_sequence_get(iter);
-
-			if (rec->refnum > refnum)
-				return rec->refnum;
-		}
+	if (iter != end) {
+		rec = g_sequence_get(iter);
+		return rec->refnum;
 	}
 
 	if (wrap) {
-		WINDOW_REC *rec;
 		iter = windows_seq_begin();
 		if (iter != end) {
 			rec = g_sequence_get(iter);
-
 			return rec->refnum;
 		}
 	}
@@ -546,14 +529,13 @@ int window_refnum_next(int refnum, int wrap)
 
 int windows_refnum_last(void)
 {
-	GSequenceIter *end, *iter;
 	WINDOW_REC *rec;
+	GSequenceIter *end, *iter;
 
 	end = windows_seq_end();
 	iter = g_sequence_iter_prev(end);
 	if (iter != end) {
 		rec = g_sequence_get(iter);
-
 		return rec->refnum;
 	}
 

From 03f5dc63fee7c60bb5d5c29698c975073e365b88 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Dec 2016 21:33:51 +0100
Subject: [PATCH 0474/1650] nits

---
 src/fe-common/core/fe-windows.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 97034192..bd289d2f 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -59,19 +59,17 @@ static int window_get_new_refnum(void)
 	int refnum;
 
 	refnum = 1;
-	for (iter = windows_seq_begin(),
-	     end = windows_seq_end();
-
-	     iter != end;
-
-	     refnum++,
-	     iter = g_sequence_iter_next(iter)) {
+	iter = windows_seq_begin();
+	end = windows_seq_end();
 
+	while (iter != end) {
 		win = g_sequence_get(iter);
 
-		if (refnum != win->refnum) {
+		if (refnum != win->refnum)
 			return refnum;
-		}
+
+		refnum++;
+		iter = g_sequence_iter_next(iter);
 	}
 
 	return refnum;
@@ -141,7 +139,7 @@ static void windows_pack(int removed_refnum)
 	int refnum;
 	GSequenceIter *iter, *end;
 
-	refnum = removed_refnum+1;
+	refnum = removed_refnum + 1;
 	end = windows_seq_end();
 	iter = windows_seq_refnum_lookup(refnum);
 	if (iter == NULL) return;
@@ -152,7 +150,7 @@ static void windows_pack(int removed_refnum)
 		if (window == NULL || window->sticky_refnum || window->refnum != refnum)
 			break;
 
-		window_set_refnum0(window, refnum-1);
+		window_set_refnum0(window, refnum - 1);
 		windows_seq_changed(iter);
 	}
 }
@@ -468,14 +466,19 @@ WINDOW_REC *window_find_item(SERVER_REC *server, const char *name)
 	return window_item_window(item);
 }
 
+/* search to the numerically right iterator of refnum */
 static GSequenceIter *windows_seq_refnum_search_right(int refnum)
 {
 	return g_sequence_search(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
 }
 
+/* we want to find the numerically left iterator of refnum, so we
+   search the right of the previous refnum. but we need to figure out
+   the case where the iterator is already at the beginning, i.e
+   iter->refnum >= refnum */
 static GSequenceIter *windows_seq_refnum_search_left(int refnum)
 {
-	GSequenceIter *iter = windows_seq_refnum_search_right(refnum-1);
+	GSequenceIter *iter = windows_seq_refnum_search_right(refnum - 1);
 	return iter == windows_seq_begin() ? NULL : g_sequence_iter_prev(iter);
 }
 

From 9a018a782c40ed9da88ae88a7f1c01265f3342de Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Dec 2016 21:36:56 +0100
Subject: [PATCH 0475/1650] sort windows_seq helpers to top

---
 src/fe-common/core/fe-windows.c | 84 ++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index bd289d2f..248cd621 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -42,6 +42,12 @@ static int daytag;
 static int daycheck; /* 0 = don't check, 1 = time is 00:00, check,
                         2 = time is 00:00, already checked */
 
+static int window_refnum_lookup(WINDOW_REC *window, void *refnum_p)
+{
+	int refnum = GPOINTER_TO_INT(refnum_p);
+	return window->refnum == refnum ? 0 : window->refnum < refnum ? -1 : 1;
+}
+
 static GSequenceIter *windows_seq_begin(void)
 {
 	return g_sequence_get_begin_iter(windows_seq);
@@ -52,6 +58,42 @@ static GSequenceIter *windows_seq_end(void)
 	return g_sequence_get_end_iter(windows_seq);
 }
 
+static GSequenceIter *windows_seq_insert(WINDOW_REC *rec)
+{
+	return g_sequence_insert_sorted(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
+}
+
+static GSequenceIter *windows_seq_refnum_lookup(int refnum)
+{
+	return g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+}
+
+static void windows_seq_changed(GSequenceIter *iter)
+{
+	g_sequence_sort_changed(iter, (GCompareDataFunc)window_refnum_cmp, NULL);
+}
+
+static GSequenceIter *windows_seq_window_lookup(WINDOW_REC *rec)
+{
+	return g_sequence_lookup(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
+}
+
+/* search to the numerically right iterator of refnum */
+static GSequenceIter *windows_seq_refnum_search_right(int refnum)
+{
+	return g_sequence_search(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
+}
+
+/* we want to find the numerically left iterator of refnum, so we
+   search the right of the previous refnum. but we need to figure out
+   the case where the iterator is already at the beginning, i.e
+   iter->refnum >= refnum */
+static GSequenceIter *windows_seq_refnum_search_left(int refnum)
+{
+	GSequenceIter *iter = windows_seq_refnum_search_right(refnum - 1);
+	return iter == windows_seq_begin() ? NULL : g_sequence_iter_prev(iter);
+}
+
 static int window_get_new_refnum(void)
 {
 	WINDOW_REC *win;
@@ -75,11 +117,6 @@ static int window_get_new_refnum(void)
 	return refnum;
 }
 
-static GSequenceIter *windows_seq_insert(WINDOW_REC *rec)
-{
-	return g_sequence_insert_sorted(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
-}
-
 WINDOW_REC *window_create(WI_ITEM_REC *item, int automatic)
 {
 	WINDOW_REC *rec;
@@ -114,22 +151,6 @@ static void window_set_refnum0(WINDOW_REC *window, int refnum)
 	signal_emit("window refnum changed", 2, window, GINT_TO_POINTER(old_refnum));
 }
 
-static int window_refnum_lookup(WINDOW_REC *window, void *refnum_p)
-{
-	int refnum = GPOINTER_TO_INT(refnum_p);
-	return window->refnum == refnum ? 0 : window->refnum < refnum ? -1 : 1;
-}
-
-static GSequenceIter *windows_seq_refnum_lookup(int refnum)
-{
-	return g_sequence_lookup(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
-}
-
-static void windows_seq_changed(GSequenceIter *iter)
-{
-	g_sequence_sort_changed(iter, (GCompareDataFunc)window_refnum_cmp, NULL);
-}
-
 /* removed_refnum was removed from the windows list, pack the windows so
    there won't be any holes. If there is any holes after removed_refnum,
    leave the windows behind it alone. */
@@ -155,11 +176,6 @@ static void windows_pack(int removed_refnum)
 	}
 }
 
-static GSequenceIter *windows_seq_window_lookup(WINDOW_REC *rec)
-{
-	return g_sequence_lookup(windows_seq, rec, (GCompareDataFunc)window_refnum_cmp, NULL);
-}
-
 void window_destroy(WINDOW_REC *window)
 {
 	GSequenceIter *iter;
@@ -466,22 +482,6 @@ WINDOW_REC *window_find_item(SERVER_REC *server, const char *name)
 	return window_item_window(item);
 }
 
-/* search to the numerically right iterator of refnum */
-static GSequenceIter *windows_seq_refnum_search_right(int refnum)
-{
-	return g_sequence_search(windows_seq, GINT_TO_POINTER(refnum), (GCompareDataFunc)window_refnum_lookup, NULL);
-}
-
-/* we want to find the numerically left iterator of refnum, so we
-   search the right of the previous refnum. but we need to figure out
-   the case where the iterator is already at the beginning, i.e
-   iter->refnum >= refnum */
-static GSequenceIter *windows_seq_refnum_search_left(int refnum)
-{
-	GSequenceIter *iter = windows_seq_refnum_search_right(refnum - 1);
-	return iter == windows_seq_begin() ? NULL : g_sequence_iter_prev(iter);
-}
-
 int window_refnum_prev(int refnum, int wrap)
 {
 	WINDOW_REC *rec;

From 9151f87145e6c9ea40192e0e7c8266eacaaa335f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Dec 2016 21:40:18 +0100
Subject: [PATCH 0476/1650] remove some for loops

---
 src/fe-common/core/fe-windows.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 248cd621..0afa2914 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -165,7 +165,7 @@ static void windows_pack(int removed_refnum)
 	iter = windows_seq_refnum_lookup(refnum);
 	if (iter == NULL) return;
 
-	for (; iter != end; refnum++, iter = g_sequence_iter_next(iter)) {
+	while (iter != end) {
 		window = g_sequence_get(iter);
 
 		if (window == NULL || window->sticky_refnum || window->refnum != refnum)
@@ -173,6 +173,9 @@ static void windows_pack(int removed_refnum)
 
 		window_set_refnum0(window, refnum - 1);
 		windows_seq_changed(iter);
+
+		refnum++;
+		iter = g_sequence_iter_next(iter);
 	}
 }
 
@@ -556,12 +559,10 @@ GSList *windows_get_sorted(void)
 	GSList *sorted;
 
         sorted = NULL;
-	for (iter = windows_seq_end(),
-	     begin = windows_seq_begin();
+	iter = windows_seq_end();
+	begin = windows_seq_begin();
 
-	     iter != begin;
-
-	     ) {
+	while (iter != begin) {
 		iter = g_sequence_iter_prev(iter);
 		WINDOW_REC *rec = g_sequence_get(iter);
 

From 0a46a1664ab2d5c914ab378d56e0d22825f06522 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 22 Dec 2016 15:38:43 +0100
Subject: [PATCH 0477/1650] Add myself to the core team members

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index eea359cc..c1280552 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Irssi staff (current maintainers) <staff@irssi.org>:
   Jase Thew (bazerka)
   dequis (dx)
   Ailin Nemui (Nei)
+  Giuseppe (TheLemonMan, lemonboy)
 
 Former developers:
 
@@ -26,7 +27,6 @@ Large feature patches by:
   Heikki Orsila : DCC SEND queueing
   Mark Trumbull : DCC SERVER
   Francesco Fracassi : Passive DCC
-  Giuseppe (The Lemon Man)
 
 Other patches (grep for "patch" in ChangeLog) by:
 

From 7e22d051ae699467575d1feeec6d8e2e2f16721f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 23 Dec 2016 17:59:55 +0100
Subject: [PATCH 0478/1650] Make sure SASL was actually requested before
 failing.

---
 src/fe-common/irc/fe-sasl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
index 6cba1887..fc8105fc 100644
--- a/src/fe-common/irc/fe-sasl.c
+++ b/src/fe-common/irc/fe-sasl.c
@@ -1,7 +1,7 @@
 /*
     fe-sasl.c : irssi
 
-    Copyright (C) 2015 The Lemon Man
+    Copyright (C) 2015-2017 The Lemon Man
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 #include "module-formats.h"
 #include "signals.h"
 #include "levels.h"
+#include "misc.h"
+#include "sasl.h"
 
 #include "irc-servers.h"
 #include "settings.h"
@@ -43,6 +45,7 @@ static void sig_cap_end(IRC_SERVER_REC *server)
 	/* The negotiation has now been terminated, if we didn't manage to
 	 * authenticate successfully with the server just disconnect. */
 	if (!server->sasl_success &&
+	    server->connrec->sasl_mechanism != SASL_MECHANISM_NONE &&
 	    settings_get_bool("sasl_disconnect_on_failure")) {
 		/* We can't use server_disconnect() here because we'd end up
 		 * freeing the 'server' object and be guilty of a slew of UaF. */

From 8e5db471e4d8b052f072ce8a351222c6edb42d19 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 14 Jan 2016 14:10:00 +0100
Subject: [PATCH 0479/1650] Use GLib's regexp interface (backed by PCRE)

---
 src/core/ignore.c                 | 35 +++++++++++------------------
 src/core/ignore.h                 |  8 +------
 src/core/misc.c                   |  4 ----
 src/fe-common/core/fe-ignore.c    |  2 --
 src/fe-common/core/hilight-text.c | 37 +++++++++++++------------------
 src/fe-common/core/hilight-text.h |  8 +------
 src/fe-text/textbuffer.c          | 35 ++++++++++-------------------
 7 files changed, 42 insertions(+), 87 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 2047dc9d..2b8299bd 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -67,12 +67,8 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
 		return FALSE;
 
 	if (rec->regexp) {
-#ifdef HAVE_REGEX_H
 		return rec->regexp_compiled &&
-			regexec(&rec->preg, text, 0, NULL, 0) == 0;
-#else
-                return FALSE;
-#endif
+		    g_regex_match(rec->preg, text, 0, NULL);
 	}
 
 	return rec->fullword ?
@@ -326,26 +322,23 @@ static void ignore_remove_config(IGNORE_REC *rec)
 
 static void ignore_init_rec(IGNORE_REC *rec)
 {
-#ifdef HAVE_REGEX_H
-	char *errbuf;
-	int errcode, errbuf_len;
+	if (rec->regexp_compiled) {
+		g_regex_unref(rec->preg);
+		rec->regexp_compiled = FALSE;
+	}
 
-	if (rec->regexp_compiled) regfree(&rec->preg);
-	rec->regexp_compiled = FALSE;
 	if (rec->regexp && rec->pattern != NULL) {
-		errcode = regcomp(&rec->preg, rec->pattern,
-				REG_EXTENDED|REG_ICASE|REG_NOSUB);
-		if (errcode != 0) {
-			errbuf_len = regerror(errcode, &rec->preg, 0, 0);
-			errbuf = g_malloc(errbuf_len);
-			regerror(errcode, &rec->preg, errbuf, errbuf_len);
-			g_warning("Failed to compile regexp '%s': %s", rec->pattern, errbuf);
-			g_free(errbuf);
+		GError *re_error;
+
+		rec->preg = g_regex_new(rec->pattern, G_REGEX_CASELESS, 0, &re_error);
+
+		if (rec->preg == NULL) {
+			g_warning("Failed to compile regexp '%s': %s", rec->pattern, re_error->message);
+			g_error_free(re_error);
 		} else {
 			rec->regexp_compiled = TRUE;
 		}
 	}
-#endif
 }
 
 void ignore_add_rec(IGNORE_REC *rec)
@@ -365,9 +358,7 @@ static void ignore_destroy(IGNORE_REC *rec, int send_signal)
 	if (send_signal)
 		signal_emit("ignore destroyed", 1, rec);
 
-#ifdef HAVE_REGEX_H
-	if (rec->regexp_compiled) regfree(&rec->preg);
-#endif
+	if (rec->regexp_compiled) g_regex_unref(rec->preg);
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->mask);
 	g_free_not_null(rec->servertag);
diff --git a/src/core/ignore.h b/src/core/ignore.h
index f889740f..6c9797f5 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -1,10 +1,6 @@
 #ifndef __IGNORE_H
 #define __IGNORE_H
 
-#ifdef HAVE_REGEX_H
-#  include <regex.h>
-#endif
-
 typedef struct _IGNORE_REC IGNORE_REC;
 
 struct _IGNORE_REC {
@@ -20,10 +16,8 @@ struct _IGNORE_REC {
 	unsigned int regexp:1;
 	unsigned int fullword:1;
 	unsigned int replies:1; /* ignore replies to nick in channel */
-#ifdef HAVE_REGEX_H
 	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
-	regex_t preg;
-#endif
+	GRegex *preg;
 };
 
 extern GSList *ignores;
diff --git a/src/core/misc.c b/src/core/misc.c
index 0bb1f7e6..c59eb126 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -22,10 +22,6 @@
 #include "misc.h"
 #include "commands.h"
 
-#ifdef HAVE_REGEX_H
-#  include <regex.h>
-#endif
-
 typedef struct {
 	int condition;
 	GInputFunction function;
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 52b11e6b..addfa0b8 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -58,10 +58,8 @@ static void ignore_print(int index, IGNORE_REC *rec)
 		g_string_append(options, "-regexp ");
 		if (rec->pattern == NULL)
 			g_string_append(options, "[INVALID! -pattern missing] ");
-#ifdef HAVE_REGEX_H
 		else if (!rec->regexp_compiled)
 			g_string_append(options, "[INVALID!] ");
-#endif
 	}
 	if (rec->fullword) g_string_append(options, "-full ");
 	if (rec->replies) g_string_append(options, "-replies ");
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 4691a708..83b6f67e 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -101,9 +101,7 @@ static void hilight_destroy(HILIGHT_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
 
-#ifdef HAVE_REGEX_H
-	if (rec->regexp_compiled) regfree(&rec->preg);
-#endif
+	if (rec->regexp_compiled) g_regex_unref(rec->preg);
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->color);
 	g_free_not_null(rec->act_color);
@@ -120,14 +118,15 @@ static void hilights_destroy_all(void)
 
 static void hilight_init_rec(HILIGHT_REC *rec)
 {
-#ifdef HAVE_REGEX_H
-	if (rec->regexp_compiled) regfree(&rec->preg);
-	if (!rec->regexp)
+	if (rec->regexp_compiled) {
+		g_regex_unref(rec->preg);
 		rec->regexp_compiled = FALSE;
-	else
-		rec->regexp_compiled = regcomp(&rec->preg, rec->text,
-				rec->case_sensitive ? REG_EXTENDED : (REG_EXTENDED|REG_ICASE)) == 0;
-#endif
+	}
+
+	rec->preg = g_regex_new(rec->text, G_REGEX_CASELESS, 0, NULL);
+
+	if (rec->preg != NULL)
+		rec->regexp_compiled = TRUE;
 }
 
 void hilight_create(HILIGHT_REC *rec)
@@ -200,19 +199,15 @@ static int hilight_match_text(HILIGHT_REC *rec, const char *text,
 	char *match;
 
 	if (rec->regexp) {
-#ifdef HAVE_REGEX_H
-		regmatch_t rmatch[1];
+		GMatchInfo *match;
 
-		if (rec->regexp_compiled &&
-			regexec(&rec->preg, text, 1, rmatch, 0) == 0) {
-			if (rmatch[0].rm_so > 0 &&
-				match_beg != NULL && match_end != NULL) {
-				*match_beg = rmatch[0].rm_so;
-				*match_end = rmatch[0].rm_eo;
+		if (rec->regexp_compiled) {
+			g_regex_match (rec->preg, text, 0, &match);
+
+			if (g_match_info_matches(match)) {
+				return g_match_info_fetch_pos(match, 0, match_beg, match_end);
 			}
-			return TRUE;
 		}
-#endif
 	} else {
 		if (rec->case_sensitive) {
 			match = rec->fullword ?
@@ -509,10 +504,8 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 	if (rec->case_sensitive) g_string_append(options, "-matchcase ");
 	if (rec->regexp) {
 		g_string_append(options, "-regexp ");
-#ifdef HAVE_REGEX_H
 		if (!rec->regexp_compiled)
 			g_string_append(options, "[INVALID!] ");
-#endif
 	}
 
 	if (rec->priority != 0)
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index ae05e1ca..a74c38b0 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -1,10 +1,6 @@
 #ifndef __HILIGHT_TEXT_H
 #define __HILIGHT_TEXT_H
 
-#ifdef HAVE_REGEX_H
-#  include <regex.h>
-#endif
-
 #include "formats.h"
 
 struct _HILIGHT_REC {
@@ -24,10 +20,8 @@ struct _HILIGHT_REC {
 	unsigned int fullword:1; /* match `text' only for full words */
 	unsigned int regexp:1; /* `text' is a regular expression */
 	unsigned int case_sensitive:1;/* `text' must match case */
-#ifdef HAVE_REGEX_H
 	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
-	regex_t preg;
-#endif
+	GRegex *preg;
 	char *servertag;
 };
 
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 24ee62bc..979b2a46 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -27,10 +27,6 @@
 
 #include "textbuffer.h"
 
-#ifdef HAVE_REGEX_H
-#  include <regex.h>
-#endif
-
 #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*))
 
 TEXT_BUFFER_REC *textbuffer_create(void)
@@ -537,9 +533,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			    int before, int after,
 			    int regexp, int fullword, int case_sensitive)
 {
-#ifdef HAVE_REGEX_H
-	regex_t preg;
-#endif
+	GRegex *preg;
         LINE_REC *line, *pre_line;
 	GList *matches;
 	GString *str;
@@ -550,14 +544,10 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 	g_return_val_if_fail(text != NULL, NULL);
 
 	if (regexp) {
-#ifdef HAVE_REGEX_H
-		int flags = REG_EXTENDED | REG_NOSUB |
-			(case_sensitive ? 0 : REG_ICASE);
-		if (regcomp(&preg, text, flags) != 0)
+		preg = g_regex_new(text, (case_sensitive ? 0 : G_REGEX_CASELESS), 0, NULL);
+
+		if (preg == NULL)
 			return NULL;
-#else
-		return NULL;
-#endif
 	}
 
 	matches = NULL; match_after = 0;
@@ -577,12 +567,11 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 		if (*text != '\0') {
 			textbuffer_line2text(line, FALSE, str);
 
-			if (line_matched)
-			line_matched =
-#ifdef HAVE_REGEX_H
-			regexp ? regexec(&preg, str->str, 0, NULL, 0) == 0 :
-#endif
-			match_func(str->str, text) != NULL;
+			if (line_matched) {
+				line_matched = regexp ? 
+				    g_regex_match(preg, str->str, 0, NULL) :
+				    match_func(str->str, text) != NULL;
+			}
 		}
 
 		if (line_matched) {
@@ -610,9 +599,9 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 				matches = g_list_append(matches, NULL);
 		}
 	}
-#ifdef HAVE_REGEX_H
-	if (regexp) regfree(&preg);
-#endif
+
+	if (regexp)
+		g_regex_unref(preg);
         g_string_free(str, TRUE);
 	return matches;
 }

From b5a727c87cf7db944ade9c6714385f1e8598d37e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 29 Jan 2016 16:08:40 +0100
Subject: [PATCH 0480/1650] Remove unused references to regex.h

Also remove the prototype for regex_match since it has been removed.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index bf87f5aa..7eb1bfe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PATH_PROG(perlpath, perl)
 AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h)
 
 # check posix headers..
-AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/utsname.h regex.h)
+AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/utsname.h)
 
 AC_SYS_LARGEFILE
 

From 3fcd3cd2b9fae07a0b7cd3e5ba91049f19cc6501 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 29 Jan 2016 16:22:14 +0100
Subject: [PATCH 0481/1650] Remove the regexp_compiled field.

It was made redundant by the introduction of the pointer to the GRegex
structure.
Silence the compiler warning in textbuffer.c about preg being
initialized by setting it to NULL.
---
 src/core/ignore.c                 | 14 ++++----------
 src/core/ignore.h                 |  1 -
 src/fe-common/core/fe-ignore.c    |  2 +-
 src/fe-common/core/hilight-text.c | 13 ++++---------
 src/fe-common/core/hilight-text.h |  1 -
 src/fe-text/textbuffer.c          |  2 ++
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 2b8299bd..30cb7cb8 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -66,10 +66,8 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
         if (text == NULL)
 		return FALSE;
 
-	if (rec->regexp) {
-		return rec->regexp_compiled &&
-		    g_regex_match(rec->preg, text, 0, NULL);
-	}
+	if (rec->regexp)
+		return rec->preg && g_regex_match(rec->preg, text, 0, NULL);
 
 	return rec->fullword ?
 		stristr_full(text, rec->pattern) != NULL :
@@ -322,10 +320,8 @@ static void ignore_remove_config(IGNORE_REC *rec)
 
 static void ignore_init_rec(IGNORE_REC *rec)
 {
-	if (rec->regexp_compiled) {
+	if (rec->preg != NULL)
 		g_regex_unref(rec->preg);
-		rec->regexp_compiled = FALSE;
-	}
 
 	if (rec->regexp && rec->pattern != NULL) {
 		GError *re_error;
@@ -335,8 +331,6 @@ static void ignore_init_rec(IGNORE_REC *rec)
 		if (rec->preg == NULL) {
 			g_warning("Failed to compile regexp '%s': %s", rec->pattern, re_error->message);
 			g_error_free(re_error);
-		} else {
-			rec->regexp_compiled = TRUE;
 		}
 	}
 }
@@ -358,7 +352,7 @@ static void ignore_destroy(IGNORE_REC *rec, int send_signal)
 	if (send_signal)
 		signal_emit("ignore destroyed", 1, rec);
 
-	if (rec->regexp_compiled) g_regex_unref(rec->preg);
+	if (rec->preg != NULL) g_regex_unref(rec->preg);
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->mask);
 	g_free_not_null(rec->servertag);
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 6c9797f5..f37f8b28 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -16,7 +16,6 @@ struct _IGNORE_REC {
 	unsigned int regexp:1;
 	unsigned int fullword:1;
 	unsigned int replies:1; /* ignore replies to nick in channel */
-	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
 	GRegex *preg;
 };
 
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index addfa0b8..03fd4dd2 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -58,7 +58,7 @@ static void ignore_print(int index, IGNORE_REC *rec)
 		g_string_append(options, "-regexp ");
 		if (rec->pattern == NULL)
 			g_string_append(options, "[INVALID! -pattern missing] ");
-		else if (!rec->regexp_compiled)
+		else if (rec->preg == NULL)
 			g_string_append(options, "[INVALID!] ");
 	}
 	if (rec->fullword) g_string_append(options, "-full ");
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 83b6f67e..e3dcc2d9 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -101,7 +101,7 @@ static void hilight_destroy(HILIGHT_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
 
-	if (rec->regexp_compiled) g_regex_unref(rec->preg);
+	if (rec->preg != NULL) g_regex_unref(rec->preg);
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->color);
 	g_free_not_null(rec->act_color);
@@ -118,15 +118,10 @@ static void hilights_destroy_all(void)
 
 static void hilight_init_rec(HILIGHT_REC *rec)
 {
-	if (rec->regexp_compiled) {
+	if (rec->preg != NULL)
 		g_regex_unref(rec->preg);
-		rec->regexp_compiled = FALSE;
-	}
 
 	rec->preg = g_regex_new(rec->text, G_REGEX_CASELESS, 0, NULL);
-
-	if (rec->preg != NULL)
-		rec->regexp_compiled = TRUE;
 }
 
 void hilight_create(HILIGHT_REC *rec)
@@ -201,7 +196,7 @@ static int hilight_match_text(HILIGHT_REC *rec, const char *text,
 	if (rec->regexp) {
 		GMatchInfo *match;
 
-		if (rec->regexp_compiled) {
+		if (rec->preg != NULL) {
 			g_regex_match (rec->preg, text, 0, &match);
 
 			if (g_match_info_matches(match)) {
@@ -504,7 +499,7 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 	if (rec->case_sensitive) g_string_append(options, "-matchcase ");
 	if (rec->regexp) {
 		g_string_append(options, "-regexp ");
-		if (!rec->regexp_compiled)
+		if (rec->preg == NULL)
 			g_string_append(options, "[INVALID!] ");
 	}
 
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index a74c38b0..93c573c2 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -20,7 +20,6 @@ struct _HILIGHT_REC {
 	unsigned int fullword:1; /* match `text' only for full words */
 	unsigned int regexp:1; /* `text' is a regular expression */
 	unsigned int case_sensitive:1;/* `text' must match case */
-	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
 	GRegex *preg;
 	char *servertag;
 };
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 979b2a46..7d0806d1 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -543,6 +543,8 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 	g_return_val_if_fail(buffer != NULL, NULL);
 	g_return_val_if_fail(text != NULL, NULL);
 
+	preg = NULL;
+
 	if (regexp) {
 		preg = g_regex_new(text, (case_sensitive ? 0 : G_REGEX_CASELESS), 0, NULL);
 

From 5eaead761f1812fb9d4058b2bc38468521794693 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 19 Jun 2016 21:08:25 +0200
Subject: [PATCH 0482/1650] Rebase against master.

---
 src/core/ignore.c        | 6 ++++--
 src/fe-text/textbuffer.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 30cb7cb8..c91f6e4a 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -66,8 +66,10 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
         if (text == NULL)
 		return FALSE;
 
-	if (rec->regexp)
-		return rec->preg && g_regex_match(rec->preg, text, 0, NULL);
+	if (rec->regexp) {
+		return rec->preg != NULL &&
+			g_regex_match(rec->preg, text, 0, NULL);
+	}
 
 	return rec->fullword ?
 		stristr_full(text, rec->pattern) != NULL :
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 7d0806d1..f35848a2 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -570,7 +570,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			textbuffer_line2text(line, FALSE, str);
 
 			if (line_matched) {
-				line_matched = regexp ? 
+				line_matched = regexp ?
 				    g_regex_match(preg, str->str, 0, NULL) :
 				    match_func(str->str, text) != NULL;
 			}

From 5dcf291f2144564363f734dba15760d3a82b61c2 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 23 Jun 2016 13:25:23 +0200
Subject: [PATCH 0483/1650] Use the RAW flag when building the regexps.

Also, plugged a memory leak when retrieving the match position.
---
 src/core/ignore.c                 |  2 +-
 src/fe-common/core/hilight-text.c | 23 +++++++++++++----------
 src/fe-text/textbuffer.c          |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index c91f6e4a..cfcbd792 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -328,7 +328,7 @@ static void ignore_init_rec(IGNORE_REC *rec)
 	if (rec->regexp && rec->pattern != NULL) {
 		GError *re_error;
 
-		rec->preg = g_regex_new(rec->pattern, G_REGEX_CASELESS, 0, &re_error);
+		rec->preg = g_regex_new(rec->pattern, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, &re_error);
 
 		if (rec->preg == NULL) {
 			g_warning("Failed to compile regexp '%s': %s", rec->pattern, re_error->message);
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index e3dcc2d9..7a7f473c 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -121,7 +121,7 @@ static void hilight_init_rec(HILIGHT_REC *rec)
 	if (rec->preg != NULL)
 		g_regex_unref(rec->preg);
 
-	rec->preg = g_regex_new(rec->text, G_REGEX_CASELESS, 0, NULL);
+	rec->preg = g_regex_new(rec->text, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, NULL);
 }
 
 void hilight_create(HILIGHT_REC *rec)
@@ -188,22 +188,25 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
 	return NULL;
 }
 
-static int hilight_match_text(HILIGHT_REC *rec, const char *text,
+static gboolean hilight_match_text(HILIGHT_REC *rec, const char *text,
 				  int *match_beg, int *match_end)
 {
-	char *match;
+	gboolean ret = FALSE;
 
 	if (rec->regexp) {
-		GMatchInfo *match;
-
 		if (rec->preg != NULL) {
+			GMatchInfo *match;
+
 			g_regex_match (rec->preg, text, 0, &match);
 
-			if (g_match_info_matches(match)) {
-				return g_match_info_fetch_pos(match, 0, match_beg, match_end);
-			}
+			if (g_match_info_matches(match))
+				ret = g_match_info_fetch_pos(match, 0, match_beg, match_end);
+
+			g_match_info_free(match);
 		}
 	} else {
+		char *match;
+
 		if (rec->case_sensitive) {
 			match = rec->fullword ?
 				strstr_full(text, rec->text) :
@@ -218,11 +221,11 @@ static int hilight_match_text(HILIGHT_REC *rec, const char *text,
 				*match_beg = (int) (match-text);
 				*match_end = *match_beg + strlen(rec->text);
 			}
-			return TRUE;
+			ret = TRUE;
 		}
 	}
 
-	return FALSE;
+	return ret;
 }
 
 #define hilight_match_level(rec, level) \
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index f35848a2..979a6104 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -546,7 +546,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 	preg = NULL;
 
 	if (regexp) {
-		preg = g_regex_new(text, (case_sensitive ? 0 : G_REGEX_CASELESS), 0, NULL);
+		preg = g_regex_new(text, G_REGEX_RAW | (case_sensitive ? 0 : G_REGEX_CASELESS), 0, NULL);
 
 		if (preg == NULL)
 			return NULL;
@@ -602,7 +602,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 		}
 	}
 
-	if (regexp)
+	if (preg != NULL)
 		g_regex_unref(preg);
         g_string_free(str, TRUE);
 	return matches;

From f5cbbebc2ee858e8792ab40eea6abc9fd7865a28 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Tue, 3 Jan 2017 12:04:56 +0100
Subject: [PATCH 0484/1650] switch for gregex and regex.h

---
 configure.ac                      | 16 ++++++++++++++++
 src/core/ignore.c                 | 31 ++++++++++++++++++++++++++++++
 src/core/ignore.h                 |  9 +++++++++
 src/core/misc.c                   |  4 ++++
 src/fe-common/core/fe-ignore.c    |  5 +++++
 src/fe-common/core/hilight-text.c | 32 +++++++++++++++++++++++++++++++
 src/fe-common/core/hilight-text.h |  9 +++++++++
 src/fe-text/textbuffer.c          | 29 ++++++++++++++++++++++++++--
 8 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7eb1bfe1..8d588408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,15 @@ AC_ARG_ENABLE(true-color,
 	fi,
 	want_truecolor=no)
 
+AC_ARG_ENABLE(gregex,
+[  --disable-gregex     Build without GRegex (fall back to regex.h)],
+	if test x$enableval = xno ; then
+		want_gregex=no
+	else
+		want_gregex=yes
+	fi,
+	want_gregex=yes)
+
 dnl **
 dnl ** just some generic stuff...
 dnl **
@@ -534,6 +543,12 @@ else
 	want_truecolor=no
 fi
 
+if test "x$want_gregex" = "xyes"; then
+	AC_DEFINE([USE_GREGEX], [], [use GRegex for regular expressions])
+else
+	want_gregex=no
+fi
+
 AH_TEMPLATE(HAVE_GMODULE)
 AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
 AH_TEMPLATE(HAVE_STATIC_PERL)
@@ -648,6 +663,7 @@ echo
 
 echo "Building with 64bit DCC support .. : $offt_64bit"
 echo "Building with true color support.. : $want_truecolor"
+echo "Building with GRegex ............. : $want_gregex"
 
 echo
 echo "If there are any problems, read the INSTALL file."
diff --git a/src/core/ignore.c b/src/core/ignore.c
index cfcbd792..bf8db04f 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -67,8 +67,13 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
 		return FALSE;
 
 	if (rec->regexp) {
+#ifdef USE_GREGEX
 		return rec->preg != NULL &&
 			g_regex_match(rec->preg, text, 0, NULL);
+#else
+		return rec->regexp_compiled &&
+			regexec(&rec->preg, text, 0, NULL, 0) == 0;
+#endif
 	}
 
 	return rec->fullword ?
@@ -322,6 +327,7 @@ static void ignore_remove_config(IGNORE_REC *rec)
 
 static void ignore_init_rec(IGNORE_REC *rec)
 {
+#ifdef USE_GREGEX
 	if (rec->preg != NULL)
 		g_regex_unref(rec->preg);
 
@@ -335,6 +341,27 @@ static void ignore_init_rec(IGNORE_REC *rec)
 			g_error_free(re_error);
 		}
 	}
+#else
+	char *errbuf;
+	int errcode, errbuf_len;
+
+	if (rec->regexp_compiled) regfree(&rec->preg);
+	rec->regexp_compiled = FALSE;
+
+	if (rec->regexp && rec->pattern != NULL) {
+		errcode = regcomp(&rec->preg, rec->pattern,
+				REG_EXTENDED|REG_ICASE|REG_NOSUB);
+		if (errcode != 0) {
+			errbuf_len = regerror(errcode, &rec->preg, 0, 0);
+			errbuf = g_malloc(errbuf_len);
+			regerror(errcode, &rec->preg, errbuf, errbuf_len);
+			g_warning("Failed to compile regexp '%s': %s", rec->pattern, errbuf);
+			g_free(errbuf);
+		} else {
+			rec->regexp_compiled = TRUE;
+		}
+	}
+#endif
 }
 
 void ignore_add_rec(IGNORE_REC *rec)
@@ -354,7 +381,11 @@ static void ignore_destroy(IGNORE_REC *rec, int send_signal)
 	if (send_signal)
 		signal_emit("ignore destroyed", 1, rec);
 
+#ifdef USE_GREGEX
 	if (rec->preg != NULL) g_regex_unref(rec->preg);
+#else
+	if (rec->regexp_compiled) regfree(&rec->preg);
+#endif
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->mask);
 	g_free_not_null(rec->servertag);
diff --git a/src/core/ignore.h b/src/core/ignore.h
index f37f8b28..80ae1d12 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -1,6 +1,10 @@
 #ifndef __IGNORE_H
 #define __IGNORE_H
 
+#ifndef USE_GREGEX
+#  include <regex.h>
+#endif
+
 typedef struct _IGNORE_REC IGNORE_REC;
 
 struct _IGNORE_REC {
@@ -16,7 +20,12 @@ struct _IGNORE_REC {
 	unsigned int regexp:1;
 	unsigned int fullword:1;
 	unsigned int replies:1; /* ignore replies to nick in channel */
+#ifdef USE_GREGEX
 	GRegex *preg;
+#else
+	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
+	regex_t preg;
+#endif
 };
 
 extern GSList *ignores;
diff --git a/src/core/misc.c b/src/core/misc.c
index c59eb126..1cfa15b6 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -22,6 +22,10 @@
 #include "misc.h"
 #include "commands.h"
 
+#ifndef USE_GREGEX
+#  include <regex.h>
+#endif
+
 typedef struct {
 	int condition;
 	GInputFunction function;
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 03fd4dd2..800e881d 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -58,8 +58,13 @@ static void ignore_print(int index, IGNORE_REC *rec)
 		g_string_append(options, "-regexp ");
 		if (rec->pattern == NULL)
 			g_string_append(options, "[INVALID! -pattern missing] ");
+#ifdef USE_GREGEX
 		else if (rec->preg == NULL)
 			g_string_append(options, "[INVALID!] ");
+#else
+		else if (!rec->regexp_compiled)
+			g_string_append(options, "[INVALID!] ");
+#endif
 	}
 	if (rec->fullword) g_string_append(options, "-full ");
 	if (rec->replies) g_string_append(options, "-replies ");
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 7a7f473c..037cde5c 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -101,7 +101,11 @@ static void hilight_destroy(HILIGHT_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
 
+#ifdef USE_GREGEX
 	if (rec->preg != NULL) g_regex_unref(rec->preg);
+#else
+	if (rec->regexp_compiled) regfree(&rec->preg);
+#endif
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->color);
 	g_free_not_null(rec->act_color);
@@ -118,10 +122,19 @@ static void hilights_destroy_all(void)
 
 static void hilight_init_rec(HILIGHT_REC *rec)
 {
+#ifdef USE_GREGEX
 	if (rec->preg != NULL)
 		g_regex_unref(rec->preg);
 
 	rec->preg = g_regex_new(rec->text, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, NULL);
+#else
+	if (rec->regexp_compiled) regfree(&rec->preg);
+	if (!rec->regexp)
+		rec->regexp_compiled = FALSE;
+	else
+		rec->regexp_compiled = regcomp(&rec->preg, rec->text,
+				rec->case_sensitive ? REG_EXTENDED : (REG_EXTENDED|REG_ICASE)) == 0;
+#endif
 }
 
 void hilight_create(HILIGHT_REC *rec)
@@ -194,6 +207,7 @@ static gboolean hilight_match_text(HILIGHT_REC *rec, const char *text,
 	gboolean ret = FALSE;
 
 	if (rec->regexp) {
+#ifdef USE_GREGEX
 		if (rec->preg != NULL) {
 			GMatchInfo *match;
 
@@ -204,6 +218,19 @@ static gboolean hilight_match_text(HILIGHT_REC *rec, const char *text,
 
 			g_match_info_free(match);
 		}
+#else
+		regmatch_t rmatch[1];
+
+		if (rec->regexp_compiled &&
+			regexec(&rec->preg, text, 1, rmatch, 0) == 0) {
+			if (rmatch[0].rm_so > 0 &&
+				match_beg != NULL && match_end != NULL) {
+				*match_beg = rmatch[0].rm_so;
+				*match_end = rmatch[0].rm_eo;
+			}
+			ret = TRUE;
+		}
+#endif
 	} else {
 		char *match;
 
@@ -502,8 +529,13 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 	if (rec->case_sensitive) g_string_append(options, "-matchcase ");
 	if (rec->regexp) {
 		g_string_append(options, "-regexp ");
+#ifdef USE_GREGEX
 		if (rec->preg == NULL)
 			g_string_append(options, "[INVALID!] ");
+#else
+		if (!rec->regexp_compiled)
+			g_string_append(options, "[INVALID!] ");
+#endif
 	}
 
 	if (rec->priority != 0)
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 93c573c2..76beec1f 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -1,6 +1,10 @@
 #ifndef __HILIGHT_TEXT_H
 #define __HILIGHT_TEXT_H
 
+#ifndef USE_GREGEX
+#  include <regex.h>
+#endif
+
 #include "formats.h"
 
 struct _HILIGHT_REC {
@@ -20,7 +24,12 @@ struct _HILIGHT_REC {
 	unsigned int fullword:1; /* match `text' only for full words */
 	unsigned int regexp:1; /* `text' is a regular expression */
 	unsigned int case_sensitive:1;/* `text' must match case */
+#ifdef USE_GREGEX
 	GRegex *preg;
+#else
+	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
+	regex_t preg;
+#endif
 	char *servertag;
 };
 
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 979a6104..ae4636a5 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -27,6 +27,10 @@
 
 #include "textbuffer.h"
 
+#ifndef USE_GREGEX
+#  include <regex.h>
+#endif
+
 #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*))
 
 TEXT_BUFFER_REC *textbuffer_create(void)
@@ -533,7 +537,11 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			    int before, int after,
 			    int regexp, int fullword, int case_sensitive)
 {
+#ifdef USE_GREGEX
 	GRegex *preg;
+#else
+	regex_t preg;
+#endif
         LINE_REC *line, *pre_line;
 	GList *matches;
 	GString *str;
@@ -543,6 +551,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 	g_return_val_if_fail(buffer != NULL, NULL);
 	g_return_val_if_fail(text != NULL, NULL);
 
+#ifdef USE_GREGEX
 	preg = NULL;
 
 	if (regexp) {
@@ -551,6 +560,14 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 		if (preg == NULL)
 			return NULL;
 	}
+#else
+	if (regexp) {
+		int flags = REG_EXTENDED | REG_NOSUB |
+			(case_sensitive ? 0 : REG_ICASE);
+		if (regcomp(&preg, text, flags) != 0)
+			return NULL;
+	}
+#endif
 
 	matches = NULL; match_after = 0;
         str = g_string_new(NULL);
@@ -571,8 +588,12 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 
 			if (line_matched) {
 				line_matched = regexp ?
-				    g_regex_match(preg, str->str, 0, NULL) :
-				    match_func(str->str, text) != NULL;
+#ifdef USE_GREGEX
+				    g_regex_match(preg, str->str, 0, NULL)
+#else
+				    regexec(&preg, str->str, 0, NULL, 0) == 0
+#endif
+					: match_func(str->str, text) != NULL;
 			}
 		}
 
@@ -602,8 +623,12 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 		}
 	}
 
+#ifdef USE_GREGEX
 	if (preg != NULL)
 		g_regex_unref(preg);
+#else
+	if (regexp) regfree(&preg);
+#endif
         g_string_free(str, TRUE);
 	return matches;
 }

From 1f72b8e66a06b484dde20b6031c766a2129e0bd2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Tue, 3 Jan 2017 12:29:52 +0100
Subject: [PATCH 0485/1650] up abi version

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 0a7b72f0..43596580 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 6
+#define IRSSI_ABI_VERSION 7
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 

From 6c6c42e3d1b49d90aacc0b67f8540471cae02a1d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 3 Jan 2017 13:44:58 +0100
Subject: [PATCH 0486/1650] Merge branch 'security' into 'master'

See merge request !7
---
 src/fe-common/core/formats.c | 10 +++++++++-
 src/fe-text/term-terminfo.c  | 13 ++++++++++---
 src/irc/core/irc-nicklist.c  |  6 +++++-
 src/irc/core/irc-queries.c   |  2 ++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index d9a51201..738239a6 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -68,7 +68,7 @@ static void format_expand_code(const char **format, GString *out, int *flags)
 
 	if (flags == NULL) {
 		/* flags are being ignored - skip the code */
-		while (**format != ']')
+		while (**format != ']' && **format != '\0')
 			(*format)++;
 		return;
 	}
@@ -246,6 +246,10 @@ int format_expand_styles(GString *out, const char **format, int *flags)
 	case '[':
 		/* code */
 		format_expand_code(format, out, flags);
+		if ((*format)[0] == '\0')
+			/* oops, reached end prematurely */
+			(*format)--;
+
 		break;
 	case 'x':
 	case 'X':
@@ -972,6 +976,7 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 			str++;
 			for (num2 = 0; i_isdigit(*str); str++)
 				num2 = num2*10 + (*str-'0');
+			if (*str == '\0') return start;
 
 			switch (num2) {
 			case 2:
@@ -989,6 +994,8 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 					for (; i_isdigit(*str); str++)
 						num2 = (num2&~0xff) |
 							(((num2&0xff) * 10 + (*str-'0'))&0xff);
+
+					if (*str == '\0') return start;
 				}
 
 				if (i == -1) break;
@@ -1017,6 +1024,7 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 				str++;
 				for (num2 = 0; i_isdigit(*str); str++)
 					num2 = num2*10 + (*str-'0');
+				if (*str == '\0') return start;
 
 				if (num == 38) {
 					flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 27be904e..8fac76b3 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -539,9 +539,16 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 
 	if (term_type == TERM_TYPE_UTF8) {
 		while (*ptr != '\0') {
-			tmp = g_utf8_get_char(ptr);
-			len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
-			ptr = g_utf8_next_char(ptr);
+			tmp = g_utf8_get_char_validated(ptr, -1);
+			/* On utf8 error, treat as single byte and try to
+			   continue interpretting rest of string as utf8 */
+			if (tmp == (gunichar)-1 || tmp == (gunichar)-2) {
+				len++;
+				ptr++;
+			} else {
+				len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
+				ptr = g_utf8_next_char(ptr);
+			}
 		}
 	} else
 		len = raw_len;
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index bcb9d1f6..f049fe79 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -314,7 +314,11 @@ static void event_whois_ircop(SERVER_REC *server, const char *data)
 static void event_nick_invalid(IRC_SERVER_REC *server, const char *data)
 {
 	if (!server->connected)
-		server_disconnect((SERVER_REC *) server);
+		/* we used to call server_disconnect but that crashes
+		   irssi because of undefined memory access. instead,
+		   indicate that the connection should be dropped and
+		   let the irc method to the clean-up. */
+		server->connection_lost = server->no_reconnect = TRUE;
 }
 
 static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 12861744..77a5289d 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -45,6 +45,8 @@ QUERY_REC *irc_query_find(IRC_SERVER_REC *server, const char *nick)
 {
 	GSList *tmp;
 
+	g_return_val_if_fail(nick != NULL, NULL);
+
 	for (tmp = server->queries; tmp != NULL; tmp = tmp->next) {
 		QUERY_REC *rec = tmp->data;
 

From 7cac354161a8914712264408347a9a2882aab22f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 3 Jan 2017 14:24:55 +0100
Subject: [PATCH 0487/1650] tag as 0.8.21

---
 NEWS         | 9 +++++++++
 configure.ac | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 265827b3..34bb76a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+v0.8.21 2017-01-03  The Irssi team <staff@irssi.org>
+	- Correct a NULL pointer dereference in the nickcmp function found by
+	  Joseph Bisch (GL#1)
+	- Correct an out of bounds read in certain incomplete control codes
+	  found by Joseph Bisch (GL#2)
+	- Correct an out of bounds read in certain incomplete character
+	  sequences found by Hanno Böck and independently by J. Bisch (GL#3)
+	- Correct an error when receiving invalid nick message (GL#4, #466)
+
 v0.8.20 2016-09-16  The Irssi team <staff@irssi.org>
 	- Correct the name of an emitted sasl signal (#484)
 	- Correct the prototype for the 'message private' signal (#515)
diff --git a/configure.ac b/configure.ac
index 458c8aa9..59f5ce57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.20)
+AC_INIT(irssi, 0.8.21)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 33107be74888ea08411904193f2832fcc7747692 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 3 Jan 2017 17:04:24 +0100
Subject: [PATCH 0488/1650] fix GRegex GError problem

---
 src/core/ignore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index bf8db04f..d4a92e3c 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -332,7 +332,7 @@ static void ignore_init_rec(IGNORE_REC *rec)
 		g_regex_unref(rec->preg);
 
 	if (rec->regexp && rec->pattern != NULL) {
-		GError *re_error;
+		GError *re_error = NULL;
 
 		rec->preg = g_regex_new(rec->pattern, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, &re_error);
 

From ea7826b0ec097b9fdc29336ff7fe7074052773f5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 3 Jan 2017 16:41:41 +0100
Subject: [PATCH 0489/1650] tag as 1.0.0

---
 NEWS         | 76 +++++++++++++++++++++++++++++++++++++---------------
 configure.ac |  2 +-
 2 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/NEWS b/NEWS
index b55b1b4d..81c6004c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,22 +1,29 @@
-v0.8.22-head 2017-xx-xx  The Irssi team <staff@irssi.org>
-	* Removed --disable-ipv6
+v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
+	* Removed --disable-ipv6 (#408).
 	* /connect Network now aborts with an error if no servers have been
-	  added to that network.
+	  added to that network (#443).
 	* /dcc commands now use quotes around spaces consistently.
-	+ irssiproxy can now forward all tags through a single port.
-	+ irssiproxy can also listen on unix sockets.
-	+ send channel -botcmds immediately when no mask is specified (#175).
+	* bell_beeps was removed (#524, #565).
+	* Switch to GRegex instead of regex.h (#412).
+	+ irssiproxy can now forward all tags through a single
+	  port. By Lukas Mai (mauke, #425).
+	+ irssiproxy can also listen on unix sockets. By Lukas Mai (#427).
+	+ send channel -botcmds immediately when no mask is specified (#175, #399).
 	+ the kill buffer now remembers consecutive kills.
 	  New bindings were added: yank_next_cutbuffer and append_next_kill
+	  By Todd A. Pratt (#353, #414, #455)
 	+ connections will avoid looking up IPv6 addresses if the machine does
 	  not have an IPv6 address assigned (exact behaviour is implementation
-	  defined).
+	  defined, #410).
 	+ Fix potential crash if scripts insert undef values into the completion
-	  list.
-	+ Paste warning is now also shown on pasting overlong lines.
+	  list (#413).
+	+ Paste warning is now also shown on pasting overlong
+	  lines. By Manish Goregaokar (#426).
 	+ autolog_ignore_targets and activity_hide_targets learn a new syntax
 	      tag/* and * to ignore whole networks or everything.
-	+ /hilight got a -matchcase flag to hilight case sensitively (#421).
+	  By Jari Matilainen (vague666, #437)
+	+ /hilight got a -matchcase flag to hilight case
+	  sensitively. By Thibault B (isundil, #421, #476).
 	+ Always build irssi with TLS support.
 	+ Rename SSL to TLS in the code and add -tls_* versions of the -ssl_*
 	  options to /CONNECT and /SERVER, but make sure the -ssl_* options continue
@@ -54,10 +61,36 @@ v0.8.22-head 2017-xx-xx  The Irssi team <staff@irssi.org>
 	  does not rely on the libval library. It is causing a lot of troubles for
 	  our downstream maintainers.
 
+	+ /names and $[...] now uses utf8 string operations. By Xavier
+          G. (#40, #411, #471, #480).
+	+ New setting completion_nicks_match_case (#488).
+	+ /channel /server /network now support modify subcommand. By
+	  Jari Matilainen (#338, #498).
+	+ Irssi::signal_remove now works with coderefs. By Tom Feist (shabble, #512).
+	+ /script reset got an -autorun switch (#540, #538).
+	+ cap_toggle can now be called from Perl, and fields
+	  cap_active and cap_supported can be inspected (#542).
+	+ Make it possible to disable empty line completion. By Lauri
+	  Tirkkonen (lotheac, #574).
+	+ New option sasl_disconnect_on_failure to disconnect when
+	  SASL log-in failed (#514).
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
-	- /names and $[...] now uses utf8 string operations (#40, #411).
-	- Removed broken support for curses.
+	- Removed broken support for curses (#521).
+	- Removed broken dummy mode (#526).
+	- Fix terminal state after suspend (#450, #452).
+	- Improve Perl library path detection (#479, #132).
+	- Reconnect now works on unix connections (#493).
+	- Fix completion warnings (#125, #496, FS#124).
+	- Fix a crash in the --more-- item (#501).
+	- Fix a display issue in /unignore (#517, bdo#577202).
+	- Fix a crash in some netsplits (#529, #500).
+	- Fix crashes with some invalid config (#550, #551, #563, #564, #587, #581, #570).
+	- Add support for SASL Fragmentation. By Kenny Root (kruton, #506).
+	- Improve netsplit dumping (#420, #465).
+	- Improve responsibility under DCC I/O strain (#578, #159).
+	- Fix query nick change on open (#580, #586).
+	- Correct a few help texts.
 
 v0.8.21 2017-01-03  The Irssi team <staff@irssi.org>
 	- Correct a NULL pointer dereference in the nickcmp function found by
@@ -72,11 +105,11 @@ v0.8.20 2016-09-16  The Irssi team <staff@irssi.org>
 	- Correct the name of an emitted sasl signal (#484)
 	- Correct the prototype for the 'message private' signal (#515)
 	- Corrections in away and hilight help text (#477, #518)
-	- /squery and /servlist commands have been restored.
+	- /squery and /servlist commands have been restored (#461).
 	- Where Irssi would previously only report "System error" on connect,
-	  it will now try harder to retrieve the system error message.
+	  it will now try harder to retrieve the system error message (#467).
 	- Fixed issue with +channels not working properly (#533)
-	- Fixed crash in optchan when item has no server (#485)
+	- Fixed crash in optchan when item has no server (#485, bdo#826525)
 	- Fixed random remote crash in the nicklist handling (#529)
 	- Fixed remote crash due to incorrect bounds checking on
 	  formats, reported by Gabriel Campana and Adrien Guinet from
@@ -84,16 +117,17 @@ v0.8.20 2016-09-16  The Irssi team <staff@irssi.org>
 
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 	- Fixed regression when joining and parting channels on IRCnet (#435)
-	- Fixed SASL EXTERNAL (#432)
+	- Fixed SASL EXTERNAL. By Mantas Mikulėnas (grawity, #432)
 	- Fixed regression when not using SASL (#438)
-	- Fixed incorrect SSL disconnects when using SSL from modules/scripts
-	  (#439)
+	- Fixed incorrect SSL disconnects when using SSL from modules/scripts.
+	  By Will Storey (horgh, #439)
 	- Fixed regression where proxy_string could not be configured or
-	  certain file transfers could not be accepted (#445)
-	- Fixed storing layout of !channels (#183)
-	- Fixed restoration of bracketed paste mode on quit (#449)
+	  certain file transfers could not be accepted (#445, #446)
+	- Fixed storing layout of !channels (#183, #405)
+	- Fixed restoration of bracketed paste mode on quit (#449, #457)
 	- Make the usage of meta-O for cursor keys configurable with
 	      /set term_appkey_mode off
+	  (#430, #459)
 
 v0.8.18 2016-02-13  The Irssi team <staff@irssi.org>
 	* Modules will now require to define a
diff --git a/configure.ac b/configure.ac
index c0f8e842..4aa1f3cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.22-head)
+AC_INIT(irssi, 1.0.0)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From cbb931ed1da91b2cee36f89673edd6a526d56e9a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 3 Jan 2017 17:21:47 +0100
Subject: [PATCH 0490/1650] continue head

---
 NEWS         | 2 ++
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 81c6004c..267eaa2a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+v1.1-head 2017-xx-xx  The Irssi team <staff@irssi.org>
+
 v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
 	* Removed --disable-ipv6 (#408).
 	* /connect Network now aborts with an error if no servers have been
diff --git a/configure.ac b/configure.ac
index 4aa1f3cc..15ae74b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.0.0)
+AC_INIT(irssi, 1.1-head)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From c9c45e4f89bc42fec00b71c50844a946bfcc6e0c Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Fri, 6 Jan 2017 12:24:36 +0100
Subject: [PATCH 0491/1650] make irssi --with-perl build with separate object
 directory

irssi 1.0.0 will not build if Perl is enabled and a separate
object code directory is used. The problem was a relative path
to an internal Perl dependency in four Makefile.PL.in files.
---
 src/perl/common/Makefile.PL.in | 2 +-
 src/perl/irc/Makefile.PL.in    | 2 +-
 src/perl/textui/Makefile.PL.in | 2 +-
 src/perl/ui/Makefile.PL.in     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/perl/common/Makefile.PL.in b/src/perl/common/Makefile.PL.in
index 84a80403..70b1d258 100644
--- a/src/perl/common/Makefile.PL.in
+++ b/src/perl/common/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi',
               'LIBS' => '',
diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in
index 0fbc5241..582160a0 100644
--- a/src/perl/irc/Makefile.PL.in
+++ b/src/perl/irc/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::Irc',
               'LIBS' => '',
diff --git a/src/perl/textui/Makefile.PL.in b/src/perl/textui/Makefile.PL.in
index 3541f75c..ffdda21a 100644
--- a/src/perl/textui/Makefile.PL.in
+++ b/src/perl/textui/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::TextUI',
               'LIBS' => '',
diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in
index ed87d528..ceed51c3 100644
--- a/src/perl/ui/Makefile.PL.in
+++ b/src/perl/ui/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::UI',
               'LIBS' => '',

From 752f484c6ce4c2aa7284b617a59a8906b269281c Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 6 Jan 2017 11:47:24 -0300
Subject: [PATCH 0492/1650] Add OPENSSL_NO_EC for solaris 11.3, see issue #598

Original patch by 'Slarky'

According to that ticket, the next major version of solaris won't need
this. Consider reverting this when solaris 11.3 stops being relevant.
---
 src/core/network-openssl.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 7a1d6e34..1eb85341 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -646,7 +646,11 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 #ifdef SSL_get_server_tmp_key
 	// Show ephemeral key information.
 	EVP_PKEY *ephemeral_key = NULL;
+
+	// OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598
+#ifndef OPENSSL_NO_EC
 	EC_KEY *ec_key = NULL;
+#endif
 	char *ephemeral_key_algorithm = NULL;
 	char *cname = NULL;
 	int nid;
@@ -658,6 +662,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
 				break;
 
+#ifndef OPENSSL_NO_EC
 			case EVP_PKEY_EC:
 				ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
 				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
@@ -670,6 +675,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 
 				g_free_and_null(ephemeral_key_algorithm);
 				break;
+#endif
 
 			default:
 				tls_rec_set_ephemeral_key_algorithm(tls, "Unknown");

From ef9da295cdd8af0036396e7fc772fcee8a1c7c51 Mon Sep 17 00:00:00 2001
From: Lasse Toimela <lasse.toimela@protonmail.ch>
Date: Fri, 6 Jan 2017 17:47:08 +0200
Subject: [PATCH 0493/1650] Fix syntax on /help SERVER example

---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 60870111..44de0efc 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -64,7 +64,7 @@
     /SERVER CONNECT chat.freenode.net
     /SERVER CONNECT +chat.freenode.net
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
-    /SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode -noproxy orwell.freenode.net
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
     /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
     /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE

From 1831a8e1a710decbbcae524c60cdf6216f19a121 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 6 Jan 2017 12:48:27 -0300
Subject: [PATCH 0494/1650] Don't reset wait_cmd during connection registration
 (fixes early ISON)

---
 src/irc/core/irc-servers.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 3117e345..7cbd05a0 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -527,6 +527,12 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
 		return;
 	}
 
+	/* Don't reset wait_cmd during connection registration
+	 * (while sending CAP / SASL related commands) */
+	if (!server->connected) {
+		return;
+	}
+
 	g_get_current_time(&server->last_cmd);
 
 	/* A bit kludgy way to do the flood protection. In ircnet, there

From 69e112fbd1b44a6f9f3380167c12bbe0f76693a1 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 6 Jan 2017 11:20:49 -0300
Subject: [PATCH 0495/1650] NEWS: Avoid explicitly mentioning freenode in the
 pinning examples

They have proper certs, so using them as an example is wrong.
Particularly worse since they started using letsencrypt recently so
every server has a different cert and pubkey.

We'll figure out how to link this from the release notes later.
---
 NEWS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 81c6004c..9604277a 100644
--- a/NEWS
+++ b/NEWS
@@ -39,16 +39,16 @@ v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
 	  values like this: Start by downloading the certificate from a given IRC
 	  server:
 
-	      $ openssl s_client -connect chat.freenode.net:6697 < /dev/null 2>/dev/null | \
-	        openssl x509 > freenode.cert
+	      $ openssl s_client -connect irc.example.net:6697 < /dev/null 2>/dev/null | \
+	        openssl x509 > example.cert
 
 	  Find the value for -tls_pinned_cert:
 
-	      $ openssl x509 -in freenode.cert -fingerprint -sha256 -noout
+	      $ openssl x509 -in example.cert -fingerprint -sha256 -noout
 
 	  Find the value for -tls_pinned_pubkey:
 
-	      $ openssl x509 -in freenode.cert -pubkey -noout | \
+	      $ openssl x509 -in example.cert -pubkey -noout | \
 	        openssl pkey -pubin -outform der | \
 	        openssl dgst -sha256 -c | \
 	        tr a-z A-Z

From 5917bc6f75dd87806807d3d526826b64e8271a5b Mon Sep 17 00:00:00 2001
From: Tim Konick <konick781@gmail.com>
Date: Fri, 6 Jan 2017 21:58:00 -0800
Subject: [PATCH 0496/1650] Follow g_strsplit with call to g_strfreev

---
 src/irc/core/modes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index 207461cc..cc3d0faf 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -743,6 +743,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item,
 			    g_hash_table_lookup(optlist, "yes") == NULL) {
                                 /* too many matches */
 				g_string_free(str, TRUE);
+				g_strfreev(matches);
 				cmd_params_free(free_arg);
 
 				signal_emit("error command", 1,
@@ -756,7 +757,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item,
         if (str->len > 0) g_string_truncate(str, str->len-1);
 	ret = str->str;
 	g_string_free(str, FALSE);
-
+	g_strfreev(matches);
 	cmd_params_free(free_arg);
 
 	*ret_channel = channel;

From cf4690725667211bc8a8998e362c6bda24dd7528 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Sat, 7 Jan 2017 20:01:07 -0500
Subject: [PATCH 0497/1650] Add frontend for fuzzing

Use the following configure command:

$ ./configure --with-fuzzer --with-fuzzer-lib=/path/to/libFuzzer.a \
      CC=clang CXX=clang++

Places an irssi-fuzz in src/fe-fuzz/ after build.

Also can specify SANFLAGS to override the chosen sanitizer flags
(defaults to "-g -fsanitize=address -fsanitize-coverage=trace-pc-guard").
---
 .gitignore                   |   4 +
 configure.ac                 |  40 ++++++++++
 src/Makefile.am              |   6 +-
 src/fe-fuzz/Makefile.am      |  25 ++++++
 src/fe-fuzz/irssi.c          |  58 ++++++++++++++
 src/fe-fuzz/module-formats.c |  82 ++++++++++++++++++++
 src/fe-fuzz/module-formats.h |  58 ++++++++++++++
 src/fe-fuzz/tokens.txt       | 143 +++++++++++++++++++++++++++++++++++
 8 files changed, 415 insertions(+), 1 deletion(-)
 create mode 100644 src/fe-fuzz/Makefile.am
 create mode 100644 src/fe-fuzz/irssi.c
 create mode 100644 src/fe-fuzz/module-formats.c
 create mode 100644 src/fe-fuzz/module-formats.h
 create mode 100644 src/fe-fuzz/tokens.txt

diff --git a/.gitignore b/.gitignore
index 945b6cf6..9af0c4b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ docs/help/[a-z]*
 docs/help/in/Makefile.am
 
 src/fe-text/irssi
+src/fe-fuzz/irssi-fuzz
 
 src/fe-common/irc/irc-modules.c
 src/irc/irc.c
@@ -46,6 +47,9 @@ src/perl/ui/*.c
 src/perl/*/MYMETA.*
 src/perl/*/Makefile.old
 
+src/fe-fuzz/crash-*
+src/fe-fuzz/oom-*
+
 *.a
 *.bs
 *.la
diff --git a/configure.ac b/configure.ac
index 15ae74b1..03c7ddf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,19 @@ AC_ARG_WITH(bot,
 	fi,
 	want_irssibot=no)
 
+AC_ARG_WITH(fuzzer,
+[  --with-fuzzer           Build irssi-fuzzer],
+	if test x$withval = xno; then
+		want_irssifuzzer=no
+	else
+		want_irssifuzzer=yes
+	fi,
+	want_irssifuzzer=no)
+
+AC_ARG_WITH(fuzzer-lib,
+[  --with-fuzzer-lib       Specify path to fuzzer library],
+	fuzzerlibpath="$withval")
+
 AC_ARG_WITH(proxy,
 [  --with-proxy            Build irssi-proxy],
 	if test x$withval = xno; then
@@ -297,6 +310,30 @@ if test "x$want_textui" != "xno"; then
 
 fi
 
+dnl **
+dnl ** irssifuzzer checks
+dnl **
+
+if test "$want_irssifuzzer" != "no"; then
+	dnl * we need to build with -fsanitize-coverage=trace-pc-guard
+	dnl * otherwise fuzzer won't be very successful at finding bugs :)
+	if test -z "$SANFLAGS"; then
+		SANFLAGS="-g -fsanitize=address -fsanitize-coverage=trace-pc-guard"
+	fi
+	CFLAGS="$CFLAGS $SANFLAGS"
+	CXXFLAGS="$CXXFLAGS $SANFLAGS"
+
+	AC_MSG_CHECKING(for fuzzer library)
+
+	if test -z "$fuzzerlibpath"; then
+		AC_MSG_RESULT([not found, building without fuzzer front end])
+		want_irssifuzzer=no
+	else
+		FUZZER_LIBS="$fuzzerlibpath"
+		AC_SUBST(FUZZER_LIBS)
+	fi
+fi
+
 dnl **
 dnl ** perl checks
 dnl **
@@ -456,6 +493,7 @@ fi
 dnl ** check what we want to build
 AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
+AM_CONDITIONAL(BUILD_IRSSIFUZZER, test "$want_irssifuzzer" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
 AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
 
@@ -572,6 +610,7 @@ src/fe-common/core/Makefile
 src/fe-common/irc/Makefile
 src/fe-common/irc/dcc/Makefile
 src/fe-common/irc/notifylist/Makefile
+src/fe-fuzz/Makefile
 src/fe-none/Makefile
 src/fe-text/Makefile
 src/lib-config/Makefile
@@ -611,6 +650,7 @@ echo
 
 echo "Building text frontend ........... : $want_textui"
 echo "Building irssi bot ............... : $want_irssibot"
+echo "Building irssi fuzzer ............ : $want_irssifuzzer"
 echo "Building irssi proxy ............. : $want_irssiproxy"
 if test "x$have_gmodule" = "xyes"; then
 	echo "Building with module support ..... : yes"
diff --git a/src/Makefile.am b/src/Makefile.am
index 76a4af4f..a7fb2ee2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,10 @@ if BUILD_IRSSIBOT
 BOTUI=fe-none
 endif
 
+if BUILD_IRSSIFUZZER
+FUZZERUI=fe-fuzz
+endif
+
 if HAVE_PERL
 PERLDIR=perl
 endif
@@ -14,4 +18,4 @@ pkginc_srcdir=$(pkgincludedir)/src
 pkginc_src_HEADERS = \
 	common.h
 
-SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(TEXTUI) $(BOTUI)
+SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI)
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
new file mode 100644
index 00000000..2ecf4a85
--- /dev/null
+++ b/src/fe-fuzz/Makefile.am
@@ -0,0 +1,25 @@
+bin_PROGRAMS = irssi-fuzz
+
+# Force link with clang++ for libfuzzer support
+CCLD=clang++ $(CXXFLAGS)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core/ \
+	-I$(top_srcdir)/src/irc/core/ \
+	-I$(top_srcdir)/src/fe-common/core/ \
+	$(GLIB_CFLAGS)
+
+irssi_fuzz_DEPENDENCIES = @COMMON_LIBS@
+
+irssi_fuzz_LDADD = \
+	@COMMON_LIBS@ \
+	@PROG_LIBS@ \
+	$(FUZZER_LIBS)
+
+irssi_fuzz_SOURCES = \
+        irssi.c \
+	module-formats.c
+
+noinst_HEADERS = \
+	module-formats.h
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
new file mode 100644
index 00000000..3b2c617a
--- /dev/null
+++ b/src/fe-fuzz/irssi.c
@@ -0,0 +1,58 @@
+/*
+ irssi.c : irssi
+
+    Copyright (C) 2017 Joseph Bisch
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "modules-load.h"
+#include "levels.h"
+#include "module-formats.h"
+#include "themes.h"
+#include "core.h"
+#include "fe-common-core.h"
+#include "args.h"
+#include "printtext.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+int LLVMFuzzerInitialize(int *argc, char ***argv) {
+	core_register_options();
+	fe_common_core_register_options();
+	/* no args */
+	args_execute(0, NULL);
+	core_preinit((*argv)[0]);
+	core_init();
+	fe_common_core_init();
+	theme_register(gui_text_formats);
+	module_register("core", "fe-fuzz");
+	printtext_string(NULL, NULL, MSGLEVEL_CLIENTCRAP, "init");
+	return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+	char *copy = (char *)malloc(sizeof(char)*(size+1));
+	memcpy(copy, data, size);
+	copy[size] = '\0';
+	printtext_string(NULL, NULL, MSGLEVEL_CLIENTCRAP, copy);
+	free(copy);
+	return 0;
+}
diff --git a/src/fe-fuzz/module-formats.c b/src/fe-fuzz/module-formats.c
new file mode 100644
index 00000000..899827c2
--- /dev/null
+++ b/src/fe-fuzz/module-formats.c
@@ -0,0 +1,82 @@
+/*
+ module-formats.c : irssi
+
+    Copyright (C) 2000 Timo Sirainen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "formats.h"
+
+FORMAT_REC gui_text_formats[] =
+{
+	{ MODULE_NAME, "Text user interface", 0 },
+
+	/* ---- */
+	{ NULL, "Lastlog", 0 },
+
+	{ "lastlog_too_long", "/LASTLOG would print $0 lines. If you really want to print all these lines use -force option.", 1, { 1 } },
+	{ "lastlog_count", "{hilight Lastlog}: $0 lines", 1, { 1 } },
+	{ "lastlog_start", "{hilight Lastlog}:", 0 },
+	{ "lastlog_end", "{hilight End of Lastlog}", 0 },
+	{ "lastlog_separator", "--", 0 },
+	{ "lastlog_date", "%%F ", 0 },
+
+	/* ---- */
+	{ NULL, "Windows", 0 },
+
+	{ "refnum_not_found", "Window number $0 not found", 1, { 0 } },
+	{ "window_too_small", "Not enough room to resize this window", 0 },
+	{ "cant_hide_last", "You can't hide the last window", 0 },
+	{ "cant_hide_sticky_windows", "You can't hide sticky windows (use /WINDOW STICK OFF)", 0 },
+	{ "cant_show_sticky_windows", "You can't show sticky windows (use /WINDOW STICK OFF)", 0 },
+	{ "window_not_sticky", "Window is not sticky", 0 },
+	{ "window_set_sticky", "Window set sticky", 0 },
+	{ "window_unset_sticky", "Window is not sticky anymore", 0 },
+	{ "window_info_sticky", "%#Sticky  : $0", 1, { 0 } },
+	{ "window_info_scroll", "%#Scroll  : $0", 1, { 0 } },
+	{ "window_scroll", "Window scroll mode is now $0", 1, { 0 } },
+	{ "window_scroll_unknown", "Unknown scroll mode $0, must be ON, OFF or DEFAULT", 1, { 0 } },
+
+	/* ---- */
+	{ NULL, "Statusbars", 0 },
+
+	{ "statusbar_list_header", "%#Name                           Type   Placement Position Visible", 0 },
+	{ "statusbar_list_footer", "", 0 },
+	{ "statusbar_list", "%#$[30]0 $[6]1 $[9]2 $[8]3 $4", 5, { 0, 0, 0, 1, 0 } },
+	{ "statusbar_info_name", "%#Statusbar: {hilight $0}", 1, { 0 } },
+	{ "statusbar_info_type", "%#Type     : $0", 1, { 0 } },
+	{ "statusbar_info_placement", "%#Placement: $0", 1, { 0 } },
+	{ "statusbar_info_position", "%#Position : $0", 1, { 1 } },
+	{ "statusbar_info_visible", "%#Visible  : $0", 1, { 0 } },
+	{ "statusbar_info_item_header", "%#Items    : Name                                Priority  Alignment", 0 },
+	{ "statusbar_info_item_footer", "", 0 },
+	{ "statusbar_info_item_name",  "%#         : $[35]0 $[9]1 $2", 3, { 0, 1, 0 } },
+	{ "statusbar_not_found", "Statusbar doesn't exist: $0", 1, { 0 } },
+	{ "statusbar_item_not_found", "Statusbar item doesn't exist: $0", 1, { 0 } },
+	{ "statusbar_unknown_command", "Unknown statusbar command: $0", 1, { 0 } },
+	{ "statusbar_unknown_type", "Statusbar type must be 'window' or 'root'", 1, { 0 } },
+	{ "statusbar_unknown_placement", "Statusbar placement must be 'top' or 'bottom'", 1, { 0 } },
+	{ "statusbar_unknown_visibility", "Statusbar visibility must be 'always', 'active' or 'inactive'", 1, { 0 } },
+
+	/* ---- */
+	{ NULL, "Pasting", 0 },
+
+	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.", 2, { 1, 0 } },
+	{ "paste_prompt", "Hit Ctrl-K to paste, Ctrl-C to abort?", 0 },
+
+	{ NULL, NULL, 0 }
+};
diff --git a/src/fe-fuzz/module-formats.h b/src/fe-fuzz/module-formats.h
new file mode 100644
index 00000000..3fa8c511
--- /dev/null
+++ b/src/fe-fuzz/module-formats.h
@@ -0,0 +1,58 @@
+#include "formats.h"
+
+enum {
+	TXT_MODULE_NAME,
+
+	TXT_FILL_1,
+
+        TXT_LASTLOG_TOO_LONG,
+        TXT_LASTLOG_COUNT,
+	TXT_LASTLOG_START,
+	TXT_LASTLOG_END,
+	TXT_LASTLOG_SEPARATOR,
+	TXT_LASTLOG_DATE,
+
+	TXT_FILL_2,
+
+        TXT_REFNUM_NOT_FOUND,
+        TXT_WINDOW_TOO_SMALL,
+        TXT_CANT_HIDE_LAST,
+	TXT_CANT_HIDE_STICKY_WINDOWS,
+        TXT_CANT_SHOW_STICKY_WINDOWS,
+        TXT_WINDOW_NOT_STICKY,
+        TXT_WINDOW_SET_STICKY,
+	TXT_WINDOW_UNSET_STICKY,
+	TXT_WINDOW_INFO_STICKY,
+        TXT_WINDOW_INFO_SCROLL,
+        TXT_WINDOW_SCROLL,
+        TXT_WINDOW_SCROLL_UNKNOWN,
+
+	TXT_FILL_3,
+
+        TXT_STATUSBAR_LIST_HEADER,
+	TXT_STATUSBAR_LIST_FOOTER,
+	TXT_STATUSBAR_LIST,
+	TXT_STATUSBAR_INFO_NAME,
+	TXT_STATUSBAR_INFO_TYPE,
+        TXT_STATUSBAR_INFO_PLACEMENT,
+	TXT_STATUSBAR_INFO_POSITION,
+	TXT_STATUSBAR_INFO_VISIBLE,
+        TXT_STATUSBAR_INFO_ITEM_HEADER,
+	TXT_STATUSBAR_INFO_ITEM_FOOTER,
+        TXT_STATUSBAR_INFO_ITEM_NAME,
+        TXT_STATUSBAR_NOT_FOUND,
+        TXT_STATUSBAR_ITEM_NOT_FOUND,
+	TXT_STATUSBAR_UNKNOWN_COMMAND,
+        TXT_STATUSBAR_UNKNOWN_TYPE,
+	TXT_STATUSBAR_UNKNOWN_PLACEMENT,
+        TXT_STATUSBAR_UNKNOWN_VISIBILITY,
+
+	TXT_FILL_4,
+
+	TXT_PASTE_WARNING,
+	TXT_PASTE_PROMPT,
+
+	TXT_COUNT
+};
+
+extern FORMAT_REC gui_text_formats[TXT_COUNT+1];
diff --git a/src/fe-fuzz/tokens.txt b/src/fe-fuzz/tokens.txt
new file mode 100644
index 00000000..e337b6e9
--- /dev/null
+++ b/src/fe-fuzz/tokens.txt
@@ -0,0 +1,143 @@
+"@%+"
+"*@*!*"
+"001"
+"002"
+"003"
+"004"
+"005"
+"221"
+"254"
+"271"
+"272"
+"281"
+"301"
+"302"
+"303"
+"305"
+"306"
+"311"
+"312"
+"313"
+"314"
+"315"
+"317"
+"318"
+"319"
+"324"
+"326"
+"327"
+"328"
+"329"
+"330"
+"332"
+"333"
+"338"
+"341"
+"344"
+"345"
+"346"
+"347"
+"348"
+"349"
+"352"
+"353"
+"364"
+"365"
+"366"
+"367"
+"368"
+"369"
+"372"
+"375"
+"376"
+"377"
+"378"
+"379"
+"381"
+"386"
+"387"
+"388"
+"389"
+"396"
+"401"
+"403"
+"404"
+"405"
+"407"
+"408"
+"410"
+"421"
+"422"
+"433"
+"436"
+"437"
+"438"
+"439"
+"442"
+"465"
+"470"
+"471"
+"472"
+"473"
+"474"
+"475"
+"476"
+"477"
+"478"
+"479"
+"482"
+"486"
+"489"
+"494"
+"506"
+"707"
+"716"
+"717"
+"728"
+"729"
+"902"
+"903"
+"904"
+"905"
+"906"
+"907"
+":a"
+"+a"
+"ACK"
+"authenticate"
+"away"
+"-b"
+"+b"
+"cap"
+"#chan"
+"connected"
+"empty"
+"error"
+"invite"
+"join"
+"kick"
+"kill"
+"LS"
+"mode"
+"multi-prefix"
+"NAK"
+"network"
+"nick"
+"nicklen"
+"notice"
+"-o"
+"+o"
+"part"
+"ping"
+"pong"
+"prefix"
+"privmsg"
+"quit"
+"sasl"
+"topic"
+"wallops"
+"watch"
+":\x01"
+":\x01ACTION"
+":\x01PING"
+":\x01VERSION"

From 17fc77565e3278ffc19c5294be57c2467f43974b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 9 Jan 2017 13:19:37 +0100
Subject: [PATCH 0498/1650] fix regression in completion

fixes #609
---
 src/fe-common/core/completion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 76dfbb79..914ba80b 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -191,7 +191,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 				g_strdup_printf("%s%c%s",
 						/* do not accidentally duplicate the word separator */
 						line == wordstart - 1 ? "" : linestart,
-						wordstart[-1], word);
+						old_wordstart[-1], word);
 			g_free(old);
 
 			g_free(word);

From abdae2d5fcc83ef73c7233da4a169ef3305c9743 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 9 Jan 2017 08:19:01 -0500
Subject: [PATCH 0499/1650] Don't duplicate module-formats.* in fe-fuzz

---
 src/fe-fuzz/Makefile.am      |  4 +-
 src/fe-fuzz/irssi.c          |  2 +-
 src/fe-fuzz/module-formats.c | 82 ------------------------------------
 src/fe-fuzz/module-formats.h | 58 -------------------------
 4 files changed, 3 insertions(+), 143 deletions(-)
 delete mode 100644 src/fe-fuzz/module-formats.c
 delete mode 100644 src/fe-fuzz/module-formats.h

diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index 2ecf4a85..3a547c66 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -19,7 +19,7 @@ irssi_fuzz_LDADD = \
 
 irssi_fuzz_SOURCES = \
         irssi.c \
-	module-formats.c
+	$(top_srcdir)/src/fe-text/module-formats.c
 
 noinst_HEADERS = \
-	module-formats.h
+	$(top_srcdir)/src/fe-text/module-formats.h
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index 3b2c617a..12c61147 100644
--- a/src/fe-fuzz/irssi.c
+++ b/src/fe-fuzz/irssi.c
@@ -21,7 +21,7 @@
 #include "module.h"
 #include "modules-load.h"
 #include "levels.h"
-#include "module-formats.h"
+#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text
 #include "themes.h"
 #include "core.h"
 #include "fe-common-core.h"
diff --git a/src/fe-fuzz/module-formats.c b/src/fe-fuzz/module-formats.c
deleted file mode 100644
index 899827c2..00000000
--- a/src/fe-fuzz/module-formats.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- module-formats.c : irssi
-
-    Copyright (C) 2000 Timo Sirainen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "module.h"
-#include "formats.h"
-
-FORMAT_REC gui_text_formats[] =
-{
-	{ MODULE_NAME, "Text user interface", 0 },
-
-	/* ---- */
-	{ NULL, "Lastlog", 0 },
-
-	{ "lastlog_too_long", "/LASTLOG would print $0 lines. If you really want to print all these lines use -force option.", 1, { 1 } },
-	{ "lastlog_count", "{hilight Lastlog}: $0 lines", 1, { 1 } },
-	{ "lastlog_start", "{hilight Lastlog}:", 0 },
-	{ "lastlog_end", "{hilight End of Lastlog}", 0 },
-	{ "lastlog_separator", "--", 0 },
-	{ "lastlog_date", "%%F ", 0 },
-
-	/* ---- */
-	{ NULL, "Windows", 0 },
-
-	{ "refnum_not_found", "Window number $0 not found", 1, { 0 } },
-	{ "window_too_small", "Not enough room to resize this window", 0 },
-	{ "cant_hide_last", "You can't hide the last window", 0 },
-	{ "cant_hide_sticky_windows", "You can't hide sticky windows (use /WINDOW STICK OFF)", 0 },
-	{ "cant_show_sticky_windows", "You can't show sticky windows (use /WINDOW STICK OFF)", 0 },
-	{ "window_not_sticky", "Window is not sticky", 0 },
-	{ "window_set_sticky", "Window set sticky", 0 },
-	{ "window_unset_sticky", "Window is not sticky anymore", 0 },
-	{ "window_info_sticky", "%#Sticky  : $0", 1, { 0 } },
-	{ "window_info_scroll", "%#Scroll  : $0", 1, { 0 } },
-	{ "window_scroll", "Window scroll mode is now $0", 1, { 0 } },
-	{ "window_scroll_unknown", "Unknown scroll mode $0, must be ON, OFF or DEFAULT", 1, { 0 } },
-
-	/* ---- */
-	{ NULL, "Statusbars", 0 },
-
-	{ "statusbar_list_header", "%#Name                           Type   Placement Position Visible", 0 },
-	{ "statusbar_list_footer", "", 0 },
-	{ "statusbar_list", "%#$[30]0 $[6]1 $[9]2 $[8]3 $4", 5, { 0, 0, 0, 1, 0 } },
-	{ "statusbar_info_name", "%#Statusbar: {hilight $0}", 1, { 0 } },
-	{ "statusbar_info_type", "%#Type     : $0", 1, { 0 } },
-	{ "statusbar_info_placement", "%#Placement: $0", 1, { 0 } },
-	{ "statusbar_info_position", "%#Position : $0", 1, { 1 } },
-	{ "statusbar_info_visible", "%#Visible  : $0", 1, { 0 } },
-	{ "statusbar_info_item_header", "%#Items    : Name                                Priority  Alignment", 0 },
-	{ "statusbar_info_item_footer", "", 0 },
-	{ "statusbar_info_item_name",  "%#         : $[35]0 $[9]1 $2", 3, { 0, 1, 0 } },
-	{ "statusbar_not_found", "Statusbar doesn't exist: $0", 1, { 0 } },
-	{ "statusbar_item_not_found", "Statusbar item doesn't exist: $0", 1, { 0 } },
-	{ "statusbar_unknown_command", "Unknown statusbar command: $0", 1, { 0 } },
-	{ "statusbar_unknown_type", "Statusbar type must be 'window' or 'root'", 1, { 0 } },
-	{ "statusbar_unknown_placement", "Statusbar placement must be 'top' or 'bottom'", 1, { 0 } },
-	{ "statusbar_unknown_visibility", "Statusbar visibility must be 'always', 'active' or 'inactive'", 1, { 0 } },
-
-	/* ---- */
-	{ NULL, "Pasting", 0 },
-
-	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.", 2, { 1, 0 } },
-	{ "paste_prompt", "Hit Ctrl-K to paste, Ctrl-C to abort?", 0 },
-
-	{ NULL, NULL, 0 }
-};
diff --git a/src/fe-fuzz/module-formats.h b/src/fe-fuzz/module-formats.h
deleted file mode 100644
index 3fa8c511..00000000
--- a/src/fe-fuzz/module-formats.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "formats.h"
-
-enum {
-	TXT_MODULE_NAME,
-
-	TXT_FILL_1,
-
-        TXT_LASTLOG_TOO_LONG,
-        TXT_LASTLOG_COUNT,
-	TXT_LASTLOG_START,
-	TXT_LASTLOG_END,
-	TXT_LASTLOG_SEPARATOR,
-	TXT_LASTLOG_DATE,
-
-	TXT_FILL_2,
-
-        TXT_REFNUM_NOT_FOUND,
-        TXT_WINDOW_TOO_SMALL,
-        TXT_CANT_HIDE_LAST,
-	TXT_CANT_HIDE_STICKY_WINDOWS,
-        TXT_CANT_SHOW_STICKY_WINDOWS,
-        TXT_WINDOW_NOT_STICKY,
-        TXT_WINDOW_SET_STICKY,
-	TXT_WINDOW_UNSET_STICKY,
-	TXT_WINDOW_INFO_STICKY,
-        TXT_WINDOW_INFO_SCROLL,
-        TXT_WINDOW_SCROLL,
-        TXT_WINDOW_SCROLL_UNKNOWN,
-
-	TXT_FILL_3,
-
-        TXT_STATUSBAR_LIST_HEADER,
-	TXT_STATUSBAR_LIST_FOOTER,
-	TXT_STATUSBAR_LIST,
-	TXT_STATUSBAR_INFO_NAME,
-	TXT_STATUSBAR_INFO_TYPE,
-        TXT_STATUSBAR_INFO_PLACEMENT,
-	TXT_STATUSBAR_INFO_POSITION,
-	TXT_STATUSBAR_INFO_VISIBLE,
-        TXT_STATUSBAR_INFO_ITEM_HEADER,
-	TXT_STATUSBAR_INFO_ITEM_FOOTER,
-        TXT_STATUSBAR_INFO_ITEM_NAME,
-        TXT_STATUSBAR_NOT_FOUND,
-        TXT_STATUSBAR_ITEM_NOT_FOUND,
-	TXT_STATUSBAR_UNKNOWN_COMMAND,
-        TXT_STATUSBAR_UNKNOWN_TYPE,
-	TXT_STATUSBAR_UNKNOWN_PLACEMENT,
-        TXT_STATUSBAR_UNKNOWN_VISIBILITY,
-
-	TXT_FILL_4,
-
-	TXT_PASTE_WARNING,
-	TXT_PASTE_PROMPT,
-
-	TXT_COUNT
-};
-
-extern FORMAT_REC gui_text_formats[TXT_COUNT+1];

From b15c27cc63fa967f3e8fe98fdc6d093dd8692c93 Mon Sep 17 00:00:00 2001
From: dx <dx@dxzone.com.ar>
Date: Tue, 10 Jan 2017 03:09:36 -0300
Subject: [PATCH 0500/1650] Revert "Don't reset wait_cmd during connection
 registration (fixes early ISON)"

---
 src/irc/core/irc-servers.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 7cbd05a0..3117e345 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -527,12 +527,6 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
 		return;
 	}
 
-	/* Don't reset wait_cmd during connection registration
-	 * (while sending CAP / SASL related commands) */
-	if (!server->connected) {
-		return;
-	}
-
 	g_get_current_time(&server->last_cmd);
 
 	/* A bit kludgy way to do the flood protection. In ircnet, there

From fe1ea4b80a3467c23b1ec2d30bdfe4cfaf9b94d6 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 12 Jan 2017 18:11:09 -0500
Subject: [PATCH 0501/1650] Fix fe-fuzz nits

---
 configure.ac        | 1 -
 src/fe-fuzz/irssi.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 03c7ddf5..8d1ba706 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,7 +650,6 @@ echo
 
 echo "Building text frontend ........... : $want_textui"
 echo "Building irssi bot ............... : $want_irssibot"
-echo "Building irssi fuzzer ............ : $want_irssifuzzer"
 echo "Building irssi proxy ............. : $want_irssiproxy"
 if test "x$have_gmodule" = "xyes"; then
 	echo "Building with module support ..... : yes"
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index 12c61147..77892aaf 100644
--- a/src/fe-fuzz/irssi.c
+++ b/src/fe-fuzz/irssi.c
@@ -28,7 +28,6 @@
 #include "args.h"
 #include "printtext.h"
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>

From 677fb1f55ca52d0e43c93f7d8361d333ff5bffd6 Mon Sep 17 00:00:00 2001
From: Hanno <hanno@gentoo.org>
Date: Sun, 15 Jan 2017 22:20:23 +0100
Subject: [PATCH 0502/1650] perl_parse needs NULL terminated parameter list.

---
 src/perl/perl-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 2c61df70..e4bde559 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -41,7 +41,7 @@ GSList *perl_scripts;
 PerlInterpreter *my_perl;
 
 static int print_script_errors;
-static char *perl_args[] = {"", "-e", "0"};
+static char *perl_args[] = {"", "-e", "0", NULL};
 
 #define IS_PERL_SCRIPT(file) \
 	(strlen(file) > 3 && g_strcmp0(file+strlen(file)-3, ".pl") == 0)
@@ -123,7 +123,7 @@ void perl_scripts_init(void)
 	my_perl = perl_alloc();
 	perl_construct(my_perl);
 
-	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args), perl_args, NULL);
+	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args)-1, perl_args, NULL);
 #if PERL_STATIC_LIBS == 1
 	perl_eval_pv("Irssi::Core::->boot_Irssi_Core(0.9);", TRUE);
 #endif

From c8dafe2a76f199f35e24440ca85796454717965e Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 16 Jan 2017 12:56:33 -0500
Subject: [PATCH 0503/1650] Add SUPPRESS_PRINTF_FALLBACK

There are some cases (such as fuzzing with fe-fuzz) where suppressing
printf output may be desirable.
---
 src/fe-common/core/printtext.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index ba6f3242..01ef2dcd 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -446,7 +446,9 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text)
 
 	if (dest->window == NULL) {
                 str = strip_codes(text);
+#ifndef SUPPRESS_PRINTF_FALLBACK
 		printf("NO WINDOWS: %s\n", str);
+#endif
                 g_free(str);
                 return;
 	}

From 6221ce520644efe4095bfecbc29f11c9c6962e0f Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 16 Jan 2017 13:04:54 -0500
Subject: [PATCH 0504/1650] Fix glib-2.0.m4 so that $PKG_CONFIG doesn't break
 configure script

If $PKG_CONFIG contains a space, then the test may not work, so
surround with quotation mark characters. (for example,
PKG_CONFIG="pkg-config --static" breaks configure before this commit).
---
 m4/glib-2.0.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
index 2c8760b7..5b7c84c0 100644
--- a/m4/glib-2.0.m4
+++ b/m4/glib-2.0.m4
@@ -43,7 +43,7 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run
   min_glib_version=ifelse([$1], ,2.0.0,$1)
   AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
 
-  if test x$PKG_CONFIG != xno ; then
+  if test "x$PKG_CONFIG" != xno ; then
     ## don't try to run the test against uninstalled libtool libs
     if $PKG_CONFIG --uninstalled $pkg_config_args; then
 	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"

From bc1ff509d2a9dc5592e7c2cb996d0c32cde026ff Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 19 Jan 2017 21:09:56 +0100
Subject: [PATCH 0505/1650] sync mail.pl

---
 scripts/mail.pl | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/scripts/mail.pl b/scripts/mail.pl
index 190c33af..ded02120 100644
--- a/scripts/mail.pl
+++ b/scripts/mail.pl
@@ -30,6 +30,7 @@ $VERSION = "2.92";
 # Check /mailbox help for help.
 
 use Irssi::TextUI;
+use Irssi;
 
 my $maildirmode = 0; # maildir=1, file(spools)=0
 my $old_is_not_new = 0; 
@@ -37,7 +38,7 @@ my $extprog;
 my ($last_refresh_time, $refresh_tag);
 
 # for mbox caching
-my $last_size, $last_mtime, $last_mailcount, $last_mode;
+my ($last_size, $last_mtime, $last_mailcount, $last_mode);
 
 # list of mailboxes
 my %mailboxes = (); 
@@ -101,8 +102,9 @@ sub mbox_count {
   my $old_is_not_new=Irssi::settings_get_bool('mail_oldnotnew');
 
   if ($extprog ne "") {
-     $total = `$extprog`;
-     chomp $unread;
+     my $total = `$extprog`;
+     chomp $total;
+     ($read, $unread) = split ' ', $total, 2;
   } else {
     if (!$maildirmode) {
       if (-f $mailfile) {
@@ -115,8 +117,7 @@ sub mbox_count {
 	$last_size = $size;
 	$last_mtime = $mtime;
 
-	my $f = gensym;
-	return 0 if (!open($f, "<", $mailfile));
+	return 0 if (!open(my $f, "<", $mailfile));
 
 	# count new mails only
 	my $internal_removed = 0;
@@ -205,7 +206,7 @@ sub mail {
   my $total = 0;
 
   # check all mailboxes for new email
-  foreach $name (keys(%mailboxes)) {
+  foreach my $name (keys(%mailboxes)) {
     my $box = $mailboxes{$name};
     # replace "~/" at the beginning by the user's home dir
     $box =~ s/^~\//$ENV{'HOME'}\//;
@@ -233,7 +234,7 @@ sub mail {
     # Show this only if there are any new, unread messages.
     if (Irssi::settings_get_bool('mail_show_message') &&
         $unread > $new_mails_in_box{$name}) {
-      $new_mails = $unread - $new_mails_in_box{$name};
+      my $new_mails = $unread - $new_mails_in_box{$name};
       if ($nummailboxes == 1) {
         Irssi::print("You have $new_mails new message" . ($new_mails != 1 ? "s." : "."), MSGLEVEL_CRAP);
       } else {
@@ -263,11 +264,9 @@ sub add_mailboxes {
   my $boxstring = $_[0];
   my @boxes = split(/,/, $boxstring);
 
-  foreach $dbox(@boxes) {
-    my $name = $dbox;
-    $name = substr($dbox, 0, index($dbox, '='));
-    my $box = $dbox;
-    $box = substr($dbox, index($dbox, '=') + 1, length($dbox));
+  foreach my $dbox(@boxes) {
+    my $name = substr($dbox, 0, index($dbox, '='));
+    my $box = substr($dbox, index($dbox, '=') + 1, length($dbox));
     addmailbox($name, $box);
   }
 }
@@ -306,7 +305,7 @@ sub delmailbox {
 sub update_settings_string {
   my $setting;
 
-  foreach $name (keys(%mailboxes)) {
+  foreach my $name (keys(%mailboxes)) {
     $setting .= $name . "=" . $mailboxes{$name} . ",";
   }
 
@@ -345,7 +344,7 @@ sub cmd_showmailboxes {
     return;
   }
   Irssi::print("Mailboxes:", MSGLEVEL_CRAP);
-  foreach $box (keys(%mailboxes)) {
+  foreach my $box (keys(%mailboxes)) {
     Irssi::print("$box: " . $mailboxes{$box}, MSGLEVEL_CRAP);
   }
 }

From 876c1dd93e06b9e627918f142f547e3deea682be Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 20 Jan 2017 10:32:23 +0100
Subject: [PATCH 0506/1650] implement break_wide

for more pleasant east asian mixed display
---
 src/fe-text/gui-windows.c     | 10 +++++++---
 src/fe-text/textbuffer-view.c | 12 +++++++++++-
 src/fe-text/textbuffer-view.h |  3 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 4213149d..c63c495c 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -49,6 +49,7 @@ static GUI_WINDOW_REC *gui_window_init(WINDOW_REC *window,
 					   settings_get_int("indent"),
 					   !settings_get_bool("indent_always"),
 					   get_default_indent_func());
+	textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
 	if (parent->active == window)
 		textbuffer_view_set_window(gui->view, parent->screen_win);
 	return gui;
@@ -201,12 +202,14 @@ void gui_windows_reset_settings(void)
 
 	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
 		WINDOW_REC *rec = tmp->data;
-                GUI_WINDOW_REC *gui = WINDOW_GUI(rec);
+		GUI_WINDOW_REC *gui = WINDOW_GUI(rec);
 
-                textbuffer_view_set_default_indent(gui->view,
+		textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
+
+		textbuffer_view_set_default_indent(gui->view,
 						   settings_get_int("indent"),
 						   !settings_get_bool("indent_always"),
-                                                   get_default_indent_func());
+						   get_default_indent_func());
 
 		textbuffer_view_set_scroll(gui->view,
 					   gui->use_scroll ? gui->scroll :
@@ -281,6 +284,7 @@ void gui_windows_init(void)
         settings_add_bool("lookandfeel", "autostick_split_windows", TRUE);
 	settings_add_int("lookandfeel", "indent", 10);
 	settings_add_bool("lookandfeel", "indent_always", FALSE);
+	settings_add_bool("lookandfeel", "break_wide", FALSE);
 	settings_add_bool("lookandfeel", "scroll", TRUE);
 
 	window_create_override = -1;
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index e2e3707b..486b7234 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -307,7 +307,7 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 			continue;
 		}
 
-		if (!view->utf8 && char_width > 1) {
+		if (view->break_wide && char_width > 1) {
 			last_space = xpos;
 			last_space_ptr = next_ptr;
 			last_color = color; last_fg24 = fg24; last_bg24 = bg24;
@@ -665,6 +665,16 @@ void textbuffer_view_set_default_indent(TEXT_BUFFER_VIEW_REC *view,
 	view->default_indent_func = indent_func;
 }
 
+/* Enable breaking of wide chars */
+void textbuffer_view_set_break_wide(TEXT_BUFFER_VIEW_REC *view,
+				    gboolean break_wide)
+{
+	if (view->break_wide != break_wide) {
+		view->break_wide = break_wide;
+		view_reset_cache(view);
+	}
+}
+
 static void view_unregister_indent_func(TEXT_BUFFER_VIEW_REC *view,
 					INDENT_FUNC indent_func)
 {
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index 21a9bde6..5e7a9d0a 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -59,6 +59,7 @@ struct _TEXT_BUFFER_VIEW_REC {
 	unsigned int longword_noindent:1;
 	unsigned int scroll:1; /* scroll down automatically when at bottom */
 	unsigned int utf8:1; /* use UTF8 in this view */
+	unsigned int break_wide:1; /* Break wide chars in this view */
 
 	TEXT_BUFFER_CACHE_REC *cache;
 	int ypos; /* cursor position - visible area is 0..height-1 */
@@ -97,6 +98,8 @@ void textbuffer_view_set_default_indent(TEXT_BUFFER_VIEW_REC *view,
 					int longword_noindent,
 					INDENT_FUNC indent_func);
 void textbuffer_views_unregister_indent_func(INDENT_FUNC indent_func);
+void textbuffer_view_set_break_wide(TEXT_BUFFER_VIEW_REC *view,
+				    gboolean break_wide);
 
 void textbuffer_view_set_scroll(TEXT_BUFFER_VIEW_REC *view, int scroll);
 void textbuffer_view_set_utf8(TEXT_BUFFER_VIEW_REC *view, int utf8);

From 697dd19d887c58930c76de68268d58f2251904d6 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 22 Jan 2017 21:49:37 +0100
Subject: [PATCH 0507/1650] Check whether the client certificate is expired.

Right now we only warn the user, the connection keeps going.
Fixes #211
---
 src/core/network-openssl.c | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 1eb85341..001e2d9d 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -420,16 +420,38 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 
 	if (mycert && *mycert) {
 		char *scert = NULL, *spkey = NULL;
+		FILE *fp;
 		scert = convert_home(mycert);
 		if (mypkey && *mypkey)
 			spkey = convert_home(mypkey);
-		ERR_clear_error();
-		if (! SSL_CTX_use_certificate_file(ctx, scert, SSL_FILETYPE_PEM))
-			g_warning("Loading of client certificate '%s' failed: %s", mycert, ERR_reason_error_string(ERR_get_error()));
-		else if (! SSL_CTX_use_PrivateKey_file(ctx, spkey ? spkey : scert, SSL_FILETYPE_PEM))
-			g_warning("Loading of private key '%s' failed: %s", mypkey ? mypkey : mycert, ERR_reason_error_string(ERR_get_error()));
-		else if (! SSL_CTX_check_private_key(ctx))
-			g_warning("Private key does not match the certificate");
+
+		if ((fp = fopen(scert, "r"))) {
+			X509 *cert;
+			/* Let's parse the certificate by hand instead of using
+			 * SSL_CTX_use_certificate_file so that we can validate
+			 * some parts of it. */
+			cert = PEM_read_X509(fp, NULL, get_pem_password_callback, (void *)mypass);
+			if (cert != NULL) {
+				/* Only the expiration date is checked right now */
+				if (X509_cmp_current_time(X509_get_notAfter(cert))  <= 0 ||
+				    X509_cmp_current_time(X509_get_notBefore(cert)) >= 0)
+					g_warning("The client certificate is expired");
+
+				ERR_clear_error();
+				if (! SSL_CTX_use_certificate(ctx, cert))
+					g_warning("Loading of client certificate '%s' failed: %s", mycert, ERR_reason_error_string(ERR_get_error()));
+				else if (! SSL_CTX_use_PrivateKey_file(ctx, spkey ? spkey : scert, SSL_FILETYPE_PEM))
+					g_warning("Loading of private key '%s' failed: %s", mypkey ? mypkey : mycert, ERR_reason_error_string(ERR_get_error()));
+				else if (! SSL_CTX_check_private_key(ctx))
+					g_warning("Private key does not match the certificate");
+
+				X509_free(cert);
+			} else
+				g_warning("Loading of client certificate '%s' failed: %s", mycert, ERR_reason_error_string(ERR_get_error()));
+
+			fclose(fp);
+		} else
+			g_warning("Could not find client certificate '%s'", scert);
 		g_free(scert);
 		g_free(spkey);
 	}

From 19c51789967a2f63da033e60f6ef08848b9cd144 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 24 Jan 2017 22:19:50 +0100
Subject: [PATCH 0508/1650] Prevent a memory leak during the processing of the
 SASL response.

We also get rid of an allocation in the process of doing so.
---
 src/irc/core/sasl.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 1021bea4..635b7dfb 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -174,10 +174,16 @@ static gboolean sasl_reassemble_incoming(IRC_SERVER_REC *server, const char *fra
 		*decoded = g_string_new_len("", 0);
 	} else {
 		gsize dec_len;
-		gchar *tmp;
+		gint state = 0;
+		guint save = 0;
 
-		tmp = (gchar *) g_base64_decode(enc_req->str, &dec_len);
-		*decoded = g_string_new_len(tmp, dec_len);
+		/* Since we're not going to use the enc_req GString anymore we
+		 * can perform the decoding in place. */
+		dec_len = g_base64_decode_step(enc_req->str, enc_req->len,
+					       (guchar *)enc_req->str,
+					       &state, &save);
+		/* A copy of the data is made when the GString is created. */
+		*decoded = g_string_new_len(enc_req->str, dec_len);
 	}
 
 	g_string_free(enc_req, TRUE);

From 73e8a065bd24092a03c0938eb6c93fec3ee0f4d9 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 23 Jan 2017 16:53:30 +0100
Subject: [PATCH 0509/1650] Support OpenSSL 1.1.0.

- X509_get_notBefore becomes X509_get0_notBefore
- X509_get_notAfter becomes X509_get0_notAfter
- ASN1_STRING_data becomes ASN1_STRING_get0_data (and drops the const)
- The whole library is now initialized by OPENSSL_init_ssl

Closes #597
---
 src/core/network-openssl.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 1eb85341..f193a61e 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -32,6 +32,17 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
+/* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+/* The two functions below could be already defined if OPENSSL_API_COMPAT is
+ * below the 1.1.0 version so let's do a clean start */
+#undef  X509_get_notBefore
+#undef  X509_get_notAfter
+#define X509_get_notBefore(x)     X509_get0_notBefore(x)
+#define X509_get_notAfter(x)      X509_get0_notAfter(x)
+#define ASN1_STRING_data(x)       ASN1_STRING_get0_data(x)
+#endif
+
 /* ssl i/o channel object */
 typedef struct
 {
@@ -352,13 +363,19 @@ static GIOFuncs irssi_ssl_channel_funcs = {
 
 static gboolean irssi_ssl_init(void)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+	if (!OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT, NULL)) {
+		g_error("Could not initialize OpenSSL");
+		return FALSE;
+	}
+#else
 	SSL_library_init();
 	SSL_load_error_strings();
 	OpenSSL_add_all_algorithms();
+#endif
 	ssl_inited = TRUE;
 
 	return TRUE;
-
 }
 
 static int get_pem_password_callback(char *buffer, int max_length, int rwflag, void *pass)

From 7c49ed2d17d2325d7bceef632ac38b66a44e8b63 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Jan 2017 12:44:02 +0100
Subject: [PATCH 0510/1650] Merge pull request #602 from McDutchie/master

make irssi --with-perl build with separate object directory
---
 src/perl/common/Makefile.PL.in | 2 +-
 src/perl/irc/Makefile.PL.in    | 2 +-
 src/perl/textui/Makefile.PL.in | 2 +-
 src/perl/ui/Makefile.PL.in     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/perl/common/Makefile.PL.in b/src/perl/common/Makefile.PL.in
index 84a80403..70b1d258 100644
--- a/src/perl/common/Makefile.PL.in
+++ b/src/perl/common/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi',
               'LIBS' => '',
diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in
index 0fbc5241..582160a0 100644
--- a/src/perl/irc/Makefile.PL.in
+++ b/src/perl/irc/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::Irc',
               'LIBS' => '',
diff --git a/src/perl/textui/Makefile.PL.in b/src/perl/textui/Makefile.PL.in
index 3541f75c..ffdda21a 100644
--- a/src/perl/textui/Makefile.PL.in
+++ b/src/perl/textui/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::TextUI',
               'LIBS' => '',
diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in
index ed87d528..ceed51c3 100644
--- a/src/perl/ui/Makefile.PL.in
+++ b/src/perl/ui/Makefile.PL.in
@@ -1,4 +1,4 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "../Makefile_silent.pm";
+use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
 
 WriteMakefile('NAME' => 'Irssi::UI',
               'LIBS' => '',

From 8dbf186ad6e808c269fa10c22444c89df63f2d7d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Jan 2017 16:37:09 +0100
Subject: [PATCH 0511/1650] Merge pull request #604 from dequis/solaris

Add OPENSSL_NO_EC for solaris 11.3, see issue #598
---
 src/core/network-openssl.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 7a1d6e34..1eb85341 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -646,7 +646,11 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 #ifdef SSL_get_server_tmp_key
 	// Show ephemeral key information.
 	EVP_PKEY *ephemeral_key = NULL;
+
+	// OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598
+#ifndef OPENSSL_NO_EC
 	EC_KEY *ec_key = NULL;
+#endif
 	char *ephemeral_key_algorithm = NULL;
 	char *cname = NULL;
 	int nid;
@@ -658,6 +662,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
 				break;
 
+#ifndef OPENSSL_NO_EC
 			case EVP_PKEY_EC:
 				ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
 				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
@@ -670,6 +675,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 
 				g_free_and_null(ephemeral_key_algorithm);
 				break;
+#endif
 
 			default:
 				tls_rec_set_ephemeral_key_algorithm(tls, "Unknown");

From 3a3b34fc633fe8e045bf4b696c41857c9f8c5ba5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Jan 2017 17:00:09 +0100
Subject: [PATCH 0512/1650] Merge pull request #606 from or4n/master

Fix syntax on /help SERVER example
---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 60870111..44de0efc 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -64,7 +64,7 @@
     /SERVER CONNECT chat.freenode.net
     /SERVER CONNECT +chat.freenode.net
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
-    /SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode -noproxy orwell.freenode.net
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
     /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
     /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE

From 929c9477477a4ccf03626388499192d8003b96d5 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Sun, 8 Jan 2017 21:55:39 +0100
Subject: [PATCH 0513/1650] Merge pull request #608 from tijko/master

Follow g_strsplit with call to g_strfreev
---
 src/irc/core/modes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index 207461cc..cc3d0faf 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -743,6 +743,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item,
 			    g_hash_table_lookup(optlist, "yes") == NULL) {
                                 /* too many matches */
 				g_string_free(str, TRUE);
+				g_strfreev(matches);
 				cmd_params_free(free_arg);
 
 				signal_emit("error command", 1,
@@ -756,7 +757,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item,
         if (str->len > 0) g_string_truncate(str, str->len-1);
 	ret = str->str;
 	g_string_free(str, FALSE);
-
+	g_strfreev(matches);
 	cmd_params_free(free_arg);
 
 	*ret_channel = channel;

From d63c93ae1dbb1254a92e8e4fafc39fe8d69d00ae Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Fri, 13 Jan 2017 22:36:44 +0100
Subject: [PATCH 0514/1650] Merge pull request #613 from
 ailin-nemui/fix_completion

fix regression in completion
---
 src/fe-common/core/completion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 76dfbb79..914ba80b 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -191,7 +191,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 				g_strdup_printf("%s%c%s",
 						/* do not accidentally duplicate the word separator */
 						line == wordstart - 1 ? "" : linestart,
-						wordstart[-1], word);
+						old_wordstart[-1], word);
 			g_free(old);
 
 			g_free(word);

From 1f42d2aa950e4d70bf4c4aebae3a7040bd710cf3 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Sun, 15 Jan 2017 22:33:42 +0100
Subject: [PATCH 0515/1650] Merge pull request #619 from hannob/master

perl_parse needs NULL terminated parameter list.
---
 src/perl/perl-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 2c61df70..e4bde559 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -41,7 +41,7 @@ GSList *perl_scripts;
 PerlInterpreter *my_perl;
 
 static int print_script_errors;
-static char *perl_args[] = {"", "-e", "0"};
+static char *perl_args[] = {"", "-e", "0", NULL};
 
 #define IS_PERL_SCRIPT(file) \
 	(strlen(file) > 3 && g_strcmp0(file+strlen(file)-3, ".pl") == 0)
@@ -123,7 +123,7 @@ void perl_scripts_init(void)
 	my_perl = perl_alloc();
 	perl_construct(my_perl);
 
-	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args), perl_args, NULL);
+	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args)-1, perl_args, NULL);
 #if PERL_STATIC_LIBS == 1
 	perl_eval_pv("Irssi::Core::->boot_Irssi_Core(0.9);", TRUE);
 #endif

From ca5e9bd623862bd9a640bf8799aafa53502b79f6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 21 Jan 2017 03:52:31 +0100
Subject: [PATCH 0516/1650] Merge pull request #624 from ailin-nemui/mail_pl

sync mail.pl
---
 scripts/mail.pl | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/scripts/mail.pl b/scripts/mail.pl
index 190c33af..ded02120 100644
--- a/scripts/mail.pl
+++ b/scripts/mail.pl
@@ -30,6 +30,7 @@ $VERSION = "2.92";
 # Check /mailbox help for help.
 
 use Irssi::TextUI;
+use Irssi;
 
 my $maildirmode = 0; # maildir=1, file(spools)=0
 my $old_is_not_new = 0; 
@@ -37,7 +38,7 @@ my $extprog;
 my ($last_refresh_time, $refresh_tag);
 
 # for mbox caching
-my $last_size, $last_mtime, $last_mailcount, $last_mode;
+my ($last_size, $last_mtime, $last_mailcount, $last_mode);
 
 # list of mailboxes
 my %mailboxes = (); 
@@ -101,8 +102,9 @@ sub mbox_count {
   my $old_is_not_new=Irssi::settings_get_bool('mail_oldnotnew');
 
   if ($extprog ne "") {
-     $total = `$extprog`;
-     chomp $unread;
+     my $total = `$extprog`;
+     chomp $total;
+     ($read, $unread) = split ' ', $total, 2;
   } else {
     if (!$maildirmode) {
       if (-f $mailfile) {
@@ -115,8 +117,7 @@ sub mbox_count {
 	$last_size = $size;
 	$last_mtime = $mtime;
 
-	my $f = gensym;
-	return 0 if (!open($f, "<", $mailfile));
+	return 0 if (!open(my $f, "<", $mailfile));
 
 	# count new mails only
 	my $internal_removed = 0;
@@ -205,7 +206,7 @@ sub mail {
   my $total = 0;
 
   # check all mailboxes for new email
-  foreach $name (keys(%mailboxes)) {
+  foreach my $name (keys(%mailboxes)) {
     my $box = $mailboxes{$name};
     # replace "~/" at the beginning by the user's home dir
     $box =~ s/^~\//$ENV{'HOME'}\//;
@@ -233,7 +234,7 @@ sub mail {
     # Show this only if there are any new, unread messages.
     if (Irssi::settings_get_bool('mail_show_message') &&
         $unread > $new_mails_in_box{$name}) {
-      $new_mails = $unread - $new_mails_in_box{$name};
+      my $new_mails = $unread - $new_mails_in_box{$name};
       if ($nummailboxes == 1) {
         Irssi::print("You have $new_mails new message" . ($new_mails != 1 ? "s." : "."), MSGLEVEL_CRAP);
       } else {
@@ -263,11 +264,9 @@ sub add_mailboxes {
   my $boxstring = $_[0];
   my @boxes = split(/,/, $boxstring);
 
-  foreach $dbox(@boxes) {
-    my $name = $dbox;
-    $name = substr($dbox, 0, index($dbox, '='));
-    my $box = $dbox;
-    $box = substr($dbox, index($dbox, '=') + 1, length($dbox));
+  foreach my $dbox(@boxes) {
+    my $name = substr($dbox, 0, index($dbox, '='));
+    my $box = substr($dbox, index($dbox, '=') + 1, length($dbox));
     addmailbox($name, $box);
   }
 }
@@ -306,7 +305,7 @@ sub delmailbox {
 sub update_settings_string {
   my $setting;
 
-  foreach $name (keys(%mailboxes)) {
+  foreach my $name (keys(%mailboxes)) {
     $setting .= $name . "=" . $mailboxes{$name} . ",";
   }
 
@@ -345,7 +344,7 @@ sub cmd_showmailboxes {
     return;
   }
   Irssi::print("Mailboxes:", MSGLEVEL_CRAP);
-  foreach $box (keys(%mailboxes)) {
+  foreach my $box (keys(%mailboxes)) {
     Irssi::print("$box: " . $mailboxes{$box}, MSGLEVEL_CRAP);
   }
 }

From 97b182089eec8cc158313c424b453dcaa39e05af Mon Sep 17 00:00:00 2001
From: Nei <ailin.nemui@gmail.com>
Date: Fri, 3 Feb 2017 11:49:16 +0000
Subject: [PATCH 0517/1650] Merge branch 'dub-the-wub' into 'master'

Prevent a memory leak during the processing of the SASL response.

See merge request !8
---
 src/irc/core/sasl.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 1021bea4..635b7dfb 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -174,10 +174,16 @@ static gboolean sasl_reassemble_incoming(IRC_SERVER_REC *server, const char *fra
 		*decoded = g_string_new_len("", 0);
 	} else {
 		gsize dec_len;
-		gchar *tmp;
+		gint state = 0;
+		guint save = 0;
 
-		tmp = (gchar *) g_base64_decode(enc_req->str, &dec_len);
-		*decoded = g_string_new_len(tmp, dec_len);
+		/* Since we're not going to use the enc_req GString anymore we
+		 * can perform the decoding in place. */
+		dec_len = g_base64_decode_step(enc_req->str, enc_req->len,
+					       (guchar *)enc_req->str,
+					       &state, &save);
+		/* A copy of the data is made when the GString is created. */
+		*decoded = g_string_new_len(enc_req->str, dec_len);
 	}
 
 	g_string_free(enc_req, TRUE);

From 8ec923082737276bce122e082998928ac038bf7f Mon Sep 17 00:00:00 2001
From: Paolo <mrtnpaolo@gmail.com>
Date: Sun, 5 Feb 2017 01:03:02 +0100
Subject: [PATCH 0518/1650] Make themes' docs more consistent.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mentioning "sb-item" was misleading in that there is no such template,
nor any occurrence of that exact string anywhere else in the source.

In going from `sb-item` to `"sb"` I am following the pattern established
in a couple of comments above:

	"msgownnick" specifies the styling …
	"ownmsgnick" specifies …
---
 colorless.theme | 4 ++--
 default.theme   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/colorless.theme b/colorless.theme
index 668866f5..1b26f628 100644
--- a/colorless.theme
+++ b/colorless.theme
@@ -261,8 +261,8 @@ abstracts = {
   # background for topicbar (same default)
   #sb_topic_bg = "%8";
 
-  # text at the beginning of statusbars. sb-item already puts
-  # space there,so we don't use anything by default.
+  # text at the beginning of statusbars. "sb" already puts a space there,
+  # so we don't use anything by default.
   sbstart = "";
   # text at the end of statusbars. Use space so that it's never
   # used for anything.
diff --git a/default.theme b/default.theme
index 6b6aeab8..956d7c4f 100644
--- a/default.theme
+++ b/default.theme
@@ -261,8 +261,8 @@ abstracts = {
   # background for topicbar (same default)
   #sb_topic_bg = "%4";
 
-  # text at the beginning of statusbars. sb-item already puts
-  # space there,so we don't use anything by default.
+  # text at the beginning of statusbars. "sb" already puts a space there,
+  # so we don't use anything by default.
   sbstart = "";
   # text at the end of statusbars. Use space so that it's never
   # used for anything.

From 99e3d8a30bdf68775825eb79e5c29f3af12cd255 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 3 Feb 2017 20:46:20 +0100
Subject: [PATCH 0519/1650] tag as 1.0.1

---
 NEWS         | 9 +++++++++
 configure.ac | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9604277a..f2af5810 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+v1.0.1 2017-02-03  The Irssi team <staff@irssi.org>
+	- Fix Perl compilation in object dir. By Martijn Dekker (#602, #623).
+	- Disable EC cryptography on Solaris to fix build (#604, #598).
+	- Fix incorrect HELP SERVER example (#606, #519).
+	- Correct memory leak in /OP and /VOICE. By Tim Konick (#608).
+	- Fix regression that broke second level completion (#613, #609).
+	- Correct missing NULL termination in perl_parse. By Hanno Böck (#619).
+	- Sync broken mail.pl script (#624, #607).
+
 v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
 	* Removed --disable-ipv6 (#408).
 	* /connect Network now aborts with an error if no servers have been
diff --git a/configure.ac b/configure.ac
index 4aa1f3cc..4a96920c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.0.0)
+AC_INIT(irssi, 1.0.1)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 28df637055bc6f20f26ec40158f428ed4dac3c3d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 16 Jan 2017 20:04:11 +0100
Subject: [PATCH 0520/1650] provide net_start_ssl api

fixes #615
---
 src/common.h               |  2 +-
 src/core/network-openssl.c | 16 ++++++++++++++++
 src/core/network.h         |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 43596580..646b7e1a 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 7
+#define IRSSI_ABI_VERSION 8
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 1eb85341..aab9176d 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include "network.h"
+#include "net-sendbuffer.h"
 #include "misc.h"
 #include "servers.h"
 #include "signals.h"
@@ -701,6 +702,21 @@ GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *
 	return ssl_handle;
 }
 
+GIOChannel *net_start_ssl(SERVER_REC *server)
+{
+	GIOChannel *handle, *ssl_handle;
+
+	g_return_val_if_fail(server != NULL, NULL);
+
+	handle = net_sendbuffer_handle(server->handle);
+	if (handle == NULL)
+		return NULL;
+
+	ssl_handle  = irssi_ssl_get_iochannel(handle, server->connrec->port, server);
+	return ssl_handle;
+}
+
+
 int irssi_ssl_handshake(GIOChannel *handle)
 {
 	GIOSSLChannel *chan = (GIOSSLChannel *)handle;
diff --git a/src/core/network.h b/src/core/network.h
index 03f3b813..8757f78c 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -40,6 +40,9 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip) G_GNUC_DEPRECATED;
 /* Connect to socket with ip address and SSL*/
 GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server);
+/* Start TLS */
+GIOChannel *net_start_ssl(SERVER_REC *server);
+
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
 GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);

From 15736ba5ab63d62bfbf8c7907835e5530ba58311 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 11 Feb 2017 00:07:03 -0300
Subject: [PATCH 0521/1650] notify-ison: Don't send ison before the connection
 is done

---
 src/irc/notifylist/notify-ison.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index f9ca7b37..8a8865cc 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -80,6 +80,10 @@ static void ison_send(IRC_SERVER_REC *server, GString *cmd)
 {
 	MODULE_SERVER_REC *mserver;
 
+	if (!server->connected) {
+		return;
+	}
+
 	mserver = MODULE_DATA(server);
 	mserver->ison_count++;
 

From 98ead50b4eea7cda4b357f1c4b19a741205c6fa4 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 14 Feb 2017 13:38:59 +0100
Subject: [PATCH 0522/1650] Prevent some potential null-pointer deferences.

Spotted by our friend scan-build.
---
 src/fe-common/core/fe-channels.c | 2 +-
 src/fe-common/irc/fe-netsplit.c  | 2 ++
 src/fe-text/mainwindows-layout.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 00aac885..8e434ab5 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -453,7 +453,7 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
 		}
 	}
 
-	if (str->len > strlen(prefix_format)) {
+	if (prefix_format != NULL && str->len > strlen(prefix_format)) {
 		printtext(channel->server, channel->visible_name,
 		          MSGLEVEL_CLIENTCRAP, "%s", str->str);
 	}
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index 17fb1994..4c69dd10 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -148,6 +148,8 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, con
 	char *sourceserver;
 	GSList *tmp;
 
+	g_return_if_fail(rec->servers != NULL);
+
 	destservers = g_string_new(NULL);
 	for (tmp = rec->servers; tmp != NULL; tmp = tmp->next) {
 		NETSPLIT_SERVER_REC *rec = tmp->data;
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index 020969e6..fae02539 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -121,6 +121,8 @@ static void sig_layout_restore(void)
 	if (node == NULL) return;
 
 	sorted_config = get_sorted_windows_config(node);
+	if (sorted_config == NULL) return;
+
         windows_count = g_slist_length(sorted_config);
 
         /* calculate the saved terminal height */

From c067f8e99b9332ca485bf1e1809b745878c80f4a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 14 Feb 2017 22:04:35 +0100
Subject: [PATCH 0523/1650] Do not alias /server <hostname> to /server connect
 <hostname>

Closes #559.
---
 docs/help/in/server.in   |  2 --
 src/core/chat-commands.c | 19 ++++++-------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 44de0efc..2e757260 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -59,8 +59,6 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER chat.freenode.net
-    /SERVER +chat.freenode.net
     /SERVER CONNECT chat.freenode.net
     /SERVER CONNECT +chat.freenode.net
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index c737b810..69c2fc91 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -250,19 +250,14 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }
 
-static void sig_default_command_server(const char *data, SERVER_REC *server,
-				       WI_ITEM_REC *item)
-{
-        signal_emit("command server connect", 3, data, server, item);
-}
-
-/* SYNTAX: SERVER [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
-                  [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
-                  [-ssl_ciphers <list>]
-                  [-!] [-noautosendcmd]
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] 
+		  [-ssl_pass <password>] [-ssl_verify] [-ssl_cafile <cafile>] 
+		  [-ssl_capath <capath>]
+		  [-ssl_ciphers <list>]
+		  [-!] [-noautosendcmd]
 		  [-noproxy] [-network <network>] [-host <hostname>]
 		  [-rawlog <file>]
-                  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
+		  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_server_connect(const char *data, SERVER_REC *server)
 {
@@ -495,7 +490,6 @@ void chat_commands_init(void)
 	command_bind("foreach channel", NULL, (SIGNAL_FUNC) cmd_foreach_channel);
 	command_bind("foreach query", NULL, (SIGNAL_FUNC) cmd_foreach_query);
 
-	signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server);
 	signal_add("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
 
 	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_pinned_cert +ssl_pinned_pubkey tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey +host noproxy -rawlog noautosendcmd");
@@ -515,6 +509,5 @@ void chat_commands_deinit(void)
 	command_unbind("foreach channel", (SIGNAL_FUNC) cmd_foreach_channel);
 	command_unbind("foreach query", (SIGNAL_FUNC) cmd_foreach_query);
 
-        signal_remove("default command server", (SIGNAL_FUNC) sig_default_command_server);
 	signal_remove("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
 }

From 9cae98e6421cb454ecc9b3b48d06cce5a042bb6a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 10 Feb 2017 13:59:50 +0100
Subject: [PATCH 0524/1650] Execute what's left in the input queue when the
 timeout expires.

Similar to how vim behaves.
---
 src/fe-common/core/keyboard.c | 46 ++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index fed7f9cb..6f7907eb 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -35,6 +35,7 @@
 
 GSList *keyinfos;
 static GHashTable *keys, *default_keys;
+static int key_timeout;
 
 /* A cache of some sort for key presses that generate a single char only.
    If the key isn't used, used_keys[key] is zero. */
@@ -48,7 +49,8 @@ static int key_config_frozen;
 
 struct _KEYBOARD_REC {
 	char *key_state; /* the ongoing key combo */
-        void *gui_data; /* GUI specific data sent in "key pressed" signal */
+	guint timer_tag; /* used to check when a pending combo has expired */
+	void *gui_data; /* GUI specific data sent in "key pressed" signal */
 };
 
 /* Creates a new "keyboard" - this is used only for keeping track of
@@ -60,6 +62,7 @@ KEYBOARD_REC *keyboard_create(void *data)
 
 	rec = g_new0(KEYBOARD_REC, 1);
 	rec->gui_data = data;
+	rec->timer_tag = 0;
 
 	signal_emit("keyboard created", 1, rec);
         return rec;
@@ -68,6 +71,11 @@ KEYBOARD_REC *keyboard_create(void *data)
 /* Destroys a keyboard */
 void keyboard_destroy(KEYBOARD_REC *keyboard)
 {
+	if (keyboard->timer_tag > 0) {
+		g_source_remove(keyboard->timer_tag);
+		keyboard->timer_tag = 0;
+	}
+
 	signal_emit("keyboard destroyed", 1, keyboard);
 
         g_free_not_null(keyboard->key_state);
@@ -592,6 +600,25 @@ static int key_states_search(const unsigned char *combo,
         return 0;
 }
 
+static gboolean key_timeout_expired(KEYBOARD_REC *keyboard)
+{
+	KEY_REC *rec;
+
+	keyboard->timer_tag = 0;
+
+	/* So, the timeout has expired with the input queue full, let's see if
+	 * what we've got is bound to some action. */
+	rec = g_tree_lookup(key_states, keyboard->key_state);
+	/* Drain the queue anyway. */
+	g_free_and_null(keyboard->key_state);
+
+	if (rec != NULL) {
+		(void)key_emit_signal(keyboard, rec);
+	}
+
+	return FALSE;
+}
+
 int key_pressed(KEYBOARD_REC *keyboard, const char *key)
 {
 	KEY_REC *rec;
@@ -601,6 +628,11 @@ int key_pressed(KEYBOARD_REC *keyboard, const char *key)
 	g_return_val_if_fail(keyboard != NULL, FALSE);
 	g_return_val_if_fail(key != NULL && *key != '\0', FALSE);
 
+	if (keyboard->timer_tag > 0) {
+		g_source_remove(keyboard->timer_tag);
+		keyboard->timer_tag = 0;
+	}
+
 	if (keyboard->key_state == NULL && key[1] == '\0' &&
 	    !used_keys[(int) (unsigned char) key[0]]) {
 		/* fast check - key not used */
@@ -625,6 +657,13 @@ int key_pressed(KEYBOARD_REC *keyboard, const char *key)
 	if (g_tree_lookup(key_states, combo) != rec) {
 		/* key combo continues.. */
 		keyboard->key_state = combo;
+		/* respect the timeout if specified by the user */
+		if (key_timeout > 0) {
+			keyboard->timer_tag =
+				g_timeout_add(key_timeout,
+					      (GSourceFunc) key_timeout_expired,
+					      keyboard);
+		}
                 return 0;
 	}
 
@@ -870,6 +909,9 @@ static void read_keyboard_config(void)
 		key_config_read(tmp->data);
 
         key_configure_thaw();
+
+	/* any positive value other than 0 enables the timeout (in ms). */
+	key_timeout = settings_get_int("key_timeout");
 }
 
 void keyboard_init(void)
@@ -883,6 +925,8 @@ void keyboard_init(void)
         key_config_frozen = 0;
 	memset(used_keys, 0, sizeof(used_keys));
 
+	settings_add_int("misc", "key_timeout", 0);
+
 	key_bind("command", "Run any command", NULL, NULL, (SIGNAL_FUNC) sig_command);
 	key_bind("key", "Specify name for key binding", NULL, NULL, (SIGNAL_FUNC) sig_key);
 	key_bind("multi", "Run multiple commands", NULL, NULL, (SIGNAL_FUNC) sig_multi);

From db85ab7c90f23e00cd444728f6a5b3d1f63254df Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 21 Feb 2017 15:17:37 +0100
Subject: [PATCH 0525/1650] Quote the filename when dcc requests are auto
 accepted.

PR #453 forces the user to quote the filenames given to /DCC commands
when they contain spaces but the autoget functionality didn't get
updated so the filename was always passed without quotes.

Closes #656.
---
 src/irc/dcc/dcc-autoget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index de23a5d1..995b3e04 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -70,7 +70,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 	file = dcc_get_download_path(dcc->arg);
 	str = g_strdup_printf(settings_get_bool("dcc_autoresume") &&
 			      stat(file, &statbuf) == 0 ?
-			      "RESUME %s %s" : "GET %s %s",
+			      "RESUME %s \"%s\"" : "GET %s \"%s\"",
 			      dcc->nick, dcc->arg);
 	signal_emit("command dcc", 2, str, dcc->server);
         g_free(file);

From 027acffb4208d7e6ba8e229cbf6c3dae6f5dabaf Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 21 Feb 2017 15:54:31 +0100
Subject: [PATCH 0526/1650] Handle file names with quotes.

Let's repurpose escape_string and make it more flexible by letting us
choose the characters to escape.
---
 src/core/misc.c                      | 20 +++++++++++---------
 src/core/misc.h                      |  4 ++--
 src/fe-common/core/chat-completion.c |  2 +-
 src/irc/dcc/dcc-autoget.c            |  8 ++++++--
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 1cfa15b6..03fcce59 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -724,18 +724,20 @@ int expand_escape(const char **data)
 	}
 }
 
-/* Escape all '"', "'" and '\' chars with '\' */
-char *escape_string(const char *str)
+/* Escape all the characters in `what' with a backslash */
+char *escape_string(const char *str, const char *what)
 {
-	char *ret, *p;
+	const char *p;
+	char *ret;
 
-	p = ret = g_malloc(strlen(str)*2+1);
-	while (*str != '\0') {
-		if (*str == '"' || *str == '\'' || *str == '\\')
-			*p++ = '\\';
-		*p++ = *str++;
+	ret = g_malloc(strlen(str) * 2 + 1);
+	for (p = str; *p != '\0'; p++, ret++) {
+		if (strchr(what, *p) != NULL) {
+			*ret++ = '\\';
+		}
+		*ret = *p;
 	}
-	*p = '\0';
+	*ret = '\0';
 
 	return ret;
 }
diff --git a/src/core/misc.h b/src/core/misc.h
index 00637da0..9e620169 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -88,8 +88,8 @@ char *stristr_full(const char *data, const char *key);
 char *ascii_strup(char *str);
 char *ascii_strdown(char *str);
 
-/* Escape all '"', "'" and '\' chars with '\' */
-char *escape_string(const char *str);
+/* Escape all the characters in `what' with a backslash */
+char *escape_string(const char *str, const char *what);
 
 /* convert all low-ascii (<32) to ^<A..> combinations */
 char *show_lowascii(const char *str);
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 1f00feaf..4fe9509a 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -1113,7 +1113,7 @@ static void event_text(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	/* the nick is quoted in case it contains '-' character. also
 	   spaces should work too now :) The nick is also escaped in case
 	   it contains '\' characters */
-	target = escape_string(window_item_get_target(item));
+	target = escape_string(window_item_get_target(item), "\"'\\");
 	str = g_strdup_printf(IS_CHANNEL(item) ? "-channel \"%s\" %s" :
 			      IS_QUERY(item) ? "-nick \"%s\" %s" : "%s %s",
 			      target, line);
diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index 995b3e04..21417211 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -23,6 +23,7 @@
 #include "masks.h"
 #include "settings.h"
 #include "servers.h"
+#include "misc.h"
 
 #include "dcc-get.h"
 
@@ -30,7 +31,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 {
         struct stat statbuf;
 	const char *masks;
-        char *str, *file;
+        char *str, *file, *esc_arg;
         int max_size;
 
         if (!IS_DCC_GET(dcc)) return;
@@ -68,11 +69,14 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 
 	/* ok. but do we want/need to resume? */
 	file = dcc_get_download_path(dcc->arg);
+	/* we have to escape the quotes as the whole file name gets quoted */
+	esc_arg = escape_string(dcc->arg, "\"");
 	str = g_strdup_printf(settings_get_bool("dcc_autoresume") &&
 			      stat(file, &statbuf) == 0 ?
 			      "RESUME %s \"%s\"" : "GET %s \"%s\"",
-			      dcc->nick, dcc->arg);
+			      dcc->nick, esc_arg);
 	signal_emit("command dcc", 2, str, dcc->server);
+	g_free(esc_arg);
         g_free(file);
 	g_free(str);
 }

From 9aaa6449a0a554c83d40b56ce0a87bd0cba8bdbf Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 27 Feb 2017 13:43:58 +0100
Subject: [PATCH 0527/1650] make foreach send commands

---
 src/core/chat-commands.c             | 43 ++++++++++++++++++++++------
 src/fe-common/core/window-commands.c | 18 ++++++++----
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 69c2fc91..e86fdf9d 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -438,41 +438,66 @@ static void cmd_foreach(const char *data, SERVER_REC *server,
 /* SYNTAX: FOREACH SERVER <command> */
 static void cmd_foreach_server(const char *data, SERVER_REC *server)
 {
-        GSList *list;
+	GSList *list;
+	const char *cmdchars;
+	char *str;
+
+	cmdchars = settings_get_str("cmdchars");
+	str = strchr(cmdchars, *data) != NULL ? g_strdup(data) :
+		g_strdup_printf("%c%s", *cmdchars, data);
 
 	list = g_slist_copy(servers);
 	while (list != NULL) {
-		signal_emit("send command", 3, data, list->data, NULL);
-                list = g_slist_remove(list, list->data);
+		signal_emit("send command", 3, str, list->data, NULL);
+		list = g_slist_remove(list, list->data);
 	}
+
+	g_free(str);
 }
 
 /* SYNTAX: FOREACH CHANNEL <command> */
 static void cmd_foreach_channel(const char *data)
 {
-        GSList *list;
+	GSList *list;
+	const char *cmdchars;
+	char *str;
+
+	cmdchars = settings_get_str("cmdchars");
+	str = strchr(cmdchars, *data) != NULL ? g_strdup(data) :
+		g_strdup_printf("%c%s", *cmdchars, data);
 
 	list = g_slist_copy(channels);
 	while (list != NULL) {
 		CHANNEL_REC *rec = list->data;
 
-		signal_emit("send command", 3, data, rec->server, rec);
-                list = g_slist_remove(list, list->data);
+		signal_emit("send command", 3, str, rec->server, rec);
+		list = g_slist_remove(list, list->data);
 	}
+
+	g_free(str);
 }
 
 /* SYNTAX: FOREACH QUERY <command> */
 static void cmd_foreach_query(const char *data)
 {
-        GSList *list;
+	GSList *list;
+	const char *cmdchars;
+	char *str;
+
+	cmdchars = settings_get_str("cmdchars");
+	str = strchr(cmdchars, *data) != NULL ? g_strdup(data) :
+		g_strdup_printf("%c%s", *cmdchars, data);
+
 
 	list = g_slist_copy(queries);
 	while (list != NULL) {
 		QUERY_REC *rec = list->data;
 
-		signal_emit("send command", 3, data, rec->server, rec);
-                list = g_slist_remove(list, list->data);
+		signal_emit("send command", 3, str, rec->server, rec);
+		list = g_slist_remove(list, list->data);
 	}
+
+	g_free(str);
 }
 
 void chat_commands_init(void)
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 9e4aab3a..57c81ac2 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -839,23 +839,31 @@ static void cmd_layout(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 /* SYNTAX: FOREACH WINDOW <command> */
 static void cmd_foreach_window(const char *data)
 {
-        WINDOW_REC *old;
-        GSList *list;
+	WINDOW_REC *old;
+	GSList *list;
+	const char *cmdchars;
+	char *str;
 
-        old = active_win;
+	cmdchars = settings_get_str("cmdchars");
+	str = strchr(cmdchars, *data) != NULL ? g_strdup(data) :
+		g_strdup_printf("%c%s", *cmdchars, data);
+
+	old = active_win;
 
 	list = g_slist_copy(windows);
 	while (list != NULL) {
 		WINDOW_REC *rec = list->data;
 
 		active_win = rec;
-		signal_emit("send command", 3, data, rec->active_server,
+		signal_emit("send command", 3, str, rec->active_server,
 			    rec->active);
-                list = g_slist_remove(list, list->data);
+		list = g_slist_remove(list, list->data);
 	}
 
 	if (g_slist_find(windows, old) != NULL)
 		active_win = old;
+
+	g_free(str);
 }
 
 void window_commands_init(void)

From 7c09b72848f99886964266ff531b41c69fe138f5 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 27 Feb 2017 23:42:57 -0300
Subject: [PATCH 0528/1650] fe-netjoin: remove irc servers on "server
 disconnected" signal

---
 src/fe-common/irc/fe-netjoin.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 4eb388c0..8272093f 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -470,6 +470,20 @@ static void read_settings(void)
 	}
 }
 
+static void sig_server_disconnected(IRC_SERVER_REC *server)
+{
+	NETJOIN_SERVER_REC *netjoin_server;
+
+	g_return_if_fail(server != NULL);
+
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	if ((netjoin_server = netjoin_find_server(server))) {
+		netjoin_server_remove(netjoin_server);
+	}
+}
+
 void fe_netjoin_init(void)
 {
 	settings_add_bool("misc", "hide_netsplit_quits", TRUE);
@@ -480,6 +494,7 @@ void fe_netjoin_init(void)
 
 	read_settings();
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_add("server disconnected", (SIGNAL_FUNC) sig_server_disconnected);
 }
 
 void fe_netjoin_deinit(void)
@@ -492,6 +507,7 @@ void fe_netjoin_deinit(void)
 	}
 
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_remove("server disconnected", (SIGNAL_FUNC) sig_server_disconnected);
 
 	signal_remove("message quit", (SIGNAL_FUNC) msg_quit);
 	signal_remove("message join", (SIGNAL_FUNC) msg_join);

From 5c4e6304ce12a3c94cc58eec01d4ef45db4dabc3 Mon Sep 17 00:00:00 2001
From: Stephen Oberholtzer <stevie@qrpff.net>
Date: Tue, 28 Feb 2017 23:48:56 -0500
Subject: [PATCH 0529/1650] Don't emit the script destroyed signal before
 script is actually destroyed

The script unloading code originally worked like this:

1. Destroy package
2. Emit 'script destroyed' signal
3. Unhook script's signal handlers

If a script added a 'script destroyed' signal handler, unloading
that script would cause the 'script destroyed' signal to be sent to the
(already destroyed) package.  This would cause a script error, which would
trigger a script unload, which would start the whole process over again,
until we run out of heap or stack space and segfault.

This commit simply reorders the operations so that the 'script destroyed'
signal is sent *after* the script is fully destroyed.
---
 src/perl/perl-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index e4bde559..39389157 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -67,11 +67,11 @@ static void perl_script_destroy(PERL_SCRIPT_REC *script)
 {
 	perl_scripts = g_slist_remove(perl_scripts, script);
 
-	signal_emit("script destroyed", 1, script);
-
 	perl_signal_remove_script(script);
 	perl_source_remove_script(script);
 
+	signal_emit("script destroyed", 1, script);
+
 	g_free(script->name);
 	g_free(script->package);
         g_free_not_null(script->path);

From dc99f8d7a5f90eebd4c52cef8d186bf20e2a9912 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 15 Feb 2017 14:19:36 +0100
Subject: [PATCH 0530/1650] Properly check the command arguments in tail place.

A command requiring an argument and given in tail position would not
raise an error but silently set the value to the empty string ''.
---
 src/core/commands.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/commands.c b/src/core/commands.c
index 607baf77..8e21a88a 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -567,13 +567,14 @@ static int get_cmd_options(char **data, int ignore_unknown,
 
 	option = NULL; pos = -1;
 	for (;;) {
-		if (**data == '-') {
+		if (**data == '\0' || **data == '-') {
 			if (option != NULL && *optlist[pos] == '+') {
 				/* required argument missing! */
                                 *data = optlist[pos] + 1;
 				return CMDERR_OPTION_ARG_MISSING;
 			}
-
+		}
+		if (**data == '-') {
 			(*data)++;
 			if (**data == '-' && (*data)[1] == ' ') {
 				/* -- option means end of options even

From 62fd3ac1804d5d45bc2302ceac9ee9c7ef372e1a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 6 Mar 2017 11:27:55 +0100
Subject: [PATCH 0531/1650] Revert "Quote the filename when dcc requests are
 auto accepted."

---
 src/core/misc.c                      | 20 +++++++++-----------
 src/core/misc.h                      |  4 ++--
 src/fe-common/core/chat-completion.c |  2 +-
 src/irc/dcc/dcc-autoget.c            | 10 +++-------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 03fcce59..1cfa15b6 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -724,20 +724,18 @@ int expand_escape(const char **data)
 	}
 }
 
-/* Escape all the characters in `what' with a backslash */
-char *escape_string(const char *str, const char *what)
+/* Escape all '"', "'" and '\' chars with '\' */
+char *escape_string(const char *str)
 {
-	const char *p;
-	char *ret;
+	char *ret, *p;
 
-	ret = g_malloc(strlen(str) * 2 + 1);
-	for (p = str; *p != '\0'; p++, ret++) {
-		if (strchr(what, *p) != NULL) {
-			*ret++ = '\\';
-		}
-		*ret = *p;
+	p = ret = g_malloc(strlen(str)*2+1);
+	while (*str != '\0') {
+		if (*str == '"' || *str == '\'' || *str == '\\')
+			*p++ = '\\';
+		*p++ = *str++;
 	}
-	*ret = '\0';
+	*p = '\0';
 
 	return ret;
 }
diff --git a/src/core/misc.h b/src/core/misc.h
index 9e620169..00637da0 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -88,8 +88,8 @@ char *stristr_full(const char *data, const char *key);
 char *ascii_strup(char *str);
 char *ascii_strdown(char *str);
 
-/* Escape all the characters in `what' with a backslash */
-char *escape_string(const char *str, const char *what);
+/* Escape all '"', "'" and '\' chars with '\' */
+char *escape_string(const char *str);
 
 /* convert all low-ascii (<32) to ^<A..> combinations */
 char *show_lowascii(const char *str);
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 4fe9509a..1f00feaf 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -1113,7 +1113,7 @@ static void event_text(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	/* the nick is quoted in case it contains '-' character. also
 	   spaces should work too now :) The nick is also escaped in case
 	   it contains '\' characters */
-	target = escape_string(window_item_get_target(item), "\"'\\");
+	target = escape_string(window_item_get_target(item));
 	str = g_strdup_printf(IS_CHANNEL(item) ? "-channel \"%s\" %s" :
 			      IS_QUERY(item) ? "-nick \"%s\" %s" : "%s %s",
 			      target, line);
diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index 21417211..de23a5d1 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -23,7 +23,6 @@
 #include "masks.h"
 #include "settings.h"
 #include "servers.h"
-#include "misc.h"
 
 #include "dcc-get.h"
 
@@ -31,7 +30,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 {
         struct stat statbuf;
 	const char *masks;
-        char *str, *file, *esc_arg;
+        char *str, *file;
         int max_size;
 
         if (!IS_DCC_GET(dcc)) return;
@@ -69,14 +68,11 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 
 	/* ok. but do we want/need to resume? */
 	file = dcc_get_download_path(dcc->arg);
-	/* we have to escape the quotes as the whole file name gets quoted */
-	esc_arg = escape_string(dcc->arg, "\"");
 	str = g_strdup_printf(settings_get_bool("dcc_autoresume") &&
 			      stat(file, &statbuf) == 0 ?
-			      "RESUME %s \"%s\"" : "GET %s \"%s\"",
-			      dcc->nick, esc_arg);
+			      "RESUME %s %s" : "GET %s %s",
+			      dcc->nick, dcc->arg);
 	signal_emit("command dcc", 2, str, dcc->server);
-	g_free(esc_arg);
         g_free(file);
 	g_free(str);
 }

From 7bd1b80687cc97010094de0d398b429480e0a608 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 7 Mar 2017 23:23:54 +0100
Subject: [PATCH 0532/1650] fix dcc get

fixes #656
---
 src/irc/dcc/dcc-autoget.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index de23a5d1..dd12f438 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -23,6 +23,7 @@
 #include "masks.h"
 #include "settings.h"
 #include "servers.h"
+#include "misc.h"
 
 #include "dcc-get.h"
 
@@ -30,7 +31,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 {
         struct stat statbuf;
 	const char *masks;
-        char *str, *file;
+        char *str, *file, *esc_arg;
         int max_size;
 
         if (!IS_DCC_GET(dcc)) return;
@@ -68,11 +69,13 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 
 	/* ok. but do we want/need to resume? */
 	file = dcc_get_download_path(dcc->arg);
+	esc_arg = escape_string(dcc->arg);
 	str = g_strdup_printf(settings_get_bool("dcc_autoresume") &&
 			      stat(file, &statbuf) == 0 ?
-			      "RESUME %s %s" : "GET %s %s",
-			      dcc->nick, dcc->arg);
+			      "RESUME %s \"%s\"" : "GET %s \"%s\"",
+			      dcc->nick, esc_arg);
 	signal_emit("command dcc", 2, str, dcc->server);
+	g_free(esc_arg);
         g_free(file);
 	g_free(str);
 }

From 93c158d8156293bd95e4bf5bdb75cf8d44bc4eab Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 8 Mar 2017 18:57:53 -0300
Subject: [PATCH 0533/1650] expand_escape: expand double backslash as a
 backslash

---
 src/core/misc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/misc.c b/src/core/misc.c
index 1cfa15b6..d8437430 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -690,6 +690,8 @@ int expand_escape(const char **data)
 		return '\n';
 	case 'e':
 		return 27; /* ESC */
+	case '\\':
+		return '\\';
 
 	case 'x':
                 /* hex digit */

From 24e62b0525ac852517230fa39330042325f105a5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 4 Mar 2017 21:36:00 +0000
Subject: [PATCH 0534/1650] Merge pull request #652 from LemonBoy/trailing-arg

Properly check the command arguments in tail place.

commit 5a92a3926fab4def4bcb7d14642b93184eeb4f71
Merge: 647ef193a896cc8a97d9bc664a6337b8b779f3c4 e4601b4b43af6177375c90a423546d892fbf6bfd
Rebased: e4601b4b43af6177375c90a423546d892fbf6bfd dc99f8d7a5f90eebd4c52cef8d186bf20e2a9912

From 22bc7fcc3906ff3dd6e3837e049d37dc352edf94 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 5 Feb 2017 21:33:19 +0100
Subject: [PATCH 0535/1650] amend forgotten fix

(cherry picked from commit 0ada284a257cfb08da984a78dab24c3ddaf09ec7)
---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 2553d0da..7cd788ac 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ v1.0.1 2017-02-03  The Irssi team <staff@irssi.org>
 	- Fix regression that broke second level completion (#613, #609).
 	- Correct missing NULL termination in perl_parse. By Hanno Böck (#619).
 	- Sync broken mail.pl script (#624, #607).
+	- Prevent a memory leak during the processing of the SASL
+	  response (GL!8, GL#5)
 
 v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
 	* Removed --disable-ipv6 (#408).

From 3930f91edcf4b1e96c9d857233d58f7cb45c8a86 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Fri, 10 Mar 2017 17:41:04 +0100
Subject: [PATCH 0536/1650] tag as 1.0.2

(cherry picked from commit 2a53853f369b47e42e32e183c8109e3d63808899)
---
 NEWS | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/NEWS b/NEWS
index 7cd788ac..af330804 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,15 @@
 v1.1-head 2017-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.0.2 2017-03-10  The Irssi team <staff@irssi.org>
+	- Prevent some null-pointer crashes (GL!9).
+	- Fix compilation with OpenSSL 1.1.0 (#628, #597).
+	- Correct dereferencing of already freed server objects during
+	  output of netjoins. Found by APic (GL!10, GL#7).
+	- Fix in command arg parser to detect missing arguments in tail place
+	  (#652, #651).
+	- Fix regression that broke incoming DCC file transfers (#667, #656).
+	- Fix issue with escaping \ in evaluated strings (#669, #520).
+
 v1.0.1 2017-02-03  The Irssi team <staff@irssi.org>
 	- Fix Perl compilation in object dir. By Martijn Dekker (#602, #623).
 	- Disable EC cryptography on Solaris to fix build (#604, #598).

From 966efced3c178031f5f75a1009acc0ec8f897b4a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 14 Mar 2017 09:54:28 +0100
Subject: [PATCH 0537/1650] up abi ver

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 646b7e1a..b6f9153e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 8
+#define IRSSI_ABI_VERSION 9
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 

From a720c3b5efdcd9b580110441bb22be91a4a16732 Mon Sep 17 00:00:00 2001
From: Rodrigo Rebello <rprebello@gmail.com>
Date: Mon, 20 Mar 2017 13:17:42 -0300
Subject: [PATCH 0538/1650] Get back to using pkg-config to check for OpenSSL

Commit 6300dfec7 removed the option to disable SSL support from the
configure script since it became a requirement, but it also removed the
use of pkg-config for finding the OpenSSL library and its dependencies.

This had the unfortunate consequence of breaking the correct detection
of library flags in many static linking scenarios. In some cases, for
example, OpenSSL might have been built with zlib, which requires `-lz`
to be passed to the linker when doing a static link of the irssi
executable. Thus, pkg-config becomes an invaluable tool in such
situations, since no guessing work is needed as the OpenSSL .pc file
provides all the necessary flags.

So, this commit re-inserts the PKG_CHECK_MODULES macro in the configure
script when looking for OpenSSL. The test using AC_CHECK_LIB remains,
but only as a last resort in case the one using pkg-config fails.

Also, because the macro AM_PATH_GLIB_2_0 contains an unconditional call
to PKG_PROG_PKG_CONFIG, the OpenSSL checks are moved so that they come
after the Glib ones in order to avoid doubly checking for the pkg-config
binary (PKG_CHECK_MODULES skips that check if it has been performed
before, but PKG_PROG_PKG_CONFIG does not).
---
 configure.ac | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8d1ba706..dd5064c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,11 +243,6 @@ if test "x$want_socks" = "xyes"; then
 	])
 fi
 
-dnl **
-dnl ** OpenSSL checks
-dnl **
-AC_CHECK_LIB([ssl], [SSL_library_init])
-
 dnl **
 dnl ** fe-text checks
 dnl **
@@ -289,7 +284,21 @@ if test -z "$GLIB_LIBS"; then
   AC_ERROR([GLIB is required to build irssi.])
 fi
 
-LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto"
+LIBS="$LIBS $GLIB_LIBS"
+
+dnl **
+dnl ** OpenSSL checks
+dnl **
+PKG_CHECK_MODULES([OPENSSL], [openssl], [
+	CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+	LIBS="$LIBS $OPENSSL_LIBS"
+], [
+	AC_CHECK_LIB([ssl], [SSL_library_init], [
+		LIBS="$LIBS -lssl -lcrypto"
+	], [
+		AC_MSG_ERROR([The OpenSSL library was not found])
+	])
+])
 
 dnl **
 dnl ** curses checks

From 449b8a4589f1fcadae44387999260ed5f8c6c2bf Mon Sep 17 00:00:00 2001
From: Rodrigo Rebello <rprebello@gmail.com>
Date: Mon, 20 Mar 2017 15:47:24 -0300
Subject: [PATCH 0539/1650] Remove outdated information from INSTALL

Disabling SSL support is no longer an option.
---
 INSTALL | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index 629a75c6..d2a0acc2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -30,10 +30,6 @@ configure options
 
   Build the irssi proxy (see startup-HOWTO).
 
-  --disable-ssl
-
-  Disable SSL support.
-
   --with-perl=[yes|no|module]
 
   Enable Perl support

From 70f9db3cbdc0a3c6b622e64edbd504592f921892 Mon Sep 17 00:00:00 2001
From: Stephen Oberholtzer <stevie@qrpff.net>
Date: Tue, 21 Mar 2017 09:08:42 -0400
Subject: [PATCH 0540/1650] Fix delay at startup when running against glib
 2.49.3+

In glib v2.49.3, an optimization was made to eliminate certain
unnecessary wakeups.  (The specific change was made in
e4ee3079c5afc3c1c3d2415f20c3e8605728f074). Before this change, the
first call to g_main_iteration would always complete immediately.
In Irssi, this effectively reversed the order of the main loop, causing
the reload_config check and the dirty_check to run *before* the first
blocking call to g_main_iteration.

With the new logic, the first g_main_iteration call now blocks,
preventing the screen from being refreshed until the user starts typing
or a timer goes off.  (It also delays processing of SIGHUP, but I
expect that is not a common situation.)

This commit reorders the main loop to wait at the end of the loop,
rather than the beginning, addressing the problem.

(This closes Debian bug #856201.)
---
 src/fe-text/irssi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index ad79e0c4..e9e9b8b2 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -317,10 +317,6 @@ int main(int argc, char **argv)
 	/* Does the same as g_main_run(main_loop), except we
 	   can call our dirty-checker after each iteration */
 	while (!quitting) {
-		term_refresh_freeze();
-		g_main_iteration(TRUE);
-                term_refresh_thaw();
-
 		if (reload_config) {
                         /* SIGHUP received, do /RELOAD */
 			reload_config = FALSE;
@@ -328,6 +324,10 @@ int main(int argc, char **argv)
 		}
 
 		dirty_check();
+
+		term_refresh_freeze();
+		g_main_iteration(TRUE);
+                term_refresh_thaw();
 	}
 
 	g_main_destroy(main_loop);

From 2b9be6e2ed446293008d0e850fd726aad30fbcd2 Mon Sep 17 00:00:00 2001
From: Stephen Oberholtzer <stevie@qrpff.net>
Date: Tue, 21 Mar 2017 10:27:39 -0400
Subject: [PATCH 0541/1650] Intentation/whitespace fixes

Change several instances of space-indentation to tabs, matching the
surrounding code.
---
 src/fe-text/irssi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index e9e9b8b2..b5df47c9 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -318,21 +318,21 @@ int main(int argc, char **argv)
 	   can call our dirty-checker after each iteration */
 	while (!quitting) {
 		if (reload_config) {
-                        /* SIGHUP received, do /RELOAD */
+			/* SIGHUP received, do /RELOAD */
 			reload_config = FALSE;
-                        signal_emit("command reload", 1, "");
+			signal_emit("command reload", 1, "");
 		}
 
 		dirty_check();
 
 		term_refresh_freeze();
 		g_main_iteration(TRUE);
-                term_refresh_thaw();
+		term_refresh_thaw();
 	}
 
 	g_main_destroy(main_loop);
 	textui_deinit();
 
-        session_upgrade(); /* if we /UPGRADEd, start the new process */
+	session_upgrade(); /* if we /UPGRADEd, start the new process */
 	return 0;
 }

From a4cc4e0ad7278835d976aa5e75ca2b42443f5bb1 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Fri, 31 Mar 2017 15:37:48 -0400
Subject: [PATCH 0542/1650] Fix off by one error with char_expandos

---
 src/core/expandos.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/expandos.c b/src/core/expandos.c
index 67aea837..2e4265d5 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -51,7 +51,7 @@ const char *current_expando = NULL;
 
 static int timer_tag;
 
-static EXPANDO_REC *char_expandos[255];
+static EXPANDO_REC *char_expandos[256];
 static GHashTable *expandos;
 static char *last_sent_msg, *last_sent_msg_body;
 static char *last_privmsg_from, *last_public_from;

From 41776d71f76924664bce1562ebe37743ba0cc9b7 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Wed, 5 Apr 2017 11:00:25 -0400
Subject: [PATCH 0543/1650] Fix strange history behavior when history is empty

If text is being entered and then the user presses the up arrow
followed by the down arrow, the expected behavior is to return to the
text being entered. Prior to this commit that was not the case.

Fixes #462
---
 src/fe-common/core/command-history.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 1060744e..405700e5 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -116,6 +116,8 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
 		history->pos = history->pos->prev;
 		if (history->pos == NULL)
                         history->over_counter++;
+	} else if (history->lines == 0) {
+		history->over_counter++;
 	} else {
 		history->pos = g_list_last(history->list);
 	}

From 7c86575b02d4f80539bcd2da3bef8195b963fa92 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 6 Apr 2017 20:27:39 -0400
Subject: [PATCH 0544/1650] Don't allow command history to wrap around

This changes the behavior of the command history to avoid wrapping back
to the bottom once the top of the history is reached.
---
 src/fe-common/core/command-history.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 405700e5..f957d385 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -113,11 +113,9 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
 	pos = history->pos;
 
 	if (pos != NULL) {
-		history->pos = history->pos->prev;
-		if (history->pos == NULL)
-                        history->over_counter++;
-	} else if (history->lines == 0) {
-		history->over_counter++;
+		/* don't go past the first entry (no wrap around) */
+		if (history->pos->prev != NULL)
+			history->pos = history->pos->prev;
 	} else {
 		history->pos = g_list_last(history->list);
 	}
@@ -128,7 +126,7 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
 		command_history_add(history, text);
 	}
 
-	return history->pos == NULL ? "" : history->pos->data;
+	return history->pos == NULL ? text : history->pos->data;
 }
 
 const char *command_history_next(WINDOW_REC *window, const char *text)
@@ -141,10 +139,6 @@ const char *command_history_next(WINDOW_REC *window, const char *text)
 
 	if (pos != NULL)
 		history->pos = history->pos->next;
-	else if (history->over_counter > 0) {
-		history->over_counter--;
-		history->pos = history->list;
-	}
 
 	if (*text != '\0' &&
 	    (pos == NULL || g_strcmp0(pos->data, text) != 0)) {

From 405136440cbfd18a39e2d5aa01c812a1247c369d Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Fri, 7 Apr 2017 08:20:28 -0400
Subject: [PATCH 0545/1650] Remove over_counter

We are no longer using over_counter for any functional purpose, so
remove it.
---
 src/fe-common/core/command-history.c | 1 -
 src/fe-common/core/command-history.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index f957d385..55474b1b 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -150,7 +150,6 @@ const char *command_history_next(WINDOW_REC *window, const char *text)
 
 void command_history_clear_pos_func(HISTORY_REC *history, gpointer user_data)
 {
-	history->over_counter = 0;
 	history->pos = NULL;
 }
 
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index a572216b..45126092 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -7,7 +7,7 @@ typedef struct {
 	char *name;
 
 	GList *list, *pos;
-	int lines, over_counter;
+	int lines;
 
 	int refcount;
 } HISTORY_REC;

From 3297fafcd9be1fc3f48557a12023a1ef20884985 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Fri, 7 Apr 2017 12:54:18 -0400
Subject: [PATCH 0546/1650] Add syntax info for completion

Allows syntax info to be picked up and displayed by help command.

Fixes #687
---
 src/fe-common/core/completion.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 914ba80b..a97adc21 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -784,6 +784,7 @@ static void sig_complete_command(GList **list, WINDOW_REC *window,
 	if (*list != NULL) signal_stop();
 }
 
+/* SYNTAX: COMPLETION [-auto] [-delete] <key> <value> */
 static void cmd_completion(const char *data)
 {
 	GHashTable *optlist;

From c8a19e112499c0ca1d2b07a98d68415ca1509614 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 May 2017 12:27:23 +0200
Subject: [PATCH 0547/1650] detect Netbsd terminfo

fixes #694
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dd5064c9..3855ba4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,7 +308,7 @@ if test "x$want_textui" != "xno"; then
 
 	TEXTUI_NO_LIBS="$LIBS"
 	LIBS=
-	AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses], [want_textui=yes], [
+	AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses terminfo], [want_textui=yes], [
 		AC_ERROR(Terminfo not found - install libncurses-dev or ncurses-devel package)
 		want_textui="no, Terminfo not found"
 	])

From 0c760b0c1bd86134fd5f55205b2ea45ba8e2f4af Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 8 May 2017 13:45:13 -0400
Subject: [PATCH 0548/1650] Add fuzz.diff for fuzzing with afl

Authored by dx.
---
 fuzz-support/fuzz.diff | 269 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 269 insertions(+)
 create mode 100644 fuzz-support/fuzz.diff

diff --git a/fuzz-support/fuzz.diff b/fuzz-support/fuzz.diff
new file mode 100644
index 00000000..a3683493
--- /dev/null
+++ b/fuzz-support/fuzz.diff
@@ -0,0 +1,269 @@
+diff --git a/src/core/network.c b/src/core/network.c
+index 3e1b7c7..1e5324a 100644
+--- a/src/core/network.c
++++ b/src/core/network.c
+@@ -199,6 +199,10 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
+ /* Connect to named UNIX socket */
+ GIOChannel *net_connect_unix(const char *path)
+ {
++	if (strcmp(path, "/dev/stdin") == 0) {
++		return g_io_channel_new(0);
++	}
++
+ 	struct sockaddr_un sa;
+ 	int handle, ret;
+ 
+@@ -336,6 +340,8 @@ int net_receive(GIOChannel *handle, char *buf, int len)
+ /* Transmit data, return number of bytes sent, -1 = error */
+ int net_transmit(GIOChannel *handle, const char *data, int len)
+ {
++	return write(1, data, len);
++
+         gsize ret;
+ 	GIOStatus status;
+ 	GError *err = NULL;
+@@ -495,6 +501,7 @@ int net_host2ip(const char *host, IPADDR *ip)
+ /* Get socket error */
+ int net_geterror(GIOChannel *handle)
+ {
++	return 0;
+ 	int data;
+ 	socklen_t len = sizeof(data);
+ 
+diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
+index 58c9dd0..0c6ec1b 100644
+--- a/src/core/servers-reconnect.c
++++ b/src/core/servers-reconnect.c
+@@ -484,7 +484,8 @@ void servers_reconnect_init(void)
+ 	reconnects = NULL;
+ 	last_reconnect_tag = 0;
+ 
+-	reconnect_timeout_tag = g_timeout_add(1000, (GSourceFunc) server_reconnect_timeout, NULL);
++	(void) server_reconnect_timeout;
++
+ 	read_settings();
+ 
+ 	signal_add("server connect failed", (SIGNAL_FUNC) sig_reconnect);
+diff --git a/src/core/settings.c b/src/core/settings.c
+index e65ceb2..f9dc678 100644
+--- a/src/core/settings.c
++++ b/src/core/settings.c
+@@ -704,7 +704,10 @@ int irssi_config_is_changed(const char *fname)
+ 
+ static CONFIG_REC *parse_configfile(const char *fname)
+ {
+-	CONFIG_REC *config;
++	CONFIG_REC *config = config_open(NULL, -1);
++	config_parse_data(config, default_config, "internal");
++	return config;
++
+ 	struct stat statbuf;
+         const char *path;
+ 	char *str;
+@@ -871,8 +874,6 @@ void settings_init(void)
+ 	init_configfile();
+ 
+ 	settings_add_bool("misc", "settings_autosave", TRUE);
+-	timeout_tag = g_timeout_add(SETTINGS_AUTOSAVE_TIMEOUT,
+-				    (GSourceFunc) sig_autosave, NULL);
+ 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+ 	signal_add("gui exit", (SIGNAL_FUNC) sig_autosave);
+ }
+diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
+index 1b2ab1e..4344cd9 100644
+--- a/src/fe-common/core/fe-common-core.c
++++ b/src/fe-common/core/fe-common-core.c
+@@ -320,6 +320,8 @@ static void autoconnect_servers(void)
+ 	GSList *tmp, *chatnets;
+ 	char *str;
+ 
++	return;
++
+ 	if (autocon_server != NULL) {
+ 		/* connect to specified server */
+ 		if (autocon_password == NULL)
+@@ -390,6 +392,7 @@ static void sig_setup_changed(void)
+ 
+ static void autorun_startup(void)
+ {
++	return;
+ 	char *path;
+ 	GIOChannel *handle;
+ 	GString *buf;
+diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
+index 2b1459b..2e518a1 100644
+--- a/src/fe-common/core/themes.c
++++ b/src/fe-common/core/themes.c
+@@ -790,9 +790,8 @@ static void theme_read_module(THEME_REC *theme, const char *module)
+ {
+ 	CONFIG_REC *config;
+ 
+-	config = config_open(theme->path, -1);
+-	if (config != NULL)
+-		config_parse(config);
++	config = config_open(NULL, -1);
++	config_parse_data(config, default_theme, "internal");
+ 
+ 	theme_init_module(theme, module, config);
+ 
+@@ -987,7 +986,7 @@ static int theme_read(THEME_REC *theme, const char *path)
+ 	THEME_READ_REC rec;
+         char *str;
+ 
+-	config = config_open(path, -1) ;
++	config = config_open(NULL, -1) ;
+ 	if (config == NULL) {
+ 		/* didn't exist or no access? */
+ 		str = g_strdup_printf("Error reading theme file %s: %s",
+@@ -997,7 +996,7 @@ static int theme_read(THEME_REC *theme, const char *path)
+ 		return FALSE;
+ 	}
+ 
+-	if (path == NULL)
++	if (1)
+ 		config_parse_data(config, default_theme, "internal");
+         else
+ 		config_parse(config);
+@@ -1200,6 +1199,7 @@ static void module_save(const char *module, MODULE_THEME_REC *rec,
+ 
+ static void theme_save(THEME_REC *theme, int save_all)
+ {
++	return;
+ 	CONFIG_REC *config;
+ 	THEME_SAVE_REC data;
+ 	char *path;
+diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
+index 7c71edd..6bf2177 100644
+--- a/src/fe-text/gui-readline.c
++++ b/src/fe-text/gui-readline.c
+@@ -1126,7 +1126,6 @@ void gui_readline_init(void)
+ 	paste_timeout_id = -1;
+ 	paste_bracketed_mode = FALSE;
+ 	g_get_current_time(&last_keypress);
+-        input_listen_init(STDIN_FILENO);
+ 
+ 	settings_add_bool("lookandfeel", "term_appkey_mode", TRUE);
+ 	settings_add_str("history", "scroll_page_count", "/2");
+diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
+index ad79e0c..84d0c5c 100644
+--- a/src/fe-text/irssi.c
++++ b/src/fe-text/irssi.c
+@@ -314,20 +314,16 @@ int main(int argc, char **argv)
+ 	textui_finish_init();
+ 	main_loop = g_main_new(TRUE);
+ 
++#ifdef __AFL_HAVE_MANUAL_CONTROL
++	__AFL_INIT();
++#endif
++
++	signal_emit("command connect", 1, "/dev/stdin 6667");
++
+ 	/* Does the same as g_main_run(main_loop), except we
+ 	   can call our dirty-checker after each iteration */
+ 	while (!quitting) {
+-		term_refresh_freeze();
+ 		g_main_iteration(TRUE);
+-                term_refresh_thaw();
+-
+-		if (reload_config) {
+-                        /* SIGHUP received, do /RELOAD */
+-			reload_config = FALSE;
+-                        signal_emit("command reload", 1, "");
+-		}
+-
+-		dirty_check();
+ 	}
+ 
+ 	g_main_destroy(main_loop);
+diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
+index b2478c6..cebe260 100644
+--- a/src/fe-text/term-terminfo.c
++++ b/src/fe-text/term-terminfo.c
+@@ -29,6 +29,10 @@
+ #include <termios.h>
+ #include <stdio.h>
+ 
++#undef putc
++#define putc(x, y) (void) (x)
++#define fputc(x, y) (void) (x), 0
++
+ /* returns number of characters in the beginning of the buffer being a
+    a single character, or -1 if more input is needed. The character will be
+    saved in result */
+@@ -113,7 +117,8 @@ int term_init(void)
+ 	vcmove = FALSE; cforcemove = TRUE;
+         curs_visible = TRUE;
+ 
+-	current_term = terminfo_core_init(stdin, stdout);
++	FILE *devnull = fopen("/dev/null", "r+");
++	current_term = terminfo_core_init(devnull, devnull);
+ 	if (current_term == NULL)
+ 		return FALSE;
+ 
+@@ -670,6 +675,7 @@ void term_set_input_type(int type)
+ 
+ void term_gets(GArray *buffer, int *line_count)
+ {
++	return;
+ 	int ret, i, char_len;
+ 
+         /* fread() doesn't work */
+diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
+index 9c9179a..6349935 100644
+--- a/src/fe-text/terminfo-core.c
++++ b/src/fe-text/terminfo-core.c
+@@ -6,6 +6,10 @@
+ #  define _POSIX_VDISABLE 0
+ #endif
+ 
++#undef putc
++#define putc(x, y) (void) (x)
++#define fputc(x, y) (void) (x), 0
++
+ #define tput(s) tputs(s, 0, term_putchar)
+ inline static int term_putchar(int c)
+ {
+diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
+index 4dce3fc..25fbb34 100644
+--- a/src/irc/core/irc.c
++++ b/src/irc/core/irc.c
+@@ -383,12 +383,13 @@ static void irc_parse_incoming(SERVER_REC *server)
+ 		signal_emit_id(signal_server_incoming, 2, server, str);
+ 
+ 		if (server->connection_lost)
+-			server_disconnect(server);
++			exit(0);
+ 
+ 		count++;
+ 	}
+ 	if (ret == -1) {
+ 		/* connection lost */
++		exit(0);
+ 		server->connection_lost = TRUE;
+ 		server_disconnect(server);
+ 	}
+diff --git a/src/lib-config/write.c b/src/lib-config/write.c
+index 37e51f0..ee82726 100644
+--- a/src/lib-config/write.c
++++ b/src/lib-config/write.c
+@@ -299,6 +299,8 @@ static int config_write_block(CONFIG_REC *rec, CONFIG_NODE *node, int list, int
+ 
+ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
+ {
++	return 0;
++
+ 	int ret;
+ 	int fd;
+ 
+diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
+index 2c61df7..485fe25 100644
+--- a/src/perl/perl-core.c
++++ b/src/perl/perl-core.c
+@@ -395,6 +395,7 @@ int perl_get_api_version(void)
+ 
+ void perl_scripts_autorun(void)
+ {
++	return;
+ 	DIR *dirp;
+ 	struct dirent *dp;
+ 	struct stat statbuf;

From dbde9f0fe3c9fcd7eb8e56e9b1beffb71b0607e1 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Thu, 11 May 2017 10:57:24 +0200
Subject: [PATCH 0549/1650] Added support for -notls and -notls_verify

---
 src/fe-common/core/fe-server.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index f4c1d3ee..207dae7d 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -156,6 +156,10 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl"))
 		rec->use_tls = TRUE;
+	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl")) {
+		rec->use_tls = FALSE;
+		rec->tls_verify = FALSE;
+	}
 
 	value = g_hash_table_lookup(optlist, "tls_cert");
 	if (value == NULL)
@@ -177,6 +181,8 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	if (g_hash_table_lookup(optlist, "tls_verify") || g_hash_table_lookup(optlist, "ssl_verify"))
 		rec->tls_verify = TRUE;
+	else if (g_hash_table_lookup(optlist, "notls_verify") || g_hash_table_lookup(optlist, "nossl_verify"))
+		rec->tls_verify = FALSE;
 
 	value = g_hash_table_lookup(optlist, "tls_cafile");
 	if (value == NULL)
@@ -434,8 +440,8 @@ void fe_server_init(void)
 	command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
 	command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
 
-	command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
-	command_set_options("server modify", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options("server add", "4 6 !! ssl nossl +ssl_cert +ssl_pkey +ssl_pass ssl_verify nossl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls notls +tls_cert +tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options("server modify", "4 6 !! ssl nossl +ssl_cert +ssl_pkey +ssl_pass ssl_verify nossl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls notls +tls_cert +tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
 
 	signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
 	signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting);

From f060292a9cd0835dd9cc8c24a4ede67909a2b68b Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Thu, 11 May 2017 11:17:14 +0200
Subject: [PATCH 0550/1650] Added braces

---
 src/fe-common/core/fe-server.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 207dae7d..c9488e25 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -154,8 +154,9 @@ static void cmd_server_add_modify(const char *data, gboolean add)
         else if (g_hash_table_lookup(optlist, "4"))
 		rec->family = AF_INET;
 
-	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl"))
+	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl")) {
 		rec->use_tls = TRUE;
+	}
 	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl")) {
 		rec->use_tls = FALSE;
 		rec->tls_verify = FALSE;

From 25f9c71f690f9fd846a39e646fbd11f715ffbfa5 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Thu, 11 May 2017 14:02:23 +0200
Subject: [PATCH 0551/1650] Allow -port <num> or irc.host.tld <port num> in
 /server add and /server modify

---
 src/fe-common/core/fe-server.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index f4c1d3ee..89d6f739 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -117,7 +117,11 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		return;
 
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-	port = *portstr == '\0' ? DEFAULT_SERVER_ADD_PORT : atoi(portstr);
+
+        value = g_hash_table_lookup(optlist, "port");
+        port = *portstr == '\0' ?
+                (value != NULL && *value != '\0' ? atoi(value) : DEFAULT_SERVER_ADD_PORT)
+		: atoi(portstr);
 
 	chatnet = g_hash_table_lookup(optlist, "network");
 
@@ -137,11 +141,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 			return;
 		}
 		rec->address = g_strdup(addr);
-		rec->port = port;
 	} else {
-		value = g_hash_table_lookup(optlist, "port");
-		if (value != NULL && *value != '\0') rec->port = atoi(value);
-
 		if (*password != '\0') g_free_and_null(rec->password);
 		if (g_hash_table_lookup(optlist, "host")) {
 			g_free_and_null(rec->own_host);
@@ -149,6 +149,8 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		}
 	}
 
+	rec->port = port;
+
 	if (g_hash_table_lookup(optlist, "6"))
 		rec->family = AF_INET6;
         else if (g_hash_table_lookup(optlist, "4"))

From 783458e9ba068117089d23730add317069cf6447 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Thu, 11 May 2017 14:08:45 +0200
Subject: [PATCH 0552/1650] Added code comments

---
 src/fe-common/core/fe-server.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index c9488e25..03feba32 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -159,6 +159,8 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	}
 	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl")) {
 		rec->use_tls = FALSE;
+		/* if rec has tls_verify = TRUE then use_tls will be set to true on lines 224-225
+		   so explicitly set tls_verify to FALSE when -notls is used */
 		rec->tls_verify = FALSE;
 	}
 

From 787e192567626dab7788e54363dbccda52d5322c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 12 May 2017 13:36:48 +0200
Subject: [PATCH 0553/1650] improve nicklist performance

---
 src/core/nicklist.c | 53 ++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 770b0afc..50199f63 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -166,41 +166,50 @@ void nicklist_rename_unique(SERVER_REC *server,
 			     nicklist_get_same_unique(server, old_nick_id));
 }
 
+#define NICKLIST_GETNICKS_LOOP_INIT(hashtable)			 \
+	do {							 \
+		GHashTableIter _iter;				 \
+		g_hash_table_iter_init(&_iter, (hashtable));		\
+		while (g_hash_table_iter_next(&_iter, NULL, (void*)&nick)) { \
+			while (nick != NULL) {
+#define NICKLIST_GETNICKS_LOOP_END					\
+				nick = nick->next;			\
+			}						\
+		}							\
+	} while (0)
+
 static NICK_REC *nicklist_find_wildcards(CHANNEL_REC *channel,
 					 const char *mask)
 {
-	GSList *nicks, *tmp;
 	NICK_REC *nick;
 
-	nicks = nicklist_getnicks(channel);
-	nick = NULL;
-	for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
-		nick = tmp->data;
+	NICKLIST_GETNICKS_LOOP_INIT(channel->nicks);
 
-		if (mask_match_address(channel->server, mask,
-				       nick->nick, nick->host))
-			break;
-	}
-	g_slist_free(nicks);
-	return tmp == NULL ? NULL : nick;
+	if (mask_match_address(channel->server, mask,
+			       nick->nick, nick->host))
+		return nick;
+
+	NICKLIST_GETNICKS_LOOP_END;
+	return NULL;
 }
 
 GSList *nicklist_find_multiple(CHANNEL_REC *channel, const char *mask)
 {
-	GSList *nicks, *tmp, *next;
+	GSList *nicks;
+	NICK_REC *nick;
 
 	g_return_val_if_fail(IS_CHANNEL(channel), NULL);
 	g_return_val_if_fail(mask != NULL, NULL);
 
-	nicks = nicklist_getnicks(channel);
-	for (tmp = nicks; tmp != NULL; tmp = next) {
-		NICK_REC *nick = tmp->data;
+	nicks = NULL;
 
-		next = tmp->next;
-		if (!mask_match_address(channel->server, mask,
-					nick->nick, nick->host))
-                        nicks = g_slist_remove(nicks, tmp->data);
-	}
+	NICKLIST_GETNICKS_LOOP_INIT(channel->nicks);
+
+	if (mask_match_address(channel->server, mask,
+			       nick->nick, nick->host))
+		nicks = g_slist_prepend(nicks, nick);
+
+	NICKLIST_GETNICKS_LOOP_END;
 
 	return nicks;
 }
@@ -264,8 +273,8 @@ NICK_REC *nicklist_find_mask(CHANNEL_REC *channel, const char *mask)
 static void get_nicks_hash(gpointer key, NICK_REC *rec, GSList **list)
 {
 	while (rec != NULL) {
-		*list = g_slist_append(*list, rec);
-                rec = rec->next;
+		*list = g_slist_prepend(*list, rec);
+		rec = rec->next;
 	}
 }
 

From 371eb7f5052b9cce7efcbcc4086cd6f6716e21fd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 12 May 2017 16:27:33 +0200
Subject: [PATCH 0554/1650] expand macro

---
 src/core/nicklist.c | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 50199f63..54dfb5fb 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -166,30 +166,21 @@ void nicklist_rename_unique(SERVER_REC *server,
 			     nicklist_get_same_unique(server, old_nick_id));
 }
 
-#define NICKLIST_GETNICKS_LOOP_INIT(hashtable)			 \
-	do {							 \
-		GHashTableIter _iter;				 \
-		g_hash_table_iter_init(&_iter, (hashtable));		\
-		while (g_hash_table_iter_next(&_iter, NULL, (void*)&nick)) { \
-			while (nick != NULL) {
-#define NICKLIST_GETNICKS_LOOP_END					\
-				nick = nick->next;			\
-			}						\
-		}							\
-	} while (0)
-
 static NICK_REC *nicklist_find_wildcards(CHANNEL_REC *channel,
 					 const char *mask)
 {
 	NICK_REC *nick;
+	GHashTableIter iter;
 
-	NICKLIST_GETNICKS_LOOP_INIT(channel->nicks);
+	g_hash_table_iter_init(&iter, channel->nicks);
+	while (g_hash_table_iter_next(&iter, NULL, (void*)&nick)) {
+		for (; nick != NULL; nick = nick->next) {
+			if (mask_match_address(channel->server, mask,
+					       nick->nick, nick->host))
+				return nick;
+		}
+	}
 
-	if (mask_match_address(channel->server, mask,
-			       nick->nick, nick->host))
-		return nick;
-
-	NICKLIST_GETNICKS_LOOP_END;
 	return NULL;
 }
 
@@ -197,19 +188,21 @@ GSList *nicklist_find_multiple(CHANNEL_REC *channel, const char *mask)
 {
 	GSList *nicks;
 	NICK_REC *nick;
+	GHashTableIter iter;
 
 	g_return_val_if_fail(IS_CHANNEL(channel), NULL);
 	g_return_val_if_fail(mask != NULL, NULL);
 
 	nicks = NULL;
 
-	NICKLIST_GETNICKS_LOOP_INIT(channel->nicks);
-
-	if (mask_match_address(channel->server, mask,
-			       nick->nick, nick->host))
-		nicks = g_slist_prepend(nicks, nick);
-
-	NICKLIST_GETNICKS_LOOP_END;
+	g_hash_table_iter_init(&iter, channel->nicks);
+	while (g_hash_table_iter_next(&iter, NULL, (void*)&nick)) {
+		for (; nick != NULL; nick = nick->next) {
+			if (mask_match_address(channel->server, mask,
+					       nick->nick, nick->host))
+				nicks = g_slist_prepend(nicks, nick);
+		}
+	}
 
 	return nicks;
 }

From 4a6fbdbe7891859ffd7b51a87147ecb6158df141 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Sun, 14 May 2017 03:01:01 +0200
Subject: [PATCH 0555/1650] Spaces to tabs

---
 src/fe-common/core/fe-server.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 89d6f739..73c77e77 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -118,9 +118,9 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
-        value = g_hash_table_lookup(optlist, "port");
-        port = *portstr == '\0' ?
-                (value != NULL && *value != '\0' ? atoi(value) : DEFAULT_SERVER_ADD_PORT)
+	value = g_hash_table_lookup(optlist, "port");
+	port = *portstr == '\0' ?
+		(value != NULL && *value != '\0' ? atoi(value) : DEFAULT_SERVER_ADD_PORT)
 		: atoi(portstr);
 
 	chatnet = g_hash_table_lookup(optlist, "network");

From 81cf8d8813c4226e0d9db5f776e0f6a6904813e0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 14 May 2017 09:43:38 +0200
Subject: [PATCH 0556/1650] Update fe-server.c

---
 src/fe-common/core/fe-server.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 03feba32..e8e9f33f 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -159,8 +159,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	}
 	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl")) {
 		rec->use_tls = FALSE;
-		/* if rec has tls_verify = TRUE then use_tls will be set to true on lines 224-225
-		   so explicitly set tls_verify to FALSE when -notls is used */
+		/* tls_verify implies use_tls, disable it explicitly */
 		rec->tls_verify = FALSE;
 	}
 

From 0c26aeb9fc716416aa7dde2356cc59643f7cc793 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Mon, 15 May 2017 23:07:01 +0200
Subject: [PATCH 0557/1650] Make sure port is only set on /server modify if
 specified

---
 src/fe-common/core/fe-server.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 73c77e77..46d25ae9 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -120,7 +120,8 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	value = g_hash_table_lookup(optlist, "port");
 	port = *portstr == '\0' ?
-		(value != NULL && *value != '\0' ? atoi(value) : DEFAULT_SERVER_ADD_PORT)
+			(value != NULL && *value != '\0' ?
+			atoi(value) : DEFAULT_SERVER_ADD_PORT)
 		: atoi(portstr);
 
 	chatnet = g_hash_table_lookup(optlist, "network");
@@ -141,7 +142,11 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 			return;
 		}
 		rec->address = g_strdup(addr);
+		rec->port = port;
 	} else {
+		if (*portstr != '\0' || g_hash_table_lookup(optlist, "port"))
+			rec->port = port;
+
 		if (*password != '\0') g_free_and_null(rec->password);
 		if (g_hash_table_lookup(optlist, "host")) {
 			g_free_and_null(rec->own_host);
@@ -149,8 +154,6 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		}
 	}
 
-	rec->port = port;
-
 	if (g_hash_table_lookup(optlist, "6"))
 		rec->family = AF_INET6;
         else if (g_hash_table_lookup(optlist, "4"))

From 5045f4766a72f18a3d682d1c9eeeffb40ab32569 Mon Sep 17 00:00:00 2001
From: mh <mh-source@users.noreply.github.com>
Date: Wed, 17 May 2017 12:17:27 +0200
Subject: [PATCH 0558/1650] dcc.in: fixed typo 'resolved' -&gt; 'resolves'

n/t
---
 docs/help/in/dcc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/dcc.in b/docs/help/in/dcc.in
index 18a77ee9..2e58c9b1 100644
--- a/docs/help/in/dcc.in
+++ b/docs/help/in/dcc.in
@@ -27,7 +27,7 @@
     and file transfers.
 
     If you are behind NAT, or if the firewall is too restrictive, you might
-    want to try if using the passive parameter resolved your connection
+    want to try if using the passive parameter resolves your connection
     problem.
 
     You can send files which contain special character or spaces by enclosing

From 632b0ce5e68ce32ade90382cb64fbb8d1e75090d Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 17 May 2017 06:18:49 -0300
Subject: [PATCH 0559/1650] Add parse_uint function to improve integer overflow
 handling

Originally found by oss-fuzz (issue 525) in get_ansi_color using ubsan.
After a lot of analysis I'm 99% sure this isn't security relevant so
it's fine to handle this publicly.

The fix is mainly adding a function that does it right and use it
everywhere. This is harder than it seems because the strtol() family of
functions doesn't have the friendliest of interfaces.

Aside from get_ansi_color(), there were other pieces of code that used
the same (out*10+(*in-'0')) pattern, like the parse_size() and
parse_time_interval() functions, which are mostly used for settings.
Those are interesting cases, since they multiply the parsed number
(resulting in more overflows) and they write to a signed integer
parameter (which can accidentally make the uints negative without UB)

Thanks to Pascal Cuoq for enlightening me about the undefined behavior
of parse_size (and, in particular, the implementation-defined behavior
of one of the WIP versions of this commit, where something like signed
integer overflow happened, but it was legal). Also for writing
tis-interpreter, which is better than ubsan to verify these things.
---
 src/core/misc.c              | 119 ++++++++++++++++++++++++++++++-----
 src/core/misc.h              |   1 +
 src/core/special-vars.c      |   9 ++-
 src/fe-common/core/formats.c |  28 ++++++---
 4 files changed, 130 insertions(+), 27 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index d8437430..0f038cbb 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -750,10 +750,42 @@ int nearest_power(int num)
 	return n;
 }
 
-int parse_time_interval(const char *time, int *msecs)
+/* Parses unsigned integers from strings with decent error checking.
+ * Returns true on success, false otherwise (overflow, no valid number, etc)
+ * There's a 31 bit limit so the output can be assigned to signed positive ints */
+int parse_uint(const char *nptr, char **endptr, int base, guint *number)
+{
+	char *endptr_;
+	gulong parsed;
+
+	/* strtoul accepts whitespace and plus/minus signs, for some reason */
+	if (!i_isdigit(*nptr)) {
+		return FALSE;
+	}
+
+	errno = 0;
+	parsed = strtoul(nptr, &endptr_, base);
+
+	if (errno || endptr_ == nptr || parsed >= (1U << 31)) {
+		return FALSE;
+	}
+
+	if (endptr) {
+		*endptr = endptr_;
+	}
+
+	if (number) {
+		*number = (guint) parsed;
+	}
+
+	return TRUE;
+}
+
+static int parse_time_interval_uint(const char *time, guint *msecs)
 {
 	const char *desc;
-	int number, sign, len, ret, digits;
+	guint number;
+	int sign, len, ret, digits;
 
 	*msecs = 0;
 
@@ -769,8 +801,11 @@ int parse_time_interval(const char *time, int *msecs)
 	}
 	for (;;) {
 		if (i_isdigit(*time)) {
-			number = number*10 + (*time - '0');
-			time++;
+			char *endptr;
+			if (!parse_uint(time, &endptr, 10, &number)) {
+				return FALSE;
+			}
+			time = endptr;
 			digits = TRUE;
 			continue;
 		}
@@ -835,10 +870,11 @@ int parse_time_interval(const char *time, int *msecs)
 	return ret;
 }
 
-int parse_size(const char *size, int *bytes)
+static int parse_size_uint(const char *size, guint *bytes)
 {
 	const char *desc;
-	int number, len;
+	guint number, multiplier, limit;
+	int len;
 
 	*bytes = 0;
 
@@ -846,8 +882,11 @@ int parse_size(const char *size, int *bytes)
 	number = 0;
 	while (*size != '\0') {
 		if (i_isdigit(*size)) {
-			number = number*10 + (*size - '0');
-			size++;
+			char *endptr;
+			if (!parse_uint(size, &endptr, 10, &number)) {
+				return FALSE;
+			}
+			size = endptr;
 			continue;
 		}
 
@@ -869,14 +908,31 @@ int parse_size(const char *size, int *bytes)
 			return FALSE;
 		}
 
-		if (g_ascii_strncasecmp(desc, "gbytes", len) == 0)
-			*bytes += number * 1024*1024*1024;
-		if (g_ascii_strncasecmp(desc, "mbytes", len) == 0)
-			*bytes += number * 1024*1024;
-		if (g_ascii_strncasecmp(desc, "kbytes", len) == 0)
-			*bytes += number * 1024;
-		if (g_ascii_strncasecmp(desc, "bytes", len) == 0)
-			*bytes += number;
+		multiplier = 0;
+		limit = 0;
+
+		if (g_ascii_strncasecmp(desc, "gbytes", len) == 0) {
+			multiplier = 1U << 30;
+			limit = 2U << 0;
+		}
+		if (g_ascii_strncasecmp(desc, "mbytes", len) == 0) {
+			multiplier = 1U << 20;
+			limit = 2U << 10;
+		}
+		if (g_ascii_strncasecmp(desc, "kbytes", len) == 0) {
+			multiplier = 1U << 10;
+			limit = 2U << 20;
+		}
+		if (g_ascii_strncasecmp(desc, "bytes", len) == 0) {
+			multiplier = 1;
+			limit = 2U << 30;
+		}
+
+		if (limit && number > limit) {
+			return FALSE;
+		}
+
+		*bytes += number * multiplier;
 
 		/* skip punctuation */
 		while (*size != '\0' && i_ispunct(*size))
@@ -886,6 +942,37 @@ int parse_size(const char *size, int *bytes)
 	return TRUE;
 }
 
+int parse_size(const char *size, int *bytes)
+{
+	guint bytes_;
+	int ret;
+
+	ret = parse_size_uint(size, &bytes_);
+
+	if (bytes_ > (1U << 31)) {
+		return FALSE;
+	}
+
+	*bytes = bytes_;
+	return ret;
+}
+
+int parse_time_interval(const char *time, int *msecs)
+{
+	guint msecs_;
+	int ret;
+
+	ret = parse_time_interval_uint(time, &msecs_);
+
+	if (msecs_ > (1U << 31)) {
+		return FALSE;
+	}
+
+	*msecs = msecs_;
+	return ret;
+}
+
+
 char *ascii_strup(char *str)
 {
 	char *s;
diff --git a/src/core/misc.h b/src/core/misc.h
index 00637da0..375744db 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -71,6 +71,7 @@ int expand_escape(const char **data);
 int nearest_power(int num);
 
 /* Returns TRUE / FALSE */
+int parse_uint(const char *nptr, char **endptr, int base, guint *number);
 int parse_time_interval(const char *time, int *msecs);
 int parse_size(const char *size, int *bytes);
 
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index 6ca080fc..aaf8da8f 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -275,6 +275,8 @@ static char *get_special_value(char **cmd, SERVER_REC *server, void *item,
 static int get_alignment_args(char **data, int *align, int *flags, char *pad)
 {
 	char *str;
+	char *endptr;
+	guint align_;
 
 	*align = 0;
 	*flags = ALIGN_CUT|ALIGN_PAD;
@@ -295,10 +297,11 @@ static int get_alignment_args(char **data, int *align, int *flags, char *pad)
 		return FALSE; /* expecting number */
 
 	/* get the alignment size */
-	while (i_isdigit(*str)) {
-		*align = (*align) * 10 + (*str-'0');
-		str++;
+	if (!parse_uint(str, &endptr, 10, &align_)) {
+		return FALSE;
 	}
+	str = endptr;
+	*align = align_;
 
 	/* get the pad character */
 	while (*str != '\0' && *str != ']') {
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 17c13a97..005e6fb7 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -33,6 +33,7 @@
 #include "themes.h"
 #include "recode.h"
 #include "utf8.h"
+#include "misc.h"
 
 static const char *format_backs = "04261537";
 static const char *format_fores = "kbgcrmyw";
@@ -870,8 +871,9 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 {
 	static char ansitab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
 	const char *start;
-	int fg, bg, flags, num, i;
-	unsigned int num2;
+	char *endptr;
+	int fg, bg, flags, i;
+	guint num, num2;
 
 	if (*str != '[')
 		return str;
@@ -886,8 +888,10 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 		if (*str == '\0') return start;
 
 		if (i_isdigit(*str)) {
-			num = num*10 + (*str-'0');
-			continue;
+			if (!parse_uint(str, &endptr, 10, &num)) {
+				return start;
+			}
+			str = endptr;
 		}
 
 		if (*str != ';' && *str != 'm')
@@ -958,8 +962,12 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 			/* ANSI indexed color or RGB color */
 			if (*str != ';') break;
 			str++;
-			for (num2 = 0; i_isdigit(*str); str++)
-				num2 = num2*10 + (*str-'0');
+
+			if (!parse_uint(str, &endptr, 10, &num2)) {
+				return start;
+			}
+			str = endptr;
+
 			if (*str == '\0') return start;
 
 			switch (num2) {
@@ -1006,8 +1014,12 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 				/* indexed */
 				if (*str != ';') break;
 				str++;
-				for (num2 = 0; i_isdigit(*str); str++)
-					num2 = num2*10 + (*str-'0');
+
+				if (!parse_uint(str, &endptr, 10, &num2)) {
+					return start;
+				}
+				str = endptr;
+
 				if (*str == '\0') return start;
 
 				if (num == 38) {

From d61c54c32b6383186a8f32d852594cc4e10240d9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 27 May 2017 00:12:54 +0200
Subject: [PATCH 0560/1650] do not reset true colour bit on colour reset

fixes #710
---
 src/fe-text/textbuffer-view.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 58bd36fb..cb066f5e 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -114,7 +114,6 @@ static void update_cmd_color(unsigned char cmd, int *color)
 		if (cmd & LINE_COLOR_BG) {
 			/* set background color */
 			*color &= FGATTR;
-			*color &= ~ATTR_FGCOLOR24;
 			if ((cmd & LINE_COLOR_DEFAULT) == 0)
 				*color |= (cmd & 0x0f) << BG_SHIFT;
 			else {
@@ -123,7 +122,6 @@ static void update_cmd_color(unsigned char cmd, int *color)
 		} else {
 			/* set foreground color */
 			*color &= BGATTR;
-			*color &= ~ATTR_BGCOLOR24;
 			if ((cmd & LINE_COLOR_DEFAULT) == 0)
 				*color |= cmd & 0x0f;
 			else {

From 601be187746234c36c407a17ca54b17c82264e1b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 29 May 2017 11:07:06 +0200
Subject: [PATCH 0561/1650] Update list.in

Add a more detailed paragraph about service bots

Fixes #699

I would like to add another paragraph about how freenode is
broken and spits at you the whole list instead of empty list
if you attempt to use network side filtering......
---
 docs/help/in/list.in | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/list.in b/docs/help/in/list.in
index b796eed0..6dda79e6 100644
--- a/docs/help/in/list.in
+++ b/docs/help/in/list.in
@@ -24,11 +24,15 @@
 
 %9Remarks:%9
 
-    Not all networks support server-side filtering and may provide a network
+    Not all networks support server-side filtering. Some provide a network
     service or service bot instead; on IRCnet, you may use the List service:
 
-    /SQUERY List HELP
-    /MSG ALIS HELP
+    /SQUERY Alis HELP
+
+    Other networks with service bots (like ChanServ) may also provide a list
+    service bot (confirm with /WHOIS ALIS):
+
+    /MSG Alis HELP
 
 %9See also:%9 STATS, SQUERY, WHOIS
 

From 30a92754bb650c3dedd507d41110443142899a65 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 29 May 2017 14:43:24 -0400
Subject: [PATCH 0562/1650] Fix oob read of one byte in
 get_file_params_count{,_resume}

We can use continue to handle cases such as:
"ab<space><space>c"
---
 src/irc/dcc/dcc-get.c    | 2 ++
 src/irc/dcc/dcc-resume.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 73c1b864..eff516db 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -382,6 +382,8 @@ int get_file_params_count(char **params, int paramcount)
 	if (*params[0] == '"') {
 		/* quoted file name? */
 		for (pos = 0; pos < paramcount-3; pos++) {
+			if (strlen(params[pos]) == 0)
+				continue;
 			if (params[pos][strlen(params[pos])-1] == '"' &&
 			    get_params_match(params, pos+1))
 				return pos+1;
diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c
index 36f84ddf..ce0ac925 100644
--- a/src/irc/dcc/dcc-resume.c
+++ b/src/irc/dcc/dcc-resume.c
@@ -62,6 +62,8 @@ int get_file_params_count_resume(char **params, int paramcount)
 	if (*params[0] == '"') {
 		/* quoted file name? */
 		for (pos = 0; pos < paramcount-2; pos++) {
+			if (strlen(params[pos]) == 0)
+				continue;
 			if (params[pos][strlen(params[pos])-1] == '"' &&
 			    get_params_match_resume(params, pos+1))
 				return pos+1;

From 528f51bfbe5c65c5b24546faa244009dd5b3c586 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Wed, 17 May 2017 10:08:51 -0400
Subject: [PATCH 0563/1650] Fix dcc_request where addr is NULL

---
 src/irc/dcc/dcc-get.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 73c1b864..98294099 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -428,6 +428,10 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 	int p_id = -1;
 	int passive = FALSE;
 
+	if (addr == NULL) {
+		addr = "";
+	}
+
 	/* SEND <file name> <address> <port> <size> [...] */
 	/* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */
 	params = g_strsplit(data, " ", -1);

From 1ce9e07be0ad33fbdac9413e9045c45e66afff37 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 1 Jun 2017 23:59:19 -0400
Subject: [PATCH 0564/1650] Use CXX for fe-fuzz linking

---
 src/fe-fuzz/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index 3a547c66..c11b3dbb 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = irssi-fuzz
 
-# Force link with clang++ for libfuzzer support
-CCLD=clang++ $(CXXFLAGS)
+# Force link with CXX for libfuzzer support
+CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \

From 79bbca4644cad7f2dee89c7ac6b8f9acc2c8b427 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 16 Feb 2017 22:48:13 +0100
Subject: [PATCH 0565/1650] Refactor regex and implement UTF8 mode for GRegex

- with non-unicode byte to Private Use Area A mapping
- move all ifdefs to iregex.h file only
---
 configure.ac                      |   1 +
 src/core/Makefile.am              |   8 ++
 src/core/ignore.c                 |  40 ++-------
 src/core/ignore.h                 |  11 +--
 src/core/iregex-gregex.c          | 137 ++++++++++++++++++++++++++++++
 src/core/iregex-regexh.c          | 101 ++++++++++++++++++++++
 src/core/iregex.h                 |  52 ++++++++++++
 src/core/misc.c                   |   4 -
 src/fe-common/core/fe-ignore.c    |   5 --
 src/fe-common/core/hilight-text.c |  51 +++--------
 src/fe-common/core/hilight-text.h |  12 +--
 src/fe-text/textbuffer.c          |  37 ++------
 12 files changed, 327 insertions(+), 132 deletions(-)
 create mode 100644 src/core/iregex-gregex.c
 create mode 100644 src/core/iregex-regexh.c
 create mode 100644 src/core/iregex.h

diff --git a/configure.ac b/configure.ac
index 3855ba4c..459d3a2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -505,6 +505,7 @@ AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIFUZZER, test "$want_irssifuzzer" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
 AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
+AM_CONDITIONAL(USE_GREGEX, test "x$want_gregex" = "xyes")
 
 # move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
 PROG_LIBS=$LIBS
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 10bd035a..91daba3f 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -7,6 +7,12 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DMODULEDIR=\""$(libdir)/irssi/modules"\"
 
+if USE_GREGEX
+regex_impl=iregex-gregex.c
+else
+regex_impl=iregex-regexh.c
+endif
+
 libcore_a_SOURCES = \
 	args.c \
 	channels.c \
@@ -45,6 +51,7 @@ libcore_a_SOURCES = \
 	signals.c \
 	special-vars.c \
 	utf8.c \
+	$(regex_impl) \
 	wcwidth.c \
 	tls.c \
 	write-buffer.c
@@ -97,6 +104,7 @@ pkginc_core_HEADERS = \
 	signals.h \
 	special-vars.h \
 	utf8.h \
+	iregex.h \
 	window-item-def.h \
 	tls.h \
 	write-buffer.h \
diff --git a/src/core/ignore.c b/src/core/ignore.c
index d4a92e3c..63a507f5 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -24,6 +24,7 @@
 #include "levels.h"
 #include "lib-config/iconfig.h"
 #include "settings.h"
+#include "iregex.h"
 
 #include "masks.h"
 #include "servers.h"
@@ -67,13 +68,8 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
 		return FALSE;
 
 	if (rec->regexp) {
-#ifdef USE_GREGEX
 		return rec->preg != NULL &&
-			g_regex_match(rec->preg, text, 0, NULL);
-#else
-		return rec->regexp_compiled &&
-			regexec(&rec->preg, text, 0, NULL, 0) == 0;
-#endif
+			i_regex_match(rec->preg, text, 0, NULL, NULL);
 	}
 
 	return rec->fullword ?
@@ -327,41 +323,19 @@ static void ignore_remove_config(IGNORE_REC *rec)
 
 static void ignore_init_rec(IGNORE_REC *rec)
 {
-#ifdef USE_GREGEX
 	if (rec->preg != NULL)
-		g_regex_unref(rec->preg);
+		i_regex_unref(rec->preg);
 
 	if (rec->regexp && rec->pattern != NULL) {
 		GError *re_error = NULL;
 
-		rec->preg = g_regex_new(rec->pattern, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, &re_error);
+		rec->preg = i_regex_new(rec->pattern, G_REGEX_OPTIMIZE | G_REGEX_CASELESS, 0, &re_error);
 
 		if (rec->preg == NULL) {
 			g_warning("Failed to compile regexp '%s': %s", rec->pattern, re_error->message);
 			g_error_free(re_error);
 		}
 	}
-#else
-	char *errbuf;
-	int errcode, errbuf_len;
-
-	if (rec->regexp_compiled) regfree(&rec->preg);
-	rec->regexp_compiled = FALSE;
-
-	if (rec->regexp && rec->pattern != NULL) {
-		errcode = regcomp(&rec->preg, rec->pattern,
-				REG_EXTENDED|REG_ICASE|REG_NOSUB);
-		if (errcode != 0) {
-			errbuf_len = regerror(errcode, &rec->preg, 0, 0);
-			errbuf = g_malloc(errbuf_len);
-			regerror(errcode, &rec->preg, errbuf, errbuf_len);
-			g_warning("Failed to compile regexp '%s': %s", rec->pattern, errbuf);
-			g_free(errbuf);
-		} else {
-			rec->regexp_compiled = TRUE;
-		}
-	}
-#endif
 }
 
 void ignore_add_rec(IGNORE_REC *rec)
@@ -381,11 +355,7 @@ static void ignore_destroy(IGNORE_REC *rec, int send_signal)
 	if (send_signal)
 		signal_emit("ignore destroyed", 1, rec);
 
-#ifdef USE_GREGEX
-	if (rec->preg != NULL) g_regex_unref(rec->preg);
-#else
-	if (rec->regexp_compiled) regfree(&rec->preg);
-#endif
+	if (rec->preg != NULL) i_regex_unref(rec->preg);
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->mask);
 	g_free_not_null(rec->servertag);
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 80ae1d12..e18be3c4 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -1,9 +1,7 @@
 #ifndef __IGNORE_H
 #define __IGNORE_H
 
-#ifndef USE_GREGEX
-#  include <regex.h>
-#endif
+#include "iregex.h"
 
 typedef struct _IGNORE_REC IGNORE_REC;
 
@@ -20,12 +18,7 @@ struct _IGNORE_REC {
 	unsigned int regexp:1;
 	unsigned int fullword:1;
 	unsigned int replies:1; /* ignore replies to nick in channel */
-#ifdef USE_GREGEX
-	GRegex *preg;
-#else
-	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
-	regex_t preg;
-#endif
+	Regex *preg;
 };
 
 extern GSList *ignores;
diff --git a/src/core/iregex-gregex.c b/src/core/iregex-gregex.c
new file mode 100644
index 00000000..0de11e64
--- /dev/null
+++ b/src/core/iregex-gregex.c
@@ -0,0 +1,137 @@
+#include <string.h>
+
+#include "iregex.h"
+
+const gchar *
+make_valid_utf8(const gchar *text, gboolean *free_ret)
+{
+	GString *str;
+	const gchar *ptr;
+	if (g_utf8_validate(text, -1, NULL)) {
+		if (free_ret)
+			*free_ret = FALSE;
+		return text;
+	}
+
+	str = g_string_sized_new(strlen(text) + 12);
+
+	ptr = text;
+	while (*ptr) {
+		gunichar c = g_utf8_get_char_validated(ptr, -1);
+		/* the unicode is invalid */
+		if (c == (gunichar)-1 || c == (gunichar)-2) {
+			/* encode the byte into PUA-A */
+			g_string_append_unichar(str, (gunichar) (0xfff00 | (*ptr & 0xff)));
+			ptr++;
+		} else {
+			g_string_append_unichar(str, c);
+			ptr = g_utf8_next_char(ptr);
+		}
+	}
+
+	if (free_ret)
+		*free_ret = TRUE;
+	return g_string_free(str, FALSE);
+}
+
+Regex *
+i_regex_new (const gchar *pattern,
+             GRegexCompileFlags compile_options,
+             GRegexMatchFlags match_options,
+             GError **error)
+{
+	const gchar *valid_pattern;
+	gboolean free_valid_pattern;
+	Regex *ret = NULL;
+
+	valid_pattern = make_valid_utf8(pattern, &free_valid_pattern);
+	ret = g_regex_new(valid_pattern, compile_options, match_options, error);
+
+	if (free_valid_pattern)
+		g_free_not_null((gchar *)valid_pattern);
+
+	return ret;
+}
+
+void
+i_regex_unref (Regex *regex)
+{
+	g_regex_unref(regex);
+}
+
+/* if new_string is present, the caller must free new_string.
+   otherwise, g_match_info_get_string must not be used. */
+gboolean
+i_regex_match (const Regex *regex,
+               const gchar *string,
+               GRegexMatchFlags match_options,
+               MatchInfo **match_info,
+               const gchar **new_string)
+{
+	gboolean ret;
+	gboolean free_valid_string;
+	const gchar *valid_string = make_valid_utf8(string, &free_valid_string);
+
+	ret = g_regex_match(regex, valid_string, match_options, match_info);
+	if (free_valid_string) {
+		if (new_string)
+			*new_string = valid_string;
+		else
+			g_free_not_null((gchar *)valid_string);
+	}
+	return ret;
+}
+
+gsize
+strlen_pua_oddly(const char *str)
+{
+	const gchar *ptr;
+	gsize ret = 0;
+	ptr = str;
+
+	while (*ptr) {
+		const gchar *old;
+		gunichar c = g_utf8_get_char(ptr);
+		old = ptr;
+		ptr = g_utf8_next_char(ptr);
+
+		/* it is our PUA encoded byte */
+		if ((c & 0xfff00) == 0xfff00)
+			ret++;
+		else
+			ret += ptr - old;
+	}
+
+	return ret;
+}
+
+gboolean
+i_match_info_fetch_pos (const MatchInfo *match_info,
+                        gint match_num,
+                        gint *start_pos,
+                        gint *end_pos,
+                        const gchar *new_string)
+{
+	gint tmp_start, tmp_end, new_start_pos;
+	gboolean ret;
+
+	if (!new_string || (!start_pos && !end_pos))
+		return g_match_info_fetch_pos(match_info, match_num, start_pos, end_pos);
+
+	ret = g_match_info_fetch_pos(match_info, match_num, &tmp_start, &tmp_end);
+	if (start_pos || end_pos) {
+		gchar *to_start = g_strndup(new_string, tmp_start);
+		new_start_pos = strlen_pua_oddly(to_start);
+		g_free_not_null(to_start);
+
+		if (start_pos)
+			*start_pos = new_start_pos;
+
+		if (end_pos) {
+			gchar *to_end = g_strndup(new_string + tmp_start, tmp_end - tmp_start);
+			*end_pos = new_start_pos + strlen_pua_oddly(to_end);
+			g_free_not_null(to_end);
+		}
+	}
+	return ret;
+}
diff --git a/src/core/iregex-regexh.c b/src/core/iregex-regexh.c
new file mode 100644
index 00000000..aabe44f6
--- /dev/null
+++ b/src/core/iregex-regexh.c
@@ -0,0 +1,101 @@
+#include "iregex.h"
+
+Regex *
+i_regex_new (const gchar *pattern,
+             GRegexCompileFlags compile_options,
+             GRegexMatchFlags match_options,
+             GError **error)
+{
+	Regex *regex;
+	char *errbuf;
+	int cflags;
+	int errcode, errbuf_len;
+
+	regex = g_new0(Regex, 1);
+	cflags = REG_EXTENDED;
+	if (compile_options & G_REGEX_CASELESS)
+		cflags |= REG_ICASE;
+	if (compile_options & G_REGEX_MULTILINE)
+		cflags |= REG_NEWLINE;
+	if (match_options & G_REGEX_MATCH_NOTBOL)
+		cflags |= REG_NOTBOL;
+	if (match_options & G_REGEX_MATCH_NOTEOL)
+		cflags |= REG_NOTEOL;
+
+	errcode = regcomp(regex, pattern, cflags);
+	if (errcode != 0) {
+		errbuf_len = regerror(errcode, regex, 0, 0);
+		errbuf = g_malloc(errbuf_len);
+		regerror(errcode, regex, errbuf, errbuf_len);
+		g_set_error(error, G_REGEX_ERROR, errcode, "%s", errbuf);
+		g_free(errbuf);
+		g_free(regex);
+		return NULL;
+	} else {
+		return regex;
+	}
+}
+
+void
+i_regex_unref (Regex *regex)
+{
+	regfree(regex);
+	g_free(regex);
+}
+
+gboolean
+i_regex_match (const Regex *regex,
+               const gchar *string,
+               GRegexMatchFlags match_options,
+               MatchInfo **match_info,
+               const gchar **new_string)
+{
+	int groups;
+	int eflags;
+
+	g_return_val_if_fail(regex != NULL, FALSE);
+
+	if (match_info != NULL) {
+		groups = 1 + regex->re_nsub;
+		*match_info = g_new0(MatchInfo, groups);
+	} else {
+		groups = 0;
+	}
+
+	eflags = 0;
+	if (match_options & G_REGEX_MATCH_NOTBOL)
+		eflags |= REG_NOTBOL;
+	if (match_options & G_REGEX_MATCH_NOTEOL)
+		eflags |= REG_NOTEOL;
+
+	return regexec(regex, string, groups, groups ? *match_info : NULL, eflags) == 0;
+}
+
+gboolean
+i_match_info_fetch_pos (const MatchInfo *match_info,
+                        gint match_num,
+                        gint *start_pos,
+                        gint *end_pos,
+                        const gchar *new_string)
+{
+	if (start_pos != NULL)
+		*start_pos = match_info[match_num].rm_so;
+	if (end_pos != NULL)
+		*end_pos = match_info[match_num].rm_eo;
+
+	return TRUE;
+}
+
+gboolean
+i_match_info_matches (const MatchInfo *match_info)
+{
+	g_return_val_if_fail(match_info != NULL, FALSE);
+
+	return match_info[0].rm_so != -1;
+}
+
+void
+i_match_info_free (MatchInfo *match_info)
+{
+	g_free(match_info);
+}
diff --git a/src/core/iregex.h b/src/core/iregex.h
new file mode 100644
index 00000000..adeea987
--- /dev/null
+++ b/src/core/iregex.h
@@ -0,0 +1,52 @@
+#ifndef __REGEX_H
+#define __REGEX_H
+
+#include "common.h"
+
+#ifdef USE_GREGEX
+
+#include <glib.h>
+typedef	GRegex Regex;
+typedef	GMatchInfo MatchInfo;
+
+#define i_match_info_matches g_match_info_matches
+#define i_match_info_free g_match_info_free
+
+#else
+
+#include <regex.h>
+typedef	regex_t Regex;
+typedef regmatch_t MatchInfo;
+
+gboolean
+i_match_info_matches (const MatchInfo *match_info);
+
+void
+i_match_info_free (MatchInfo *match_info);
+
+#endif
+
+Regex *
+i_regex_new (const gchar *pattern,
+             GRegexCompileFlags compile_options,
+             GRegexMatchFlags match_options,
+             GError **error);
+
+void
+i_regex_unref (Regex *regex);
+
+gboolean
+i_regex_match (const Regex *regex,
+               const gchar *string,
+               GRegexMatchFlags match_options,
+               MatchInfo **match_info,
+               const gchar **new_string);
+
+gboolean
+i_match_info_fetch_pos (const MatchInfo *match_info,
+                        gint match_num,
+                        gint *start_pos,
+                        gint *end_pos,
+                        const gchar *new_string);
+
+#endif
diff --git a/src/core/misc.c b/src/core/misc.c
index 0f038cbb..4b1e72f6 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -22,10 +22,6 @@
 #include "misc.h"
 #include "commands.h"
 
-#ifndef USE_GREGEX
-#  include <regex.h>
-#endif
-
 typedef struct {
 	int condition;
 	GInputFunction function;
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 800e881d..03fd4dd2 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -58,13 +58,8 @@ static void ignore_print(int index, IGNORE_REC *rec)
 		g_string_append(options, "-regexp ");
 		if (rec->pattern == NULL)
 			g_string_append(options, "[INVALID! -pattern missing] ");
-#ifdef USE_GREGEX
 		else if (rec->preg == NULL)
 			g_string_append(options, "[INVALID!] ");
-#else
-		else if (!rec->regexp_compiled)
-			g_string_append(options, "[INVALID!] ");
-#endif
 	}
 	if (rec->fullword) g_string_append(options, "-full ");
 	if (rec->replies) g_string_append(options, "-replies ");
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index dd38be87..6a2c97dc 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -26,6 +26,7 @@
 #include "misc.h"
 #include "lib-config/iconfig.h"
 #include "settings.h"
+#include "iregex.h"
 
 #include "servers.h"
 #include "channels.h"
@@ -101,11 +102,7 @@ static void hilight_destroy(HILIGHT_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
 
-#ifdef USE_GREGEX
-	if (rec->preg != NULL) g_regex_unref(rec->preg);
-#else
-	if (rec->regexp_compiled) regfree(&rec->preg);
-#endif
+	if (rec->preg != NULL) i_regex_unref(rec->preg);
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->color);
 	g_free_not_null(rec->act_color);
@@ -122,19 +119,10 @@ static void hilights_destroy_all(void)
 
 static void hilight_init_rec(HILIGHT_REC *rec)
 {
-#ifdef USE_GREGEX
 	if (rec->preg != NULL)
-		g_regex_unref(rec->preg);
+		i_regex_unref(rec->preg);
 
-	rec->preg = g_regex_new(rec->text, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, NULL);
-#else
-	if (rec->regexp_compiled) regfree(&rec->preg);
-	if (!rec->regexp)
-		rec->regexp_compiled = FALSE;
-	else
-		rec->regexp_compiled = regcomp(&rec->preg, rec->text,
-				rec->case_sensitive ? REG_EXTENDED : (REG_EXTENDED|REG_ICASE)) == 0;
-#endif
+	rec->preg = i_regex_new(rec->text, G_REGEX_OPTIMIZE | G_REGEX_CASELESS, 0, NULL);
 }
 
 void hilight_create(HILIGHT_REC *rec)
@@ -207,30 +195,18 @@ static gboolean hilight_match_text(HILIGHT_REC *rec, const char *text,
 	gboolean ret = FALSE;
 
 	if (rec->regexp) {
-#ifdef USE_GREGEX
 		if (rec->preg != NULL) {
-			GMatchInfo *match;
+			MatchInfo *match;
+			const char *new_text = NULL;
 
-			g_regex_match (rec->preg, text, 0, &match);
+			i_regex_match(rec->preg, text, 0, &match, &new_text);
 
-			if (g_match_info_matches(match))
-				ret = g_match_info_fetch_pos(match, 0, match_beg, match_end);
+			if (i_match_info_matches(match))
+				ret = i_match_info_fetch_pos(match, 0, match_beg, match_end, new_text);
 
-			g_match_info_free(match);
+			i_match_info_free(match);
+			g_free_not_null((char *)new_text);
 		}
-#else
-		regmatch_t rmatch[1];
-
-		if (rec->regexp_compiled &&
-			regexec(&rec->preg, text, 1, rmatch, 0) == 0) {
-			if (rmatch[0].rm_so > 0 &&
-				match_beg != NULL && match_end != NULL) {
-				*match_beg = rmatch[0].rm_so;
-				*match_end = rmatch[0].rm_eo;
-			}
-			ret = TRUE;
-		}
-#endif
 	} else {
 		char *match;
 
@@ -524,13 +500,8 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 	if (rec->case_sensitive) g_string_append(options, "-matchcase ");
 	if (rec->regexp) {
 		g_string_append(options, "-regexp ");
-#ifdef USE_GREGEX
 		if (rec->preg == NULL)
 			g_string_append(options, "[INVALID!] ");
-#else
-		if (!rec->regexp_compiled)
-			g_string_append(options, "[INVALID!] ");
-#endif
 	}
 
 	if (rec->priority != 0)
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 76beec1f..1d942f29 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -1,10 +1,7 @@
 #ifndef __HILIGHT_TEXT_H
 #define __HILIGHT_TEXT_H
 
-#ifndef USE_GREGEX
-#  include <regex.h>
-#endif
-
+#include "iregex.h"
 #include "formats.h"
 
 struct _HILIGHT_REC {
@@ -24,12 +21,7 @@ struct _HILIGHT_REC {
 	unsigned int fullword:1; /* match `text' only for full words */
 	unsigned int regexp:1; /* `text' is a regular expression */
 	unsigned int case_sensitive:1;/* `text' must match case */
-#ifdef USE_GREGEX
-	GRegex *preg;
-#else
-	unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
-	regex_t preg;
-#endif
+	Regex *preg;
 	char *servertag;
 };
 
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 3668f4c7..eb841096 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -24,13 +24,10 @@
 #include "misc.h"
 #include "formats.h"
 #include "utf8.h"
+#include "iregex.h"
 
 #include "textbuffer.h"
 
-#ifndef USE_GREGEX
-#  include <regex.h>
-#endif
-
 #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*))
 
 TEXT_BUFFER_REC *textbuffer_create(void)
@@ -545,11 +542,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			    int before, int after,
 			    int regexp, int fullword, int case_sensitive)
 {
-#ifdef USE_GREGEX
-	GRegex *preg;
-#else
-	regex_t preg;
-#endif
+	Regex *preg;
         LINE_REC *line, *pre_line;
 	GList *matches;
 	GString *str;
@@ -559,23 +552,14 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 	g_return_val_if_fail(buffer != NULL, NULL);
 	g_return_val_if_fail(text != NULL, NULL);
 
-#ifdef USE_GREGEX
 	preg = NULL;
 
 	if (regexp) {
-		preg = g_regex_new(text, G_REGEX_RAW | (case_sensitive ? 0 : G_REGEX_CASELESS), 0, NULL);
+		preg = i_regex_new(text, case_sensitive ? 0 : G_REGEX_CASELESS, 0, NULL);
 
 		if (preg == NULL)
 			return NULL;
 	}
-#else
-	if (regexp) {
-		int flags = REG_EXTENDED | REG_NOSUB |
-			(case_sensitive ? 0 : REG_ICASE);
-		if (regcomp(&preg, text, flags) != 0)
-			return NULL;
-	}
-#endif
 
 	matches = NULL; match_after = 0;
         str = g_string_new(NULL);
@@ -592,17 +576,16 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			(line->info.level & nolevel) == 0;
 
 		if (*text != '\0') {
+			const char *tmp = NULL;
 			textbuffer_line2text(line, FALSE, str);
 
 			if (line_matched) {
 				line_matched = regexp ?
-#ifdef USE_GREGEX
-				    g_regex_match(preg, str->str, 0, NULL)
-#else
-				    regexec(&preg, str->str, 0, NULL, 0) == 0
-#endif
+					i_regex_match(preg, str->str, 0, NULL, &tmp)
 					: match_func(str->str, text) != NULL;
 			}
+			if (tmp && tmp != str->str)
+				g_free_not_null((char *)tmp);
 		}
 
 		if (line_matched) {
@@ -631,12 +614,8 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 		}
 	}
 
-#ifdef USE_GREGEX
 	if (preg != NULL)
-		g_regex_unref(preg);
-#else
-	if (regexp) regfree(&preg);
-#endif
+		i_regex_unref(preg);
         g_string_free(str, TRUE);
 	return matches;
 }

From e84adeca15084a82c04ff6c3b5c7b8941c297322 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Sun, 4 Jun 2017 17:41:38 +0200
Subject: [PATCH 0566/1650] change ternary operator to if/else statements, add
 default ssl port support

---
 src/common.h                   |  1 +
 src/fe-common/core/fe-server.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/common.h b/src/common.h
index b6f9153e..ddbb1deb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -9,6 +9,7 @@
 #define IRSSI_ABI_VERSION 9
 
 #define DEFAULT_SERVER_ADD_PORT 6667
+#define DEFAULT_SERVER_ADD_TLS_PORT 6697
 
 #ifdef HAVE_CONFIG_H
 #include "irssi-config.h"
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 46d25ae9..6e373139 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -119,10 +119,15 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	value = g_hash_table_lookup(optlist, "port");
-	port = *portstr == '\0' ?
-			(value != NULL && *value != '\0' ?
-			atoi(value) : DEFAULT_SERVER_ADD_PORT)
-		: atoi(portstr);
+
+	if (*portstr != '\0')
+		port = atoi(portstr);
+	else if (value != NULL && *value != '\0')
+		port = atoi(value);
+	else if (g_hash_table_lookup(optlist, "tls"))
+		port = DEFAULT_SERVER_ADD_TLS_PORT;
+	else
+		port = DEFAULT_SERVER_ADD_PORT;
 
 	chatnet = g_hash_table_lookup(optlist, "network");
 

From 78a390f4796a97a3624feee2728018484c8485f8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 4 Jun 2017 19:03:40 +0200
Subject: [PATCH 0567/1650] abi up

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index b6f9153e..b4fc6d28 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 9
+#define IRSSI_ABI_VERSION 10
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 

From f28c64a3dc1e66f9d1e49650d5b2ab15795b9e53 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Sun, 4 Jun 2017 19:47:30 +0200
Subject: [PATCH 0568/1650] Make backward compatible with ssl flags

---
 src/fe-common/core/fe-server.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 6e373139..75f857c2 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -124,7 +124,8 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		port = atoi(portstr);
 	else if (value != NULL && *value != '\0')
 		port = atoi(value);
-	else if (g_hash_table_lookup(optlist, "tls"))
+	else if (g_hash_table_lookup(optlist, "tls") ||
+		 g_hash_table_lookup(optlist, "ssl"))
 		port = DEFAULT_SERVER_ADD_TLS_PORT;
 	else
 		port = DEFAULT_SERVER_ADD_PORT;

From 00354c365187cecb9bc3ce3c3b3482e32d04729a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 5 Jun 2017 10:10:38 +0200
Subject: [PATCH 0569/1650] Update iregex-gregex.c

make helper functions static
---
 src/core/iregex-gregex.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/iregex-gregex.c b/src/core/iregex-gregex.c
index 0de11e64..1a77d5b3 100644
--- a/src/core/iregex-gregex.c
+++ b/src/core/iregex-gregex.c
@@ -2,7 +2,7 @@
 
 #include "iregex.h"
 
-const gchar *
+static const gchar *
 make_valid_utf8(const gchar *text, gboolean *free_ret)
 {
 	GString *str;
@@ -82,7 +82,7 @@ i_regex_match (const Regex *regex,
 	return ret;
 }
 
-gsize
+static gsize
 strlen_pua_oddly(const char *str)
 {
 	const gchar *ptr;

From 48899a123d68051fbc73acb8ad151e89fdcb6b31 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 5 Jun 2017 10:23:16 +0200
Subject: [PATCH 0570/1650] Update iregex-gregex.c

add 2 comments about new_string
---
 src/core/iregex-gregex.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/iregex-gregex.c b/src/core/iregex-gregex.c
index 1a77d5b3..4a1623b9 100644
--- a/src/core/iregex-gregex.c
+++ b/src/core/iregex-gregex.c
@@ -60,7 +60,9 @@ i_regex_unref (Regex *regex)
 }
 
 /* if new_string is present, the caller must free new_string.
-   otherwise, g_match_info_get_string must not be used. */
+   otherwise, g_match_info_get_string must not be used.
+   if string is not vali utf8, new_string will be assigned
+   a similar, but valid utf8, string */
 gboolean
 i_regex_match (const Regex *regex,
                const gchar *string,
@@ -105,6 +107,9 @@ strlen_pua_oddly(const char *str)
 	return ret;
 }
 
+/* new_string should be passed in here from the i_regex_match call. 
+   The start_pos and end_pos will then be calculated as if they were on
+   the original string */
 gboolean
 i_match_info_fetch_pos (const MatchInfo *match_info,
                         gint match_num,

From 4edfccfce794d4c10b2a92c02fe982bb089c6629 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 5 Jun 2017 11:41:50 +0200
Subject: [PATCH 0571/1650] get rid of new_text

---
 src/core/ignore.c                 |  2 +-
 src/core/iregex-gregex.c          | 55 ++++++++++++++++++++++---------
 src/core/iregex-regexh.c          |  6 ++--
 src/core/iregex.h                 | 15 +++------
 src/fe-common/core/hilight-text.c |  7 ++--
 src/fe-text/textbuffer.c          |  5 +--
 6 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 63a507f5..cec91e6b 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -69,7 +69,7 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
 
 	if (rec->regexp) {
 		return rec->preg != NULL &&
-			i_regex_match(rec->preg, text, 0, NULL, NULL);
+			i_regex_match(rec->preg, text, 0, NULL);
 	}
 
 	return rec->fullword ?
diff --git a/src/core/iregex-gregex.c b/src/core/iregex-gregex.c
index 4a1623b9..36b4faa4 100644
--- a/src/core/iregex-gregex.c
+++ b/src/core/iregex-gregex.c
@@ -2,6 +2,11 @@
 
 #include "iregex.h"
 
+struct _MatchInfo {
+	const char *valid_string;
+	GMatchInfo *g_match_info;
+};
+
 static const gchar *
 make_valid_utf8(const gchar *text, gboolean *free_ret)
 {
@@ -59,28 +64,29 @@ i_regex_unref (Regex *regex)
 	g_regex_unref(regex);
 }
 
-/* if new_string is present, the caller must free new_string.
-   otherwise, g_match_info_get_string must not be used.
-   if string is not vali utf8, new_string will be assigned
-   a similar, but valid utf8, string */
 gboolean
 i_regex_match (const Regex *regex,
                const gchar *string,
                GRegexMatchFlags match_options,
-               MatchInfo **match_info,
-               const gchar **new_string)
+               MatchInfo **match_info)
 {
 	gboolean ret;
 	gboolean free_valid_string;
 	const gchar *valid_string = make_valid_utf8(string, &free_valid_string);
 
-	ret = g_regex_match(regex, valid_string, match_options, match_info);
+	if (match_info != NULL)
+		*match_info = g_new0(MatchInfo, 1);
+
+	ret = g_regex_match(regex, valid_string, match_options,
+			    match_info != NULL ? &(*match_info)->g_match_info : NULL);
+
 	if (free_valid_string) {
-		if (new_string)
-			*new_string = valid_string;
+		if (match_info != NULL)
+			(*match_info)->valid_string = valid_string;
 		else
 			g_free_not_null((gchar *)valid_string);
 	}
+
 	return ret;
 }
 
@@ -114,18 +120,20 @@ gboolean
 i_match_info_fetch_pos (const MatchInfo *match_info,
                         gint match_num,
                         gint *start_pos,
-                        gint *end_pos,
-                        const gchar *new_string)
+                        gint *end_pos)
 {
 	gint tmp_start, tmp_end, new_start_pos;
 	gboolean ret;
 
-	if (!new_string || (!start_pos && !end_pos))
-		return g_match_info_fetch_pos(match_info, match_num, start_pos, end_pos);
+	if (!match_info->valid_string || (!start_pos && !end_pos))
+		return g_match_info_fetch_pos(match_info->g_match_info,
+					      match_num, start_pos, end_pos);
 
-	ret = g_match_info_fetch_pos(match_info, match_num, &tmp_start, &tmp_end);
+	ret = g_match_info_fetch_pos(match_info->g_match_info,
+				     match_num, &tmp_start, &tmp_end);
 	if (start_pos || end_pos) {
-		gchar *to_start = g_strndup(new_string, tmp_start);
+		const gchar *str = match_info->valid_string;
+		gchar *to_start = g_strndup(str, tmp_start);
 		new_start_pos = strlen_pua_oddly(to_start);
 		g_free_not_null(to_start);
 
@@ -133,10 +141,25 @@ i_match_info_fetch_pos (const MatchInfo *match_info,
 			*start_pos = new_start_pos;
 
 		if (end_pos) {
-			gchar *to_end = g_strndup(new_string + tmp_start, tmp_end - tmp_start);
+			gchar *to_end = g_strndup(str + tmp_start, tmp_end - tmp_start);
 			*end_pos = new_start_pos + strlen_pua_oddly(to_end);
 			g_free_not_null(to_end);
 		}
 	}
 	return ret;
 }
+
+gboolean
+i_match_info_matches (const MatchInfo *match_info)
+{
+	g_return_val_if_fail(match_info != NULL, FALSE);
+
+	return g_match_info_matches(match_info->g_match_info);
+}
+
+void
+i_match_info_free (MatchInfo *match_info)
+{
+	g_match_info_free(match_info->g_match_info);
+	g_free(match_info);
+}
diff --git a/src/core/iregex-regexh.c b/src/core/iregex-regexh.c
index aabe44f6..897eb7e2 100644
--- a/src/core/iregex-regexh.c
+++ b/src/core/iregex-regexh.c
@@ -47,8 +47,7 @@ gboolean
 i_regex_match (const Regex *regex,
                const gchar *string,
                GRegexMatchFlags match_options,
-               MatchInfo **match_info,
-               const gchar **new_string)
+               MatchInfo **match_info)
 {
 	int groups;
 	int eflags;
@@ -75,8 +74,7 @@ gboolean
 i_match_info_fetch_pos (const MatchInfo *match_info,
                         gint match_num,
                         gint *start_pos,
-                        gint *end_pos,
-                        const gchar *new_string)
+                        gint *end_pos)
 {
 	if (start_pos != NULL)
 		*start_pos = match_info[match_num].rm_so;
diff --git a/src/core/iregex.h b/src/core/iregex.h
index adeea987..e67378d7 100644
--- a/src/core/iregex.h
+++ b/src/core/iregex.h
@@ -7,10 +7,7 @@
 
 #include <glib.h>
 typedef	GRegex Regex;
-typedef	GMatchInfo MatchInfo;
-
-#define i_match_info_matches g_match_info_matches
-#define i_match_info_free g_match_info_free
+typedef	struct _MatchInfo MatchInfo;
 
 #else
 
@@ -18,14 +15,14 @@ typedef	GMatchInfo MatchInfo;
 typedef	regex_t Regex;
 typedef regmatch_t MatchInfo;
 
+#endif
+
 gboolean
 i_match_info_matches (const MatchInfo *match_info);
 
 void
 i_match_info_free (MatchInfo *match_info);
 
-#endif
-
 Regex *
 i_regex_new (const gchar *pattern,
              GRegexCompileFlags compile_options,
@@ -39,14 +36,12 @@ gboolean
 i_regex_match (const Regex *regex,
                const gchar *string,
                GRegexMatchFlags match_options,
-               MatchInfo **match_info,
-               const gchar **new_string);
+               MatchInfo **match_info);
 
 gboolean
 i_match_info_fetch_pos (const MatchInfo *match_info,
                         gint match_num,
                         gint *start_pos,
-                        gint *end_pos,
-                        const gchar *new_string);
+                        gint *end_pos);
 
 #endif
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 6a2c97dc..62e6f0de 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -197,15 +197,12 @@ static gboolean hilight_match_text(HILIGHT_REC *rec, const char *text,
 	if (rec->regexp) {
 		if (rec->preg != NULL) {
 			MatchInfo *match;
-			const char *new_text = NULL;
-
-			i_regex_match(rec->preg, text, 0, &match, &new_text);
+			i_regex_match(rec->preg, text, 0, &match);
 
 			if (i_match_info_matches(match))
-				ret = i_match_info_fetch_pos(match, 0, match_beg, match_end, new_text);
+				ret = i_match_info_fetch_pos(match, 0, match_beg, match_end);
 
 			i_match_info_free(match);
-			g_free_not_null((char *)new_text);
 		}
 	} else {
 		char *match;
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index eb841096..9e791f4c 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -576,16 +576,13 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			(line->info.level & nolevel) == 0;
 
 		if (*text != '\0') {
-			const char *tmp = NULL;
 			textbuffer_line2text(line, FALSE, str);
 
 			if (line_matched) {
 				line_matched = regexp ?
-					i_regex_match(preg, str->str, 0, NULL, &tmp)
+					i_regex_match(preg, str->str, 0, NULL)
 					: match_func(str->str, text) != NULL;
 			}
-			if (tmp && tmp != str->str)
-				g_free_not_null((char *)tmp);
 		}
 
 		if (line_matched) {

From 52bb06ccd9f9bd639a454045eba1235e4133b034 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 5 Jun 2017 15:58:43 -0300
Subject: [PATCH 0572/1650] fe-dcc-(get|send): Fix some -Wpointer-compare with
 newer gcc

The warning itself:

>warning: comparison between pointer and zero character constant [-Wpointer-compare]

Harmless stuff as far as I can tell.

The fix adds a null check that probably isn't needed. The old code that
compared against '\0' worked a lot like a null check so it makes sense
to keep that, while also adding the intended check for empty string.

This was visible with "/dcc close send a" showing an empty filename.
The equivalent for get didn't show the filename in the format string.
---
 src/fe-common/irc/dcc/fe-dcc-get.c  | 2 +-
 src/fe-common/irc/dcc/fe-dcc-send.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/irc/dcc/fe-dcc-get.c b/src/fe-common/irc/dcc/fe-dcc-get.c
index 675cab65..99b6b963 100644
--- a/src/fe-common/irc/dcc/fe-dcc-get.c
+++ b/src/fe-common/irc/dcc/fe-dcc-get.c
@@ -108,7 +108,7 @@ static void dcc_error_close_not_found(const char *type, const char *nick,
 	g_return_if_fail(fname != NULL);
 	if (g_ascii_strcasecmp(type, "GET") != 0) return;
 
-	if (fname == '\0') fname = "(ANY)";
+	if (fname == NULL || *fname == '\0') fname = "(ANY)";
 	printformat(NULL, NULL, MSGLEVEL_DCC,
 		    IRCTXT_DCC_GET_NOT_FOUND, nick, fname);
 }
diff --git a/src/fe-common/irc/dcc/fe-dcc-send.c b/src/fe-common/irc/dcc/fe-dcc-send.c
index 1fc43abd..7920bedc 100644
--- a/src/fe-common/irc/dcc/fe-dcc-send.c
+++ b/src/fe-common/irc/dcc/fe-dcc-send.c
@@ -108,7 +108,7 @@ static void dcc_error_close_not_found(const char *type, const char *nick,
 	g_return_if_fail(fname != NULL);
 	if (g_ascii_strcasecmp(type, "SEND") != 0) return;
 
-	if (fname == '\0') fname = "(ANY)";
+	if (fname == NULL || *fname == '\0') fname = "(ANY)";
 	printformat(NULL, NULL, MSGLEVEL_DCC,
 		    IRCTXT_DCC_SEND_NOT_FOUND, nick, fname);
 }

From 0e44ea891645044f47bf3754e141045ee3b24324 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 5 Jun 2017 16:05:00 -0300
Subject: [PATCH 0573/1650] Performance improvements for /lastlog with big
 result sets

This applies to "/lastlog" with no filters (or with filters that don't
filter a lot) and with large amounts of text in the scrollback.

Test case:

    /exec seq 1 500000
    /lastlog -file log.txt

Thanks to morning for reporting this.
---
 src/fe-text/textbuffer.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 3668f4c7..fdb95451 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -616,21 +616,23 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			}
 
 			for (; pre_line != line; pre_line = pre_line->next)
-				matches = g_list_append(matches, pre_line);
+				matches = g_list_prepend(matches, pre_line);
 
 			match_after = after;
 		}
 
 		if (line_matched || match_after > 0) {
 			/* matched */
-			matches = g_list_append(matches, line);
+			matches = g_list_prepend(matches, line);
 
 			if ((!line_matched && --match_after == 0) ||
 			    (line_matched && match_after == 0 && before > 0))
-				matches = g_list_append(matches, NULL);
+				matches = g_list_prepend(matches, NULL);
 		}
 	}
 
+	matches = g_list_reverse(matches);
+
 #ifdef USE_GREGEX
 	if (preg != NULL)
 		g_regex_unref(preg);

From e498265328bd619b231ea4c985734ea43bf89696 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 5 Jun 2017 18:04:20 -0300
Subject: [PATCH 0574/1650] Performance improvements for /lastlog -before

This avoids the use of g_list_find() to find if a match was already
added to the list of results, by checking the last two added matches
instead.

Checking just the last match isn't enough because a NULL match is added
as a separator (shown as -- in the UI)
---
 src/fe-text/textbuffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index fdb95451..1f587f97 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -610,7 +610,8 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			pre_line = line;
 			for (i = 0; i < before; i++) {
 				if (pre_line->prev == NULL ||
-				    g_list_find(matches, pre_line->prev) != NULL)
+				    g_list_nth_data(matches, 0) == pre_line->prev ||
+				    g_list_nth_data(matches, 1) == pre_line->prev)
 					break;
                                 pre_line = pre_line->prev;
 			}

From fc67fd5111ac84cd101d961fc9a5b0bc1b25613b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Tue, 6 Jun 2017 21:06:35 +0200
Subject: [PATCH 0575/1650] Merge tag '1.0.3'

---
 NEWS | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/NEWS b/NEWS
index af330804..b0a895ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,23 @@
 v1.1-head 2017-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.0.3 2017-06-06  The Irssi team <staff@irssi.org>
+	- Fix out of bounds read when scanning expandos (GL!11).
+	- Fix invalid memory access with quoted filenames in DCC
+	  (GL#8, GL!12).
+	- Fix null-pointer dereference on DCC without address (GL#9, GL!13).
+	- Improve integer overflow handling. Originally reported by
+          oss-fuzz#525 (#706).
+	- Improve nicklist performance from O(N^2) to O(N) (#705).
+	- Fix initial screen redraw delay. By Stephen Oberholtzer
+	  (#680, bdo#856201).
+	- Fix incorrect reset of true colours when resetting background. (#711).
+	- Fix missing -notls option in /SERVER. By Jari Matilainen (#117, #702).
+	- Fix minor history glitch on overcounter (#462, #685).
+	- Improved OpenSSL detection at compile time. By Rodrigo Rebello (#677).
+	- Improved NetBSD Terminfo detection. By Maya Rashish (#694, #698).
+	- Add missing syntax info for COMPLETION (#687, #688).
+	- Minor typo correction in help. By Michael Hansen (#707).
+
 v1.0.2 2017-03-10  The Irssi team <staff@irssi.org>
 	- Prevent some null-pointer crashes (GL!9).
 	- Fix compilation with OpenSSL 1.1.0 (#628, #597).

From 4b1c60b2ecb030550716647bffb0f9dd7e97c31a Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 17 Jun 2017 13:47:13 -0300
Subject: [PATCH 0576/1650] term-terminfo: Avoid switching out of alt screen on
 unexpected exits

Perl sucks and kills the whole process when there's a version mismatch
in Perl_xs_handshake(). Our atexit handler catches the exit and
deinitializes the terminal, removing the error.

This commit uses the 'quitting' global variable which is set when irssi
is voluntarily quitting, and avoids sending TI_rmcup, which restores the
original screen and makes the error invisible.
---
 src/fe-text/term-terminfo.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 3098a4e4..bca37efc 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -102,6 +102,17 @@ static GSourceFuncs sigcont_funcs = {
 	.dispatch = sigcont_dispatch
 };
 
+static void term_atexit(void)
+{
+	if (!quitting && current_term && current_term->TI_rmcup) {
+		/* Unexpected exit, avoid switching out of alternate screen
+		   to keep any on-screen errors (like noperl_die()'s) */
+		current_term->TI_rmcup = NULL;
+	}
+
+	term_deinit();
+}
+
 int term_init(void)
 {
 	struct sigaction act;
@@ -140,7 +151,7 @@ int term_init(void)
 
         term_set_input_type(TERM_TYPE_8BIT);
 	term_common_init();
-        atexit(term_deinit);
+	atexit(term_atexit);
         return TRUE;
 }
 

From 7354a74c654f1717d08a37c2b118141655974bc0 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 17 Jun 2017 14:30:37 -0300
Subject: [PATCH 0577/1650] parse_time_interval: Allow negative time in
 settings

This splits sign parsing out of parse_time_interval_uint() so that the
negative sign is applied outside of the unsigned context where the
number parsing is done, and after all the checks that it's lower than
(1 << 31)

This fixes issues with settings like `server_reconnect_time`,
`server_connect_timeout` and `lag_max_before_disconnect`, which accepted
-1 as a valid value.
---
 src/core/misc.c | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 0f038cbb..ce49925b 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -781,24 +781,35 @@ int parse_uint(const char *nptr, char **endptr, int base, guint *number)
 	return TRUE;
 }
 
+static int parse_number_sign(const char *input, char **endptr, int *sign)
+{
+	int sign_ = 1;
+
+	while (i_isspace(*input))
+		input++;
+
+	if (*input == '-') {
+		sign_ = -sign_;
+		input++;
+	}
+
+	*sign = sign_;
+	*endptr = (char *) input;
+	return TRUE;
+}
+
 static int parse_time_interval_uint(const char *time, guint *msecs)
 {
 	const char *desc;
 	guint number;
-	int sign, len, ret, digits;
+	int len, ret, digits;
 
 	*msecs = 0;
 
 	/* max. return value is around 24 days */
-	number = 0; sign = 1; ret = TRUE; digits = FALSE;
+	number = 0; ret = TRUE; digits = FALSE;
 	while (i_isspace(*time))
 		time++;
-	if (*time == '-') {
-		sign = -sign;
-		time++;
-		while (i_isspace(*time))
-			time++;
-	}
 	for (;;) {
 		if (i_isdigit(*time)) {
 			char *endptr;
@@ -828,7 +839,6 @@ static int parse_time_interval_uint(const char *time, guint *msecs)
 			if (*time != '\0')
 				return FALSE;
 			*msecs += number * 1000; /* assume seconds */
-			*msecs *= sign;
 			return TRUE;
 		}
 
@@ -866,7 +876,6 @@ static int parse_time_interval_uint(const char *time, guint *msecs)
 		digits = FALSE;
 	}
 
-	*msecs *= sign;
 	return ret;
 }
 
@@ -960,15 +969,18 @@ int parse_size(const char *size, int *bytes)
 int parse_time_interval(const char *time, int *msecs)
 {
 	guint msecs_;
-	int ret;
+	char *number;
+	int ret, sign;
 
-	ret = parse_time_interval_uint(time, &msecs_);
+	parse_number_sign(time, &number, &sign);
+
+	ret = parse_time_interval_uint(number, &msecs_);
 
 	if (msecs_ > (1U << 31)) {
 		return FALSE;
 	}
 
-	*msecs = msecs_;
+	*msecs = msecs_ * sign;
 	return ret;
 }
 

From 02a5d1a00b4f484b4b2422785944e022810bbbb0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Jun 2017 14:09:02 +0200
Subject: [PATCH 0578/1650] fix weird n-fold unescaping

---
 src/fe-common/core/chat-completion.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 1f00feaf..1c9db28e 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -1011,13 +1011,17 @@ static void sig_complete_target(GList **list, WINDOW_REC *window,
 	}
 }
 
+static void event_text(const char *data, SERVER_REC *server, WI_ITEM_REC *item);
+
 /* expand \n, \t and \\ */
 static char *expand_escapes(const char *line, SERVER_REC *server,
 			    WI_ITEM_REC *item)
 {
 	char *ptr, *ret;
-        int chr;
+	const char *prev;
+	int chr;
 
+	prev = line;
 	ret = ptr = g_malloc(strlen(line)+1);
 	for (; *line != '\0'; line++) {
 		if (*line != '\\') {
@@ -1036,9 +1040,11 @@ static char *expand_escapes(const char *line, SERVER_REC *server,
 			/* newline .. we need to send another "send text"
 			   event to handle it (or actually the text before
 			   the newline..) */
-			if (ret != ptr) {
-				*ptr = '\0';
-				signal_emit("send text", 3, ret, server, item);
+			if (prev != line) {
+				const char *prev_line = g_strndup(prev, (line - prev) - 1);
+				event_text(prev_line, server, item);
+				g_free((char *)prev_line);
+				prev = line + 1;
 				ptr = ret;
 			}
 		} else if (chr != -1) {

From 12d671a05645d67e811264d5be06d9758458452f Mon Sep 17 00:00:00 2001
From: Oscar Linderholm <osm@recv.se>
Date: Wed, 21 Jun 2017 10:40:01 +0200
Subject: [PATCH 0579/1650] Escape nicks during nick completion when
 expand_escapes is enabled

Fixes #693
---
 src/fe-common/core/completion.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index a97adc21..78b1b24b 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -137,8 +137,9 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
         int old_startpos, old_wordlen;
 
 	GString *result;
-	char *word, *wordstart, *linestart, *ret;
-	int continue_complete, want_space;
+	const char *cmdchars;
+	char *word, *wordstart, *linestart, *ret, *data;
+	int continue_complete, want_space, expand_escapes;
 
 	g_return_val_if_fail(line != NULL, NULL);
 	g_return_val_if_fail(pos != NULL, NULL);
@@ -241,14 +242,24 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 	if (complist == NULL)
 		return NULL;
 
+        /* get the cmd char */
+	cmdchars = settings_get_str("cmdchars");
+
+	/* get the expand_escapes setting */
+	expand_escapes = settings_get_bool("expand_escapes");
+
+	/* escape if the word doesn't begin with '/' and expand_escapes are turned on */
+	data = strchr(cmdchars, *line) == NULL && expand_escapes ?
+		escape_string(complist->data) : g_strdup(complist->data);
+
 	/* word completed */
-	*pos = startpos+strlen(complist->data);
+	*pos = startpos + strlen(data);
 
 	/* replace the word in line - we need to return
 	   a full new line */
 	result = g_string_new(line);
 	g_string_erase(result, startpos, wordlen);
-	g_string_insert(result, startpos, complist->data);
+	g_string_insert(result, startpos, data);
 
 	if (want_space) {
 		if (!isseparator(result->str[*pos]))
@@ -256,13 +267,17 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 		(*pos)++;
 	}
 
-	wordlen = strlen(complist->data);
+	wordlen = strlen(data);
 	last_line_pos = *pos;
 	g_free_not_null(last_line);
 	last_line = g_strdup(result->str);
 
 	ret = result->str;
 	g_string_free(result, FALSE);
+
+	/* free the data */
+	g_free(data);
+
 	return ret;
 }
 

From bbf8b860747c13a478657b9070c191735d35e00a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 22 Jun 2017 09:33:33 +0200
Subject: [PATCH 0580/1650] remove const

---
 src/fe-common/core/chat-completion.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 1c9db28e..97cd0565 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -1041,9 +1041,9 @@ static char *expand_escapes(const char *line, SERVER_REC *server,
 			   event to handle it (or actually the text before
 			   the newline..) */
 			if (prev != line) {
-				const char *prev_line = g_strndup(prev, (line - prev) - 1);
+				char *prev_line = g_strndup(prev, (line - prev) - 1);
 				event_text(prev_line, server, item);
-				g_free((char *)prev_line);
+				g_free(prev_line);
 				prev = line + 1;
 				ptr = ret;
 			}

From b483ec5faa76dc38f2e338f89c54a6e4cd06c764 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 23 Jun 2017 12:03:05 +0200
Subject: [PATCH 0581/1650] test trusty container

---
 .travis.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 804dc58c..b4b93919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,15 @@
 sudo: false
+dist: trusty
 language: perl
 perl:
-    - "5.20-shrplib"
-    - "5.18-shrplib"
+    # ~stretch
+    - "5.24-shrplib"
+    # ~xenial
+    # - "5.22-shrplib"
+    # ~jessie
+    # - "5.20-shrplib"
+    # ~trusty
+    # - "5.18-shrplib"
     - "system-perl"
 env:
     - CC=clang

From 29ebac987da1da2c892aed5ed329256b7bc94bca Mon Sep 17 00:00:00 2001
From: Nei <ailin.nemui@gmail.com>
Date: Thu, 29 Jun 2017 13:48:44 +0000
Subject: [PATCH 0582/1650] Check return value of localtime

Fixes #10
---
 src/core/misc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/misc.c b/src/core/misc.c
index ce49925b..0b2d8e77 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -560,6 +560,9 @@ char *my_asctime(time_t t)
         int len;
 
 	tm = localtime(&t);
+	if (tm == NULL)
+	    return g_strdup("???");
+
 	str = g_strdup(asctime(tm));
 
 	len = strlen(str);

From 73b851c39c11d01199e6c040749fb20e468f6c8d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Jul 2017 16:10:55 +0200
Subject: [PATCH 0583/1650] correct GHashTable usage

---
 src/core/nicklist.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 54dfb5fb..0bc88ab8 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -54,23 +54,26 @@ static void nick_hash_add(CHANNEL_REC *channel, NICK_REC *nick)
 
 static void nick_hash_remove(CHANNEL_REC *channel, NICK_REC *nick)
 {
-	NICK_REC *list;
+	NICK_REC *list, *newlist;
 
 	list = g_hash_table_lookup(channel->nicks, nick->nick);
 	if (list == NULL)
 		return;
 
-	if (list == nick || list->next == NULL) {
-		g_hash_table_remove(channel->nicks, nick->nick);
-		if (list->next != NULL) {
-			g_hash_table_insert(channel->nicks, nick->next->nick,
-					    nick->next);
-		}
+	if (list == nick) {
+		newlist = nick->next;
 	} else {
+		newlist = list;
 		while (list->next != nick)
 			list = list->next;
 		list->next = nick->next;
 	}
+
+	g_hash_table_remove(channel->nicks, nick->nick);
+	if (newlist != NULL) {
+		g_hash_table_insert(channel->nicks, newlist->nick,
+				    newlist);
+	}
 }
 
 /* Add new nick to list */

From 5d7e54cd998ab48b1dc5d82aa74896bc9a91b705 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 5 Jul 2017 14:30:11 +0200
Subject: [PATCH 0584/1650] More accurately describe clear

---
 docs/help/in/clear.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/clear.in b/docs/help/in/clear.in
index d43830dd..affa7677 100644
--- a/docs/help/in/clear.in
+++ b/docs/help/in/clear.in
@@ -12,8 +12,8 @@
 
 %9Description:%9
 
-    Clears the window of all text; you may use this to clear a windows that
-    contains sensitive information or has rendered improperly.
+    Scrolls up the text in the window and fill the window with blank lines; you
+    may want to use this to make new text start at the top of the window again.
 
 %9See also:%9 REDRAW
 

From 8b82d741b79e1cbb68c9e01d85d344fa0dc817ca Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 5 Jul 2017 19:39:17 +0200
Subject: [PATCH 0585/1650] Update clear.in

---
 docs/help/in/clear.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/clear.in b/docs/help/in/clear.in
index affa7677..3b76a7c9 100644
--- a/docs/help/in/clear.in
+++ b/docs/help/in/clear.in
@@ -12,8 +12,8 @@
 
 %9Description:%9
 
-    Scrolls up the text in the window and fill the window with blank lines; you
+    Scrolls up the text in the window and fills the window with blank lines; you
     may want to use this to make new text start at the top of the window again.
 
-%9See also:%9 REDRAW
+%9See also:%9 REDRAW, SCROLLBACK CLEAR
 

From 91ec153c7f89ed96fa592ebae7a931fe50a4bb42 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Wed, 5 Jul 2017 21:30:59 +0200
Subject: [PATCH 0586/1650] Merge tag '1.0.4' into integrate/1.0.4

---
 NEWS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NEWS b/NEWS
index b0a895ad..feb52275 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
 v1.1-head 2017-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.0.4 2017-07-07  The Irssi team <staff@irssi.org>
+	- Fix null pointer dereference when parsing invalid timestamp (GL#10,
+	  GL!15). Reported by Brian 'geeknik' Carpenter.
+	- Fix use-after-free condition when removing nicks from the internal
+	  nicklist (GL#11, GL!16). Reported by Brian 'geeknik' Carpenter.
+	- Fix incorrect string comparison in DCC file names (#714).
+	- Fix regression in Irssi 1.0.3 where it would claim "Invalid time '-1'"
+	  (#716, #722).
+	- Fix a bug when using \n to separate lines with expand_escapes (#723).
+	- Retain screen output on improper exit, to better see any error
+	  messages (#287, #721).
+	- Minor help update (#729).
+
 v1.0.3 2017-06-06  The Irssi team <staff@irssi.org>
 	- Fix out of bounds read when scanning expandos (GL!11).
 	- Fix invalid memory access with quoted filenames in DCC

From 2bc10386610eba0fe5741228f143e89e1acd2a7d Mon Sep 17 00:00:00 2001
From: Tristan <tpepin96@gmail.com>
Date: Fri, 21 Jul 2017 20:40:29 -0400
Subject: [PATCH 0587/1650] Clarified ambiguous autogen.sh error

autogen.sh now instructs the user to install elinks or lynx if needed
---
 autogen.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autogen.sh b/autogen.sh
index 946f1ebb..60eb4fb8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,6 +39,7 @@ elif type links >/dev/null 2>&1 ; then
   links -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 else
   echo "**Error**: No lynx or elinks present"
+  echo "Install lynx or elinks, then run autogen.sh again"
   exit 1
 fi
 

From d971c0292082823182f333a412207a9a8f6ad008 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 17 Jun 2017 17:01:42 +0200
Subject: [PATCH 0588/1650] Allow the user to clear the sasl-related fields

There was no easy way for the user to disable the SASL authentication or
to clear the username/password once the network was created.
Closes #718
---
 docs/help/in/network.in          | 1 +
 src/fe-common/irc/fe-ircnet.c    | 6 +++---
 src/irc/core/irc-servers-setup.c | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index ba08ef69..4c2eeed4 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -36,6 +36,7 @@
     -sasl_mechanism  Specifies the mechanism to use for the SASL authentication.
                      At the moment irssi only supports the 'plain' and the
                      'external' mechanisms.
+                     Use '' to disable the authentication.
     -sasl_username   Specifies the username to use during the SASL authentication.
     -sasl_password   Specifies the password to use during the SASL authentication.
 
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index b70a9ea7..24dad63f 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -163,11 +163,11 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 
 	/* the validity of the parameters is checked in sig_server_setup_fill_chatnet */
 	value = g_hash_table_lookup(optlist, "sasl_mechanism");
-	if (value != NULL && *value != '\0') rec->sasl_mechanism = g_strdup(value);
+	if (value != NULL) rec->sasl_mechanism = *value != '\0' ? g_strdup(value) : NULL;
 	value = g_hash_table_lookup(optlist, "sasl_username");
-	if (value != NULL && *value != '\0') rec->sasl_username = g_strdup(value);
+	if (value != NULL) rec->sasl_username = *value != '\0' ? g_strdup(value) : NULL;
 	value = g_hash_table_lookup(optlist, "sasl_password");
-	if (value != NULL && *value != '\0') rec->sasl_password = g_strdup(value);
+	if (value != NULL) rec->sasl_password = *value != '\0' ? g_strdup(value) : NULL;
 
 	ircnet_create(rec);
 	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_ADDED, name);
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index f425b587..6040d3a5 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -89,6 +89,8 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 
 	/* Validate the SASL parameters filled by sig_chatnet_read() or cmd_network_add */
 	conn->sasl_mechanism = SASL_MECHANISM_NONE;
+	conn->sasl_username = NULL;
+	conn->sasl_password = NULL;
 
 	if (ircnet->sasl_mechanism != NULL) {
 		if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "plain")) {
@@ -102,9 +104,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 				g_warning("The fields sasl_username and sasl_password are either missing or empty");
 		}
 		else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
-				conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
-				conn->sasl_username = NULL;
-				conn->sasl_password = NULL;
+			conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
 		}
 		else
 			g_warning("Unsupported SASL mechanism \"%s\" selected", ircnet->sasl_mechanism);

From e08e2bd87aceafc2a34d72ca3fd362f2f2ea90eb Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 28 Jul 2017 03:56:02 +0100
Subject: [PATCH 0589/1650] Don't compute log_dir_create_mode in three
 different places.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/log.c              | 5 ++---
 src/core/log.h              | 2 ++
 src/core/rawlog.c           | 9 +--------
 src/fe-common/core/fe-log.c | 9 ---------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/core/log.c b/src/core/log.c
index 6af1effc..cee1dab5 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -33,6 +33,8 @@
 #define DEFAULT_LOG_FILE_CREATE_MODE 600
 
 GSList *logs;
+int log_file_create_mode;
+int log_dir_create_mode;
 
 static const char *log_item_types[] = {
 	"target",
@@ -42,8 +44,6 @@ static const char *log_item_types[] = {
 };
 
 static char *log_timestamp;
-static int log_file_create_mode;
-static int log_dir_create_mode;
 static int rotate_tag;
 
 static int log_item_str2type(const char *type)
@@ -562,7 +562,6 @@ static void read_settings(void)
 	log_timestamp = g_strdup(settings_get_str("log_timestamp"));
 
 	log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
-
 	log_dir_create_mode = log_file_create_mode;
 	if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
 	if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
diff --git a/src/core/log.h b/src/core/log.h
index fae872c7..5a07859b 100644
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -35,6 +35,8 @@ struct _LOG_REC {
 };
 
 extern GSList *logs;
+extern int log_file_create_mode;
+extern int log_dir_create_mode;
 
 /* Create log record - you still need to call log_update() to actually add it
    into log list */
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 5927e730..2192e256 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include "rawlog.h"
+#include "log.h"
 #include "modules.h"
 #include "signals.h"
 #include "commands.h"
@@ -31,8 +32,6 @@
 
 static int rawlog_lines;
 static int signal_rawlog;
-static int log_file_create_mode;
-static int log_dir_create_mode;
 
 RAWLOG_REC *rawlog_create(void)
 {
@@ -174,12 +173,6 @@ void rawlog_set_size(int lines)
 static void read_settings(void)
 {
 	rawlog_set_size(settings_get_int("rawlog_lines"));
-	log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
-        log_dir_create_mode = log_file_create_mode;
-        if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
-        if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
-        if (log_file_create_mode & 0004) log_dir_create_mode |= 0001;
-
 }
 
 static void cmd_rawlog(const char *data, SERVER_REC *server, void *item)
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 5bc5c4e1..37b29990 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -49,8 +49,6 @@ static THEME_REC *log_theme;
 static int skip_next_printtext;
 static char *log_theme_name;
 
-static int log_dir_create_mode;
-
 static char **autolog_ignore_targets;
 
 static char *log_colorizer_strip(const char *str)
@@ -676,7 +674,6 @@ static void sig_theme_destroyed(THEME_REC *theme)
 static void read_settings(void)
 {
 	int old_autolog = autolog_level;
-	int log_file_create_mode;
 
 	g_free_not_null(autolog_path);
 	autolog_path = g_strdup(settings_get_str("autolog_path"));
@@ -704,12 +701,6 @@ static void read_settings(void)
 	log_theme = log_theme_name == NULL ? NULL :
 		theme_load(log_theme_name);
 
-	log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
-        log_dir_create_mode = log_file_create_mode;
-        if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
-        if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
-        if (log_file_create_mode & 0004) log_dir_create_mode |= 0001;
-
 	if (autolog_ignore_targets != NULL)
 		g_strfreev(autolog_ignore_targets);
 

From 42b5e89f6e9fba17111f67441e25db38a737a3bd Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 28 Jul 2017 04:49:14 +0100
Subject: [PATCH 0590/1650] Add missing diagnostics for rawlog open().

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/rawlog.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 2192e256..d929682a 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -128,6 +128,9 @@ void rawlog_open(RAWLOG_REC *rawlog, const char *fname)
 	path = convert_home(fname);
 	rawlog->handle = open(path, O_WRONLY | O_APPEND | O_CREAT,
 			      log_file_create_mode);
+	if (rawlog->handle == -1) {
+		g_warning("rawlog open() failed: %s", strerror(errno));
+	}
 	g_free(path);
 
 	rawlog_dump(rawlog, rawlog->handle);

From 08dc6734b90389c357c73544023ec614e43b0860 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 09:25:51 +0100
Subject: [PATCH 0591/1650] When rawlog open fails, there's no point in trying
 to write.  Don't.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/rawlog.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index d929682a..43f140f3 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -128,13 +128,15 @@ void rawlog_open(RAWLOG_REC *rawlog, const char *fname)
 	path = convert_home(fname);
 	rawlog->handle = open(path, O_WRONLY | O_APPEND | O_CREAT,
 			      log_file_create_mode);
-	if (rawlog->handle == -1) {
-		g_warning("rawlog open() failed: %s", strerror(errno));
-	}
 	g_free(path);
 
+	if (rawlog->handle == -1) {
+		g_warning("rawlog open() failed: %s", strerror(errno));
+		return;
+	}
+
 	rawlog_dump(rawlog, rawlog->handle);
-	rawlog->logging = rawlog->handle != -1;
+	rawlog->logging = TRUE;
 }
 
 void rawlog_close(RAWLOG_REC *rawlog)

From 2914498b291ea0ca432a320004aa3d2499e50eb5 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 10:42:53 +0100
Subject: [PATCH 0592/1650] Consistency: use FALSE instead of 0.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/rawlog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 43f140f3..2ec155fa 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -144,7 +144,7 @@ void rawlog_close(RAWLOG_REC *rawlog)
 	if (rawlog->logging) {
 		write_buffer_flush();
 		close(rawlog->handle);
-		rawlog->logging = 0;
+		rawlog->logging = FALSE;
 	}
 }
 

From 2907a82b446d9d0a25157aa4ab560b49853f80d2 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 12:32:15 +0100
Subject: [PATCH 0593/1650] Fix vertical alignment in ./configure --help
 output.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 459d3a2d..c7c8edef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ AC_ARG_ENABLE(true-color,
 	want_truecolor=no)
 
 AC_ARG_ENABLE(gregex,
-[  --disable-gregex     Build without GRegex (fall back to regex.h)],
+[  --disable-gregex        Build without GRegex (fall back to regex.h)],
 	if test x$enableval = xno ; then
 		want_gregex=no
 	else

From f468008b25c7218a03cc0b327082d4d69d5481ef Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 25 Jul 2017 19:39:15 +0100
Subject: [PATCH 0594/1650] Make autotools detect Capsicum.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 configure.ac | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/configure.ac b/configure.ac
index c7c8edef..f0c4cc5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,15 @@ AC_ARG_ENABLE(gregex,
 	fi,
 	want_gregex=yes)
 
+AC_ARG_WITH(capsicum,
+[  --with-capsicum            Build with Capsicum support],
+	if test x$withval = xno; then
+		want_capsicum=no
+	else
+		want_capsicum=yes
+	fi,
+	want_capsicum=yes)
+
 dnl **
 dnl ** just some generic stuff...
 dnl **
@@ -499,6 +508,18 @@ if test "$want_perl" != "no"; then
 	fi
 fi
 
+dnl **
+dnl ** check for capsicum
+dnl **
+
+if test "x$want_capsicum" = "xyes"; then
+	AC_CHECK_LIB(c, cap_enter, [
+		AC_DEFINE(HAVE_CAPSICUM,, Build with Capsicum support)
+	], [
+		want_capsicum="no, cap_enter not found"
+	])
+fi
+
 dnl ** check what we want to build
 AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
@@ -713,6 +734,7 @@ echo
 echo "Building with 64bit DCC support .. : $offt_64bit"
 echo "Building with true color support.. : $want_truecolor"
 echo "Building with GRegex ............. : $want_gregex"
+echo "Building with Capsicum ........... : $want_capsicum"
 
 echo
 echo "If there are any problems, read the INSTALL file."

From 56c94570b420dea28b253af5f2c91184423acee1 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 25 Jul 2017 20:15:14 +0100
Subject: [PATCH 0595/1650] Implement /cap_enter.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 configure.ac         |  3 ++-
 src/core/Makefile.am |  5 +++++
 src/core/capsicum.c  | 46 ++++++++++++++++++++++++++++++++++++++++++++
 src/core/capsicum.h  |  7 +++++++
 src/core/core.c      |  3 +++
 5 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/core/capsicum.c
 create mode 100644 src/core/capsicum.h

diff --git a/configure.ac b/configure.ac
index f0c4cc5d..773f9eea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,7 +167,7 @@ AC_ARG_ENABLE(gregex,
 	want_gregex=yes)
 
 AC_ARG_WITH(capsicum,
-[  --with-capsicum            Build with Capsicum support],
+[  --with-capsicum         Build with Capsicum support],
 	if test x$withval = xno; then
 		want_capsicum=no
 	else
@@ -526,6 +526,7 @@ AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIFUZZER, test "$want_irssifuzzer" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
 AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
+AM_CONDITIONAL(HAVE_CAPSICUM, test "x$want_capsicum" = "xyes")
 AM_CONDITIONAL(USE_GREGEX, test "x$want_gregex" = "xyes")
 
 # move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 91daba3f..f3bc1674 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -56,6 +56,11 @@ libcore_a_SOURCES = \
 	tls.c \
 	write-buffer.c
 
+if HAVE_CAPSICUM
+libcore_a_SOURCES += \
+	capsicum.c
+endif
+
 structure_headers = \
 	channel-rec.h \
 	channel-setup-rec.h \
diff --git a/src/core/capsicum.c b/src/core/capsicum.c
new file mode 100644
index 00000000..702b895a
--- /dev/null
+++ b/src/core/capsicum.c
@@ -0,0 +1,46 @@
+/*
+ capsicum.c : Capsicum sandboxing support
+
+    Copyright (C) 2017 Edward Tomasz Napierala <trasz@FreeBSD.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "signals.h"
+#include "commands.h"
+
+#include <sys/capsicum.h>
+#include <string.h>
+
+static void cmd_cap_enter(void)
+{
+	int error;
+
+	error = cap_enter();
+	if (error != 0)
+		g_error("cap_enter(2) failed: %s", strerror(errno));
+}
+
+void capsicum_init(void)
+{
+
+	command_bind("cap_enter", NULL, (SIGNAL_FUNC) cmd_cap_enter);
+}
+
+void capsicum_deinit(void)
+{
+	command_unbind("cap_enter", (SIGNAL_FUNC) cmd_cap_enter);
+}
diff --git a/src/core/capsicum.h b/src/core/capsicum.h
new file mode 100644
index 00000000..75c70080
--- /dev/null
+++ b/src/core/capsicum.h
@@ -0,0 +1,7 @@
+#ifndef __CAPSICUM_H
+#define __CAPSICUM_H
+
+void capsicum_init(void);
+void capsicum_deinit(void);
+
+#endif
diff --git a/src/core/core.c b/src/core/core.c
index bf7cdd6b..72631f91 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -29,6 +29,7 @@
 #include "signals.h"
 #include "settings.h"
 #include "session.h"
+#include "capsicum.h"
 
 #include "chat-protocols.h"
 #include "servers.h"
@@ -235,6 +236,7 @@ void core_init(void)
 	commands_init();
 	nickmatch_cache_init();
         session_init();
+	capsicum_init();
 
 	chat_protocols_init();
 	chatnets_init();
@@ -292,6 +294,7 @@ void core_deinit(void)
 	chatnets_deinit();
 	chat_protocols_deinit();
 
+	capsicum_deinit();
         session_deinit();
         nickmatch_cache_deinit();
 	commands_deinit();

From d5d45c29b8e00c304a6b6656983cafee84fe6bc8 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 26 Jul 2017 01:00:25 +0100
Subject: [PATCH 0596/1650] Add capability mode error/success messages.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c                 | 24 +++++++++++-
 src/fe-common/core/Makefile.am      |  5 +++
 src/fe-common/core/fe-capsicum.c    | 60 +++++++++++++++++++++++++++++
 src/fe-common/core/fe-capsicum.h    |  7 ++++
 src/fe-common/core/fe-common-core.c |  3 ++
 src/fe-common/core/module-formats.c |  3 ++
 src/fe-common/core/module-formats.h |  3 ++
 7 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 src/fe-common/core/fe-capsicum.c
 create mode 100644 src/fe-common/core/fe-capsicum.h

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 702b895a..eb30fef3 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -30,17 +30,37 @@ static void cmd_cap_enter(void)
 	int error;
 
 	error = cap_enter();
-	if (error != 0)
-		g_error("cap_enter(2) failed: %s", strerror(errno));
+	if (error != 0) {
+		signal_emit("capability mode failed", 1, strerror(errno));
+	} else {
+		signal_emit("capability mode enabled", 0);
+	}
+}
+
+static void cmd_cap_getmode(void)
+{
+	u_int mode;
+	int error;
+
+	error = cap_getmode(&mode);
+	if (error != 0) {
+		signal_emit("capability mode failed", 1, strerror(errno));
+	} else if (mode == 0) {
+		signal_emit("capability mode disabled", 0);
+	} else {
+		signal_emit("capability mode enabled", 0);
+	}
 }
 
 void capsicum_init(void)
 {
 
 	command_bind("cap_enter", NULL, (SIGNAL_FUNC) cmd_cap_enter);
+	command_bind("cap_getmode", NULL, (SIGNAL_FUNC) cmd_cap_getmode);
 }
 
 void capsicum_deinit(void)
 {
 	command_unbind("cap_enter", (SIGNAL_FUNC) cmd_cap_enter);
+	command_unbind("cap_getmode", (SIGNAL_FUNC) cmd_cap_getmode);
 }
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 6efff411..08e41520 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -38,6 +38,11 @@ libfe_common_core_a_SOURCES = \
 	windows-layout.c \
 	fe-windows.c
 
+if HAVE_CAPSICUM
+libfe_common_core_a_SOURCES += \
+	fe-capsicum.c
+endif
+
 pkginc_fe_common_coredir=$(pkgincludedir)/src/fe-common/core
 pkginc_fe_common_core_HEADERS = \
 	command-history.h \
diff --git a/src/fe-common/core/fe-capsicum.c b/src/fe-common/core/fe-capsicum.c
new file mode 100644
index 00000000..5816b223
--- /dev/null
+++ b/src/fe-common/core/fe-capsicum.c
@@ -0,0 +1,60 @@
+/*
+ fe-capsicum.c : irssi
+
+    Copyright (C) 2017 Edward Tomasz Napierala <trasz@FreeBSD.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "module-formats.h"
+#include "signals.h"
+#include "printtext.h"
+
+#include "levels.h"
+#include "servers.h"
+
+static void capability_mode_enabled(void)
+{
+
+	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_CAPSICUM_ENABLED);
+}
+
+static void capability_mode_disabled(void)
+{
+
+	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_CAPSICUM_DISABLED);
+}
+
+static void capability_mode_failed(gchar *msg)
+{
+
+	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_CAPSICUM_FAILED, msg);
+}
+
+void fe_capsicum_init(void)
+{
+
+	signal_add("capability mode enabled", (SIGNAL_FUNC) capability_mode_enabled);
+	signal_add("capability mode disabled", (SIGNAL_FUNC) capability_mode_disabled);
+	signal_add("capability mode failed", (SIGNAL_FUNC) capability_mode_failed);
+}
+
+void fe_capsicum_deinit(void)
+{
+	signal_remove("capability mode enabled", (SIGNAL_FUNC) capability_mode_enabled);
+	signal_remove("capability mode disabled", (SIGNAL_FUNC) capability_mode_disabled);
+	signal_remove("capability mode failed", (SIGNAL_FUNC) capability_mode_failed);
+}
diff --git a/src/fe-common/core/fe-capsicum.h b/src/fe-common/core/fe-capsicum.h
new file mode 100644
index 00000000..a7cb743b
--- /dev/null
+++ b/src/fe-common/core/fe-capsicum.h
@@ -0,0 +1,7 @@
+#ifndef __FE_CAPSICUM_H
+#define __FE_CAPSICUM_H
+
+void fe_capsicum_init(void);
+void fe_capsicum_deinit(void);
+
+#endif
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 512fc84c..a0388827 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -32,6 +32,7 @@
 #include "special-vars.h"
 #include "fe-core-commands.h"
 #include "fe-queries.h"
+#include "fe-capsicum.h"
 #include "hilight-text.h"
 #include "command-history.h"
 #include "completion.h"
@@ -179,6 +180,7 @@ void fe_common_core_init(void)
 	fe_server_init();
 	fe_settings_init();
 	fe_tls_init();
+	fe_capsicum_init();
 	windows_init();
 	window_activity_init();
 	window_commands_init();
@@ -221,6 +223,7 @@ void fe_common_core_deinit(void)
 	fe_server_deinit();
 	fe_settings_deinit();
 	fe_tls_deinit();
+	fe_capsicum_deinit();
 	windows_deinit();
 	window_activity_deinit();
 	window_commands_deinit();
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index da9705be..eb0ddb61 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -290,6 +290,9 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "completion_header", "%#Key        Value                                    Auto", 0 },
 	{ "completion_line", "%#$[10]0 $[!40]1 $2", 3, { 0, 0, 0 } },
 	{ "completion_footer", "", 0 },
+	{ "capsicum_enabled", "Capability mode enabled", 0 },
+	{ "capsicum_disabled", "Capability mode not enabled", 0 },
+	{ "capsicum_failed", "Capability mode failed: $0", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "TLS", 0 },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index a9ed28c5..4e2f72d9 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -255,6 +255,9 @@ enum {
 	TXT_COMPLETION_HEADER,
         TXT_COMPLETION_LINE,
 	TXT_COMPLETION_FOOTER,
+	TXT_CAPSICUM_ENABLED,
+	TXT_CAPSICUM_DISABLED,
+	TXT_CAPSICUM_FAILED,
 
 	TLS_FILL_15,
 

From 3200c381dbcb02e99c7667bd955c90ee859d15a0 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 26 Jul 2017 02:11:46 +0100
Subject: [PATCH 0597/1650] Rename to "/capability enter" and "/capability
 status".

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index eb30fef3..69a379e2 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -25,7 +25,12 @@
 #include <sys/capsicum.h>
 #include <string.h>
 
-static void cmd_cap_enter(void)
+static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
+{
+	command_runsub("capsicum", data, server, item);
+}
+
+static void cmd_capsicum_enter(void)
 {
 	int error;
 
@@ -37,7 +42,7 @@ static void cmd_cap_enter(void)
 	}
 }
 
-static void cmd_cap_getmode(void)
+static void cmd_capsicum_status(void)
 {
 	u_int mode;
 	int error;
@@ -55,12 +60,14 @@ static void cmd_cap_getmode(void)
 void capsicum_init(void)
 {
 
-	command_bind("cap_enter", NULL, (SIGNAL_FUNC) cmd_cap_enter);
-	command_bind("cap_getmode", NULL, (SIGNAL_FUNC) cmd_cap_getmode);
+	command_bind("capsicum", NULL, (SIGNAL_FUNC) cmd_capsicum);
+	command_bind("capsicum enter", NULL, (SIGNAL_FUNC) cmd_capsicum_enter);
+	command_bind("capsicum status", NULL, (SIGNAL_FUNC) cmd_capsicum_status);
 }
 
 void capsicum_deinit(void)
 {
-	command_unbind("cap_enter", (SIGNAL_FUNC) cmd_cap_enter);
-	command_unbind("cap_getmode", (SIGNAL_FUNC) cmd_cap_getmode);
+	command_unbind("capsicum", (SIGNAL_FUNC) cmd_capsicum);
+	command_unbind("capsicum enter", (SIGNAL_FUNC) cmd_capsicum_enter);
+	command_unbind("capsicum status", (SIGNAL_FUNC) cmd_capsicum_status);
 }

From cec68557aa436b4f16505d2095af02f83d154eda Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 27 Jul 2017 14:20:47 +0100
Subject: [PATCH 0598/1650] /connect works - although only with IP addresses.

---
 configure.ac        |   7 ++-
 src/core/capsicum.c | 126 ++++++++++++++++++++++++++++++++++++++++++++
 src/core/capsicum.h |   3 ++
 src/core/network.c  |  33 ++++++++++--
 src/core/network.h  |   2 +
 5 files changed, 165 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 773f9eea..9c026c5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -514,7 +514,12 @@ dnl **
 
 if test "x$want_capsicum" = "xyes"; then
 	AC_CHECK_LIB(c, cap_enter, [
-		AC_DEFINE(HAVE_CAPSICUM,, Build with Capsicum support)
+		AC_CHECK_LIB(nv, nvlist_create, [
+			AC_DEFINE(HAVE_CAPSICUM,, Build with Capsicum support)
+			LIBS="$LIBS -lnv"
+		], [
+			want_capsicum="no, nvlist_create not found"
+		])
 	], [
 		want_capsicum="no, cap_enter not found"
 	])
diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 69a379e2..19ca858e 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -19,21 +19,147 @@
 */
 
 #include "module.h"
+#include "network.h"
 #include "signals.h"
 #include "commands.h"
 
+#include <sys/types.h>
 #include <sys/capsicum.h>
+#include <sys/nv.h>
+#include <sys/procdesc.h>
+#include <sys/socket.h>
 #include <string.h>
 
+static int symbiontfds[2];
+
+gboolean capsicum_enabled(void)
+{
+	u_int mode;
+	int error;
+
+	error = cap_getmode(&mode);
+	if (error != 0)
+		return FALSE;
+
+	if (mode == 0)
+		return FALSE;
+
+	return TRUE;
+}
+
+int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
+{
+	nvlist_t *nvl;
+	int error, saved_errno, sock;
+
+	/* Send request to the symbiont. */
+	nvl = nvlist_create(0);
+	nvlist_add_binary(nvl, "ip", ip, sizeof(*ip));
+	nvlist_add_number(nvl, "port", port);
+	if (my_ip != NULL) {
+		/* nvlist_add_binary(3) can't handle NULL values. */
+		nvlist_add_binary(nvl, "my_ip", my_ip, sizeof(*my_ip));
+	}
+	error = nvlist_send(symbiontfds[1], nvl);
+	nvlist_destroy(nvl);
+	if (error != 0) {
+		g_warning("nvlist_send: %s", strerror(errno));
+		return -1;
+	}
+
+	/* Receive response. */
+	nvl = nvlist_recv(symbiontfds[1], 0);
+	if (nvl == NULL) {
+		g_warning("nvlist_recv: %s", strerror(errno));
+		return -1;
+	}
+	if (nvlist_exists_descriptor(nvl, "sock")) {
+		sock = nvlist_take_descriptor(nvl, "sock");
+	} else {
+		sock = -1;
+	}
+	saved_errno = nvlist_get_number(nvl, "errno");
+	nvlist_destroy(nvl);
+	errno = saved_errno;
+
+	return sock;
+}
+
 static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
 {
 	command_runsub("capsicum", data, server, item);
 }
 
+static int start_symbiont(void)
+{
+	pid_t pid;
+	nvlist_t *nvl;
+	IPADDR *ip, *my_ip;
+	int childfd, error, port, saved_errno, sock;
+
+	error = socketpair(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, symbiontfds);
+	if (error != 0) {
+		g_warning("socketpair: %s", strerror(errno));
+		return 1;
+	}
+
+	pid = pdfork(&childfd, PD_CLOEXEC);
+	if (pid < 0) {
+		g_warning("pdfork: %s", strerror(errno));
+		return 1;
+	}
+
+	if (pid > 0) {
+		close(symbiontfds[0]);
+		return 0;
+	}
+
+	/* We're the child, running outside the Capsicum sandbox. */
+	setproctitle("capsicum symbiont");
+	close(symbiontfds[1]);
+	close(0);
+	close(1);
+	close(2);
+	for (;;) {
+		/* Receive parameters from the main irssi process. */
+		nvl = nvlist_recv(symbiontfds[0], 0);
+		if (nvl == NULL)
+			exit(1);
+		ip = nvlist_get_binary(nvl, "ip", NULL);
+		port = (int)nvlist_get_number(nvl, "port");
+		if (nvlist_exists(nvl, "my_ip"))
+			my_ip = nvlist_get_binary(nvl, "my_ip", NULL);
+		else
+			my_ip = NULL;
+
+		/* Connect. */
+		sock = net_connect_ip_handle(ip, port, my_ip);
+		saved_errno = errno;
+
+		/* Send back the socket fd. */
+		nvlist_destroy(nvl);
+		nvl = nvlist_create(0);
+
+		if (sock != -1)
+			nvlist_move_descriptor(nvl, "sock", sock);
+		nvlist_add_number(nvl, "errno", saved_errno);
+		error = nvlist_send(symbiontfds[0], nvl);
+		if (error != 0)
+			exit(1);
+		nvlist_destroy(nvl);
+	}
+}
+
 static void cmd_capsicum_enter(void)
 {
 	int error;
 
+	error = start_symbiont();
+	if (error != 0) {
+		signal_emit("capability mode failed", 1, strerror(errno));
+		return;
+	}
+
 	error = cap_enter();
 	if (error != 0) {
 		signal_emit("capability mode failed", 1, strerror(errno));
diff --git a/src/core/capsicum.h b/src/core/capsicum.h
index 75c70080..f8cec28e 100644
--- a/src/core/capsicum.h
+++ b/src/core/capsicum.h
@@ -1,6 +1,9 @@
 #ifndef __CAPSICUM_H
 #define __CAPSICUM_H
 
+gboolean capsicum_enabled(void);
+int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
+
 void capsicum_init(void);
 void capsicum_deinit(void);
 
diff --git a/src/core/network.c b/src/core/network.c
index 3e1b7c70..b182d19f 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -20,6 +20,9 @@
 
 #include "module.h"
 #include "network.h"
+#ifdef HAVE_CAPSICUM
+#include "capsicum.h"
+#endif
 
 #include <sys/un.h>
 
@@ -144,8 +147,7 @@ GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
 	return net_connect_ip(ip, port, my_ip);
 }
 
-/* Connect to socket with ip address */
-GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
+int net_connect_ip_handle(IPADDR *ip, int port, IPADDR *my_ip)
 {
 	union sockaddr_union so;
 	int handle, ret, opt = 1;
@@ -161,7 +163,7 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 	handle = socket(ip->family, SOCK_STREAM, 0);
 
 	if (handle == -1)
-		return NULL;
+		return -1;
 
 	/* set socket options */
 	fcntl(handle, F_SETFL, O_NONBLOCK);
@@ -176,7 +178,7 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 
 			close(handle);
 			errno = old_errno;
-			return NULL;
+			return -1;
 		}
 	}
 
@@ -190,9 +192,30 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 		int old_errno = errno;
 		close(handle);
 		errno = old_errno;
-		return NULL;
+		return -1;
 	}
 
+	return handle;
+}
+
+
+/* Connect to socket with ip address */
+GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
+{
+	int handle = -1;
+
+#ifdef HAVE_CAPSICUM
+	if (capsicum_enabled())
+		handle = capsicum_net_connect_ip(ip, port, my_ip);
+	else
+		handle = net_connect_ip_handle(ip, port, my_ip);
+#else
+	handle = net_connect_ip_handle(ip, port, my_ip);
+#endif
+
+	if (handle == -1)
+		return (NULL);
+
 	return g_io_channel_new(handle);
 }
 
diff --git a/src/core/network.h b/src/core/network.h
index 8757f78c..5ccacc0d 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -36,6 +36,8 @@ GIOChannel *g_io_channel_new(int handle);
 /* returns 1 if IPADDRs are the same */
 int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 
+int net_connect_ip_handle(IPADDR *ip, int port, IPADDR *my_ip);
+
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip) G_GNUC_DEPRECATED;
 /* Connect to socket with ip address and SSL*/

From 925240155e5c0c20569bcb5fafe4d3047055768a Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 27 Jul 2017 14:56:35 +0100
Subject: [PATCH 0599/1650] Config file support for "capsicum" parameter.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 19ca858e..7674ca4d 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -19,9 +19,10 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "signals.h"
 #include "commands.h"
+#include "network.h"
+#include "settings.h"
+#include "signals.h"
 
 #include <sys/types.h>
 #include <sys/capsicum.h>
@@ -183,8 +184,17 @@ static void cmd_capsicum_status(void)
 	}
 }
 
+void sig_init_finished(void)
+{
+	if (settings_get_bool("capsicum"))
+		cmd_capsicum_enter();
+}
+
 void capsicum_init(void)
 {
+	settings_add_bool("misc", "capsicum", FALSE);
+
+	signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
 
 	command_bind("capsicum", NULL, (SIGNAL_FUNC) cmd_capsicum);
 	command_bind("capsicum enter", NULL, (SIGNAL_FUNC) cmd_capsicum_enter);
@@ -193,6 +203,8 @@ void capsicum_init(void)
 
 void capsicum_deinit(void)
 {
+	signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+
 	command_unbind("capsicum", (SIGNAL_FUNC) cmd_capsicum);
 	command_unbind("capsicum enter", (SIGNAL_FUNC) cmd_capsicum_enter);
 	command_unbind("capsicum status", (SIGNAL_FUNC) cmd_capsicum_status);

From f4546be7ecb8a0801fb0d30415586c15d721494a Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 27 Jul 2017 15:35:14 +0100
Subject: [PATCH 0600/1650] Reorder functions.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 7674ca4d..a0375077 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -86,11 +86,6 @@ int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 	return sock;
 }
 
-static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
-{
-	command_runsub("capsicum", data, server, item);
-}
-
 static int start_symbiont(void)
 {
 	pid_t pid;
@@ -151,6 +146,11 @@ static int start_symbiont(void)
 	}
 }
 
+static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
+{
+	command_runsub("capsicum", data, server, item);
+}
+
 static void cmd_capsicum_enter(void)
 {
 	int error;

From 509eca76f0755e94b5981f464f9f9a882499180a Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 28 Jul 2017 02:21:40 +0100
Subject: [PATCH 0601/1650] Make DNS work in capability mode.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 173 ++++++++++++++++++++++++++++++++++----------
 src/core/capsicum.h |   1 +
 src/core/network.c  |   5 ++
 3 files changed, 142 insertions(+), 37 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index a0375077..99f7ff0f 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -31,6 +31,9 @@
 #include <sys/socket.h>
 #include <string.h>
 
+#define	OPCODE_CONNECT		1
+#define	OPCODE_GETHOSTBYNAME	2
+
 static int symbiontfds[2];
 
 gboolean capsicum_enabled(void)
@@ -55,6 +58,7 @@ int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 
 	/* Send request to the symbiont. */
 	nvl = nvlist_create(0);
+	nvlist_add_number(nvl, "opcode", OPCODE_CONNECT);
 	nvlist_add_binary(nvl, "ip", ip, sizeof(*ip));
 	nvlist_add_number(nvl, "port", port);
 	if (my_ip != NULL) {
@@ -86,12 +90,139 @@ int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 	return sock;
 }
 
+int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
+{
+	nvlist_t *nvl;
+	IPADDR *received_ip4, *received_ip6;
+	int error, ret, saved_errno;
+
+	/* Send request to the symbiont. */
+	nvl = nvlist_create(0);
+	nvlist_add_number(nvl, "opcode", OPCODE_GETHOSTBYNAME);
+	nvlist_add_string(nvl, "addr", addr);
+	error = nvlist_send(symbiontfds[1], nvl);
+	nvlist_destroy(nvl);
+	if (error != 0) {
+		g_warning("nvlist_send: %s", strerror(errno));
+		return -1;
+	}
+
+	/* Receive response. */
+	nvl = nvlist_recv(symbiontfds[1], 0);
+	if (nvl == NULL) {
+		g_warning("nvlist_recv: %s", strerror(errno));
+		return -1;
+	}
+
+	received_ip4 = nvlist_get_binary(nvl, "ip4", NULL);
+	received_ip6 = nvlist_get_binary(nvl, "ip6", NULL);
+	memcpy(ip4, received_ip4, sizeof(*ip4));
+	memcpy(ip6, received_ip6, sizeof(*ip6));
+
+	ret = nvlist_get_number(nvl, "ret");
+	saved_errno = nvlist_get_number(nvl, "errno");
+	nvlist_destroy(nvl);
+	errno = saved_errno;
+
+	return ret;
+}
+
+nvlist_t *symbiont_connect(const nvlist_t *request)
+{
+	nvlist_t *response;
+	IPADDR *ip, *my_ip;
+	int port, saved_errno, sock;
+
+	ip = nvlist_get_binary(request, "ip", NULL);
+	port = (int)nvlist_get_number(request, "port");
+	if (nvlist_exists(request, "my_ip"))
+		my_ip = nvlist_get_binary(request, "my_ip", NULL);
+	else
+		my_ip = NULL;
+
+	/* Connect. */
+	sock = net_connect_ip_handle(ip, port, my_ip);
+	saved_errno = errno;
+
+	/* Send back the socket fd. */
+	response = nvlist_create(0);
+
+	if (sock != -1)
+		nvlist_move_descriptor(response, "sock", sock);
+	nvlist_add_number(response, "errno", saved_errno);
+
+	return (response);
+}
+
+nvlist_t *symbiont_gethostbyname(const nvlist_t *request)
+{
+	nvlist_t *response;
+	IPADDR ip4, ip6;
+	const char *addr;
+	int ret, saved_errno;
+
+	addr = nvlist_get_string(request, "addr");
+
+	/* Connect. */
+	ret = net_gethostbyname(addr, &ip4, &ip6);
+	saved_errno = errno;
+
+	/* Send back the IPs. */
+	response = nvlist_create(0);
+
+	nvlist_add_number(response, "ret", ret);
+	nvlist_add_number(response, "errno", saved_errno);
+	nvlist_add_binary(response, "ip4", &ip4, sizeof(ip4));
+	nvlist_add_binary(response, "ip6", &ip6, sizeof(ip6));
+
+	return (response);
+}
+
+/*
+ * Child process, running outside the Capsicum sandbox.
+ */
+_Noreturn static void symbiont(void)
+{
+	nvlist_t *request, *response;
+	int error, opcode;
+
+	setproctitle("capsicum symbiont");
+	close(symbiontfds[1]);
+	close(0);
+	close(1);
+	close(2);
+
+	for (;;) {
+		/* Receive parameters from the main irssi process. */
+		request = nvlist_recv(symbiontfds[0], 0);
+		if (request == NULL)
+			exit(1);
+
+		opcode = nvlist_get_number(request, "opcode");
+		switch (opcode) {
+		case OPCODE_CONNECT:
+			response = symbiont_connect(request);
+			break;
+		case OPCODE_GETHOSTBYNAME:
+			response = symbiont_gethostbyname(request);
+			break;
+		default:
+			exit(1);
+		}
+
+		/* Send back the response. */
+		error = nvlist_send(symbiontfds[0], response);
+		if (error != 0)
+			exit(1);
+		nvlist_destroy(request);
+		nvlist_destroy(response);
+	}
+}
+
 static int start_symbiont(void)
 {
+	int childfd, error;
 	pid_t pid;
-	nvlist_t *nvl;
-	IPADDR *ip, *my_ip;
-	int childfd, error, port, saved_errno, sock;
 
 	error = socketpair(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, symbiontfds);
 	if (error != 0) {
@@ -110,40 +241,8 @@ static int start_symbiont(void)
 		return 0;
 	}
 
-	/* We're the child, running outside the Capsicum sandbox. */
-	setproctitle("capsicum symbiont");
-	close(symbiontfds[1]);
-	close(0);
-	close(1);
-	close(2);
-	for (;;) {
-		/* Receive parameters from the main irssi process. */
-		nvl = nvlist_recv(symbiontfds[0], 0);
-		if (nvl == NULL)
-			exit(1);
-		ip = nvlist_get_binary(nvl, "ip", NULL);
-		port = (int)nvlist_get_number(nvl, "port");
-		if (nvlist_exists(nvl, "my_ip"))
-			my_ip = nvlist_get_binary(nvl, "my_ip", NULL);
-		else
-			my_ip = NULL;
-
-		/* Connect. */
-		sock = net_connect_ip_handle(ip, port, my_ip);
-		saved_errno = errno;
-
-		/* Send back the socket fd. */
-		nvlist_destroy(nvl);
-		nvl = nvlist_create(0);
-
-		if (sock != -1)
-			nvlist_move_descriptor(nvl, "sock", sock);
-		nvlist_add_number(nvl, "errno", saved_errno);
-		error = nvlist_send(symbiontfds[0], nvl);
-		if (error != 0)
-			exit(1);
-		nvlist_destroy(nvl);
-	}
+	symbiont();
+	/* NOTREACHED */
 }
 
 static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
diff --git a/src/core/capsicum.h b/src/core/capsicum.h
index f8cec28e..2733c1ea 100644
--- a/src/core/capsicum.h
+++ b/src/core/capsicum.h
@@ -3,6 +3,7 @@
 
 gboolean capsicum_enabled(void);
 int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
+int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
 
 void capsicum_init(void);
 void capsicum_deinit(void);
diff --git a/src/core/network.c b/src/core/network.c
index b182d19f..2954af54 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -406,6 +406,11 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 	struct addrinfo hints, *ai, *ailist;
 	int ret, count_v4, count_v6, use_v4, use_v6;
 
+#ifdef HAVE_CAPSICUM
+	if (capsicum_enabled())
+		return (capsicum_net_gethostbyname(addr, ip4, ip6));
+#endif
+
 	g_return_val_if_fail(addr != NULL, -1);
 
 	memset(ip4, 0, sizeof(IPADDR));

From 1f57ceec4c4e7c3d42f341921e36fe4aab612e57 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 28 Jul 2017 18:10:45 +0100
Subject: [PATCH 0602/1650] Prevent the user from calling "/capsicum enter"
 twice.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 99f7ff0f..f44b326d 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -252,8 +252,15 @@ static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
 
 static void cmd_capsicum_enter(void)
 {
+	u_int mode;
 	int error;
 
+	error = cap_getmode(&mode);
+	if (error == 0 && mode != 0) {
+		g_warning("Already in capability mode");
+		return;
+	}
+
 	error = start_symbiont();
 	if (error != 0) {
 		signal_emit("capability mode failed", 1, strerror(errno));

From 939371aa1dfdbf11fe98648e1eafc4c95e80bb9e Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 28 Jul 2017 18:44:18 +0100
Subject: [PATCH 0603/1650] Fix warnings.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 4 ++--
 src/core/network.c  | 2 +-
 src/core/network.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index f44b326d..5a59adcd 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -93,7 +93,7 @@ int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 {
 	nvlist_t *nvl;
-	IPADDR *received_ip4, *received_ip6;
+	const IPADDR *received_ip4, *received_ip6;
 	int error, ret, saved_errno;
 
 	/* Send request to the symbiont. */
@@ -130,7 +130,7 @@ int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 nvlist_t *symbiont_connect(const nvlist_t *request)
 {
 	nvlist_t *response;
-	IPADDR *ip, *my_ip;
+	const IPADDR *ip, *my_ip;
 	int port, saved_errno, sock;
 
 	ip = nvlist_get_binary(request, "ip", NULL);
diff --git a/src/core/network.c b/src/core/network.c
index 2954af54..01e56eb5 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -147,7 +147,7 @@ GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
 	return net_connect_ip(ip, port, my_ip);
 }
 
-int net_connect_ip_handle(IPADDR *ip, int port, IPADDR *my_ip)
+int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip)
 {
 	union sockaddr_union so;
 	int handle, ret, opt = 1;
diff --git a/src/core/network.h b/src/core/network.h
index 5ccacc0d..d1582a2e 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -36,7 +36,7 @@ GIOChannel *g_io_channel_new(int handle);
 /* returns 1 if IPADDRs are the same */
 int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 
-int net_connect_ip_handle(IPADDR *ip, int port, IPADDR *my_ip);
+int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
 
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip) G_GNUC_DEPRECATED;

From 241dd66ac11d54b37c671cd56f1320fe5b83803d Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 28 Jul 2017 05:08:34 +0100
Subject: [PATCH 0604/1650] Working /log and /rawlog.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 33 +++++++++++++++++++++++++++++++++
 src/core/capsicum.h |  1 +
 src/core/log.c      | 15 ++++++++++++++-
 src/core/log.h      |  2 ++
 src/core/network.c  |  1 -
 src/core/rawlog.c   | 17 +++++++++++++++--
 6 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 5a59adcd..6667276c 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -20,6 +20,8 @@
 
 #include "module.h"
 #include "commands.h"
+#include "log.h"
+#include "misc.h"
 #include "network.h"
 #include "settings.h"
 #include "signals.h"
@@ -34,6 +36,9 @@
 #define	OPCODE_CONNECT		1
 #define	OPCODE_GETHOSTBYNAME	2
 
+static char *irclogs_path;
+static size_t irclogs_path_len;
+static int irclogs_fd;
 static int symbiontfds[2];
 
 gboolean capsicum_enabled(void)
@@ -127,6 +132,23 @@ int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 	return ret;
 }
 
+int capsicum_open(const char *path, int flags, int mode)
+{
+	int fd;
+
+	/* +1 is for slash separating irclogs_path and the rest. */
+	if (strlen(path) > irclogs_path_len + 1 && strncmp(path, irclogs_path, irclogs_path_len) == 0) {
+		fd = openat(irclogs_fd, path + irclogs_path_len + 1, flags, mode);
+	} else {
+		fd = open(path, flags, mode);
+	}
+
+	if (fd < 0 && (errno == ENOTCAPABLE || errno == ECAPMODE))
+		g_warning("File system access restricted to %s due to capability mode", irclogs_path);
+
+	return (fd);
+}
+
 nvlist_t *symbiont_connect(const nvlist_t *request)
 {
 	nvlist_t *response;
@@ -261,6 +283,16 @@ static void cmd_capsicum_enter(void)
 		return;
 	}
 
+	irclogs_path = convert_home(settings_get_str("capsicum_irclogs_path"));
+	g_mkdir_with_parents(irclogs_path, log_dir_create_mode);
+	irclogs_path_len = strlen(irclogs_path);
+	irclogs_fd = open(irclogs_path, O_DIRECTORY | O_CLOEXEC);
+	if (irclogs_fd < 0) {
+		g_warning("Unable to open %s: %s", irclogs_path, strerror(errno));
+		signal_emit("capability mode failed", 1, strerror(errno));
+		return;
+	}
+
 	error = start_symbiont();
 	if (error != 0) {
 		signal_emit("capability mode failed", 1, strerror(errno));
@@ -299,6 +331,7 @@ void sig_init_finished(void)
 void capsicum_init(void)
 {
 	settings_add_bool("misc", "capsicum", FALSE);
+	settings_add_str("misc", "capsicum_irclogs_path", "~/irclogs");
 
 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
 
diff --git a/src/core/capsicum.h b/src/core/capsicum.h
index 2733c1ea..ca35fd05 100644
--- a/src/core/capsicum.h
+++ b/src/core/capsicum.h
@@ -4,6 +4,7 @@
 gboolean capsicum_enabled(void);
 int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
 int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
+int capsicum_open(const char *path, int flags, int mode);
 
 void capsicum_init(void);
 void capsicum_deinit(void);
diff --git a/src/core/log.c b/src/core/log.c
index cee1dab5..00686bee 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -26,6 +26,9 @@
 #include "servers.h"
 #include "log.h"
 #include "write-buffer.h"
+#ifdef HAVE_CAPSICUM
+#include "capsicum.h"
+#endif
 
 #include "lib-config/iconfig.h"
 #include "settings.h"
@@ -73,6 +76,16 @@ static void log_write_timestamp(int handle, const char *format,
 	if (text != NULL) write_buffer(handle, text, strlen(text));
 }
 
+static int log_open_wrapper(const char *path, int flags, int mode)
+{
+#ifdef HAVE_CAPSICUM
+	if (capsicum_enabled())
+		return capsicum_open(path, flags, mode);
+#endif
+
+	return open(path, flags, mode);
+}
+
 static char *log_filename(LOG_REC *log)
 {
 	char *str, fname[1024];
@@ -119,7 +132,7 @@ int log_start_logging(LOG_REC *log)
 	}
 
 	log->handle = log->real_fname == NULL ? -1 :
-		open(log->real_fname, O_WRONLY | O_APPEND | O_CREAT,
+		log_open_wrapper(log->real_fname, O_WRONLY | O_APPEND | O_CREAT,
 		     log_file_create_mode);
 	if (log->handle == -1) {
 		signal_emit("log create failed", 1, log);
diff --git a/src/core/log.h b/src/core/log.h
index 5a07859b..52660bb9 100644
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -38,6 +38,8 @@ extern GSList *logs;
 extern int log_file_create_mode;
 extern int log_dir_create_mode;
 
+extern int log_dir_create_mode;
+
 /* Create log record - you still need to call log_update() to actually add it
    into log list */
 LOG_REC *log_create_rec(const char *fname, int level);
diff --git a/src/core/network.c b/src/core/network.c
index 01e56eb5..4494dbc6 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -198,7 +198,6 @@ int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip)
 	return handle;
 }
 
-
 /* Connect to socket with ip address */
 GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 {
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 2ec155fa..5df02981 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -27,12 +27,25 @@
 #include "misc.h"
 #include "write-buffer.h"
 #include "settings.h"
+#ifdef HAVE_CAPSICUM
+#include "capsicum.h"
+#endif
 
 #include "servers.h"
 
 static int rawlog_lines;
 static int signal_rawlog;
 
+static int rawlog_open_wrapper(const char *path, int flags, int mode)
+{
+#ifdef HAVE_CAPSICUM
+	if (capsicum_enabled())
+		return capsicum_open(path, flags, mode);
+#endif
+
+	return open(path, flags, mode);
+}
+
 RAWLOG_REC *rawlog_create(void)
 {
 	RAWLOG_REC *rec;
@@ -126,7 +139,7 @@ void rawlog_open(RAWLOG_REC *rawlog, const char *fname)
 		return;
 
 	path = convert_home(fname);
-	rawlog->handle = open(path, O_WRONLY | O_APPEND | O_CREAT,
+	rawlog->handle = rawlog_open_wrapper(path, O_WRONLY | O_APPEND | O_CREAT,
 			      log_file_create_mode);
 	g_free(path);
 
@@ -158,7 +171,7 @@ void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
         g_free(dir);
 
 	path = convert_home(fname);
-	f = open(path, O_WRONLY | O_APPEND | O_CREAT, log_file_create_mode);
+	f = rawlog_open_wrapper(path, O_WRONLY | O_APPEND | O_CREAT, log_file_create_mode);
 	g_free(path);
 
 	if (f < 0) {

From e777ae986d64863a444132885b160ab2e9c7458e Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 10:32:24 +0100
Subject: [PATCH 0605/1650] Working autolog.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c         | 51 ++++++++++++++++++++++++++++++++++---
 src/core/capsicum.h         |  1 +
 src/core/log.c              |  7 +++++
 src/core/rawlog.c           |  9 ++++++-
 src/fe-common/core/fe-log.c | 10 ++++++++
 5 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 6667276c..c554fcf7 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -136,19 +136,62 @@ int capsicum_open(const char *path, int flags, int mode)
 {
 	int fd;
 
-	/* +1 is for slash separating irclogs_path and the rest. */
-	if (strlen(path) > irclogs_path_len + 1 && strncmp(path, irclogs_path, irclogs_path_len) == 0) {
-		fd = openat(irclogs_fd, path + irclogs_path_len + 1, flags, mode);
+	/* +1 is for the slash separating irclogs_path and the rest. */
+	if (strlen(path) > irclogs_path_len + 1 &&
+	    strncmp(path, irclogs_path, irclogs_path_len) == 0) {
+		fd = openat(irclogs_fd, path + irclogs_path_len + 1,
+		    flags, mode);
 	} else {
 		fd = open(path, flags, mode);
 	}
 
 	if (fd < 0 && (errno == ENOTCAPABLE || errno == ECAPMODE))
-		g_warning("File system access restricted to %s due to capability mode", irclogs_path);
+		g_warning("File system access restricted to %s "
+		    "due to capability mode", irclogs_path);
 
 	return (fd);
 }
 
+void capsicum_mkdir_with_parents(const char *path, int mode)
+{
+	char *component, *copy, *tofree;
+	int error, fd, newfd;
+
+	/* +1 is for the slash separating irclogs_path and the rest. */
+	if (strlen(path) <= irclogs_path_len + 1 ||
+	    strncmp(path, irclogs_path, irclogs_path_len) != 0) {
+		g_warning("Cannot create %s: file system access restricted "
+		    "to %s due to capability mode", path, irclogs_path);
+		return;
+	}
+
+	copy = tofree = g_strdup(path + irclogs_path_len + 1);
+	fd = irclogs_fd;
+	for (;;) {
+		component = strsep(&copy, "/");
+		if (component == NULL)
+			break;
+		error = mkdirat(fd, component, mode);
+		if (error != 0 && errno != EEXIST) {
+			g_warning("cannot create %s: %s",
+			    component, strerror(errno));
+			break;
+		}
+		newfd = openat(fd, component, O_DIRECTORY);
+		if (newfd < 0) {
+			g_warning("cannot open %s: %s",
+			    component, strerror(errno));
+			break;
+		}
+		if (fd != irclogs_fd)
+			close(fd);
+		fd = newfd;
+	}
+	g_free(tofree);
+	if (fd != irclogs_fd)
+		close(fd);
+}
+
 nvlist_t *symbiont_connect(const nvlist_t *request)
 {
 	nvlist_t *response;
diff --git a/src/core/capsicum.h b/src/core/capsicum.h
index ca35fd05..1eb56402 100644
--- a/src/core/capsicum.h
+++ b/src/core/capsicum.h
@@ -5,6 +5,7 @@ gboolean capsicum_enabled(void);
 int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
 int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
 int capsicum_open(const char *path, int flags, int mode);
+void capsicum_mkdir_with_parents(const char *path, int mode);
 
 void capsicum_init(void);
 void capsicum_deinit(void);
diff --git a/src/core/log.c b/src/core/log.c
index 00686bee..9394263f 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -127,7 +127,14 @@ int log_start_logging(LOG_REC *log)
 		/* path may contain variables (%time, $vars),
 		   make sure the directory is created */
 		dir = g_path_get_dirname(log->real_fname);
+#ifdef HAVE_CAPSICUM
+		if (capsicum_enabled())
+			capsicum_mkdir_with_parents(dir, log_dir_create_mode);
+		else
+			g_mkdir_with_parents(dir, log_dir_create_mode);
+#else
 		g_mkdir_with_parents(dir, log_dir_create_mode);
+#endif
 		g_free(dir);
 	}
 
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 5df02981..dd86af7c 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -167,7 +167,14 @@ void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
 	int f;
 
         dir = g_path_get_dirname(fname);
-        g_mkdir_with_parents(dir, log_dir_create_mode);
+#ifdef HAVE_CAPSICUM
+	if (capsicum_enabled())
+		capsicum_mkdir_with_parents(dir, log_dir_create_mode);
+	else
+		g_mkdir_with_parents(dir, log_dir_create_mode);
+#else
+	g_mkdir_with_parents(dir, log_dir_create_mode);
+#endif
         g_free(dir);
 
 	path = convert_home(fname);
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 37b29990..deb70991 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -30,6 +30,9 @@
 #include "special-vars.h"
 #include "settings.h"
 #include "lib-config/iconfig.h"
+#ifdef HAVE_CAPSICUM
+#include "capsicum.h"
+#endif
 
 #include "fe-windows.h"
 #include "window-items.h"
@@ -451,7 +454,14 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
 		log_item_add(log, LOG_ITEM_TARGET, target, server_tag);
 
 		dir = g_path_get_dirname(log->real_fname);
+#ifdef HAVE_CAPSICUM
+		if (capsicum_enabled())
+			capsicum_mkdir_with_parents(dir, log_dir_create_mode);
+		else
+			g_mkdir_with_parents(dir, log_dir_create_mode);
+#else
 		g_mkdir_with_parents(dir, log_dir_create_mode);
+#endif
 		g_free(dir);
 
 		log->temp = TRUE;

From c00d4753aee732b5a815f12dda3c9fced41ef1f5 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 11:41:56 +0100
Subject: [PATCH 0606/1650] Restrict port range available in capability mode.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index c554fcf7..e87704dd 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -40,6 +40,8 @@ static char *irclogs_path;
 static size_t irclogs_path_len;
 static int irclogs_fd;
 static int symbiontfds[2];
+static int port_min;
+static int port_max;
 
 gboolean capsicum_enabled(void)
 {
@@ -90,6 +92,13 @@ int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 	}
 	saved_errno = nvlist_get_number(nvl, "errno");
 	nvlist_destroy(nvl);
+
+	if (sock == -1 && (port < port_min || port > port_max)) {
+		g_warning("Access restricted to ports between %d and %d "
+		    "due to capability mode",
+		    port_min, port_max);
+	}
+
 	errno = saved_errno;
 
 	return sock;
@@ -205,9 +214,19 @@ nvlist_t *symbiont_connect(const nvlist_t *request)
 	else
 		my_ip = NULL;
 
-	/* Connect. */
-	sock = net_connect_ip_handle(ip, port, my_ip);
-	saved_errno = errno;
+	/*
+	 * Check if the port is in allowed range.  This is to minimize
+	 * the chance of the attacker rooting another system in case of
+	 * compromise.
+	 */
+	if (port < port_min || port > port_max) {
+		sock = -1;
+		saved_errno = EPERM;
+	} else {
+		/* Connect. */
+		sock = net_connect_ip_handle(ip, port, my_ip);
+		saved_errno = errno;
+	}
 
 	/* Send back the socket fd. */
 	response = nvlist_create(0);
@@ -326,6 +345,9 @@ static void cmd_capsicum_enter(void)
 		return;
 	}
 
+	port_min = settings_get_int("capsicum_port_min");
+	port_max = settings_get_int("capsicum_port_max");
+
 	irclogs_path = convert_home(settings_get_str("capsicum_irclogs_path"));
 	g_mkdir_with_parents(irclogs_path, log_dir_create_mode);
 	irclogs_path_len = strlen(irclogs_path);
@@ -375,6 +397,8 @@ void capsicum_init(void)
 {
 	settings_add_bool("misc", "capsicum", FALSE);
 	settings_add_str("misc", "capsicum_irclogs_path", "~/irclogs");
+	settings_add_int("misc", "capsicum_port_min", 6667);
+	settings_add_int("misc", "capsicum_port_max", 6697);
 
 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
 

From 12e2c46d6a778f131c1ca6a7134af1cd5e722dbe Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 12:28:49 +0100
Subject: [PATCH 0607/1650] Add wrappers to reduce #ifdefs.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c         | 17 +++++++++++++++++
 src/core/capsicum.h         | 12 +++++++++++-
 src/core/log.c              | 23 ++---------------------
 src/core/rawlog.c           | 29 ++++++-----------------------
 src/fe-common/core/fe-log.c | 11 +----------
 5 files changed, 37 insertions(+), 55 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index e87704dd..99a4e795 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -161,6 +161,14 @@ int capsicum_open(const char *path, int flags, int mode)
 	return (fd);
 }
 
+int capsicum_open_wrapper(const char *path, int flags, int mode)
+{
+	if (capsicum_enabled()) {
+		return capsicum_open(path, flags, mode);
+	}
+	return open(path, flags, mode);
+}
+
 void capsicum_mkdir_with_parents(const char *path, int mode)
 {
 	char *component, *copy, *tofree;
@@ -201,6 +209,15 @@ void capsicum_mkdir_with_parents(const char *path, int mode)
 		close(fd);
 }
 
+void capsicum_mkdir_with_parents_wrapper(const char *path, int mode)
+{
+	if (capsicum_enabled()) {
+		capsicum_mkdir_with_parents(path, mode);
+		return;
+	}
+	g_mkdir_with_parents(path, mode);
+}
+
 nvlist_t *symbiont_connect(const nvlist_t *request)
 {
 	nvlist_t *response;
diff --git a/src/core/capsicum.h b/src/core/capsicum.h
index 1eb56402..3c1234e1 100644
--- a/src/core/capsicum.h
+++ b/src/core/capsicum.h
@@ -7,7 +7,17 @@ int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
 int capsicum_open(const char *path, int flags, int mode);
 void capsicum_mkdir_with_parents(const char *path, int mode);
 
+#ifdef HAVE_CAPSICUM
+int capsicum_open_wrapper(const char *path, int flags, int mode);
+void capsicum_mkdir_with_parents_wrapper(const char *path, int mode);
+#else
+#define	capsicum_open_wrapper(P, F, M)			\
+	open(P, F, M)
+#define	capsicum_mkdir_with_parents_wrapper(P, M)	\
+	g_mkdir_with_parents(P, M)
+#endif
+
 void capsicum_init(void);
 void capsicum_deinit(void);
 
-#endif
+#endif /* !__CAPSICUM_H */
diff --git a/src/core/log.c b/src/core/log.c
index 9394263f..ea2f1a1d 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -26,9 +26,7 @@
 #include "servers.h"
 #include "log.h"
 #include "write-buffer.h"
-#ifdef HAVE_CAPSICUM
 #include "capsicum.h"
-#endif
 
 #include "lib-config/iconfig.h"
 #include "settings.h"
@@ -76,16 +74,6 @@ static void log_write_timestamp(int handle, const char *format,
 	if (text != NULL) write_buffer(handle, text, strlen(text));
 }
 
-static int log_open_wrapper(const char *path, int flags, int mode)
-{
-#ifdef HAVE_CAPSICUM
-	if (capsicum_enabled())
-		return capsicum_open(path, flags, mode);
-#endif
-
-	return open(path, flags, mode);
-}
-
 static char *log_filename(LOG_REC *log)
 {
 	char *str, fname[1024];
@@ -127,19 +115,12 @@ int log_start_logging(LOG_REC *log)
 		/* path may contain variables (%time, $vars),
 		   make sure the directory is created */
 		dir = g_path_get_dirname(log->real_fname);
-#ifdef HAVE_CAPSICUM
-		if (capsicum_enabled())
-			capsicum_mkdir_with_parents(dir, log_dir_create_mode);
-		else
-			g_mkdir_with_parents(dir, log_dir_create_mode);
-#else
-		g_mkdir_with_parents(dir, log_dir_create_mode);
-#endif
+		capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
 		g_free(dir);
 	}
 
 	log->handle = log->real_fname == NULL ? -1 :
-		log_open_wrapper(log->real_fname, O_WRONLY | O_APPEND | O_CREAT,
+		capsicum_open_wrapper(log->real_fname, O_WRONLY | O_APPEND | O_CREAT,
 		     log_file_create_mode);
 	if (log->handle == -1) {
 		signal_emit("log create failed", 1, log);
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index dd86af7c..8f674e6b 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -27,25 +27,13 @@
 #include "misc.h"
 #include "write-buffer.h"
 #include "settings.h"
-#ifdef HAVE_CAPSICUM
 #include "capsicum.h"
-#endif
 
 #include "servers.h"
 
 static int rawlog_lines;
 static int signal_rawlog;
 
-static int rawlog_open_wrapper(const char *path, int flags, int mode)
-{
-#ifdef HAVE_CAPSICUM
-	if (capsicum_enabled())
-		return capsicum_open(path, flags, mode);
-#endif
-
-	return open(path, flags, mode);
-}
-
 RAWLOG_REC *rawlog_create(void)
 {
 	RAWLOG_REC *rec;
@@ -139,8 +127,9 @@ void rawlog_open(RAWLOG_REC *rawlog, const char *fname)
 		return;
 
 	path = convert_home(fname);
-	rawlog->handle = rawlog_open_wrapper(path, O_WRONLY | O_APPEND | O_CREAT,
-			      log_file_create_mode);
+	rawlog->handle = capsicum_open_wrapper(path,
+					       O_WRONLY | O_APPEND | O_CREAT,
+					       log_file_create_mode);
 	g_free(path);
 
 	if (rawlog->handle == -1) {
@@ -167,18 +156,12 @@ void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
 	int f;
 
         dir = g_path_get_dirname(fname);
-#ifdef HAVE_CAPSICUM
-	if (capsicum_enabled())
-		capsicum_mkdir_with_parents(dir, log_dir_create_mode);
-	else
-		g_mkdir_with_parents(dir, log_dir_create_mode);
-#else
-	g_mkdir_with_parents(dir, log_dir_create_mode);
-#endif
+	capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
         g_free(dir);
 
 	path = convert_home(fname);
-	f = rawlog_open_wrapper(path, O_WRONLY | O_APPEND | O_CREAT, log_file_create_mode);
+	f = capsicum_open_wrapper(path, O_WRONLY | O_APPEND | O_CREAT,
+				  log_file_create_mode);
 	g_free(path);
 
 	if (f < 0) {
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index deb70991..3d8910c9 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -30,9 +30,7 @@
 #include "special-vars.h"
 #include "settings.h"
 #include "lib-config/iconfig.h"
-#ifdef HAVE_CAPSICUM
 #include "capsicum.h"
-#endif
 
 #include "fe-windows.h"
 #include "window-items.h"
@@ -454,14 +452,7 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
 		log_item_add(log, LOG_ITEM_TARGET, target, server_tag);
 
 		dir = g_path_get_dirname(log->real_fname);
-#ifdef HAVE_CAPSICUM
-		if (capsicum_enabled())
-			capsicum_mkdir_with_parents(dir, log_dir_create_mode);
-		else
-			g_mkdir_with_parents(dir, log_dir_create_mode);
-#else
-		g_mkdir_with_parents(dir, log_dir_create_mode);
-#endif
+		capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
 		g_free(dir);
 
 		log->temp = TRUE;

From 8c04c2be14fc053bd7b5ff03b8e4ba8cb5023700 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 12:30:27 +0100
Subject: [PATCH 0608/1650] Fix build without Capsicum.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/core.c                     | 4 ++++
 src/fe-common/core/fe-common-core.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/core/core.c b/src/core/core.c
index 72631f91..c95879de 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -236,7 +236,9 @@ void core_init(void)
 	commands_init();
 	nickmatch_cache_init();
         session_init();
+#ifdef HAVE_CAPSICUM
 	capsicum_init();
+#endif
 
 	chat_protocols_init();
 	chatnets_init();
@@ -294,7 +296,9 @@ void core_deinit(void)
 	chatnets_deinit();
 	chat_protocols_deinit();
 
+#ifdef HAVE_CAPSICUM
 	capsicum_deinit();
+#endif
         session_deinit();
         nickmatch_cache_deinit();
 	commands_deinit();
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index a0388827..67c9e20c 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -180,7 +180,9 @@ void fe_common_core_init(void)
 	fe_server_init();
 	fe_settings_init();
 	fe_tls_init();
+#ifdef HAVE_CAPSICUM
 	fe_capsicum_init();
+#endif
 	windows_init();
 	window_activity_init();
 	window_commands_init();
@@ -223,7 +225,9 @@ void fe_common_core_deinit(void)
 	fe_server_deinit();
 	fe_settings_deinit();
 	fe_tls_deinit();
+#ifdef HAVE_CAPSICUM
 	fe_capsicum_deinit();
+#endif
 	windows_deinit();
 	window_activity_deinit();
 	window_commands_deinit();

From 7f2697d30744d1f33cf67430aa48013b8f4ae9cd Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 12:38:06 +0100
Subject: [PATCH 0609/1650] Cosmetics.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/log.h    | 2 --
 src/core/rawlog.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/core/log.h b/src/core/log.h
index 52660bb9..5a07859b 100644
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -38,8 +38,6 @@ extern GSList *logs;
 extern int log_file_create_mode;
 extern int log_dir_create_mode;
 
-extern int log_dir_create_mode;
-
 /* Create log record - you still need to call log_update() to actually add it
    into log list */
 LOG_REC *log_create_rec(const char *fname, int level);
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 8f674e6b..a95b9a92 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -156,7 +156,7 @@ void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
 	int f;
 
         dir = g_path_get_dirname(fname);
-	capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
+        capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
         g_free(dir);
 
 	path = convert_home(fname);

From a29eeaa9f2e85630b08fc46b3a2b8749b9719efd Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 29 Jul 2017 20:04:28 +0100
Subject: [PATCH 0610/1650] Fix trailing slash handling for
 capsicum_irclogs_path.

This is mostly an anti-footshooting measure, but still.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 99a4e795..01f5f95c 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -147,6 +147,7 @@ int capsicum_open(const char *path, int flags, int mode)
 
 	/* +1 is for the slash separating irclogs_path and the rest. */
 	if (strlen(path) > irclogs_path_len + 1 &&
+	    path[irclogs_path_len] == '/' &&
 	    strncmp(path, irclogs_path, irclogs_path_len) == 0) {
 		fd = openat(irclogs_fd, path + irclogs_path_len + 1,
 		    flags, mode);
@@ -176,6 +177,7 @@ void capsicum_mkdir_with_parents(const char *path, int mode)
 
 	/* +1 is for the slash separating irclogs_path and the rest. */
 	if (strlen(path) <= irclogs_path_len + 1 ||
+	    path[irclogs_path_len] != '/' ||
 	    strncmp(path, irclogs_path, irclogs_path_len) != 0) {
 		g_warning("Cannot create %s: file system access restricted "
 		    "to %s due to capability mode", path, irclogs_path);
@@ -366,8 +368,15 @@ static void cmd_capsicum_enter(void)
 	port_max = settings_get_int("capsicum_port_max");
 
 	irclogs_path = convert_home(settings_get_str("capsicum_irclogs_path"));
-	g_mkdir_with_parents(irclogs_path, log_dir_create_mode);
 	irclogs_path_len = strlen(irclogs_path);
+
+	/* Strip trailing slashes, if any. */
+	while (irclogs_path_len > 0 && irclogs_path[irclogs_path_len - 1] == '/') {
+		irclogs_path[irclogs_path_len - 1] = '\0';
+		irclogs_path_len--;
+	}
+
+	g_mkdir_with_parents(irclogs_path, log_dir_create_mode);
 	irclogs_fd = open(irclogs_path, O_DIRECTORY | O_CLOEXEC);
 	if (irclogs_fd < 0) {
 		g_warning("Unable to open %s: %s", irclogs_path, strerror(errno));

From 8bb392a3f47d74cccb9e2d7e3633e3e534306968 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sun, 30 Jul 2017 01:27:33 +0100
Subject: [PATCH 0611/1650] Hook up capsicum.h and fe-capsicum.h to autotools.

This hopefully fixes Travis build.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/Makefile.am           | 1 +
 src/fe-common/core/Makefile.am | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index f3bc1674..983f7e32 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -74,6 +74,7 @@ structure_headers = \
 pkginc_coredir=$(pkgincludedir)/src/core
 pkginc_core_HEADERS = \
 	args.h \
+	capsicum.h \
 	channels.h \
 	channels-setup.h \
 	commands.h \
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 08e41520..29cc941a 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -48,6 +48,7 @@ pkginc_fe_common_core_HEADERS = \
 	command-history.h \
 	chat-completion.h \
 	completion.h \
+	fe-capsicum.h \
 	fe-channels.h \
 	fe-common-core.h \
 	fe-core-commands.h \

From 5551b4fe9504f5d5b4e81a680741cab72bec82e9 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sun, 30 Jul 2017 11:47:08 +0100
Subject: [PATCH 0612/1650] Update copyrights.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c              | 4 ++++
 src/fe-common/core/fe-capsicum.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 01f5f95c..b5f704f7 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -3,6 +3,10 @@
 
     Copyright (C) 2017 Edward Tomasz Napierala <trasz@FreeBSD.org>
 
+    This software was developed by SRI International and the University of
+    Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+    ("CTSRD"), as part of the DARPA CRASH research programme.
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
diff --git a/src/fe-common/core/fe-capsicum.c b/src/fe-common/core/fe-capsicum.c
index 5816b223..4666eda7 100644
--- a/src/fe-common/core/fe-capsicum.c
+++ b/src/fe-common/core/fe-capsicum.c
@@ -3,6 +3,10 @@
 
     Copyright (C) 2017 Edward Tomasz Napierala <trasz@FreeBSD.org>
 
+    This software was developed by SRI International and the University of
+    Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+    ("CTSRD"), as part of the DARPA CRASH research programme.
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or

From aeaa420ad330a528391ed149371b55581a808655 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 1 Aug 2017 01:15:25 +0100
Subject: [PATCH 0613/1650] Clean up includes a bit.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c              | 1 +
 src/fe-common/core/fe-capsicum.c | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index b5f704f7..06cb8d9b 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -23,6 +23,7 @@
 */
 
 #include "module.h"
+#include "capsicum.h"
 #include "commands.h"
 #include "log.h"
 #include "misc.h"
diff --git a/src/fe-common/core/fe-capsicum.c b/src/fe-common/core/fe-capsicum.c
index 4666eda7..54a43d27 100644
--- a/src/fe-common/core/fe-capsicum.c
+++ b/src/fe-common/core/fe-capsicum.c
@@ -23,12 +23,11 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "printtext.h"
-
+#include "fe-capsicum.h"
 #include "levels.h"
-#include "servers.h"
+#include "module-formats.h"
+#include "printtext.h"
+#include "signals.h"
 
 static void capability_mode_enabled(void)
 {

From 96f4fe10c6081cf441122039c39eb6422eef13e8 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 1 Aug 2017 01:47:45 +0100
Subject: [PATCH 0614/1650] Change the way we load default CA certificates so
 it works with Capsicum.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c        |  8 ++++++++
 src/core/network-openssl.c | 23 ++++++++++++++++++++---
 src/core/network-openssl.h |  6 ++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 src/core/network-openssl.h

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 06cb8d9b..79db780a 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -28,6 +28,7 @@
 #include "log.h"
 #include "misc.h"
 #include "network.h"
+#include "network-openssl.h"
 #include "settings.h"
 #include "signals.h"
 
@@ -361,6 +362,7 @@ static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
 static void cmd_capsicum_enter(void)
 {
 	u_int mode;
+	gboolean inited;
 	int error;
 
 	error = cap_getmode(&mode);
@@ -369,6 +371,12 @@ static void cmd_capsicum_enter(void)
 		return;
 	}
 
+	inited = irssi_ssl_init();
+	if (!inited) {
+		signal_emit("capability mode failed", 1, strerror(errno));
+		return;
+	}
+
 	port_min = settings_get_int("capsicum_port_min");
 	port_max = settings_get_int("capsicum_port_max");
 
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 4de3cb3c..78bdcce4 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include "network.h"
+#include "network-openssl.h"
 #include "net-sendbuffer.h"
 #include "misc.h"
 #include "servers.h"
@@ -58,6 +59,7 @@ typedef struct
 } GIOSSLChannel;
 
 static int ssl_inited = FALSE;
+static X509_STORE *store = NULL;
 
 static void irssi_ssl_free(GIOChannel *handle)
 {
@@ -362,8 +364,10 @@ static GIOFuncs irssi_ssl_channel_funcs = {
     irssi_ssl_get_flags
 };
 
-static gboolean irssi_ssl_init(void)
+gboolean irssi_ssl_init(void)
 {
+	int success;
+
 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
 	if (!OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT, NULL)) {
 		g_error("Could not initialize OpenSSL");
@@ -374,6 +378,20 @@ static gboolean irssi_ssl_init(void)
 	SSL_load_error_strings();
 	OpenSSL_add_all_algorithms();
 #endif
+	store = X509_STORE_new();
+	if (store == NULL) {
+		g_error("Could not initialize OpenSSL: X509_STORE_new() failed");
+		return FALSE;
+	}
+
+	success = X509_STORE_set_default_paths(store);
+	if (success == 0) {
+		g_error("Could not load default certificates");
+		X509_STORE_free(store);
+		store = NULL;
+		return FALSE;
+	}
+
 	ssl_inited = TRUE;
 
 	return TRUE;
@@ -492,8 +510,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		g_free(scapath);
 		verify = TRUE;
 	} else {
-		if (!SSL_CTX_set_default_verify_paths(ctx))
-			g_warning("Could not load default certificates");
+		SSL_CTX_set_cert_store(ctx, store);
 	}
 
 	if(!(ssl = SSL_new(ctx)))
diff --git a/src/core/network-openssl.h b/src/core/network-openssl.h
new file mode 100644
index 00000000..4cd6d711
--- /dev/null
+++ b/src/core/network-openssl.h
@@ -0,0 +1,6 @@
+#ifndef __NETWORK_OPENSSL_H
+#define __NETWORK_OPENSSL_H
+
+gboolean irssi_ssl_init(void);
+
+#endif /* !__NETWORK_OPENSSL_H */

From 5db6caee0d17eb125d8c7f3090c325ffbee35920 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 1 Aug 2017 01:50:16 +0100
Subject: [PATCH 0615/1650] Attempt to fix build by adding the forgotten
 header.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 983f7e32..f64d9e2e 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -95,6 +95,7 @@ pkginc_core_HEADERS = \
 	net-nonblock.h \
 	net-sendbuffer.h \
 	network.h \
+	network-openssl.h \
 	nick-rec.h \
 	nicklist.h \
 	nickmatch-cache.h \

From 788e47032f9f6b7eea188a1a6e7fc1a19531c1b0 Mon Sep 17 00:00:00 2001
From: Paul Townsend <paul@plik.org>
Date: Sat, 5 Aug 2017 21:02:35 +0100
Subject: [PATCH 0616/1650] Update /CONNECT and /SERVER syntax tags (-ssl ->
 -tls).

---
 src/core/chat-commands.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index e86fdf9d..d5a133f8 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -149,9 +149,9 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
         return conn;
 }
 
-/* SYNTAX: CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
-                   [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
-                   [-ssl_ciphers <list>]
+/* SYNTAX: CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>]
+                   [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>]
+                   [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
                    [-!] [-noautosendcmd]
 		   [-noproxy] [-network <network>] [-host <hostname>]
 		   [-rawlog <file>]
@@ -250,10 +250,10 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }
 
-/* SYNTAX: SERVER CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] 
-		  [-ssl_pass <password>] [-ssl_verify] [-ssl_cafile <cafile>] 
-		  [-ssl_capath <capath>]
-		  [-ssl_ciphers <list>]
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] 
+		  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] 
+		  [-tls_capath <capath>]
+		  [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
 		  [-!] [-noautosendcmd]
 		  [-noproxy] [-network <network>] [-host <hostname>]
 		  [-rawlog <file>]

From 947682e5dde85aa5e0277c01d7fb4afc1032ea04 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 7 Aug 2017 15:24:07 +0200
Subject: [PATCH 0617/1650] Revert "Merge pull request #452 from
 LemonBoy/terminfo-cup"

Fixes #733. The fix outlined in #452 had adverse effects for the
following reason. The code removed the restoration path that would go on
the code path from kill SIGTSTP. The problem is this: When Irssi is not
running in a controlling parent (like a shell), the TSTP will in fact be
ignored. In that case, there is no process sending a CONT either and
thus the screen state never gets restored. Luckily, the patch in #457 is
sufficient to prevent the problem in #450 (which lead to the development
of #452). To that end, we do end up with potentially calling
terminfo_cont twice but that is better than not calling it at all.

This reverts commit b1ffd5f6472584aa3966746da9728c5afefcc4ce, reversing
changes made to 9cb0419435d1ad331c1f55361a003d9682fae9a8.
---
 src/fe-text/term-terminfo.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index bca37efc..6645cfb0 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -629,6 +629,13 @@ void term_stop(void)
 {
 	terminfo_stop(current_term);
 	kill(getpid(), SIGTSTP);
+	/* this call needs to stay here in case the TSTP was ignored,
+	   because then we never see a CONT to call the restoration
+	   code. On the other hand we also cannot remove the CONT
+	   handler because then nothing would restore the screen when
+	   Irssi is killed with TSTP/STOP from external. */
+	terminfo_cont(current_term);
+	irssi_redraw();
 }
 
 static int input_utf8(const unsigned char *buffer, int size, unichar *result)

From 0c49a84ffb8d74506a13653183bfa1ef8ffd2554 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 9 Aug 2017 11:06:36 +0100
Subject: [PATCH 0618/1650] Add back some ifdefs.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.h                 | 10 +---------
 src/core/core.c                     |  2 ++
 src/core/log.c                      | 12 ++++++++++++
 src/core/rawlog.c                   | 16 ++++++++++++++++
 src/fe-common/core/fe-common-core.c |  2 ++
 src/fe-common/core/fe-log.c         |  6 ++++++
 6 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/core/capsicum.h b/src/core/capsicum.h
index 3c1234e1..7d89f2aa 100644
--- a/src/core/capsicum.h
+++ b/src/core/capsicum.h
@@ -5,17 +5,9 @@ gboolean capsicum_enabled(void);
 int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
 int capsicum_net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
 int capsicum_open(const char *path, int flags, int mode);
-void capsicum_mkdir_with_parents(const char *path, int mode);
-
-#ifdef HAVE_CAPSICUM
 int capsicum_open_wrapper(const char *path, int flags, int mode);
+void capsicum_mkdir_with_parents(const char *path, int mode);
 void capsicum_mkdir_with_parents_wrapper(const char *path, int mode);
-#else
-#define	capsicum_open_wrapper(P, F, M)			\
-	open(P, F, M)
-#define	capsicum_mkdir_with_parents_wrapper(P, M)	\
-	g_mkdir_with_parents(P, M)
-#endif
 
 void capsicum_init(void);
 void capsicum_deinit(void);
diff --git a/src/core/core.c b/src/core/core.c
index c95879de..506d6a13 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -29,7 +29,9 @@
 #include "signals.h"
 #include "settings.h"
 #include "session.h"
+#ifdef HAVE_CAPSICUM
 #include "capsicum.h"
+#endif
 
 #include "chat-protocols.h"
 #include "servers.h"
diff --git a/src/core/log.c b/src/core/log.c
index ea2f1a1d..f7741d3d 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -26,7 +26,9 @@
 #include "servers.h"
 #include "log.h"
 #include "write-buffer.h"
+#ifdef HAVE_CAPSICUM
 #include "capsicum.h"
+#endif
 
 #include "lib-config/iconfig.h"
 #include "settings.h"
@@ -115,13 +117,23 @@ int log_start_logging(LOG_REC *log)
 		/* path may contain variables (%time, $vars),
 		   make sure the directory is created */
 		dir = g_path_get_dirname(log->real_fname);
+#ifdef HAVE_CAPSICUM
 		capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
+#else
+		g_mkdir_with_parents(dir, log_dir_create_mode);
+#endif
 		g_free(dir);
 	}
 
+#ifdef HAVE_CAPSICUM
 	log->handle = log->real_fname == NULL ? -1 :
 		capsicum_open_wrapper(log->real_fname, O_WRONLY | O_APPEND | O_CREAT,
 		     log_file_create_mode);
+#else
+	log->handle = log->real_fname == NULL ? -1 :
+		open(log->real_fname, O_WRONLY | O_APPEND | O_CREAT,
+		     log_file_create_mode);
+#endif
 	if (log->handle == -1) {
 		signal_emit("log create failed", 1, log);
 		log->failed = TRUE;
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index a95b9a92..fdd51241 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -27,7 +27,9 @@
 #include "misc.h"
 #include "write-buffer.h"
 #include "settings.h"
+#ifdef HAVE_CAPSICUM
 #include "capsicum.h"
+#endif
 
 #include "servers.h"
 
@@ -127,9 +129,15 @@ void rawlog_open(RAWLOG_REC *rawlog, const char *fname)
 		return;
 
 	path = convert_home(fname);
+#ifdef HAVE_CAPSICUM
 	rawlog->handle = capsicum_open_wrapper(path,
 					       O_WRONLY | O_APPEND | O_CREAT,
 					       log_file_create_mode);
+#else
+	rawlog->handle = open(path, O_WRONLY | O_APPEND | O_CREAT,
+			      log_file_create_mode);
+#endif
+
 	g_free(path);
 
 	if (rawlog->handle == -1) {
@@ -156,12 +164,20 @@ void rawlog_save(RAWLOG_REC *rawlog, const char *fname)
 	int f;
 
         dir = g_path_get_dirname(fname);
+#ifdef HAVE_CAPSICUM
         capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
+#else
+        g_mkdir_with_parents(dir, log_dir_create_mode);
+#endif
         g_free(dir);
 
 	path = convert_home(fname);
+#ifdef HAVE_CAPSICUM
 	f = capsicum_open_wrapper(path, O_WRONLY | O_APPEND | O_CREAT,
 				  log_file_create_mode);
+#else
+	f = open(path, O_WRONLY | O_APPEND | O_CREAT, log_file_create_mode);
+#endif
 	g_free(path);
 
 	if (f < 0) {
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 67c9e20c..a3b7364c 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -32,7 +32,9 @@
 #include "special-vars.h"
 #include "fe-core-commands.h"
 #include "fe-queries.h"
+#ifdef HAVE_CAPSICUM
 #include "fe-capsicum.h"
+#endif
 #include "hilight-text.h"
 #include "command-history.h"
 #include "completion.h"
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 3d8910c9..0fed8642 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -30,7 +30,9 @@
 #include "special-vars.h"
 #include "settings.h"
 #include "lib-config/iconfig.h"
+#ifdef HAVE_CAPSICUM
 #include "capsicum.h"
+#endif
 
 #include "fe-windows.h"
 #include "window-items.h"
@@ -452,7 +454,11 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
 		log_item_add(log, LOG_ITEM_TARGET, target, server_tag);
 
 		dir = g_path_get_dirname(log->real_fname);
+#ifdef HAVE_CAPSICUM
 		capsicum_mkdir_with_parents_wrapper(dir, log_dir_create_mode);
+#else
+		g_mkdir_with_parents(dir, log_dir_create_mode);
+#endif
 		g_free(dir);
 
 		log->temp = TRUE;

From 4bcbb41113bf23b1d121ad6fbd7b86473f7fa89d Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 9 Aug 2017 14:36:06 +0100
Subject: [PATCH 0619/1650] Fix indentation; no functional changes.

(Take two.)

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/fe-common/core/module-formats.h | 50 ++++++++++++++---------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index a9ed28c5..f361befb 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -12,21 +12,21 @@ enum {
 	TXT_DAYCHANGE,
 	TXT_TALKING_WITH,
 	TXT_REFNUM_TOO_LOW,
-        TXT_ERROR_SERVER_STICKY,
-        TXT_SET_SERVER_STICKY,
+	TXT_ERROR_SERVER_STICKY,
+	TXT_SET_SERVER_STICKY,
 	TXT_UNSET_SERVER_STICKY,
-        TXT_WINDOW_NAME_NOT_UNIQUE,
-        TXT_WINDOW_LEVEL,
-        TXT_WINDOW_SET_IMMORTAL,
-        TXT_WINDOW_UNSET_IMMORTAL,
-        TXT_WINDOW_IMMORTAL_ERROR,
+	TXT_WINDOW_NAME_NOT_UNIQUE,
+	TXT_WINDOW_LEVEL,
+	TXT_WINDOW_SET_IMMORTAL,
+	TXT_WINDOW_UNSET_IMMORTAL,
+	TXT_WINDOW_IMMORTAL_ERROR,
 	TXT_WINDOWLIST_HEADER,
 	TXT_WINDOWLIST_LINE,
 	TXT_WINDOWLIST_FOOTER,
 	TXT_WINDOWS_LAYOUT_SAVED,
 	TXT_WINDOWS_LAYOUT_RESET,
-        TXT_WINDOW_INFO_HEADER,
-        TXT_WINDOW_INFO_FOOTER,
+	TXT_WINDOW_INFO_HEADER,
+	TXT_WINDOW_INFO_FOOTER,
 	TXT_WINDOW_INFO_REFNUM,
 	TXT_WINDOW_INFO_REFNUM_STICKY,
 	TXT_WINDOW_INFO_NAME,
@@ -34,22 +34,22 @@ enum {
 	TXT_WINDOW_INFO_IMMORTAL,
 	TXT_WINDOW_INFO_SIZE,
 	TXT_WINDOW_INFO_LEVEL,
-        TXT_WINDOW_INFO_SERVER,
+	TXT_WINDOW_INFO_SERVER,
 	TXT_WINDOW_INFO_SERVER_STICKY,
-        TXT_WINDOW_INFO_THEME,
+	TXT_WINDOW_INFO_THEME,
 	TXT_WINDOW_INFO_BOUND_ITEMS_HEADER,
 	TXT_WINDOW_INFO_BOUND_ITEM,
 	TXT_WINDOW_INFO_BOUND_ITEMS_FOOTER,
 	TXT_WINDOW_INFO_ITEMS_HEADER,
 	TXT_WINDOW_INFO_ITEM,
-        TXT_WINDOW_INFO_ITEMS_FOOTER,
+	TXT_WINDOW_INFO_ITEMS_FOOTER,
 
 	TXT_FILL_2,
 
 	TXT_LOOKING_UP,
 	TXT_CONNECTING,
- 	TXT_RECONNECTING,
-        TXT_CONNECTION_ESTABLISHED,
+	TXT_RECONNECTING,
+	TXT_CONNECTION_ESTABLISHED,
 	TXT_CANT_CONNECT,
 	TXT_CONNECTION_LOST,
 	TXT_LAG_DISCONNECTED,
@@ -100,7 +100,7 @@ enum {
 	TXT_CHANSETUP_LINE,
 	TXT_CHANSETUP_FOOTER,
 
-        TXT_FILL_4,
+	TXT_FILL_4,
 
 	TXT_OWN_MSG,
 	TXT_OWN_MSG_CHANNEL,
@@ -162,7 +162,7 @@ enum {
 
 	TXT_MODULE_HEADER,
 	TXT_MODULE_LINE,
-        TXT_MODULE_FOOTER,
+	TXT_MODULE_FOOTER,
 	TXT_MODULE_ALREADY_LOADED,
 	TXT_MODULE_NOT_LOADED,
 	TXT_MODULE_LOAD_ERROR,
@@ -183,7 +183,7 @@ enum {
 	TXT_NOT_JOINED,
 	TXT_CHAN_NOT_FOUND,
 	TXT_CHAN_NOT_SYNCED,
-        TXT_ILLEGAL_PROTO,
+	TXT_ILLEGAL_PROTO,
 	TXT_NOT_GOOD_IDEA,
 	TXT_INVALID_NUMBER,
 	TXT_INVALID_TIME,
@@ -232,8 +232,8 @@ enum {
 
 	TXT_FILL_14,
 
-        TXT_UNKNOWN_CHAT_PROTOCOL,
-        TXT_UNKNOWN_CHATNET,
+	TXT_UNKNOWN_CHAT_PROTOCOL,
+	TXT_UNKNOWN_CHATNET,
 	TXT_NOT_TOGGLE,
 	TXT_PERL_ERROR,
 	TXT_BIND_HEADER,
@@ -245,15 +245,15 @@ enum {
 	TXT_CONFIG_RELOADED,
 	TXT_CONFIG_MODIFIED,
 	TXT_GLIB_ERROR,
-        TXT_OVERWRITE_CONFIG,
-        TXT_SET_TITLE,
-        TXT_SET_ITEM,
-        TXT_SET_UNKNOWN,
+	TXT_OVERWRITE_CONFIG,
+	TXT_SET_TITLE,
+	TXT_SET_ITEM,
+	TXT_SET_UNKNOWN,
 	TXT_SET_NOT_BOOLEAN,
 	TXT_NO_COMPLETIONS,
-        TXT_COMPLETION_REMOVED,
+	TXT_COMPLETION_REMOVED,
 	TXT_COMPLETION_HEADER,
-        TXT_COMPLETION_LINE,
+	TXT_COMPLETION_LINE,
 	TXT_COMPLETION_FOOTER,
 
 	TLS_FILL_15,

From edee0ba587069a860eac43f9219f8ecfa49fe1fa Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 10 Aug 2017 14:35:34 +0100
Subject: [PATCH 0620/1650] Don't error out on failure to load default
 certificate store.

This restores the previous behaviour.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/network-openssl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 78bdcce4..2054f28a 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -386,10 +386,10 @@ gboolean irssi_ssl_init(void)
 
 	success = X509_STORE_set_default_paths(store);
 	if (success == 0) {
-		g_error("Could not load default certificates");
+		g_warning("Could not load default certificates");
 		X509_STORE_free(store);
 		store = NULL;
-		return FALSE;
+		/* Don't return an error; the user might have their own cafile/capath. */
 	}
 
 	ssl_inited = TRUE;
@@ -509,7 +509,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		g_free(scafile);
 		g_free(scapath);
 		verify = TRUE;
-	} else {
+	} else if (store != NULL) {
 		SSL_CTX_set_cert_store(ctx, store);
 	}
 

From 245a3fd4c1afb86b38eb17477a42c60c52cef793 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 28 Aug 2017 06:13:28 +0100
Subject: [PATCH 0621/1650] Add docs/capsicum.txt.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 docs/Makefile.am  |  1 +
 docs/capsicum.txt | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 docs/capsicum.txt

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 861a2ca4..32722391 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,6 +2,7 @@ man_MANS = \
 	irssi.1
 
 doc_DATA = \
+	capsicum.txt \
 	design.txt \
 	formats.txt \
 	manual.txt \
diff --git a/docs/capsicum.txt b/docs/capsicum.txt
new file mode 100644
index 00000000..3093bfe5
--- /dev/null
+++ b/docs/capsicum.txt
@@ -0,0 +1,30 @@
+Capsicum is a lightweight OS capability and sandbox framework provided
+by FreeBSD.  When built with Capsicum support - which is the default under
+FreeBSD - Irssi can enter a Capsicum capability mode (a sandbox), greatly
+limiting possible consequences of a potential security hole in Irssi
+or the libraries it depends on.
+
+To make Irssi enter capability mode on startup, add
+
+capsicum = "yes";
+
+to your ~/.irssi/config and restart the client.  Alternatively you can
+enter it "by hand", using the "/capsicum enter" command.  From the security
+point of view it's strongly preferable to use the former method, to avoid
+establishing connections without the sandbox protection; the "/capsicum"
+command is only intended for experimentation, and in cases where you need
+to do something that's not possible in capability mode - run scripts,
+for example - before continuing.
+
+There is no way to leave the capability mode, apart from exiting Irssi.
+When running in capability mode, there are certain restrictions - Irssi
+won't be able to access any files outside the directory pointed to by
+capsicum_irclogs_path (which defaults to ~/irclogs/).  If you change
+the path when already in capability mode it won't be effective until
+you restart Irssi.  Capability mode also makes it impossible to use
+the "/save" command.
+
+Currently there is no way to use custom SSL certificates.  As a workaround
+you can establish connections and enter the capability mode afterwards
+using the "/capsicum enter" command.
+

From 7086eae650a616615bc81e688cdfa44d444463e0 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 29 Aug 2017 21:03:42 +0200
Subject: [PATCH 0622/1650] Complete filenames ending with a slash

---
 src/fe-common/core/completion.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 78b1b24b..e78fe7d5 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -321,6 +321,10 @@ GList *filename_complete(const char *path, const char *default_path)
 
 	g_return_val_if_fail(path != NULL, NULL);
 
+	if (path[0] == '\0') {
+	    return NULL;
+	}
+
 	list = NULL;
 
 	/* get directory part of the path - expand ~/ */
@@ -350,7 +354,14 @@ GList *filename_complete(const char *path, const char *default_path)
 		g_free_and_null(dir);
 	}
 
-	basename = g_path_get_basename(path);
+	len = strlen(path);
+	/* g_path_get_basename() returns the component before the last slash if
+	 * the path ends with a directory separator, that's not what we want */
+	if (len > 0 && path[len - 1] == G_DIR_SEPARATOR) {
+	    basename = g_strdup("");
+	} else {
+	    basename = g_path_get_basename(path);
+	}
 	len = strlen(basename);
 
 	/* add all files in directory to completion list */

From b529e1a9df134bbc5618752abcf19af0110b6868 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 1 Sep 2017 10:39:14 +0100
Subject: [PATCH 0623/1650] Fix /back in Capsicum capability mode.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/fe-common/core/fe-core-commands.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 97a246ec..fb98cc25 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -28,6 +28,9 @@
 #include "settings.h"
 #include "irssi-version.h"
 #include "servers.h"
+#ifdef HAVE_CAPSICUM
+#include "capsicum.h"
+#endif
 
 #include "fe-windows.h"
 #include "printtext.h"
@@ -120,6 +123,9 @@ static void cmd_cat(const char *data)
 	GIOChannel *handle;
 	GString *buf;
 	gsize tpos;
+#ifdef HAVE_CAPSICUM
+	int fd;
+#endif
 
 	if (!cmd_get_params(data, &free_arg, 2, &fname, &fposstr))
 		return;
@@ -128,7 +134,15 @@ static void cmd_cat(const char *data)
 	fpos = atoi(fposstr);
         cmd_params_free(free_arg);
 
+#ifdef HAVE_CAPSICUM
+	fd = capsicum_open_wrapper(fname, O_RDONLY, 0);
+	if (fd > 0)
+		handle = g_io_channel_unix_new(fd);
+	else
+		handle = NULL;
+#else
 	handle = g_io_channel_new_file(fname, "r", NULL);
+#endif
 	g_free(fname);
 
 	if (handle == NULL) {

From 96d5a4669d696d57a511119963ae5c651346e167 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 11 Sep 2017 16:32:36 +0200
Subject: [PATCH 0624/1650] Increment the X509_STORE refcount during the
 connection

OpenSSL doesn't increment the reference count when the store is assigned
to a SSL_CTX.
---
 src/core/network-openssl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 2054f28a..feb2295d 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -510,6 +510,10 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		g_free(scapath);
 		verify = TRUE;
 	} else if (store != NULL) {
+		/* Make sure to increment the refcount every time the store is
+		 * used, that's essential not to get it free'd by OpenSSL when
+		 * the SSL_CTX is destroyed. */
+		X509_STORE_up_ref(store);
 		SSL_CTX_set_cert_store(ctx, store);
 	}
 

From 36d8b974fc42ed8eb1ff88811e09d0910ae61187 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 11 Sep 2017 17:07:50 +0200
Subject: [PATCH 0625/1650] Restore compatibility with old OpenSSL versions

Let's implement X509_STORE_up_ref on our own.
---
 src/core/network-openssl.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index feb2295d..7ec902fb 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -45,6 +45,19 @@
 #define ASN1_STRING_data(x)       ASN1_STRING_get0_data(x)
 #endif
 
+/* OpenSSL 1.1.0 also introduced some useful additions to the api */
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
+static int X509_STORE_up_ref(X509_STORE *vfy)
+{
+    int n;
+
+    n = CRYPTO_add(&vfy->references, 1, CRYPTO_LOCK_X509_STORE);
+    g_assert(n > 1);
+
+    return (n > 1) ? 1 : 0;
+}
+#endif
+
 /* ssl i/o channel object */
 typedef struct
 {

From 624ef4a696fc736779c6b7af94c7e376b7033590 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 12 Sep 2017 14:19:17 +0100
Subject: [PATCH 0626/1650] Get rid of the zombies in Capsicum capability mode.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
---
 src/core/capsicum.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 79db780a..3b0708cb 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -403,6 +403,13 @@ static void cmd_capsicum_enter(void)
 		return;
 	}
 
+	/*
+	 * XXX: We should use pdwait(2) to wait for children.  Unfortunately
+	 *      it's not implemented yet.  Thus the workaround, to get rid
+	 *      of the zombies at least.
+	 */
+	signal(SIGCHLD, SIG_IGN);
+
 	error = cap_enter();
 	if (error != 0) {
 		signal_emit("capability mode failed", 1, strerror(errno));

From 0468c5d912fc8a89bd552611ef6243bd1c889df7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 13 Sep 2017 13:58:00 +0200
Subject: [PATCH 0627/1650] add new function to set the position in bytes

fixes #752
---
 src/fe-text/gui-entry.c    | 20 ++++++++++++++++++++
 src/fe-text/gui-entry.h    |  1 +
 src/fe-text/gui-readline.c |  6 ++----
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index f05decd2..e91fcfb3 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -936,6 +936,26 @@ void gui_entry_set_pos(GUI_ENTRY_REC *entry, int pos)
 	gui_entry_draw(entry);
 }
 
+void gui_entry_set_text_and_pos_bytes(GUI_ENTRY_REC *entry, const char *str, int pos_bytes)
+{
+	int pos;
+	const char *ptr;
+
+	g_return_if_fail(entry != NULL);
+
+	gui_entry_set_text(entry, str);
+
+	if (entry->utf8) {
+		g_utf8_validate(str, pos_bytes, &ptr);
+		pos = g_utf8_pointer_to_offset(str, ptr);
+	} else if (term_type == TERM_TYPE_BIG5)
+		pos = strlen_big5((const unsigned char *)str) - strlen_big5((const unsigned char *)(str + pos_bytes));
+	else
+		pos = pos_bytes;
+
+	gui_entry_set_pos(entry, pos);
+}
+
 void gui_entry_move_pos(GUI_ENTRY_REC *entry, int pos)
 {
         g_return_if_fail(entry != NULL);
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index 8777f083..000c5f03 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -50,6 +50,7 @@ void gui_entry_set_utf8(GUI_ENTRY_REC *entry, int utf8);
 void gui_entry_set_text(GUI_ENTRY_REC *entry, const char *str);
 char *gui_entry_get_text(GUI_ENTRY_REC *entry);
 char *gui_entry_get_text_and_pos(GUI_ENTRY_REC *entry, int *pos);
+void gui_entry_set_text_and_pos_bytes(GUI_ENTRY_REC *entry, const char *str, int pos_bytes);
 
 void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str);
 void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr);
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 2c2eac21..3688f15e 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -878,8 +878,7 @@ static void key_completion(int erase, int backward)
 	g_free(text);
 
 	if (line != NULL) {
-		gui_entry_set_text(active_entry, line);
-		gui_entry_set_pos(active_entry, pos);
+		gui_entry_set_text_and_pos_bytes(active_entry, line, pos);
 		g_free(line);
 	}
 }
@@ -909,8 +908,7 @@ static void key_check_replaces(void)
 	g_free(text);
 
 	if (line != NULL) {
-		gui_entry_set_text(active_entry, line);
-		gui_entry_set_pos(active_entry, pos);
+		gui_entry_set_text_and_pos_bytes(active_entry, line, pos);
 		g_free(line);
 	}
 }

From 8dfeca57ede1e726de07522a87203ce13676882d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 8 Sep 2017 15:19:40 +0200
Subject: [PATCH 0628/1650] hidden lines

---
 src/common.h                      |  2 +-
 src/core/levels.c                 | 21 +++++-----
 src/core/levels.h                 |  4 +-
 src/fe-text/gui-windows.c         |  4 ++
 src/fe-text/mainwindows-layout.c  | 10 +++++
 src/fe-text/module-formats.c      |  1 +
 src/fe-text/module-formats.h      |  1 +
 src/fe-text/textbuffer-commands.c | 21 ++++++++++
 src/fe-text/textbuffer-view.c     | 67 ++++++++++++++++++++++++++++---
 src/fe-text/textbuffer-view.h     | 36 +++++++++++------
 src/fe-text/textbuffer.c          |  1 +
 src/fe-text/textbuffer.h          |  2 +-
 12 files changed, 139 insertions(+), 31 deletions(-)

diff --git a/src/common.h b/src/common.h
index 100d00cb..159f7124 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 10
+#define IRSSI_ABI_VERSION 11
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/core/levels.c b/src/core/levels.c
index e623c4de..eb7efcf7 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -21,6 +21,7 @@
 #include "module.h"
 #include "levels.h"
 
+/* the order of these levels must match the bits in levels.h */
 static const char *levels[] = {
 	"CRAP",
 	"MSGS",
@@ -44,9 +45,6 @@ static const char *levels[] = {
 	"CLIENTCRAP",
 	"CLIENTERRORS",
 	"HILIGHTS",
-
-	"NOHILIGHT",
-	"NO_ACT",
 	NULL
 };
 
@@ -63,6 +61,9 @@ int level_get(const char *level)
 	if (g_ascii_strcasecmp(level, "NO_ACT") == 0)
 		return MSGLEVEL_NO_ACT;
 
+	if (g_ascii_strcasecmp(level, "HIDDEN") == 0)
+		return MSGLEVEL_HIDDEN;
+
 	len = strlen(level);
 	if (len == 0) return 0;
 
@@ -138,17 +139,13 @@ char *bits2level(int bits)
 
 
 	str = g_string_new(NULL);
-	if (bits & MSGLEVEL_NEVER) {
+	if (bits & MSGLEVEL_NEVER)
 		g_string_append(str, "NEVER ");
-		bits &= ~MSGLEVEL_NEVER;
-	}
 
-	if (bits & MSGLEVEL_NO_ACT) {
+	if (bits & MSGLEVEL_NO_ACT)
 		g_string_append(str, "NO_ACT ");
-		bits &= ~MSGLEVEL_NO_ACT;
-	}
 
-	if (bits == MSGLEVEL_ALL) {
+	if ((bits & MSGLEVEL_ALL) == MSGLEVEL_ALL) {
 		g_string_append(str, "ALL ");
 	} else {
 		for (n = 0; levels[n] != NULL; n++) {
@@ -156,6 +153,10 @@ char *bits2level(int bits)
 				g_string_append_printf(str, "%s ", levels[n]);
 		}
 	}
+
+	if (bits & MSGLEVEL_HIDDEN)
+		g_string_append(str, "HIDDEN ");
+
         if (str->len > 0)
 		g_string_truncate(str, str->len-1);
 
diff --git a/src/core/levels.h b/src/core/levels.h
index 9f7e588f..b0ebafba 100644
--- a/src/core/levels.h
+++ b/src/core/levels.h
@@ -36,7 +36,9 @@ enum {
 	MSGLEVEL_NOHILIGHT    = 0x1000000, /* Don't highlight this message */
 	MSGLEVEL_NO_ACT       = 0x2000000, /* Don't trigger channel activity */
 	MSGLEVEL_NEVER        = 0x4000000, /* never ignore / never log */
-	MSGLEVEL_LASTLOG      = 0x8000000 /* never ignore / never log */
+	MSGLEVEL_LASTLOG      = 0x8000000, /* used for /lastlog */
+
+	MSGLEVEL_HIDDEN       = 0x10000000 /* Hidden from view */
 };
 
 int level_get(const char *level);
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index c63c495c..34c55772 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -23,6 +23,7 @@
 #include "misc.h"
 #include "settings.h"
 #include "special-vars.h"
+#include "levels.h"
 
 #include "term.h"
 #include "gui-entry.h"
@@ -50,6 +51,7 @@ static GUI_WINDOW_REC *gui_window_init(WINDOW_REC *window,
 					   !settings_get_bool("indent_always"),
 					   get_default_indent_func());
 	textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
+	textbuffer_view_set_hidden_level(gui->view, MSGLEVEL_HIDDEN);
 	if (parent->active == window)
 		textbuffer_view_set_window(gui->view, parent->screen_win);
 	return gui;
@@ -204,6 +206,8 @@ void gui_windows_reset_settings(void)
 		WINDOW_REC *rec = tmp->data;
 		GUI_WINDOW_REC *gui = WINDOW_GUI(rec);
 
+		textbuffer_view_set_hidden_level(gui->view, MSGLEVEL_HIDDEN);
+
 		textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
 
 		textbuffer_view_set_default_indent(gui->view,
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index fae02539..acbcb6b9 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -23,6 +23,7 @@
 #include "misc.h"
 #include "lib-config/iconfig.h"
 #include "settings.h"
+#include "levels.h"
 
 #include "mainwindows.h"
 #include "gui-windows.h"
@@ -41,6 +42,12 @@ static void sig_layout_window_save(WINDOW_REC *window, CONFIG_NODE *node)
 			iconfig_node_set_int(node, "parent", active->refnum);
 	}
 
+	if (gui->view->hidden_level != MSGLEVEL_HIDDEN) {
+		char *level = bits2level(gui->view->hidden_level);
+		iconfig_node_set_str(node, "hidelevel", level);
+		g_free(level);
+	}
+
 	if (gui->use_scroll)
                 iconfig_node_set_bool(node, "scroll", gui->scroll);
 }
@@ -58,6 +65,9 @@ static void sig_layout_window_restore(WINDOW_REC *window, CONFIG_NODE *node)
 
 	if (config_node_get_bool(node, "sticky", FALSE))
 		gui_window_set_sticky(window);
+
+	textbuffer_view_set_hidden_level(gui->view, level2bits(config_node_get_str(node, "hidelevel", "HIDDEN"), NULL));
+
 	if (config_node_get_str(node, "scroll", NULL) != NULL) {
 		gui->use_scroll = TRUE;
 		gui->scroll = config_node_get_bool(node, "scroll", TRUE);
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index 899827c2..0cde9946 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -50,6 +50,7 @@ FORMAT_REC gui_text_formats[] =
 	{ "window_info_scroll", "%#Scroll  : $0", 1, { 0 } },
 	{ "window_scroll", "Window scroll mode is now $0", 1, { 0 } },
 	{ "window_scroll_unknown", "Unknown scroll mode $0, must be ON, OFF or DEFAULT", 1, { 0 } },
+	{ "window_hidelevel", "Window hidden level is now $0", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Statusbars", 0 },
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index 3fa8c511..acc2627c 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -26,6 +26,7 @@ enum {
         TXT_WINDOW_INFO_SCROLL,
         TXT_WINDOW_SCROLL,
         TXT_WINDOW_SCROLL_UNKNOWN,
+	TXT_WINDOW_HIDELEVEL,
 
 	TXT_FILL_3,
 
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 648862e7..97d897f3 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -89,6 +89,25 @@ static void cmd_window_scroll(const char *data)
 				   gui->scroll : settings_get_bool("scroll"));
 }
 
+/* SYNTAX: WINDOW HIDELEVEL [<level>] */
+static void cmd_window_hidelevel(const char *data)
+{
+	GUI_WINDOW_REC *gui;
+	char *level;
+
+	g_return_if_fail(data != NULL);
+
+	gui = WINDOW_GUI(active_win);
+	textbuffer_view_set_hidden_level(gui->view,
+					 combine_level(gui->view->hidden_level, data));
+	textbuffer_view_redraw(gui->view);
+	level = gui->view->hidden_level == 0 ? g_strdup("NONE") :
+		bits2level(gui->view->hidden_level);
+	printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
+			   TXT_WINDOW_HIDELEVEL, level);
+	g_free(level);
+}
+
 static void cmd_scrollback(const char *data, SERVER_REC *server,
 			   WI_ITEM_REC *item)
 {
@@ -358,6 +377,7 @@ void textbuffer_commands_init(void)
 {
 	command_bind("clear", NULL, (SIGNAL_FUNC) cmd_clear);
 	command_bind("window scroll", NULL, (SIGNAL_FUNC) cmd_window_scroll);
+	command_bind("window hidelevel", NULL, (SIGNAL_FUNC) cmd_window_hidelevel);
 	command_bind("scrollback", NULL, (SIGNAL_FUNC) cmd_scrollback);
 	command_bind("scrollback clear", NULL, (SIGNAL_FUNC) cmd_scrollback_clear);
 	command_bind("scrollback levelclear", NULL, (SIGNAL_FUNC) cmd_scrollback_levelclear);
@@ -377,6 +397,7 @@ void textbuffer_commands_deinit(void)
 {
 	command_unbind("clear", (SIGNAL_FUNC) cmd_clear);
 	command_unbind("window scroll", (SIGNAL_FUNC) cmd_window_scroll);
+	command_unbind("window hidelevel", (SIGNAL_FUNC) cmd_window_hidelevel);
 	command_unbind("scrollback", (SIGNAL_FUNC) cmd_scrollback);
 	command_unbind("scrollback clear", (SIGNAL_FUNC) cmd_scrollback_clear);
 	command_unbind("scrollback levelclear", (SIGNAL_FUNC) cmd_scrollback_levelclear);
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index cb066f5e..b54f1c8e 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -41,9 +41,15 @@ static GSList *views;
 #define view_is_bottom(view) \
         ((view)->ypos >= -1 && (view)->ypos < (view)->height)
 
-#define view_get_linecount(view, line) \
+#define view_get_linecount_hidden(view, line) \
         textbuffer_view_get_line_cache(view, line)->count
 
+#define view_line_is_hidden(view, line) \
+	(((line)->info.level & (view)->hidden_level) != 0)
+
+#define view_get_linecount(view, line) \
+	(view_line_is_hidden(view, line) ? 0 : view_get_linecount_hidden(view, line))
+
 static GSList *textbuffer_get_views(TEXT_BUFFER_REC *buffer)
 {
 	GSList *tmp, *list;
@@ -552,6 +558,9 @@ static void textbuffer_view_init_bottom(TEXT_BUFFER_VIEW_REC *view)
 	total = 0;
         line = textbuffer_line_last(view->buffer);
 	for (; line != NULL; line = line->prev) {
+		if (view_line_is_hidden(view, line))
+			continue;
+
 		linecount = view_get_linecount(view, line);
 		if (line == view->bottom_startline) {
 			/* keep the old one, make sure that subline is ok */
@@ -614,6 +623,8 @@ TEXT_BUFFER_VIEW_REC *textbuffer_view_create(TEXT_BUFFER_REC *buffer,
         view->subline = view->bottom_subline;
 	view->bottom = TRUE;
 
+	view->hidden_level = 0;
+
 	textbuffer_view_init_ypos(view);
 
 	view->bookmarks = g_hash_table_new((GHashFunc) g_str_hash,
@@ -726,8 +737,10 @@ static void view_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
                 return;
 
 	while (line != NULL && lines > 0) {
-                linecount = view_line_draw(view, line, subline, ypos, lines);
-		ypos += linecount; lines -= linecount;
+		if (!view_line_is_hidden(view, line)) {
+			linecount = view_line_draw(view, line, subline, ypos, lines);
+			ypos += linecount; lines -= linecount;
+		}
 
 		subline = 0;
                 line = line->next;
@@ -768,7 +781,12 @@ static void view_draw_bottom(TEXT_BUFFER_VIEW_REC *view, int lines)
         view_draw(view, line, subline, maxline, lines, TRUE);
 }
 
-/* Returns number of lines actually scrolled */
+/* lines: this pointer is scrolled by scrollcount screen lines
+   subline: this pointer contains the subline position
+   scrollcount: the number of lines to scroll down (negative: up)
+   draw_nonclean: whether to redraw the screen now
+
+   Returns number of lines actually scrolled */
 static int view_scroll(TEXT_BUFFER_VIEW_REC *view, LINE_REC **lines,
 		       int *subline, int scrollcount, int draw_nonclean)
 {
@@ -1027,7 +1045,7 @@ static void view_insert_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 			view->bottom = view_is_bottom(view);
 		}
 
-		if (view->window != NULL) {
+		if (view->window != NULL && !view_line_is_hidden(view, line)) {
 			ypos = view->ypos+1 - view_get_linecount(view, line);
 			if (ypos >= 0)
 				subline = 0;
@@ -1042,7 +1060,7 @@ static void view_insert_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 		}
 	}
 
-        if (view->window != NULL)
+        if (view->window != NULL && !view_line_is_hidden(view, line))
 		term_refresh(view->window);
 }
 
@@ -1122,6 +1140,12 @@ static int view_get_lines_height(TEXT_BUFFER_VIEW_REC *view,
 	return height < view->height ? height : view->height;
 }
 
+/* line: line to remove
+   linecount: linecount of that line, to be offset when the line was in/below view
+
+   scroll the window maintaining the startline while removing line
+   if startline is removed, make the previous line the new startline
+*/
 static void view_remove_line_update_startline(TEXT_BUFFER_VIEW_REC *view,
 					      LINE_REC *line, int linecount)
 {
@@ -1318,6 +1342,37 @@ LINE_REC *textbuffer_view_get_bookmark(TEXT_BUFFER_VIEW_REC *view,
         return g_hash_table_lookup(view->bookmarks, name);
 }
 
+void textbuffer_view_set_hidden_level(TEXT_BUFFER_VIEW_REC *view, int level)
+{
+	g_return_if_fail(view != NULL);
+
+	if (view->hidden_level != level) {
+		if (view->empty_linecount > 0 && view->startline != NULL) {
+			int old_height, new_height;
+			LINE_REC *hidden_start;
+
+			hidden_start = view->startline;
+			while (hidden_start->prev != NULL && view_line_is_hidden(view, hidden_start->prev)) {
+				hidden_start = hidden_start->prev;
+			}
+
+			old_height = view_get_lines_height(view, hidden_start, view->subline, NULL);
+			view->hidden_level = level;
+			new_height = view_get_lines_height(view, hidden_start, view->subline, NULL);
+
+			view->empty_linecount -= new_height - old_height;
+
+			if (view->empty_linecount < 0)
+				view->empty_linecount = 0;
+			else if (view->empty_linecount > view->height)
+				view->empty_linecount = view->height;
+		} else {
+			view->hidden_level = level;
+		}
+		textbuffer_view_resize(view, view->width, view->height);
+	}
+}
+
 /* Specify window where the changes in view should be drawn,
    NULL disables it. */
 void textbuffer_view_set_window(TEXT_BUFFER_VIEW_REC *view,
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index 5e7a9d0a..a670df2b 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -49,41 +49,51 @@ typedef struct {
 
 struct _TEXT_BUFFER_VIEW_REC {
 	TEXT_BUFFER_REC *buffer;
-	GSList *siblings; /* other views that use the same buffer */
+	/* other views that use the same buffer */
+	GSList *siblings;
 
         TERM_WINDOW *window;
 	int width, height;
 
 	int default_indent;
         INDENT_FUNC default_indent_func;
-	unsigned int longword_noindent:1;
-	unsigned int scroll:1; /* scroll down automatically when at bottom */
-	unsigned int utf8:1; /* use UTF8 in this view */
-	unsigned int break_wide:1; /* Break wide chars in this view */
 
 	TEXT_BUFFER_CACHE_REC *cache;
-	int ypos; /* cursor position - visible area is 0..height-1 */
+	/* cursor position - visible area is 0..height-1 */
+	int ypos;
 
-	LINE_REC *startline; /* line at the top of the screen */
-	int subline; /* number of "real lines" to skip from `startline' */
+	 /* line at the top of the screen */
+	LINE_REC *startline;
+	/* number of "real lines" to skip from `startline' */
+	int subline;
 
         /* marks the bottom of the text buffer */
 	LINE_REC *bottom_startline;
 	int bottom_subline;
 
+	/* Bookmarks to the lines in the buffer - removed automatically
+	   when the line gets removed from buffer */
+        GHashTable *bookmarks;
+
+	/* these levels should be hidden */
+	int hidden_level;
 	/* how many empty lines are in screen. a screenful when started
 	   or used /CLEAR */
 	int empty_linecount;
+
+	unsigned int longword_noindent:1;
+	/* scroll down automatically when at bottom */
+	unsigned int scroll:1;
+	/* use UTF8 in this view */
+	unsigned int utf8:1;
+	/* Break wide chars in this view */
+	unsigned int break_wide:1;
         /* window is at the bottom of the text buffer */
 	unsigned int bottom:1;
         /* if !bottom - new text has been printed since we were at bottom */
 	unsigned int more_text:1;
         /* Window needs a redraw */
 	unsigned int dirty:1;
-
-	/* Bookmarks to the lines in the buffer - removed automatically
-	   when the line gets removed from buffer */
-        GHashTable *bookmarks;
 };
 
 /* Create new view. */
@@ -143,6 +153,8 @@ void textbuffer_view_set_bookmark_bottom(TEXT_BUFFER_VIEW_REC *view,
 /* Return the line for bookmark */
 LINE_REC *textbuffer_view_get_bookmark(TEXT_BUFFER_VIEW_REC *view,
 				       const char *name);
+/* Set hidden level for view */
+void textbuffer_view_set_hidden_level(TEXT_BUFFER_VIEW_REC *view, int level);
 
 /* Specify window where the changes in view should be drawn,
    NULL disables it. */
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index a920fab2..01cdd118 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -230,6 +230,7 @@ LINE_REC *textbuffer_line_last(TEXT_BUFFER_REC *buffer)
 	return buffer->cur_line;
 }
 
+/* returns TRUE if `search' comes on or after `line' in the buffer */
 int textbuffer_line_exists_after(LINE_REC *line, LINE_REC *search)
 {
 	while (line != NULL) {
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index 303789a3..2aa22f1a 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -65,10 +65,10 @@ typedef struct {
 	LINE_REC *cur_line;
 	TEXT_CHUNK_REC *cur_text;
 
-	unsigned int last_eol:1;
 	int last_fg;
 	int last_bg;
 	int last_flags;
+	unsigned int last_eol:1;
 } TEXT_BUFFER_REC;
 
 /* Create new buffer */

From 32f33e7bb34598e8603b9f6a931ef063f6bd31f2 Mon Sep 17 00:00:00 2001
From: Robert Bisewski <contact@ibiscybernetics.com>
Date: Tue, 3 Oct 2017 22:49:21 -0500
Subject: [PATCH 0629/1650] improving HOWTO document

---
 docs/startup-HOWTO.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 07a9f47c..fe317ad9 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -635,7 +635,7 @@ separated by <code>:</code> from the actual proxy password.</p>
 
 <h2 id="statusbar">12. Statusbar</h2>
 
-<p><code>/STATUSBAR</code> displays a list of statusbars:</p>
+<p><code>/STATUSBAR</code> displays a list of the current statusbars, along with their position and visibility:</p>
 
 <pre><code> Name                           Type   Placement Position Visible
  window                         window bottom    0        always
@@ -644,9 +644,9 @@ separated by <code>:</code> from the actual proxy password.</p>
  topic                          root   top       1        always
 </code></pre>
 
-<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings and it’s items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to it’s default settings, or if the statusbar was created by you, it will be removed.</p>
+<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings (type, placement, position, visibility) as well as its items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to its default settings, or if the statusbar was created by you, it will be removed.</p>
 
-<p>Type can be window or root, meaning if the statusbar should be created for each split window, or just once. Placement can be top or bottom. Position is a number, the higher the value the lower in screen it is. Visible can be always, active or inactive. Active/inactive is useful only with split windows, one split window is active and the rest are inactive. These settings can be changed with:</p>
+<p>The statusbar type can be either window or root. If the type is window, then a statusbar will be created for each split window, otherwise it will be created only once. Placement can be top or bottom, which refers to the top or bottom of the screen. Position is a number, the higher the value the lower it will appear in-screen. Visible can be always, active or inactive. Active/inactive is useful only with split windows; one split window is active and the rest are inactive. To adjust these settings, the following commands are available:</p>
 
 <pre><code> /STATUSBAR &lt;name&gt; TYPE window|root
  /STATUSBAR &lt;name&gt; PLACEMENT top|bottom
@@ -654,10 +654,10 @@ separated by <code>:</code> from the actual proxy password.</p>
  /STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
 </code></pre>
 
-<p>When loading a new statusbar scripts, you’ll need to also specify where you want to show it. Statusbar items can be modified with:</p>
+<p>Statusbar items can also be added or removed via command. Note that when loading new statusbar scripts that add items, you will need to specify where you want to show the item and how it is aligned. This can be accomplished using the below commands:</p>
 
 <pre><code> /STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
  /STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
 </code></pre>
 
-<p>The item name with statusbar scripts is usually same as the script’s name. Script’s documentation should tell if this isn’t the case. So, to add mail.pl before the window activity item (see the list with <code>/STATUSBAR</code> window), use: <code>/STATUSBAR window ADD -before act mail</code>.</p>
+<p>For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: <code>/STATUSBAR window ADD -before act mail</code>.</p>

From 1f7de4c3bd8cb03af76c14aff71fc535ce9f23de Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 5 Oct 2017 11:31:33 +0200
Subject: [PATCH 0630/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 100d00cb..159f7124 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 10
+#define IRSSI_ABI_VERSION 11
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From e1e632d31e1d8efc3370db76ddcc4bda200e4d31 Mon Sep 17 00:00:00 2001
From: Robert Bisewski <contact@ibiscybernetics.com>
Date: Thu, 5 Oct 2017 22:47:15 -0500
Subject: [PATCH 0631/1650] correcting and expanding content of statusbar help
 text

---
 docs/help/in/statusbar.in | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index ac475dd5..7fff7fb8 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -5,22 +5,31 @@
 
 %9Parameters:%9
 
-    ENABLE:       Enables the statusbar.
-    DISABLE:      Disabled the statusbar.
+    ENABLE:       Adds a statusbar to the list of statusbars.
+    DISABLE:      Removes a statusbar from the list.
     RESET:        Restores the default statusbar configuration.
-    TYPE:         Identifies the type of statusbar.
-    PLACEMENT:    Identifies the placement of the statusbar.
-    POSITION:     Identifies the position of the statusbar.
-    VISIBLE:      Identifies the visibility of the statusbar.
-    ADD:          Adds a statusbar into the configuration.
-    REMOVE:       Removes a statusbar from the configuration.
+    TYPE:         Refers to the type of statusbar, for each split window
+                  or only for the current root screen.
+    PLACEMENT:    Refers to the placement of the statusbar, either at the
+                  top or the bottom of the screen.
+    POSITION:     Refers to the position of the statusbar. Represented as
+                  an unsigned integer, with 0 implying the first position.
+    VISIBLE:      Refers to the visibility of the statusbar or item. If set
+                  to always it is visible on all screens, otherwise if set
+                  to inactive or active then it is only visible on inactive
+                  or active screens, respectively.
+    ADD:          Adds an item to the specified statusbar. It can be set to
+                  appear before/after another item and left/right aligned
+                  to a specified position on the screen.
+    REMOVE:       Removes an item from the specified statusbar.
 
-    The name of the statusbar; if no argument is given, the list of statusbars
-    will be displayed.
+    Where name refers to the name of the statusbar; if no argument is
+    given, the entire list of statusbars will be displayed.
 
 %9Description:%9
 
-    Modified the attributes of the statusbar.
+    Allows adjustment of the attributes and items of a statusbar, as well
+    as where it is located and whether or not it is currently visible.
 
 %9Examples:%9
 

From 0883ff8d320be47336e05aa38cf11427bd79b3af Mon Sep 17 00:00:00 2001
From: Robert Bisewski <contact@ibiscybernetics.com>
Date: Fri, 6 Oct 2017 07:13:30 -0500
Subject: [PATCH 0632/1650] reverting changes to startup HOWTO

---
 docs/startup-HOWTO.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index fe317ad9..07a9f47c 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -635,7 +635,7 @@ separated by <code>:</code> from the actual proxy password.</p>
 
 <h2 id="statusbar">12. Statusbar</h2>
 
-<p><code>/STATUSBAR</code> displays a list of the current statusbars, along with their position and visibility:</p>
+<p><code>/STATUSBAR</code> displays a list of statusbars:</p>
 
 <pre><code> Name                           Type   Placement Position Visible
  window                         window bottom    0        always
@@ -644,9 +644,9 @@ separated by <code>:</code> from the actual proxy password.</p>
  topic                          root   top       1        always
 </code></pre>
 
-<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings (type, placement, position, visibility) as well as its items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to its default settings, or if the statusbar was created by you, it will be removed.</p>
+<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings and it’s items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to it’s default settings, or if the statusbar was created by you, it will be removed.</p>
 
-<p>The statusbar type can be either window or root. If the type is window, then a statusbar will be created for each split window, otherwise it will be created only once. Placement can be top or bottom, which refers to the top or bottom of the screen. Position is a number, the higher the value the lower it will appear in-screen. Visible can be always, active or inactive. Active/inactive is useful only with split windows; one split window is active and the rest are inactive. To adjust these settings, the following commands are available:</p>
+<p>Type can be window or root, meaning if the statusbar should be created for each split window, or just once. Placement can be top or bottom. Position is a number, the higher the value the lower in screen it is. Visible can be always, active or inactive. Active/inactive is useful only with split windows, one split window is active and the rest are inactive. These settings can be changed with:</p>
 
 <pre><code> /STATUSBAR &lt;name&gt; TYPE window|root
  /STATUSBAR &lt;name&gt; PLACEMENT top|bottom
@@ -654,10 +654,10 @@ separated by <code>:</code> from the actual proxy password.</p>
  /STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
 </code></pre>
 
-<p>Statusbar items can also be added or removed via command. Note that when loading new statusbar scripts that add items, you will need to specify where you want to show the item and how it is aligned. This can be accomplished using the below commands:</p>
+<p>When loading a new statusbar scripts, you’ll need to also specify where you want to show it. Statusbar items can be modified with:</p>
 
 <pre><code> /STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
  /STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
 </code></pre>
 
-<p>For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: <code>/STATUSBAR window ADD -before act mail</code>.</p>
+<p>The item name with statusbar scripts is usually same as the script’s name. Script’s documentation should tell if this isn’t the case. So, to add mail.pl before the window activity item (see the list with <code>/STATUSBAR</code> window), use: <code>/STATUSBAR window ADD -before act mail</code>.</p>

From 84bfea52af8776e13d754e2ee20387f07556fc90 Mon Sep 17 00:00:00 2001
From: Robert Bisewski <bisewskr@med.umanitoba.ca>
Date: Fri, 6 Oct 2017 07:54:54 -0500
Subject: [PATCH 0633/1650] adjusting text content as per the pull-request
 discussion

---
 docs/help/in/statusbar.in | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index 7fff7fb8..13977891 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -6,15 +6,17 @@
 %9Parameters:%9
 
     ENABLE:       Adds a statusbar to the list of statusbars.
-    DISABLE:      Removes a statusbar from the list.
+    DISABLE:      Removes a statusbar from the list. Note that for
+                  built-in statusbars they can be enabled again should the
+                  user wish to add back the default statusbars.
     RESET:        Restores the default statusbar configuration.
-    TYPE:         Refers to the type of statusbar, for each split window
-                  or only for the current root screen.
-    PLACEMENT:    Refers to the placement of the statusbar, either at the
-                  top or the bottom of the screen.
-    POSITION:     Refers to the position of the statusbar. Represented as
-                  an unsigned integer, with 0 implying the first position.
-    VISIBLE:      Refers to the visibility of the statusbar or item. If set
+    TYPE:         Sets the type of statusbar, for each split window or only
+                  for the current root screen.
+    PLACEMENT:    Sets the placement of the statusbar, either at the top or
+                  the bottom of the screen.
+    POSITION:     Sets the position of the statusbar. Represented as a
+                  number, with 0 implying the first position.
+    VISIBLE:      Sets the visibility of the statusbar or item. If set to
                   to always it is visible on all screens, otherwise if set
                   to inactive or active then it is only visible on inactive
                   or active screens, respectively.

From 4b42eca7c57fdd3d5ded8d5b1d4c75d01fc28569 Mon Sep 17 00:00:00 2001
From: Robert Bisewski <bisewskr@med.umanitoba.ca>
Date: Fri, 6 Oct 2017 07:58:27 -0500
Subject: [PATCH 0634/1650] minor word correction

---
 docs/help/in/statusbar.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index 13977891..7d64b816 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -17,8 +17,8 @@
     POSITION:     Sets the position of the statusbar. Represented as a
                   number, with 0 implying the first position.
     VISIBLE:      Sets the visibility of the statusbar or item. If set to
-                  to always it is visible on all screens, otherwise if set
-                  to inactive or active then it is only visible on inactive
+                  always it is visible on all screens, otherwise if set to
+                  inactive or active then it is only visible on inactive
                   or active screens, respectively.
     ADD:          Adds an item to the specified statusbar. It can be set to
                   appear before/after another item and left/right aligned

From 1fd285dccfd43b740e88f7f4e168132387d39843 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Oct 2017 14:58:47 +0200
Subject: [PATCH 0635/1650] refactor history to use history_entries list

this allows access to the global history even when a using /window history
named or /set window_history on, and you want to recall something from one
of the other windows' histories.

usage (default): ctrl+up/down
---
 src/fe-common/core/command-history.c | 187 +++++++++++++++++++++------
 src/fe-common/core/command-history.h |  16 ++-
 src/fe-text/gui-readline.c           |  28 ++++
 src/perl/ui/Window.xs                |   5 +-
 4 files changed, 196 insertions(+), 40 deletions(-)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 55474b1b..5de76969 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -30,10 +30,93 @@
 #include "command-history.h"
 
 /* command history */
+static GList *history_entries;
 static HISTORY_REC *global_history;
 static int window_history;
 static GSList *histories;
 
+static HISTORY_ENTRY_REC *history_entry_new(HISTORY_REC *history, const char *text)
+{
+	HISTORY_ENTRY_REC *entry;
+
+	entry = g_new0(HISTORY_ENTRY_REC, 1);
+	entry->text = g_strdup(text);
+	entry->history = history;
+	entry->time = time(NULL);
+
+	return entry;
+}
+
+static void history_entry_destroy(HISTORY_ENTRY_REC *entry)
+{
+	g_free((char *)entry->text);
+	g_free(entry);
+}
+
+GList *command_history_list_last(HISTORY_REC *history)
+{
+	GList *link;
+
+	link = g_list_last(history_entries);
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->prev;
+	}
+
+	return link;
+}
+
+GList *command_history_list_first(HISTORY_REC *history)
+{
+	GList *link;
+
+	link = history_entries;
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->next;
+	}
+
+	return link;
+}
+
+GList *command_history_list_prev(HISTORY_REC *history, GList *pos)
+{
+	GList *link;
+
+	link = pos != NULL ? pos->prev : NULL;
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->prev;
+	}
+
+	return link;
+}
+
+GList *command_history_list_next(HISTORY_REC *history, GList *pos)
+{
+	GList *link;
+
+	link = pos != NULL ? pos->next : NULL;
+	while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
+		link = link->next;
+	}
+
+	return link;
+}
+
+static void command_history_clear_pos_for_unlink_func(HISTORY_REC *history, GList* link)
+{
+	if (history->pos == link) {
+		history->pos = command_history_list_next(history, link);
+		history->redo = 1;
+	}
+}
+
+static void history_list_delete_link_and_destroy(GList *link)
+{
+	g_slist_foreach(histories,
+		       (GFunc) command_history_clear_pos_for_unlink_func, link);
+	history_entry_destroy(link->data);
+	history_entries = g_list_delete_link(history_entries, link);
+}
+
 void command_history_add(HISTORY_REC *history, const char *text)
 {
 	GList *link;
@@ -41,21 +124,19 @@ void command_history_add(HISTORY_REC *history, const char *text)
 	g_return_if_fail(history != NULL);
 	g_return_if_fail(text != NULL);
 
-	link = g_list_last(history->list);
-	if (link != NULL && g_strcmp0(link->data, text) == 0)
-	  return; /* same as previous entry */
+	link = command_history_list_last(history);
+	if (link != NULL && g_strcmp0(((HISTORY_ENTRY_REC *)link->data)->text, text) == 0)
+		return; /* same as previous entry */
 
 	if (settings_get_int("max_command_history") < 1 ||
 	    history->lines < settings_get_int("max_command_history"))
 		history->lines++;
 	else {
-		link = history->list;
-		g_free(link->data);
-		history->list = g_list_remove_link(history->list, link);
-		g_list_free_1(link);
+		link = command_history_list_first(history);
+		history_list_delete_link_and_destroy(link);
 	}
 
-	history->list = g_list_append(history->list, g_strdup(text));
+	history_entries = g_list_append(history_entries, history_entry_new(history, text));
 }
 
 HISTORY_REC *command_history_find(HISTORY_REC *history)
@@ -104,7 +185,44 @@ HISTORY_REC *command_history_current(WINDOW_REC *window)
 	return global_history;
 }
 
+static const char *command_history_prev_int(WINDOW_REC *window, const char *text, gboolean global)
+{
+	HISTORY_REC *history;
+	GList *pos;
+
+	history = command_history_current(window);
+	pos = history->pos;
+	history->redo = 0;
+
+	if (pos != NULL) {
+		/* don't go past the first entry (no wrap around) */
+		GList *prev = command_history_list_prev(global ? NULL : history, history->pos);
+		if (prev != NULL)
+			history->pos = prev;
+	} else {
+		history->pos = command_history_list_last(global ? NULL : history);
+	}
+
+	if (*text != '\0' &&
+	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
+		/* save the old entry to history */
+		command_history_add(history, text);
+	}
+
+	return history->pos == NULL ? text : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
+}
+
 const char *command_history_prev(WINDOW_REC *window, const char *text)
+{
+	return command_history_prev_int(window, text, FALSE);
+}
+
+const char *command_global_history_prev(WINDOW_REC *window, const char *text)
+{
+	return command_history_prev_int(window, text, TRUE);
+}
+
+static const char *command_history_next_int(WINDOW_REC *window, const char *text, gboolean global)
 {
 	HISTORY_REC *history;
 	GList *pos;
@@ -112,40 +230,26 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
 	history = command_history_current(window);
 	pos = history->pos;
 
-	if (pos != NULL) {
-		/* don't go past the first entry (no wrap around) */
-		if (history->pos->prev != NULL)
-			history->pos = history->pos->prev;
-	} else {
-		history->pos = g_list_last(history->list);
-	}
+	if (!(history->redo) && pos != NULL)
+		history->pos = command_history_list_next(global ? NULL : history, history->pos);
+	history->redo = 0;
 
 	if (*text != '\0' &&
-	    (pos == NULL || g_strcmp0(pos->data, text) != 0)) {
+	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
 		/* save the old entry to history */
 		command_history_add(history, text);
 	}
-
-	return history->pos == NULL ? text : history->pos->data;
+	return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
 }
 
 const char *command_history_next(WINDOW_REC *window, const char *text)
 {
-	HISTORY_REC *history;
-	GList *pos;
+	return command_history_next_int(window, text, FALSE);
+}
 
-	history = command_history_current(window);
-	pos = history->pos;
-
-	if (pos != NULL)
-		history->pos = history->pos->next;
-
-	if (*text != '\0' &&
-	    (pos == NULL || g_strcmp0(pos->data, text) != 0)) {
-		/* save the old entry to history */
-		command_history_add(history, text);
-	}
-	return history->pos == NULL ? "" : history->pos->data;
+const char *command_global_history_next(WINDOW_REC *window, const char *text)
+{
+	return command_history_next_int(window, text, TRUE);
 }
 
 void command_history_clear_pos_func(HISTORY_REC *history, gpointer user_data)
@@ -175,12 +279,17 @@ HISTORY_REC *command_history_create(const char *name)
 
 void command_history_clear(HISTORY_REC *history)
 {
+	GList *link, *next;
+
 	g_return_if_fail(history != NULL);
 
 	command_history_clear_pos_func(history, NULL);
-	g_list_foreach(history->list, (GFunc) g_free, NULL);
-	g_list_free(history->list);
-	history->list = NULL;
+	link = command_history_list_first(history);
+	while (link != NULL) {
+		next = command_history_list_next(history, link);
+		history_list_delete_link_and_destroy(link);
+		link = next;
+	}
 	history->lines = 0;
 }
 
@@ -264,8 +373,8 @@ static char *special_history_func(const char *text, void *item, int *free_ret)
 	ret = NULL;
 
 	history = command_history_current(window);
-	for (tmp = history->list; tmp != NULL; tmp = tmp->next) {
-		const char *line = tmp->data;
+	for (tmp = command_history_list_first(history); tmp != NULL; tmp = command_history_list_next(history, tmp)) {
+		const char *line = ((HISTORY_ENTRY_REC *)tmp->data)->text;
 
 		if (match_wildcards(findtext, line)) {
 			*free_ret = TRUE;
@@ -289,6 +398,8 @@ void command_history_init(void)
 
 	special_history_func_set(special_history_func);
 
+	history_entries = NULL;
+
 	global_history = command_history_create(NULL);
 
 	read_settings();
@@ -308,4 +419,6 @@ void command_history_deinit(void)
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 
 	command_history_destroy(global_history);
+
+	g_list_free_full(history_entries, (GDestroyNotify) history_entry_destroy);
 }
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index 45126092..ddc8f5e6 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -6,12 +6,19 @@
 typedef struct {
 	char *name;
 
-	GList *list, *pos;
+	GList *pos;
 	int lines;
 
 	int refcount;
+	int redo:1;
 } HISTORY_REC;
 
+typedef struct {
+	const char *text;
+	HISTORY_REC *history;
+	time_t time;
+} HISTORY_ENTRY_REC;
+
 HISTORY_REC *command_history_find(HISTORY_REC *history);
 HISTORY_REC *command_history_find_name(const char *name);
 
@@ -22,8 +29,15 @@ void command_history_deinit(void);
 
 void command_history_add(HISTORY_REC *history, const char *text);
 
+GList *command_history_list_last(HISTORY_REC *history);
+GList *command_history_list_first(HISTORY_REC *history);
+GList *command_history_list_prev(HISTORY_REC *history, GList *pos);
+GList *command_history_list_next(HISTORY_REC *history, GList *pos);
+
 const char *command_history_prev(WINDOW_REC *window, const char *text);
 const char *command_history_next(WINDOW_REC *window, const char *text);
+const char *command_global_history_prev(WINDOW_REC *window, const char *text);
+const char *command_global_history_next(WINDOW_REC *window, const char *text);
 
 void command_history_clear_pos(WINDOW_REC *window);
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 3688f15e..0528ed94 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -530,6 +530,28 @@ static void key_forward_history(void)
         g_free(line);
 }
 
+static void key_backward_global_history(void)
+{
+	const char *text;
+	char *line;
+
+	line = gui_entry_get_text(active_entry);
+	text = command_global_history_prev(active_win, line);
+	gui_entry_set_text(active_entry, text);
+	g_free(line);
+}
+
+static void key_forward_global_history(void)
+{
+	const char *text;
+	char *line;
+
+	line = gui_entry_get_text(active_entry);
+	text = command_global_history_next(active_win, line);
+	gui_entry_set_text(active_entry, text);
+	g_free(line);
+}
+
 static void key_beginning_of_line(void)
 {
         gui_entry_set_pos(active_entry, 0);
@@ -1176,6 +1198,8 @@ void gui_readline_init(void)
 	key_bind("key", NULL, "meta2-5C", "cright", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;5D", "cleft", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;5C", "cright", (SIGNAL_FUNC) key_combo);
+	key_bind("key", NULL, "meta2-1;5A", "cup", (SIGNAL_FUNC) key_combo);
+	key_bind("key", NULL, "meta2-1;5B", "cdown", (SIGNAL_FUNC) key_combo);
 
 	key_bind("key", NULL, "meta2-1;3A", "mup", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "meta2-1;3B", "mdown", (SIGNAL_FUNC) key_combo);
@@ -1217,6 +1241,8 @@ void gui_readline_init(void)
         /* history */
 	key_bind("backward_history", "Go back one line in the history", "up", NULL, (SIGNAL_FUNC) key_backward_history);
 	key_bind("forward_history", "Go forward one line in the history", "down", NULL, (SIGNAL_FUNC) key_forward_history);
+	key_bind("backward_global_history", "Go back one line in the global history", "cup", NULL, (SIGNAL_FUNC) key_backward_global_history);
+	key_bind("forward_global_history", "Go forward one line in the global history", "cdown", NULL, (SIGNAL_FUNC) key_forward_global_history);
 
         /* line editing */
 	key_bind("backspace", "Delete the previous character", "backspace", NULL, (SIGNAL_FUNC) key_backspace);
@@ -1310,6 +1336,8 @@ void gui_readline_deinit(void)
 
 	key_unbind("backward_history", (SIGNAL_FUNC) key_backward_history);
 	key_unbind("forward_history", (SIGNAL_FUNC) key_forward_history);
+	key_unbind("backward_global_history", (SIGNAL_FUNC) key_backward_global_history);
+	key_unbind("forward_global_history", (SIGNAL_FUNC) key_forward_global_history);
 
 	key_unbind("backspace", (SIGNAL_FUNC) key_backspace);
 	key_unbind("delete_character", (SIGNAL_FUNC) key_delete_character);
diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs
index 8c994cc2..b8d68ad8 100644
--- a/src/perl/ui/Window.xs
+++ b/src/perl/ui/Window.xs
@@ -252,8 +252,9 @@ PREINIT:
 	GList *tmp;
 PPCODE:
 	rec = command_history_current(window);
-	for (tmp = rec->list; tmp != NULL; tmp = tmp->next)
-		XPUSHs(sv_2mortal(new_pv(tmp->data)));
+	for (tmp = command_history_list_first(rec); tmp != NULL; tmp = command_history_list_next(rec, tmp))
+		XPUSHs(sv_2mortal(new_pv(((HISTORY_ENTRY_REC *)tmp->data)->text)));
+
 
 #*******************************
 MODULE = Irssi::UI::Window  PACKAGE = Irssi::Windowitem  PREFIX = window_item_

From 16d68a86ca75b73c53aa81fe6d3d36361cb35b99 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Oct 2017 15:02:15 +0200
Subject: [PATCH 0636/1650] add two XSFuncs to manipulate command history
 entries

it is possible to use Irssi::UI::Window::get_history_entries to save the
history entries, load_history_entries to load entries into the command
history and delete_history_entries to remove history entries (for example
to remove history selectively)
---
 src/fe-common/core/command-history.c |  55 +++++++++++
 src/fe-common/core/command-history.h |   2 +
 src/perl/ui/Window.xs                | 139 +++++++++++++++++++++++++++
 3 files changed, 196 insertions(+)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 5de76969..a6a800d3 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -168,6 +168,61 @@ HISTORY_REC *command_history_find_name(const char *name)
 	return NULL;
 }
 
+static int history_entry_after_time_sort(const HISTORY_ENTRY_REC *a, const HISTORY_ENTRY_REC *b)
+{
+	return a->time == b->time ? 1 : a->time - b->time;
+}
+
+void command_history_load_entry(time_t history_time, HISTORY_REC *history, const char *text)
+{
+	HISTORY_ENTRY_REC *entry;
+
+	g_return_if_fail(history != NULL);
+	g_return_if_fail(text != NULL);
+
+	entry = g_new0(HISTORY_ENTRY_REC, 1);
+	entry->text = g_strdup(text);
+	entry->history = history;
+	entry->time = history_time;
+
+	history->lines++;
+
+	history_entries = g_list_insert_sorted(history_entries, entry, (GCompareFunc)history_entry_after_time_sort);
+}
+
+static int history_entry_find_func(const HISTORY_ENTRY_REC *data, const HISTORY_ENTRY_REC *user_data)
+{
+	if ((user_data->time == -1 || (data->time == user_data->time)) &&
+	    (user_data->history == NULL || (data->history == user_data->history)) &&
+	    g_strcmp0(data->text, user_data->text) == 0) {
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+gboolean command_history_delete_entry(time_t history_time, HISTORY_REC *history, const char *text)
+{
+	GList *link;
+	HISTORY_ENTRY_REC entry;
+
+	g_return_val_if_fail(history != NULL, FALSE);
+	g_return_val_if_fail(text != NULL, FALSE);
+
+	entry.text = text;
+	entry.history = history;
+	entry.time = history_time;
+
+	link = g_list_find_custom(history_entries, &entry, (GCompareFunc)history_entry_find_func);
+	if (link != NULL) {
+		((HISTORY_ENTRY_REC *)link->data)->history->lines--;
+		history_list_delete_link_and_destroy(link);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
 HISTORY_REC *command_history_current(WINDOW_REC *window)
 {
 	HISTORY_REC *rec;
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index ddc8f5e6..dc4d46da 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -28,6 +28,8 @@ void command_history_init(void);
 void command_history_deinit(void);
 
 void command_history_add(HISTORY_REC *history, const char *text);
+void command_history_load_entry(time_t time, HISTORY_REC *history, const char *text);
+gboolean command_history_delete_entry(time_t history_time, HISTORY_REC *history, const char *text);
 
 GList *command_history_list_last(HISTORY_REC *history);
 GList *command_history_list_first(HISTORY_REC *history);
diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs
index b8d68ad8..85e284bb 100644
--- a/src/perl/ui/Window.xs
+++ b/src/perl/ui/Window.xs
@@ -255,6 +255,145 @@ PPCODE:
 	for (tmp = command_history_list_first(rec); tmp != NULL; tmp = command_history_list_next(rec, tmp))
 		XPUSHs(sv_2mortal(new_pv(((HISTORY_ENTRY_REC *)tmp->data)->text)));
 
+void
+window_get_history_entries(window)
+	Irssi::UI::Window window
+PREINIT:
+	HISTORY_REC *rec;
+	HISTORY_ENTRY_REC *ent;
+	WINDOW_REC *win;
+	GList *tmp;
+	GSList *stmp;
+	HV *hv;
+PPCODE:
+	rec = window == NULL ? NULL : command_history_current(window);
+	for (tmp = command_history_list_first(rec); tmp != NULL; tmp = command_history_list_next(rec, tmp)) {
+		hv = (HV*)sv_2mortal((SV*)newHV());
+		ent = tmp->data;
+		hv_store(hv, "text", 4, newSVpv(ent->text, 0), 0);
+		hv_store(hv, "time", 4, newSViv(ent->time), 0);
+		if (ent->history == command_history_current(NULL)) {
+			hv_store(hv, "history", 7, newSV(0), 0);
+			hv_store(hv, "window", 6, newSV(0), 0);
+		} else {
+			if (ent->history->name == NULL) {
+				hv_store(hv, "history", 7, newSV(0), 0);
+				for (stmp = windows; stmp != NULL; stmp = stmp->next) {
+					win = stmp->data;
+					if (win->history == ent->history) {
+						hv_store(hv, "window", 6, newSViv(win->refnum), 0);
+						break;
+					}
+				}
+			} else {
+				hv_store(hv, "history", 7, new_pv(ent->history->name), 0);
+				hv_store(hv, "window", 6, newSV(0), 0);
+			}
+		}
+		XPUSHs(sv_2mortal(newRV_inc((SV*)hv)));
+	}
+
+void
+window_load_history_entries(window, ...)
+	Irssi::UI::Window window
+PREINIT:
+	HV *hv;
+	SV **sv;
+	HISTORY_REC *history;
+	WINDOW_REC *tmp;
+	const char *text;
+	long hist_time;
+	int i;
+PPCODE:
+	for (i = 1; i < items; i++) {
+		if (!is_hvref(ST(i))) {
+			croak("Usage: Irssi::UI::Window::load_history_entries(window, hash...)");
+		}
+		hv = hvref(ST(i));
+		if (hv != NULL) {
+			tmp = NULL;
+			text = NULL;
+			hist_time = time(NULL);
+			history = command_history_current(NULL);
+
+			sv = hv_fetch(hv, "text", 4, 0);
+			if (sv != NULL) text = SvPV_nolen(*sv);
+			sv = hv_fetch(hv, "time", 4, 0);
+			if (sv != NULL && SvOK(*sv)) hist_time = SvIV(*sv);
+
+			if (window != NULL) {
+				history = command_history_current(window);
+			} else {
+				sv = hv_fetch(hv, "history", 7, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					history = command_history_find_name(SvPV_nolen(*sv));
+				}
+
+				sv = hv_fetch(hv, "window", 6, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					tmp = window_find_refnum(SvIV(*sv));
+					if (tmp != NULL) {
+						history = tmp->history;
+					}
+				}
+			}
+
+			if (text != NULL && history != NULL) {
+				command_history_load_entry(hist_time, history, text);
+			}
+		}
+	}
+
+void
+window_delete_history_entries(window, ...)
+	Irssi::UI::Window window
+PREINIT:
+	HV *hv;
+	SV **sv;
+	HISTORY_REC *history;
+	WINDOW_REC *tmp;
+	const char *text;
+	long hist_time;
+	int i;
+PPCODE:
+	for (i = 1; i < items; i++) {
+		if (!is_hvref(ST(i))) {
+			croak("Usage: Irssi::UI::Window::delete_history_entries(window, hash...)");
+		}
+		hv = hvref(ST(i));
+		if (hv != NULL) {
+			tmp = NULL;
+			text = NULL;
+			hist_time = -1;
+			history = command_history_current(NULL);
+
+			sv = hv_fetch(hv, "text", 4, 0);
+			if (sv != NULL) text = SvPV_nolen(*sv);
+			sv = hv_fetch(hv, "time", 4, 0);
+			if (sv != NULL && SvOK(*sv)) hist_time = SvIV(*sv);
+
+			if (window != NULL) {
+				history = command_history_current(window);
+			} else {
+				sv = hv_fetch(hv, "history", 7, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					history = command_history_find_name(SvPV_nolen(*sv));
+				}
+
+				sv = hv_fetch(hv, "window", 6, 0);
+				if (sv != NULL && SvOK(*sv)) {
+					tmp = window_find_refnum(SvIV(*sv));
+					if (tmp != NULL) {
+						history = tmp->history;
+					}
+				}
+			}
+
+			if (text != NULL && history != NULL) {
+				XPUSHs(boolSV(command_history_delete_entry(hist_time, history, text)));
+			}
+		}
+	}
 
 #*******************************
 MODULE = Irssi::UI::Window  PACKAGE = Irssi::Windowitem  PREFIX = window_item_

From deac66f33c0fb1d6914d15ce63bde3f030a9c06d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Oct 2017 15:31:52 +0200
Subject: [PATCH 0637/1650] add a key binding to erase history entries

it is possible to delete the current history entry using the
erase_history_entry key binding
---
 src/fe-common/core/command-history.c | 17 +++++++++++++++++
 src/fe-common/core/command-history.h |  1 +
 src/fe-text/gui-readline.c           | 13 +++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index a6a800d3..32d7adaa 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -307,6 +307,23 @@ const char *command_global_history_next(WINDOW_REC *window, const char *text)
 	return command_history_next_int(window, text, TRUE);
 }
 
+const char *command_history_delete_current(WINDOW_REC *window, const char *text)
+{
+	HISTORY_REC *history;
+	GList *pos;
+
+	history = command_history_current(window);
+	pos = history->pos;
+
+	if (pos != NULL && g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) == 0) {
+		((HISTORY_ENTRY_REC *)pos->data)->history->lines--;
+		history_list_delete_link_and_destroy(pos);
+	}
+
+	history->redo = 0;
+	return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
+}
+
 void command_history_clear_pos_func(HISTORY_REC *history, gpointer user_data)
 {
 	history->pos = NULL;
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index dc4d46da..ed093415 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -40,6 +40,7 @@ const char *command_history_prev(WINDOW_REC *window, const char *text);
 const char *command_history_next(WINDOW_REC *window, const char *text);
 const char *command_global_history_prev(WINDOW_REC *window, const char *text);
 const char *command_global_history_next(WINDOW_REC *window, const char *text);
+const char *command_history_delete_current(WINDOW_REC *window, const char *text);
 
 void command_history_clear_pos(WINDOW_REC *window);
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 0528ed94..b3a78396 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -552,6 +552,17 @@ static void key_forward_global_history(void)
 	g_free(line);
 }
 
+static void key_erase_history_entry(void)
+{
+	const char *text;
+	char *line;
+
+	line = gui_entry_get_text(active_entry);
+	text = command_history_delete_current(active_win, line);
+	gui_entry_set_text(active_entry, text);
+	g_free(line);
+}
+
 static void key_beginning_of_line(void)
 {
         gui_entry_set_pos(active_entry, 0);
@@ -1243,6 +1254,7 @@ void gui_readline_init(void)
 	key_bind("forward_history", "Go forward one line in the history", "down", NULL, (SIGNAL_FUNC) key_forward_history);
 	key_bind("backward_global_history", "Go back one line in the global history", "cup", NULL, (SIGNAL_FUNC) key_backward_global_history);
 	key_bind("forward_global_history", "Go forward one line in the global history", "cdown", NULL, (SIGNAL_FUNC) key_forward_global_history);
+	key_bind("erase_history_entry", "Erase the currently active entry from the history", NULL, NULL, (SIGNAL_FUNC) key_erase_history_entry);
 
         /* line editing */
 	key_bind("backspace", "Delete the previous character", "backspace", NULL, (SIGNAL_FUNC) key_backspace);
@@ -1338,6 +1350,7 @@ void gui_readline_deinit(void)
 	key_unbind("forward_history", (SIGNAL_FUNC) key_forward_history);
 	key_unbind("backward_global_history", (SIGNAL_FUNC) key_backward_global_history);
 	key_unbind("forward_global_history", (SIGNAL_FUNC) key_forward_global_history);
+	key_unbind("erase_history_entry", (SIGNAL_FUNC) key_erase_history_entry);
 
 	key_unbind("backspace", (SIGNAL_FUNC) key_backspace);
 	key_unbind("delete_character", (SIGNAL_FUNC) key_delete_character);

From 5da0b73a12b3b319a2c7d6b18657ec13d52b6476 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Oct 2017 15:31:59 +0200
Subject: [PATCH 0638/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 159f7124..a7eaa7cf 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 11
+#define IRSSI_ABI_VERSION 12
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 40ae8f5fa67cb7ec529f9fea5816fb8804c9bba8 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 7 Oct 2017 03:28:02 +0100
Subject: [PATCH 0639/1650] Limit capsicum rights to stdio.

This requires FreeBSD fix (https://reviews.freebsd.org/D12622)
to work properly.
---
 src/core/capsicum.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 3b0708cb..1c5c59da 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -37,6 +37,7 @@
 #include <sys/nv.h>
 #include <sys/procdesc.h>
 #include <sys/socket.h>
+#include <capsicum_helpers.h>
 #include <string.h>
 
 #define	OPCODE_CONNECT		1
@@ -410,6 +411,13 @@ static void cmd_capsicum_enter(void)
 	 */
 	signal(SIGCHLD, SIG_IGN);
 
+	error = caph_limit_stdio();
+	if (error != 0) {
+		g_warning("caph_limit_stdio(3) failed: %s", strerror(errno));
+		signal_emit("capability mode failed", 1, strerror(errno));
+		return;
+	}
+
 	error = cap_enter();
 	if (error != 0) {
 		signal_emit("capability mode failed", 1, strerror(errno));

From 00c80cb6fcca40cfc421fe3fc181115ac4907191 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 7 Oct 2017 20:45:13 +0200
Subject: [PATCH 0640/1650] fix out of bounds read in compress_colors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported by Hanno Böck.

Fixes GL#12
---
 src/fe-common/core/themes.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 2b1459be..cb1cce8f 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -587,7 +587,7 @@ static char *theme_format_compress_colors(THEME_REC *theme, const char *format)
 			/* a normal character */
 			g_string_append_c(str, *format);
 			format++;
-		} else {
+		} else if (format[1] != '\0') {
 			/* %format */
 			format++;
 			if (IS_OLD_FORMAT(*format, last_fg, last_bg)) {
@@ -614,6 +614,11 @@ static char *theme_format_compress_colors(THEME_REC *theme, const char *format)
 					last_bg = '\0';
 			}
 			format++;
+		} else {
+			/* % at end of string */
+			format++;
+			g_string_append_c(str, '%');
+			g_string_append_c(str, '%');
 		}
 	}
 

From 49ace3251b79a9e97c6e4d0bc640f9143dc71b90 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 8 Oct 2017 19:47:50 +0200
Subject: [PATCH 0641/1650] fix uaf in chanquery module

the chanquery needs to be removed in any case if a channel rec is
destroyed, regardless of any state

Fixes GL#13
---
 src/irc/core/channels-query.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 857ebaf0..d161aec1 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -125,15 +125,15 @@ static void query_remove_all(IRC_CHANNEL_REC *channel)
 		rec->queries[n] = g_slist_remove(rec->queries[n], channel);
 	rec->current_queries = g_slist_remove(rec->current_queries, channel);
 
-	query_check(channel->server);
+	if (!channel->server->disconnected)
+		query_check(channel->server);
 }
 
 static void sig_channel_destroyed(IRC_CHANNEL_REC *channel)
 {
 	g_return_if_fail(channel != NULL);
 
-	if (IS_IRC_CHANNEL(channel) && !channel->server->disconnected &&
-	    !channel->synced)
+	if (IS_IRC_CHANNEL(channel))
 		query_remove_all(channel);
 }
 

From 2edd816e7db13b4ac0b20df9bf7fe55ee7718215 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Sun, 8 Oct 2017 22:02:44 -0400
Subject: [PATCH 0642/1650] Fix segfault in query_remove_all

It is possible for rec to be NULL in query_remove_all, resulting in a
segfault. So return without doing anything if rec is NULL.
---
 src/irc/core/channels-query.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index d161aec1..d7dadf04 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -119,6 +119,7 @@ static void query_remove_all(IRC_CHANNEL_REC *channel)
 	int n;
 
 	rec = channel->server->chanqueries;
+	if (rec == NULL) return;
 
 	/* remove channel from query lists */
 	for (n = 0; n < CHANNEL_QUERIES; n++)

From 4ccff71f678f79da71713a29d8528812379bb584 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 9 Oct 2017 12:50:04 -0700
Subject: [PATCH 0643/1650] Set host to an empty string on error

While investigating #317, I noticed that it was possible we would access
an uninitialized buffer due to failing to check the return value of
net_ip2host(). This is done in several places. To make such uses safe,
set the host buffer to an empty string on error. It is possible callers
could be improved by handling the error in each spot, but this gives us
some safety.
---
 src/core/network.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/core/network.c b/src/core/network.c
index 4494dbc6..8d9c6b06 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -489,7 +489,16 @@ int net_gethostbyaddr(IPADDR *ip, char **name)
 
 int net_ip2host(IPADDR *ip, char *host)
 {
-	return inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN) ? 0 : -1;
+	if (inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN)) {
+		return 0;
+	}
+
+	// For callers that do not check our return value and pass in an
+	// uninitialized buffer assuming it will be set, ensure the buffer is a valid
+	// string. Ideally callers should check what we return and handle
+	// appropriately, but this at least gives us safety.
+	host[0] = '\0';
+	return -1;
 }
 
 int net_host2ip(const char *host, IPADDR *ip)

From cb5f3cba1f2b5dbad67bcc107f3fe4a1875cc52d Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 9 Oct 2017 13:14:34 -0700
Subject: [PATCH 0644/1650] Delete unused function net_ip_compare()

---
 src/core/network.c | 12 ------------
 src/core/network.h |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 4494dbc6..36e04c7a 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -60,18 +60,6 @@ IPADDR ip4_any = {
 #endif
 };
 
-int net_ip_compare(IPADDR *ip1, IPADDR *ip2)
-{
-	if (ip1->family != ip2->family)
-		return 0;
-
-	if (ip1->family == AF_INET6)
-		return memcmp(&ip1->ip, &ip2->ip, sizeof(ip1->ip)) == 0;
-
-	return memcmp(&ip1->ip, &ip2->ip, 4) == 0;
-}
-
-
 static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
 {
 	if (ip == NULL) {
diff --git a/src/core/network.h b/src/core/network.h
index d1582a2e..471ab2d8 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -33,9 +33,6 @@ extern IPADDR ip4_any;
 
 GIOChannel *g_io_channel_new(int handle);
 
-/* returns 1 if IPADDRs are the same */
-int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
-
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
 
 /* Connect to socket */

From 3b3939b146bb2f80182d572a2afc08ba405037a1 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 9 Oct 2017 13:14:59 -0700
Subject: [PATCH 0645/1650] Delete commented out CYGWIN define

---
 src/core/network.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 36e04c7a..38f4e65a 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -48,9 +48,6 @@ GIOChannel *g_io_channel_new(int handle)
 	return chan;
 }
 
-/* Cygwin need this, don't know others.. */
-/*#define BLOCKING_SOCKETS 1*/
-
 IPADDR ip4_any = {
 	AF_INET,
 #if defined(IN6ADDR_ANY_INIT)

From b8b90c76d4ea87d7e50c2a34fbc36ab732e3e89e Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 9 Oct 2017 13:20:44 -0700
Subject: [PATCH 0646/1650] Delete unused function net_connect()

---
 src/core/network.c | 34 ----------------------------------
 src/core/network.h |  2 --
 2 files changed, 36 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 38f4e65a..52619e4f 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -98,40 +98,6 @@ static int sin_get_port(union sockaddr_union *so)
 		     so->sin.sin_port);
 }
 
-/* Connect to socket */
-GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
-{
-	IPADDR ip4, ip6, *ip;
-
-	g_return_val_if_fail(addr != NULL, NULL);
-
-	if (net_gethostbyname(addr, &ip4, &ip6) == -1)
-		return NULL;
-
-	if (my_ip == NULL) {
-                /* prefer IPv4 addresses */
-		ip = ip4.family != 0 ? &ip4 : &ip6;
-	} else if (IPADDR_IS_V6(my_ip)) {
-                /* my_ip is IPv6 address, use it if possible */
-		if (ip6.family != 0)
-			ip = &ip6;
-		else {
-			my_ip = NULL;
-                        ip = &ip4;
-		}
-	} else {
-                /* my_ip is IPv4 address, use it if possible */
-		if (ip4.family != 0)
-			ip = &ip4;
-		else {
-			my_ip = NULL;
-                        ip = &ip6;
-		}
-	}
-
-	return net_connect_ip(ip, port, my_ip);
-}
-
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip)
 {
 	union sockaddr_union so;
diff --git a/src/core/network.h b/src/core/network.h
index 471ab2d8..a02f0db9 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -35,8 +35,6 @@ GIOChannel *g_io_channel_new(int handle);
 
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
 
-/* Connect to socket */
-GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip) G_GNUC_DEPRECATED;
 /* Connect to socket with ip address and SSL*/
 GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server);
 /* Start TLS */

From 174adee9dd91c23615f79b979b3b3c5f72ad1240 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Tue, 10 Oct 2017 18:21:05 -0700
Subject: [PATCH 0647/1650] Always initialize the host string

This also removes a wordy comment
---
 src/core/network.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 8d9c6b06..b38c9102 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -489,16 +489,8 @@ int net_gethostbyaddr(IPADDR *ip, char **name)
 
 int net_ip2host(IPADDR *ip, char *host)
 {
-	if (inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN)) {
-		return 0;
-	}
-
-	// For callers that do not check our return value and pass in an
-	// uninitialized buffer assuming it will be set, ensure the buffer is a valid
-	// string. Ideally callers should check what we return and handle
-	// appropriately, but this at least gives us safety.
 	host[0] = '\0';
-	return -1;
+	return inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN) ? 0 : -1;
 }
 
 int net_host2ip(const char *host, IPADDR *ip)

From 17b195021dc35b95b24c1cce6f2e891e0e6b85ec Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 11 Oct 2017 14:34:38 +0100
Subject: [PATCH 0648/1650] Bump default capsicum_port_max to 9999.

This is needed for servers like ssl.efnet.org, which, per default
config, listen on 9999.
---
 src/core/capsicum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 1c5c59da..945d3197 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -452,7 +452,7 @@ void capsicum_init(void)
 	settings_add_bool("misc", "capsicum", FALSE);
 	settings_add_str("misc", "capsicum_irclogs_path", "~/irclogs");
 	settings_add_int("misc", "capsicum_port_min", 6667);
-	settings_add_int("misc", "capsicum_port_max", 6697);
+	settings_add_int("misc", "capsicum_port_max", 9999);
 
 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
 

From 87955b69cb82314becf1aa9f66c707705f517d0f Mon Sep 17 00:00:00 2001
From: Paul Townsend <pt@mindvox.org>
Date: Wed, 11 Oct 2017 21:33:14 +0100
Subject: [PATCH 0649/1650] Add alternate_nick as a network-specific property.

---
 docs/help/in/network.in          |  1 +
 src/core/chatnet-rec.h           |  1 +
 src/fe-common/irc/fe-ircnet.c    | 11 ++++++++---
 src/irc/core/irc-servers-setup.c |  9 ++++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 4c2eeed4..fbdaa0b4 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -11,6 +11,7 @@
     REMOVE:          Removes a network from your configuration.
 
     -nick:           Specifies the nickname to use.
+    -alternate_nick  Specifies the alternate nickname to use.
     -user:           Specifies the user identity to use.
     -realname:       Specifies the real name to use.
     -host:           Specifies the hostname to use.
diff --git a/src/core/chatnet-rec.h b/src/core/chatnet-rec.h
index e3ed8aa0..96ef6914 100644
--- a/src/core/chatnet-rec.h
+++ b/src/core/chatnet-rec.h
@@ -4,6 +4,7 @@ int chat_type; /* chat_protocol_lookup(xx) */
 char *name;
 
 char *nick;
+char *alternate_nick;
 char *username;
 char *realname;
 
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 24dad63f..8f1d2efd 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -48,6 +48,8 @@ static void cmd_network_list(void)
 		g_string_truncate(str, 0);
 		if (rec->nick != NULL)
 			g_string_append_printf(str, "nick: %s, ", rec->nick);
+		if (rec->alternate_nick != NULL)
+			g_string_append_printf(str, "alternate_nick: %s, ", rec->alternate_nick);
 		if (rec->username != NULL)
 			g_string_append_printf(str, "username: %s, ", rec->username);
 		if (rec->realname != NULL)
@@ -114,6 +116,7 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 		rec->name = g_strdup(name);
 	} else {
 		if (g_hash_table_lookup(optlist, "nick")) g_free_and_null(rec->nick);
+		if (g_hash_table_lookup(optlist, "alternate_nick")) g_free_and_null(rec->alternate_nick);
 		if (g_hash_table_lookup(optlist, "user")) g_free_and_null(rec->username);
 		if (g_hash_table_lookup(optlist, "realname")) g_free_and_null(rec->realname);
 		if (g_hash_table_lookup(optlist, "host")) {
@@ -145,6 +148,8 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 
 	value = g_hash_table_lookup(optlist, "nick");
 	if (value != NULL && *value != '\0') rec->nick = g_strdup(value);
+	value = g_hash_table_lookup(optlist, "alternate_nick");
+	if (value != NULL && *value != '\0') rec->alternate_nick = g_strdup(value);
 	value = g_hash_table_lookup(optlist, "user");
 	if (value != NULL && *value != '\0') rec->username = g_strdup(value);
 	value = g_hash_table_lookup(optlist, "realname");
@@ -175,7 +180,7 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: NETWORK ADD|MODIFY [-nick <nick>] [-user <user>] [-realname <name>]
+/* SYNTAX: NETWORK ADD|MODIFY [-nick <nick>] [-alternate_nick <nick>] [-user <user>] [-realname <name>]
                               [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
                               [-querychans <count>] [-whois <count>] [-msgs <count>]
                               [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
@@ -228,9 +233,9 @@ void fe_ircnet_init(void)
 	command_bind("network remove", NULL, (SIGNAL_FUNC) cmd_network_remove);
 
 	command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed "
-			    "-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
+			    "-cmdmax -nick -alternate_nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
 	command_set_options("network modify", "-kicks -msgs -modes -whois -cmdspeed "
-			    "-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
+			    "-cmdmax -nick -alternate_nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
 }
 
 void fe_ircnet_deinit(void)
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 6040d3a5..a51ce2e2 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -69,7 +69,14 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 		return;
 	g_return_if_fail(IS_IRCNET(ircnet));
 
-	if (ircnet->nick != NULL) g_free_and_null(conn->alternate_nick);
+	if (ircnet->nick != NULL) {
+		g_free_and_null(conn->nick);
+		conn->nick = g_strdup(ircnet->nick);
+	}
+	if (ircnet->alternate_nick != NULL) {
+		g_free_and_null(conn->alternate_nick);
+		conn->alternate_nick = g_strdup(ircnet->alternate_nick);
+	}
 	if (ircnet->usermode != NULL) {
 		g_free_and_null(conn->usermode);
 		conn->usermode = g_strdup(ircnet->usermode);

From 1e66cbd62e231f8ae47589cf4f1c0c6c62bb7ca8 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 11 Oct 2017 23:13:06 +0100
Subject: [PATCH 0650/1650] Improve Capsicum stdio limits to fix terminal state
 on exit.

---
 src/core/capsicum.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 945d3197..5f2556ab 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -360,6 +360,38 @@ static void cmd_capsicum(const char *data, SERVER_REC *server, void *item)
 	command_runsub("capsicum", data, server, item);
 }
 
+/*
+ * The main difference between this and caph_limit_stdio(3) is that this
+ * one permits TIOCSETAW, which is requred for restoring the terminal state
+ * on exit.
+ */
+static int
+limit_stdio_fd(int fd)
+{
+	cap_rights_t rights;
+	unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ, TIOCSETAW, FIODTYPE };
+
+	cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_EVENT, CAP_FCNTL,
+	    CAP_FSTAT, CAP_IOCTL, CAP_SEEK);
+
+	if (cap_rights_limit(fd, &rights) < 0) {
+		g_warning("cap_rights_limit(3) failed: %s", strerror(errno));
+		return (-1);
+	}
+
+	if (cap_ioctls_limit(fd, cmds, nitems(cmds)) < 0) {
+		g_warning("cap_ioctls_limit(3) failed: %s", strerror(errno));
+		return (-1);
+	}
+
+	if (cap_fcntls_limit(fd, CAP_FCNTL_GETFL) < 0) {
+		g_warning("cap_fcntls_limit(3) failed: %s", strerror(errno));
+		return (-1);
+	}
+
+	return (0);
+}
+
 static void cmd_capsicum_enter(void)
 {
 	u_int mode;
@@ -411,9 +443,9 @@ static void cmd_capsicum_enter(void)
 	 */
 	signal(SIGCHLD, SIG_IGN);
 
-	error = caph_limit_stdio();
-	if (error != 0) {
-		g_warning("caph_limit_stdio(3) failed: %s", strerror(errno));
+	if (limit_stdio_fd(STDIN_FILENO) != 0 ||
+	    limit_stdio_fd(STDOUT_FILENO) != 0 ||
+	    limit_stdio_fd(STDERR_FILENO) != 0) {
 		signal_emit("capability mode failed", 1, strerror(errno));
 		return;
 	}

From 5c0b4aeb0572827877654b65bb05fb7b37a3117a Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 11 Oct 2017 23:31:26 +0100
Subject: [PATCH 0651/1650] Sort Capsicum headers.

---
 src/core/capsicum.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 5f2556ab..5647a302 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -32,13 +32,14 @@
 #include "settings.h"
 #include "signals.h"
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/capsicum.h>
+#include <sys/filio.h>
 #include <sys/nv.h>
 #include <sys/procdesc.h>
 #include <sys/socket.h>
-#include <capsicum_helpers.h>
 #include <string.h>
+#include <termios.h>
 
 #define	OPCODE_CONNECT		1
 #define	OPCODE_GETHOSTBYNAME	2

From 9895e7b28a3767bbe4430cbffd3662b4ef92b37f Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 11 Oct 2017 23:52:36 +0100
Subject: [PATCH 0652/1650] Silence down a warning that would appear on "/away"
 in Capability mode.

---
 src/core/capsicum.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 5647a302..568b5542 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -183,6 +183,10 @@ void capsicum_mkdir_with_parents(const char *path, int mode)
 	char *component, *copy, *tofree;
 	int error, fd, newfd;
 
+	/* The directory already exists, nothing to do. */
+	if (strcmp(path, irclogs_path) == 0)
+		return;
+
 	/* +1 is for the slash separating irclogs_path and the rest. */
 	if (strlen(path) <= irclogs_path_len + 1 ||
 	    path[irclogs_path_len] != '/' ||

From 711b2d7df7da4a3010214909ed1b260c55f6befa Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 11 Oct 2017 23:53:41 +0100
Subject: [PATCH 0653/1650] Document that one needs to change the awaylog_file
 path for "/away" to work with Capsicum.

---
 docs/capsicum.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/capsicum.txt b/docs/capsicum.txt
index 3093bfe5..a3a1b8a7 100644
--- a/docs/capsicum.txt
+++ b/docs/capsicum.txt
@@ -7,6 +7,7 @@ or the libraries it depends on.
 To make Irssi enter capability mode on startup, add
 
 capsicum = "yes";
+awaylog_file = "~/irclogs/away.log";
 
 to your ~/.irssi/config and restart the client.  Alternatively you can
 enter it "by hand", using the "/capsicum enter" command.  From the security

From da59fd7c2dd0641f623db2c67a244ddca3013d65 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Fri, 13 Oct 2017 18:28:26 -0700
Subject: [PATCH 0654/1650] Revert "Delete unused function net_ip_compare()"

This reverts commit cb5f3cba1f2b5dbad67bcc107f3fe4a1875cc52d.
---
 src/core/network.c | 12 ++++++++++++
 src/core/network.h |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/src/core/network.c b/src/core/network.c
index 52619e4f..4963a542 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -57,6 +57,18 @@ IPADDR ip4_any = {
 #endif
 };
 
+int net_ip_compare(IPADDR *ip1, IPADDR *ip2)
+{
+	if (ip1->family != ip2->family)
+		return 0;
+
+	if (ip1->family == AF_INET6)
+		return memcmp(&ip1->ip, &ip2->ip, sizeof(ip1->ip)) == 0;
+
+	return memcmp(&ip1->ip, &ip2->ip, 4) == 0;
+}
+
+
 static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
 {
 	if (ip == NULL) {
diff --git a/src/core/network.h b/src/core/network.h
index a02f0db9..84f3a56c 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -33,6 +33,9 @@ extern IPADDR ip4_any;
 
 GIOChannel *g_io_channel_new(int handle);
 
+/* returns 1 if IPADDRs are the same */
+int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
+
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
 
 /* Connect to socket with ip address and SSL*/

From 233be9f580290ff3efa66e6256e46303b01781da Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Fri, 13 Oct 2017 18:30:57 -0700
Subject: [PATCH 0655/1650] Mark net_ip_compare() deprecated

---
 src/core/network.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/network.h b/src/core/network.h
index 84f3a56c..e60f607f 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -33,8 +33,9 @@ extern IPADDR ip4_any;
 
 GIOChannel *g_io_channel_new(int handle);
 
-/* returns 1 if IPADDRs are the same */
-int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
+/* Returns 1 if IPADDRs are the same. */
+/* Deprecated since it is unused. It will be deleted in a later release. */
+int net_ip_compare(IPADDR *ip1, IPADDR *ip2) G_GNUC_DEPRECATED;
 
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
 

From 7b94015f8f3a7f9f9348a57243632a98cb5e2a56 Mon Sep 17 00:00:00 2001
From: Paul Townsend <pt@mindvox.org>
Date: Sat, 14 Oct 2017 17:42:45 +0100
Subject: [PATCH 0656/1650] Changes based on comments in pull #771.

---
 src/core/chatnet-rec.h           | 1 -
 src/irc/core/irc-chatnets.c      | 7 +++++++
 src/irc/core/irc-chatnets.h      | 1 +
 src/irc/core/irc-servers-setup.c | 4 ----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/core/chatnet-rec.h b/src/core/chatnet-rec.h
index 96ef6914..e3ed8aa0 100644
--- a/src/core/chatnet-rec.h
+++ b/src/core/chatnet-rec.h
@@ -4,7 +4,6 @@ int chat_type; /* chat_protocol_lookup(xx) */
 char *name;
 
 char *nick;
-char *alternate_nick;
 char *username;
 char *realname;
 
diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index 0796e0cb..98ce89c3 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -43,6 +43,9 @@ static void sig_chatnet_read(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 	value = config_node_get_str(node, "usermode", NULL);
 	rec->usermode = (value != NULL && *value != '\0') ? g_strdup(value) : NULL;
 
+	value = config_node_get_str(node, "alternate_nick", NULL);
+	rec->alternate_nick = (value != NULL && *value != '\0') ? g_strdup(value) : NULL;
+
 	rec->max_cmds_at_once = config_node_get_int(node, "cmdmax", 0);
 	rec->cmd_queue_speed = config_node_get_int(node, "cmdspeed", 0);
 	rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0);
@@ -65,6 +68,9 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 	if (rec->usermode != NULL)
 		iconfig_node_set_str(node, "usermode", rec->usermode);
 
+	if (rec->alternate_nick != NULL)
+		iconfig_node_set_str(node, "alternate_nick", rec->alternate_nick);
+
 	if (rec->max_cmds_at_once > 0)
 		iconfig_node_set_int(node, "cmdmax", rec->max_cmds_at_once);
 	if (rec->cmd_queue_speed > 0)
@@ -93,6 +99,7 @@ static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec)
 {
 	if (IS_IRC_CHATNET(rec)) {
 		g_free(rec->usermode);
+		g_free(rec->alternate_nick);
 		g_free(rec->sasl_mechanism);
 		g_free(rec->sasl_username);
 		g_free(rec->sasl_password);
diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h
index 2bb10fa9..3fd44472 100644
--- a/src/irc/core/irc-chatnets.h
+++ b/src/irc/core/irc-chatnets.h
@@ -18,6 +18,7 @@ struct _IRC_CHATNET_REC {
 #include "chatnet-rec.h"
 
 	char *usermode;
+	char *alternate_nick;
 
 	char *sasl_mechanism;
 	char *sasl_username;
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index a51ce2e2..bae7d3b4 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -69,10 +69,6 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 		return;
 	g_return_if_fail(IS_IRCNET(ircnet));
 
-	if (ircnet->nick != NULL) {
-		g_free_and_null(conn->nick);
-		conn->nick = g_strdup(ircnet->nick);
-	}
 	if (ircnet->alternate_nick != NULL) {
 		g_free_and_null(conn->alternate_nick);
 		conn->alternate_nick = g_strdup(ircnet->alternate_nick);

From 45dfe2ba3889c5dc23a9bea3214f158cc651a043 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 19 Oct 2017 11:17:56 +0200
Subject: [PATCH 0657/1650] Prevent a OOB read when parsing IRCNet ! channels

Make sure the string has enough data.
Fixes #16
---
 src/irc/core/channel-events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 6cb9b088..b0bddab2 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -37,7 +37,7 @@ static void check_join_failure(IRC_SERVER_REC *server, const char *channel)
 		channel++; /* server didn't understand !channels */
 
 	chanrec = channel_find(SERVER(server), channel);
-	if (chanrec == NULL && channel[0] == '!') {
+	if (chanrec == NULL && channel[0] == '!' && strlen(channel) > 6) {
 		/* it probably replied with the full !channel name,
 		   find the channel with the short name.. */
 		chan2 = g_strdup_printf("!%s", channel+6);

From 9f0dc4766c7aa80e34aa2cde94323fb49971abdf Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 13 Oct 2017 17:54:57 +0200
Subject: [PATCH 0658/1650] fix dcc issue

---
 src/irc/dcc/dcc-chat.c | 21 +++++++++++++++++++++
 src/irc/dcc/dcc-get.c  | 17 +++++++++++++++--
 src/irc/dcc/dcc-send.c | 10 ++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index ca90b8d8..88c577f7 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -66,6 +66,13 @@ CHAT_DCC_REC *dcc_chat_create(IRC_SERVER_REC *server,
         dcc->id = dcc_chat_get_new_id(nick);
 
 	dcc_init_rec(DCC(dcc), server, chat, nick, arg);
+	if (dcc->module_data == NULL) {
+		/* failed to successfully init; TODO: change init_rec API */
+		g_free(dcc->id);
+		g_free(dcc);
+		return NULL;
+	}
+
         return dcc;
 }
 
@@ -471,6 +478,7 @@ static void cmd_dcc_chat(const char *data, IRC_SERVER_REC *server)
 			/* We are accepting a passive DCC CHAT. */
 			dcc_chat_passive(dcc);
 		}
+		cmd_params_free(free_arg);
 		return;
 	}
 
@@ -485,6 +493,11 @@ static void cmd_dcc_chat(const char *data, IRC_SERVER_REC *server)
 		cmd_param_error(CMDERR_NOT_CONNECTED);
 
 	dcc = dcc_chat_create(server, NULL, nick, "chat");
+	if (dcc == NULL) {
+		cmd_params_free(free_arg);
+		g_warn_if_reached();
+		return;
+	}
 
 	if (g_hash_table_lookup(optlist, "passive") == NULL) {
 		/* Standard DCC CHAT... let's listen for incoming connections */
@@ -627,6 +640,9 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
 	}
 	passive = paramcount == 4 && g_strcmp0(params[2], "0") == 0;
 
+	if (nick == NULL)
+		nick = "";
+
 	dcc = DCC_CHAT(dcc_find_request(DCC_CHAT_TYPE, nick, NULL));
 	if (dcc != NULL) {
 		if (dcc_is_listening(dcc)) {
@@ -658,6 +674,11 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
 	}
 
 	dcc = dcc_chat_create(server, chat, nick, params[0]);
+	if (dcc == NULL) {
+		g_strfreev(params);
+		g_warn_if_reached();
+		return;
+	}
 	dcc->target = g_strdup(target);
 	dcc->port = atoi(params[2]);
 
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 107f68fa..cecbb076 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -43,6 +43,12 @@ GET_DCC_REC *dcc_get_create(IRC_SERVER_REC *server, CHAT_DCC_REC *chat,
 	dcc->fhandle = -1;
 
 	dcc_init_rec(DCC(dcc), server, chat, nick, arg);
+	if (dcc->module_data == NULL) {
+		/* failed to successfully init; TODO: change API */
+		g_free(dcc);
+		return NULL;
+	}
+
         return dcc;
 }
 
@@ -430,9 +436,10 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 	int p_id = -1;
 	int passive = FALSE;
 
-	if (addr == NULL) {
+	if (addr == NULL)
 		addr = "";
-	}
+	if (nick == NULL)
+		nick = "";
 
 	/* SEND <file name> <address> <port> <size> [...] */
 	/* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */
@@ -512,6 +519,12 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 		dcc_destroy(DCC(dcc)); /* remove the old DCC */
 
 	dcc = dcc_get_create(server, chat, nick, fname);
+	if (dcc == NULL) {
+		g_free(address);
+		g_free(fname);
+		g_warn_if_reached();
+		return;
+	}
 	dcc->target = g_strdup(target);
 
 	if (passive && port == 0)
diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c
index ca29b9b9..912129b7 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -237,6 +237,12 @@ static SEND_DCC_REC *dcc_send_create(IRC_SERVER_REC *server,
 	dcc->queue = -1;
 
 	dcc_init_rec(DCC(dcc), server, chat, nick, arg);
+	if (dcc->module_data == NULL) {
+		/* failed to successfully init; TODO: change API */
+		g_free(dcc);
+		return NULL;
+	}
+
         return dcc;
 }
 
@@ -417,6 +423,10 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname,
 
 	dcc = dcc_send_create(server, chat, target, str);
 	g_free(str);
+	if (dcc == NULL) {
+		g_warn_if_reached();
+		return FALSE;
+	}
 
 	dcc->handle = handle;
 	dcc->port = port;

From 73d7b9d7753d35c63f24defe6d26c7c06ffa3cce Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 16 Oct 2017 16:21:10 -0400
Subject: [PATCH 0659/1650] Don't proceed with cmd_msg if there was an error
 splitting msg

There may be cases (such as if target or server->nick is very long)
where the split_message function returns NULL, indicating an error. To
avoid a potential segfault, we now check to see if splitmsgs is NULL.
---
 src/core/chat-commands.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index d5a133f8..77f02aa2 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -404,7 +404,10 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		else
 			splitmsgs = singlemsg;
 
-		while ((m = splitmsgs[n++])) {
+		/* splitmsgs may be NULL if there was an error */
+		g_warn_if_fail(splitmsgs != NULL);
+
+		while (splitmsgs && (m = splitmsgs[n++])) {
 			signal_emit("server sendmsg", 4, server, target, m,
 				    GINT_TO_POINTER(target_type));
 			signal_emit(target_type == SEND_TARGET_CHANNEL ?

From beb2beba3b4802c6969a5595197e25e7a5483fa3 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Wed, 18 Oct 2017 14:33:02 -0400
Subject: [PATCH 0660/1650] Revert "Don't proceed with cmd_msg if there was an
 error splitting msg"

This reverts commit bd83852d646de28f2e0fe01efe7c9236aa4074d4.
---
 src/core/chat-commands.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 77f02aa2..d5a133f8 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -404,10 +404,7 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		else
 			splitmsgs = singlemsg;
 
-		/* splitmsgs may be NULL if there was an error */
-		g_warn_if_fail(splitmsgs != NULL);
-
-		while (splitmsgs && (m = splitmsgs[n++])) {
+		while ((m = splitmsgs[n++])) {
 			signal_emit("server sendmsg", 4, server, target, m,
 				    GINT_TO_POINTER(target_type));
 			signal_emit(target_type == SEND_TARGET_CHANNEL ?

From 0840eaec7bf56740029aae614e393f8cf76f6946 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Wed, 18 Oct 2017 14:52:04 -0400
Subject: [PATCH 0661/1650] Make split functions return an array with NULL
 instead of NULL

This avoids undefined behavior in functions that call these split
functions and expect an array back instead of just a NULL pointer.
---
 src/core/recode.c          | 7 ++++++-
 src/irc/core/irc-servers.c | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/core/recode.c b/src/core/recode.c
index d001a46a..d3fc91e7 100644
--- a/src/core/recode.c
+++ b/src/core/recode.c
@@ -198,7 +198,12 @@ char **recode_split(const SERVER_REC *server, const char *str,
 	int n = 0;
 	char **ret;
 
-	g_return_val_if_fail(str != NULL, NULL);
+	g_warn_if_fail(str != NULL);
+	if (str == NULL) {
+		ret = g_new(char *, 1);
+		ret[0] = NULL;
+		return ret;
+	}
 
 	if (settings_get_bool("recode")) {
 		to = find_conversion(server, target);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 3117e345..4eaab712 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -116,11 +116,14 @@ static char **split_line(const SERVER_REC *server, const char *line,
 	 * the code much simpler.  It's worth it.
 	 */
 	len -= strlen(recoded_start) + strlen(recoded_end);
+	g_warn_if_fail(len > 0);
 	if (len <= 0) {
 		/* There is no room for anything. */
 		g_free(recoded_start);
 		g_free(recoded_end);
-		return NULL;
+		lines = g_new(char *, 1);
+		lines[0] = NULL;
+		return lines;
 	}
 
 	lines = recode_split(server, line, target, len, onspace);

From 956bc592a94d5f4cce03f5762f1976d98de637ef Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 21 Oct 2017 22:00:11 -0700
Subject: [PATCH 0662/1650] Fix a typo in the readme

Also uppercase Irssi in a couple places, and escape an argument not
shown due to looking like an HTML tag
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d6577fdf..8d91f4cb 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ think of currently:
    queries when msgs/notices are received or when you send a msg, closing
    queries when it's been idle for some time, etc.
 
- - **Multiserver friendy** - I think Irssi has clearly the best support
+ - **Multiserver friendly** - I think Irssi has clearly the best support
    for handling multiple server connections. You can have as many as you
    want in as many ircnets as you want. Having several connections in one
    server works too, for example when you hit the (ircnet's) 10
@@ -84,7 +84,7 @@ think of currently:
    search command that jumps around in scrollback in GUI-style is still
    missing from Irssi, but there's something that's almost as good as it.
    /LASTLOG always shows timestamps when the line was printed, even if you
-   didn't have timestamps on. Now doing /SB GOTO <timestamp> jumps
+   didn't have timestamps on. Now doing /SB GOTO \<timestamp\> jumps
    directly to the position in scrollback you wanted. Great feature when
    you want to browse a bit of the discussion what happened when someone
    said your name (as seen in awaylog) or topic was changed (/last
@@ -96,9 +96,9 @@ think of currently:
     - `startup-HOWTO.txt` - new users should read this
     - `manual.txt` - manual I started writing but didn't get it very far :)
     - `perl.txt` - Perl scripting help
-    - `formats.txt` - How to use colors, etc. with irssi
+    - `formats.txt` - How to use colors, etc. with Irssi
     - `faq.txt` - Frequently Asked Questions
-    - `special_vars.txt` - some predefined $variables you can use with irssi
+    - `special_vars.txt` - some predefined $variables you can use with Irssi
 
 ## Bugs / Suggestions
 

From 816df6d153e937734bdac258ad6bf43173361451 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 22 Oct 2017 15:38:54 +0200
Subject: [PATCH 0663/1650] Merge tag '1.0.5' into integrate/1.0.5

---
 NEWS | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/NEWS b/NEWS
index feb52275..cc301365 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,23 @@
 v1.1-head 2017-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.0.5 2017-10-23  The Irssi team <staff@irssi.org>
+	- Fix missing -sasl_method '' in /NETWORK (#718, #719).
+	- Fix incorrect restoration of term state when hitting SUSP
+          inside screen (#737, #733).
+	- Fix out of bounds read when compressing colour
+          sequences. Found by Hanno Böck (GL#12, GL!18).
+	- Fix use after free condition during a race condition when
+          waiting on channel sync during a rejoin (GL#13, GL!19).
+	- Fix null pointer dereference when parsing certain malformed
+          CTCP DCC messages (GL#14, GL!20).
+	- Fix crash due to null pointer dereference when failing to
+          split messages due to overlong nick or target (GL#15, GL!21).
+	- Fix out of bounds read when trying to skip a safe channel ID
+          without verifying that the ID is long enough (GL#16, GL!22).
+	- Fix return of random memory when inet_ntop failed (#769).
+	- Minor statusbar help update. By Robert Bisewski (#758,
+          #763).
+
 v1.0.4 2017-07-07  The Irssi team <staff@irssi.org>
 	- Fix null pointer dereference when parsing invalid timestamp (GL#10,
 	  GL!15). Reported by Brian 'geeknik' Carpenter.

From 84fc92635acd4d513049794fdbc574b79ac1c5d5 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Tue, 24 Oct 2017 13:27:11 -0400
Subject: [PATCH 0664/1650] Add event_get_params to fe-fuzz

---
 .gitignore                              |  1 +
 configure.ac                            |  2 +
 src/fe-fuzz/Makefile.am                 |  2 +
 src/fe-fuzz/irc/Makefile.am             |  1 +
 src/fe-fuzz/irc/core/Makefile.am        | 46 +++++++++++++
 src/fe-fuzz/irc/core/event-get-params.c | 86 +++++++++++++++++++++++++
 6 files changed, 138 insertions(+)
 create mode 100644 src/fe-fuzz/irc/Makefile.am
 create mode 100644 src/fe-fuzz/irc/core/Makefile.am
 create mode 100644 src/fe-fuzz/irc/core/event-get-params.c

diff --git a/.gitignore b/.gitignore
index 9af0c4b1..2f761710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ docs/help/in/Makefile.am
 
 src/fe-text/irssi
 src/fe-fuzz/irssi-fuzz
+src/fe-fuzz/irc/core/event-get-params-fuzz
 
 src/fe-common/irc/irc-modules.c
 src/irc/irc.c
diff --git a/configure.ac b/configure.ac
index 9c026c5d..92252672 100644
--- a/configure.ac
+++ b/configure.ac
@@ -648,6 +648,8 @@ src/fe-common/irc/Makefile
 src/fe-common/irc/dcc/Makefile
 src/fe-common/irc/notifylist/Makefile
 src/fe-fuzz/Makefile
+src/fe-fuzz/irc/Makefile
+src/fe-fuzz/irc/core/Makefile
 src/fe-none/Makefile
 src/fe-text/Makefile
 src/lib-config/Makefile
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index c11b3dbb..ae49f3df 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = irc
+
 bin_PROGRAMS = irssi-fuzz
 
 # Force link with CXX for libfuzzer support
diff --git a/src/fe-fuzz/irc/Makefile.am b/src/fe-fuzz/irc/Makefile.am
new file mode 100644
index 00000000..52770885
--- /dev/null
+++ b/src/fe-fuzz/irc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = core
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
new file mode 100644
index 00000000..fa614abb
--- /dev/null
+++ b/src/fe-fuzz/irc/core/Makefile.am
@@ -0,0 +1,46 @@
+bin_PROGRAMS = event-get-params-fuzz
+
+# Force link with CXX for libfuzzer support
+CCLD=$(CXX) $(CXXFLAGS)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core/ \
+	-I$(top_srcdir)/src/irc/core/ \
+	-I$(top_srcdir)/src/fe-common/core/ \
+	$(GLIB_CFLAGS)
+
+AM_DEPENDENCIES = \
+	../../../core/libcore.a \
+	../../../lib-config/libirssi_config.a \
+	../../../irc/libirc.a \
+	../../../irc/core/libirc_core.a \
+	../../../irc/dcc/libirc_dcc.a \
+	../../../irc/flood/libirc_flood.a \
+	../../../irc/notifylist/libirc_notifylist.a \
+	../../../fe-common/core/libfe_common_core.a \
+	../../../fe-common/irc/libfe_common_irc.a \
+	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
+	../../../fe-common/irc/notifylist/libfe_irc_notifylist a
+
+LDADD = \
+	../../../irc/libirc.a \
+	../../../irc/core/libirc_core.a \
+	../../../irc/dcc/libirc_dcc.a \
+	../../../irc/flood/libirc_flood.a \
+	../../../irc/notifylist/libirc_notifylist.a \
+	../../../fe-common/core/libfe_common_core.a \
+	../../../fe-common/irc/libfe_common_irc.a \
+	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
+	../../../fe-common/irc/notifylist/libfe_irc_notifylist.a \
+	../../../core/libcore.a \
+	../../../lib-config/libirssi_config.a \
+	@PROG_LIBS@ \
+	$(FUZZER_LIBS)
+
+event_get_params_fuzz_SOURCES = \
+        event-get-params.c \
+	$(top_srcdir)/src/fe-text/module-formats.c
+
+noinst_HEADERS = \
+	$(top_srcdir)/src/fe-text/module-formats.h
diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
new file mode 100644
index 00000000..89eb89d2
--- /dev/null
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -0,0 +1,86 @@
+/*
+ event-get-params.c : irssi
+
+    Copyright (C) 2017 Joseph Bisch
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "modules-load.h"
+#include "levels.h"
+#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text
+#include "themes.h"
+#include "core.h"
+#include "fe-common-core.h"
+#include "args.h"
+#include "printtext.h"
+#include "irc.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+int LLVMFuzzerInitialize(int *argc, char ***argv) {
+	core_register_options();
+	fe_common_core_register_options();
+	/* no args */
+	args_execute(0, NULL);
+	core_preinit((*argv)[0]);
+	core_init();
+	fe_common_core_init();
+	theme_register(gui_text_formats);
+	module_register("core", "fe-fuzz");
+	return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+	if (size < 1) {
+		return 0;
+	}
+	uint8_t count = *data;
+	char *copy = (char *)malloc(sizeof(char)*(size-1+1));
+	memcpy(copy, data+1, size-1);
+	copy[size-1] = '\0';
+
+	char *output0;
+	char *output1;
+	char *output2;
+	char *output3;
+	char *params;
+	if (count % 8 == 0) {
+		params = event_get_params(copy, 1 | PARAM_FLAG_GETREST, &output0);
+	} else if (count % 8 == 1) {
+		params = event_get_params(copy, 2 | PARAM_FLAG_GETREST, &output0, &output1);
+	} else if (count % 8 == 2) {
+		params = event_get_params(copy, 3 | PARAM_FLAG_GETREST, &output0, &output1, &output2);
+	} else if (count % 8 == 3) {
+		params = event_get_params(copy, 4 | PARAM_FLAG_GETREST, &output0, &output1, &output2, &output3);
+	} else if (count % 8 == 4) {
+		params = event_get_params(copy, 1, &output0);
+	} else if (count % 8 == 5) {
+		params = event_get_params(copy, 2, &output0, &output1);
+	} else if (count % 8 == 6) {
+		params = event_get_params(copy, 3, &output0, &output1, &output2);
+	} else if (count % 8 == 7) {
+		params = event_get_params(copy, 4, &output0, &output1, &output2, &output3);
+	} else {
+		params = event_get_params(copy, 4, &output0, &output1, &output2, &output3);
+	}
+	g_free(params);
+	free(copy);
+	return 0;
+}

From 87550541e745627cc78507ce573d68b8453959c9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 24 Oct 2017 22:04:13 +0200
Subject: [PATCH 0665/1650] fix key length checker to actually do some work

---
 autogen.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 60eb4fb8..a9e354c9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,20 +29,6 @@ cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr
 files=`echo $files|sed 's/\.in//g'`
 cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
 
-# .html -> .txt with lynx or elinks
-echo "Documentation: html -> txt..."
-if type lynx >/dev/null 2>&1 ; then
-  LC_ALL=en_IE.utf8 lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
-elif type elinks >/dev/null 2>&1 ; then
-  elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
-elif type links >/dev/null 2>&1 ; then
-  links -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
-else
-  echo "**Error**: No lynx or elinks present"
-  echo "Install lynx or elinks, then run autogen.sh again"
-  exit 1
-fi
-
 if test x$NOCONFIGURE = x && test -z "$*"; then
   echo "**Warning**: I am going to run \`configure' with no arguments."
   echo "If you wish to pass any to it, please specify them on the"
@@ -65,4 +51,4 @@ else
 fi
 
 # make sure perl hashes have correct length
-find src/perl -name *.c -o -name *.xs | xargs grep -n hv_store | perl -ne 'if (/"(\w+)",\s*(\d+)/) { print unless $2 == length $1 }'
+find src/perl -name '*.c' -o -name '*.xs' -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }'

From 245bd5579cc680e8eeba4769da87bccb8a4d0de3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 24 Oct 2017 22:12:34 +0200
Subject: [PATCH 0666/1650] remove lynx from autogen and make a separate
 syncdocs script

---
 .gitignore              |   1 -
 docs/Makefile.am        |   3 +-
 docs/faq.html           |   4 +-
 docs/faq.txt            | 124 +++++++
 docs/startup-HOWTO.html | 512 ++++++++++++++------------
 docs/startup-HOWTO.txt  | 797 ++++++++++++++++++++++++++++++++++++++++
 syncdocs.sh             | 101 +++++
 7 files changed, 1295 insertions(+), 247 deletions(-)
 create mode 100644 docs/faq.txt
 create mode 100644 docs/startup-HOWTO.txt
 create mode 100755 syncdocs.sh

diff --git a/.gitignore b/.gitignore
index 9af0c4b1..efc579cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ config.status
 configure
 default-config.h
 default-theme.h
-faq.txt
 irssi-config
 irssi-config.h
 irssi-config.h.in
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 32722391..8998ffb4 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -11,7 +11,8 @@ doc_DATA = \
 	perl.txt \
 	signals.txt \
 	special_vars.txt \
-	startup-HOWTO.html
+	startup-HOWTO.html \
+	startup-HOWTO.txt
 
 EXTRA_DIST = $(doc_DATA) $(man_MANS)
 
diff --git a/docs/faq.html b/docs/faq.html
index 345060dc..70e90bb5 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1,4 +1,6 @@
+<base href='https://irssi.org/documentation/faq/'>
 <h1>Frequently Asked Questions</h1>
+
 <h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
 
 <p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
@@ -77,4 +79,4 @@
 
 <h3 id="q-how-to-pronounce-irssi">Q: How to pronounce Irssi?</h3>
 
-<p>A: Check <a href="https://irssi.org/assets/irssi.wav">here</a></p>
+<p>A: Check <a href="/assets/irssi.wav">here</a></p>
\ No newline at end of file
diff --git a/docs/faq.txt b/docs/faq.txt
new file mode 100644
index 00000000..719fbb9a
--- /dev/null
+++ b/docs/faq.txt
@@ -0,0 +1,124 @@
+   Frequently Asked Questions
+
+Q: Why doesn’t irssi display colors even when ircii etc. displays them?
+A: They force ANSI colors even if terminal doesn’t support them. By default,
+   irssi uses colors only if terminfo/termcap so says. The correct way to fix this
+   would be to change your TERM environment to a value where colors work, like
+   xterm-color or color_xterm (eg. TERM=xterm-color irssi). If this doesn’t help,
+   then use the evil way of /SET term_force_colors ON.
+
+Q: How do I easily write text to channel that starts with ‘/’ character?
+A: / /text
+
+Q: Why doesn’t irssi update my realname (or whatever) after I change it with /
+   SET realname and reconnect with /RECONNECT or /SERVER?
+A: Irssi is trying to be too smart. This will be fixed in future, but for now
+   you should use /DISCONNECT and /CONNECT.
+
+Q: I connected to some server which isn’t responding but now irssi tries to
+   connect back to it all the time! How can I stop it?
+A: Two ways. The “good way” to do it is with /DISCONNECT. Check the server tags
+   first with /SERVER without giving it any parameters, reconnections are those
+   that have tag starting with “recon” text. So most probably you’re going to do /
+   DISCONNECT recon-1. The other way is to remove all the reconnections with /
+   RMRECONNS, easier but may remove some connections you actually wanted to
+   reconnect (if you used multiple servers..).
+
+Q: How do I add seconds to timestamp?
+A: /FORMAT timestamp {timestamp %%H:%%M:%%S} - and remember to add the trailing
+   space :)
+
+Q: Why does irssi say “Irssi: Channel not fully synchronized yet, try again
+   after a while” when I try to use /BAN etc?
+A: Possibly a bug in irssi, or ircd you’re using does something that irssi
+   didn’t really notice. The new code should make this happen far less often than
+   before, but one known reason for this is when irssi doesn’t notice that you
+   were unable to join some channel. Currently however I don’t know of any such
+   events irssi doesn’t know about.
+
+   Anyway, if this does happen, do /RAWLOG SAVE ~/rawlog soon after joining to
+   channel, and either try to figure out yourself why irssi didn’t get reply to
+   WHO request, or open a Github issue with the full log included. Note that the
+   rawlog is by default only 200 lines and it may not be enough to show all needed
+   information, so you might want to do /SET rawlog_lines 1000 or so.
+
+   MODE +b still works fine though.
+
+Q: Where’s the GUI version?
+A: There was one on [1]irssi-import/xirssi but it has not been maintained for a
+   long time.
+
+Q: How do I autorejoin channels after being kicked?
+A: That’s evil and you shouldn’t do it. If you get kicked, you should stay out,
+   at least until the channel forgot you existed :) Most channels I’ve joined just
+   ban you if you autorejoin after kick. If you’re joined to channels who kick
+   people for fun, try changing channels or something.
+
+   Anyway, if you REALLY want to do that, and you understand that you’re doing
+   evilness, you can use the autorejoin.pl script that comes with irssi. You’ll
+   still need to specify the channels you wish to rejoin with /SET
+   autorejoin_channels #chan1 #chan2 ...
+
+Q: How do I announce that I’m away/back in all channels I’ve joined? Or how do
+   I change my nick when setting myself away/back?
+A: That’s even worse than autorejoin. Who could possibly care every time you
+   come and go? Many channels will kick you for using this, and I for example have
+   added several ignores so I’d never need to see these messages. Learn to use /
+   AWAY command properly and tell its existence to people who don’t know about it.
+   /WII yournick shows your away reason much better for people who actually want
+   to know if you’re there or not.
+
+Q: Why does irssi autojoin on invite by default?
+A: The setting is /SET join_auto_chans_on_invite - it’s not the same as regular
+   autojoin-on-invite, which irssi doesn’t even have. The only channels that are
+   joined on invite, are the ones you’ve added to config with /CHANNEL ADD -auto.
+   This is very useful with +i channels when you need to first send an invite
+   request to bot, or if you get accidentally kicked from channel, the kicker can
+   invite you back immediately.
+
+   I don’t see any bad side effects with this feature, so it’s ON by default. I
+   guess someone could start kicking/inviting you all the time but server
+   connection shouldn’t drop because of that, and you shouldn’t join channels
+   whose operators are that evil.
+
+Q: How to make UTF-8 support work with irssi?
+A: Make sure your terminal supports UTF-8 (for example, xterm -u8). If you use
+   screen, you may have to do screen -U. And in Irssi do /SET term_charset utf-8.
+   (for 0.8.9 and older: /SET term_type utf-8)
+
+Q: Will there be /DETACH-like feature?
+A: [2]tmux, [3]screen and [4]dtach can be used to do it just fine.
+
+Q: How do I run scripts automatically at startup?
+A: Put them into ~/.irssi/scripts/autorun/ directory. Or better would be if you
+   placed them in ~/.irssi/scripts/ and created symlinks to autorun directory (eg.
+   cd ~/.irssi/scripts/autorun/ ; ln -s ../script.pl .)
+
+Q: How do I execute commands automatically at startup?
+A: Put them into ~/.irssi/startup file, each command on its own line. The
+   preceding slash (/) is not necessary.
+
+Q: How do I easily edit existing topic?
+A: /TOPIC <tab>
+
+Q: How can I have /WHOIS replies to active window?
+A: You can disable the status window, or do /WINDOW LEVEL -CRAP in it which
+   would also make several other messages show up in active window. You can also
+   use a [5]script.
+
+Q: How do I add the active network to the statusbar
+A: Modify the window-line in statusbar section in config file to window = "{sb
+   $winref:$tag/$T{sbmode $M}}";
+
+Q: How to pronounce Irssi?
+A: Check [6]here
+
+
+   References:
+
+   [1] https://github.com/irssi-import/xirssi
+   [2] http://tmux.github.io/
+   [3] http://www.gnu.org/software/screen/screen.html
+   [4] http://dtach.sf.net/
+   [5] http://dgl.cx/irssi/hack-whois-in-current-window.pl
+   [6] https://irssi.org/assets/irssi.wav
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 07a9f47c..aaf9e5fe 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -1,4 +1,6 @@
-                    <h1>Startup How-To</h1>
+<base href='https://irssi.org/documentation/startup/'>
+<h1>Startup How-To</h1>
+
 <h3 id="to-new-irssi-users-not-to-new-irc-users-">To new Irssi users (not to new IRC users ..)</h3>
 
 <p>Copyright (c) 2000-2002 by Timo Sirainen, release under <a href="http://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1 license.</p>
@@ -6,11 +8,7 @@
 <p>Index with some FAQ questions that are answered in the chapter:</p>
 
 <ol>
-  <li><a href="#for-all-the-ircii-people">For all the ircII people</a>
-    <ul>
-      <li>This window management is just weird, I want it exactly like ircII</li>
-    </ul>
-  </li>
+  <li><a href="#first-steps">First steps</a></li>
   <li><a href="#basic-user-interface-usage">Basic user interface usage</a>
     <ul>
       <li>Split windows work in weird way</li>
@@ -50,7 +48,11 @@
     </ul>
   </li>
   <li><a href="#proxies-and-irc-bouncers">Proxies and IRC bouncers</a></li>
-  <li><a href="#irssis-settings">Irssi’s settings</a></li>
+  <li><a href="#irssis-settings">Irssi’s settings</a>
+    <ul>
+      <li><a href="#for-all-the-ircii-people">For all the ircII people</a></li>
+    </ul>
+  </li>
   <li><a href="#statusbar">Statusbar</a>
     <ul>
       <li>I loaded a statusbar script but it’s not visible anywhere!</li>
@@ -58,169 +60,176 @@
   </li>
 </ol>
 
-<h2 id="for-all-the-ircii-people">1. For all the ircII people</h2>
+<h2 id="first-steps">1. First steps</h2>
 
-<p>These settings should give you pretty good defaults (the ones I use):</p>
+<p>IRC Networks are made of servers, and servers have channels. The default config has a few predefined networks, to list them:</p>
 
-<p>If colors don’t work, and you know you’re not going to use some weird non-VT compatible terminal (you most probably aren’t), just say:</p>
+<div><div><pre><code>/NETWORK LIST
+</code></pre></div></div>
 
-<pre><code> /SET term_force_colors ON
-</code></pre>
+<p>And to connect to one of those networks and join a channel:</p>
 
-<p>I don’t like automatic query windows, I don’t like status window, I do like msgs window where all messages go:</p>
+<div><div><pre><code>/CONNECT Freenode
+/JOIN #irssi
+</code></pre></div></div>
 
-<pre><code> /SET autocreate_own_query OFF
- /SET autocreate_query_level DCCMSGS
- /SET use_status_window OFF
- /SET use_msgs_window ON
-</code></pre>
+<p>To add more networks:</p>
 
-<p>Disable automatic window closing when <code>/PART</code>ing channel or <code>/UNQUERY</code>ing query:</p>
+<div><div><pre><code>/NETWORK ADD ExampleNet
+</code></pre></div></div>
 
-<pre><code> /SET autoclose_windows OFF
- /SET reuse_unused_windows ON
-</code></pre>
+<p>Then add some servers (with -auto to automatically connect):</p>
 
-<p>Here’s the settings that make irssi work exactly like ircII in window management (send me a note if you can think of more):</p>
+<div><div><pre><code>/SERVER ADD -auto -network ExampleNet irc.example.net
+</code></pre></div></div>
 
-<pre><code> /SET autocreate_own_query OFF
- /SET autocreate_query_level NONE
- /SET use_status_window OFF
- /SET use_msgs_window OFF
- /SET reuse_unused_windows ON
- /SET windows_auto_renumber OFF
+<p>Automatically join to channels after connected to server:</p>
 
- /SET autostick_split_windows OFF
- /SET autoclose_windows OFF
- /SET print_active_channel ON
-</code></pre>
+<div><div><pre><code>/CHANNEL ADD -auto #lounge ExampleNet
+</code></pre></div></div>
 
-<p>And example how to add servers:</p>
+<p>To modify existing networks (or servers, or channels) just ADD again using the same name as before. This configures a network to identify with nickserv and wait for 2 seconds before joining channels:</p>
 
-<p>(OFTC network, identify with nickserv and wait for 2 seconds before joining channels)</p>
+<div><div><pre><code>/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" ExampleNet
+</code></pre></div></div>
 
-<pre><code> /NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
-</code></pre>
+<p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<p>(NOTE: use /IRCNET with 0.8.9 and older)</p>
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+</code></pre></div></div>
 
-<p>Then add some servers to different networks (network is already set up for them), irc.kpnqwest.fi is used by default for IRCNet but if it fails, irc.funet.fi is tried next:</p>
+<p>These commands have many more options, see their help for details:</p>
 
-<pre><code> /SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
- /SERVER ADD -network IRCnet irc.funet.fi 6667
- /SERVER ADD -auto -network efnet efnet.cs.hut.fi 6667
-</code></pre>
-
-<p>Automatically join to channels after connected to server, send op request to bot after joined to efnet/#irssi:</p>
-
-<pre><code> /CHANNEL ADD -auto #irssi IRCnet
- /CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
-</code></pre>
+<div><div><pre><code>/HELP NETWORK
+/HELP SERVER
+/HELP CHANNEL
+/HELP
+</code></pre></div></div>
 
 <p>If you want lines containing your nick to hilight:</p>
 
-<pre><code> /HILIGHT nick
-</code></pre>
+<div><div><pre><code>/HILIGHT nick
+</code></pre></div></div>
+
+<p>Or, for irssi 0.8.18 or higher:</p>
+
+<div><div><pre><code>/SET hilight_nick_matches_everywhere ON
+</code></pre></div></div>
+
+<p>To get beeps on private messages or highlights:</p>
+
+<div><div><pre><code>/SET beep_msg_level MSGS HILIGHT DCCMSGS
+</code></pre></div></div>
+
+<p>No other irssi settings are needed (don’t enable bell_beeps), but there may be settings to change in your terminal multiplexer (screen/tmux), your terminal, or your desktop environment.</p>
 
 <h2 id="basic-user-interface-usage">2. Basic user interface usage</h2>
 
 <p>Windows can be scrolled up/down with PgUp and PgDown keys. If they don’t work for you, use Meta-p and Meta-n keys. For jumping to beginning or end of the buffer, use <code>/SB HOME</code> and <code>/SB END</code> commands.</p>
 
-<p>By default, irssi uses “hidden windows” for everything. Hidden window is created every time you <code>/JOIN</code> a channel or <code>/QUERY</code> someone. There’s several ways you can change between these windows:</p>
+<p>By default, irssi uses “hidden windows” for everything. Hidden windows are created every time you <code>/JOIN</code> a channel or <code>/QUERY</code> someone. There’s several ways you can change between these windows:</p>
 
-<pre><code> Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
- Meta-q .. Meta-o          - Jump directly between windows 11-19
- /WINDOW &lt;number&gt;          - Jump to any window with specified number
- Ctrl-P, Ctrl-N            - Jump to previous / next window
-</code></pre>
+<div><div><pre><code>Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
+Meta-q .. Meta-o          - Jump directly between windows 11-19
+/WINDOW &lt;number&gt;          - Jump to any window with specified number
+Ctrl-P, Ctrl-N            - Jump to previous / next window
+</code></pre></div></div>
 
-<p>Clearly the easiest way is to use Meta-number keys. And what is the Meta key? ESC key always works as Meta, but there’s also easier ways. ALT could work as Meta, or if you have Windows keyboard, left Windows key might work as Meta. If they don’t work directly, you’ll need to set a few X resources (NOTE: these work with both xterm and rxvt):</p>
+<p>Clearly the easiest way is to use Meta-number keys. Meta usually means the ALT key, but if that doesn’t work, you can use ESC.</p>
 
-<pre><code> XTerm*eightBitInput:   false
+<p>Mac OS X users with ALT key issues might prefer using <a href="https://www.iterm2.com/">iTerm2</a> instead of the default terminal emulator.</p>
+
+<h3 id="alt-key-as-meta-for-xtermrxvt-users">Alt key as meta, for xterm/rxvt users</h3>
+
+<p>If you use xterm or rxvt, you may need to set a few X resources:</p>
+
+<div><div><pre><code> XTerm*eightBitInput:   false
  XTerm*metaSendsEscape: true
-</code></pre>
+</code></pre></div></div>
 
 <p>With rxvt, you can also specify which key acts as Meta key. So if you want to use ALT instead of Windows key for it, use:</p>
 
-<pre><code> rxvt*modifier: alt
-</code></pre>
+<div><div><pre><code> rxvt*modifier: alt
+</code></pre></div></div>
 
 <p>You could do this by changing the X key mappings:</p>
 
-<pre><code> xmodmap -e "keysym Alt_L = Meta_L Alt_L"
-</code></pre>
+<div><div><pre><code> xmodmap -e "keysym Alt_L = Meta_L Alt_L"
+</code></pre></div></div>
 
 <p>And how exactly do you set these X resources? For Debian, there’s <code>/etc/X11/Xresources/xterm</code> file where you can put them and it’s read automatically when X starts. <code>~/.Xresources</code> and <code>~/.Xdefaults</code> files might also work. If you can’t get anything else to work, just copy and paste those lines to <code>~/.Xresources</code> and directly call <code>xrdb -merge ~/.Xresources</code> in some xterm. The resources affect only the new xterms you start, not existing ones.</p>
 
-<p>Many windows SSH clients also don’t allow usage of ALT. One excellent client that does allow is putty, you can download it from <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/"> http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>.</p>
+<h3 id="split-windows-and-window-items">Split windows and window items</h3>
+
+<p><em>Note: <a href="http://quadpoint.org/articles/irssisplit/">this guide</a> might be a better introduction to window splits</em></p>
 
 <p>Irssi also supports split windows, they’ve had some problems in past but I think they should work pretty well now :) Here’s some commands related to them:</p>
 
-<pre><code> /WINDOW NEW                    - Create new split window
- /WINDOW NEW HIDE               - Create new hidden window
- /WINDOW CLOSE                  - Close split or hidden window
+<div><div><pre><code>/WINDOW NEW                    - Create new split window
+/WINDOW NEW HIDE               - Create new hidden window
+/WINDOW CLOSE                  - Close split or hidden window
 
- /WINDOW HIDE [&lt;number&gt;|&lt;name&gt;] - Make the split window hidden window
- /WINDOW SHOW &lt;number&gt;|&lt;name&gt;   - Make the hidden window a split window
+/WINDOW HIDE [&lt;number&gt;|&lt;name&gt;] - Make the split window hidden window
+/WINDOW SHOW &lt;number&gt;|&lt;name&gt;   - Make the hidden window a split window
 
- /WINDOW SHRINK [&lt;lines&gt;]       - Shrink the split window
- /WINDOW GROW [&lt;lines&gt;]         - Grow the split window
- /WINDOW BALANCE                - Balance the sizes of all split windows
-</code></pre>
+/WINDOW SHRINK [&lt;lines&gt;]       - Shrink the split window
+/WINDOW GROW [&lt;lines&gt;]         - Grow the split window
+/WINDOW BALANCE                - Balance the sizes of all split windows
+</code></pre></div></div>
 
 <p>By default, irssi uses “sticky windowing” for split windows. This means that windows created inside one split window cannot be moved to another split window without some effort. For example you could have following window layout:</p>
 
-<pre><code> Split window 1: win#1 - Status window, win#2 - Messages window
+<div><div><pre><code> Split window 1: win#1 - Status window, win#2 - Messages window
  Split window 2: win#3 - IRCnet/#channel1, win#4 - IRCnet/#channel2
  Split window 3: win#5 - efnet/#channel1, win#6 - efnet/#channel2
-</code></pre>
+</code></pre></div></div>
 
 <p>When you are in win#1 and press ALT-6, irssi jumps to split window #3 and moves the efnet/#channel2 the active window.</p>
 
 <p>With non-sticky windowing the windows don’t have any relationship with split windows, pressing ALT-6 in win#1 moves win#6 to split window 1 and sets it active, except if win#6 was already visible in some other split window irssi just changes to that split window. This it the way windows work with ircii, if you prefer it you can set it with</p>
 
-<pre><code> /SET autostick_split_windows OFF
-</code></pre>
+<div><div><pre><code>/SET autostick_split_windows OFF
+</code></pre></div></div>
 
 <p>Each window can have multiple channels, queries and other “window items” inside them. If you don’t like windows at all, you disable automatic creating of them with</p>
 
-<pre><code> /SET autocreate_windows OFF
-</code></pre>
+<div><div><pre><code>/SET autocreate_windows OFF
+</code></pre></div></div>
 
 <p>And if you keep all channels in one window, you most probably want the channel name printed in each line:</p>
 
-<pre><code> /SET print_active_channel ON
-</code></pre>
+<div><div><pre><code>/SET print_active_channel ON
+</code></pre></div></div>
 
 <p>If you want to group only some channels or queries in one window, use</p>
 
-<pre><code> /JOIN -window #channel
- /QUERY -window nick
-</code></pre>
+<div><div><pre><code>/JOIN -window #channel
+/QUERY -window nick
+</code></pre></div></div>
 
 <h2 id="server-and-channel-automation">3. Server and channel automation</h2>
 
 <p>Irssi’s multiple IRC network support is IMHO very good - at least compared to other clients :) Even if you’re only in one IRC network you should group all your servers to be in the same IRC network as this helps with reconnecting if your primary server breaks and is probably useful in some other ways too :) For information how to actually use irssi correctly with multiple servers see the chapter 6.</p>
 
-<p>First you need to have your IRC network set, use <code>/NETWORK</code> command to see if it’s already there. If it isn’t, use <code>/NETWORK ADD yournetwork</code>. If you want to execute some commands automatically when you’re connected to some network, use <code>-autosendcmd</code> option. (NOTE: use /IRCNET with 0.8.9 and older.) Here’s some examples:</p>
+<p>First you need to have your IRC network set, use <code>/NETWORK</code> command to see if it’s already there. If it isn’t, use <code>/NETWORK ADD yournetwork</code>. If you want to execute some commands automatically when you’re connected to some network, use <code>-autosendcmd</code> option. Here’s some examples:</p>
 
-<pre><code> /NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
- /NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
-</code></pre>
+<div><div><pre><code>/NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
+/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
+</code></pre></div></div>
 
 <p>After that you need to add your servers. For example:</p>
 
-<pre><code> /SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
- /SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
-</code></pre>
+<div><div><pre><code>/SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
+/SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
+</code></pre></div></div>
 
 <p>The <code>-auto</code> option specifies that this server is automatically connected at startup. You don’t need to make more than one server with <code>-auto</code> option to one IRC network, other servers are automatically connected in same network if the <code>-auto</code> server fails.</p>
 
 <p>And finally channels:</p>
 
-<pre><code> /CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
- /CHANNEL ADD -auto #secret IRCnet password
-</code></pre>
+<div><div><pre><code>/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+/CHANNEL ADD -auto #secret IRCnet password
+</code></pre></div></div>
 
 <p><code>-bots</code> and <code>-botcmd</code> should be the only ones needing a bit of explaining. They’re used to send commands automatically to bot when channel is joined, usually to get ops automatically. You can specify multiple bot masks with <code>-bots</code> option separated with spaces (and remember to quote the string then). The $0 in <code>-botcmd</code> specifies the first found bot in the list. If you don’t need the bot masks (ie. the bot is always with the same nick, like chanserv) you can give only the <code>-botcmd</code> option and the command is always sent.</p>
 
@@ -228,9 +237,9 @@
 
 <p>First connect to all the servers, join the channels and create the queries you want. If you want to move the windows or channels around use commands:</p>
 
-<pre><code> /WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
- /WINDOW ITEM MOVE &lt;number&gt;|&lt;name&gt; - move channel/query to another window
-</code></pre>
+<div><div><pre><code>/WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
+/WINDOW ITEM MOVE &lt;number&gt;|&lt;name&gt; - move channel/query to another window
+</code></pre></div></div>
 
 <p>When everything looks the way you like, use <code>/LAYOUT SAVE</code> command (and <code>/SAVE</code>, if you don’t have autosaving enabled) and when you start irssi next time, irssi remembers the positions of the channels, queries and everything. This “remembering” doesn’t mean that simply using <code>/LAYOUT SAVE</code> would automatically make irssi reconnect to all servers and join all channels, you’ll need the <code>/SERVER ADD -auto</code> and <code>/CHANNEL ADD -auto</code> commands to do that.</p>
 
@@ -240,32 +249,32 @@
 
 <p>By default, all the “extra messages” go to status window. This means pretty much all messages that don’t clearly belong to some channel or query. Some people like it, some don’t. If you want to remove it, use</p>
 
-<pre><code> /SET use_status_window OFF
-</code></pre>
+<div><div><pre><code>/SET use_status_window OFF
+</code></pre></div></div>
 
 <p>This doesn’t have any effect until you restart irssi. If you want to remove it immediately, just <code>/WINDOW CLOSE</code> it.</p>
 
 <p>Another common window is “messages window”, where all private messages go. By default it’s disabled and query windows are created instead. To make all private messages go to msgs window, say:</p>
 
-<pre><code> /SET use_msgs_window ON
- /SET autocreate_query_level DCCMSGS  (or if you don't want queries to
+<div><div><pre><code>/SET use_msgs_window ON
+/SET autocreate_query_level DCCMSGS  (or if you don't want queries to
  				      dcc chats either, say NONE)
-</code></pre>
+</code></pre></div></div>
 
 <p>use_msgs_window either doesn’t have any effect until restarting irssi. To create it immediately say:</p>
 
-<pre><code> /WINDOW NEW HIDE     - create the window
- /WINDOW NAME (msgs)  - name it to "(msgs)"
- /WINDOW LEVEL MSGS   - make all private messages go to this window
- /WINDOW MOVE 1       - move it to first window
-</code></pre>
+<div><div><pre><code>/WINDOW NEW HIDE     - create the window
+/WINDOW NAME (msgs)  - name it to "(msgs)"
+/WINDOW LEVEL MSGS   - make all private messages go to this window
+/WINDOW MOVE 1       - move it to first window
+</code></pre></div></div>
 
 <p>Note that neither use_msgs_window nor use_status_window have any effect at all if <code>/LAYOUT SAVE</code> has been used.</p>
 
 <p>This brings us to message levels.. What are they? All messages that irssi prints have one or more “message levels”. Most common are PUBLIC for public messages in channels, MSGS for private messages and CRAP for all sorts of messages with no real classification. You can get a whole list of levels with</p>
 
-<pre><code> /HELP levels
-</code></pre>
+<div><div><pre><code>/HELP levels
+</code></pre></div></div>
 
 <p>Status window has message level <code>ALL -MSGS</code>, meaning that all messages, except private messages, without more specific place go to status window. The <code>-MSGS</code> is there so it doesn’t conflict with messages window.</p>
 
@@ -273,15 +282,15 @@
 
 <p>ircii and several other clients support multiple servers by placing the connection into some window. IRSSI DOES NOT. There is no required relationship between window and server. You can connect to 10 servers and manage them all in just one window, or join channel in each one of them to one single window if you really want to. That being said, here’s how you do connect to new server without closing the old connection:</p>
 
-<pre><code> /CONNECT irc.server.org
-</code></pre>
+<div><div><pre><code>/CONNECT irc.server.org
+</code></pre></div></div>
 
 <p>Instead of the <code>/SERVER</code> which disconnects the existing connection. To see list of all active connections, use <code>/SERVER</code> without any parameters. You should see a list of something like:</p>
 
-<pre><code> -!- IRCNet: irc.song.fi:6667 (IRCNet)
+<div><div><pre><code> -!- IRCNet: irc.song.fi:6667 (IRCNet)
  -!- OFTC: irc.oftc.net:6667 (OFTC)
  -!- RECON-1: 192.168.0.1:6667 () (02:59 left before reconnecting)
-</code></pre>
+</code></pre></div></div>
 
 <p>Here you see that we’re connected to IRCNet and OFTC networks. The IRCNet at the beginning is called the “server tag” while the (IRCnet) at the end shows the IRC network. Server tag specifies unique tag to refer to the server, usually it’s the same as the IRC network. When the IRC network isn’t known it’s some part of the server name. When there’s multiple connections to same IRC network or server, irssi adds a number after the tag so there could be network, network2, network3 etc.</p>
 
@@ -289,63 +298,63 @@
 
 <p>To disconnect one of the servers, or to stop irssi from reconnecting, use</p>
 
-<pre><code> /DISCONNECT network   - disconnect server with tag "network"
- /DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
- /RMRECONNS           - stop all server reconnections
+<div><div><pre><code>/DISCONNECT network   - disconnect server with tag "network"
+/DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
+/RMRECONNS           - stop all server reconnections
 
- /RECONNECT recon-1   - immediately try reconnecting back to RECON-1
- /RECONNECT ALL       - immediately try reconnecting back to all
+/RECONNECT recon-1   - immediately try reconnecting back to RECON-1
+/RECONNECT ALL       - immediately try reconnecting back to all
  		       servers in reconnection queue
-</code></pre>
+</code></pre></div></div>
 
 <p>Now that you’re connected to all your servers, you’ll have to know how to specify which one of them you want to use. One way is to have an empty window, like status or msgs window. In it, you can specify which server to set active with</p>
 
-<pre><code> /WINDOW SERVER tag    - set server "tag" active
- Ctrl-X                - set the next server in list active
-</code></pre>
+<div><div><pre><code>/WINDOW SERVER tag    - set server "tag" active
+Ctrl-X                - set the next server in list active
+</code></pre></div></div>
 
 <p>When the server is active, you can use it normally. When there’s multiple connected servers, irssi adds [servertag] prefix to all messages in non-channel/query messages so you’ll know where it came from.</p>
 
 <p>Several commands also accept <code>-servertag</code> option to specify which server it should use:</p>
 
-<pre><code> /MSG -tag nick message
- /JOIN -tag #channel
- /QUERY -tag nick
-</code></pre>
+<div><div><pre><code>/MSG -tag nick message
+/JOIN -tag #channel
+/QUERY -tag nick
+</code></pre></div></div>
 
 <p><code>/MSG</code> tab completion also automatically adds the <code>-tag</code> option when nick isn’t in active server.</p>
 
 <p>Window’s server can be made sticky. When sticky, it will never automatically change to anything else, and if server gets disconnected, the window won’t have any active server. When the server gets connected again, it is automatically set active in the window. To set the window’s server sticky use</p>
 
-<pre><code> /WINDOW SERVER -sticky tag
-</code></pre>
+<div><div><pre><code>/WINDOW SERVER -sticky tag
+</code></pre></div></div>
 
 <p>This is useful if you wish to have multiple status or msgs windows, one for each server. Here’s how to do them (repeat for each server)</p>
 
-<pre><code> /WINDOW NEW HIDE
- /WINDOW NAME (status)
- /WINDOW LEVEL ALL -MSGS
- /WINDOW SERVER -sticky network
+<div><div><pre><code>/WINDOW NEW HIDE
+/WINDOW NAME (status)
+/WINDOW LEVEL ALL -MSGS
+/WINDOW SERVER -sticky network
 
- /WINDOW NEW HIDE
- /WINDOW NAME (msgs)
- /WINDOW LEVEL MSGS
- /WINDOW SERVER -sticky network
-</code></pre>
+/WINDOW NEW HIDE
+/WINDOW NAME (msgs)
+/WINDOW LEVEL MSGS
+/WINDOW SERVER -sticky network
+</code></pre></div></div>
 
 <h2 id="lastlog-and-jumping-around-in-scrollback">7. /LASTLOG and jumping around in scrollback</h2>
 
 <p><code>/LASTLOG</code> command can be used for searching texts in scrollback buffer. Simplest usages are</p>
 
-<pre><code> /LASTLOG word     - print all lines with "word" in them
- /LASTLOG word 10  - print last 10 occurances of "word"
- /LASTLOG -topics  - print all topic changes
-</code></pre>
+<div><div><pre><code>/LASTLOG word     - print all lines with "word" in them
+/LASTLOG word 10  - print last 10 occurances of "word"
+/LASTLOG -topics  - print all topic changes
+</code></pre></div></div>
 
 <p>If there’s more than 1000 lines to be printed, irssi thinks that you probably made some mistake and won’t print them without <code>-force</code> option. If you want to save the full lastlog to file, use</p>
 
-<pre><code> /LASTLOG -file ~/irc.log
-</code></pre>
+<div><div><pre><code>/LASTLOG -file ~/irc.log
+</code></pre></div></div>
 
 <p>With <code>-file</code> option you don’t need <code>-force</code> even if there’s more than 1000 lines. <code>/LASTLOG</code> has a lot of other options too, see <code>/HELP lastlog</code> for details.</p>
 
@@ -355,29 +364,29 @@
 
 <p>Irssi can automatically log important messages when you’re set away (<code>/AWAY reason</code>). When you set yourself unaway (<code>/AWAY</code>), the new messages in away log are printed to screen. You can configure it with:</p>
 
-<pre><code> /SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
- /SET awaylog_file ~/.irssi/away.log - Specifies the file to use
-</code></pre>
+<div><div><pre><code>/SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
+/SET awaylog_file ~/.irssi/away.log - Specifies the file to use
+</code></pre></div></div>
 
 <p>Easiest way to start logging with Irssi is to use autologging. With it Irssi logs all channels and private messages to specified directory. You can turn it on with</p>
 
-<pre><code> /SET autolog ON
-</code></pre>
+<div><div><pre><code>/SET autolog ON
+</code></pre></div></div>
 
 <p>By default it logs pretty much everything execept CTCPS or CRAP (<code>/WHOIS</code> requests, etc). You can specify the logging level yourself with</p>
 
-<pre><code> /SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
-</code></pre>
+<div><div><pre><code>/SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
+</code></pre></div></div>
 
 <p>By default irssi logs to ~/irclogs/<servertag>/<target>.log. You can change this with</target></servertag></p>
 
-<pre><code> /SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
-</code></pre>
+<div><div><pre><code>/SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
+</code></pre></div></div>
 
 <p>The path is automatically created if it doesn’t exist. $0 specifies the target (channel/nick). You can make irssi automatically rotate the logs by adding date/time formats to the file name. The formats are in “man strftime” format. For example</p>
 
-<pre><code> /SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
-</code></pre>
+<div><div><pre><code>/SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
+</code></pre></div></div>
 
 <p>For logging only some specific channels or nicks, see <code>/HELP log</code></p>
 
@@ -387,16 +396,16 @@
 
 <p><code>/HELP bind</code> tells pretty much everything there is to know about keyboard bindings. However, there’s the problem of how to bind some non-standard keys. They might differ a bit with each terminal, so you’ll need to find out what exactly the keypress produces. Easiest way to check that would be to see what it prints in <code>cat</code>. Here’s an example for pressing F1 key:</p>
 
-<pre><code> [cras@hurina] ~% cat
+<div><div><pre><code> [user@host] ~% cat
  ^[OP
-</code></pre>
+</code></pre></div></div>
 
 <p>So in irssi you would use <code>/BIND ^[OP /ECHO F1 pressed</code>. If you use multiple terminals which have different bindings for the key, it would be better to use eg.:</p>
 
-<pre><code> /BIND ^[OP key F1
- /BIND ^[11~ key F1
- /BIND F1 /ECHO F1 pressed.
-</code></pre>
+<div><div><pre><code>/BIND ^[OP key F1
+/BIND ^[11~ key F1
+/BIND F1 /ECHO F1 pressed.
+</code></pre></div></div>
 
 <h2 id="proxies-and-irc-bouncers">10. Proxies and IRC bouncers</h2>
 
@@ -404,20 +413,20 @@
 
 <p>Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:</p>
 
-<pre><code> /SET use_proxy ON
- /SET proxy_address irc.bouncer.org
- /SET proxy_port 5000
+<div><div><pre><code>/SET use_proxy ON
+/SET proxy_address irc.bouncer.org
+/SET proxy_port 5000
 
- /SET proxy_password YOUR_BNC_PASSWORD_HERE
- /SET -clear proxy_string
- /SET proxy_string_after conn %s %d
-</code></pre>
+/SET proxy_password YOUR_BNC_PASSWORD_HERE
+/SET -clear proxy_string
+/SET proxy_string_after conn %s %d
+</code></pre></div></div>
 
 <p>Then you’ll need to add the server connections. These are done exactly as if you’d want to connect directly to them. Nothing special about them:</p>
 
-<pre><code> /SERVER ADD -auto -network dalnet irc.dal.net
- /SERVER ADD -auto -network efnet irc.efnet.org
-</code></pre>
+<div><div><pre><code>/SERVER ADD -auto -network dalnet irc.dal.net
+/SERVER ADD -auto -network efnet irc.efnet.org
+</code></pre></div></div>
 
 <p>With the proxy <code>/SET</code>s however, irssi now connects to those servers through your BNC. All server connections are made through them so you can just forget that your bouncer even exists.</p>
 
@@ -427,36 +436,36 @@
 
 <p>All proxies have these settings in common:</p>
 
-<pre><code> /SET use_proxy ON
- /SET proxy_address &lt;Proxy host address&gt;
- /SET proxy_port &lt;Proxy port&gt;
-</code></pre>
+<div><div><pre><code>/SET use_proxy ON
+/SET proxy_address &lt;Proxy host address&gt;
+/SET proxy_port &lt;Proxy port&gt;
+</code></pre></div></div>
 
 <p><strong>HTTP proxy</strong></p>
 
 <p>Use these settings with HTTP proxies:</p>
 
-<pre><code> /SET -clear proxy_password
- /EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
-</code></pre>
+<div><div><pre><code>/SET -clear proxy_password
+/EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
+</code></pre></div></div>
 
 <p><strong>BNC</strong></p>
 
-<pre><code> /SET proxy_password your_pass
- /SET -clear proxy_string
- /SET proxy_string_after conn %s %d
-</code></pre>
+<div><div><pre><code>/SET proxy_password your_pass
+/SET -clear proxy_string
+/SET proxy_string_after conn %s %d
+</code></pre></div></div>
 
 <p><strong>dircproxy</strong></p>
 
 <p>dircproxy separates the server connections by passwords. So, if you for example have network connection with password ircpass and OFTC connection with oftcpass, you would do something like this:</p>
 
-<pre><code> /SET -clear proxy_password
- /SET -clear proxy_string
+<div><div><pre><code>/SET -clear proxy_password
+/SET -clear proxy_string
 
- /SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
- /SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-</code></pre>
+/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+</code></pre></div></div>
 
 <p>The server name and port you give isn’t used anywhere, so you can put anything you want in there.</p>
 
@@ -464,19 +473,17 @@
 
 <p>psyBNC has internal support for multiple servers. However, it could be a bit annoying to use, and some people just use different users for connecting to different servers. You can manage this in a bit same way as with dircproxy, by creating fake connections:</p>
 
-<pre><code> /SET -clear proxy_password
- /SET -clear proxy_string
+<div><div><pre><code>/SET -clear proxy_password
+/SET -clear proxy_string
 
- /NETWORK ADD -user networkuser IRCnet
- /SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
- /NETWORK ADD -user oftcuser OFTC
- /SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-</code></pre>
+/NETWORK ADD -user networkuser IRCnet
+/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+/NETWORK ADD -user oftcuser OFTC
+/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+</code></pre></div></div>
 
 <p>So, you’ll specify the usernames with <code>/NETWORK ADD</code> command, and the user’s password with <code>/SERVER ADD</code>.</p>
 
-<p>(NOTE: use /IRCNET with 0.8.9 and older.)</p>
-
 <p><strong>Irssi proxy</strong></p>
 
 <p>Irssi contains it’s own proxy which you can build giving <code>\--with-proxy</code> option to configure. You’ll still need to run irssi in a screen to use it though.</p>
@@ -487,65 +494,52 @@
 
 <p>Usage in proxy side:</p>
 
-<pre><code> /LOAD proxy
- /SET irssiproxy_password &lt;password&gt;
- /SET irssiproxy_ports &lt;network&gt;=&lt;port&gt; ... (eg. IRCnet=2777 efnet=2778)
-</code></pre>
+<div><div><pre><code>/LOAD proxy
+/SET irssiproxy_password &lt;password&gt;
+/SET irssiproxy_ports &lt;network&gt;=&lt;port&gt; ... (eg. IRCnet=2777 efnet=2778)
+</code></pre></div></div>
 
 <p><strong>NOTE</strong>: you <strong>MUST</strong> add all the servers you are using to server and network lists with <code>/SERVER ADD</code> and <code>/NETWORK ADD</code>. ..Except if you really don’t want to for some reason, and you only use one server connection, you may simply set:</p>
 
-<pre><code> /SET irssiproxy_ports *=2777
-</code></pre>
-
-<p>The special network name <code>?</code> allows the client to select the
-network dynamically on connect (see below):</p>
-
-<pre>
-/SET irssiproxy_ports ?=2777
-</pre>
+<div><div><pre><code>/SET irssiproxy_ports *=2777
+</code></pre></div></div>
 
 <p>Usage in client side:</p>
 
 <p>Just connect to the irssi proxy like it is a normal server with password specified in <code>/SET irssiproxy_password</code>. For example:</p>
 
-<pre><code> /SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
- /SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
-</code></pre>
-
-<p>Or, if you used <code>?</code> in <code>irssiproxy_ports</code>:</p>
-
-<pre>
-/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 IRCnet:secret
-/SERVER ADD -network efnet my.irssi-proxy.org 2777 efnet:secret
-</pre>
-
-<p>I.e. the network to connect to is specified as part of the password,
-separated by <code>:</code> from the actual proxy password.</p>
+<div><div><pre><code>/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
+/SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
+</code></pre></div></div>
 
 <p>Irssi proxy works fine with other IRC clients as well.</p>
 
 <p><strong>SOCKS</strong></p>
 
-<p>Irssi can be compiled with socks support (<code>\--with-socks</code> option to configure), but I don’t really know how it works, if at all. <code>/SET proxy</code> settings don’t have anything to do with socks however.</p>
+<p>Irssi can be compiled with socks support (<code>\--with-socks</code> option to configure), which requires “dante” and routes all connections through the proxy specified in the system-wide /etc/socks.conf. This method is known to have issues in Mac OS X.</p>
+
+<p>Note that <code>/SET proxy</code> settings don’t have anything to do with socks.</p>
+
+<p>Using <a href="https://github.com/rofl0r/proxychains-ng">proxychains-ng</a> is recommended over recompiling irssi.</p>
 
 <p><strong>Others</strong></p>
 
 <p>IRC bouncers usually work like IRC servers, and want a password. You can give it with:</p>
 
-<pre><code> /SET proxy_password &lt;password&gt;
-</code></pre>
+<div><div><pre><code>/SET proxy_password &lt;password&gt;
+</code></pre></div></div>
 
 <p>Irssi’s defaults for connect strings are</p>
 
-<pre><code> /SET proxy_string CONNECT %s %d
- /SET proxy_string_after
-</code></pre>
+<div><div><pre><code>/SET proxy_string CONNECT %s %d
+/SET proxy_string_after
+</code></pre></div></div>
 
 <p>The proxy_string is sent before NICK/USER commands, the proxy_string_after is sent after them. %s and %d can be used with both of them.</p>
 
 <h2 id="irssis-settings">11. Irssi’s settings</h2>
 
-<p>You probably don’t like Irssi’s default settings. I don’t like them. But I’m still convinced that they’re pretty good defaults. Here’s some of them you might want to change (the default value is shown): Also check the <a href="/documentation/settings/">Settings Documentation</a></p>
+<p>Here’s some settings you might want to change (the default value is shown): Also check the <a href="/documentation/settings/">Settings Documentation</a></p>
 
 <p><strong>Queries</strong></p>
 
@@ -633,31 +627,61 @@ separated by <code>:</code> from the actual proxy password.</p>
   <dd>Completion character to use.</dd>
 </dl>
 
+<h3 id="for-all-the-ircii-people">For all the ircII people</h3>
+
+<p>I don’t like automatic query windows, I don’t like status window, I do like msgs window where all messages go:</p>
+
+<div><div><pre><code>/SET autocreate_own_query OFF
+/SET autocreate_query_level DCCMSGS
+/SET use_status_window OFF
+/SET use_msgs_window ON
+</code></pre></div></div>
+
+<p>Disable automatic window closing when <code>/PART</code>ing channel or <code>/UNQUERY</code>ing query:</p>
+
+<div><div><pre><code>/SET autoclose_windows OFF
+/SET reuse_unused_windows ON
+</code></pre></div></div>
+
+<p>Here’s the settings that make irssi work exactly like ircII in window management (send me a note if you can think of more):</p>
+
+<div><div><pre><code>/SET autocreate_own_query OFF
+/SET autocreate_query_level NONE
+/SET use_status_window OFF
+/SET use_msgs_window OFF
+/SET reuse_unused_windows ON
+/SET windows_auto_renumber OFF
+
+/SET autostick_split_windows OFF
+/SET autoclose_windows OFF
+/SET print_active_channel ON
+</code></pre></div></div>
+
 <h2 id="statusbar">12. Statusbar</h2>
 
-<p><code>/STATUSBAR</code> displays a list of statusbars:</p>
+<p><code>/STATUSBAR</code> displays a list of the current statusbars, along with their position and visibility:</p>
 
-<pre><code> Name                           Type   Placement Position Visible
+<div><div><pre><code> Name                           Type   Placement Position Visible
  window                         window bottom    0        always
  window_inact                   window bottom    1        inactive
  prompt                         root   bottom    100      always
  topic                          root   top       1        always
-</code></pre>
+</code></pre></div></div>
 
-<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings and it’s items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to it’s default settings, or if the statusbar was created by you, it will be removed.</p>
+<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings (type, placement, position, visibility) as well as its items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to its default settings, or if the statusbar was created by you, it will be removed.</p>
 
-<p>Type can be window or root, meaning if the statusbar should be created for each split window, or just once. Placement can be top or bottom. Position is a number, the higher the value the lower in screen it is. Visible can be always, active or inactive. Active/inactive is useful only with split windows, one split window is active and the rest are inactive. These settings can be changed with:</p>
+<p>The statusbar type can be either window or root. If the type is window, then a statusbar will be created for each split window, otherwise it will be created only once. Placement can be top or bottom, which refers to the top or bottom of the screen. Position is a number, the higher the value the lower it will appear in-screen. Visible can be always, active or inactive. Active/inactive is useful only with split windows; one split window is active and the rest are inactive. To adjust these settings, the following commands are available:</p>
 
-<pre><code> /STATUSBAR &lt;name&gt; TYPE window|root
- /STATUSBAR &lt;name&gt; PLACEMENT top|bottom
- /STATUSBAR &lt;name&gt; POSITION &lt;num&gt;
- /STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
-</code></pre>
+<div><div><pre><code>/STATUSBAR &lt;name&gt; TYPE window|root
+/STATUSBAR &lt;name&gt; PLACEMENT top|bottom
+/STATUSBAR &lt;name&gt; POSITION &lt;num&gt;
+/STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
+</code></pre></div></div>
 
-<p>When loading a new statusbar scripts, you’ll need to also specify where you want to show it. Statusbar items can be modified with:</p>
+<p>Statusbar items can also be added or removed via command. Note that when loading new statusbar scripts that add items, you will need to specify where you want to show the item and how it is aligned. This can be accomplished using the below commands:</p>
 
-<pre><code> /STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
- /STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
-</code></pre>
+<div><div><pre><code>/STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
+/STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
+</code></pre></div></div>
 
-<p>The item name with statusbar scripts is usually same as the script’s name. Script’s documentation should tell if this isn’t the case. So, to add mail.pl before the window activity item (see the list with <code>/STATUSBAR</code> window), use: <code>/STATUSBAR window ADD -before act mail</code>.</p>
+<p>For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: <code>/STATUSBAR window ADD -before act mail</code>.</p>
\ No newline at end of file
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
new file mode 100644
index 00000000..23d7cf94
--- /dev/null
+++ b/docs/startup-HOWTO.txt
@@ -0,0 +1,797 @@
+Startup How-To
+
+To new Irssi users (not to new IRC users ..)
+
+Copyright (c) 2000-2002 by Timo Sirainen, release under [1]GNU FDL 1.1 license.
+
+Index with some FAQ questions that are answered in the chapter:
+
+ 1. First steps
+ 2. Basic user interface usage
+      □ Split windows work in weird way
+      □ How can I easily switch between windows?
+      □ But alt-1 etc. don’t work!
+ 3. Server and channel automation
+      □ How do I automatically connect to servers at startup?
+      □ How do I automatically join to channels at startup?
+      □ How do I automatically send commands to server at connect?
+ 4. Setting up windows and automatically restoring them at startup
+ 5. Status and msgs windows & message levels
+      □ I want /WHOIS to print reply to current window
+      □ I want all messages to go to one window, not create new windows
+ 6. How support for multiple servers works in irssi
+      □ I connected to some server that doesn’t respond and now irssi keeps
+        trying to reconnect to it again and again, how can I stop it??
+      □ I want to have own status and/or msgs window for each servers
+ 7. /LASTLOG and jumping around in scrollback
+      □ How can I save all texts in a window to file?
+ 8. Logging
+ 9. Changing keyboard bindings
+      □ How do I make F1 key do something?
+10. Proxies and IRC bouncers
+11. Irssi’s settings
+      □ For all the ircII people
+12. Statusbar
+      □ I loaded a statusbar script but it’s not visible anywhere!
+
+1. First steps
+
+IRC Networks are made of servers, and servers have channels. The default config
+has a few predefined networks, to list them:
+
+/NETWORK LIST
+
+And to connect to one of those networks and join a channel:
+
+/CONNECT Freenode
+/JOIN #irssi
+
+To add more networks:
+
+/NETWORK ADD ExampleNet
+
+Then add some servers (with -auto to automatically connect):
+
+/SERVER ADD -auto -network ExampleNet irc.example.net
+
+Automatically join to channels after connected to server:
+
+/CHANNEL ADD -auto #lounge ExampleNet
+
+To modify existing networks (or servers, or channels) just ADD again using the
+same name as before. This configures a network to identify with nickserv and
+wait for 2 seconds before joining channels:
+
+/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" ExampleNet
+
+If you have irssi 0.8.18 or higher and the irc network supports it, you can use
+SASL instead of nickserv, which is more reliable:
+
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+
+These commands have many more options, see their help for details:
+
+/HELP NETWORK
+/HELP SERVER
+/HELP CHANNEL
+/HELP
+
+If you want lines containing your nick to hilight:
+
+/HILIGHT nick
+
+Or, for irssi 0.8.18 or higher:
+
+/SET hilight_nick_matches_everywhere ON
+
+To get beeps on private messages or highlights:
+
+/SET beep_msg_level MSGS HILIGHT DCCMSGS
+
+No other irssi settings are needed (don’t enable bell_beeps), but there may be
+settings to change in your terminal multiplexer (screen/tmux), your terminal,
+or your desktop environment.
+
+2. Basic user interface usage
+
+Windows can be scrolled up/down with PgUp and PgDown keys. If they don’t work
+for you, use Meta-p and Meta-n keys. For jumping to beginning or end of the
+buffer, use /SB HOME and /SB END commands.
+
+By default, irssi uses “hidden windows” for everything. Hidden windows are
+created every time you /JOIN a channel or /QUERY someone. There’s several ways
+you can change between these windows:
+
+Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
+Meta-q .. Meta-o          - Jump directly between windows 11-19
+/WINDOW <number>          - Jump to any window with specified number
+Ctrl-P, Ctrl-N            - Jump to previous / next window
+
+Clearly the easiest way is to use Meta-number keys. Meta usually means the ALT
+key, but if that doesn’t work, you can use ESC.
+
+Mac OS X users with ALT key issues might prefer using [2]iTerm2 instead of the
+default terminal emulator.
+
+Alt key as meta, for xterm/rxvt users
+
+If you use xterm or rxvt, you may need to set a few X resources:
+
+ XTerm*eightBitInput:   false
+ XTerm*metaSendsEscape: true
+
+With rxvt, you can also specify which key acts as Meta key. So if you want to
+use ALT instead of Windows key for it, use:
+
+ rxvt*modifier: alt
+
+You could do this by changing the X key mappings:
+
+ xmodmap -e "keysym Alt_L = Meta_L Alt_L"
+
+And how exactly do you set these X resources? For Debian, there’s /etc/X11/
+Xresources/xterm file where you can put them and it’s read automatically when X
+starts. ~/.Xresources and ~/.Xdefaults files might also work. If you can’t get
+anything else to work, just copy and paste those lines to ~/.Xresources and
+directly call xrdb -merge ~/.Xresources in some xterm. The resources affect
+only the new xterms you start, not existing ones.
+
+Split windows and window items
+
+Note: [3]this guide might be a better introduction to window splits
+
+Irssi also supports split windows, they’ve had some problems in past but I
+think they should work pretty well now :) Here’s some commands related to them:
+
+/WINDOW NEW                    - Create new split window
+/WINDOW NEW HIDE               - Create new hidden window
+/WINDOW CLOSE                  - Close split or hidden window
+
+/WINDOW HIDE [<number>|<name>] - Make the split window hidden window
+/WINDOW SHOW <number>|<name>   - Make the hidden window a split window
+
+/WINDOW SHRINK [<lines>]       - Shrink the split window
+/WINDOW GROW [<lines>]         - Grow the split window
+/WINDOW BALANCE                - Balance the sizes of all split windows
+
+By default, irssi uses “sticky windowing” for split windows. This means that
+windows created inside one split window cannot be moved to another split window
+without some effort. For example you could have following window layout:
+
+ Split window 1: win#1 - Status window, win#2 - Messages window
+ Split window 2: win#3 - IRCnet/#channel1, win#4 - IRCnet/#channel2
+ Split window 3: win#5 - efnet/#channel1, win#6 - efnet/#channel2
+
+When you are in win#1 and press ALT-6, irssi jumps to split window #3 and moves
+the efnet/#channel2 the active window.
+
+With non-sticky windowing the windows don’t have any relationship with split
+windows, pressing ALT-6 in win#1 moves win#6 to split window 1 and sets it
+active, except if win#6 was already visible in some other split window irssi
+just changes to that split window. This it the way windows work with ircii, if
+you prefer it you can set it with
+
+/SET autostick_split_windows OFF
+
+Each window can have multiple channels, queries and other “window items” inside
+them. If you don’t like windows at all, you disable automatic creating of them
+with
+
+/SET autocreate_windows OFF
+
+And if you keep all channels in one window, you most probably want the channel
+name printed in each line:
+
+/SET print_active_channel ON
+
+If you want to group only some channels or queries in one window, use
+
+/JOIN -window #channel
+/QUERY -window nick
+
+3. Server and channel automation
+
+Irssi’s multiple IRC network support is IMHO very good - at least compared to
+other clients :) Even if you’re only in one IRC network you should group all
+your servers to be in the same IRC network as this helps with reconnecting if
+your primary server breaks and is probably useful in some other ways too :) For
+information how to actually use irssi correctly with multiple servers see the
+chapter 6.
+
+First you need to have your IRC network set, use /NETWORK command to see if
+it’s already there. If it isn’t, use /NETWORK ADD yournetwork. If you want to
+execute some commands automatically when you’re connected to some network, use
+-autosendcmd option. Here’s some examples:
+
+/NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
+/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
+
+After that you need to add your servers. For example:
+
+/SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
+/SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
+
+The -auto option specifies that this server is automatically connected at
+startup. You don’t need to make more than one server with -auto option to one
+IRC network, other servers are automatically connected in same network if the
+-auto server fails.
+
+And finally channels:
+
+/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+/CHANNEL ADD -auto #secret IRCnet password
+
+-bots and -botcmd should be the only ones needing a bit of explaining. They’re
+used to send commands automatically to bot when channel is joined, usually to
+get ops automatically. You can specify multiple bot masks with -bots option
+separated with spaces (and remember to quote the string then). The $0 in
+-botcmd specifies the first found bot in the list. If you don’t need the bot
+masks (ie. the bot is always with the same nick, like chanserv) you can give
+only the -botcmd option and the command is always sent.
+
+4. Setting up windows and automatically restoring them at startup
+
+First connect to all the servers, join the channels and create the queries you
+want. If you want to move the windows or channels around use commands:
+
+/WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
+/WINDOW ITEM MOVE <number>|<name> - move channel/query to another window
+
+When everything looks the way you like, use /LAYOUT SAVE command (and /SAVE, if
+you don’t have autosaving enabled) and when you start irssi next time, irssi
+remembers the positions of the channels, queries and everything. This
+“remembering” doesn’t mean that simply using /LAYOUT SAVE would automatically
+make irssi reconnect to all servers and join all channels, you’ll need the /
+SERVER ADD -auto and /CHANNEL ADD -auto commands to do that.
+
+If you want to change the layout, you just rearrange the layout like you want
+it and use /LAYOUT SAVE again. If you want to remove the layout for some
+reason, use /LAYOUT RESET.
+
+5. Status and msgs windows & message levels
+
+By default, all the “extra messages” go to status window. This means pretty
+much all messages that don’t clearly belong to some channel or query. Some
+people like it, some don’t. If you want to remove it, use
+
+/SET use_status_window OFF
+
+This doesn’t have any effect until you restart irssi. If you want to remove it
+immediately, just /WINDOW CLOSE it.
+
+Another common window is “messages window”, where all private messages go. By
+default it’s disabled and query windows are created instead. To make all
+private messages go to msgs window, say:
+
+/SET use_msgs_window ON
+/SET autocreate_query_level DCCMSGS  (or if you don't want queries to
+                                      dcc chats either, say NONE)
+
+use_msgs_window either doesn’t have any effect until restarting irssi. To
+create it immediately say:
+
+/WINDOW NEW HIDE     - create the window
+/WINDOW NAME (msgs)  - name it to "(msgs)"
+/WINDOW LEVEL MSGS   - make all private messages go to this window
+/WINDOW MOVE 1       - move it to first window
+
+Note that neither use_msgs_window nor use_status_window have any effect at all
+if /LAYOUT SAVE has been used.
+
+This brings us to message levels.. What are they? All messages that irssi
+prints have one or more “message levels”. Most common are PUBLIC for public
+messages in channels, MSGS for private messages and CRAP for all sorts of
+messages with no real classification. You can get a whole list of levels with
+
+/HELP levels
+
+Status window has message level ALL -MSGS, meaning that all messages, except
+private messages, without more specific place go to status window. The -MSGS is
+there so it doesn’t conflict with messages window.
+
+6. How support for multiple servers works in irssi
+
+ircii and several other clients support multiple servers by placing the
+connection into some window. IRSSI DOES NOT. There is no required relationship
+between window and server. You can connect to 10 servers and manage them all in
+just one window, or join channel in each one of them to one single window if
+you really want to. That being said, here’s how you do connect to new server
+without closing the old connection:
+
+/CONNECT irc.server.org
+
+Instead of the /SERVER which disconnects the existing connection. To see list
+of all active connections, use /SERVER without any parameters. You should see a
+list of something like:
+
+ -!- IRCNet: irc.song.fi:6667 (IRCNet)
+ -!- OFTC: irc.oftc.net:6667 (OFTC)
+ -!- RECON-1: 192.168.0.1:6667 () (02:59 left before reconnecting)
+
+Here you see that we’re connected to IRCNet and OFTC networks. The IRCNet at
+the beginning is called the “server tag” while the (IRCnet) at the end shows
+the IRC network. Server tag specifies unique tag to refer to the server,
+usually it’s the same as the IRC network. When the IRC network isn’t known it’s
+some part of the server name. When there’s multiple connections to same IRC
+network or server, irssi adds a number after the tag so there could be network,
+network2, network3 etc.
+
+Server tags beginning with RECON- mean server reconnections. Above we see that
+connection to server at 192.168.0.1 wasn’t successful and irssi will try to
+connect it again in 3 minutes.
+
+To disconnect one of the servers, or to stop irssi from reconnecting, use
+
+/DISCONNECT network   - disconnect server with tag "network"
+/DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
+/RMRECONNS           - stop all server reconnections
+
+/RECONNECT recon-1   - immediately try reconnecting back to RECON-1
+/RECONNECT ALL       - immediately try reconnecting back to all
+                       servers in reconnection queue
+
+Now that you’re connected to all your servers, you’ll have to know how to
+specify which one of them you want to use. One way is to have an empty window,
+like status or msgs window. In it, you can specify which server to set active
+with
+
+/WINDOW SERVER tag    - set server "tag" active
+Ctrl-X                - set the next server in list active
+
+When the server is active, you can use it normally. When there’s multiple
+connected servers, irssi adds [servertag] prefix to all messages in non-channel
+/query messages so you’ll know where it came from.
+
+Several commands also accept -servertag option to specify which server it
+should use:
+
+/MSG -tag nick message
+/JOIN -tag #channel
+/QUERY -tag nick
+
+/MSG tab completion also automatically adds the -tag option when nick isn’t in
+active server.
+
+Window’s server can be made sticky. When sticky, it will never automatically
+change to anything else, and if server gets disconnected, the window won’t have
+any active server. When the server gets connected again, it is automatically
+set active in the window. To set the window’s server sticky use
+
+/WINDOW SERVER -sticky tag
+
+This is useful if you wish to have multiple status or msgs windows, one for
+each server. Here’s how to do them (repeat for each server)
+
+/WINDOW NEW HIDE
+/WINDOW NAME (status)
+/WINDOW LEVEL ALL -MSGS
+/WINDOW SERVER -sticky network
+
+/WINDOW NEW HIDE
+/WINDOW NAME (msgs)
+/WINDOW LEVEL MSGS
+/WINDOW SERVER -sticky network
+
+7. /LASTLOG and jumping around in scrollback
+
+/LASTLOG command can be used for searching texts in scrollback buffer. Simplest
+usages are
+
+/LASTLOG word     - print all lines with "word" in them
+/LASTLOG word 10  - print last 10 occurances of "word"
+/LASTLOG -topics  - print all topic changes
+
+If there’s more than 1000 lines to be printed, irssi thinks that you probably
+made some mistake and won’t print them without -force option. If you want to
+save the full lastlog to file, use
+
+/LASTLOG -file ~/irc.log
+
+With -file option you don’t need -force even if there’s more than 1000 lines. /
+LASTLOG has a lot of other options too, see /HELP lastlog for details.
+
+Once you’ve found the lines you were interested in, you might want to check the
+discussion around them. Irssi has /SCROLLBACK (or alias /SB) command for
+jumping around in scrollback buffer. Since /LASTLOG prints the timestamp when
+the message was originally printed, you can use /SB GOTO hh:mm to jump directly
+there. To get back to the bottom of scrollback, use /SB END command.
+
+8. Logging
+
+Irssi can automatically log important messages when you’re set away (/AWAY
+reason). When you set yourself unaway (/AWAY), the new messages in away log are
+printed to screen. You can configure it with:
+
+/SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
+/SET awaylog_file ~/.irssi/away.log - Specifies the file to use
+
+Easiest way to start logging with Irssi is to use autologging. With it Irssi
+logs all channels and private messages to specified directory. You can turn it
+on with
+
+/SET autolog ON
+
+By default it logs pretty much everything execept CTCPS or CRAP (/WHOIS
+requests, etc). You can specify the logging level yourself with
+
+/SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
+
+By default irssi logs to ~/irclogs//.log. You can change this with
+
+/SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
+
+The path is automatically created if it doesn’t exist. $0 specifies the target
+(channel/nick). You can make irssi automatically rotate the logs by adding date
+/time formats to the file name. The formats are in “man strftime” format. For
+example
+
+/SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
+
+For logging only some specific channels or nicks, see /HELP log
+
+9. Changing keyboard bindings
+
+You can change any keyboard binding that terminal lets irssi know about. It
+doesn’t let irssi know everything, so for example shift-backspace can’t be
+bound unless you modify xterm resources somehow.
+
+/HELP bind tells pretty much everything there is to know about keyboard
+bindings. However, there’s the problem of how to bind some non-standard keys.
+They might differ a bit with each terminal, so you’ll need to find out what
+exactly the keypress produces. Easiest way to check that would be to see what
+it prints in cat. Here’s an example for pressing F1 key:
+
+ [user@host] ~% cat
+ ^[OP
+
+So in irssi you would use /BIND ^[OP /ECHO F1 pressed. If you use multiple
+terminals which have different bindings for the key, it would be better to use
+eg.:
+
+/BIND ^[OP key F1
+/BIND ^[11~ key F1
+/BIND F1 /ECHO F1 pressed.
+
+10. Proxies and IRC bouncers
+
+Irssi supports connecting to IRC servers via a proxy. All server connections
+are then made through it, and if you’ve set up everything properly, you don’t
+need to do any /QUOTE SERVER commands manually.
+
+Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening
+in irc.bouncer.org port 5000. You want to use it to connect to servers
+irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:
+
+/SET use_proxy ON
+/SET proxy_address irc.bouncer.org
+/SET proxy_port 5000
+
+/SET proxy_password YOUR_BNC_PASSWORD_HERE
+/SET -clear proxy_string
+/SET proxy_string_after conn %s %d
+
+Then you’ll need to add the server connections. These are done exactly as if
+you’d want to connect directly to them. Nothing special about them:
+
+/SERVER ADD -auto -network dalnet irc.dal.net
+/SERVER ADD -auto -network efnet irc.efnet.org
+
+With the proxy /SETs however, irssi now connects to those servers through your
+BNC. All server connections are made through them so you can just forget that
+your bouncer even exists.
+
+If you don’t want to use the proxy for some reason, there’s -noproxy option
+which you can give to /SERVER and /SERVER ADD commands.
+
+Proxy specific settings:
+
+All proxies have these settings in common:
+
+/SET use_proxy ON
+/SET proxy_address <Proxy host address>
+/SET proxy_port <Proxy port>
+
+HTTP proxy
+
+Use these settings with HTTP proxies:
+
+/SET -clear proxy_password
+/EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
+
+BNC
+
+/SET proxy_password your_pass
+/SET -clear proxy_string
+/SET proxy_string_after conn %s %d
+
+dircproxy
+
+dircproxy separates the server connections by passwords. So, if you for example
+have network connection with password ircpass and OFTC connection with
+oftcpass, you would do something like this:
+
+/SET -clear proxy_password
+/SET -clear proxy_string
+
+/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+
+The server name and port you give isn’t used anywhere, so you can put anything
+you want in there.
+
+psyBNC
+
+psyBNC has internal support for multiple servers. However, it could be a bit
+annoying to use, and some people just use different users for connecting to
+different servers. You can manage this in a bit same way as with dircproxy, by
+creating fake connections:
+
+/SET -clear proxy_password
+/SET -clear proxy_string
+
+/NETWORK ADD -user networkuser IRCnet
+/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+/NETWORK ADD -user oftcuser OFTC
+/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+
+So, you’ll specify the usernames with /NETWORK ADD command, and the user’s
+password with /SERVER ADD.
+
+Irssi proxy
+
+Irssi contains it’s own proxy which you can build giving \--with-proxy option
+to configure. You’ll still need to run irssi in a screen to use it though.
+
+Irssi proxy is a bit different than most proxies, normally proxies create a new
+connection to IRC server when you connect to it, but irssi proxy shares your
+existing IRC connection(s) to multiple clients. And even more clearly: You can
+use only one IRC server connection to IRC with as many clients as you want. Can
+anyone figure out even more easier ways to say this, so I wouldn’t need to try
+to explain this thing for minutes every time? :)
+
+Irssi proxy supports sharing multiple server connections in different ports,
+like you can share network in port 2777 and efnet in port 2778.
+
+Usage in proxy side:
+
+/LOAD proxy
+/SET irssiproxy_password <password>
+/SET irssiproxy_ports <network>=<port> ... (eg. IRCnet=2777 efnet=2778)
+
+NOTE: you MUST add all the servers you are using to server and network lists
+with /SERVER ADD and /NETWORK ADD. ..Except if you really don’t want to for
+some reason, and you only use one server connection, you may simply set:
+
+/SET irssiproxy_ports *=2777
+
+Usage in client side:
+
+Just connect to the irssi proxy like it is a normal server with password
+specified in /SET irssiproxy_password. For example:
+
+/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
+/SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
+
+Irssi proxy works fine with other IRC clients as well.
+
+SOCKS
+
+Irssi can be compiled with socks support (\--with-socks option to configure),
+which requires “dante” and routes all connections through the proxy specified
+in the system-wide /etc/socks.conf. This method is known to have issues in Mac
+OS X.
+
+Note that /SET proxy settings don’t have anything to do with socks.
+
+Using [4]proxychains-ng is recommended over recompiling irssi.
+
+Others
+
+IRC bouncers usually work like IRC servers, and want a password. You can give
+it with:
+
+/SET proxy_password <password>
+
+Irssi’s defaults for connect strings are
+
+/SET proxy_string CONNECT %s %d
+/SET proxy_string_after
+
+The proxy_string is sent before NICK/USER commands, the proxy_string_after is
+sent after them. %s and %d can be used with both of them.
+
+11. Irssi’s settings
+
+Here’s some settings you might want to change (the default value is shown):
+Also check the [5]Settings Documentation
+
+Queries
+
+/SET autocreate_own_query ON
+    Should new query window be created when you send message to someone (with /
+    MSG).
+/SET autocreate_query_level MSGS
+    New query window should be created when receiving messages with this level.
+    MSGS, DCCMSGS and NOTICES levels work currently. You can disable this with
+    /SET -clear autocreate_query_level.
+/SET autoclose_query 0
+    Query windows can be automatically closed after certain time of inactivity.
+    Queries with unread messages aren’t closed and active window is neither
+    never closed. The value is given in seconds.
+
+Windows
+
+/SET use_msgs_window OFF
+    Create messages window at startup. All private messages go to this window.
+    This only makes sense if you’ve disabled automatic query windows. Message
+    window can also be created manually with /WINDOW LEVEL MSGS, /WINDOW NAME
+    (msgs).
+/SET use_status_window ON
+    Create status window at startup. All messages that don’t really have better
+    place go here, like all /WHOIS replies etc. Status window can also be
+    created manually with /WINDOW LEVEL ALL -MSGS, /WINDOW NAME (status).
+/SET autocreate_windows ON
+    Should we create new windows for new window items or just place everything
+    in one window
+/SET autoclose_windows ON
+    Should window be automatically closed when the last item in them is removed
+    (ie. /PART, /UNQUERY).
+/SET reuse_unused_windows OFF
+    When finding where to place new window item (channel, query) Irssi first
+    tries to use already existing empty windows. If this is set ON, new window
+    will always be created for all window items. This setting is ignored if
+    autoclose_windows is set ON.
+/SET window_auto_change OFF
+    Should Irssi automatically change to automatically created windows -
+    usually queries when someone sends you a message. To prevent accidentally
+    sending text meant to some other channel/nick, Irssi clears the input
+    buffer when changing the window. The text is still in scrollback buffer,
+    you can get it back with pressing arrow up key.
+/SET print_active_channel OFF
+    When you keep more than one channel in same window, Irssi prints the
+    messages coming to active channel as <nick> text and other channels as
+    <nick:channel> text. If this setting is set ON, the messages to active
+    channels are also printed in the latter way.
+/SET window_history OFF
+    Should command history be kept separate for each window.
+
+User information
+
+/SET nick
+    Your nick name
+/SET alternate_nick
+    Your alternate nick.
+/SET user_name
+    Your username, if you have ident enabled this doesn’t affect anything
+/SET real_name
+    Your real name.
+
+Server information
+
+/SET skip_motd OFF
+    Should we hide server’s MOTD (Message Of The Day).
+/SET server_reconnect_time 300
+    Seconds to wait before connecting to same server again. Don’t set this too
+    low since it usually doesn’t help at all - if the host is down, the few
+    extra minutes of waiting won’t hurt much.
+/SET lag_max_before_disconnect 300
+    Maximum server lag in seconds before disconnecting and trying to reconnect.
+    This happens mostly only when network breaks between you and IRC server.
+
+Appearance
+
+/SET timestamps ON
+    Show timestamps before each message.
+/SET hide_text_style OFF
+    Hide all bolds, underlines, MIRC colors, etc.
+/SET show_nickmode ON
+    Show the nick’s mode before nick in channels, ie. ops have <@nick>, voices
+    <+nick> and others < nick>
+/SET show_nickmode_empty ON
+    If the nick doesn’t have a mode, use one space. ie. ON: < nick>, OFF:
+    <nick>
+/SET show_quit_once OFF
+    Show quit message only once in some of the channel windows the nick was in
+    instead of in all windows.
+/SET lag_min_show 100
+    Show the server lag in status bar if it’s bigger than this, the unit is 1/
+    100 of seconds (ie. the default value of 100 = 1 second).
+/SET indent 10
+    When lines are longer than screen width they have to be split to multiple
+    lines. This specifies how much space to put at the beginning of the line
+    before the text begins. This can be overridden in text formats with %|
+    format.
+/SET activity_hide_targets
+    If you don’t want to see window activity in some certain channels or
+    queries, list them here. For example #boringchannel =bot1 =bot2. If any
+    highlighted text or message for you appears in that window, this setting is
+    ignored and the activity is shown.
+
+Nick completion
+
+/SET completion_auto OFF
+    Automatically complete the nick if line begins with start of nick and the
+    completion character. Learn to use the tab-completion instead, it’s a lot
+    better ;)
+/SET completion_char :
+    Completion character to use.
+
+For all the ircII people
+
+I don’t like automatic query windows, I don’t like status window, I do like
+msgs window where all messages go:
+
+/SET autocreate_own_query OFF
+/SET autocreate_query_level DCCMSGS
+/SET use_status_window OFF
+/SET use_msgs_window ON
+
+Disable automatic window closing when /PARTing channel or /UNQUERYing query:
+
+/SET autoclose_windows OFF
+/SET reuse_unused_windows ON
+
+Here’s the settings that make irssi work exactly like ircII in window
+management (send me a note if you can think of more):
+
+/SET autocreate_own_query OFF
+/SET autocreate_query_level NONE
+/SET use_status_window OFF
+/SET use_msgs_window OFF
+/SET reuse_unused_windows ON
+/SET windows_auto_renumber OFF
+
+/SET autostick_split_windows OFF
+/SET autoclose_windows OFF
+/SET print_active_channel ON
+
+12. Statusbar
+
+/STATUSBAR displays a list of the current statusbars, along with their position
+and visibility:
+
+ Name                           Type   Placement Position Visible
+ window                         window bottom    0        always
+ window_inact                   window bottom    1        inactive
+ prompt                         root   bottom    100      always
+ topic                          root   top       1        always
+
+/STATUSBAR <name> prints the statusbar settings (type, placement, position,
+visibility) as well as its items. /STATUSBAR <name> ENABLE|DISABLE enables/
+disables the statusbar. /STATUSBAR <name> RESET resets the statusbar to its
+default settings, or if the statusbar was created by you, it will be removed.
+
+The statusbar type can be either window or root. If the type is window, then a
+statusbar will be created for each split window, otherwise it will be created
+only once. Placement can be top or bottom, which refers to the top or bottom of
+the screen. Position is a number, the higher the value the lower it will appear
+in-screen. Visible can be always, active or inactive. Active/inactive is useful
+only with split windows; one split window is active and the rest are inactive.
+To adjust these settings, the following commands are available:
+
+/STATUSBAR <name> TYPE window|root
+/STATUSBAR <name> PLACEMENT top|bottom
+/STATUSBAR <name> POSITION <num>
+/STATUSBAR <name> VISIBLE always|active|inactive
+
+Statusbar items can also be added or removed via command. Note that when
+loading new statusbar scripts that add items, you will need to specify where
+you want to show the item and how it is aligned. This can be accomplished using
+the below commands:
+
+/STATUSBAR <name> ADD [-before | -after <item>] [-priority #] [-alignment left|right] <item>
+/STATUSBAR <name> REMOVE <item>
+
+For statusbar scripts, the item name is usually equivalent to the script name.
+The documentation of the script ought to tell you if this is not the case. For
+example, to add mail.pl before the window activity item, use: /STATUSBAR window
+ADD -before act mail.
+
+
+References:
+
+[1] http://www.gnu.org/licenses/fdl.html
+[2] https://www.iterm2.com/
+[3] http://quadpoint.org/articles/irssisplit/
+[4] https://github.com/rofl0r/proxychains-ng
+[5] https://irssi.org/documentation/settings/
diff --git a/syncdocs.sh b/syncdocs.sh
new file mode 100755
index 00000000..1187eec9
--- /dev/null
+++ b/syncdocs.sh
@@ -0,0 +1,101 @@
+#!/bin/sh -e
+# Run this to download FAQ and startup-HOWTO from irssi.org
+
+PKG_NAME="Irssi"
+
+site=https://irssi.org
+
+faq=$site/documentation/faq/
+howto=$site/documentation/startup/
+
+# remove everything until H1 and optionally 2 DIVs before the
+# FOOTER. May need to be adjusted as the source pages change
+pageclean_regex='s{.*(?=<h1)}{}s;
+s{\s*(</div>\s*)?(</div>\s*)?<footer.*}{}s;
+s{(<.*?)\sclass="(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;'
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+if test ! -f "$srcdir"/configure.ac; then
+    echo -n "**Error**: Directory \`$srcdir' does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+fi
+
+# detect downloader app
+downloader=false
+
+if type curl >/dev/null 2>&1 ; then
+    downloader="curl -Ssf"
+elif type wget >/dev/null 2>&1 ; then
+    downloader="wget -nv -O-"
+else
+    echo "**Error**: No wget or curl present"
+    echo "Install wget or curl, then run syncdocs.sh again"
+fi
+
+# detect html converter app
+converter=false
+if [ "$1" = "-any" ]; then
+    any=true
+else
+    any=false
+fi
+
+if type w3m >/dev/null 2>&1 ; then
+    converter="w3m -o display_link_number=1 -dump -T text/html"
+    any=true
+elif type lynx >/dev/null 2>&1 ; then
+    converter="lynx -dump -stdin -force_html"
+elif type elinks >/dev/null 2>&1 ; then
+    converter="elinks -dump -force-html"
+else
+    echo "**Error**: Neither w3m, nor lynx or elinks present"
+    echo "Install w3m, then run syncdocs.sh again"
+    exit 1
+fi
+
+if ! $any ; then
+    echo "**Error**: w3m not present"
+    echo "If you want to use lynx or elinks, run syncdocs.sh -any"
+    exit 1
+fi
+
+check_download() {
+    if test "$1" -ne 0 || test ! -e "$2" || test "$(wc -l "$2" | awk '{print $1}')" -le 1 ; then
+	rm -f "$2"
+	echo "... download failed ( $1 )"
+	exit 2
+    fi
+}
+
+download_it() {
+    echo "Downloading $1 from $2 ..."
+    ret=0
+    $downloader "$2" > "$3".tmp || ret=$?
+    check_download "$ret" "$3".tmp
+    perl -i -0777 -p -e "$pageclean_regex" "$3".tmp
+    perl -i -0777 -p -e 's{\A}{'"<base href='$2'>"'\n}' "$3".tmp
+    perl -i -0777 -p -e 's{<a href="/cdn-cgi/l/email-protection" class="__cf_email__" data-cfemail=".*?">\[email&#160;protected\]</a>}{user\@host}g' "$3".tmp
+    mv "$3".tmp "$3"
+}
+
+download_it "FAQ" "$faq" "$srcdir"/docs/faq.html
+download_it "Startup How-To" "$howto" "$srcdir"/docs/startup-HOWTO.html
+
+# .html -> .txt with lynx or elinks
+echo "Documentation: html -> txt..."
+
+cat "$srcdir"/docs/faq.html \
+    | LC_ALL=en_IE.utf8 $converter \
+    | perl -pe '
+	s/^ *//;
+	if ($_ eq "\n" && $state eq "Q") { $_ = ""; }
+	elsif (/^([QA]):/) { $state = $1 }
+	elsif ($_ ne "\n") { $_ = "   $_"; };
+' > docs/faq.txt
+
+cat "$srcdir"/docs/startup-HOWTO.html \
+    | perl -pe "s/\\bhref=([\"\'])#.*?\\1//" \
+    | LC_ALL=en_IE.utf8 $converter > "$srcdir"/docs/startup-HOWTO.txt

From 9a3c0bce48d3f172d5638ecb37967528812129b1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 24 Oct 2017 22:22:39 +0200
Subject: [PATCH 0667/1650] add a script to sync scripts as well

---
 syncscripts.sh | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100755 syncscripts.sh

diff --git a/syncscripts.sh b/syncscripts.sh
new file mode 100755
index 00000000..eee95a5e
--- /dev/null
+++ b/syncscripts.sh
@@ -0,0 +1,38 @@
+#!/bin/sh -e
+# Run this script to sync dual lived scripts from scripts.irssi.org to scripts/
+
+PKG_NAME="Irssi"
+
+scriptbase=https://scripts.irssi.org/scripts
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+if test ! -f "$srcdir"/configure.ac; then
+    echo -n "**Error**: Directory \`$srcdir' does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+fi
+
+dl2='curl -Ssf'
+
+dl_it() {
+    echo "$1"
+    $dl2 -o "$srcdir/scripts/$1" "$scriptbase/$1"
+}
+
+for script in \
+    autoop.pl \
+    autorejoin.pl \
+    buf.pl \
+    dns.pl \
+    kills.pl \
+    mail.pl \
+    mlock.pl \
+    quitmsg.pl \
+    scriptassist.pl \
+    usercount.pl \
+    ;
+do
+    dl_it $script
+done

From 8843d4f77d8e829135e2ff9b354990134c58c46a Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 21 Oct 2017 20:00:25 -0700
Subject: [PATCH 0668/1650] Strip : from <trailing> parameters

This is to fix #601. The function used to extract the mode string
assumed that ":" would only occur in a particular spot. This lead to the
possibility that ":" could be treated as part of things like nicknames
or mode arguments, where it should have been stripped as part of
protocol escaping.
---
 src/fe-common/irc/fe-events.c |  2 +-
 src/irc/core/irc.c            | 32 ++++++++++++++++++++++++++++++--
 src/irc/core/modes.c          |  4 ++--
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 850174c5..cc83d476 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -224,7 +224,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
 static void event_mode(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
-	char *params, *channel, *mode;
+	char *params = NULL, *channel = NULL, *mode = NULL;
 
 	g_return_if_fail(data != NULL);
 
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 4dce3fcf..790c7122 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -40,6 +40,8 @@ static int signal_server_incoming;
 #  define MAX_SOCKET_READS 5
 #endif
 
+static void strip_params_colon(char *const);
+
 /* The core of the irc_send_cmd* functions. If `raw' is TRUE, the `cmd'
    won't be checked at all if it's 512 bytes or not, or if it contains
    line feeds or not. Use with extreme caution! */
@@ -269,8 +271,9 @@ char *event_get_params(const char *data, int count, ...)
 	while (count-- > 0) {
 		str = (char **) va_arg(args, char **);
 		if (count == 0 && rest) {
-			/* put the rest to last parameter */
-			tmp = *datad == ':' ? datad+1 : datad;
+			/* Put the rest into the last parameter. */
+			strip_params_colon(datad);
+			tmp = datad;
 		} else {
 			tmp = event_get_param(&datad);
 		}
@@ -281,6 +284,31 @@ char *event_get_params(const char *data, int count, ...)
 	return duprec;
 }
 
+/* Given a string containing <params>, strip any colon prefixing <trailing>. */
+static void strip_params_colon(char *const params)
+{
+	if (!params) {
+		return;
+	}
+
+	char *s = params;
+	while (*s != '\0') {
+		if (*s == ':') {
+			memmove(s, s+1, strlen(s+1)+1);
+			return;
+		}
+
+		s = strchr(s, ' ');
+		if (!s) {
+			return;
+		}
+
+		while (*s == ' ') {
+			s++;
+		}
+	}
+}
+
 static void irc_server_event(IRC_SERVER_REC *server, const char *line,
 			     const char *nick, const char *address)
 {
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index cc3d0faf..ecbf2571 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -480,8 +480,8 @@ static void event_user_mode(IRC_SERVER_REC *server, const char *data)
 static void event_mode(IRC_SERVER_REC *server, const char *data,
 		       const char *nick)
 {
-	IRC_CHANNEL_REC *chanrec;
-	char *params, *channel, *mode;
+	IRC_CHANNEL_REC *chanrec = NULL;
+	char *params = NULL, *channel = NULL, *mode = NULL;
 
 	g_return_if_fail(data != NULL);
 

From ca3498d42d29383024382b0eb983f97ab4e6b614 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 25 Oct 2017 16:22:57 +0200
Subject: [PATCH 0669/1650] move some files into subdirs

---
 Makefile.am                                | 21 ++++++-----------
 autogen.sh                                 | 27 +++++++++++++---------
 configure.ac                               |  2 ++
 themes/Makefile.am                         |  5 ++++
 colorless.theme => themes/colorless.theme  |  0
 default.theme => themes/default.theme      |  0
 utils/Makefile.am                          |  4 ++++
 file2header.sh => utils/file2header.sh     |  0
 irssi-version.sh => utils/irssi-version.sh |  0
 syncdocs.sh => utils/syncdocs.sh           |  3 ++-
 syncscripts.sh => utils/syncscripts.sh     |  1 +
 syntax.pl => utils/syntax.pl               |  0
 12 files changed, 37 insertions(+), 26 deletions(-)
 create mode 100644 themes/Makefile.am
 rename colorless.theme => themes/colorless.theme (100%)
 rename default.theme => themes/default.theme (100%)
 create mode 100644 utils/Makefile.am
 rename file2header.sh => utils/file2header.sh (100%)
 rename irssi-version.sh => utils/irssi-version.sh (100%)
 rename syncdocs.sh => utils/syncdocs.sh (98%)
 rename syncscripts.sh => utils/syncscripts.sh (97%)
 rename syntax.pl => utils/syntax.pl (100%)

diff --git a/Makefile.am b/Makefile.am
index 75d502f1..f52ac92f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,33 +7,26 @@ CLEANFILES = default-config.h default-theme.h
 @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
 
 default-config.h: $(srcdir)/irssi.conf
-	$(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
+	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
 
-default-theme.h: $(srcdir)/default.theme
-	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h
+default-theme.h: $(srcdir)/themes/default.theme
+	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h
 
 irssi-version.h:
-	VERSION="$(VERSION)" $(srcdir)/irssi-version.sh $(srcdir) | \
-		cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/irssi-version.sh $(srcdir) >$@
+	VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) | \
+		cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) >$@
 
-SUBDIRS = src docs scripts
+SUBDIRS = src docs scripts themes utils
 
 confdir = $(sysconfdir)
 conf_DATA = irssi.conf
 
-themedir = $(datadir)/irssi/themes
-theme_DATA = default.theme colorless.theme
-
 pkginclude_HEADERS = irssi-config.h irssi-version.h
 
 EXTRA_DIST = \
 	ChangeLog \
 	autogen.sh \
 	README.md \
-	file2header.sh \
 	$(conf_DATA) \
-	$(theme_DATA) \
 	irssi-config.in \
-	irssi-icon.png \
-	irssi-version.sh \
-	syntax.pl
+	irssi-icon.png
diff --git a/autogen.sh b/autogen.sh
index a9e354c9..9feb0872 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,21 +3,24 @@
 
 PKG_NAME="Irssi"
 
-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
+mydir=`pwd`
 
-if test ! -f $srcdir/configure.ac; then
-    echo -n "**Error**: Directory \`$srcdir\' does not look like the"
+if test ! -f "$srcdir"/configure.ac; then
+    echo -n "**Error**: Directory \`$srcdir' does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
 fi
 
+cd "$srcdir"
+
 # create help files
 echo "Creating help files..."
-perl syntax.pl
+perl utils/syntax.pl
 
 echo "Creating ChangeLog..."
-git log > $srcdir/ChangeLog
+git log > ChangeLog
 if test "$?" -ne 0; then
     echo "**Error**: ${PKG_NAME} Autogen must be run in a git clone, cannot proceed."
     exit 1
@@ -38,17 +41,19 @@ fi
 
 rm -f aclocal.m4
 echo "Running autoreconf ..."
-autoreconf -i || exit 1
+autoreconf -i || exit $?
+
+# make sure perl hashes have correct length
+find src/perl -name '*.c' -o -name '*.xs' -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }'
+
+cd "$mydir"
 
 conf_flags="--enable-maintainer-mode"
 
 if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
+  echo Running "$srcdir"/configure $conf_flags "$@" ...
+  "$srcdir"/configure $conf_flags "$@" \
   && echo Now type \`make\' to compile $PKG_NAME || exit 1
 else
   echo Skipping configure process.
 fi
-
-# make sure perl hashes have correct length
-find src/perl -name '*.c' -o -name '*.xs' -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }'
diff --git a/configure.ac b/configure.ac
index 9c026c5d..4b65d434 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,6 +661,8 @@ scripts/examples/Makefile
 docs/Makefile
 docs/help/Makefile
 docs/help/in/Makefile
+utils/Makefile
+themes/Makefile
 irssi-config
 ])
 
diff --git a/themes/Makefile.am b/themes/Makefile.am
new file mode 100644
index 00000000..ad0707c2
--- /dev/null
+++ b/themes/Makefile.am
@@ -0,0 +1,5 @@
+themedir = $(datadir)/irssi/themes
+theme_DATA = default.theme colorless.theme
+
+EXTRA_DIST = \
+	$(theme_DATA)
diff --git a/colorless.theme b/themes/colorless.theme
similarity index 100%
rename from colorless.theme
rename to themes/colorless.theme
diff --git a/default.theme b/themes/default.theme
similarity index 100%
rename from default.theme
rename to themes/default.theme
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 00000000..be24c17f
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+	file2header.sh \
+	irssi-version.sh \
+	syntax.pl
diff --git a/file2header.sh b/utils/file2header.sh
similarity index 100%
rename from file2header.sh
rename to utils/file2header.sh
diff --git a/irssi-version.sh b/utils/irssi-version.sh
similarity index 100%
rename from irssi-version.sh
rename to utils/irssi-version.sh
diff --git a/syncdocs.sh b/utils/syncdocs.sh
similarity index 98%
rename from syncdocs.sh
rename to utils/syncdocs.sh
index 1187eec9..e723edd2 100755
--- a/syncdocs.sh
+++ b/utils/syncdocs.sh
@@ -16,6 +16,7 @@ s{(<.*?)\sclass="(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;'
 
 srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
+srcdir="$srcdir"/..
 
 if test ! -f "$srcdir"/configure.ac; then
     echo -n "**Error**: Directory \`$srcdir' does not look like the"
@@ -94,7 +95,7 @@ cat "$srcdir"/docs/faq.html \
 	if ($_ eq "\n" && $state eq "Q") { $_ = ""; }
 	elsif (/^([QA]):/) { $state = $1 }
 	elsif ($_ ne "\n") { $_ = "   $_"; };
-' > docs/faq.txt
+' > "$srcdir"/docs/faq.txt
 
 cat "$srcdir"/docs/startup-HOWTO.html \
     | perl -pe "s/\\bhref=([\"\'])#.*?\\1//" \
diff --git a/syncscripts.sh b/utils/syncscripts.sh
similarity index 97%
rename from syncscripts.sh
rename to utils/syncscripts.sh
index eee95a5e..533b77cc 100755
--- a/syncscripts.sh
+++ b/utils/syncscripts.sh
@@ -7,6 +7,7 @@ scriptbase=https://scripts.irssi.org/scripts
 
 srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
+srcdir="$srcdir"/..
 
 if test ! -f "$srcdir"/configure.ac; then
     echo -n "**Error**: Directory \`$srcdir' does not look like the"
diff --git a/syntax.pl b/utils/syntax.pl
similarity index 100%
rename from syntax.pl
rename to utils/syntax.pl

From 8c0e0c81ee79684201020f843eeb0a4d656ed14c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 25 Oct 2017 16:23:14 +0200
Subject: [PATCH 0670/1650] run syncscripts.sh

---
 scripts/autorejoin.pl | 49 ++++++++++++++++++++++++++++---------------
 scripts/mail.pl       |  1 +
 scripts/usercount.pl  |  1 +
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/scripts/autorejoin.pl b/scripts/autorejoin.pl
index 42c97da7..e5be21b2 100644
--- a/scripts/autorejoin.pl
+++ b/scripts/autorejoin.pl
@@ -1,6 +1,9 @@
-# automatically rejoin to channel after kick
+# automatically rejoin to channel after kicked
 # delayed rejoin: Lam 28.10.2001 (lam@lac.pl)
 
+# /SET autorejoin_channels #channel1 #channel2 ...
+# /SET autorejoin_delay 5
+
 # NOTE: I personally don't like this feature, in most channels I'm in it
 # will just result as ban. You've probably misunderstood the idea of /KICK
 # if you kick/get kicked all the time "just for fun" ...
@@ -9,31 +12,22 @@ use Irssi;
 use Irssi::Irc;
 use strict;
 use vars qw($VERSION %IRSSI);
-$VERSION = "1.0.0";
+$VERSION = "1.1.0";
 %IRSSI = (
 	authors => "Timo 'cras' Sirainen, Leszek Matok",
 	contact => "lam\@lac.pl",
 	name => "autorejoin",
-	description => "Automatically rejoin to channel after being kick, after a (short) user-defined delay",
+	description => "Automatically rejoin to channel after being kicked, after a (short) user-defined delay",
 	license => "GPLv2",
 	changed => "10.3.2002 14:00"
 );
 
-
-# How many seconds to wait before the rejoin?
-# TODO: make this a /setting
-my $delay = 5;
-
-my @tags;
-my $acttag = 0;
-
 sub rejoin {
 	my ( $data ) = @_;
-	my ( $tag, $servtag, $channel, $pass ) = split( / +/, $data );
+	my ( $servtag, $channel, $pass ) = @{$data};
 
 	my $server = Irssi::server_find_tag( $servtag );
 	$server->send_raw( "JOIN $channel $pass" ) if ( $server );
-	Irssi::timeout_remove( $tags[$tag] );
 }
 
 sub event_rejoin_kick {
@@ -48,10 +42,31 @@ sub event_rejoin_kick {
 	my $rejoinchan = $chanrec->{ name } if ( $chanrec );
 	my $servtag = $server->{ tag };
 
-	Irssi::print "Rejoining $rejoinchan in $delay seconds.";
-	$tags[$acttag] = Irssi::timeout_add( $delay * 1000, "rejoin", "$acttag $servtag $rejoinchan $password" );
-	$acttag++;
-	$acttag = 0 if ( $acttag > 60 );
+	# check if we want to autorejoin this channel
+	my $chans = Irssi::settings_get_str( 'autorejoin_channels' );
+
+	if ( $chans ) {
+		my $found = 0;
+		foreach my $chan ( split( /[ ,]/, $chans ) ) {
+			if ( lc( $chan ) eq lc( $channel ) ) {
+				$found = 1;
+				last;
+			}
+		}
+		return unless $found;
+	}
+
+	my @args = ($servtag, $rejoinchan, $password);
+	my $delay = Irssi::settings_get_int( "autorejoin_delay" );
+
+	if ($delay) {
+		Irssi::print "Rejoining $rejoinchan in $delay seconds.";
+		Irssi::timeout_add_once( $delay * 1000, "rejoin", \@args );
+	} else {
+		rejoin( \@args );
+	}
 }
 
+Irssi::settings_add_int('misc', 'autorejoin_delay', 5);
+Irssi::settings_add_str('misc', 'autorejoin_channels', '');
 Irssi::signal_add( 'event kick', 'event_rejoin_kick' );
diff --git a/scripts/mail.pl b/scripts/mail.pl
index ded02120..23f99c01 100644
--- a/scripts/mail.pl
+++ b/scripts/mail.pl
@@ -6,6 +6,7 @@ $VERSION = "2.92";
     contact     => "tss\@iki.fi, matti\@hiljanen.com, joost\@carnique.nl, bart\@dreamflow.nl",
     name        => "mail",
     description => "Fully customizable mail counter statusbar item with multiple mailbox and multiple Maildir support",
+    sbitems     => "mail",
     license     => "Public Domain",
     url         => "http://irssi.org, http://scripts.irssi.de",
 );
diff --git a/scripts/usercount.pl b/scripts/usercount.pl
index 613da1de..650f9f36 100644
--- a/scripts/usercount.pl
+++ b/scripts/usercount.pl
@@ -7,6 +7,7 @@ $VERSION = "1.19";
     contact     => 'dgl@dgl.cx, tss@iki.fi, georg@boerde.de',
     name        => 'usercount',
     description => 'Adds a usercount for a channel as a statusbar item',
+    sbitems     => 'usercount',
     license     => 'GNU GPLv2 or later',
     url         => 'http://irssi.dgl.cx/',
     changes     => 'Only show halfops if server supports them',

From 96c7f68b3579ae5f83b635d946dc705d6322a16c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 26 Oct 2017 16:15:25 +0200
Subject: [PATCH 0671/1650] clean up file path after move

---
 src/perl/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 427c5492..db52744e 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -59,7 +59,7 @@ perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl
 	cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals-list.h
 
 irssi-core.pl.h: irssi-core.pl
-	$(top_srcdir)/file2header.sh $(srcdir)/irssi-core.pl irssi_core_code > irssi-core.pl.h
+	$(top_srcdir)/utils/file2header.sh $(srcdir)/irssi-core.pl irssi_core_code > irssi-core.pl.h
 
 common_sources = \
 	common/Irssi.xs \

From 7e619ed990503faf45fc1ae1e28a3a6062dc7532 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 30 Oct 2017 16:54:32 +0100
Subject: [PATCH 0672/1650] Update README.md

---
 README.md | 128 ++++++++++++++++++++----------------------------------
 1 file changed, 46 insertions(+), 82 deletions(-)

diff --git a/README.md b/README.md
index 8d91f4cb..0f54ccf5 100644
--- a/README.md
+++ b/README.md
@@ -1,109 +1,73 @@
-# Irssi
+# [Irssi](https://irssi.org/)
 
 [![Build Status](https://travis-ci.org/irssi/irssi.svg?branch=master)](https://travis-ci.org/irssi/irssi)
 
 Irssi is a modular chat client that is most commonly known for its
 text mode user interface, but 80% of the code isn't text mode
-specific. We have a working but currently unmaintained GTK2 frontend
-called xirssi. Irssi comes with IRC support built in, and there are
+specific. Irssi comes with IRC support built in, and there are
 third party [ICB](https://github.com/jperkin/irssi-icb),
 [SILC](http://www.silcnet.org/),
 [XMPP](http://cybione.org/~irssi-xmpp/) (Jabber),
-[PSYC](https://github.com/electric-blue/irssyc) and
+[PSYC](http://about.psyc.eu/Irssyc) and
 [Quassel](https://github.com/phhusson/quassel-irssi) protocol modules
 available.
 
-## Installation
+![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
 
-See the `INSTALL` file.
+## [Download information](https://irssi.org/download/)
 
-## Features
+#### Development source installation
 
-So what's so great about Irssi? Here's a list of some features I can
-think of currently:
+```
+git clone https://github.com/irssi/irssi
+cd irssi
+./autogen.sh
+make && sudo make install
+```
 
- - **Optional automation** - There's lots of things Irssi does for you
-   automatically that some people like and others just hate. Things like:
-   nick completion, creating new window for newly joined channel, creating
-   queries when msgs/notices are received or when you send a msg, closing
-   queries when it's been idle for some time, etc.
+#### Release source installation
 
- - **Multiserver friendly** - I think Irssi has clearly the best support
-   for handling multiple server connections. You can have as many as you
-   want in as many ircnets as you want. Having several connections in one
-   server works too, for example when you hit the (ircnet's) 10
-   channels/connection limit you can just create another connection and
-   you hardly notice it. If connection to server is lost, Irssi tries to
-   connect back until it's successful. Also channels you were joined
-   before disconnection are restored, even if they're "temporarily
-   unavailable" because of netsplits, Irssi keeps rejoining back to them.
-   Also worth noticing - there's not that stupid "server is bound to this
-   window, if this window gets closed the connection closes" thing that
-   ircII based clients have.
+* Download [release](https://github.com/irssi/irssi/releases)
+* [Verify](https://irssi.org/download/#release-sources) signature
+```
+tar xJf irssi-*.tar.xz
+cd irssi-*
+./configure
+make && sudo make install
+```
 
- - **Channel automation** - You can specify what channels to join to
-   immediately after connected to some server or IRC network. After joined
-   to channel, Irssi can automatically request ops for you (or do
-   anything, actually) from channel's bots.
+### Requirements
 
- - **Window content saving** - Say /LAYOUT SAVE when you've put all the
-   channels and queries to their correct place, and after restarting
-   Irssi, the channels will be joined back into windows where they were
-   saved.
+- [glib-2.28](https://wiki.gnome.org/Projects/GLib) or greater
+- [openssl](https://www.openssl.org/)
+- [perl-5.6](https://www.perl.org/) or greater (for perl support)
+- terminfo or ncurses (for text frontend)
 
- - **Tab completing anything** - You can complete lots of things with tab:
-   nicks, commands, command -options, file names, settings, text format
-   names, channels and server names. There's also an excellent /msg
-   completion that works transparently with multiple IRC networks.
-   Completing channel nicks is also pretty intelligent, it first goes
-   through the people who have talked to you recently, then the people who
-   have talked to anyone recently and only then it fallbacks to rest of
-   the nicks. You can also complete a set of words you've specified, for
-   example homepage<tab> changes it to your actual home page URL.
+#### See the [INSTALL](INSTALL) file for details
 
- - **Excellent logging** - You can log any way you want and as easily or
-   hard as you want. With autologging Irssi logs everything to specified
-   directory, one file per channel/nick. ircII style /WINDOW LOG ON is
-   also supported. There's also the "hard way" of logging - /LOG command
-   which lets you specify exactly what you wish to log and where. Log
-   rotating is supported with all the different logging methods, you can
-   specify how often you want it to rotate and what kind of time stamp to
-   use.
+## [Documentation](https://irssi.org/documentation/)
 
- - **Excellent ignoring** - You can most probably ignore anything any way
-   you want. Nick masks, words, regular expressions. You can add
-   exceptions to ignores. You can ignore other people's replies in
-   channels to nicks you have ignored. You can also specify that the
-   specific ignores work only in specific channel(s).
+* [Frequently Asked Questions](https://irssi.org/documentation/faq)
+* [Startup How-To](https://irssi.org/documentation/startup)
+* Check the built-in `/HELP`, it has all the details on command syntax
 
- - **Lastlog and scrollback handling** - /LASTLOG command has some new
-   features: -new option checks only lines that came since you last did
-   /LASTLOG command, -away option checks new lines since you last went
-   away. Regular expression matches work also, of course. Going to some
-   wanted place at scrollback has always been hard with non-GUI clients. A
-   search command that jumps around in scrollback in GUI-style is still
-   missing from Irssi, but there's something that's almost as good as it.
-   /LASTLOG always shows timestamps when the line was printed, even if you
-   didn't have timestamps on. Now doing /SB GOTO \<timestamp\> jumps
-   directly to the position in scrollback you wanted. Great feature when
-   you want to browse a bit of the discussion what happened when someone
-   said your name (as seen in awaylog) or topic was changed (/last
-   -topics)
+## [Themes](https://irssi-import.github.io/themes/)
 
-## Files
+## [Scripts](http://scripts.irssi.org/)
 
- - The `docs/` directory contains several documents:
-    - `startup-HOWTO.txt` - new users should read this
-    - `manual.txt` - manual I started writing but didn't get it very far :)
-    - `perl.txt` - Perl scripting help
-    - `formats.txt` - How to use colors, etc. with Irssi
-    - `faq.txt` - Frequently Asked Questions
-    - `special_vars.txt` - some predefined $variables you can use with Irssi
+## [Modules](https://irssi.org/modules/)
 
-## Bugs / Suggestions
+## [Security information](https://irssi.org/security/)
 
-See the `TODO` file, http://bugs.irssi.org and the GitHub issues if it is
-already listed in there; if not, open an issue on GitHub or send a mail to
-[staff@irssi.org](mailto:staff@irssi.org).
+Please report security issues to staff@irssi.org. Thanks!
 
-You can also contact the Irssi developers in #irssi on freenode.
+## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / [Contributing](https://irssi.org/development/)
+
+Check the GitHub issues if it is already listed in there; if not, open
+an issue on GitHub or send a mail to [staff@irssi.org](mailto:staff@irssi.org).
+
+Irssi is always looking for developers. Feel free to submit patches through
+GitHub pull requests.
+
+You can also contact the Irssi developers in
+[#irssi](https://irssi.org/support/irc/) on freenode.

From b0fa4dd46d8bf1cf63880fabf2105dd9134100df Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Nov 2017 15:48:35 +0100
Subject: [PATCH 0673/1650] show initial nick and name on first start

---
 src/core/settings.c              | 10 +++++++
 src/fe-common/core/Makefile.am   |  1 +
 src/fe-common/core/fe-settings.c |  7 ++++-
 src/fe-common/core/fe-settings.h |  6 ++++
 src/fe-text/irssi.c              | 49 ++++++++++++++++----------------
 src/fe-text/module-formats.c     | 21 ++++++++++++++
 src/fe-text/module-formats.h     |  6 ++++
 src/irc/core/irc-servers-setup.c | 11 ++++++-
 8 files changed, 85 insertions(+), 26 deletions(-)
 create mode 100644 src/fe-common/core/fe-settings.h

diff --git a/src/core/settings.c b/src/core/settings.c
index 4e0717cd..48d6640e 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -39,6 +39,7 @@ static GString *last_errors;
 static GSList *last_invalid_modules;
 static int fe_initialized;
 static int config_changed; /* FIXME: remove after .98 (unless needed again) */
+static int user_settings_changed;
 
 static GHashTable *settings;
 static int timeout_tag;
@@ -464,6 +465,11 @@ SETTINGS_REC *settings_get_record(const char *key)
 	return g_hash_table_lookup(settings, key);
 }
 
+static void sig_init_userinfo_changed(gpointer changedp)
+{
+	user_settings_changed = GPOINTER_TO_INT(changedp);
+}
+
 static void sig_init_finished(void)
 {
 	fe_initialized = TRUE;
@@ -479,6 +485,8 @@ static void sig_init_finished(void)
 			  "updated, please /SAVE");
 		signal_emit("setup changed", 0);
 	}
+
+	signal_emit("settings userinfo changed", 1, GINT_TO_POINTER(user_settings_changed));
 }
 
 static void settings_clean_invalid_module(const char *module)
@@ -875,6 +883,7 @@ void settings_init(void)
 	timeout_tag = g_timeout_add(SETTINGS_AUTOSAVE_TIMEOUT,
 				    (GSourceFunc) sig_autosave, NULL);
 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+	signal_add("irssi init userinfo changed", (SIGNAL_FUNC) sig_init_userinfo_changed);
 	signal_add("gui exit", (SIGNAL_FUNC) sig_autosave);
 }
 
@@ -887,6 +896,7 @@ void settings_deinit(void)
 {
         g_source_remove(timeout_tag);
 	signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+	signal_remove("irssi init userinfo changed", (SIGNAL_FUNC) sig_init_userinfo_changed);
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_autosave);
 
 	g_slist_foreach(last_invalid_modules, (GFunc) g_free, NULL);
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 29cc941a..cf4e8ee3 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -55,6 +55,7 @@ pkginc_fe_common_core_HEADERS = \
 	fe-exec.h \
 	fe-messages.h \
 	fe-queries.h \
+	fe-settings.h \
 	fe-tls.h \
 	formats.h \
 	hilight-text.h \
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index abbd45a8..de9f67a1 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -26,7 +26,7 @@
 #include "misc.h"
 #include "lib-config/iconfig.h"
 #include "settings.h"
-
+#include "fe-settings.h"
 #include "levels.h"
 #include "printtext.h"
 #include "keyboard.h"
@@ -41,6 +41,11 @@ static void set_print(SETTINGS_REC *rec)
 	g_free(value);
 }
 
+void fe_settings_set_print(const char *key)
+{
+	set_print(settings_get_record(key));
+}
+
 static void set_print_pattern(const char *pattern)
 {
 	GSList *sets, *tmp;
diff --git a/src/fe-common/core/fe-settings.h b/src/fe-common/core/fe-settings.h
new file mode 100644
index 00000000..dd33f223
--- /dev/null
+++ b/src/fe-common/core/fe-settings.h
@@ -0,0 +1,6 @@
+#ifndef __FE_CHANNELS_H
+#define __FE_CHANNELS_H
+
+void fe_settings_set_print(const char *key);
+
+#endif
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index b5df47c9..6349ae2a 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -31,6 +31,7 @@
 
 #include "printtext.h"
 #include "fe-common-core.h"
+#include "fe-settings.h"
 #include "themes.h"
 
 #include "term.h"
@@ -79,25 +80,8 @@ static int dirty, full_redraw;
 static GMainLoop *main_loop;
 int quitting;
 
-static const char *banner_text =
-	" ___           _\n"
-	"|_ _|_ _ _____(_)\n"
- 	" | || '_(_-<_-< |\n"
-	"|___|_| /__/__/_|\n"
-	"Irssi v" PACKAGE_VERSION " - http://www.irssi.org";
-
-static const char *firsttimer_text =
-	"- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
-	"Hi there! If this is your first time using Irssi, you\n"
-	"might want to go to our website and read the startup\n"
-	"documentation to get you going.\n\n"
-	"Our community and staff are available to assist you or\n"
-	"to answer any questions you may have.\n\n"
-	"Use the /HELP command to get detailed information about\n"
-	"the available commands.\n"
-	"- - - - - - - - - - - - - - - - - - - - - - - - - - - -";
-
 static int display_firsttimer = FALSE;
+static int user_settings_changed = 0;
 
 
 static void sig_exit(void)
@@ -105,6 +89,11 @@ static void sig_exit(void)
         quitting = TRUE;
 }
 
+static void sig_settings_userinfo_changed(gpointer changedp)
+{
+	user_settings_changed = GPOINTER_TO_INT(changedp);
+}
+
 /* redraw irssi's screen.. */
 void irssi_redraw(void)
 {
@@ -161,6 +150,7 @@ static void textui_init(void)
 	fe_common_irc_init();
 
 	theme_register(gui_text_formats);
+	signal_add("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
 	signal_add_last("gui exit", (SIGNAL_FUNC) sig_exit);
 }
 
@@ -199,14 +189,24 @@ static void textui_finish_init(void)
 	statusbar_redraw(NULL, TRUE);
 
 	if (servers == NULL && lookup_servers == NULL) {
-		printtext(NULL, NULL, MSGLEVEL_CRAP|MSGLEVEL_NO_ACT,
-			  "%s", banner_text);
+		printformat(NULL, NULL, MSGLEVEL_CRAP|MSGLEVEL_NO_ACT, TXT_IRSSI_BANNER);
 	}
 
 	if (display_firsttimer) {
-		printtext(NULL, NULL, MSGLEVEL_CRAP|MSGLEVEL_NO_ACT,
-			  "%s", firsttimer_text);
+		printformat(NULL, NULL, MSGLEVEL_CRAP|MSGLEVEL_NO_ACT, TXT_WELCOME_FIRSTTIME);
 	}
+
+	/* see irc-servers-setup.c:init_userinfo */
+	if (user_settings_changed)
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WELCOME_INIT_SETTINGS);
+	if (user_settings_changed & (1<<0))
+		fe_settings_set_print("real_name");
+	if (user_settings_changed & (1<<1))
+		fe_settings_set_print("user_name");
+	if (user_settings_changed & (1<<2))
+		fe_settings_set_print("nick");
+	if (user_settings_changed & (1<<3))
+		fe_settings_set_print("hostname");
 }
 
 static void textui_deinit(void)
@@ -223,6 +223,7 @@ static void textui_deinit(void)
 #endif
 
         dirty_check(); /* one last time to print any quit messages */
+	signal_remove("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
 
 	lastlog_deinit();
@@ -249,6 +250,7 @@ static void textui_deinit(void)
 	core_deinit();
 }
 
+
 static void check_files(void)
 {
 	struct stat statbuf;
@@ -259,12 +261,11 @@ static void check_files(void)
 	}
 }
 
-
 int main(int argc, char **argv)
 {
 	static int version = 0;
 	static GOptionEntry options[] = {
-		{ "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Display irssi version", NULL },
+		{ "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Display Irssi version", NULL },
 		{ NULL }
 	};
 	int loglev;
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index 899827c2..c4606197 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -78,5 +78,26 @@ FORMAT_REC gui_text_formats[] =
 	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.", 2, { 1, 0 } },
 	{ "paste_prompt", "Hit Ctrl-K to paste, Ctrl-C to abort?", 0 },
 
+	/* ---- */
+	{ NULL, "Welcome", 0 },
+
+	{ "irssi_banner",
+	  " ___           _%:"
+	  "|_ _|_ _ _____(_)%:"
+	  " | || '_(_-<_-< |%:"
+	  "|___|_| /__/__/_|%:"
+	  "Irssi v$J - http://www.irssi.org", 0 },
+	{ "welcome_firsttime",
+	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
+	  "Hi there! If this is your first time using Irssi, you%:"
+	  "might want to go to our website and read the startup%:"
+	  "documentation to get you going.%:%:"
+	  "Our community and staff are available to assist you or%:"
+	  "to answer any questions you may have.%:%:"
+	  "Use the /HELP command to get detailed information about%:"
+	  "the available commands.%:"
+	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -", 0 },
+	{ "welcome_init_settings", "The following settings were initialized", 0 },
+
 	{ NULL, NULL, 0 }
 };
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index 3fa8c511..05e9438d 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -52,6 +52,12 @@ enum {
 	TXT_PASTE_WARNING,
 	TXT_PASTE_PROMPT,
 
+	TXT_FILL_5, /* Welcome */
+
+	TXT_IRSSI_BANNER,
+	TXT_WELCOME_FIRSTTIME,
+	TXT_WELCOME_INIT_SETTINGS,
+
 	TXT_COUNT
 };
 
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index bae7d3b4..22c86f57 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -116,14 +116,17 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 
 static void init_userinfo(void)
 {
+	int changed;
 	const char *set, *nick, *user_name, *str;
 
+	changed = 0;
 	/* check if nick/username/realname wasn't read from setup.. */
         set = settings_get_str("real_name");
 	if (set == NULL || *set == '\0') {
 		str = g_getenv("IRCNAME");
 		settings_set_str("real_name",
 				 str != NULL ? str : g_get_real_name());
+		changed |= 1<<0;
 	}
 
 	/* username */
@@ -134,6 +137,7 @@ static void init_userinfo(void)
 				 str != NULL ? str : g_get_user_name());
 
 		user_name = settings_get_str("user_name");
+		changed |= 1<<1;
 	}
 
 	/* nick */
@@ -143,15 +147,20 @@ static void init_userinfo(void)
 		settings_set_str("nick", str != NULL ? str : user_name);
 
 		nick = settings_get_str("nick");
+		changed |= 1<<2;
 	}
 
 	/* host name */
         set = settings_get_str("hostname");
 	if (set == NULL || *set == '\0') {
 		str = g_getenv("IRCHOST");
-		if (str != NULL)
+		if (str != NULL) {
 			settings_set_str("hostname", str);
+			changed |= 1<<3;
+		}
 	}
+
+	signal_emit("irssi init userinfo changed", 1, GINT_TO_POINTER(changed));
 }
 
 static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)

From 4d6822b1c43d876856a5df07ce69fb4e67c3591a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Nov 2017 15:52:45 +0100
Subject: [PATCH 0674/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 159f7124..a7eaa7cf 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 11
+#define IRSSI_ABI_VERSION 12
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 56013367983b61d8ee4d2e905767ce50b25ffb82 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 30 Oct 2017 09:39:16 +0100
Subject: [PATCH 0675/1650] Turn the style guide into a clang-format file

---
 .clang-format | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..5501478f
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,37 @@
+# IndentPPDirectives: None
+# SpaceInParentheses: false
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+ColumnLimit: 100
+IndentCaseLabels: true
+IndentWidth: 8
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+Language: Cpp
+MaxEmptyLinesToKeep: 1
+PointerAlignment: Right
+SortIncludes: true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 8
+UseTab: ForIndentation

From 60c31219a278330498e695e4d7fca05ea69962e4 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Tue, 24 Oct 2017 12:02:30 +0200
Subject: [PATCH 0676/1650] Allow selection of what kind of activity targets to
 ignore

Initialize tagtarget on declaration

move code around for better flow, extra checks for uninitialized values

remove unnecessary item->type checks

don't strdup sign

add braces around if statements, use strcmp0 with single characters and remove g_str_has_prefix

refactoring

changed g_ascii_strcasecmp to g_strcmp0

Add networktag/ shorthand

fixed memory leaks

changed from #@= to ::channels, ::queries and ::dccqueries

check for empty string and continue; if found

fixed bug with empty string check

Clean up code
---
 src/fe-common/core/fe-common-core.c | 53 +++++++++++++++++++----------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 512fc84c..bce9ab4e 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -461,26 +461,43 @@ void fe_common_core_finish_init(void)
 
 gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 {
+	int channel_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "CHANNEL");
+	int query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY");
+	char **tmp;
+
 	g_return_val_if_fail(array != NULL, FALSE);
+	g_return_val_if_fail(dest != NULL, FALSE);
+	g_return_val_if_fail(dest->window != NULL, FALSE);
+	g_return_val_if_fail(dest->target != NULL, FALSE);
 
-	if (strarray_find(array, "*") != -1)
-		return TRUE;
-
-	if (strarray_find(array, dest->target) != -1)
-		return TRUE;
-
-	if (dest->server_tag != NULL) {
-		char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, "*");
-		int ret = strarray_find(array, tagtarget);
-		g_free(tagtarget);
-		if (ret != -1)
-			return TRUE;
-
-		tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
-		ret = strarray_find(array, tagtarget);
-		g_free(tagtarget);
-		if (ret != -1)
-			return TRUE;
+	WI_ITEM_REC *item = window_item_find_window(dest->window, dest->server, dest->target);
+	if (item == NULL) {
+		return FALSE;
 	}
+
+	int server_tag_len = dest->server_tag ? strlen(dest->server_tag) : 0;
+	for (tmp = array; *tmp != NULL; tmp++) {
+		char *str = *tmp;
+		if (*str == '\0') {
+			continue;
+		}
+
+		if (server_tag_len && !g_ascii_strncasecmp(str, dest->server_tag, server_tag_len) && str[server_tag_len] == '/') {
+			str += server_tag_len + 1;
+		}
+
+		if (!g_strcmp0(str, "") || !g_strcmp0(str, "::all")) {
+			return TRUE;
+		} else if (!g_ascii_strcasecmp(str, dest->target)) {
+			return TRUE;
+		} else if (item->type == query_type &&
+			!g_strcmp0(str, (dest->target[0] == '=') ? "::dccqueries" : "::queries")) {
+			return TRUE;
+		} else if (item->type == channel_type &&
+			!g_strcmp0(str, "::channels")) {
+			return TRUE;
+		}
+	}
+
 	return FALSE;
 }

From f9d69597ef1e204640d5ce104061717aca0d213a Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 2 Nov 2017 11:44:57 -0400
Subject: [PATCH 0677/1650] Remove unnecessary malloc cast in fe-fuzz

We compile this as C code, so the cast is unnecessary.
---
 src/fe-fuzz/irc/core/event-get-params.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index 89eb89d2..fc21bbeb 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -52,7 +52,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 		return 0;
 	}
 	uint8_t count = *data;
-	char *copy = (char *)malloc(sizeof(char)*(size-1+1));
+	char *copy = malloc(sizeof(char)*(size-1+1));
 	memcpy(copy, data+1, size-1);
 	copy[size-1] = '\0';
 

From f4b89044f075038d29089435f7620a068507d80e Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 2 Nov 2017 11:48:30 -0400
Subject: [PATCH 0678/1650] Fix malloc parameter in fe-fuzz

It is fairly safe to assume that sizeof(char) will always be 1 anyway
and replace the size calculation with a comment explaining the
calculation.
---
 src/fe-fuzz/irc/core/event-get-params.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index fc21bbeb..f8060ffe 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -52,7 +52,8 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 		return 0;
 	}
 	uint8_t count = *data;
-	char *copy = malloc(sizeof(char)*(size-1+1));
+	/* malloc(size) instead of size+1, because we already used one byte of data */
+	char *copy = malloc(size);
 	memcpy(copy, data+1, size-1);
 	copy[size-1] = '\0';
 

From 532527ffa6a5eaccdbf607a2dc3d0e6ef884fce9 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 2 Nov 2017 11:56:53 -0400
Subject: [PATCH 0679/1650] Use gchar and g_strndup in fe-fuzz

---
 src/fe-fuzz/irc/core/event-get-params.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index f8060ffe..6266ffb6 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -53,9 +53,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 	}
 	uint8_t count = *data;
 	/* malloc(size) instead of size+1, because we already used one byte of data */
-	char *copy = malloc(size);
-	memcpy(copy, data+1, size-1);
-	copy[size-1] = '\0';
+	gchar *copy = g_strndup((const gchar *)data+1, size-1);
 
 	char *output0;
 	char *output1;
@@ -82,6 +80,6 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 		params = event_get_params(copy, 4, &output0, &output1, &output2, &output3);
 	}
 	g_free(params);
-	free(copy);
+	g_free(copy);
 	return 0;
 }

From 66b2c9bc91a3b6e34ba59491c95747db75d21c6b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 3 Nov 2017 16:37:04 +0100
Subject: [PATCH 0680/1650] Keep a copy of the strings coming from the config

The "HILIGHT_REC" structure used to keep a pointer to the "servertag"
string, owned by the "CONFIG_NODE", causing a double-free.
---
 src/fe-common/core/hilight-text.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 62e6f0de..b9912457 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -106,6 +106,7 @@ static void hilight_destroy(HILIGHT_REC *rec)
 	if (rec->channels != NULL) g_strfreev(rec->channels);
 	g_free_not_null(rec->color);
 	g_free_not_null(rec->act_color);
+	g_free_not_null(rec->servertag);
 	g_free(rec->text);
 	g_free(rec);
 }
@@ -424,7 +425,7 @@ static void read_hilight_config(void)
 	CONFIG_NODE *node;
 	HILIGHT_REC *rec;
 	GSList *tmp;
-	char *text, *color;
+	char *text, *color, *servertag;
 
 	hilights_destroy_all();
 
@@ -467,7 +468,9 @@ static void read_hilight_config(void)
 		rec->nickmask = config_node_get_bool(node, "mask", FALSE);
 		rec->fullword = config_node_get_bool(node, "fullword", FALSE);
 		rec->regexp = config_node_get_bool(node, "regexp", FALSE);
-		rec->servertag = config_node_get_str(node, "servertag", NULL);
+		servertag = config_node_get_str(node, "servertag", NULL);
+		rec->servertag = servertag == NULL || *servertag == '\0' ? NULL :
+			g_strdup(servertag);
 		hilight_init_rec(rec);
 
 		node = iconfig_node_section(node, "channels", -1);

From 02c677f467b398f8b91b1e90544502ff98a6e0da Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 10 Nov 2017 22:02:36 +0100
Subject: [PATCH 0681/1650] use enum

---
 src/core/settings.c              |  6 +++---
 src/core/settings.h              |  7 +++++++
 src/fe-text/irssi.c              | 15 +++++++--------
 src/irc/core/irc-servers-setup.c | 12 ++++++------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 48d6640e..3ebb9e4a 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -39,7 +39,7 @@ static GString *last_errors;
 static GSList *last_invalid_modules;
 static int fe_initialized;
 static int config_changed; /* FIXME: remove after .98 (unless needed again) */
-static int user_settings_changed;
+static unsigned int user_settings_changed;
 
 static GHashTable *settings;
 static int timeout_tag;
@@ -467,7 +467,7 @@ SETTINGS_REC *settings_get_record(const char *key)
 
 static void sig_init_userinfo_changed(gpointer changedp)
 {
-	user_settings_changed = GPOINTER_TO_INT(changedp);
+	user_settings_changed |= GPOINTER_TO_UINT(changedp);
 }
 
 static void sig_init_finished(void)
@@ -486,7 +486,7 @@ static void sig_init_finished(void)
 		signal_emit("setup changed", 0);
 	}
 
-	signal_emit("settings userinfo changed", 1, GINT_TO_POINTER(user_settings_changed));
+	signal_emit("settings userinfo changed", 1, GUINT_TO_POINTER(user_settings_changed));
 }
 
 static void settings_clean_invalid_module(const char *module)
diff --git a/src/core/settings.h b/src/core/settings.h
index d174f250..b67a9e44 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -30,6 +30,13 @@ typedef struct {
 	char **choices;
 } SETTINGS_REC;
 
+enum {
+	USER_SETTINGS_REAL_NAME = 0x1,
+	USER_SETTINGS_USER_NAME = 0x2,
+	USER_SETTINGS_NICK	= 0x4,
+	USER_SETTINGS_HOSTNAME	= 0x8,
+};
+
 /* macros for handling the default Irssi configuration */
 #define iconfig_get_str(a, b, c) config_get_str(mainconfig, a, b, c)
 #define iconfig_get_int(a, b, c) config_get_int(mainconfig, a, b, c)
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 6349ae2a..ef443670 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -81,7 +81,7 @@ static GMainLoop *main_loop;
 int quitting;
 
 static int display_firsttimer = FALSE;
-static int user_settings_changed = 0;
+static unsigned int user_settings_changed = 0;
 
 
 static void sig_exit(void)
@@ -91,7 +91,7 @@ static void sig_exit(void)
 
 static void sig_settings_userinfo_changed(gpointer changedp)
 {
-	user_settings_changed = GPOINTER_TO_INT(changedp);
+	user_settings_changed = GPOINTER_TO_UINT(changedp);
 }
 
 /* redraw irssi's screen.. */
@@ -199,13 +199,13 @@ static void textui_finish_init(void)
 	/* see irc-servers-setup.c:init_userinfo */
 	if (user_settings_changed)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WELCOME_INIT_SETTINGS);
-	if (user_settings_changed & (1<<0))
+	if (user_settings_changed & USER_SETTINGS_REAL_NAME)
 		fe_settings_set_print("real_name");
-	if (user_settings_changed & (1<<1))
+	if (user_settings_changed & USER_SETTINGS_USER_NAME)
 		fe_settings_set_print("user_name");
-	if (user_settings_changed & (1<<2))
+	if (user_settings_changed & USER_SETTINGS_NICK)
 		fe_settings_set_print("nick");
-	if (user_settings_changed & (1<<3))
+	if (user_settings_changed & USER_SETTINGS_HOSTNAME)
 		fe_settings_set_print("hostname");
 }
 
@@ -222,7 +222,7 @@ static void textui_deinit(void)
         fe_perl_deinit();
 #endif
 
-        dirty_check(); /* one last time to print any quit messages */
+	dirty_check(); /* one last time to print any quit messages */
 	signal_remove("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
 
@@ -250,7 +250,6 @@ static void textui_deinit(void)
 	core_deinit();
 }
 
-
 static void check_files(void)
 {
 	struct stat statbuf;
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 22c86f57..e79557ab 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -116,7 +116,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 
 static void init_userinfo(void)
 {
-	int changed;
+	unsigned int changed;
 	const char *set, *nick, *user_name, *str;
 
 	changed = 0;
@@ -126,7 +126,7 @@ static void init_userinfo(void)
 		str = g_getenv("IRCNAME");
 		settings_set_str("real_name",
 				 str != NULL ? str : g_get_real_name());
-		changed |= 1<<0;
+		changed |= USER_SETTINGS_REAL_NAME;
 	}
 
 	/* username */
@@ -137,7 +137,7 @@ static void init_userinfo(void)
 				 str != NULL ? str : g_get_user_name());
 
 		user_name = settings_get_str("user_name");
-		changed |= 1<<1;
+		changed |= USER_SETTINGS_USER_NAME;
 	}
 
 	/* nick */
@@ -147,7 +147,7 @@ static void init_userinfo(void)
 		settings_set_str("nick", str != NULL ? str : user_name);
 
 		nick = settings_get_str("nick");
-		changed |= 1<<2;
+		changed |= USER_SETTINGS_NICK;
 	}
 
 	/* host name */
@@ -156,11 +156,11 @@ static void init_userinfo(void)
 		str = g_getenv("IRCHOST");
 		if (str != NULL) {
 			settings_set_str("hostname", str);
-			changed |= 1<<3;
+			changed |= USER_SETTINGS_HOSTNAME;
 		}
 	}
 
-	signal_emit("irssi init userinfo changed", 1, GINT_TO_POINTER(changed));
+	signal_emit("irssi init userinfo changed", 1, GUINT_TO_POINTER(changed));
 }
 
 static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)

From 596fa6b51ed2ab6be80041684ad805f7b22256ac Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 11 Nov 2017 09:14:41 +0100
Subject: [PATCH 0682/1650] Take into account Nei's suggestions

---
 .clang-format | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.clang-format b/.clang-format
index 5501478f..295356df 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,4 @@
-# IndentPPDirectives: None
+# IndentPPDirectives: AfterHash
 # SpaceInParentheses: false
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
@@ -12,22 +12,23 @@ AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakBeforeMultilineStrings: false
 BinPackArguments: true
 BinPackParameters: true
 BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeTernaryOperators: true
+BreakBeforeBraces: Linux
+BreakBeforeTernaryOperators: false
 ColumnLimit: 100
 IndentCaseLabels: true
 IndentWidth: 8
 IndentWrappedFunctionNames: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 Language: Cpp
+Cpp11BracedListStyle: false
 MaxEmptyLinesToKeep: 1
 PointerAlignment: Right
 SortIncludes: true
-SpaceAfterCStyleCast: false
+SpaceAfterCStyleCast: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false

From 7605f67f95b6ee1ac26dd8fb7f3121f319497943 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 11 Nov 2017 12:37:51 +0100
Subject: [PATCH 0683/1650] Prevent a UAF error during the execution of some
 commands

Some arguments were free'd first and then printed, leading to gibberish
being output to screen or a crash.

Found by Joseph Bisch.
Closes: !GL17
---
 src/fe-common/core/fe-channels.c | 2 +-
 src/fe-common/core/fe-server.c   | 2 +-
 src/fe-common/irc/fe-ircnet.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 8e434ab5..5cad51a7 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -278,9 +278,9 @@ static void cmd_channel_add_modify(const char *data, gboolean add)
 	rec = channel_setup_find(channel, chatnet);
 	if (rec == NULL) {
 		if (add == FALSE) {
-			cmd_params_free(free_arg);
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				TXT_CHANSETUP_NOT_FOUND, channel, chatnet);
+			cmd_params_free(free_arg);
 			return;
 		}
 
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 810afe83..074a83f3 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -136,9 +136,9 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	if (rec == NULL) {
 		if (add == FALSE) {
-			cmd_params_free(free_arg);
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				TXT_SETUPSERVER_NOT_FOUND, addr, port);
+			cmd_params_free(free_arg);
 			return;
 		}
 
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 8f1d2efd..5ae5ac05 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -106,9 +106,9 @@ static void cmd_network_add_modify(const char *data, gboolean add)
 	rec = ircnet_find(name);
 	if (rec == NULL) {
 		if (add == FALSE) {
-			cmd_params_free(free_arg);
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				IRCTXT_NETWORK_NOT_FOUND, name);
+			cmd_params_free(free_arg);
 			return;
 		}
 

From 3acc72f842a021ffcff8809c1f245ca614f68598 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 15 Nov 2017 16:33:06 +0100
Subject: [PATCH 0684/1650] reset colour at comma, like mIRC

Fixes #742 and #740
---
 src/fe-common/core/formats.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 005e6fb7..a340bffa 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1072,7 +1072,8 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
 	fg = fg_ret == NULL ? -1 : *fg_ret;
 	bg = bg_ret == NULL ? -1 : *bg_ret;
 
-	if (!i_isdigit(**str) && **str != ',') {
+	if (!i_isdigit(**str)) {
+		/* turn off color */
 		fg = -1;
 		bg = -1;
 	} else {
@@ -1085,11 +1086,8 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
 				(*str)++;
 			}
 		}
-		if (**str == ',') {
+		if ((*str)[0] == ',' && i_isdigit((*str)[1])) {
 			/* background color */
-			if (!i_isdigit((*str)[1]))
-				bg = -1;
-			else {
 				(*str)++;
 				bg = **str-'0';
 				(*str)++;
@@ -1097,7 +1095,6 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
 					bg = bg*10 + (**str-'0');
 					(*str)++;
 				}
-			}
 		}
 	}
 

From ba3c5801a4bb175fe1e0d0fd273ae15318dd2b03 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 16 Nov 2017 13:50:48 +0100
Subject: [PATCH 0685/1650] Update .clang-format

do not indent case deeper
---
 .clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index 295356df..1180910e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,7 +19,7 @@ BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Linux
 BreakBeforeTernaryOperators: false
 ColumnLimit: 100
-IndentCaseLabels: true
+IndentCaseLabels: false
 IndentWidth: 8
 IndentWrappedFunctionNames: true
 KeepEmptyLinesAtTheStartOfBlocks: false

From 47400d405a0680bfe4d69ce8b06ecbfd09931999 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 20 Nov 2017 14:17:15 +0100
Subject: [PATCH 0686/1650] Update formats.c

remove now useless check for ,
---
 src/fe-common/core/formats.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index a340bffa..37db6f7c 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1078,23 +1078,22 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
 		bg = -1;
 	} else {
 		/* foreground color */
-		if (**str != ',') {
-			fg = **str-'0';
+		fg = **str-'0';
+		(*str)++;
+		if (i_isdigit(**str)) {
+			fg = fg*10 + (**str-'0');
 			(*str)++;
-			if (i_isdigit(**str)) {
-				fg = fg*10 + (**str-'0');
-				(*str)++;
-			}
 		}
+
 		if ((*str)[0] == ',' && i_isdigit((*str)[1])) {
 			/* background color */
+			(*str)++;
+			bg = **str-'0';
+			(*str)++;
+			if (i_isdigit(**str)) {
+				bg = bg*10 + (**str-'0');
 				(*str)++;
-				bg = **str-'0';
-				(*str)++;
-				if (i_isdigit(**str)) {
-					bg = bg*10 + (**str-'0');
-					(*str)++;
-				}
+			}
 		}
 	}
 

From 1a49787ef25103d1a393c81e35fb949322fe0523 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 27 Nov 2017 19:37:11 -0800
Subject: [PATCH 0687/1650] Revert initializing pointers to NULL

To maintain C89 compatibility
---
 src/fe-common/irc/fe-events.c | 2 +-
 src/irc/core/modes.c          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index cc83d476..850174c5 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -224,7 +224,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
 static void event_mode(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
-	char *params = NULL, *channel = NULL, *mode = NULL;
+	char *params, *channel, *mode;
 
 	g_return_if_fail(data != NULL);
 
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index ecbf2571..cc3d0faf 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -480,8 +480,8 @@ static void event_user_mode(IRC_SERVER_REC *server, const char *data)
 static void event_mode(IRC_SERVER_REC *server, const char *data,
 		       const char *nick)
 {
-	IRC_CHANNEL_REC *chanrec = NULL;
-	char *params = NULL, *channel = NULL, *mode = NULL;
+	IRC_CHANNEL_REC *chanrec;
+	char *params, *channel, *mode;
 
 	g_return_if_fail(data != NULL);
 

From b2ca8c04778866bd07cf1b612adf0df55f45b78e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 29 Nov 2017 15:53:12 +0100
Subject: [PATCH 0688/1650] check for declaration-after-statement on travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b4b93919..1d8786c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ before_install:
 
 install:
     - ./configure --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
-    - make CFLAGS="-Wall -Werror"
+    - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
     - make install
 
 before_script:

From b332d448f7e3c7e4b40ea4a08932d0bd46007bbf Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 30 Nov 2017 11:15:47 +0100
Subject: [PATCH 0689/1650] fix comments

---
 src/core/ignore.h             |  6 +++---
 src/core/network-openssl.c    | 20 ++++++++++----------
 src/fe-fuzz/irssi.c           |  2 +-
 src/fe-text/statusbar-items.c |  4 ++--
 src/irc/core/sasl.c           |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/core/ignore.h b/src/core/ignore.h
index e18be3c4..31171b58 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -27,14 +27,14 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 		 const char *channel, const char *text, int level);
 
 enum {
-	IGNORE_FIND_PATTERN = 0x01, // Match the pattern
-	IGNORE_FIND_NOACT   = 0x02, // Exclude the targets with NOACT level
+	IGNORE_FIND_PATTERN = 0x01, /* Match the pattern */
+	IGNORE_FIND_NOACT   = 0x02, /* Exclude the targets with NOACT level */
 };
 
 IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern,
                 char **channels, const int flags);
 
-// Convenience wrappers around ignore_find_full, for compatibility purpose
+/* Convenience wrappers around ignore_find_full, for compatibility purpose */
 
 IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
 IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact);
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 7ec902fb..26496f47 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -600,7 +600,7 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
 	tls_rec_set_certificate_fingerprint(tls, cert_fingerprint_hex);
 	tls_rec_set_certificate_fingerprint_algorithm(tls, "SHA256");
 
-	// Show algorithm.
+	/* Show algorithm. */
 	switch (EVP_PKEY_id(pubkey)) {
 		case EVP_PKEY_RSA:
 			tls_rec_set_public_key_algorithm(tls, "RSA");
@@ -624,7 +624,7 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
 	tls_rec_set_public_key_size(tls, EVP_PKEY_bits(pubkey));
 	tls_rec_set_public_key_fingerprint_algorithm(tls, "SHA256");
 
-	// Read the NotBefore timestamp.
+	/* Read the NotBefore timestamp. */
 	bio = BIO_new(BIO_s_mem());
 	ASN1_TIME_print(bio, X509_get_notBefore(cert));
 	length = BIO_read(bio, buffer, sizeof(buffer));
@@ -632,7 +632,7 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
 	BIO_free(bio);
 	tls_rec_set_not_before(tls, buffer);
 
-	// Read the NotAfter timestamp.
+	/* Read the NotAfter timestamp. */
 	bio = BIO_new(BIO_s_mem());
 	ASN1_TIME_print(bio, X509_get_notAfter(cert));
 	length = BIO_read(bio, buffer, sizeof(buffer));
@@ -670,7 +670,7 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 	for (i = 0; i < sk_X509_num(chain); i++) {
 		cert_rec = tls_cert_create_rec();
 
-		// Subject.
+		/* Subject. */
 		name = X509_get_subject_name(sk_X509_value(chain, i));
 
 		for (j = 0; j < X509_NAME_entry_count(name); j++) {
@@ -689,7 +689,7 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 			tls_cert_rec_append_subject_entry(cert_rec, tls_cert_entry_rec);
 		}
 
-		// Issuer.
+		/* Issuer. */
 		name = X509_get_issuer_name(sk_X509_value(chain, i));
 
 		for (j = 0; j < X509_NAME_entry_count(name); j++) {
@@ -718,10 +718,10 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 	g_return_if_fail(ssl != NULL);
 
 #ifdef SSL_get_server_tmp_key
-	// Show ephemeral key information.
+	/* Show ephemeral key information. */
 	EVP_PKEY *ephemeral_key = NULL;
 
-	// OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598
+	/* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */
 #ifndef OPENSSL_NO_EC
 	EC_KEY *ec_key = NULL;
 #endif
@@ -759,7 +759,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 
 		EVP_PKEY_free(ephemeral_key);
 	}
-#endif // SSL_get_server_tmp_key.
+#endif /* SSL_get_server_tmp_key. */
 }
 
 GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server)
@@ -866,7 +866,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	set_peer_cert_chain_info(tls, chan->ssl);
 	set_server_temporary_key_info(tls, chan->ssl);
 
-	// Emit the TLS rec.
+	/* Emit the TLS rec. */
 	signal_emit("tls handshake finished", 2, chan->server, tls);
 
 	ret = 1;
@@ -893,7 +893,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
 		ret = irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server, tls);
 
 		if (! ret) {
-			// irssi_ssl_verify emits a warning itself.
+			/* irssi_ssl_verify emits a warning itself. */
 			goto done;
 		}
 	}
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index 77892aaf..c1b2ca9b 100644
--- a/src/fe-fuzz/irssi.c
+++ b/src/fe-fuzz/irssi.c
@@ -21,7 +21,7 @@
 #include "module.h"
 #include "modules-load.h"
 #include "levels.h"
-#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text
+#include "../fe-text/module-formats.h" /* need to explicitly grab from fe-text */
 #include "themes.h"
 #include "core.h"
 #include "fe-common-core.h"
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index de4499b4..c7d6bcfb 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -369,8 +369,8 @@ static void item_lag(SBAR_ITEM_REC *item, int get_size_only)
 	last_lag_unknown = lag_unknown;
 
 	if (lag_unknown) {
-		// "??)" in C becomes ']'
-		// See: https://en.wikipedia.org/wiki/Digraphs_and_trigraphs#C
+		/* "??)" in C becomes ']'
+		   See: https://en.wikipedia.org/wiki/Digraphs_and_trigraphs#C */
 		g_snprintf(str, sizeof(str), "%d (?""?)", lag / 100);
 	} else {
 		if (lag % 100 == 0)
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 635b7dfb..2b589579 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -30,16 +30,16 @@
  * Based on IRCv3 SASL Extension Specification:
  * http://ircv3.net/specs/extensions/sasl-3.1.html
  */
-#define AUTHENTICATE_CHUNK_SIZE 400 // bytes
+#define AUTHENTICATE_CHUNK_SIZE 400 /* bytes */
 
 /*
  * Maximum size to allow the buffer to grow to before the next fragment comes in. Note that
  * due to the way fragmentation works, the maximum message size will actually be:
  * floor(AUTHENTICATE_MAX_SIZE / AUTHENTICATE_CHUNK_SIZE) + AUTHENTICATE_CHUNK_SIZE - 1
  */
-#define AUTHENTICATE_MAX_SIZE 8192 // bytes
+#define AUTHENTICATE_MAX_SIZE 8192 /* bytes */
 
-#define SASL_TIMEOUT (20 * 1000) // ms
+#define SASL_TIMEOUT (20 * 1000) /* ms */
 
 static gboolean sasl_timeout(IRC_SERVER_REC *server)
 {

From 2b918fd9b8438eeef8f33556723140263e36f731 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 30 Nov 2017 11:17:05 +0100
Subject: [PATCH 0690/1650] move decls before code

---
 src/core/network-openssl.c      | 18 +++++++++---------
 src/fe-common/core/fe-windows.c |  4 +++-
 src/perl/common/Expando.xs      |  3 ++-
 src/perl/textui/Statusbar.xs    |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 26496f47..c7ce4b43 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -583,9 +583,6 @@ static void set_cipher_info(TLS_REC *tls, SSL *ssl)
 
 static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_fingerprint, size_t cert_fingerprint_size, unsigned char *public_key_fingerprint, size_t public_key_fingerprint_size)
 {
-	g_return_if_fail(tls != NULL);
-	g_return_if_fail(cert != NULL);
-
 	EVP_PKEY *pubkey = NULL;
 	char *cert_fingerprint_hex = NULL;
 	char *public_key_fingerprint_hex = NULL;
@@ -594,6 +591,9 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
 	char buffer[128];
 	size_t length;
 
+	g_return_if_fail(tls != NULL);
+	g_return_if_fail(cert != NULL);
+
 	pubkey = X509_get_pubkey(cert);
 
 	cert_fingerprint_hex = binary_to_hex(cert_fingerprint, cert_fingerprint_size);
@@ -647,9 +647,6 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
 
 static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 {
-	g_return_if_fail(tls != NULL);
-	g_return_if_fail(ssl != NULL);
-
 	int nid;
 	char *key = NULL;
 	char *value = NULL;
@@ -662,6 +659,9 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 	TLS_CERT_ENTRY_REC *tls_cert_entry_rec = NULL;
 	ASN1_STRING *data = NULL;
 
+	g_return_if_fail(tls != NULL);
+	g_return_if_fail(ssl != NULL);
+
 	chain = SSL_get_peer_cert_chain(ssl);
 
 	if (chain == NULL)
@@ -714,9 +714,6 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
 
 static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 {
-	g_return_if_fail(tls != NULL);
-	g_return_if_fail(ssl != NULL);
-
 #ifdef SSL_get_server_tmp_key
 	/* Show ephemeral key information. */
 	EVP_PKEY *ephemeral_key = NULL;
@@ -729,6 +726,9 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 	char *cname = NULL;
 	int nid;
 
+	g_return_if_fail(tls != NULL);
+	g_return_if_fail(ssl != NULL);
+
 	if (SSL_get_server_tmp_key(ssl, &ephemeral_key)) {
 		switch (EVP_PKEY_id(ephemeral_key)) {
 			case EVP_PKEY_DH:
diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 0afa2914..93f2e3f3 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -563,8 +563,10 @@ GSList *windows_get_sorted(void)
 	begin = windows_seq_begin();
 
 	while (iter != begin) {
+		WINDOW_REC *rec;
+
 		iter = g_sequence_iter_prev(iter);
-		WINDOW_REC *rec = g_sequence_get(iter);
+		rec = g_sequence_get(iter);
 
 		sorted = g_slist_prepend(sorted, rec);
 	}
diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs
index 26800b05..84853a02 100644
--- a/src/perl/common/Expando.xs
+++ b/src/perl/common/Expando.xs
@@ -74,6 +74,7 @@ static char *perl_expando_event(PerlExpando *rec, SERVER_REC *server,
 
 	ret = NULL;
 	if (SvTRUE(ERRSV)) {
+		char *error;
 		PERL_SCRIPT_REC *script = rec->script;
 
 		(void) POPs;
@@ -85,7 +86,7 @@ static char *perl_expando_event(PerlExpando *rec, SERVER_REC *server,
 			script_unregister_expandos(script);
 		/* rec has been freed now */
 
-		char *error = g_strdup(SvPV_nolen(ERRSV));
+		error = g_strdup(SvPV_nolen(ERRSV));
 		signal_emit("script error", 2, script, error);
 		g_free(error);
 	} else if (retcount > 0) {
diff --git a/src/perl/textui/Statusbar.xs b/src/perl/textui/Statusbar.xs
index 8b0e5f65..111deaa7 100644
--- a/src/perl/textui/Statusbar.xs
+++ b/src/perl/textui/Statusbar.xs
@@ -67,7 +67,7 @@ static void perl_statusbar_event(char *function, SBAR_ITEM_REC *item,
 
 	if (SvTRUE(ERRSV)) {
                 PERL_SCRIPT_REC *script;
-                char *package;
+                char *package, *error;
 
                 package = perl_function_get_package(function);
                 script = perl_script_find_package(package);
@@ -78,7 +78,7 @@ static void perl_statusbar_event(char *function, SBAR_ITEM_REC *item,
 			script_unregister_statusbars(script);
 		}
 
-		char *error = g_strdup(SvPV_nolen(ERRSV));
+		error = g_strdup(SvPV_nolen(ERRSV));
 		signal_emit("script error", 2, script, error);
 		g_free(error);
 	} else {

From b0637ad6ea8784d3b2be829ca40f9dddf0c049fc Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 2 Dec 2017 10:09:52 -0800
Subject: [PATCH 0691/1650] Update NULL comparison style and be C89 compatible

---
 src/irc/core/irc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 790c7122..a740b0da 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -287,11 +287,13 @@ char *event_get_params(const char *data, int count, ...)
 /* Given a string containing <params>, strip any colon prefixing <trailing>. */
 static void strip_params_colon(char *const params)
 {
-	if (!params) {
+	char *s;
+
+	if (params == NULL) {
 		return;
 	}
 
-	char *s = params;
+	s = params;
 	while (*s != '\0') {
 		if (*s == ':') {
 			memmove(s, s+1, strlen(s+1)+1);
@@ -299,7 +301,7 @@ static void strip_params_colon(char *const params)
 		}
 
 		s = strchr(s, ' ');
-		if (!s) {
+		if (s == NULL) {
 			return;
 		}
 

From 1328e1ba08430b0eaa589919272d732bb84a6921 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 21 Oct 2017 20:01:04 -0700
Subject: [PATCH 0692/1650] Add a test program to test mode parsing

This uses GLib's testing framework. It is to test the changes to the
mode parsing for #603.
---
 .gitignore                 |   3 +
 .travis.yml                |   4 +-
 Makefile.am                |   2 +-
 configure.ac               |   3 +
 tests/Makefile.am          |   1 +
 tests/irc/Makefile.am      |   1 +
 tests/irc/core/Makefile.am |  36 ++++++
 tests/irc/core/test-irc.c  | 230 +++++++++++++++++++++++++++++++++++++
 8 files changed, 278 insertions(+), 2 deletions(-)
 create mode 100644 tests/Makefile.am
 create mode 100644 tests/irc/Makefile.am
 create mode 100644 tests/irc/core/Makefile.am
 create mode 100644 tests/irc/core/test-irc.c

diff --git a/.gitignore b/.gitignore
index efc579cb..cf1cf72e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,9 @@ src/perl/*/Makefile.old
 src/fe-fuzz/crash-*
 src/fe-fuzz/oom-*
 
+tests/irc/core/test-irc
+tests/irc/core/test-irc.trs
+
 *.a
 *.bs
 *.la
diff --git a/.travis.yml b/.travis.yml
index 1d8786c4..1e04d943 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,5 +49,7 @@ before_script:
     - echo ^quit >> irssi-test/startup
     - irssi-build/bin/irssi --home irssi-test
     - cat irc.log.*
+    - cd $TRAVIS_BUILD_DIR
 
-script: true
+script:
+    - make check
diff --git a/Makefile.am b/Makefile.am
index f52ac92f..ba45d8ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ irssi-version.h:
 	VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) | \
 		cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) >$@
 
-SUBDIRS = src docs scripts themes utils
+SUBDIRS = src tests docs scripts themes utils
 
 confdir = $(sysconfdir)
 conf_DATA = irssi.conf
diff --git a/configure.ac b/configure.ac
index 4b65d434..bf15e6ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,6 +658,9 @@ src/perl/ui/Makefile.PL
 src/perl/textui/Makefile.PL
 scripts/Makefile
 scripts/examples/Makefile
+tests/Makefile
+tests/irc/Makefile
+tests/irc/core/Makefile
 docs/Makefile
 docs/help/Makefile
 docs/help/in/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 00000000..58c348df
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = irc
diff --git a/tests/irc/Makefile.am b/tests/irc/Makefile.am
new file mode 100644
index 00000000..52770885
--- /dev/null
+++ b/tests/irc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = core
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
new file mode 100644
index 00000000..fff2a246
--- /dev/null
+++ b/tests/irc/core/Makefile.am
@@ -0,0 +1,36 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	$(GLIB_CFLAGS)
+
+TESTS = test-irc
+check_PROGRAMS = test-irc
+
+test_irc_CPPFLAGS = \
+	-I$(top_srcdir)/src/irc/core \
+	$(AM_CPPFLAGS)
+
+test_irc_DEPENDENCIES = \
+	../../../src/core/libcore.a \
+	../../../src/lib-config/libirssi_config.a
+
+test_irc_LDADD = \
+	../../../src/core/libcore.a \
+	../../../src/lib-config/libirssi_config.a \
+	@GLIB_LIBS@ \
+	@OPENSSL_LIBS@
+
+test_irc_SOURCES = \
+	test-irc.c \
+	../../../src/irc/core/irc-cap.c \
+	../../../src/irc/core/irc-nicklist.c \
+	../../../src/irc/core/irc-queries.c \
+	../../../src/irc/core/irc-servers-reconnect.c \
+	../../../src/irc/core/irc-servers-setup.c \
+	../../../src/irc/core/irc-servers.c \
+	../../../src/irc/core/irc.c \
+	../../../src/irc/core/mode-lists.c \
+	../../../src/irc/core/modes.c \
+	../../../src/irc/core/servers-idle.c \
+	../../../src/irc/core/servers-redirect.c
diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c
new file mode 100644
index 00000000..7e85c9ba
--- /dev/null
+++ b/tests/irc/core/test-irc.c
@@ -0,0 +1,230 @@
+/*
+ test-irc.c : irssi
+
+    Copyright (C) 2017 Will Storey
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <glib.h>
+#include <irc.h>
+#include <string.h>
+
+static void test_event_get_param(void);
+static void test_event_get_params(void);
+
+int main(int argc, char **argv)
+{
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_add_func("/test/event_get_param", test_event_get_param);
+	g_test_add_func("/test/event_get_params", test_event_get_params);
+
+	return g_test_run();
+}
+
+static void test_event_get_param(void)
+{
+	struct test_case {
+		char const *const description;
+		char const *const input;
+		char const *const input_after;
+		char const *const output;
+	};
+
+	struct test_case const tests[] = {
+		{
+			.description = "Zero parameters",
+			.input       = "",
+			.input_after = "",
+			.output      = "",
+		},
+		{
+			.description = "One parameter",
+			.input       = "#test",
+			.input_after = "",
+			.output      = "#test",
+		},
+		{
+			.description = "One parameter, trailing space",
+			.input       = "#test ",
+			.input_after = "",
+			.output      = "#test",
+		},
+		{
+			.description = "One parameter, more trailing space",
+			.input       = "#test  ",
+			.input_after = " ",
+			.output      = "#test",
+		},
+		{
+			.description = "Two parameters",
+			.input       = "#test +o",
+			.input_after = "+o",
+			.output      = "#test",
+		},
+		{
+			.description = "Two parameters continued",
+			.input       = "+o",
+			.input_after = "",
+			.output      = "+o",
+		},
+		{
+			.description = "Two parameters with trailing space",
+			.input       = "#test +o ",
+			.input_after = "+o ",
+			.output      = "#test",
+		},
+		{
+			.description = "Two parameters with trailing space continued",
+			.input       = "+o ",
+			.input_after = "",
+			.output      = "+o",
+		},
+		{
+			.description = "Two parameters with inline and trailing space",
+			.input       = "#test  +o ",
+			.input_after = " +o ",
+			.output      = "#test",
+		},
+		/* TODO: It seems not ideal that the caller has to deal with inline space.
+		 */
+		{
+			.description = "Two parameters with inline and trailing space continued",
+			.input       = " +o ",
+			.input_after = "+o ",
+			.output      = "",
+		},
+	};
+
+	char *buf = g_malloc0(1024);
+
+	int i = 0;
+	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
+		struct test_case const test = tests[i];
+
+		memcpy(buf, test.input, strlen(test.input)+1);
+		char *input = buf;
+
+		char *const output = event_get_param(&input);
+
+		g_assert_cmpstr(input, ==, test.input_after);
+		g_assert_cmpstr(output, ==, test.output);
+	}
+
+	g_free(buf);
+}
+
+static void test_event_get_params(void)
+{
+	struct test_case {
+		char const *const description;
+		char const *const input;
+		char const *const output0;
+		char const *const output1;
+	};
+
+	struct test_case const tests[] = {
+		{
+			.description = "Only a channel",
+			.input       = "#test",
+			.output0     = "#test",
+			.output1     = "",
+		},
+		{
+			.description = "Only a channel with trailing space",
+			.input       = "#test ",
+			.output0     = "#test",
+			.output1     = "",
+		},
+		{
+			.description = "No :<trailing>, channel mode with one parameter after channel name",
+			.input       = "#test +i",
+			.output0     = "#test",
+			.output1     = "+i",
+		},
+		{
+			.description = "No :<trailing>, channel mode with two parameters after channel name",
+			.input       = "#test +o tester",
+			.output0     = "#test",
+			.output1     = "+o tester",
+		},
+		{
+			.description = "No :<trailing>, channel mode with three parameters afer channel name",
+			.input       = "#test +ov tester tester2",
+			.output0     = "#test",
+			.output1     = "+ov tester tester2",
+		},
+		{
+			.description = "No :<trailing>, channel mode with three parameters afer channel name, bunch of extra space",
+			.input       = "#test  +ov  tester  tester2 ",
+			.output0     = "#test",
+			.output1     = " +ov  tester  tester2 ",
+		},
+		{
+			.description = "Channel mode with one parameter after channel name, :<trailing> at the start of modes",
+			.input       = "#test :+i",
+			.output0     = "#test",
+			.output1     = "+i",
+		},
+		{
+			.description = "Channel mode with two parameters after channel name, :<trailing> at the  start of modes",
+			.input       = "#test :+o tester",
+			.output0     = "#test",
+			.output1     = "+o tester",
+		},
+		{
+			.description = "Channel mode with three parameters after channel name, :<trailing> at the start of modes",
+			.input       = "#test :+ov tester tester2",
+			.output0     = "#test",
+			.output1     = "+ov tester tester2",
+		},
+		{
+			.description = "Channel mode with two parameters after channel name, :<trailing> on the final parameter",
+			.input       = "#test +o :tester",
+			.output0     = "#test",
+			.output1     = "+o tester",
+		},
+		{
+			.description = "Channel mode with three parameters after channel name, :<trailing> on the final parameter",
+			.input       = "#test +ov tester :tester2",
+			.output0     = "#test",
+			.output1     = "+ov tester tester2",
+		},
+		{
+			.description = "Channel mode with three parameters after channel name, :<trailing> on the final parameter, also a second : present",
+			.input       = "#test +ov tester :tester2 hi:there",
+			.output0     = "#test",
+			.output1     = "+ov tester tester2 hi:there",
+		},
+	};
+
+	int i = 0;
+	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
+		struct test_case const test = tests[i];
+
+		char *output0 = NULL;
+		char *output1 = NULL;
+		char *const params = event_get_params(test.input, 2 | PARAM_FLAG_GETREST,
+				&output0, &output1);
+
+		/* params happens to always point at the first output */
+		g_assert_cmpstr(params, ==, test.output0);
+		g_assert_cmpstr(output0, ==, test.output0);
+		g_assert_cmpstr(output1, ==, test.output1);
+
+		g_free(params);
+	}
+}

From c20eddeb385974d6f46494e71ab63d4493df119b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 26 Nov 2017 16:19:31 +0100
Subject: [PATCH 0693/1650] add glib testing TAP utilities

---
 configure.ac               |   2 +
 m4/glibtests.m4            |  28 ++
 tests/irc/core/Makefile.am |   5 +-
 tests/irc/core/test-irc.c  |   1 +
 utils/Makefile.am          |   4 +-
 utils/glib-tap.mk          | 134 ++++++++
 utils/tap-driver.sh        | 652 +++++++++++++++++++++++++++++++++++++
 utils/tap-test             |   5 +
 8 files changed, 828 insertions(+), 3 deletions(-)
 create mode 100644 m4/glibtests.m4
 create mode 100644 utils/glib-tap.mk
 create mode 100755 utils/tap-driver.sh
 create mode 100755 utils/tap-test

diff --git a/configure.ac b/configure.ac
index bf15e6ae..c780b9b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,6 +295,8 @@ fi
 
 LIBS="$LIBS $GLIB_LIBS"
 
+GLIB_TESTS
+
 dnl **
 dnl ** OpenSSL checks
 dnl **
diff --git a/m4/glibtests.m4 b/m4/glibtests.m4
new file mode 100644
index 00000000..7d5920a4
--- /dev/null
+++ b/m4/glibtests.m4
@@ -0,0 +1,28 @@
+dnl GLIB_TESTS
+dnl
+
+AC_DEFUN([GLIB_TESTS],
+[
+  AC_ARG_ENABLE(installed-tests,
+                AS_HELP_STRING([--enable-installed-tests],
+                               [Enable installation of some test cases]),
+                [case ${enableval} in
+                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
+                  no)  ENABLE_INSTALLED_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
+  AC_ARG_ENABLE(always-build-tests,
+                AS_HELP_STRING([--enable-always-build-tests],
+                               [Enable always building tests during 'make all']),
+                [case ${enableval} in
+                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
+                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+  fi
+])
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index fff2a246..b5345067 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -1,11 +1,12 @@
+include $(top_srcdir)/utils/glib-tap.mk
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/core \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
-TESTS = test-irc
-check_PROGRAMS = test-irc
+test_programs = test-irc
 
 test_irc_CPPFLAGS = \
 	-I$(top_srcdir)/src/irc/core \
diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c
index 7e85c9ba..4c62e6a7 100644
--- a/tests/irc/core/test-irc.c
+++ b/tests/irc/core/test-irc.c
@@ -32,6 +32,7 @@ int main(int argc, char **argv)
 	g_test_add_func("/test/event_get_param", test_event_get_param);
 	g_test_add_func("/test/event_get_params", test_event_get_params);
 
+	g_test_set_nonfatal_assertions();
 	return g_test_run();
 }
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index be24c17f..8af5c8f7 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,6 @@
 EXTRA_DIST = \
 	file2header.sh \
 	irssi-version.sh \
-	syntax.pl
+	syntax.pl \
+	tap-driver.sh \
+	tap-test
diff --git a/utils/glib-tap.mk b/utils/glib-tap.mk
new file mode 100644
index 00000000..582f6d29
--- /dev/null
+++ b/utils/glib-tap.mk
@@ -0,0 +1,134 @@
+# GLIB - Library of useful C routines
+
+TESTS_ENVIRONMENT= \
+	G_TEST_SRCDIR="$(abs_srcdir)" 		\
+	G_TEST_BUILDDIR="$(abs_builddir)" 	\
+	G_DEBUG=gc-friendly 			\
+	MALLOC_CHECK_=2 			\
+	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/utils/tap-driver.sh
+LOG_COMPILER = $(top_srcdir)/utils/tap-test
+
+NULL =
+
+# initialize variables for unconditional += appending
+BUILT_SOURCES =
+BUILT_EXTRA_DIST =
+CLEANFILES = *.log *.trs
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+EXTRA_DIST =
+TESTS =
+
+installed_test_LTLIBRARIES =
+installed_test_PROGRAMS =
+installed_test_SCRIPTS =
+nobase_installed_test_DATA =
+
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+noinst_SCRIPTS =
+noinst_DATA =
+
+check_LTLIBRARIES =
+check_PROGRAMS =
+check_SCRIPTS =
+check_DATA =
+
+# We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
+# will belong in exactly one of the following variables.
+#
+# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
+#
+#   test_programs, test_scripts, test_data, test_ltlibraries
+#
+# The above are used to list files that are involved in both uninstalled and installed testing.  The
+# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
+# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
+# installed in the same way as it appears in the package layout.
+#
+# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
+# like so:
+#
+#   installed_test_programs, uninstalled_test_programs
+#   installed_test_scripts, uninstalled_test_scripts
+#   installed_test_data, uninstalled_test_data
+#   installed_test_ltlibraries, uninstalled_test_ltlibraries
+#
+# Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
+# that should not themselves be run as testcases (but exist to be used from other testcases):
+#
+#   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
+#   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
+#
+# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
+# file automatically end up in the tarball.
+#
+#   dist_test_scripts, dist_test_data, dist_test_extra_scripts
+#   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
+#   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
+#
+# Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
+# standard automake convention of not disting programs scripts or data by default.
+#
+# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
+# variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
+# gtester.  That's a bit strange for scripts, but it's possible.
+
+TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
+         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
+
+# Note: build even the installed-only targets during 'make check' to ensure that they still work.
+# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
+# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
+# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
+all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
+                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
+all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
+                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
+all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
+                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
+all_test_scripts     += $(all_dist_test_scripts)
+EXTRA_DIST           += $(all_dist_test_scripts)
+all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
+all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
+all_test_data        += $(all_dist_test_data)
+EXTRA_DIST           += $(all_dist_test_data)
+all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
+
+if ENABLE_ALWAYS_BUILD_TESTS
+noinst_LTLIBRARIES += $(all_test_ltlibs)
+noinst_PROGRAMS += $(all_test_programs)
+noinst_SCRIPTS += $(all_test_scripts)
+noinst_DATA += $(all_test_data)
+else
+check_LTLIBRARIES += $(all_test_ltlibs)
+check_PROGRAMS += $(all_test_programs)
+check_SCRIPTS += $(all_test_scripts)
+check_DATA += $(all_test_data)
+endif
+
+if ENABLE_INSTALLED_TESTS
+installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
+                          $(test_extra_programs) $(installed_test_extra_programs)
+installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
+                          $(test_extra_scripts) $(test_installed_extra_scripts)
+installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
+                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
+nobase_installed_test_DATA += $(test_data) $(installed_test_data)
+nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
+installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
+installed_testcases = $(test_programs) $(installed_test_programs) \
+                      $(test_scripts) $(installed_test_scripts) \
+                      $(dist_test_scripts) $(dist_installed_test_scripts)
+
+installed_test_meta_DATA = $(installed_testcases:=.test)
+
+%.test: %$(EXEEXT) Makefile
+	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
+	echo 'Type=session' >> $@.tmp; \
+	echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
+	mv $@.tmp $@)
+
+CLEANFILES += $(installed_test_meta_DATA)
+endif
diff --git a/utils/tap-driver.sh b/utils/tap-driver.sh
new file mode 100755
index 00000000..19aa531d
--- /dev/null
+++ b/utils/tap-driver.sh
@@ -0,0 +1,652 @@
+#! /bin/sh
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+scriptversion=2011-12-27.17; # UTC
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+me=tap-driver.sh
+
+fatal ()
+{
+  echo "$me: fatal: $*" >&2
+  exit 1
+}
+
+usage_error ()
+{
+  echo "$me: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
+                [--expect-failure={yes|no}] [--color-tests={yes|no}]
+                [--enable-hard-errors={yes|no}] [--ignore-exit]
+                [--diagnostic-string=STRING] [--merge|--no-merge]
+                [--comments|--no-comments] [--] TEST-COMMAND
+The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the result and output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=0
+color_tests=0
+merge=0
+ignore_exit=0
+comments=0
+diag_string='#'
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "$me $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) shift;; # No-op.
+  --merge) merge=1;;
+  --no-merge) merge=0;;
+  --ignore-exit) ignore_exit=1;;
+  --comments) comments=1;;
+  --no-comments) comments=0;;
+  --diagnostic-string) diag_string=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+test $# -gt 0 || usage_error "missing test command"
+
+case $expect_failure in
+  yes) expect_failure=1;;
+    *) expect_failure=0;;
+esac
+
+if test $color_tests = yes; then
+  init_colors='
+    color_map["red"]="" # Red.
+    color_map["grn"]="" # Green.
+    color_map["lgn"]="" # Light green.
+    color_map["blu"]="" # Blue.
+    color_map["mgn"]="" # Magenta.
+    color_map["std"]=""     # No color.
+    color_for_result["ERROR"] = "mgn"
+    color_for_result["PASS"]  = "grn"
+    color_for_result["XPASS"] = "red"
+    color_for_result["FAIL"]  = "red"
+    color_for_result["XFAIL"] = "lgn"
+    color_for_result["SKIP"]  = "blu"'
+else
+  init_colors=''
+fi
+
+# :; is there to work around a bug in bash 3.2 (and earlier) which
+# does not always set '$?' properly on redirection failure.
+# See the Autoconf manual for more details.
+:;{
+  (
+    # Ignore common signals (in this subshell only!), to avoid potential
+    # problems with Korn shells.  Some Korn shells are known to propagate
+    # to themselves signals that have killed a child process they were
+    # waiting for; this is done at least for SIGINT (and usually only for
+    # it, in truth).  Without the `trap' below, such a behaviour could
+    # cause a premature exit in the current subshell, e.g., in case the
+    # test command it runs gets terminated by a SIGINT.  Thus, the awk
+    # script we are piping into would never seen the exit status it
+    # expects on its last input line (which is displayed below by the
+    # last `echo $?' statement), and would thus die reporting an internal
+    # error.
+    # For more information, see the Autoconf manual and the threads:
+    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+    # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
+    trap : 1 3 2 13 15
+    if test $merge -gt 0; then
+      exec 2>&1
+    else
+      exec 2>&3
+    fi
+    "$@"
+    echo $?
+  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
+        -v me="$me" \
+        -v test_script_name="$test_name" \
+        -v log_file="$log_file" \
+        -v trs_file="$trs_file" \
+        -v expect_failure="$expect_failure" \
+        -v merge="$merge" \
+        -v ignore_exit="$ignore_exit" \
+        -v comments="$comments" \
+        -v diag_string="$diag_string" \
+'
+# FIXME: the usages of "cat >&3" below could be optimized when using
+# FIXME: GNU awk, and/on on systems that supports /dev/fd/.
+
+# Implementation note: in what follows, `result_obj` will be an
+# associative array that (partly) simulates a TAP result object
+# from the `TAP::Parser` perl module.
+
+## ----------- ##
+##  FUNCTIONS  ##
+## ----------- ##
+
+function fatal(msg)
+{
+  print me ": " msg | "cat >&2"
+  exit 1
+}
+
+function abort(where)
+{
+  fatal("internal error " where)
+}
+
+# Convert a boolean to a "yes"/"no" string.
+function yn(bool)
+{
+  return bool ? "yes" : "no";
+}
+
+function add_test_result(result)
+{
+  if (!test_results_index)
+    test_results_index = 0
+  test_results_list[test_results_index] = result
+  test_results_index += 1
+  test_results_seen[result] = 1;
+}
+
+# Whether the test script should be re-run by "make recheck".
+function must_recheck()
+{
+  for (k in test_results_seen)
+    if (k != "XFAIL" && k != "PASS" && k != "SKIP")
+      return 1
+  return 0
+}
+
+# Whether the content of the log file associated to this test should
+# be copied into the "global" test-suite.log.
+function copy_in_global_log()
+{
+  for (k in test_results_seen)
+    if (k != "PASS")
+      return 1
+  return 0
+}
+
+# FIXME: this can certainly be improved ...
+function get_global_test_result()
+{
+    if ("ERROR" in test_results_seen)
+      return "ERROR"
+    if ("FAIL" in test_results_seen || "XPASS" in test_results_seen)
+      return "FAIL"
+    all_skipped = 1
+    for (k in test_results_seen)
+      if (k != "SKIP")
+        all_skipped = 0
+    if (all_skipped)
+      return "SKIP"
+    return "PASS";
+}
+
+function stringify_result_obj(result_obj)
+{
+  if (result_obj["is_unplanned"] || result_obj["number"] != testno)
+    return "ERROR"
+
+  if (plan_seen == LATE_PLAN)
+    return "ERROR"
+
+  if (result_obj["directive"] == "TODO")
+    return result_obj["is_ok"] ? "XPASS" : "XFAIL"
+
+  if (result_obj["directive"] == "SKIP")
+    return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL;
+
+  if (length(result_obj["directive"]))
+      abort("in function stringify_result_obj()")
+
+  return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL
+}
+
+function decorate_result(result)
+{
+  color_name = color_for_result[result]
+  if (color_name)
+    return color_map[color_name] "" result "" color_map["std"]
+  # If we are not using colorized output, or if we do not know how
+  # to colorize the given result, we should return it unchanged.
+  return result
+}
+
+function report(result, details)
+{
+  if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/)
+    {
+      msg = ": " test_script_name
+      add_test_result(result)
+    }
+  else if (result == "#")
+    {
+      msg = " " test_script_name ":"
+    }
+  else
+    {
+      abort("in function report()")
+    }
+  if (length(details))
+    msg = msg " " details
+  # Output on console might be colorized.
+  print decorate_result(result) msg
+  # Log the result in the log file too, to help debugging (this is
+  # especially true when said result is a TAP error or "Bail out!").
+  print result msg | "cat >&3";
+}
+
+function testsuite_error(error_message)
+{
+  report("ERROR", "- " error_message)
+}
+
+function handle_tap_result()
+{
+  details = result_obj["number"];
+  if (length(result_obj["description"]))
+    details = details " " result_obj["description"]
+
+  if (plan_seen == LATE_PLAN)
+    {
+      details = details " # AFTER LATE PLAN";
+    }
+  else if (result_obj["is_unplanned"])
+    {
+       details = details " # UNPLANNED";
+    }
+  else if (result_obj["number"] != testno)
+    {
+       details = sprintf("%s # OUT-OF-ORDER (expecting %d)",
+                         details, testno);
+    }
+  else if (result_obj["directive"])
+    {
+      details = details " # " result_obj["directive"];
+      if (length(result_obj["explanation"]))
+        details = details " " result_obj["explanation"]
+    }
+
+  report(stringify_result_obj(result_obj), details)
+}
+
+# `skip_reason` should be empty whenever planned > 0.
+function handle_tap_plan(planned, skip_reason)
+{
+  planned += 0 # Avoid getting confused if, say, `planned` is "00"
+  if (length(skip_reason) && planned > 0)
+    abort("in function handle_tap_plan()")
+  if (plan_seen)
+    {
+      # Error, only one plan per stream is acceptable.
+      testsuite_error("multiple test plans")
+      return;
+    }
+  planned_tests = planned
+  # The TAP plan can come before or after *all* the TAP results; we speak
+  # respectively of an "early" or a "late" plan.  If we see the plan line
+  # after at least one TAP result has been seen, assume we have a late
+  # plan; in this case, any further test result seen after the plan will
+  # be flagged as an error.
+  plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN)
+  # If testno > 0, we have an error ("too many tests run") that will be
+  # automatically dealt with later, so do not worry about it here.  If
+  # $plan_seen is true, we have an error due to a repeated plan, and that
+  # has already been dealt with above.  Otherwise, we have a valid "plan
+  # with SKIP" specification, and should report it as a particular kind
+  # of SKIP result.
+  if (planned == 0 && testno == 0)
+    {
+      if (length(skip_reason))
+        skip_reason = "- "  skip_reason;
+      report("SKIP", skip_reason);
+    }
+}
+
+function extract_tap_comment(line)
+{
+  if (index(line, diag_string) == 1)
+    {
+      # Strip leading `diag_string` from `line`.
+      line = substr(line, length(diag_string) + 1)
+      # And strip any leading and trailing whitespace left.
+      sub("^[ \t]*", "", line)
+      sub("[ \t]*$", "", line)
+      # Return what is left (if any).
+      return line;
+    }
+  return "";
+}
+
+# When this function is called, we know that line is a TAP result line,
+# so that it matches the (perl) RE "^(not )?ok\b".
+function setup_result_obj(line)
+{
+  # Get the result, and remove it from the line.
+  result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
+  sub("^(not )?ok[ \t]*", "", line)
+
+  # If the result has an explicit number, get it and strip it; otherwise,
+  # automatically assing the next progresive number to it.
+  if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
+    {
+      match(line, "^[0-9]+")
+      # The final `+ 0` is to normalize numbers with leading zeros.
+      result_obj["number"] = substr(line, 1, RLENGTH) + 0
+      line = substr(line, RLENGTH + 1)
+    }
+  else
+    {
+      result_obj["number"] = testno
+    }
+
+  if (plan_seen == LATE_PLAN)
+    # No further test results are acceptable after a "late" TAP plan
+    # has been seen.
+    result_obj["is_unplanned"] = 1
+  else if (plan_seen && testno > planned_tests)
+    result_obj["is_unplanned"] = 1
+  else
+    result_obj["is_unplanned"] = 0
+
+  # Strip trailing and leading whitespace.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+
+  # This will have to be corrected if we have a "TODO"/"SKIP" directive.
+  result_obj["description"] = line
+  result_obj["directive"] = ""
+  result_obj["explanation"] = ""
+
+  if (index(line, "#") == 0)
+    return # No possible directive, nothing more to do.
+
+  # Directives are case-insensitive.
+  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
+
+  # See whether we have the directive, and if yes, where.
+  pos = match(line, rx "$")
+  if (!pos)
+    pos = match(line, rx "[^a-zA-Z0-9_]")
+
+  # If there was no TAP directive, we have nothing more to do.
+  if (!pos)
+    return
+
+  # Let`s now see if the TAP directive has been escaped.  For example:
+  #  escaped:     ok \# SKIP
+  #  not escaped: ok \\# SKIP
+  #  escaped:     ok \\\\\# SKIP
+  #  not escaped: ok \ # SKIP
+  if (substr(line, pos, 1) == "#")
+    {
+      bslash_count = 0
+      for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--)
+        bslash_count += 1
+      if (bslash_count % 2)
+        return # Directive was escaped.
+    }
+
+  # Strip the directive and its explanation (if any) from the test
+  # description.
+  result_obj["description"] = substr(line, 1, pos - 1)
+  # Now remove the test description from the line, that has been dealt
+  # with already.
+  line = substr(line, pos)
+  # Strip the directive, and save its value (normalized to upper case).
+  sub("^[ \t]*#[ \t]*", "", line)
+  result_obj["directive"] = toupper(substr(line, 1, 4))
+  line = substr(line, 5)
+  # Now get the explanation for the directive (if any), with leading
+  # and trailing whitespace removed.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+  result_obj["explanation"] = line
+}
+
+function get_test_exit_message(status)
+{
+  if (status == 0)
+    return ""
+  if (status !~ /^[1-9][0-9]*$/)
+    abort("getting exit status")
+  if (status < 127)
+    exit_details = ""
+  else if (status == 127)
+    exit_details = " (command not found?)"
+  else if (status >= 128 && status <= 255)
+    exit_details = sprintf(" (terminated by signal %d?)", status - 128)
+  else if (status > 256 && status <= 384)
+    # We used to report an "abnormal termination" here, but some Korn
+    # shells, when a child process die due to signal number n, can leave
+    # in $? an exit status of 256+n instead of the more standard 128+n.
+    # Apparently, both behaviours are allowed by POSIX (2008), so be
+    # prepared to handle them both.  See also Austing Group report ID
+    # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
+    exit_details = sprintf(" (terminated by signal %d?)", status - 256)
+  else
+    # Never seen in practice.
+    exit_details = " (abnormal termination)"
+  return sprintf("exited with status %d%s", status, exit_details)
+}
+
+function write_test_results()
+{
+  print ":global-test-result: " get_global_test_result() > trs_file
+  print ":recheck: "  yn(must_recheck()) > trs_file
+  print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
+  for (i = 0; i < test_results_index; i += 1)
+    print ":test-result: " test_results_list[i] > trs_file
+  close(trs_file);
+}
+
+BEGIN {
+
+## ------- ##
+##  SETUP  ##
+## ------- ##
+
+'"$init_colors"'
+
+# Properly initialized once the TAP plan is seen.
+planned_tests = 0
+
+COOKED_PASS = expect_failure ? "XPASS": "PASS";
+COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
+
+# Enumeration-like constants to remember which kind of plan (if any)
+# has been seen.  It is important that NO_PLAN evaluates "false" as
+# a boolean.
+NO_PLAN = 0
+EARLY_PLAN = 1
+LATE_PLAN = 2
+
+testno = 0     # Number of test results seen so far.
+bailed_out = 0 # Whether a "Bail out!" directive has been seen.
+
+# Whether the TAP plan has been seen or not, and if yes, which kind
+# it is ("early" is seen before any test result, "late" otherwise).
+plan_seen = NO_PLAN
+
+## --------- ##
+##  PARSING  ##
+## --------- ##
+
+is_first_read = 1
+
+while (1)
+  {
+    # Involutions required so that we are able to read the exit status
+    # from the last input line.
+    st = getline
+    if (st < 0) # I/O error.
+      fatal("I/O error while reading from input stream")
+    else if (st == 0) # End-of-input
+      {
+        if (is_first_read)
+          abort("in input loop: only one input line")
+        break
+      }
+    if (is_first_read)
+      {
+        is_first_read = 0
+        nextline = $0
+        continue
+      }
+    else
+      {
+        curline = nextline
+        nextline = $0
+        $0 = curline
+      }
+    # Copy any input line verbatim into the log file.
+    print | "cat >&3"
+    # Parsing of TAP input should stop after a "Bail out!" directive.
+    if (bailed_out)
+      continue
+
+    # TAP test result.
+    if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
+      {
+        testno += 1
+        setup_result_obj($0)
+        handle_tap_result()
+      }
+    # TAP plan (normal or "SKIP" without explanation).
+    else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
+      {
+        # The next two lines will put the number of planned tests in $0.
+        sub("^1\\.\\.", "")
+        sub("[^0-9]*$", "")
+        handle_tap_plan($0, "")
+        continue
+      }
+    # TAP "SKIP" plan, with an explanation.
+    else if ($0 ~ /^1\.\.0+[ \t]*#/)
+      {
+        # The next lines will put the skip explanation in $0, stripping
+        # any leading and trailing whitespace.  This is a little more
+        # tricky in truth, since we want to also strip a potential leading
+        # "SKIP" string from the message.
+        sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
+        sub("[ \t]*$", "");
+        handle_tap_plan(0, $0)
+      }
+    # "Bail out!" magic.
+    # Older versions of prove and TAP::Harness (e.g., 3.17) did not
+    # recognize a "Bail out!" directive when preceded by leading
+    # whitespace, but more modern versions (e.g., 3.23) do.  So we
+    # emulate the latter, "more modern" behaviour.
+    else if ($0 ~ /^[ \t]*Bail out!/)
+      {
+        bailed_out = 1
+        # Get the bailout message (if any), with leading and trailing
+        # whitespace stripped.  The message remains stored in `$0`.
+        sub("^[ \t]*Bail out![ \t]*", "");
+        sub("[ \t]*$", "");
+        # Format the error message for the
+        bailout_message = "Bail out!"
+        if (length($0))
+          bailout_message = bailout_message " " $0
+        testsuite_error(bailout_message)
+      }
+    # Maybe we have too look for dianogtic comments too.
+    else if (comments != 0)
+      {
+        comment = extract_tap_comment($0);
+        if (length(comment))
+          report("#", comment);
+      }
+  }
+
+## -------- ##
+##  FINISH  ##
+## -------- ##
+
+# A "Bail out!" directive should cause us to ignore any following TAP
+# error, as well as a non-zero exit status from the TAP producer.
+if (!bailed_out)
+  {
+    if (!plan_seen)
+      {
+        testsuite_error("missing test plan")
+      }
+    else if (planned_tests != testno)
+      {
+        bad_amount = testno > planned_tests ? "many" : "few"
+        testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
+                                bad_amount, planned_tests, testno))
+      }
+    if (!ignore_exit)
+      {
+        # Fetch exit status from the last line.
+        exit_message = get_test_exit_message(nextline)
+        if (exit_message)
+          testsuite_error(exit_message)
+      }
+  }
+
+write_test_results()
+
+exit 0
+
+} # End of "BEGIN" block.
+'
+
+# TODO: document that we consume the file descriptor 3 :-(
+} 3>"$log_file"
+
+test $? -eq 0 || fatal "I/O or internal error"
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/utils/tap-test b/utils/tap-test
new file mode 100755
index 00000000..481e333e
--- /dev/null
+++ b/utils/tap-test
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+# run a GTest in tap mode. The test binary is passed as $1
+
+$1 -k --tap

From 43d06369bf8e5c5e470dc2b00656ddcdb9ee0480 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:10:07 +0100
Subject: [PATCH 0694/1650] move fixtures to outer scope

---
 tests/irc/core/Makefile.am |  16 +-
 tests/irc/core/test-irc.c  | 372 ++++++++++++++++++-------------------
 2 files changed, 190 insertions(+), 198 deletions(-)

diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index b5345067..ccc6aa97 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/utils/glib-tap.mk
 
+PACKAGE_STRING=irc/core
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/core \
@@ -17,21 +19,11 @@ test_irc_DEPENDENCIES = \
 	../../../src/lib-config/libirssi_config.a
 
 test_irc_LDADD = \
+	../../../src/irc/core/libirc_core.a \
 	../../../src/core/libcore.a \
 	../../../src/lib-config/libirssi_config.a \
 	@GLIB_LIBS@ \
 	@OPENSSL_LIBS@
 
 test_irc_SOURCES = \
-	test-irc.c \
-	../../../src/irc/core/irc-cap.c \
-	../../../src/irc/core/irc-nicklist.c \
-	../../../src/irc/core/irc-queries.c \
-	../../../src/irc/core/irc-servers-reconnect.c \
-	../../../src/irc/core/irc-servers-setup.c \
-	../../../src/irc/core/irc-servers.c \
-	../../../src/irc/core/irc.c \
-	../../../src/irc/core/mode-lists.c \
-	../../../src/irc/core/modes.c \
-	../../../src/irc/core/servers-idle.c \
-	../../../src/irc/core/servers-redirect.c
+	test-irc.c
diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c
index 4c62e6a7..90ce856b 100644
--- a/tests/irc/core/test-irc.c
+++ b/tests/irc/core/test-irc.c
@@ -22,210 +22,210 @@
 #include <irc.h>
 #include <string.h>
 
-static void test_event_get_param(void);
-static void test_event_get_params(void);
+typedef struct {
+	char const *const description;
+	char const *const input;
+	char const *const input_after;
+	char const *const output;
+} event_get_param_test_case;
+
+event_get_param_test_case const event_get_param_fixtures[] = {
+	{
+		.description = "Zero parameters",
+		.input       = "",
+		.input_after = "",
+		.output      = "",
+	},
+	{
+		.description = "One parameter",
+		.input       = "#test",
+		.input_after = "",
+		.output      = "#test",
+	},
+	{
+		.description = "One parameter, trailing space",
+		.input       = "#test ",
+		.input_after = "",
+		.output      = "#test",
+	},
+	{
+		.description = "One parameter, more trailing space",
+		.input       = "#test  ",
+		.input_after = " ",
+		.output      = "#test",
+	},
+	{
+		.description = "Two parameters",
+		.input       = "#test +o",
+		.input_after = "+o",
+		.output      = "#test",
+	},
+	{
+		.description = "Two parameters continued",
+		.input       = "+o",
+		.input_after = "",
+		.output      = "+o",
+	},
+	{
+		.description = "Two parameters with trailing space",
+		.input       = "#test +o ",
+		.input_after = "+o ",
+		.output      = "#test",
+	},
+	{
+		.description = "Two parameters with trailing space continued",
+		.input       = "+o ",
+		.input_after = "",
+		.output      = "+o",
+	},
+	{
+		.description = "Two parameters with inline and trailing space",
+		.input       = "#test  +o ",
+		.input_after = " +o ",
+		.output      = "#test",
+	},
+	/* TODO: It seems not ideal that the caller has to deal with inline space.
+	 */
+	{
+		.description = "Two parameters with inline and trailing space continued",
+		.input       = " +o ",
+		.input_after = "+o ",
+		.output      = "",
+	},
+};
+
+static void test_event_get_param(const event_get_param_test_case *test);
+
+typedef struct {
+	char const *const description;
+	char const *const input;
+	char const *const output0;
+	char const *const output1;
+} event_get_params_test_case;
+
+event_get_params_test_case const event_get_params_fixtures[] = {
+	{
+		.description = "Only a channel",
+		.input       = "#test",
+		.output0     = "#test",
+		.output1     = "",
+	},
+	{
+		.description = "Only a channel with trailing space",
+		.input       = "#test ",
+		.output0     = "#test",
+		.output1     = "",
+	},
+	{
+		.description = "No :<trailing>, channel mode with one parameter after channel name",
+		.input       = "#test +i",
+		.output0     = "#test",
+		.output1     = "+i",
+	},
+	{
+		.description = "No :<trailing>, channel mode with two parameters after channel name",
+		.input       = "#test +o tester",
+		.output0     = "#test",
+		.output1     = "+o tester",
+	},
+	{
+		.description = "No :<trailing>, channel mode with three parameters afer channel name",
+		.input       = "#test +ov tester tester2",
+		.output0     = "#test",
+		.output1     = "+ov tester tester2",
+	},
+	{
+		.description = "No :<trailing>, channel mode with three parameters afer channel name, bunch of extra space",
+		.input       = "#test  +ov  tester  tester2 ",
+		.output0     = "#test",
+		.output1     = " +ov  tester  tester2 ",
+	},
+	{
+		.description = "Channel mode with one parameter after channel name, :<trailing> at the start of modes",
+		.input       = "#test :+i",
+		.output0     = "#test",
+		.output1     = "+i",
+	},
+	{
+		.description = "Channel mode with two parameters after channel name, :<trailing> at the  start of modes",
+		.input       = "#test :+o tester",
+		.output0     = "#test",
+		.output1     = "+o tester",
+	},
+	{
+		.description = "Channel mode with three parameters after channel name, :<trailing> at the start of modes",
+		.input       = "#test :+ov tester tester2",
+		.output0     = "#test",
+		.output1     = "+ov tester tester2",
+	},
+	{
+		.description = "Channel mode with two parameters after channel name, :<trailing> on the final parameter",
+		.input       = "#test +o :tester",
+		.output0     = "#test",
+		.output1     = "+o tester",
+	},
+	{
+		.description = "Channel mode with three parameters after channel name, :<trailing> on the final parameter",
+		.input       = "#test +ov tester :tester2",
+		.output0     = "#test",
+		.output1     = "+ov tester tester2",
+	},
+	{
+		.description = "Channel mode with three parameters after channel name, :<trailing> on the final parameter, also a second : present",
+		.input       = "#test +ov tester :tester2 hi:there",
+		.output0     = "#test",
+		.output1     = "+ov tester tester2 hi:there",
+	},
+};
+
+static void test_event_get_params(const event_get_params_test_case *test);
 
 int main(int argc, char **argv)
 {
+	int i;
+
 	g_test_init(&argc, &argv, NULL);
 
-	g_test_add_func("/test/event_get_param", test_event_get_param);
-	g_test_add_func("/test/event_get_params", test_event_get_params);
+	for (i = 0; i < G_N_ELEMENTS(event_get_param_fixtures); i++) {
+		char *name = g_strdup_printf("/test/event_get_params/%d", i);
+		g_test_add_data_func(name, &event_get_params_fixtures[i], (GTestDataFunc)test_event_get_params);
+		g_free(name);
+	}
+	for (i = 0; i < G_N_ELEMENTS(event_get_param_fixtures); i++) {
+		char *name = g_strdup_printf("/test/event_get_param/%d", i);
+		g_test_add_data_func(name, &event_get_param_fixtures[i], (GTestDataFunc)test_event_get_param);
+		g_free(name);
+	}
 
 	g_test_set_nonfatal_assertions();
 	return g_test_run();
 }
 
-static void test_event_get_param(void)
+static void test_event_get_param(const event_get_param_test_case *test)
 {
-	struct test_case {
-		char const *const description;
-		char const *const input;
-		char const *const input_after;
-		char const *const output;
-	};
+	char *buf, *input, *output;
 
-	struct test_case const tests[] = {
-		{
-			.description = "Zero parameters",
-			.input       = "",
-			.input_after = "",
-			.output      = "",
-		},
-		{
-			.description = "One parameter",
-			.input       = "#test",
-			.input_after = "",
-			.output      = "#test",
-		},
-		{
-			.description = "One parameter, trailing space",
-			.input       = "#test ",
-			.input_after = "",
-			.output      = "#test",
-		},
-		{
-			.description = "One parameter, more trailing space",
-			.input       = "#test  ",
-			.input_after = " ",
-			.output      = "#test",
-		},
-		{
-			.description = "Two parameters",
-			.input       = "#test +o",
-			.input_after = "+o",
-			.output      = "#test",
-		},
-		{
-			.description = "Two parameters continued",
-			.input       = "+o",
-			.input_after = "",
-			.output      = "+o",
-		},
-		{
-			.description = "Two parameters with trailing space",
-			.input       = "#test +o ",
-			.input_after = "+o ",
-			.output      = "#test",
-		},
-		{
-			.description = "Two parameters with trailing space continued",
-			.input       = "+o ",
-			.input_after = "",
-			.output      = "+o",
-		},
-		{
-			.description = "Two parameters with inline and trailing space",
-			.input       = "#test  +o ",
-			.input_after = " +o ",
-			.output      = "#test",
-		},
-		/* TODO: It seems not ideal that the caller has to deal with inline space.
-		 */
-		{
-			.description = "Two parameters with inline and trailing space continued",
-			.input       = " +o ",
-			.input_after = "+o ",
-			.output      = "",
-		},
-	};
+	input = buf = g_strdup(test->input);
+	output = event_get_param(&input);
 
-	char *buf = g_malloc0(1024);
-
-	int i = 0;
-	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
-		struct test_case const test = tests[i];
-
-		memcpy(buf, test.input, strlen(test.input)+1);
-		char *input = buf;
-
-		char *const output = event_get_param(&input);
-
-		g_assert_cmpstr(input, ==, test.input_after);
-		g_assert_cmpstr(output, ==, test.output);
-	}
+	g_assert_cmpstr(input, ==, test->input_after);
+	g_assert_cmpstr(output, ==, test->output);
 
 	g_free(buf);
 }
 
-static void test_event_get_params(void)
+static void test_event_get_params(const event_get_params_test_case *test)
 {
-	struct test_case {
-		char const *const description;
-		char const *const input;
-		char const *const output0;
-		char const *const output1;
-	};
+	char *output0, *output1, *params;
+	output0 = NULL;
+	output1 = NULL;
+	params = event_get_params(test->input, 2 | PARAM_FLAG_GETREST,
+			&output0, &output1);
 
-	struct test_case const tests[] = {
-		{
-			.description = "Only a channel",
-			.input       = "#test",
-			.output0     = "#test",
-			.output1     = "",
-		},
-		{
-			.description = "Only a channel with trailing space",
-			.input       = "#test ",
-			.output0     = "#test",
-			.output1     = "",
-		},
-		{
-			.description = "No :<trailing>, channel mode with one parameter after channel name",
-			.input       = "#test +i",
-			.output0     = "#test",
-			.output1     = "+i",
-		},
-		{
-			.description = "No :<trailing>, channel mode with two parameters after channel name",
-			.input       = "#test +o tester",
-			.output0     = "#test",
-			.output1     = "+o tester",
-		},
-		{
-			.description = "No :<trailing>, channel mode with three parameters afer channel name",
-			.input       = "#test +ov tester tester2",
-			.output0     = "#test",
-			.output1     = "+ov tester tester2",
-		},
-		{
-			.description = "No :<trailing>, channel mode with three parameters afer channel name, bunch of extra space",
-			.input       = "#test  +ov  tester  tester2 ",
-			.output0     = "#test",
-			.output1     = " +ov  tester  tester2 ",
-		},
-		{
-			.description = "Channel mode with one parameter after channel name, :<trailing> at the start of modes",
-			.input       = "#test :+i",
-			.output0     = "#test",
-			.output1     = "+i",
-		},
-		{
-			.description = "Channel mode with two parameters after channel name, :<trailing> at the  start of modes",
-			.input       = "#test :+o tester",
-			.output0     = "#test",
-			.output1     = "+o tester",
-		},
-		{
-			.description = "Channel mode with three parameters after channel name, :<trailing> at the start of modes",
-			.input       = "#test :+ov tester tester2",
-			.output0     = "#test",
-			.output1     = "+ov tester tester2",
-		},
-		{
-			.description = "Channel mode with two parameters after channel name, :<trailing> on the final parameter",
-			.input       = "#test +o :tester",
-			.output0     = "#test",
-			.output1     = "+o tester",
-		},
-		{
-			.description = "Channel mode with three parameters after channel name, :<trailing> on the final parameter",
-			.input       = "#test +ov tester :tester2",
-			.output0     = "#test",
-			.output1     = "+ov tester tester2",
-		},
-		{
-			.description = "Channel mode with three parameters after channel name, :<trailing> on the final parameter, also a second : present",
-			.input       = "#test +ov tester :tester2 hi:there",
-			.output0     = "#test",
-			.output1     = "+ov tester tester2 hi:there",
-		},
-	};
+	/* params happens to always point at the first output */
+	g_assert_cmpstr(params, ==, test->output0);
+	g_assert_cmpstr(output0, ==, test->output0);
+	g_assert_cmpstr(output1, ==, test->output1);
 
-	int i = 0;
-	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
-		struct test_case const test = tests[i];
-
-		char *output0 = NULL;
-		char *output1 = NULL;
-		char *const params = event_get_params(test.input, 2 | PARAM_FLAG_GETREST,
-				&output0, &output1);
-
-		/* params happens to always point at the first output */
-		g_assert_cmpstr(params, ==, test.output0);
-		g_assert_cmpstr(output0, ==, test.output0);
-		g_assert_cmpstr(output1, ==, test.output1);
-
-		g_free(params);
-	}
+	g_free(params);
 }

From d932e6e4b78383e0874721a76a8480a9a7e03667 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:10:49 +0100
Subject: [PATCH 0695/1650] add test case for format_real_length

---
 configure.ac                        |  2 ++
 tests/Makefile.am                   |  2 +-
 tests/fe-common/Makefile.am         |  1 +
 tests/fe-common/core/Makefile.am    | 28 ++++++++++++++++
 tests/fe-common/core/test-formats.c | 50 +++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 tests/fe-common/Makefile.am
 create mode 100644 tests/fe-common/core/Makefile.am
 create mode 100644 tests/fe-common/core/test-formats.c

diff --git a/configure.ac b/configure.ac
index c780b9b8..76ada09f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,6 +661,8 @@ src/perl/textui/Makefile.PL
 scripts/Makefile
 scripts/examples/Makefile
 tests/Makefile
+tests/fe-common/Makefile
+tests/fe-common/core/Makefile
 tests/irc/Makefile
 tests/irc/core/Makefile
 docs/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58c348df..e16d190e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1 @@
-SUBDIRS = irc
+SUBDIRS = fe-common irc
diff --git a/tests/fe-common/Makefile.am b/tests/fe-common/Makefile.am
new file mode 100644
index 00000000..52770885
--- /dev/null
+++ b/tests/fe-common/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = core
diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am
new file mode 100644
index 00000000..070b6052
--- /dev/null
+++ b/tests/fe-common/core/Makefile.am
@@ -0,0 +1,28 @@
+include $(top_srcdir)/utils/glib-tap.mk
+
+PACKAGE_STRING=fe-common/core
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core \
+	$(GLIB_CFLAGS)
+
+test_programs = test-formats
+
+test_formats_CPPFLAGS = \
+	-I$(top_srcdir)/src/fe-common/core \
+	$(AM_CPPFLAGS)
+
+test_formats_DEPENDENCIES = \
+	../../../src/core/libcore.a \
+	../../../src/lib-config/libirssi_config.a
+
+test_formats_LDADD = \
+	../../../src/fe-common/core/libfe_common_core.a \
+	../../../src/core/libcore.a \
+	../../../src/lib-config/libirssi_config.a \
+	@GLIB_LIBS@ \
+	@OPENSSL_LIBS@
+
+test_formats_SOURCES = \
+	test-formats.c
diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c
new file mode 100644
index 00000000..9ef23fd6
--- /dev/null
+++ b/tests/fe-common/core/test-formats.c
@@ -0,0 +1,50 @@
+#include "common.h"
+#include "formats.h"
+
+#define MAX_LENGTH 5
+
+typedef struct {
+	char const *const description;
+	char const *const input;
+	int const result[ MAX_LENGTH ];
+} format_real_length_test_case;
+
+static void test_format_real_length(const format_real_length_test_case *test);
+
+format_real_length_test_case const format_real_length_fixtures[] = {
+	{
+		.description = "",
+		.input = "%4%w ",
+		.result = { 0, 5, 5, -1 },
+	},
+};
+
+int main(int argc, char **argv)
+{
+	int i;
+
+	g_test_init(&argc, &argv, NULL);
+
+	for (i = 0; i < G_N_ELEMENTS(format_real_length_fixtures); i++) {
+		char *name = g_strdup_printf("/test/format_real_length/%d", i);
+		g_test_add_data_func(name, &format_real_length_fixtures[i], (GTestDataFunc)test_format_real_length);
+		g_free(name);
+	}
+
+	g_test_set_nonfatal_assertions();
+	return g_test_run();
+}
+
+static void test_format_real_length(const format_real_length_test_case *test)
+{
+	int j, len;
+
+	g_test_message("Testing format %s", test->input);
+
+	for (j = 0; test->result[j] != -1; j++) {
+		len = format_real_length(test->input, j);
+		g_assert_cmpint(len, ==, test->result[j]);
+	}
+
+	return;
+}

From d6458304d7dba0644fb4b682e09baf0acebdbb97 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:23:51 +0100
Subject: [PATCH 0696/1650] mess with travis

---
 .travis.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e04d943..a6ff601f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,13 @@ perl:
     # - "5.18-shrplib"
     - "system-perl"
 env:
-    - CC=clang
-    - CC=gcc
+    - CC=clang UNITTESTS=false
+    - CC=gcc   UNITTESTS=false
+    - CC=clang UNITTESTS=true
+matrix:
+    exclude:
+        - env: CC=clang UNITTESTS=true
+          perl: "system-perl"
 
 addons:
     apt:
@@ -31,11 +36,12 @@ before_install:
 
 install:
     - ./configure --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
+      $( $UNITTESTS && echo --enable-always-build-tests )
     - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
     - make install
 
 before_script:
-    - cd
+    - pushd ~
     - mkdir irssi-test
     - echo echo automated irssi launch test > irssi-test/startup;
       echo ^set settings_autosave off >> irssi-test/startup;
@@ -47,9 +53,12 @@ before_script:
     - echo load perl >> irssi-test/startup
     - echo load proxy >> irssi-test/startup
     - echo ^quit >> irssi-test/startup
-    - irssi-build/bin/irssi --home irssi-test
-    - cat irc.log.*
-    - cd $TRAVIS_BUILD_DIR
 
 script:
-    - make check
+    - irssi-build/bin/irssi --home irssi-test
+    - popd
+    - if $UNITTESTS; then make -C tests -sk check; fi
+
+after_script:
+    - cat ~/irc.log.*;
+      find -name test-suite.log -exec cat {} +

From eb9e2ed6fdacc3fa262b4907de51dea3f12be5fe Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 28 Nov 2017 11:00:46 +0100
Subject: [PATCH 0697/1650] Update test-irc.c

Fix wrong array (missing an s)
---
 tests/irc/core/test-irc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c
index 90ce856b..c96956df 100644
--- a/tests/irc/core/test-irc.c
+++ b/tests/irc/core/test-irc.c
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
 
 	g_test_init(&argc, &argv, NULL);
 
-	for (i = 0; i < G_N_ELEMENTS(event_get_param_fixtures); i++) {
+	for (i = 0; i < G_N_ELEMENTS(event_get_params_fixtures); i++) {
 		char *name = g_strdup_printf("/test/event_get_params/%d", i);
 		g_test_add_data_func(name, &event_get_params_fixtures[i], (GTestDataFunc)test_event_get_params);
 		g_free(name);

From 8b34871ea67c420b045ead9e317b67a247c02aae Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 29 Nov 2017 14:40:40 +0100
Subject: [PATCH 0698/1650] make travis pass despite failures

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a6ff601f..b0bc78e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
     exclude:
         - env: CC=clang UNITTESTS=true
           perl: "system-perl"
+    allow_failures:
+        - env: CC=clang UNITTESTS=true
 
 addons:
     apt:

From 58557d18c49c11cd4a4de44c5a9e7c00f2d8f880 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 7 Dec 2017 12:08:20 +0100
Subject: [PATCH 0699/1650] add separator in travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0bc78e8..e2b3f57c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,5 +62,5 @@ script:
     - if $UNITTESTS; then make -C tests -sk check; fi
 
 after_script:
-    - cat ~/irc.log.*;
-      find -name test-suite.log -exec cat {} +
+    - cat ~/irc.log.*
+    - find -name test-suite.log -exec cat {} +

From ef07b3c60c80a828f529a2075246185d7d0b5b25 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Tue, 2 Jan 2018 20:21:07 -0500
Subject: [PATCH 0700/1650] Remove redundant if case

---
 src/fe-fuzz/irc/core/event-get-params.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index 6266ffb6..beeca6ba 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -74,8 +74,6 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 		params = event_get_params(copy, 2, &output0, &output1);
 	} else if (count % 8 == 6) {
 		params = event_get_params(copy, 3, &output0, &output1, &output2);
-	} else if (count % 8 == 7) {
-		params = event_get_params(copy, 4, &output0, &output1, &output2, &output3);
 	} else {
 		params = event_get_params(copy, 4, &output0, &output1, &output2, &output3);
 	}

From 15705432e1fb88d9f784cb3fc12c89f8f9164043 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Tue, 2 Jan 2018 20:22:38 -0500
Subject: [PATCH 0701/1650] Remove outdated comment

---
 src/fe-fuzz/irc/core/event-get-params.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index beeca6ba..c50b6205 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -52,7 +52,6 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 		return 0;
 	}
 	uint8_t count = *data;
-	/* malloc(size) instead of size+1, because we already used one byte of data */
 	gchar *copy = g_strndup((const gchar *)data+1, size-1);
 
 	char *output0;

From 54d453623d879ea83d0818a80bd14151192953ec Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 3 Jan 2018 12:45:43 +0100
Subject: [PATCH 0702/1650] do not record topic change time when sender is
 blank

---
 src/irc/core/channel-events.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index b0bddab2..46bbd5fa 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -138,7 +138,13 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 	g_free_not_null(chanrec->topic_by);
 	chanrec->topic_by = g_strdup(setby);
 
-	chanrec->topic_time = settime;
+	if (chanrec->topic_by == NULL) {
+		/* ensure invariant topic_time > 0 <=> topic_by != NULL.
+		   this could be triggered by a topic command without sender */
+		chanrec->topic_time = 0;
+	} else {
+		chanrec->topic_time = settime;
+	}
 
 	signal_emit("channel topic changed", 1, chanrec);
 }

From 7a83c63701b7395ee6cc606905314318eef77971 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 3 Jan 2018 14:09:48 +0100
Subject: [PATCH 0703/1650] check if \\c is complete in eval

---
 src/core/misc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index e589b8c5..4e9f4bbe 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -703,8 +703,11 @@ int expand_escape(const char **data)
 		*data += 2;
 		return strtol(digit, NULL, 16);
 	case 'c':
-                /* control character (\cA = ^A) */
-                (*data)++;
+		/* check for end of string */
+		if ((*data)[1] == '\0')
+			return 0;
+		/* control character (\cA = ^A) */
+		(*data)++;
 		return i_toupper(**data) - 64;
 	case '0': case '1': case '2': case '3':
 	case '4': case '5': case '6': case '7':

From 2361d4b1e5d38701f35146219ceddd318ac4e645 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 3 Jan 2018 15:35:18 +0100
Subject: [PATCH 0704/1650] rewrite completion code and check for direct match
 of separator

---
 src/fe-common/core/completion.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index e78fe7d5..fd452e5c 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -187,12 +187,18 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 			char *old;
 
 			old = linestart;
-			linestart = *linestart == '\0' ?
-				g_strdup(word) :
-				g_strdup_printf("%s%c%s",
-						/* do not accidentally duplicate the word separator */
-						line == wordstart - 1 ? "" : linestart,
-						old_wordstart[-1], word);
+			/* we want to move word into linestart */
+			if (*linestart == '\0') {
+				linestart = g_strdup(word);
+			} else {
+				GString *str = g_string_new(linestart);
+				if (old_wordstart[-1] != str->str[str->len - 1]) {
+					/* do not accidentally duplicate the word separator */
+					g_string_append_c(str, old_wordstart[-1]);
+				}
+				g_string_append(str, word);
+				linestart = g_string_free(str, FALSE);
+			}
 			g_free(old);
 
 			g_free(word);

From cc17837a9b326ec9100a35981348fa0f5d6316fa Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 3 Jan 2018 15:51:51 +0100
Subject: [PATCH 0705/1650] disable variable arguments code

---
 src/core/special-vars.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index aaf8da8f..f254c200 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -384,6 +384,7 @@ char *parse_special(char **cmd, SERVER_REC *server, void *item,
 	}
 
 	nest_free = FALSE; nest_value = NULL;
+#if 0 /* this code is disabled due to security issues until it is fixed */
 	if (**cmd == '(' && (*cmd)[1] != '\0') {
 		/* subvariable */
 		int toplevel = nested_orig_cmd == NULL;
@@ -412,6 +413,9 @@ char *parse_special(char **cmd, SERVER_REC *server, void *item,
 
                 if (toplevel) nested_orig_cmd = NULL;
 	}
+#else
+	if (nested_orig_cmd) nested_orig_cmd = NULL;
+#endif
 
 	if (**cmd != '{')
 		brackets = FALSE;

From 5bddfe7b7336f6b48408c72955dbcb664cc4dc97 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Jan 2018 14:29:57 +0100
Subject: [PATCH 0706/1650] add new test skeleton

---
 configure.ac                |  1 +
 tests/irc/Makefile.am       |  4 +++-
 tests/irc/flood/Makefile.am | 32 ++++++++++++++++++++++++++++++++
 tests/irc/flood/test-796.c  | 29 +++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 tests/irc/flood/Makefile.am
 create mode 100644 tests/irc/flood/test-796.c

diff --git a/configure.ac b/configure.ac
index 76ada09f..61e96149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,6 +665,7 @@ tests/fe-common/Makefile
 tests/fe-common/core/Makefile
 tests/irc/Makefile
 tests/irc/core/Makefile
+tests/irc/flood/Makefile
 docs/Makefile
 docs/help/Makefile
 docs/help/in/Makefile
diff --git a/tests/irc/Makefile.am b/tests/irc/Makefile.am
index 52770885..d42cfc87 100644
--- a/tests/irc/Makefile.am
+++ b/tests/irc/Makefile.am
@@ -1 +1,3 @@
-SUBDIRS = core
+SUBDIRS = \
+	core \
+	flood
diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
new file mode 100644
index 00000000..4bc4a93c
--- /dev/null
+++ b/tests/irc/flood/Makefile.am
@@ -0,0 +1,32 @@
+include $(top_srcdir)/utils/glib-tap.mk
+
+PACKAGE_STRING=irc/flood
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	$(GLIB_CFLAGS)
+
+test_programs = \
+	test-796
+
+test_796_CPPFLAGS = \
+	-I$(top_srcdir)/src/irc/core \
+	-I$(top_srcdir)/src/irc/flood \
+	$(AM_CPPFLAGS)
+
+test_796_DEPENDENCIES = \
+	../../../src/core/libcore.a \
+	../../../src/lib-config/libirssi_config.a
+
+test_796_LDADD = \
+	../../../src/irc/flood/libirc_flood.a \
+	../../../src/irc/core/libirc_core.a \
+	../../../src/core/libcore.a \
+	../../../src/lib-config/libirssi_config.a \
+	@GLIB_LIBS@ \
+	@OPENSSL_LIBS@
+
+test_796_SOURCES = \
+	test-796.c
diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
new file mode 100644
index 00000000..9ca29489
--- /dev/null
+++ b/tests/irc/flood/test-796.c
@@ -0,0 +1,29 @@
+/*
+ test-796.c : irssi
+
+    Copyright (C) 2017 The Irssi project.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "common.h"
+
+int main(int argc, char **argv)
+{
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_set_nonfatal_assertions();
+	return g_test_run();
+}

From c7cd49f8d7e83302c0f21f4449cddac528d28eea Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Jan 2018 16:18:07 +0100
Subject: [PATCH 0707/1650] first bug case, exposes broken server object in
 chat-completion

---
 tests/irc/flood/Makefile.am |   8 +++
 tests/irc/flood/test-796.c  | 122 ++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
index 4bc4a93c..85b52eab 100644
--- a/tests/irc/flood/Makefile.am
+++ b/tests/irc/flood/Makefile.am
@@ -12,6 +12,7 @@ test_programs = \
 	test-796
 
 test_796_CPPFLAGS = \
+	-I$(top_srcdir)/src/fe-common/core \
 	-I$(top_srcdir)/src/irc/core \
 	-I$(top_srcdir)/src/irc/flood \
 	$(AM_CPPFLAGS)
@@ -21,8 +22,15 @@ test_796_DEPENDENCIES = \
 	../../../src/lib-config/libirssi_config.a
 
 test_796_LDADD = \
+	../../../src/irc/libirc.a \
+	../../../src/fe-common/irc/libfe_common_irc.a \
+	../../../src/fe-common/irc/dcc/libfe_irc_dcc.a \
+	../../../src/fe-common/irc/notifylist/libfe_irc_notifylist.a \
+	../../../src/irc/dcc/libirc_dcc.a \
+	../../../src/irc/notifylist/libirc_notifylist.a \
 	../../../src/irc/flood/libirc_flood.a \
 	../../../src/irc/core/libirc_core.a \
+	../../../src/fe-common/core/libfe_common_core.a \
 	../../../src/core/libcore.a \
 	../../../src/lib-config/libirssi_config.a \
 	@GLIB_LIBS@ \
diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index 9ca29489..293e87d7 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -19,11 +19,133 @@
 */
 
 #include "common.h"
+#include "args.h"
+#include "core.h"
+#include "misc.h"
+#include "servers-setup.h"
+
+#include "formats.h"
+#include "fe-common-core.h"
+
+#include "irc.h"
+#include "irc-servers.h"
+#include "irc-channels.h"
+
+/* irc.c */
+void irc_init(void);
+void irc_deinit(void) ;
+
+/* irc-session.c */
+void irc_session_init(void);
+void irc_session_deinit(void);
+
+/* fe-common-irc.c */
+void fe_common_irc_init(void);
+void fe_common_irc_deinit(void);
+
+typedef struct {
+} ServerDestroyFloodData;
+
+#define MODULE_NAME "tests"
+
+static void cmd_echo(const char *data, void *server, WI_ITEM_REC *item)
+{
+	g_test_message("echo: [server=%p,item=%p] %s", server, item, data);
+}
+
+static void sig_public(SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target)
+{
+	signal_emit("send command", 3, "/eval echo $tag", server, NULL);
+}
+
+static void print_disconnect(SERVER_REC *server)
+{
+	g_test_message("server %p was disconnected", server);
+}
+
+static void server_destroy_flood_set_up(ServerDestroyFloodData *fixture, const void *data)
+{
+	args_execute(0, NULL);
+	core_init();
+	irc_init();
+	fe_common_core_init();
+	fe_common_irc_init();
+	signal_emit("irssi init finished", 0);
+	command_bind("echo", NULL, (SIGNAL_FUNC) cmd_echo);
+	signal_add("message public", (SIGNAL_FUNC) sig_public);
+	signal_add_first("server disconnected", (SIGNAL_FUNC) print_disconnect);
+}
+
+static void server_destroy_flood_tear_down(ServerDestroyFloodData *fixture, const void *data)
+{
+	signal_remove("server disconnected", (SIGNAL_FUNC) print_disconnect);
+	signal_remove("message public", (SIGNAL_FUNC) sig_public);
+	command_unbind("echo", (SIGNAL_FUNC) cmd_echo);
+	fe_common_irc_deinit();
+	fe_common_core_deinit();
+	irc_deinit();
+	core_deinit();
+}
+
+static void irc_server_init_bare_minimum(IRC_SERVER_REC *server)
+{
+	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
+                                            (GCompareFunc) g_istr_equal);
+
+        /* set the standards */
+        g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
+        g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
+}
+
+static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const void *data)
+{
+	SERVER_REC *server; /* = g_new0(IRC_SERVER_REC, 1); */
+        CHAT_PROTOCOL_REC *proto;
+	SERVER_CONNECT_REC *conn;
+
+	g_test_bug("796");
+
+	proto = chat_protocol_find("IRC");
+	conn = server_create_conn(proto->id, "localhost", 0, "", "", "user");
+	server = proto->server_init_connect(conn);
+	server->session_reconnect = TRUE;
+	server->tag = g_strdup("testserver");
+
+	g_test_message("created server: %p", server);
+
+	/* we skip some initialisations that would try to send data */
+	/* irc_servers_deinit(); */
+	irc_session_deinit();
+	irc_irc_deinit();
+
+	signal_emit("server connected", 1, server);
+
+	/* make up for the skipped session init */
+	irc_server_init_bare_minimum(IRC_SERVER(server));
+
+	irc_irc_init();
+	irc_session_init();
+	/* irc_servers_init(); */
+
+	/* simulate failing irc_server_send_data() */
+	server->connection_lost = TRUE;
+
+	signal_emit("event privmsg", 4, server, "#someroom :test message", "nick", "user@host");
+}
 
 int main(int argc, char **argv)
 {
 	g_test_init(&argc, &argv, NULL);
+	g_test_bug_base("https://github.com/irssi/irssi/issues/");
+
+	g_test_add("/test/server_destroy_flood", ServerDestroyFloodData, NULL,
+		   server_destroy_flood_set_up, test_server_destroy_flood,
+		   server_destroy_flood_tear_down);
 
 	g_test_set_nonfatal_assertions();
+
+	core_preinit(*argv);
+	irssi_gui = IRSSI_GUI_NONE;
+
 	return g_test_run();
 }

From 3b7b868bb11faf74c872ecf606c4eef189e31725 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Jan 2018 16:43:58 +0100
Subject: [PATCH 0708/1650] finish test case

---
 tests/irc/flood/test-796.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index 293e87d7..24a5d4be 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -110,6 +110,7 @@ static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const voi
 	server = proto->server_init_connect(conn);
 	server->session_reconnect = TRUE;
 	server->tag = g_strdup("testserver");
+	server_ref(server);
 
 	g_test_message("created server: %p", server);
 
@@ -118,7 +119,8 @@ static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const voi
 	irc_session_deinit();
 	irc_irc_deinit();
 
-	signal_emit("server connected", 1, server);
+
+	server_connect_finished(server);
 
 	/* make up for the skipped session init */
 	irc_server_init_bare_minimum(IRC_SERVER(server));
@@ -130,6 +132,16 @@ static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const voi
 	/* simulate failing irc_server_send_data() */
 	server->connection_lost = TRUE;
 
+	/*
+	chat_completion_deinit();
+	fe_messages_deinit();
+	irc_notifylist_deinit();
+	*/
+
+	/* for the purpose of this exercise, we are ignoring the
+	   errors of g_hash_table_lookup failure */
+	g_log_set_always_fatal(G_LOG_FATAL_MASK);
+
 	signal_emit("event privmsg", 4, server, "#someroom :test message", "nick", "user@host");
 }
 

From bffced54981c191f5bac4f9611e4691fe442e58c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Jan 2018 21:11:00 +0100
Subject: [PATCH 0709/1650] Update test-796.c

odd space
---
 tests/irc/flood/test-796.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index 24a5d4be..ae94c5ab 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -33,7 +33,7 @@
 
 /* irc.c */
 void irc_init(void);
-void irc_deinit(void) ;
+void irc_deinit(void);
 
 /* irc-session.c */
 void irc_session_init(void);

From 6b0e14099655bf4d94a19dff252cce89b2858c93 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Jan 2018 23:01:28 +0100
Subject: [PATCH 0710/1650] show destroyed event

---
 tests/irc/flood/test-796.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index ae94c5ab..2e4affa0 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -63,6 +63,11 @@ static void print_disconnect(SERVER_REC *server)
 	g_test_message("server %p was disconnected", server);
 }
 
+static void print_destroyed(SERVER_REC *server)
+{
+	g_test_message("server %p was destroyed", server);
+}
+
 static void server_destroy_flood_set_up(ServerDestroyFloodData *fixture, const void *data)
 {
 	args_execute(0, NULL);
@@ -73,12 +78,14 @@ static void server_destroy_flood_set_up(ServerDestroyFloodData *fixture, const v
 	signal_emit("irssi init finished", 0);
 	command_bind("echo", NULL, (SIGNAL_FUNC) cmd_echo);
 	signal_add("message public", (SIGNAL_FUNC) sig_public);
+	signal_add("server destroyed", (SIGNAL_FUNC) print_destroyed);
 	signal_add_first("server disconnected", (SIGNAL_FUNC) print_disconnect);
 }
 
 static void server_destroy_flood_tear_down(ServerDestroyFloodData *fixture, const void *data)
 {
 	signal_remove("server disconnected", (SIGNAL_FUNC) print_disconnect);
+	signal_remove("server destroyed", (SIGNAL_FUNC) print_destroyed);
 	signal_remove("message public", (SIGNAL_FUNC) sig_public);
 	command_unbind("echo", (SIGNAL_FUNC) cmd_echo);
 	fe_common_irc_deinit();
@@ -90,27 +97,31 @@ static void server_destroy_flood_tear_down(ServerDestroyFloodData *fixture, cons
 static void irc_server_init_bare_minimum(IRC_SERVER_REC *server)
 {
 	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
-                                            (GCompareFunc) g_istr_equal);
+					    (GCompareFunc) g_istr_equal);
 
-        /* set the standards */
-        g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
-        g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
+	/* set the standards */
+	g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
+	g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
 }
 
 static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const void *data)
 {
 	SERVER_REC *server; /* = g_new0(IRC_SERVER_REC, 1); */
-        CHAT_PROTOCOL_REC *proto;
+	CHAT_PROTOCOL_REC *proto;
 	SERVER_CONNECT_REC *conn;
+	GLogLevelFlags loglev;
 
 	g_test_bug("796");
 
+	/* for the purpose of this exercise, we are ignoring the
+	   errors of g_hash_table_lookup failure */
+	loglev = g_log_set_always_fatal(G_LOG_FATAL_MASK);
+
 	proto = chat_protocol_find("IRC");
 	conn = server_create_conn(proto->id, "localhost", 0, "", "", "user");
 	server = proto->server_init_connect(conn);
 	server->session_reconnect = TRUE;
 	server->tag = g_strdup("testserver");
-	server_ref(server);
 
 	g_test_message("created server: %p", server);
 
@@ -138,11 +149,11 @@ static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const voi
 	irc_notifylist_deinit();
 	*/
 
-	/* for the purpose of this exercise, we are ignoring the
-	   errors of g_hash_table_lookup failure */
-	g_log_set_always_fatal(G_LOG_FATAL_MASK);
-
+	server_ref(server);
 	signal_emit("event privmsg", 4, server, "#someroom :test message", "nick", "user@host");
+	server_unref(server);
+
+	g_log_set_always_fatal(loglev);
 }
 
 int main(int argc, char **argv)

From c9b3d87eb7ef2ce99f659d7e567fc83629439142 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 3 Jan 2018 12:26:02 +0100
Subject: [PATCH 0711/1650] Postpone server cleanup until after unref

Add a new signal, server destroyed, that is supposed to run the clean up
tasks of server disconnected. This is so that some structures will stay
around longer.
---
 src/core/servers.c                  | 1 +
 src/fe-common/core/fe-common-core.c | 6 +++---
 src/irc/core/irc-servers.c          | 6 +++---
 src/irc/flood/flood.c               | 4 ++--
 src/irc/notifylist/notifylist.c     | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index b9faab81..b1da9b7e 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -524,6 +524,7 @@ int server_unref(SERVER_REC *server)
 		return TRUE;
 	}
 
+	signal_emit("server destroyed", 1, server);
         MODULE_DATA_DEINIT(server);
 	server_connect_unref(server->connrec);
 	if (server->rawlog != NULL) rawlog_destroy(server->rawlog);
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index a3b7364c..d0d36490 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -104,7 +104,7 @@ static void sig_connected(SERVER_REC *server)
 	MODULE_DATA_SET(server, g_new0(MODULE_SERVER_REC, 1));
 }
 
-static void sig_disconnected(SERVER_REC *server)
+static void sig_destroyed(SERVER_REC *server)
 {
 	void *data = MODULE_DATA(server);
 	g_free(data);
@@ -203,7 +203,7 @@ void fe_common_core_init(void)
 	settings_check();
 
         signal_add_first("server connected", (SIGNAL_FUNC) sig_connected);
-        signal_add_last("server disconnected", (SIGNAL_FUNC) sig_disconnected);
+        signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_add_first("channel created", (SIGNAL_FUNC) sig_channel_created);
         signal_add_last("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 
@@ -249,7 +249,7 @@ void fe_common_core_deinit(void)
 
         signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
         signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
-        signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
+        signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("channel created", (SIGNAL_FUNC) sig_channel_created);
         signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 }
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 4eaab712..5076a688 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -425,7 +425,7 @@ static void isupport_destroy_hash(void *key, void *value)
 	g_free(value);
 }
 
-static void sig_disconnected(IRC_SERVER_REC *server)
+static void sig_destroyed(IRC_SERVER_REC *server)
 {
 	GSList *tmp;
 
@@ -1031,7 +1031,7 @@ void irc_servers_init(void)
 	cmd_tag = -1;
 
 	signal_add_first("server connected", (SIGNAL_FUNC) sig_connected);
-	signal_add_last("server disconnected", (SIGNAL_FUNC) sig_disconnected);
+	signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
 	signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit);
 	signal_add("event 001", (SIGNAL_FUNC) event_connected);
 	signal_add("event 004", (SIGNAL_FUNC) event_server_info);
@@ -1058,7 +1058,7 @@ void irc_servers_deinit(void)
 		g_source_remove(cmd_tag);
 
 	signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
-	signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
+	signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
 	signal_remove("event 001", (SIGNAL_FUNC) event_connected);
 	signal_remove("event 004", (SIGNAL_FUNC) event_server_info);
diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c
index 0944a6eb..b528f707 100644
--- a/src/irc/flood/flood.c
+++ b/src/irc/flood/flood.c
@@ -324,7 +324,7 @@ void irc_flood_init(void)
 	read_settings();
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 	signal_add_first("server connected", (SIGNAL_FUNC) flood_init_server);
-	signal_add("server disconnected", (SIGNAL_FUNC) flood_deinit_server);
+	signal_add("server destroyed", (SIGNAL_FUNC) flood_deinit_server);
 
 	autoignore_init();
 	settings_check();
@@ -344,5 +344,5 @@ void irc_flood_deinit(void)
 
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 	signal_remove("server connected", (SIGNAL_FUNC) flood_init_server);
-	signal_remove("server disconnected", (SIGNAL_FUNC) flood_deinit_server);
+	signal_remove("server destroyed", (SIGNAL_FUNC) flood_deinit_server);
 }
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index 573f7a7f..4fd5ef1a 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -331,7 +331,7 @@ void irc_notifylist_init(void)
 	notifylist_ison_init();
 	notifylist_whois_init();
 	signal_add("server connected", (SIGNAL_FUNC) notifylist_init_server);
-	signal_add("server disconnected", (SIGNAL_FUNC) notifylist_deinit_server);
+	signal_add("server destroyed", (SIGNAL_FUNC) notifylist_deinit_server);
 	signal_add("event quit", (SIGNAL_FUNC) event_quit);
 	signal_add("event privmsg", (SIGNAL_FUNC) event_privmsg);
 	signal_add("event join", (SIGNAL_FUNC) event_join);
@@ -349,7 +349,7 @@ void irc_notifylist_deinit(void)
 	notifylist_whois_deinit();
 
 	signal_remove("server connected", (SIGNAL_FUNC) notifylist_init_server);
-	signal_remove("server disconnected", (SIGNAL_FUNC) notifylist_deinit_server);
+	signal_remove("server destroyed", (SIGNAL_FUNC) notifylist_deinit_server);
 	signal_remove("event quit", (SIGNAL_FUNC) event_quit);
 	signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
 	signal_remove("event join", (SIGNAL_FUNC) event_join);

From c8012b2e574c6e1e25cf20ed31182323a492a98e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Fri, 5 Jan 2018 00:32:03 +0100
Subject: [PATCH 0712/1650] Merge tag '1.0.6' into integrate/1.0.6

---
 NEWS | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index cc301365..1054bb62 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,16 @@
-v1.1-head 2017-xx-xx  The Irssi team <staff@irssi.org>
+v1.1-head 2018-xx-xx  The Irssi team <staff@irssi.org>
+
+v1.0.6 2018-01-07 The Irssi team <staff@irssi.org>
+	- Fix invalid memory access when reading hilight configuration
+          (#787, #788).
+	- Fix null pointer dereference when the channel topic is set
+          without specifying a sender (GL#20, GL!25).
+	- Fix return of random memory when using incomplete escape
+          codes (GL#21, GL!26).
+	- Fix heap buffer overflow when completing certain strings
+          (GL#19, GL!27).
+	- Fix return of random memory when using an incomplete
+          variable argument (GL#18, GL!28).
 
 v1.0.5 2017-10-23  The Irssi team <staff@irssi.org>
 	- Fix missing -sasl_method '' in /NETWORK (#718, #719).

From 3c7185c5ad61de24f9d1bc39240c8145665fba44 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 Jan 2018 00:38:54 +0100
Subject: [PATCH 0713/1650] Update irc-nicklist.c

move altnick check before the nick correction code
---
 src/irc/core/irc-nicklist.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index a006a3cb..1f8c1fc9 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -345,6 +345,7 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
 {
 	char *str, *cmd, *params, *nick;
 	int n;
+	gboolean try_alternate_nick;
 
 	g_return_if_fail(data != NULL);
 
@@ -352,6 +353,10 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
 		/* Already connected, no need to handle this anymore. */
 		return;
 	}
+	
+	try_alternate_nick = g_ascii_strcasecmp(server->nick, server->connrec->nick) == 0 &&
+	    server->connrec->alternate_nick != NULL &&
+	    g_ascii_strcasecmp(server->connrec->alternate_nick, server->nick) != 0;
 
 	params = event_get_params(data, 2, NULL, &nick);
 	if (g_ascii_strcasecmp(server->nick, nick) != 0) {
@@ -362,9 +367,7 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 
 	/* nick already in use - need to change it .. */
-	if (g_ascii_strcasecmp(server->nick, server->connrec->nick) == 0 &&
-	    server->connrec->alternate_nick != NULL &&
-	    g_ascii_strcasecmp(server->connrec->alternate_nick, server->nick) != 0) {
+	if (try_alternate_nick) {
 		/* first try, so try the alternative nick.. */
 		g_free(server->nick);
 		server->nick = g_strdup(server->connrec->alternate_nick);

From eb18904840cc7d4a6830bf0711f4682af50f1abc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 Jan 2018 22:13:23 +0100
Subject: [PATCH 0714/1650] fix crash in notifylist

---
 src/core/servers.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index b1da9b7e..0abfdfb0 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -524,7 +524,12 @@ int server_unref(SERVER_REC *server)
 		return TRUE;
 	}
 
-	signal_emit("server destroyed", 1, server);
+	/* since module initialisation uses server connected, only let
+	   them know that the object got destroyed if the server was
+	   disconnected */
+	if (server->disconnected)
+		signal_emit("server destroyed", 1, server);
+
         MODULE_DATA_DEINIT(server);
 	server_connect_unref(server->connrec);
 	if (server->rawlog != NULL) rawlog_destroy(server->rawlog);

From b111f038ddb7b5079f9901dd282fd4733390b1ba Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 Jan 2018 23:15:24 +0100
Subject: [PATCH 0715/1650] fix /exec -o for blank lines

since it is not allowed to send nothing, instead of spamming the status window
with error, send " " instead

Fixes FS#902
---
 src/fe-common/core/fe-exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index 36990866..c1739d39 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -613,7 +613,7 @@ static void sig_exec_input(PROCESS_REC *rec, const char *text)
 
 		str = g_strconcat(rec->target_nick ? "-nick " :
 				  rec->target_channel ? "-channel " : "",
-				  rec->target, " ", text, NULL);
+				  rec->target, " ", *text == '\0' ? " " : text, NULL);
 		signal_emit(rec->notice ? "command notice" : "command msg",
 			    3, str, server, item);
                 g_free(str);

From 6e6a96d8c1eb8a51404d34809382e54eea46a9f7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 Jan 2018 23:05:39 +0100
Subject: [PATCH 0716/1650] fix uaf in signal path

---
 src/core/servers.c | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index 0abfdfb0..11eccc53 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -460,8 +460,6 @@ static int server_remove_channels(SERVER_REC *server)
 
 void server_disconnect(SERVER_REC *server)
 {
-	int chans;
-
 	g_return_if_fail(IS_SERVER(server));
 
 	if (server->disconnected)
@@ -480,21 +478,9 @@ void server_disconnect(SERVER_REC *server)
 	server->disconnected = TRUE;
 	signal_emit("server disconnected", 1, server);
 
-	/* close all channels */
-	chans = server_remove_channels(server);
-
-	if (server->handle != NULL) {
-		if (!chans || server->connection_lost)
-			net_sendbuffer_destroy(server->handle, TRUE);
-		else {
-			/* we were on some channels, try to let the server
-			   disconnect so that our quit message is guaranteed
-			   to get displayed */
-			net_disconnect_later(net_sendbuffer_handle(server->handle));
-			net_sendbuffer_destroy(server->handle, FALSE);
-		}
-		server->handle = NULL;
-	}
+	/* we used to destroy the handle here but it may be still in
+	   use during signal processing, so destroy it on unref
+	   instead */
 
 	if (server->readtag > 0) {
 		g_source_remove(server->readtag);
@@ -513,6 +499,8 @@ void server_ref(SERVER_REC *server)
 
 int server_unref(SERVER_REC *server)
 {
+	int chans;
+
 	g_return_val_if_fail(IS_SERVER(server), FALSE);
 
 	if (--server->refcount > 0)
@@ -524,11 +512,28 @@ int server_unref(SERVER_REC *server)
 		return TRUE;
 	}
 
+	/* close all channels */
+	chans = server_remove_channels(server);
+
 	/* since module initialisation uses server connected, only let
 	   them know that the object got destroyed if the server was
 	   disconnected */
-	if (server->disconnected)
+	if (server->disconnected) {
 		signal_emit("server destroyed", 1, server);
+	}
+
+	if (server->handle != NULL) {
+		if (!chans || server->connection_lost)
+			net_sendbuffer_destroy(server->handle, TRUE);
+		else {
+			/* we were on some channels, try to let the server
+			   disconnect so that our quit message is guaranteed
+			   to get displayed */
+			net_disconnect_later(net_sendbuffer_handle(server->handle));
+			net_sendbuffer_destroy(server->handle, FALSE);
+		}
+		server->handle = NULL;
+	}
 
         MODULE_DATA_DEINIT(server);
 	server_connect_unref(server->connrec);

From 451019d05dfabbac2463f0d835c5113ac140c5c4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 May 2017 14:45:13 +0200
Subject: [PATCH 0717/1650] make format_real_length left-collecting

---
 src/fe-common/core/formats.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 37db6f7c..4c819c2d 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -480,27 +480,30 @@ int format_real_length(const char *str, int len)
 
 	start = str;
 	tmp = g_string_new(NULL);
-	while (*str != '\0' && len > 0) {
+	while (*str != '\0') {
+		oldstr = str;
 		if (*str == '%' && str[1] != '\0') {
 			str++;
 			if (*str != '%') {
 			     adv = format_expand_styles(tmp, &str, NULL);
-			     str += adv;
-			     if (adv)
-				continue;
-			}
-
-			/* %% or unknown %code, written as-is */
-			if (*str != '%') {
-				if (--len == 0)
-					break;
+			     if (adv) {
+				     str += adv;
+				     continue;
+			     }
+			     /* discount for unknown % */
+			     if (--len < 0) {
+				     str = oldstr;
+				     break;
+			     }
+			     oldstr = str;
 			}
 		}
 
-		oldstr = str;
 		len -= string_advance(&str, utf8);
-		if (len < 0)
+		if (len < 0) {
 			str = oldstr;
+			break;
+		}
 	}
 
 	g_string_free(tmp, TRUE);

From 4e71a1f485d9a546cb92ad94e8918a2363a88b03 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 25 Apr 2017 00:42:53 +0200
Subject: [PATCH 0718/1650] sideways split support for Irssi

warning:

* may be buggy

This commit adds support for sideways splits into Irssi. To that regard,
there are a number of new commands available

the "R" commands:
	/window new rsplit - make a new sideways split
	/window rshow - show an existing window to the right
	/window rgrow/rshrink/rsize/rbalance
	 - manipulate the size of your sideways split windows

the "D" commands:
	/window dup/ddown/dleft/dright
	 - navigate the windows directionally, as an alternative to
	   /window up/down that you can bind to some key
	/window move dleft/dright - the same for moving

Enjoy!
---
 docs/help/in/window.in               |   15 +-
 src/fe-common/core/fe-windows.h      |    8 +
 src/fe-common/core/window-commands.c |    7 +-
 src/fe-common/core/window-items.c    |    2 +-
 src/fe-text/gui-printtext.c          |   43 +-
 src/fe-text/gui-printtext.h          |    1 +
 src/fe-text/gui-windows.c            |   14 +-
 src/fe-text/mainwindows-layout.c     |  159 +++-
 src/fe-text/mainwindows.c            | 1144 +++++++++++++++++++++-----
 src/fe-text/mainwindows.h            |   22 +-
 src/fe-text/module-formats.c         |    4 +-
 src/fe-text/statusbar-items.c        |   19 +-
 src/fe-text/statusbar.c              |   72 +-
 src/fe-text/statusbar.h              |    6 +
 src/fe-text/term-terminfo.c          |   79 +-
 src/fe-text/term.h                   |    2 +
 src/fe-text/textbuffer-view.c        |  120 +--
 themes/default.theme                 |    1 +
 18 files changed, 1373 insertions(+), 345 deletions(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index 6dde6c50..0e7ed637 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -35,10 +35,19 @@
     SHRINK:       %|Decrease the size of the active split window by the specified number of lines.
     SIZE:         %|Set the current split window size to the specified numer of lines.
     BALANCE:      %|Balance the heights of all split windows.
+    RGROW:        %|Increase the width of the active split window by the specified number of columns.
+    RSHRINK:      %|Decrease the wodth of the active split window by the specified number of columns.
+    RSIZE:        %|Set the current split window width to the specified numer of columns.
+    RBALANCE:     %|Balance the widths of all split windows in this line.
     HIDE:         %|Hides the current split window, or the split window specified by number or item name.
     SHOW:         %|Show the window specified by number or item name as a new split windows. It is made sticky when autostick_split_windows is turned on.
-    UP:           %|Set the split window above the current one active. At the top, wraps to the bottom.
-    DOWN:         %|Set the split window below the current one active. At the bottom, wraps to the top.
+    RSHOW:        %|Show the window specified by number or item name as a new windows split to the right of the current window. It is made sticky when autostick_split_windows is turned on.
+    UP:           %|Set the split window left or above the current one active. At the top, wraps to the bottom.
+    DOWN:         %|Set the split window right or below the current one active. At the bottom, wraps to the top.
+    DUP:          %|Set the split window above the current one active. At the top, wraps to the bottom.
+    DDOWN:        %|Set the split window below the current one active. At the bottom, wraps to the top.
+    DLEFT:        %|Set the split window left to the current one active. At the left, wraps to the right.
+    DRIGHT:       %|Set the split window right to the current one active. At the right, wraps to the left.
     LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
     RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
     STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.
@@ -46,6 +55,8 @@
     MOVE RIGHT:   %|Move the window to the numerically next location inside the current sticky group.
     MOVE UP:      %|Move the current window to the sticky group of the split window above. If no sticky group remains, the split window collapses.
     MOVE DOWN:    %|Move the current window to the sticky group of the split window below. If no sticky group remains, the split window collapses.
+    MOVE DLEFT:   %|Move the current window to the sticky group of the split window to the left. If no sticky group remains, the split window collapses.
+    MOVE DRIGHT:  %|Move the current window to the sticky group of the split window to the right. If no sticky group remains, the split window collapses.
 
    %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index 32d6cfcd..aaa773c8 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -11,6 +11,14 @@ enum {
         DATA_LEVEL_HILIGHT
 };
 
+enum {
+	MAIN_WINDOW_TYPE_NONE = -1,
+	MAIN_WINDOW_TYPE_DEFAULT = 0,
+	MAIN_WINDOW_TYPE_HIDDEN = 1,
+	MAIN_WINDOW_TYPE_SPLIT = 2,
+	MAIN_WINDOW_TYPE_RSPLIT = 3
+};
+
 typedef struct {
 	char *servertag;
         char *name;
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 57c81ac2..a81c0180 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -169,7 +169,7 @@ static void cmd_window(const char *data, void *server, WI_ITEM_REC *item)
 		command_runsub("window", data, server, item);
 }
 
-/* SYNTAX: WINDOW NEW [HIDDEN|SPLIT] */
+/* SYNTAX: WINDOW NEW [HIDDEN|SPLIT|RSPLIT] */
 static void cmd_window_new(const char *data, void *server, WI_ITEM_REC *item)
 {
 	WINDOW_REC *window;
@@ -177,8 +177,9 @@ static void cmd_window_new(const char *data, void *server, WI_ITEM_REC *item)
 
 	g_return_if_fail(data != NULL);
 
-	type = (g_ascii_strncasecmp(data, "hid", 3) == 0 || g_ascii_strcasecmp(data, "tab") == 0) ? 1 :
-		(g_ascii_strcasecmp(data, "split") == 0 ? 2 : 0);
+	type = (g_ascii_strncasecmp(data, "hid", 3) == 0 || g_ascii_strcasecmp(data, "tab") == 0) ? MAIN_WINDOW_TYPE_HIDDEN :
+		g_ascii_strcasecmp(data, "split") == 0 ? MAIN_WINDOW_TYPE_SPLIT :
+		g_ascii_strncasecmp(data, "rs", 2) == 0 ? MAIN_WINDOW_TYPE_RSPLIT : MAIN_WINDOW_TYPE_DEFAULT;
 	signal_emit("gui window create override", 1, GINT_TO_POINTER(type));
 
 	window = window_create(NULL, FALSE);
diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c
index bd6ae5e9..8eab7124 100644
--- a/src/fe-common/core/window-items.c
+++ b/src/fe-common/core/window-items.c
@@ -314,7 +314,7 @@ void window_item_create(WI_ITEM_REC *item, int automatic)
 		/* create new window to use */
 		if (settings_get_bool("autocreate_split_windows")) {
 			signal_emit("gui window create override", 1,
-				    GINT_TO_POINTER(0));
+				    GINT_TO_POINTER(MAIN_WINDOW_TYPE_SPLIT));
 		}
 		window = window_create(item, automatic);
 	} else {
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index a07451fa..c52f9ced 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -24,6 +24,7 @@
 
 #include "formats.h"
 #include "printtext.h"
+#include "themes.h"
 
 #include "term.h"
 #include "gui-printtext.h"
@@ -138,6 +139,39 @@ void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str)
 	gui_printtext_after_time(dest, prev, str, 0);
 }
 
+void gui_printtext_window_border(int x, int y)
+{
+	char *v0, *v1;
+	int len;
+	if (current_theme != NULL) {
+		v1 = theme_format_expand(current_theme, "{window_border} ");
+		len = format_real_length(v1, 1);
+		v1[len] = '\0';
+	}
+	else {
+		v1 = g_strdup(" ");
+	}
+
+	if (*v1 == '\0') {
+		g_free(v1);
+		v1 = g_strdup(" ");
+	}
+
+	if (clrtoeol_info->color != NULL) {
+		char *color = g_strdup(clrtoeol_info->color);
+		len = format_real_length(color, 0);
+		color[len] = '\0';
+		v0 = g_strconcat(color, v1, NULL);
+		g_free(color);
+		g_free(v1);
+	} else {
+		v0 = v1;
+	}
+
+	gui_printtext(x, y, v0);
+	g_free(v0);
+}
+
 static void remove_old_lines(TEXT_BUFFER_VIEW_REC *view)
 {
 	LINE_REC *line;
@@ -236,8 +270,13 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 		term_set_color2(root_window, attr, fg, bg);
 
 		term_move(root_window, next_xpos, next_ypos);
-		if (flags & GUI_PRINT_FLAG_CLRTOEOL)
-			term_clrtoeol(root_window);
+		if (flags & GUI_PRINT_FLAG_CLRTOEOL) {
+			if (clrtoeol_info->window != NULL) {
+				term_window_clrtoeol_abs(clrtoeol_info->window, next_ypos);
+			} else {
+				term_clrtoeol(root_window);
+			}
+		}
 		next_xpos += term_addstr(root_window, str);
 		return;
 	}
diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h
index d2671497..64595bbe 100644
--- a/src/fe-text/gui-printtext.h
+++ b/src/fe-text/gui-printtext.h
@@ -20,5 +20,6 @@ void gui_printtext(int xpos, int ypos, const char *str);
 void gui_printtext_internal(int xpos, int ypos, const char *str);
 void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str);
 void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str, time_t time);
+void gui_printtext_window_border(int xpos, int ypos);
 
 #endif
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index c63c495c..966c5138 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -73,17 +73,18 @@ static void gui_window_created(WINDOW_REC *window, void *automatic)
 
 	g_return_if_fail(window != NULL);
 
-	new_parent = window_create_override == 0 ||
-		window_create_override == 2 ||
+	new_parent = window_create_override == MAIN_WINDOW_TYPE_DEFAULT ||
+		window_create_override == MAIN_WINDOW_TYPE_SPLIT ||
+		window_create_override == MAIN_WINDOW_TYPE_RSPLIT ||
 		active_win == NULL || WINDOW_GUI(active_win) == NULL;
-	parent = !new_parent ? WINDOW_MAIN(active_win) : mainwindow_create();
+	parent = !new_parent ? WINDOW_MAIN(active_win) : mainwindow_create(window_create_override == MAIN_WINDOW_TYPE_RSPLIT);
 	if (parent == NULL) {
 		/* not enough space for new window, but we really can't
 		   abort creation of the window anymore, so create hidden
 		   window instead. */
 		parent = WINDOW_MAIN(active_win);
 	}
-	window_create_override = -1;
+	window_create_override = MAIN_WINDOW_TYPE_NONE;
 
 	if (parent->active == NULL) parent->active = window;
 	window->gui_data = gui_window_init(window, parent);
@@ -281,13 +282,14 @@ static void read_settings(void)
 
 void gui_windows_init(void)
 {
-        settings_add_bool("lookandfeel", "autostick_split_windows", TRUE);
+	settings_add_bool("lookandfeel", "autostick_split_windows", FALSE);
+	settings_add_bool("lookandfeel", "autounstick_windows", TRUE);
 	settings_add_int("lookandfeel", "indent", 10);
 	settings_add_bool("lookandfeel", "indent_always", FALSE);
 	settings_add_bool("lookandfeel", "break_wide", FALSE);
 	settings_add_bool("lookandfeel", "scroll", TRUE);
 
-	window_create_override = -1;
+	window_create_override = MAIN_WINDOW_TYPE_NONE;
 
 	read_settings();
 	signal_add("gui window create override", (SIGNAL_FUNC) sig_window_create_override);
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index fae02539..734c9acb 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -48,9 +48,9 @@ static void sig_layout_window_save(WINDOW_REC *window, CONFIG_NODE *node)
 static void sig_layout_window_restore(WINDOW_REC *window, CONFIG_NODE *node)
 {
 	WINDOW_REC *parent;
-        GUI_WINDOW_REC *gui;
+	GUI_WINDOW_REC *gui;
 
-        gui = WINDOW_GUI(window);
+	gui = WINDOW_GUI(window);
 
 	parent = window_find_refnum(config_node_get_int(node, "parent", -1));
 	if (parent != NULL)
@@ -61,7 +61,7 @@ static void sig_layout_window_restore(WINDOW_REC *window, CONFIG_NODE *node)
 	if (config_node_get_str(node, "scroll", NULL) != NULL) {
 		gui->use_scroll = TRUE;
 		gui->scroll = config_node_get_bool(node, "scroll", TRUE);
-                textbuffer_view_set_scroll(gui->view, gui->scroll);
+		textbuffer_view_set_scroll(gui->view, gui->scroll);
 	}
 }
 
@@ -74,6 +74,8 @@ static void main_window_save(MAIN_WINDOW_REC *window, CONFIG_NODE *node)
 
 	iconfig_node_set_int(node, "first_line", window->first_line);
 	iconfig_node_set_int(node, "lines", window->height);
+	iconfig_node_set_int(node, "first_column", window->first_column);
+	iconfig_node_set_int(node, "columns", window->width);
 }
 
 static void sig_layout_save(void)
@@ -88,8 +90,16 @@ static void sig_layout_save(void)
 
 static int window_node_cmp(CONFIG_NODE *n1, CONFIG_NODE *n2)
 {
-	return config_node_get_int(n1, "first_line", 0) >
-		config_node_get_int(n2, "first_line", 0) ? -1 : 1;
+	return (config_node_get_int(n1, "first_line", 0) ==
+		config_node_get_int(n2, "first_line", 0)
+		&&
+		config_node_get_int(n1, "first_column", 0) >
+		config_node_get_int(n2, "first_column", 0)
+	       ) ||
+		config_node_get_int(n1, "first_line", 0) >
+		config_node_get_int(n2, "first_line", 0)
+		? -1
+		: 1;
 }
 
 /* Returns list of mainwindow nodes sorted by first_line
@@ -108,14 +118,45 @@ static GSList *get_sorted_windows_config(CONFIG_NODE *node)
         return output;
 }
 
+static GSList *get_windows_config_filter_line(GSList *in)
+{
+	GSList *tmp, *output;
+
+	output = NULL;
+	for (tmp = in; tmp != NULL; tmp = tmp->next) {
+		CONFIG_NODE *node = tmp->data;
+		if (config_node_get_int(node, "first_column", 0) == 0)
+			output = g_slist_append(output, node);
+	}
+
+	return output;
+}
+
+static GSList *get_windows_config_filter_column(GSList *in, int first_line, int last_line)
+{
+	GSList *tmp, *output;
+
+	output = NULL;
+	for (tmp = in; tmp != NULL; tmp = tmp->next) {
+		int l1, l2;
+		CONFIG_NODE *node = tmp->data;
+		l1 = config_node_get_int(node, "first_line", -1);
+		l2 = l1 + config_node_get_int(node, "lines", 0) - 1;
+		if (l1 >= first_line && l2 <= last_line)
+			output = g_slist_prepend(output, node);
+	}
+
+	return output;
+}
+
 static void sig_layout_restore(void)
 {
-        MAIN_WINDOW_REC *lower_window;
-        WINDOW_REC *window;
+	MAIN_WINDOW_REC *lower_window;
+	WINDOW_REC *window, *first;
 	CONFIG_NODE *node;
-	GSList *tmp, *sorted_config;
-        int avail_height, height, *heights;
-	int i, lower_size, windows_count, diff;
+	GSList *tmp, *sorted_config, *lines_config;
+	int avail_height, height, *heights, *widths, max_wins_line;
+	int i, lower_size, lines_count, columns_count, diff;
 
 	node = iconfig_node_traverse("mainwindows", FALSE);
 	if (node == NULL) return;
@@ -123,51 +164,56 @@ static void sig_layout_restore(void)
 	sorted_config = get_sorted_windows_config(node);
 	if (sorted_config == NULL) return;
 
-        windows_count = g_slist_length(sorted_config);
+	lines_config = get_windows_config_filter_line(sorted_config);
+	lines_count = g_slist_length(lines_config);
 
-        /* calculate the saved terminal height */
+	/* calculate the saved terminal height */
 	avail_height = term_height -
 		screen_reserved_top - screen_reserved_bottom;
 	height = 0;
-        heights = g_new0(int, windows_count);
-	for (i = 0, tmp = sorted_config; tmp != NULL; tmp = tmp->next, i++) {
+	heights = g_new0(int, lines_count);
+	for (i = 0, tmp = lines_config; tmp != NULL; tmp = tmp->next, i++) {
 		CONFIG_NODE *node = tmp->data;
 
-                heights[i] = config_node_get_int(node, "lines", 0);
+		heights[i] = config_node_get_int(node, "lines", 0);
 		height += heights[i];
 	}
 
+	max_wins_line = (term_width + 1) / (NEW_WINDOW_WIDTH + 1);
+	if (max_wins_line < 1)
+		max_wins_line = 1;
+
 	if (avail_height <= (WINDOW_MIN_SIZE*2)+1) {
 		/* we can fit only one window to screen -
 		   give it all the height we can */
-		windows_count = 1;
-                heights[0] = avail_height;
+		lines_count = 1;
+		heights[0] = avail_height;
 	} else if (height != avail_height) {
 		/* Terminal's height is different from the saved one.
 		   Resize the windows so they fit to screen. */
 		while (height > avail_height &&
-		       windows_count*(WINDOW_MIN_SIZE+1) > avail_height) {
+		       lines_count*(WINDOW_MIN_SIZE+1) > avail_height) {
 			/* all windows can't fit into screen,
 			   remove the lowest ones */
-                        windows_count--;
+			lines_count--;
 		}
 
-                /* try to keep the windows' size about the same in percents */
-		for (i = 0; i < windows_count; i++) {
+		/* try to keep the windows' size about the same in percents */
+		for (i = 0; i < lines_count; i++) {
 			int size = avail_height*heights[i]/height;
 			if (size < WINDOW_MIN_SIZE+1)
-                                size = WINDOW_MIN_SIZE+1;
+				size = WINDOW_MIN_SIZE+1;
 			heights[i] = size;
 		}
 
 		/* give/remove the last bits */
-                height = 0;
-		for (i = 0; i < windows_count; i++)
-                        height += heights[i];
+		height = 0;
+		for (i = 0; i < lines_count; i++)
+			height += heights[i];
 
 		diff = height < avail_height ? 1 : -1;
 		for (i = 0; height != avail_height; i++) {
-			if (i == windows_count)
+			if (i == lines_count)
 				i = 0;
 
 			if (heights[i] > WINDOW_MIN_SIZE+1) {
@@ -178,25 +224,59 @@ static void sig_layout_restore(void)
 	}
 
 	/* create all the visible windows with correct size */
-	lower_window = NULL; lower_size = 0;
-	for (i = 0, tmp = sorted_config; i < windows_count; tmp = tmp->next, i++) {
+	lower_window = NULL; lower_size = 0; first = NULL;
+	for (i = 0, tmp = lines_config; i < lines_count; tmp = tmp->next, i++) {
+		GSList *tmp2, *columns_config, *line;
+		int j, l1, l2;
 		CONFIG_NODE *node = tmp->data;
 		if (node->key == NULL) continue;
 
-		/* create a new window + mainwindow */
-		signal_emit("gui window create override", 1,
-			    GINT_TO_POINTER(0));
+		l1 = config_node_get_int(node, "first_line", -1);
+		l2 = l1 + config_node_get_int(node, "lines", 0) - 1;
+		columns_config = get_windows_config_filter_column(sorted_config, l1, l2);
 
-		window = window_create(NULL, TRUE);
-                window_set_refnum(window, atoi(node->key));
+		window = NULL; columns_count = 0;
+		widths = g_new0(int, max_wins_line);
+		for (j = 0, tmp2 = columns_config; j < max_wins_line && tmp2 != NULL; tmp2 = tmp2->next, j++) {
+			int width;
+			WINDOW_REC *new_win;
+			CONFIG_NODE *node2 = tmp2->data;
+			if (node2->key == NULL) continue;
+
+			/* create a new window + mainwindow */
+			signal_emit("gui window create override", 1,
+				    GINT_TO_POINTER(window == NULL ? MAIN_WINDOW_TYPE_SPLIT : MAIN_WINDOW_TYPE_RSPLIT));
+
+			new_win = window_create(NULL, TRUE);
+
+			window_set_refnum(new_win, atoi(node2->key));
+			width = config_node_get_int(node2, "columns", NEW_WINDOW_WIDTH);
+			widths[j] = width;
+			columns_count += width + (window == NULL ? 0 : 1);
+
+			if (window == NULL)
+				window = new_win;
+			if (first == NULL)
+				first = new_win;
+
+			window_set_active(new_win);
+			active_mainwin = WINDOW_MAIN(new_win);
+		}
+		if (window == NULL)
+			continue;
+		line = g_slist_reverse(mainwindows_get_line(WINDOW_MAIN(window)));
+		for (j = g_slist_length(line), tmp2 = line; tmp2 != NULL; tmp2 = tmp2->next, j--) {
+			int width = MAX(NEW_WINDOW_WIDTH, widths[j-1] * term_width / columns_count);
+			MAIN_WINDOW_REC *rec = tmp2->data;
+			mainwindow_set_rsize(rec, width);
+		}
+		g_slist_free(line);
+		g_free(widths);
 
 		if (lower_size > 0)
 			mainwindow_set_size(lower_window, lower_size, FALSE);
 
-		window_set_active(window);
-                active_mainwin = WINDOW_MAIN(window);
-
-                lower_window = WINDOW_MAIN(window);
+		lower_window = WINDOW_MAIN(window);
 		lower_size = heights[i];
 		if (lower_size < WINDOW_MIN_SIZE+1)
 			lower_size = WINDOW_MIN_SIZE+1;
@@ -206,6 +286,11 @@ static void sig_layout_restore(void)
 
 	if (lower_size > 0)
 		mainwindow_set_size(lower_window, lower_size, FALSE);
+
+	if (first != NULL) {
+		window_set_active(first);
+		active_mainwin = WINDOW_MAIN(first);
+	}
 }
 
 static void sig_layout_reset(void)
diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 5f58c25f..deab8de8 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -34,24 +34,27 @@
 
 GSList *mainwindows;
 MAIN_WINDOW_REC *active_mainwin;
+MAIN_WINDOW_BORDER_REC *clrtoeol_info;
 
 int screen_reserved_top, screen_reserved_bottom;
-static int old_screen_width, old_screen_height;
+int screen_reserved_left, screen_reserved_right;
+static int screen_width, screen_height;
 
 #define mainwindow_create_screen(window) \
-	term_window_create(0, \
+	term_window_create((window)->first_column + (window)->statusbar_columns_left, \
 			   (window)->first_line + (window)->statusbar_lines_top, \
-			   (window)->width, \
+			   (window)->width - (window)->statusbar_columns, \
 			   (window)->height - (window)->statusbar_lines)
 
 #define mainwindow_set_screen_size(window) \
-	term_window_move((window)->screen_win, 0, \
+	term_window_move((window)->screen_win, \
+			 (window)->first_column + (window)->statusbar_columns_left, \
 			 (window)->first_line + (window)->statusbar_lines_top, \
-			 (window)->width, \
+			 (window)->width - (window)->statusbar_columns, \
 			 (window)->height - (window)->statusbar_lines);
 
 
-static MAIN_WINDOW_REC *find_window_with_room(void)
+static MAIN_WINDOW_REC *find_window_with_room()
 {
 	MAIN_WINDOW_REC *biggest_rec;
 	GSList *tmp;
@@ -71,14 +74,34 @@ static MAIN_WINDOW_REC *find_window_with_room(void)
 	return biggest_rec;
 }
 
+static MAIN_WINDOW_REC *find_window_with_room_right(void)
+{
+	MAIN_WINDOW_REC *biggest_rec;
+	GSList *tmp;
+	int space, biggest;
+
+	biggest = 0; biggest_rec = NULL;
+	for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
+		MAIN_WINDOW_REC *rec = tmp->data;
+
+		space = MAIN_WINDOW_TEXT_WIDTH(rec);
+		if (space >= 2 * NEW_WINDOW_WIDTH && space > biggest) {
+			biggest = space;
+			biggest_rec = rec;
+		}
+	}
+
+	return biggest_rec;
+}
+
 #define window_size_equals(window, mainwin) \
-	((window)->width == (mainwin)->width && \
+	((window)->width == MAIN_WINDOW_TEXT_WIDTH(mainwin) && \
 	 (window)->height == MAIN_WINDOW_TEXT_HEIGHT(mainwin))
 
 static void mainwindow_resize_windows(MAIN_WINDOW_REC *window)
 {
 	GSList *tmp;
-        int resized;
+	int resized;
 
 	mainwindow_set_screen_size(window);
 
@@ -89,24 +112,31 @@ static void mainwindow_resize_windows(MAIN_WINDOW_REC *window)
 		if (rec->gui_data != NULL &&
 		    WINDOW_GUI(rec)->parent == window &&
 		    !window_size_equals(rec, window)) {
-                        resized = TRUE;
-			gui_window_resize(rec, window->width,
+			resized = TRUE;
+			gui_window_resize(rec, MAIN_WINDOW_TEXT_WIDTH(window),
 					  MAIN_WINDOW_TEXT_HEIGHT(window));
 		}
 	}
 
-        if (resized)
+	if (resized)
 		signal_emit("mainwindow resized", 1, window);
 }
 
 static void mainwindow_resize(MAIN_WINDOW_REC *window, int xdiff, int ydiff)
 {
+	int height, width;
 	if (quitting || (xdiff == 0 && ydiff == 0))
-                return;
+		return;
 
-        window->width += xdiff;
+	height = window->height + ydiff;
+	width = window->width + xdiff;
+	window->width = window->last_column-window->first_column+1;
 	window->height = window->last_line-window->first_line+1;
-        window->size_dirty = TRUE;
+	if (height != window->height || width != window->width) {
+		g_warning("Resizing window %p W:%d expected:%d H:%d expected:%d",
+			  window, window->width, width, window->height, height);
+	}
+	window->size_dirty = TRUE;
 }
 
 static GSList *get_sticky_windows_sorted(MAIN_WINDOW_REC *mainwin)
@@ -178,14 +208,13 @@ void mainwindows_recreate(void)
 	}
 }
 
-MAIN_WINDOW_REC *mainwindow_create(void)
+MAIN_WINDOW_REC *mainwindow_create(int right)
 {
 	MAIN_WINDOW_REC *rec, *parent;
 	int space;
 
 	rec = g_new0(MAIN_WINDOW_REC, 1);
 	rec->dirty = TRUE;
-	rec->width = term_width;
 
 	if (mainwindows == NULL) {
 		active_mainwin = rec;
@@ -193,21 +222,53 @@ MAIN_WINDOW_REC *mainwindow_create(void)
 		rec->first_line = screen_reserved_top;
 		rec->last_line = term_height-1 - screen_reserved_bottom;
 		rec->height = rec->last_line-rec->first_line+1;
+		rec->first_column = screen_reserved_left;
+		rec->last_column = screen_width-1 - screen_reserved_right;
+		rec->width = rec->last_column-rec->first_column+1;
 	} else {
 		parent = WINDOW_MAIN(active_win);
-		if (MAIN_WINDOW_TEXT_HEIGHT(parent) <
-		    WINDOW_MIN_SIZE+NEW_WINDOW_SIZE)
-			parent = find_window_with_room();
-		if (parent == NULL)
-			return NULL; /* not enough space */
 
-		space = parent->height / 2;
-		rec->first_line = parent->first_line;
-		rec->last_line = rec->first_line + space;
-		rec->height = rec->last_line-rec->first_line+1;
+		if (!right) {
+			GSList *tmp, *line;
+			if (MAIN_WINDOW_TEXT_HEIGHT(parent) <
+			    WINDOW_MIN_SIZE+NEW_WINDOW_SIZE)
+				parent = find_window_with_room();
+			if (parent == NULL)
+				return NULL; /* not enough space */
 
-		parent->first_line += space+1;
-		mainwindow_resize(parent, 0, -space-1);
+			space = parent->height / 2;
+			rec->first_line = parent->first_line;
+			rec->last_line = rec->first_line + space;
+			rec->height = rec->last_line-rec->first_line+1;
+			rec->first_column = screen_reserved_left;
+			rec->last_column = screen_width-1 - screen_reserved_right;
+			rec->width = rec->last_column-rec->first_column+1;
+
+			line = mainwindows_get_line(parent);
+			for (tmp = line; tmp != NULL; tmp = tmp->next) {
+				MAIN_WINDOW_REC *rec = tmp->data;
+				rec->first_line += space+1;
+				mainwindow_resize(rec, 0, -space-1);
+			}
+			g_slist_free(line);
+		} else {
+			if (MAIN_WINDOW_TEXT_WIDTH(parent) <
+			    2* NEW_WINDOW_WIDTH)
+				parent = find_window_with_room_right();
+			if (parent == NULL)
+				return NULL; /* not enough space */
+
+			space = parent->width / 2;
+			rec->first_line = parent->first_line;
+			rec->last_line = parent->last_line;
+			rec->height = parent->height;
+			rec->first_column = parent->last_column - space + 1;
+			rec->last_column = parent->last_column;
+			rec->width = rec->last_column-rec->first_column+1;
+
+			parent->last_column -= space+1;
+			mainwindow_resize(parent, -space-1, 0);
+		}
 	}
 
 	rec->screen_win = mainwindow_create_screen(rec);
@@ -218,16 +279,22 @@ MAIN_WINDOW_REC *mainwindow_create(void)
 	return rec;
 }
 
-static MAIN_WINDOW_REC *mainwindows_find_lower(int line)
+static MAIN_WINDOW_REC *mainwindows_find_lower(MAIN_WINDOW_REC *window)
 {
+	int last_line;
 	MAIN_WINDOW_REC *best;
 	GSList *tmp;
 
+	if (window != NULL)
+		last_line = window->last_line;
+	else
+		last_line = -1;
+
 	best = NULL;
 	for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
 		MAIN_WINDOW_REC *rec = tmp->data;
 
-		if (rec->first_line > line &&
+		if (rec->first_line > last_line &&
 		    (best == NULL || rec->first_line < best->first_line))
 			best = rec;
 	}
@@ -235,16 +302,64 @@ static MAIN_WINDOW_REC *mainwindows_find_lower(int line)
 	return best;
 }
 
-static MAIN_WINDOW_REC *mainwindows_find_upper(int line)
+static MAIN_WINDOW_REC *mainwindows_find_right(MAIN_WINDOW_REC *window, int find_first)
 {
+	int first_line, last_line, last_column;
 	MAIN_WINDOW_REC *best;
 	GSList *tmp;
 
+	if (window != NULL) {
+		first_line = window->first_line;
+		last_line = window->last_line;
+		last_column = window->last_column;
+	} else {
+		first_line = last_line = last_column = -1;
+	}
+
+	if (find_first)
+		last_column = -1;
+
 	best = NULL;
 	for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
 		MAIN_WINDOW_REC *rec = tmp->data;
 
-		if (rec->last_line < line &&
+		if (rec->first_line >= first_line &&
+		    rec->last_line <= last_line &&
+		    rec->first_column > last_column &&
+		    (best == NULL || rec->first_column < best->first_column))
+			best = rec;
+	}
+
+	return best;
+}
+
+static MAIN_WINDOW_REC *mainwindows_find_lower_right(MAIN_WINDOW_REC *window)
+{
+	MAIN_WINDOW_REC *best;
+
+	best = mainwindows_find_right(window, FALSE);
+	if (best == NULL)
+		best = mainwindows_find_lower(window);
+
+	return best;
+}
+
+static MAIN_WINDOW_REC *mainwindows_find_upper(MAIN_WINDOW_REC *window)
+{
+	int first_line;
+	MAIN_WINDOW_REC *best;
+	GSList *tmp;
+
+	if (window != NULL)
+		first_line = window->first_line;
+	else
+		first_line = screen_height;
+
+	best = NULL;
+	for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
+		MAIN_WINDOW_REC *rec = tmp->data;
+
+		if (rec->last_line < first_line &&
 		    (best == NULL || rec->last_line > best->last_line))
 			best = rec;
 	}
@@ -252,27 +367,142 @@ static MAIN_WINDOW_REC *mainwindows_find_upper(int line)
 	return best;
 }
 
-static void mainwindows_add_space(int first_line, int last_line)
+static MAIN_WINDOW_REC *mainwindows_find_left(MAIN_WINDOW_REC *window, int find_last)
+{
+	int first_line, last_line, first_column;
+	MAIN_WINDOW_REC *best;
+	GSList *tmp;
+
+	if (window != NULL) {
+		first_line = window->first_line;
+		last_line = window->last_line;
+		first_column = window->first_column;
+	} else {
+		first_line = last_line = screen_height;
+		first_column = screen_width;
+	}
+
+	if (find_last)
+		first_column = screen_width;
+
+	best = NULL;
+	for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
+		MAIN_WINDOW_REC *rec = tmp->data;
+
+		if (rec->first_line >= first_line &&
+		    rec->last_line <= last_line &&
+		    rec->last_column < first_column &&
+		    (best == NULL || rec->last_column > best->last_column))
+			best = rec;
+	}
+
+	return best;
+}
+
+static MAIN_WINDOW_REC *mainwindows_find_upper_left(MAIN_WINDOW_REC *window)
+{
+	MAIN_WINDOW_REC *best;
+
+	best = mainwindows_find_left(window, FALSE);
+	if (best == NULL)
+		best = mainwindows_find_upper(window);
+
+	return best;
+}
+
+static MAIN_WINDOW_REC *mainwindows_find_left_upper(MAIN_WINDOW_REC *window)
+{
+	MAIN_WINDOW_REC *best;
+
+	best = mainwindows_find_left(window, FALSE);
+	if (best == NULL)
+		best = mainwindows_find_left(mainwindows_find_upper(window), TRUE);
+
+	return best;
+}
+
+GSList *mainwindows_get_line(MAIN_WINDOW_REC *rec)
+{
+	MAIN_WINDOW_REC *win;
+	GSList *list;
+
+	list = NULL;
+
+	for (win = mainwindows_find_left(rec, FALSE);
+	     win != NULL;
+	     win = mainwindows_find_left(win, FALSE)) {
+		list = g_slist_append(list, win);
+	}
+
+	if (rec != NULL)
+		list = g_slist_append(list, rec);
+
+	for (win = mainwindows_find_right(rec, FALSE);
+	     win != NULL;
+	     win = mainwindows_find_right(win, FALSE)) {
+		list = g_slist_append(list, win);
+	}
+
+	return list;
+}
+
+/* add back the space which was occupied by destroyed mainwindow first_line .. last_line */
+static void mainwindows_add_space(MAIN_WINDOW_REC *destroy_win)
 {
 	MAIN_WINDOW_REC *rec;
-	int size;
+	int size, rsize;
 
-	if (last_line < first_line)
+	if (destroy_win->last_line < destroy_win->first_line)
 		return;
 
-	size = last_line-first_line+1;
+	if (destroy_win->last_column < destroy_win->first_column)
+		return;
 
-	rec = mainwindows_find_lower(last_line);
+	rsize = destroy_win->last_column-destroy_win->first_column+1;
+	rec = mainwindows_find_left(destroy_win, FALSE);
 	if (rec != NULL) {
-		rec->first_line = first_line;
-		mainwindow_resize(rec, 0, size);
+		rec->last_column = destroy_win->last_column;
+		mainwindow_resize(rec, rsize+1, 0);
 		return;
 	}
 
-	rec = mainwindows_find_upper(first_line);
+	rec = mainwindows_find_right(destroy_win, FALSE);
 	if (rec != NULL) {
-		rec->last_line = last_line;
-		mainwindow_resize(rec, 0, size);
+		rec->first_column = destroy_win->first_column;
+		mainwindow_resize(rec, rsize+1, 0);
+		return;
+	}
+
+	size = destroy_win->last_line-destroy_win->first_line+1;
+
+	rec = mainwindows_find_lower(destroy_win);
+	if (rec != NULL) {
+		GSList *tmp, *list;
+		list = mainwindows_get_line(rec);
+
+		for (tmp = list; tmp != NULL; tmp = tmp->next) {
+			MAIN_WINDOW_REC *rec = tmp->data;
+			rec->first_line = destroy_win->first_line;
+			mainwindow_resize(rec, 0, size);
+		}
+
+		g_slist_free(list);
+		return;
+	}
+
+	rec = mainwindows_find_upper(destroy_win);
+	if (rec != NULL) {
+		GSList *tmp, *list;
+		list = mainwindows_get_line(rec);
+
+		for (tmp = list; tmp != NULL; tmp = tmp->next) {
+			MAIN_WINDOW_REC *rec = tmp->data;
+			rec->last_line = destroy_win->last_line;
+			mainwindow_resize(rec, 0, size);
+		}
+
+		g_slist_free(list);
+		return;
 	}
 }
 
@@ -302,8 +532,7 @@ void mainwindow_destroy(MAIN_WINDOW_REC *window)
 	if (mainwindows != NULL) {
 		gui_windows_remove_parent(window);
 		if (!quitting) {
-			mainwindows_add_space(window->first_line,
-					      window->last_line);
+			mainwindows_add_space(window);
 			mainwindows_redraw();
 		}
 	}
@@ -313,6 +542,14 @@ void mainwindow_destroy(MAIN_WINDOW_REC *window)
 	if (active_mainwin == window) active_mainwin = NULL;
 }
 
+void mainwindow_destroy_half(MAIN_WINDOW_REC *window)
+{
+	int really_quitting = quitting;
+	quitting = TRUE;
+	mainwindow_destroy(window);
+	quitting = really_quitting;
+}
+
 void mainwindows_redraw(void)
 {
         GSList *tmp;
@@ -327,12 +564,20 @@ void mainwindows_redraw(void)
 
 static int mainwindows_compare(MAIN_WINDOW_REC *w1, MAIN_WINDOW_REC *w2)
 {
-	return w1->first_line < w2->first_line ? -1 : 1;
+	return    w1->first_line   < w2->first_line   ? -1
+		: w1->first_line   > w2->first_line   ?  1
+		: w1->first_column < w2->first_column ? -1
+		: w1->first_column > w2->first_column ?  1
+		: 0;
 }
 
 static int mainwindows_compare_reverse(MAIN_WINDOW_REC *w1, MAIN_WINDOW_REC *w2)
 {
-	return w1->first_line < w2->first_line ? 1 : -1;
+	return    w1->first_line   < w2->first_line   ?  1
+		: w1->first_line   > w2->first_line   ? -1
+		: w1->first_column < w2->first_column ?  1
+		: w1->first_column > w2->first_column ? -1
+		: 0;
 }
 
 GSList *mainwindows_get_sorted(int reverse)
@@ -348,123 +593,235 @@ GSList *mainwindows_get_sorted(int reverse)
 	return list;
 }
 
-static void mainwindows_resize_smaller(int xdiff, int ydiff)
+static void mainwindows_resize_smaller(int ydiff)
 {
-        MAIN_WINDOW_REC *rec;
+	MAIN_WINDOW_REC *rec;
 	GSList *sorted, *tmp;
-        int space;
+	int space;
 
-	sorted = mainwindows_get_sorted(TRUE);
+	sorted = NULL;
+	for (rec = mainwindows_find_lower(NULL);
+	     rec != NULL;
+	     rec = mainwindows_find_lower(rec)) {
+		sorted = g_slist_prepend(sorted, rec);
+	}
 	if (sorted == NULL)
 		return;
 
 	for (;;) {
+		int skip_active = FALSE;
 		space = 0;
-		for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
+		/* for each line of windows, calculate the space that can be reduced still */
+		for (tmp = sorted; tmp != NULL; tmp = tmp->next) {
+			int min;
+			GSList *line, *ltmp;
 			rec = tmp->data;
-			space += MAIN_WINDOW_TEXT_HEIGHT(rec)-WINDOW_MIN_SIZE;
+			line = mainwindows_get_line(rec);
+			min = screen_height - ydiff;
+			for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+				int lmin;
+				MAIN_WINDOW_REC *win = ltmp->data;
+				if (win == active_mainwin && tmp == sorted)
+					skip_active = TRUE;
+
+				lmin = MAIN_WINDOW_TEXT_HEIGHT(win)-WINDOW_MIN_SIZE;
+				if (lmin < min)
+					min = lmin;
+			}
+			g_slist_free(line);
+			space += min;
 		}
 
 		if (space >= -ydiff)
 			break;
 
 		rec = sorted->data;
-		if (rec == active_mainwin && sorted->next != NULL)
+		if (skip_active && sorted->next != NULL)
 			rec = sorted->next->data;
 		sorted = g_slist_remove(sorted, rec);
 
 		if (sorted != NULL) {
 			/* terminal is too small - destroy the
 			   uppest window and try again */
-			mainwindow_destroy(rec);
+			GSList *line, *ltmp;
+			line = mainwindows_get_line(rec);
+			for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+				MAIN_WINDOW_REC *win = ltmp->data;
+				mainwindow_destroy(win);
+			}
+			g_slist_free(line);
 		} else {
-			/* only one window in screen.. just force the resize */
-			rec->last_line += ydiff;
-			mainwindow_resize(rec, xdiff, ydiff);
-                        return;
+			/* only one line of window in screen.. just force the resize */
+			GSList *line, *ltmp;
+			line = mainwindows_get_line(rec);
+			for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+				MAIN_WINDOW_REC *win = ltmp->data;
+				win->last_line += ydiff;
+				mainwindow_resize(win, 0, ydiff);
+			}
+			g_slist_free(line);
+			return;
 		}
 	}
 
 	/* resize windows that have space */
 	for (tmp = sorted; tmp != NULL && ydiff < 0; tmp = tmp->next) {
+		int min;
+		GSList *line, *ltmp;
+
 		rec = tmp->data;
+		line = mainwindows_get_line(rec);
+		min = screen_height - ydiff;
+		for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+			int lmin;
+			MAIN_WINDOW_REC *win = ltmp->data;
+			lmin = MAIN_WINDOW_TEXT_HEIGHT(win)-WINDOW_MIN_SIZE;
+			if (lmin < min)
+				min = lmin;
+		}
+		space = min;
 
-		space = MAIN_WINDOW_TEXT_HEIGHT(rec)-WINDOW_MIN_SIZE;
 		if (space == 0) {
-			mainwindow_resize(rec, xdiff, 0);
+			/* move the line */
+			for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+				MAIN_WINDOW_REC *win = ltmp->data;
+				mainwindow_resize(win, 0, 0);
+				win->size_dirty = TRUE;
+				win->first_line += ydiff;
+				win->last_line += ydiff;
+				signal_emit("mainwindow moved", 1, win);
+			}
+		} else {
+			if (space > -ydiff) space = -ydiff;
+			for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+				MAIN_WINDOW_REC *win = ltmp->data;
+				win->last_line += ydiff;
+				win->first_line += ydiff + space;
 
-			rec->first_line += ydiff;
-			rec->last_line += ydiff;
-			signal_emit("mainwindow moved", 1, rec);
-			continue;
-		}
-
-		if (space > -ydiff) space = -ydiff;
-		rec->last_line += ydiff;
-		ydiff += space;
-		rec->first_line += ydiff;
-
-		mainwindow_resize(rec, xdiff, -space);
-	}
-
-	if (xdiff != 0) {
-		while (tmp != NULL) {
-			mainwindow_resize(tmp->data, xdiff, 0);
-			tmp = tmp->next;
+				mainwindow_resize(win, 0, -space);
+			}
+			ydiff += space;
 		}
+		g_slist_free(line);
 	}
 
 	g_slist_free(sorted);
 }
 
-static void mainwindows_resize_bigger(int xdiff, int ydiff)
+static void mainwindows_rresize_line(int xdiff, MAIN_WINDOW_REC *win)
 {
-	GSList *sorted, *tmp;
+	int windows, i, extra_width, next_column, shrunk;
+	int *widths;
+	GSList *line, *tmp;
 
-	sorted = mainwindows_get_sorted(FALSE);
-	for (tmp = sorted; tmp != NULL; tmp = tmp->next) {
+	line = mainwindows_get_line(win);
+	windows = g_slist_length(line);
+	widths = g_new0(int, windows);
+
+	extra_width = screen_width - windows + 1;
+	for (tmp = line, i = 0; tmp != NULL; tmp = tmp->next, i++) {
 		MAIN_WINDOW_REC *rec = tmp->data;
-
-		if (ydiff == 0 || tmp->next != NULL) {
-			mainwindow_resize(rec, xdiff, 0);
-			continue;
+		widths[i] = (MAIN_WINDOW_TEXT_WIDTH(rec) * (screen_width - windows + 1)) / (screen_width - xdiff - windows + 1);
+		extra_width -= widths[i] + rec->statusbar_columns;
+	}
+	shrunk = FALSE;
+	for (i = windows; extra_width < 0; i = i > 1 ? i - 1 : windows) {
+		if (widths[i-1] > NEW_WINDOW_WIDTH || (i == 1 && !shrunk)) {
+			widths[i-1]--;
+			extra_width++;
+			shrunk = i == 1;
 		}
-
-		/* lowest window - give all the extra space for it */
-		rec->last_line += ydiff;
-		mainwindow_resize(rec, xdiff, ydiff);
 	}
-	g_slist_free(sorted);
-}
 
-static void mainwindows_resize_horiz(int xdiff)
-{
-	GSList *tmp;
+	next_column = 0;
 
-	for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
+#define extra ( (i >= screen_width % windows && i < extra_width + (screen_width % windows)) \
+		|| i + windows < extra_width + (screen_width % windows) ? 1 : 0 )
+
+	for (tmp = line, i = 0; tmp != NULL; tmp = tmp->next, i++) {
 		MAIN_WINDOW_REC *rec = tmp->data;
-
-		mainwindow_resize(rec, xdiff, 0);
+		rec->first_column = next_column;
+		rec->last_column = rec->first_column + widths[i] + rec->statusbar_columns + extra - 1;
+		next_column = rec->last_column + 2;
+		mainwindow_resize(rec, widths[i] + rec->statusbar_columns + extra - rec->width, 0);
+		rec->size_dirty = TRUE;
 	}
+#undef extra
+
+	g_free(widths);
+	g_slist_free(line);
 }
 
 void mainwindows_resize(int width, int height)
 {
 	int xdiff, ydiff;
 
-	xdiff = width-old_screen_width;
-	ydiff = height-old_screen_height;
-        old_screen_width = width;
-        old_screen_height = height;
+	xdiff = width-screen_width;
+	ydiff = height-screen_height;
+	screen_width = width;
+	screen_height = height;
 
-	if (ydiff < 0)
-		mainwindows_resize_smaller(xdiff, ydiff);
-	else if (ydiff > 0)
-		mainwindows_resize_bigger(xdiff, ydiff);
-        else if (xdiff != 0)
-		mainwindows_resize_horiz(xdiff);
+	if (ydiff > 0) {
+		/* algorithm: enlarge bottom window */
+		MAIN_WINDOW_REC *rec;
+		GSList *line, *tmp;
+		line = mainwindows_get_line(mainwindows_find_upper(NULL));
+		for (tmp = line; tmp != NULL; tmp = tmp->next) {
+			rec = tmp->data;
+			rec->last_line += ydiff;
+			mainwindow_resize(rec, 0, ydiff);
+		}
+		g_slist_free(line);
+	}
 
-        signal_emit("terminal resized", 0);
+	if (xdiff > 0) {
+		/* algorithm: distribute new space on each line */
+		MAIN_WINDOW_REC *win;
+
+		for (win = mainwindows_find_lower(NULL);
+		     win != NULL;
+		     win = mainwindows_find_lower(win)) {
+			mainwindows_rresize_line(xdiff, win);
+		}
+	}
+
+	if (xdiff < 0) {
+		/* algorithm: shrink each window,
+		   destroy windows on the right if no room */
+		MAIN_WINDOW_REC *win;
+
+		for (win = mainwindows_find_lower(NULL);
+		     win != NULL;
+		     win = mainwindows_find_lower(win)) {
+			int max_windows, i, last_column;
+			GSList *line, *tmp;
+
+			line = mainwindows_get_line(win);
+			max_windows = (screen_width + 1) / (NEW_WINDOW_WIDTH + 1);
+			if (max_windows < 1)
+				max_windows = 1;
+			last_column = screen_width - 1;
+			for (tmp = line, i = 0; tmp != NULL; tmp = tmp->next, i++) {
+				MAIN_WINDOW_REC *rec = tmp->data;
+				if (i >= max_windows)
+					mainwindow_destroy_half(rec);
+				else
+					last_column = rec->last_column;
+			}
+			win = line->data;
+			g_slist_free(line);
+
+			mainwindows_rresize_line(screen_width - last_column + 1, win);
+		}
+	}
+
+	if (ydiff < 0) {
+		/* algorithm: shrink windows starting from bottom,
+		   destroy windows starting from top if no room */
+		mainwindows_resize_smaller(ydiff);
+	}
+
+	signal_emit("terminal resized", 0);
 
 	irssi_redraw();
 }
@@ -474,31 +831,37 @@ int mainwindows_reserve_lines(int top, int bottom)
 	MAIN_WINDOW_REC *window;
 	int ret;
 
-        ret = -1;
+	ret = -1;
 	if (top != 0) {
+		GSList *list, *tmp;
 		g_return_val_if_fail(top > 0 || screen_reserved_top > top, -1);
 
 		ret = screen_reserved_top;
 		screen_reserved_top += top;
 
-		window = mainwindows_find_lower(-1);
-		if (window != NULL) {
+		list = mainwindows_get_line(mainwindows_find_lower(NULL));
+		for (tmp = list; tmp != NULL; tmp = tmp->next) {
+			window = tmp->data;
 			window->first_line += top;
 			mainwindow_resize(window, 0, -top);
 		}
+		g_slist_free(list);
 	}
 
 	if (bottom != 0) {
+		GSList *list, *tmp;
 		g_return_val_if_fail(bottom > 0 || screen_reserved_bottom > bottom, -1);
 
 		ret = screen_reserved_bottom;
 		screen_reserved_bottom += bottom;
 
-		window = mainwindows_find_upper(term_height);
-		if (window != NULL) {
+		list = mainwindows_get_line(mainwindows_find_upper(NULL));
+		for (tmp = list; tmp != NULL; tmp = tmp->next) {
+			window = tmp->data;
 			window->last_line -= bottom;
 			mainwindow_resize(window, 0, -bottom);
 		}
+		g_slist_free(list);
 	}
 
 	return ret;
@@ -528,47 +891,109 @@ int mainwindow_set_statusbar_lines(MAIN_WINDOW_REC *window,
         return ret;
 }
 
-static void mainwindows_resize_two(MAIN_WINDOW_REC *grow_win,
-				   MAIN_WINDOW_REC *shrink_win, int count)
+static void mainwindows_resize_two(GSList *grow_list,
+				   GSList *shrink_list, int count)
 {
-        irssi_set_dirty();
+	GSList *tmp;
+	MAIN_WINDOW_REC *win;
 
-	mainwindow_resize(grow_win, 0, count);
-	mainwindow_resize(shrink_win, 0, -count);
-	grow_win->dirty = TRUE;
-	shrink_win->dirty = TRUE;
+	irssi_set_dirty();
+
+	for (tmp = shrink_list; tmp != NULL; tmp = tmp->next) {
+		win = tmp->data;
+		mainwindow_resize(win, 0, -count);
+		win->dirty = TRUE;
+	}
+	for (tmp = grow_list; tmp != NULL; tmp = tmp->next) {
+		win = tmp->data;
+		mainwindow_resize(win, 0, count);
+		win->dirty = TRUE;
+	}
 }
 
 static int try_shrink_lower(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
-	shrink_win = mainwindows_find_lower(window->last_line);
-	if (shrink_win != NULL &&
-	    MAIN_WINDOW_TEXT_HEIGHT(shrink_win)-count >= WINDOW_MIN_SIZE) {
-                window->last_line += count;
-		shrink_win->first_line += count;
-		mainwindows_resize_two(window, shrink_win, count);
-                return TRUE;
+	shrink_win = mainwindows_find_lower(window);
+	if (shrink_win != NULL) {
+		int ok;
+		GSList *shrink_list, *tmp;
+		MAIN_WINDOW_REC *win;
+
+		ok = TRUE;
+		shrink_list = mainwindows_get_line(shrink_win);
+
+		for (tmp = shrink_list; tmp != NULL; tmp = tmp->next) {
+			win = tmp->data;
+			if (MAIN_WINDOW_TEXT_HEIGHT(win)-count < WINDOW_MIN_SIZE) {
+				ok = FALSE;
+				break;
+			}
+		}
+		if (ok) {
+			GSList *grow_list;
+			grow_list = mainwindows_get_line(window);
+
+			for (tmp = shrink_list; tmp != NULL; tmp = tmp->next) {
+				win = tmp->data;
+				win->first_line += count;
+			}
+			for (tmp = grow_list; tmp != NULL; tmp = tmp->next) {
+				win = tmp->data;
+				win->last_line += count;
+			}
+
+			mainwindows_resize_two(grow_list, shrink_list, count);
+			g_slist_free(grow_list);
+		}
+
+		g_slist_free(shrink_list);
+		return ok;
 	}
 
-        return FALSE;
+	return FALSE;
 }
 
 static int try_shrink_upper(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
-	shrink_win = mainwindows_find_upper(window->first_line);
-	if (shrink_win != NULL &&
-	    MAIN_WINDOW_TEXT_HEIGHT(shrink_win)-count >= WINDOW_MIN_SIZE) {
-		window->first_line -= count;
-		shrink_win->last_line -= count;
-		mainwindows_resize_two(window, shrink_win, count);
-                return TRUE;
+	shrink_win = mainwindows_find_upper(window);
+	if (shrink_win != NULL) {
+		int ok;
+		GSList *shrink_list, *tmp;
+		MAIN_WINDOW_REC *win;
+
+		ok = TRUE;
+		shrink_list = mainwindows_get_line(shrink_win);
+
+		for (tmp = shrink_list; tmp != NULL; tmp = tmp->next) {
+			win = tmp->data;
+			if (MAIN_WINDOW_TEXT_HEIGHT(win)-count < WINDOW_MIN_SIZE) {
+				ok = FALSE;
+				break;
+			}
+		}
+		if (ok) {
+			GSList *grow_list;
+			grow_list = mainwindows_get_line(window);
+			for (tmp = grow_list; tmp != NULL; tmp = tmp->next) {
+				win = tmp->data;
+				win->first_line -= count;
+			}
+			for (tmp = shrink_list; tmp != NULL; tmp = tmp->next) {
+				win = tmp->data;
+				win->last_line -= count;
+			}
+			mainwindows_resize_two(grow_list, shrink_list, count);
+			g_slist_free(grow_list);
+		}
+		g_slist_free(shrink_list);
+		return ok;
 	}
 
-        return FALSE;
+	return FALSE;
 }
 
 static int mainwindow_grow(MAIN_WINDOW_REC *window, int count,
@@ -588,28 +1013,52 @@ static int try_grow_lower(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *grow_win;
 
-	grow_win = mainwindows_find_lower(window->last_line);
+	grow_win = mainwindows_find_lower(window);
 	if (grow_win != NULL) {
-                window->last_line -= count;
-		grow_win->first_line -= count;
-		mainwindows_resize_two(grow_win, window, count);
+		MAIN_WINDOW_REC *win;
+		GSList *grow_list, *shrink_list, *tmp;
+		grow_list = mainwindows_get_line(grow_win);
+		shrink_list = mainwindows_get_line(window);
+		for (tmp = grow_list; tmp != NULL; tmp = tmp->next) {
+			win = tmp->data;
+			win->first_line -= count;
+		}
+		for (tmp = shrink_list; tmp != NULL; tmp = tmp->next) {
+			win = tmp->data;
+			win->last_line -= count;
+		}
+		mainwindows_resize_two(grow_list, shrink_list, count);
+		g_slist_free(shrink_list);
+		g_slist_free(grow_list);
 	}
 
-        return grow_win != NULL;
+	return grow_win != NULL;
 }
 
 static int try_grow_upper(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *grow_win;
 
-	grow_win = mainwindows_find_upper(window->first_line);
+	grow_win = mainwindows_find_upper(window);
 	if (grow_win != NULL) {
-		window->first_line += count;
-		grow_win->last_line += count;
-		mainwindows_resize_two(grow_win, window, count);
+		MAIN_WINDOW_REC *win;
+		GSList *grow_list, *shrink_list, *tmp;
+		grow_list = mainwindows_get_line(grow_win);
+		shrink_list = mainwindows_get_line(window);
+		for (tmp = grow_list; tmp != NULL; tmp = tmp->next) {
+			win = tmp->data;
+			win->last_line += count;
+		}
+		for (tmp = shrink_list; tmp != NULL; tmp = tmp->next) {
+			win = tmp->data;
+			win->first_line += count;
+		}
+		mainwindows_resize_two(grow_list, shrink_list, count);
+		g_slist_free(shrink_list);
+		g_slist_free(grow_list);
 	}
 
-        return grow_win != NULL;
+	return grow_win != NULL;
 }
 
 static int mainwindow_shrink(MAIN_WINDOW_REC *window, int count, int resize_lower)
@@ -627,6 +1076,109 @@ static int mainwindow_shrink(MAIN_WINDOW_REC *window, int count, int resize_lowe
         return TRUE;
 }
 
+static void mainwindows_rresize_two(MAIN_WINDOW_REC *grow_win,
+				    MAIN_WINDOW_REC *shrink_win, int count)
+{
+	irssi_set_dirty();
+
+	mainwindow_resize(grow_win, count, 0);
+	mainwindow_resize(shrink_win, -count, 0);
+	grow_win->dirty = TRUE;
+	shrink_win->dirty = TRUE;
+}
+
+static int try_rshrink_right(MAIN_WINDOW_REC *window, int count)
+{
+	MAIN_WINDOW_REC *shrink_win;
+
+	shrink_win = mainwindows_find_right(window, FALSE);
+	if (shrink_win != NULL) {
+		if (MAIN_WINDOW_TEXT_WIDTH(shrink_win)-count < NEW_WINDOW_WIDTH) {
+			return FALSE;
+		}
+
+		shrink_win->first_column += count;
+		window->last_column += count;
+
+		mainwindows_rresize_two(window, shrink_win, count);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static int try_rshrink_left(MAIN_WINDOW_REC *window, int count)
+{
+	MAIN_WINDOW_REC *shrink_win;
+
+	shrink_win = mainwindows_find_left(window, FALSE);
+	if (shrink_win != NULL) {
+		if (MAIN_WINDOW_TEXT_WIDTH(shrink_win)-count < NEW_WINDOW_WIDTH) {
+			return FALSE;
+		}
+		window->first_column -= count;
+		shrink_win->last_column -= count;
+
+		mainwindows_rresize_two(window, shrink_win, count);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static int mainwindow_rgrow(MAIN_WINDOW_REC *window, int count)
+{
+	if (!try_rshrink_right(window, count)) {
+		if (!try_rshrink_left(window, count))
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+static int try_rgrow_right(MAIN_WINDOW_REC *window, int count)
+{
+	MAIN_WINDOW_REC *grow_win;
+
+	grow_win = mainwindows_find_right(window, FALSE);
+	if (grow_win != NULL) {
+		grow_win->first_column -= count;
+		window->last_column -= count;
+		mainwindows_rresize_two(grow_win, window, count);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static int try_rgrow_left(MAIN_WINDOW_REC *window, int count)
+{
+	MAIN_WINDOW_REC *grow_win;
+
+	grow_win = mainwindows_find_left(window, FALSE);
+	if (grow_win != NULL) {
+		grow_win->last_column += count;
+		window->first_column += count;
+		mainwindows_rresize_two(grow_win, window, count);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static int mainwindow_rshrink(MAIN_WINDOW_REC *window, int count)
+{
+	if (MAIN_WINDOW_TEXT_WIDTH(window)-count < NEW_WINDOW_WIDTH)
+		return FALSE;
+
+	if (!try_rgrow_right(window, count)) {
+		if (!try_rgrow_left(window, count))
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
 /* Change the window height - the height includes the lines needed for
    statusbars. If resize_lower is TRUE, the lower window is first tried
    to be resized instead of upper window. */
@@ -639,6 +1191,15 @@ void mainwindow_set_size(MAIN_WINDOW_REC *window, int height, int resize_lower)
 		mainwindow_grow(window, height, resize_lower);
 }
 
+void mainwindow_set_rsize(MAIN_WINDOW_REC *window, int width)
+{
+	width -= window->width;
+	if (width < 0)
+		mainwindow_rshrink(window, -width);
+	else
+		mainwindow_rgrow(window, width);
+}
+
 void mainwindows_redraw_dirty(void)
 {
 	GSList *tmp;
@@ -707,35 +1268,52 @@ static void cmd_window_size(const char *data)
 /* SYNTAX: WINDOW BALANCE */
 static void cmd_window_balance(void)
 {
-	GSList *sorted, *tmp;
+	GSList *sorted, *stmp, *line, *ltmp;
 	int avail_size, unit_size, bigger_units;
 	int windows, last_line, old_size;
+	MAIN_WINDOW_REC *win;
 
 	windows = g_slist_length(mainwindows);
 	if (windows == 1) return;
 
+	sorted = NULL;
+	windows = 0;
+	for (win = mainwindows_find_lower(NULL);
+	     win != NULL;
+	     win = mainwindows_find_lower(win)) {
+		windows++;
+		sorted = g_slist_append(sorted, win);
+	}
+
 	avail_size = term_height - screen_reserved_top-screen_reserved_bottom;
 	unit_size = avail_size/windows;
 	bigger_units = avail_size%windows;
 
-	sorted = mainwindows_get_sorted(FALSE);
-        last_line = screen_reserved_top;
-	for (tmp = sorted; tmp != NULL; tmp = tmp->next) {
-		MAIN_WINDOW_REC *rec = tmp->data;
+	last_line = screen_reserved_top;
+	for (stmp = sorted; stmp != NULL; stmp = stmp->next) {
+		win = stmp->data;
+		line = mainwindows_get_line(win);
 
-		old_size = rec->height;
-		rec->first_line = last_line;
-		rec->last_line = rec->first_line + unit_size-1;
+		for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+			MAIN_WINDOW_REC *rec = ltmp->data;
+			old_size = rec->height;
+			rec->first_line = last_line;
+			rec->last_line = rec->first_line + unit_size-1;
 
-		if (bigger_units > 0) {
-			rec->last_line++;
-                        bigger_units--;
+			if (bigger_units > 0) {
+				rec->last_line++;
+			}
+
+			rec->height = rec->last_line-rec->first_line+1;
+
+			mainwindow_resize(rec, 0, rec->height-old_size);
 		}
+		if (line != NULL && bigger_units > 0) {
+			bigger_units--;
+		}
+		last_line = win->last_line+1;
 
-		rec->height = rec->last_line-rec->first_line+1;
-		last_line = rec->last_line+1;
-
-		mainwindow_resize(rec, 0, rec->height-old_size);
+		g_slist_free(line);
 	}
 	g_slist_free(sorted);
 
@@ -769,29 +1347,30 @@ static void cmd_window_hide(const char *data)
 		return;
 
 	if (WINDOW_MAIN(window)->sticky_windows) {
-		printformat_window(active_win, MSGLEVEL_CLIENTERROR,
-				   TXT_CANT_HIDE_STICKY_WINDOWS);
-                return;
+		if (!settings_get_bool("autounstick_windows")) {
+			printformat_window(active_win, MSGLEVEL_CLIENTERROR,
+					   TXT_CANT_HIDE_STICKY_WINDOWS);
+			return;
+		}
 	}
 
 	mainwindow_destroy(WINDOW_MAIN(window));
 
 	if (active_mainwin == NULL) {
 		active_mainwin = WINDOW_MAIN(active_win);
-                window_set_active(active_mainwin->active);
+		window_set_active(active_mainwin->active);
 	}
 }
 
-/* SYNTAX: WINDOW SHOW <number>|<name> */
-static void cmd_window_show(const char *data)
+static void _cmd_window_show_opt(const char *data, int right)
 {
-        MAIN_WINDOW_REC *parent;
+	MAIN_WINDOW_REC *parent;
 	WINDOW_REC *window;
 
 	if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	if (is_numeric(data, '\0')) {
-                window = window_find_refnum(atoi(data));
+		window = window_find_refnum(atoi(data));
 		if (window == NULL) {
 			printformat_window(active_win, MSGLEVEL_CLIENTERROR,
 					   TXT_REFNUM_NOT_FOUND, data);
@@ -804,30 +1383,150 @@ static void cmd_window_show(const char *data)
 		return;
 
 	if (WINDOW_GUI(window)->sticky) {
-		printformat_window(active_win, MSGLEVEL_CLIENTERROR,
-				   TXT_CANT_SHOW_STICKY_WINDOWS);
-                return;
+		if (!settings_get_bool("autounstick_windows")) {
+			printformat_window(active_win, MSGLEVEL_CLIENTERROR,
+					   TXT_CANT_SHOW_STICKY_WINDOWS);
+			return;
+		}
 	}
 
-	parent = mainwindow_create();
+	parent = mainwindow_create(right);
 	parent->active = window;
-        gui_window_reparent(window, parent);
+	gui_window_reparent(window, parent);
 
 	if (settings_get_bool("autostick_split_windows"))
-                gui_window_set_sticky(window);
+		gui_window_set_sticky(window);
 
 	active_mainwin = NULL;
 	window_set_active(window);
 }
 
+/* SYNTAX: WINDOW SHOW <number>|<name> */
+static void cmd_window_show(const char *data)
+{
+	_cmd_window_show_opt(data, FALSE);
+}
+
+/* SYNTAX: WINDOW RSHOW <number>|<name> */
+static void cmd_window_rshow(const char *data)
+{
+	_cmd_window_show_opt(data, TRUE);
+}
+
+/* SYNTAX: WINDOW RGROW [<columns>] */
+static void cmd_window_rgrow(const char *data)
+{
+	int count;
+
+	count = *data == '\0' ? 1 : atoi(data);
+	if (!mainwindow_rgrow(WINDOW_MAIN(active_win), count)) {
+		printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
+				   TXT_WINDOW_TOO_SMALL);
+	}
+}
+
+/* SYNTAX: WINDOW RSHRINK [<lines>] */
+static void cmd_window_rshrink(const char *data)
+{
+	int count;
+
+	count = *data == '\0' ? 1 : atoi(data);
+	if (!mainwindow_rshrink(WINDOW_MAIN(active_win), count)) {
+		printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
+				   TXT_WINDOW_TOO_SMALL);
+	}
+}
+
+/* SYNTAX: WINDOW RSIZE <columns> */
+static void cmd_window_rsize(const char *data)
+{
+	char rsizestr[MAX_INT_STRLEN];
+	int rsize;
+
+	if (!is_numeric(data, 0)) return;
+	rsize = atoi(data);
+
+	rsize -= MAIN_WINDOW_TEXT_WIDTH(WINDOW_MAIN(active_win));
+	if (rsize == 0) return;
+
+	ltoa(rsizestr, rsize < 0 ? -rsize : rsize);
+	if (rsize < 0)
+		cmd_window_rshrink(rsizestr);
+	else
+		cmd_window_rgrow(rsizestr);
+}
+
+/* SYNTAX: WINDOW RBALANCE */
+static void cmd_window_rbalance(void)
+{
+	GSList *line, *ltmp;
+	int avail_width, unit_width, bigger_units;
+	int windows, last_column, old_width;
+	MAIN_WINDOW_REC *win;
+
+	line = mainwindows_get_line(WINDOW_MAIN(active_win));
+	windows = g_slist_length(line);
+	if (windows == 1) {
+		g_slist_free(line);
+		return;
+	}
+
+	avail_width = term_width - screen_reserved_left-screen_reserved_right - windows + 1;
+	unit_width = avail_width/windows;
+	bigger_units = avail_width%windows;
+
+	last_column = screen_reserved_left;
+	for (ltmp = line; ltmp != NULL; ltmp = ltmp->next) {
+		win = ltmp->data;
+		old_width = win->width;
+		win->first_column = last_column;
+		win->last_column = win->first_column + unit_width-1;
+
+		if (bigger_units > 0) {
+			win->last_column++;
+			bigger_units--;
+		}
+
+		mainwindow_resize(win, win->last_column - win->first_column + 1 - old_width, 0);
+		last_column = win->last_column+2;
+	}
+	g_slist_free(line);
+
+	mainwindows_redraw();
+}
+
 /* SYNTAX: WINDOW UP */
 static void cmd_window_up(void)
 {
 	MAIN_WINDOW_REC *rec;
 
-	rec = mainwindows_find_upper(active_mainwin->first_line);
+	rec = mainwindows_find_left_upper(active_mainwin);
 	if (rec == NULL)
-		rec = mainwindows_find_upper(term_height);
+		rec = mainwindows_find_left_upper(NULL);
+	if (rec != NULL)
+		window_set_active(rec->active);
+}
+
+/* SYNTAX: WINDOW DUP */
+static void cmd_window_dup(void)
+{
+	MAIN_WINDOW_REC *rec;
+
+	rec = mainwindows_find_upper(active_mainwin);
+	if (rec == NULL)
+		rec = mainwindows_find_upper(NULL);
+	if (rec != NULL)
+		window_set_active(rec->active);
+}
+
+/* SYNTAX: WINDOW DLEFT */
+static void cmd_window_dleft(void)
+{
+	MAIN_WINDOW_REC *rec;
+
+	rec = mainwindows_find_left(active_mainwin, FALSE);
+	if (rec == NULL)
+		rec = mainwindows_find_left(active_mainwin, TRUE);
 	if (rec != NULL)
 		window_set_active(rec->active);
 }
@@ -837,9 +1536,33 @@ static void cmd_window_down(void)
 {
 	MAIN_WINDOW_REC *rec;
 
-	rec = mainwindows_find_lower(active_mainwin->last_line);
+	rec = mainwindows_find_lower_right(active_mainwin);
 	if (rec == NULL)
-		rec = mainwindows_find_lower(-1);
+		rec = mainwindows_find_lower_right(NULL);
+	if (rec != NULL)
+		window_set_active(rec->active);
+}
+
+/* SYNTAX: WINDOW DDOWN */
+static void cmd_window_ddown(void)
+{
+	MAIN_WINDOW_REC *rec;
+
+	rec = mainwindows_find_lower(active_mainwin);
+	if (rec == NULL)
+		rec = mainwindows_find_lower(NULL);
+	if (rec != NULL)
+		window_set_active(rec->active);
+}
+
+/* SYNTAX: WINDOW DRIGHT */
+static void cmd_window_dright(void)
+{
+	MAIN_WINDOW_REC *rec;
+
+	rec = mainwindows_find_right(active_mainwin, FALSE);
+	if (rec == NULL)
+		rec = mainwindows_find_right(active_mainwin, TRUE);
 	if (rec != NULL)
 		window_set_active(rec->active);
 }
@@ -997,13 +1720,37 @@ static void cmd_window_move_right(void)
 		window_set_refnum(active_win, refnum);
 }
 
+/* SYNTAX: WINDOW MOVE DLEFT */
+static void cmd_window_move_dleft(void)
+{
+	MAIN_WINDOW_REC *rec;
+
+	rec = mainwindows_find_left(active_mainwin, FALSE);
+	if (rec == NULL)
+		rec = mainwindows_find_left(active_mainwin, TRUE);
+	if (rec != NULL)
+		window_reparent(active_win, rec);
+}
+
+/* SYNTAX: WINDOW MOVE DRIGHT */
+static void cmd_window_move_dright(void)
+{
+	MAIN_WINDOW_REC *rec;
+
+	rec = mainwindows_find_right(active_mainwin, FALSE);
+	if (rec == NULL)
+		rec = mainwindows_find_right(active_mainwin, TRUE);
+	if (rec != NULL)
+		window_reparent(active_win, rec);
+}
+
 /* SYNTAX: WINDOW MOVE UP */
 static void cmd_window_move_up(void)
 {
 	MAIN_WINDOW_REC *rec;
 
-	rec = mainwindows_find_upper(active_mainwin->first_line);
-        if (rec != NULL)
+	rec = mainwindows_find_upper_left(active_mainwin);
+	if (rec != NULL)
 		window_reparent(active_win, rec);
 }
 
@@ -1012,7 +1759,7 @@ static void cmd_window_move_down(void)
 {
 	MAIN_WINDOW_REC *rec;
 
-	rec = mainwindows_find_lower(active_mainwin->last_line);
+	rec = mainwindows_find_lower_right(active_mainwin);
 	if (rec != NULL)
 		window_reparent(active_win, rec);
 }
@@ -1058,12 +1805,14 @@ static void sig_window_print_info(WINDOW_REC *win)
 
 void mainwindows_init(void)
 {
-	old_screen_width = term_width;
-	old_screen_height = term_height;
+	screen_width = term_width;
+	screen_height = term_height;
 
 	mainwindows = NULL;
 	active_mainwin = NULL;
+	clrtoeol_info = g_new0(MAIN_WINDOW_BORDER_REC, 1);
 	screen_reserved_top = screen_reserved_bottom = 0;
+	screen_reserved_left = screen_reserved_right = 0;
 
 	command_bind("window grow", NULL, (SIGNAL_FUNC) cmd_window_grow);
 	command_bind("window shrink", NULL, (SIGNAL_FUNC) cmd_window_shrink);
@@ -1075,18 +1824,30 @@ void mainwindows_init(void)
 	command_bind("window down", NULL, (SIGNAL_FUNC) cmd_window_down);
 	command_bind("window left", NULL, (SIGNAL_FUNC) cmd_window_left);
 	command_bind("window right", NULL, (SIGNAL_FUNC) cmd_window_right);
+	command_bind("window dup", NULL, (SIGNAL_FUNC) cmd_window_dup);
+	command_bind("window ddown", NULL, (SIGNAL_FUNC) cmd_window_ddown);
+	command_bind("window dleft", NULL, (SIGNAL_FUNC) cmd_window_dleft);
+	command_bind("window dright", NULL, (SIGNAL_FUNC) cmd_window_dright);
 	command_bind("window stick", NULL, (SIGNAL_FUNC) cmd_window_stick);
 	command_bind("window move left", NULL, (SIGNAL_FUNC) cmd_window_move_left);
 	command_bind("window move right", NULL, (SIGNAL_FUNC) cmd_window_move_right);
 	command_bind("window move up", NULL, (SIGNAL_FUNC) cmd_window_move_up);
 	command_bind("window move down", NULL, (SIGNAL_FUNC) cmd_window_move_down);
-        signal_add("window print info", (SIGNAL_FUNC) sig_window_print_info);
+	command_bind("window move dleft", NULL, (SIGNAL_FUNC) cmd_window_move_dleft);
+	command_bind("window move dright", NULL, (SIGNAL_FUNC) cmd_window_move_dright);
+	command_bind("window rgrow", NULL, (SIGNAL_FUNC) cmd_window_rgrow);
+	command_bind("window rshrink", NULL, (SIGNAL_FUNC) cmd_window_rshrink);
+	command_bind("window rsize", NULL, (SIGNAL_FUNC) cmd_window_rsize);
+	command_bind("window rbalance", NULL, (SIGNAL_FUNC) cmd_window_rbalance);
+	command_bind("window rshow", NULL, (SIGNAL_FUNC) cmd_window_rshow);
+	signal_add("window print info", (SIGNAL_FUNC) sig_window_print_info);
 }
 
 void mainwindows_deinit(void)
 {
 	while (mainwindows != NULL)
 		mainwindow_destroy(mainwindows->data);
+	g_free(clrtoeol_info);
 
 	command_unbind("window grow", (SIGNAL_FUNC) cmd_window_grow);
 	command_unbind("window shrink", (SIGNAL_FUNC) cmd_window_shrink);
@@ -1098,10 +1859,21 @@ void mainwindows_deinit(void)
 	command_unbind("window down", (SIGNAL_FUNC) cmd_window_down);
 	command_unbind("window left", (SIGNAL_FUNC) cmd_window_left);
 	command_unbind("window right", (SIGNAL_FUNC) cmd_window_right);
+	command_unbind("window dup", (SIGNAL_FUNC) cmd_window_dup);
+	command_unbind("window ddown", (SIGNAL_FUNC) cmd_window_ddown);
+	command_unbind("window dleft", (SIGNAL_FUNC) cmd_window_dleft);
+	command_unbind("window dright", (SIGNAL_FUNC) cmd_window_dright);
 	command_unbind("window stick", (SIGNAL_FUNC) cmd_window_stick);
 	command_unbind("window move left", (SIGNAL_FUNC) cmd_window_move_left);
 	command_unbind("window move right", (SIGNAL_FUNC) cmd_window_move_right);
 	command_unbind("window move up", (SIGNAL_FUNC) cmd_window_move_up);
 	command_unbind("window move down", (SIGNAL_FUNC) cmd_window_move_down);
-        signal_remove("window print info", (SIGNAL_FUNC) sig_window_print_info);
+	command_unbind("window move dleft", (SIGNAL_FUNC) cmd_window_move_dleft);
+	command_unbind("window move dright", (SIGNAL_FUNC) cmd_window_move_dright);
+	command_unbind("window rgrow", (SIGNAL_FUNC) cmd_window_rgrow);
+	command_unbind("window rshrink", (SIGNAL_FUNC) cmd_window_rshrink);
+	command_unbind("window rsize", (SIGNAL_FUNC) cmd_window_rsize);
+	command_unbind("window rbalance", (SIGNAL_FUNC) cmd_window_rbalance);
+	command_unbind("window rshow", (SIGNAL_FUNC) cmd_window_rshow);
+	signal_remove("window print info", (SIGNAL_FUNC) sig_window_print_info);
 }
diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h
index 1bca333d..414275bf 100644
--- a/src/fe-text/mainwindows.h
+++ b/src/fe-text/mainwindows.h
@@ -5,36 +5,48 @@
 #include "term.h"
 
 #define WINDOW_MIN_SIZE 2
+#define NEW_WINDOW_WIDTH 10
 
 #define MAIN_WINDOW_TEXT_HEIGHT(window) \
         ((window)->height-(window)->statusbar_lines)
 
+#define MAIN_WINDOW_TEXT_WIDTH(window) \
+        ((window)->width-(window)->statusbar_columns)
+
 typedef struct {
 	WINDOW_REC *active;
 
 	TERM_WINDOW *screen_win;
-        int sticky_windows; /* number of sticky windows */
+	int sticky_windows; /* number of sticky windows */
 
 	int first_line, last_line; /* first/last line used by this window (0..x) (includes statusbars) */
+	int first_column, last_column; /* first/last column used by this window (0..x) (includes statusbars) */
 	int width, height; /* width/height of the window (includes statusbars) */
 
 	GSList *statusbars;
-	int statusbar_lines_top;
-	int statusbar_lines_bottom;
+	int statusbar_lines_top, statusbar_lines_bottom;
 	int statusbar_lines; /* top+bottom */
+	int statusbar_columns_left, statusbar_columns_right;
+	int statusbar_columns; /* left+right */
 
 	unsigned int dirty:1; /* This window needs a redraw */
 	unsigned int size_dirty:1; /* We'll need to resize the window, but haven't got around doing it just yet. */
 } MAIN_WINDOW_REC;
 
+typedef struct {
+	char *color;
+	TERM_WINDOW *window;
+} MAIN_WINDOW_BORDER_REC;
+
 extern GSList *mainwindows;
 extern MAIN_WINDOW_REC *active_mainwin;
+extern MAIN_WINDOW_BORDER_REC *clrtoeol_info;
 extern int screen_reserved_top, screen_reserved_bottom;
 
 void mainwindows_init(void);
 void mainwindows_deinit(void);
 
-MAIN_WINDOW_REC *mainwindow_create(void);
+MAIN_WINDOW_REC *mainwindow_create(int);
 void mainwindow_destroy(MAIN_WINDOW_REC *window);
 
 void mainwindows_redraw(void);
@@ -45,6 +57,7 @@ void mainwindows_recreate(void);
    to be resized instead of upper window. */
 void mainwindow_set_size(MAIN_WINDOW_REC *window, int height,
 			 int resize_lower);
+void mainwindow_set_rsize(MAIN_WINDOW_REC *window, int width);
 void mainwindows_resize(int width, int height);
 
 void mainwindow_change_active(MAIN_WINDOW_REC *mainwin,
@@ -56,5 +69,6 @@ int mainwindow_set_statusbar_lines(MAIN_WINDOW_REC *window,
 void mainwindows_redraw_dirty(void);
 
 GSList *mainwindows_get_sorted(int reverse);
+GSList *mainwindows_get_line(MAIN_WINDOW_REC *rec);
 
 #endif
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index c4606197..c37d5c62 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -41,8 +41,8 @@ FORMAT_REC gui_text_formats[] =
 	{ "refnum_not_found", "Window number $0 not found", 1, { 0 } },
 	{ "window_too_small", "Not enough room to resize this window", 0 },
 	{ "cant_hide_last", "You can't hide the last window", 0 },
-	{ "cant_hide_sticky_windows", "You can't hide sticky windows (use /WINDOW STICK OFF)", 0 },
-	{ "cant_show_sticky_windows", "You can't show sticky windows (use /WINDOW STICK OFF)", 0 },
+	{ "cant_hide_sticky_windows", "You can't hide sticky windows (use /SET autounstick_windows ON)", 0 },
+	{ "cant_show_sticky_windows", "You can't show sticky windows (use /SET autounstick_windows ON)", 0 },
 	{ "window_not_sticky", "Window is not sticky", 0 },
 	{ "window_set_sticky", "Window set sticky", 0 },
 	{ "window_unset_sticky", "Window is not sticky anymore", 0 },
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index c7d6bcfb..5740a40b 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -418,7 +418,7 @@ static void item_input(SBAR_ITEM_REC *item, int get_size_only)
 
 	rec = g_hash_table_lookup(input_entries, item->bar->config->name);
 	if (rec == NULL) {
-		rec = gui_entry_create(item->xpos, item->bar->real_ypos,
+		rec = gui_entry_create(ITEM_WINDOW_REAL_XPOS(item), item->bar->real_ypos,
 				       item->size, term_type == TERM_TYPE_UTF8);
 		gui_entry_set_active(rec);
 		g_hash_table_insert(input_entries,
@@ -426,12 +426,21 @@ static void item_input(SBAR_ITEM_REC *item, int get_size_only)
 	}
 
 	if (get_size_only) {
-		item->min_size = 2+term_width/10;
-                item->max_size = term_width;
-                return;
+		int max_width;
+		WINDOW_REC *window;
+
+		window = item->bar->parent_window != NULL
+			? item->bar->parent_window->active
+			: NULL;
+
+		max_width = window != NULL ? window->width : term_width;
+
+		item->min_size = 2+max_width/10;
+		item->max_size = max_width;
+		return;
 	}
 
-	gui_entry_move(rec, item->xpos, item->bar->real_ypos,
+	gui_entry_move(rec, ITEM_WINDOW_REAL_XPOS(item), item->bar->real_ypos,
 		       item->size);
 	gui_entry_redraw(rec); /* FIXME: this is only necessary with ^L.. */
 }
diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c
index f0dff828..40837eea 100644
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@@ -242,17 +242,24 @@ static void statusbar_resize_items(STATUSBAR_REC *bar, int max_width)
 
 static void statusbar_calc_item_positions(STATUSBAR_REC *bar)
 {
-        WINDOW_REC *old_active_win;
+	WINDOW_REC *window;
+	WINDOW_REC *old_active_win;
 	GSList *tmp, *right_items;
 	int xpos, rxpos;
+	int max_width;
 
 	old_active_win = active_win;
-        if (bar->parent_window != NULL)
+	if (bar->parent_window != NULL)
 		active_win = bar->parent_window->active;
 
-	statusbar_resize_items(bar, term_width);
+	window = bar->parent_window != NULL
+		? bar->parent_window->active
+		: NULL;
 
-        /* left-aligned items */
+	max_width = window != NULL ? window->width : term_width;
+	statusbar_resize_items(bar, max_width);
+
+	/* left-aligned items */
 	xpos = 0;
 	for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
 		SBAR_ITEM_REC *rec = tmp->data;
@@ -260,11 +267,11 @@ static void statusbar_calc_item_positions(STATUSBAR_REC *bar)
 		if (!rec->config->right_alignment &&
 		    (rec->size > 0 || rec->current_size > 0)) {
 			if (SBAR_ITEM_REDRAW_NEEDED(bar, rec, xpos)) {
-                                /* redraw the item */
+				/* redraw the item */
 				rec->dirty = TRUE;
 				if (bar->dirty_xpos == -1 ||
 				    xpos < bar->dirty_xpos) {
-                                        irssi_set_dirty();
+					irssi_set_dirty();
 					bar->dirty = TRUE;
 					bar->dirty_xpos = xpos;
 				}
@@ -277,12 +284,12 @@ static void statusbar_calc_item_positions(STATUSBAR_REC *bar)
 
 	/* right-aligned items - first copy them to a new list backwards,
 	   easier to draw them in right order */
-        right_items = NULL;
+	right_items = NULL;
 	for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
 		SBAR_ITEM_REC *rec = tmp->data;
 
 		if (rec->config->right_alignment) {
-                        if (rec->size > 0)
+			if (rec->size > 0)
 				right_items = g_slist_prepend(right_items, rec);
 			else if (rec->current_size > 0 &&
 				 (bar->dirty_xpos == -1 ||
@@ -291,12 +298,12 @@ static void statusbar_calc_item_positions(STATUSBAR_REC *bar)
 				   to begin from the item's old xpos */
 				irssi_set_dirty();
 				bar->dirty = TRUE;
-                                bar->dirty_xpos = rec->xpos;
+				bar->dirty_xpos = rec->xpos;
 			}
 		}
 	}
 
-	rxpos = term_width;
+	rxpos = max_width;
 	for (tmp = right_items; tmp != NULL; tmp = tmp->next) {
 		SBAR_ITEM_REC *rec = tmp->data;
 
@@ -312,7 +319,7 @@ static void statusbar_calc_item_positions(STATUSBAR_REC *bar)
 			rec->xpos = rxpos;
 		}
 	}
-        g_slist_free(right_items);
+	g_slist_free(right_items);
 
 	active_win = old_active_win;
 }
@@ -451,8 +458,13 @@ static void mainwindow_recalc_ypos(MAIN_WINDOW_REC *window, int placement)
 
 static void sig_mainwindow_resized(MAIN_WINDOW_REC *window)
 {
-        mainwindow_recalc_ypos(window, STATUSBAR_TOP);
-        mainwindow_recalc_ypos(window, STATUSBAR_BOTTOM);
+	GSList *tmp;
+	mainwindow_recalc_ypos(window, STATUSBAR_TOP);
+	mainwindow_recalc_ypos(window, STATUSBAR_BOTTOM);
+	for (tmp = window->statusbars; tmp != NULL; tmp = tmp->next) {
+		STATUSBAR_REC *bar = tmp->data;
+		statusbar_redraw(bar, TRUE);
+	}
 }
 
 STATUSBAR_REC *statusbar_create(STATUSBAR_GROUP_REC *group,
@@ -728,7 +740,7 @@ void statusbar_item_default_handler(SBAR_ITEM_REC *item, int get_size_only,
 				g_string_append_c(out, ' ');
 		}
 
-		gui_printtext(item->xpos, item->bar->real_ypos, out->str);
+		gui_printtext(ITEM_WINDOW_REAL_XPOS(item), item->bar->real_ypos, out->str);
 		g_string_free(out, TRUE);
 	}
 	g_free(tmpstr);
@@ -960,20 +972,42 @@ void statusbar_item_destroy(SBAR_ITEM_REC *item)
 	g_free(item);
 }
 
+static MAIN_WINDOW_BORDER_REC *set_border_info(STATUSBAR_REC *bar)
+{
+	MAIN_WINDOW_BORDER_REC *orig_border, *new_border;
+	orig_border = clrtoeol_info;
+	new_border = g_new0(MAIN_WINDOW_BORDER_REC, 1);
+	new_border->window = bar->parent_window != NULL ? bar->parent_window->screen_win : NULL;
+	new_border->color = bar->color;
+	clrtoeol_info = new_border;
+	return orig_border;
+}
+
+static void restore_border_info(MAIN_WINDOW_BORDER_REC *border_info)
+{
+	MAIN_WINDOW_BORDER_REC *old_border;
+	old_border = clrtoeol_info;
+	clrtoeol_info = border_info;
+	g_free(old_border);
+}
+
 static void statusbar_redraw_needed_items(STATUSBAR_REC *bar)
 {
-        WINDOW_REC *old_active_win;
+	WINDOW_REC *old_active_win;
 	GSList *tmp;
 	char *str;
 
 	old_active_win = active_win;
-        if (bar->parent_window != NULL)
+	if (bar->parent_window != NULL)
 		active_win = bar->parent_window->active;
 
 	if (bar->dirty_xpos >= 0) {
+		MAIN_WINDOW_BORDER_REC *orig_border;
+		orig_border = set_border_info(bar);
 		str = g_strconcat(bar->color, "%>", NULL);
-		gui_printtext(bar->dirty_xpos, bar->real_ypos, str);
+		gui_printtext(BAR_WINDOW_REAL_DIRTY_XPOS(bar), bar->real_ypos, str);
 		g_free(str);
+		restore_border_info(orig_border);
 	}
 
 	for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
@@ -982,13 +1016,13 @@ static void statusbar_redraw_needed_items(STATUSBAR_REC *bar)
 		if (rec->dirty ||
 		    (bar->dirty_xpos != -1 &&
 		     rec->xpos >= bar->dirty_xpos)) {
-                        rec->current_size = rec->size;
+			rec->current_size = rec->size;
 			rec->func(rec, FALSE);
 			rec->dirty = FALSE;
 		}
 	}
 
-        active_win = old_active_win;
+	active_win = old_active_win;
 }
 
 void statusbar_redraw_dirty(void)
diff --git a/src/fe-text/statusbar.h b/src/fe-text/statusbar.h
index 309294b0..b0048cc4 100644
--- a/src/fe-text/statusbar.h
+++ b/src/fe-text/statusbar.h
@@ -23,6 +23,12 @@ typedef struct SBAR_ITEM_REC SBAR_ITEM_REC;
 #define STATUSBAR_VISIBLE_ACTIVE        2
 #define STATUSBAR_VISIBLE_INACTIVE      3
 
+#define ITEM_WINDOW_REAL_XPOS(item) ( ( (item)->bar->parent_window != NULL ? \
+					(item)->bar->parent_window->first_column + (item)->bar->parent_window->statusbar_columns_left : 0 ) + (item)->xpos )
+
+#define BAR_WINDOW_REAL_DIRTY_XPOS(bar) ( ( (bar)->parent_window != NULL ? \
+					    (bar)->parent_window->first_column + (bar)->parent_window->statusbar_columns_left : 0 ) + (bar)->dirty_xpos )
+
 typedef struct {
 	char *name;
         GSList *config_bars;
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 6645cfb0..0b2c7cb0 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -23,6 +23,7 @@
 #include "term.h"
 #include "terminfo-core.h"
 #include "fe-windows.h"
+#include "gui-printtext.h"
 #include "utf8.h"
 
 #include <signal.h>
@@ -284,10 +285,10 @@ void term_window_clear(TERM_WINDOW *window)
 {
 	int y;
 
-        terminfo_set_normal();
-        if (window->y == 0 && window->height == term_height) {
-        	term_clear();
-        } else {
+	terminfo_set_normal();
+	if (window->y == 0 && window->height == term_height && window->width == term_width) {
+		term_clear();
+	} else {
 		for (y = 0; y < window->height; y++) {
 			term_move(window, 0, y);
 			term_clrtoeol(window);
@@ -452,14 +453,14 @@ void term_set_color(TERM_WINDOW *window, int col)
 void term_move(TERM_WINDOW *window, int x, int y)
 {
 	if (x >= 0 && y >= 0) {
-	vcmove = TRUE;
-	vcx = x+window->x;
-        vcy = y+window->y;
+		vcmove = TRUE;
+		vcx = x+window->x;
+		vcy = y+window->y;
 
-	if (vcx >= term_width)
-		vcx = term_width-1;
-	if (vcy >= term_height)
-                vcy = term_height-1;
+		if (vcx >= term_width)
+			vcx = term_width-1;
+		if (vcy >= term_height)
+			vcy = term_height-1;
 	}
 }
 
@@ -552,7 +553,7 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 		while (*ptr != '\0') {
 			tmp = g_utf8_get_char_validated(ptr, -1);
 			/* On utf8 error, treat as single byte and try to
-			   continue interpretting rest of string as utf8 */
+			   continue interpreting rest of string as utf8 */
 			if (tmp == (gunichar)-1 || tmp == (gunichar)-2) {
 				len++;
 				ptr++;
@@ -574,21 +575,47 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 
 void term_clrtoeol(TERM_WINDOW *window)
 {
-	/* clrtoeol() doesn't necessarily understand colors */
-	if (last_fg == -1 && last_bg == -1 &&
-	    (last_attrs & (ATTR_UNDERLINE|ATTR_REVERSE|ATTR_ITALIC)) == 0) {
-		if (!term_lines_empty[vcy]) {
-			if (vcmove) term_move_real();
-			terminfo_clrtoeol();
-			if (vcx == 0) term_lines_empty[vcy] = TRUE;
-		}
-	} else if (vcx < term_width) {
-		/* we'll need to fill the line ourself. */
-		if (vcmove) term_move_real();
-		terminfo_repeat(' ', term_width-vcx);
-		terminfo_move(vcx, vcy);
-                term_lines_empty[vcy] = FALSE;
+	if (vcx < window->x) {
+		/* we just wrapped outside of the split, put the cursor back into the window */
+		vcx += window->x;
 	}
+	if (window->x + window->width < term_width) {
+		/* we need to fill a vertical split */
+		if (vcmove) term_move_real();
+		terminfo_repeat(' ', window->x + window->width - vcx + 1);
+		terminfo_move(vcx, vcy);
+		term_lines_empty[vcy] = FALSE;
+	} else {
+		/* clrtoeol() doesn't necessarily understand colors */
+		if (last_fg == -1 && last_bg == -1 &&
+		    (last_attrs & (ATTR_UNDERLINE|ATTR_REVERSE|ATTR_ITALIC)) == 0) {
+			if (!term_lines_empty[vcy]) {
+				if (vcmove) term_move_real();
+				terminfo_clrtoeol();
+				if (vcx == 0) term_lines_empty[vcy] = TRUE;
+			}
+		} else if (vcx < term_width) {
+			/* we'll need to fill the line ourself. */
+			if (vcmove) term_move_real();
+			terminfo_repeat(' ', term_width-vcx);
+			terminfo_move(vcx, vcy);
+			term_lines_empty[vcy] = FALSE;
+		}
+	}
+}
+
+void term_window_clrtoeol(TERM_WINDOW* window, int ypos)
+{
+	term_clrtoeol(window);
+	if (window->x + window->width < term_width) {
+		gui_printtext_window_border(window->x + window->width, window->y + ypos);
+		term_set_color(window, ATTR_RESET);
+	}
+}
+
+void term_window_clrtoeol_abs(TERM_WINDOW* window, int ypos)
+{
+	term_window_clrtoeol(window, ypos - window->y);
 }
 
 void term_move_cursor(int x, int y)
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index 0c7847f6..70012bea 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -85,6 +85,8 @@ void term_addch(TERM_WINDOW *window, char chr);
 void term_add_unichar(TERM_WINDOW *window, unichar chr);
 int  term_addstr(TERM_WINDOW *window, const char *str);
 void term_clrtoeol(TERM_WINDOW *window);
+void term_window_clrtoeol(TERM_WINDOW* window, int ypos);
+void term_window_clrtoeol_abs(TERM_WINDOW* window, int ypos_abs);
 
 void term_move_cursor(int x, int y);
 
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index cb066f5e..b503ec73 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -388,9 +388,9 @@ static void view_reset_cache(TEXT_BUFFER_VIEW_REC *view)
 static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 			  int subline, int ypos, int max)
 {
-        INDENT_FUNC indent_func;
+	INDENT_FUNC indent_func;
 	LINE_CACHE_REC *cache;
-        const unsigned char *text, *end, *text_newline;
+	const unsigned char *text, *end, *text_newline;
 	unsigned char *tmp;
 	unichar chr;
 	int xpos, color, drawcount, first, need_move, need_clrtoeol, char_width;
@@ -399,54 +399,54 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 #endif
 
 	if (view->dirty) /* don't bother drawing anything - redraw is coming */
-                return 0;
+		return 0;
 
 	cache = textbuffer_view_get_line_cache(view, line);
 	if (subline >= cache->count)
-                return 0;
+		return 0;
 
-        color = ATTR_RESET;
-        need_move = TRUE; need_clrtoeol = FALSE;
+	color = ATTR_RESET;
+	need_move = TRUE; need_clrtoeol = FALSE;
 	xpos = drawcount = 0; first = TRUE;
 	text_newline = text =
 		subline == 0 ? line->text : cache->lines[subline-1].start;
 	for (;;) {
 		if (text == text_newline) {
-			if (need_clrtoeol && xpos < term_width) {
+			if (need_clrtoeol && xpos < view->width + (view->width == term_width ? 0 : 1)) {
 				term_set_color(view->window, ATTR_RESET);
-				term_clrtoeol(view->window);
+				term_window_clrtoeol(view->window, ypos);
 			}
 
 			if (first)
 				first = FALSE;
 			else {
 				ypos++;
-                                if (--max == 0)
+				if (--max == 0)
 					break;
 			}
 
 			if (subline > 0) {
-                                /* continuing previous line - indent it */
+				/* continuing previous line - indent it */
 				indent_func = cache->lines[subline-1].indent_func;
 				if (indent_func == NULL)
 					xpos = cache->lines[subline-1].indent;
-                                color = cache->lines[subline-1].color;
+				color = cache->lines[subline-1].color;
 #ifdef TERM_TRUECOLOR
-                                fg24 = cache->lines[subline-1].fg24;
-                                bg24 = cache->lines[subline-1].bg24;
+				fg24 = cache->lines[subline-1].fg24;
+				bg24 = cache->lines[subline-1].bg24;
 #endif
 			} else {
 				indent_func = NULL;
 			}
 
 			if (xpos == 0 && indent_func == NULL)
-                                need_clrtoeol = TRUE;
+				need_clrtoeol = TRUE;
 			else {
 				/* line was indented - need to clear the
-                                   indented area first */
+				   indented area first */
 				term_set_color(view->window, ATTR_RESET);
 				term_move(view->window, 0, ypos);
-				term_clrtoeol(view->window);
+				term_window_clrtoeol(view->window, ypos);
 
 				if (indent_func != NULL)
 					xpos = indent_func(view, line, ypos);
@@ -463,9 +463,17 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 			} else {
 				/* get the beginning of the next subline */
 				text_newline = cache->lines[subline].start;
-				need_move = !cache->lines[subline].continues;
+				if (view->width == term_width) {
+					/* ensure that links / long words are not broken */
+					need_move = !cache->lines[subline].continues;
+				} else {
+					/* we cannot use the need_move
+					   optimisation unless the split spans
+					   the whole width */
+					need_move = TRUE;
+				}
 			}
-                        drawcount++;
+			drawcount++;
 			subline++;
 		}
 
@@ -473,10 +481,10 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 			/* command */
 			text++;
 			if (*text == LINE_CMD_EOL)
-                                break;
+				break;
 
 			if (*text == LINE_CMD_CONTINUE) {
-                                /* jump to next block */
+				/* jump to next block */
 				memcpy(&tmp, text+1, sizeof(unsigned char *));
 				text = tmp;
 				continue;
@@ -511,13 +519,13 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 		}
 
 		xpos += char_width;
-		if (xpos <= term_width) {
+		if (xpos <= view->width) {
 			if (unichar_isprint(chr)) {
 				if (view->utf8)
-				term_add_unichar(view->window, chr);
+					term_add_unichar(view->window, chr);
 				else
-				for (; text < end; text++)
-					term_addch(view->window, *text);
+					for (; text < end; text++)
+						term_addch(view->window, *text);
 			} else {
 				/* low-ascii */
 				term_set_color(view->window, ATTR_RESET|ATTR_REVERSE);
@@ -528,12 +536,12 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 		text = end;
 	}
 
-	if (need_clrtoeol && xpos < term_width) {
+	if (need_clrtoeol && xpos < view->width + (view->width == term_width ? 0 : 1)) {
 		term_set_color(view->window, ATTR_RESET);
-		term_clrtoeol(view->window);
+		term_window_clrtoeol(view->window, ypos);
 	}
 
-        return drawcount;
+	return drawcount;
 }
 
 /* Recalculate view's bottom line information - try to keep the
@@ -738,7 +746,7 @@ static void view_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 		term_set_color(view->window, ATTR_RESET);
 		while (lines > 0) {
 			term_move(view->window, 0, ypos);
-			term_clrtoeol(view->window);
+			term_window_clrtoeol(view->window, ypos);
 			ypos++; lines--;
 		}
 	}
@@ -775,51 +783,51 @@ static int view_scroll(TEXT_BUFFER_VIEW_REC *view, LINE_REC **lines,
 	int linecount, realcount, scroll_visible;
 
 	if (*lines == NULL)
-                return 0;
+		return 0;
 
 	/* scroll down */
 	scroll_visible = lines == &view->startline;
 
 	realcount = -*subline;
 	scrollcount += *subline;
-        *subline = 0;
+	*subline = 0;
 	while (scrollcount > 0) {
 		linecount = view_get_linecount(view, *lines);
 
 		if ((scroll_visible && *lines == view->bottom_startline) &&
 		    (scrollcount >= view->bottom_subline)) {
 			*subline = view->bottom_subline;
-                        realcount += view->bottom_subline;
-                        scrollcount = 0;
-                        break;
+			realcount += view->bottom_subline;
+			scrollcount = 0;
+			break;
 		}
 
-                realcount += linecount;
+		realcount += linecount;
 		scrollcount -= linecount;
 		if (scrollcount < 0) {
-                        realcount += scrollcount;
+			realcount += scrollcount;
 			*subline = linecount+scrollcount;
-                        scrollcount = 0;
-                        break;
+			scrollcount = 0;
+			break;
 		}
 
 		if ((*lines)->next == NULL)
 			break;
 
-                *lines = (*lines)->next;
+		*lines = (*lines)->next;
 	}
 
-        /* scroll up */
+	/* scroll up */
 	while (scrollcount < 0 && (*lines)->prev != NULL) {
 		*lines = (*lines)->prev;
 		linecount = view_get_linecount(view, *lines);
 
-                realcount -= linecount;
+		realcount -= linecount;
 		scrollcount += linecount;
 		if (scrollcount > 0) {
-                        realcount += scrollcount;
+			realcount += scrollcount;
 			*subline = scrollcount;
-                        break;
+			break;
 		}
 	}
 
@@ -827,19 +835,27 @@ static int view_scroll(TEXT_BUFFER_VIEW_REC *view, LINE_REC **lines,
 		if (realcount <= -view->height || realcount >= view->height) {
 			/* scrolled more than screenful, redraw the
 			   whole view */
-                        textbuffer_view_redraw(view);
+			textbuffer_view_redraw(view);
 		} else {
-			term_set_color(view->window, ATTR_RESET);
-			term_window_scroll(view->window, realcount);
+			if (view->width == term_width) {
+				/* we can try to use vt100 scroll regions */
+				term_set_color(view->window, ATTR_RESET);
+				term_window_scroll(view->window, realcount);
 
-			if (draw_nonclean) {
-				if (realcount < 0)
-                                        view_draw_top(view, -realcount, TRUE);
-				else
-					view_draw_bottom(view, realcount);
+				if (draw_nonclean) {
+					if (realcount < 0)
+						view_draw_top(view, -realcount, TRUE);
+					else
+						view_draw_bottom(view, realcount);
+				}
+
+				term_refresh(view->window);
+			} else {
+				/* do not bother with vt400 scroll
+				   rectangles for now, redraw the
+				   whole view */
+				textbuffer_view_redraw(view);
 			}
-
-			term_refresh(view->window);
 		}
 	}
 
diff --git a/themes/default.theme b/themes/default.theme
index 956d7c4f..79b1af55 100644
--- a/themes/default.theme
+++ b/themes/default.theme
@@ -251,6 +251,7 @@ abstracts = {
   # default background for all statusbars. You can also give
   # the default foreground color for statusbar items.
   sb_background = "%4%w";
+  window_border = "%4%w";
 
   # default backround for "default" statusbar group
   #sb_default_bg = "%4";

From 63d8e884ddb970d6a8b5c6a7a546f0283d38a055 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 9 May 2017 15:05:03 +0200
Subject: [PATCH 0719/1650] fix some more

---
 src/fe-text/term-terminfo.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 0b2c7cb0..4d5ca65b 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -576,8 +576,9 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 void term_clrtoeol(TERM_WINDOW *window)
 {
 	if (vcx < window->x) {
-		/* we just wrapped outside of the split, put the cursor back into the window */
+		/* we just wrapped outside of the split, warp the cursor back into the window */
 		vcx += window->x;
+		vcmove = TRUE;
 	}
 	if (window->x + window->width < term_width) {
 		/* we need to fill a vertical split */
@@ -606,6 +607,10 @@ void term_clrtoeol(TERM_WINDOW *window)
 
 void term_window_clrtoeol(TERM_WINDOW* window, int ypos)
 {
+	if (ypos >= 0 && window->y + ypos != vcy) {
+		/* the line is already full */
+		return;
+	}
 	term_clrtoeol(window);
 	if (window->x + window->width < term_width) {
 		gui_printtext_window_border(window->x + window->width, window->y + ypos);

From ded4e4d98df3c8df20119574c145fe1a736ee994 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 6 Jan 2018 01:05:35 +0100
Subject: [PATCH 0720/1650] fix redraw

---
 src/fe-text/mainwindows.c     | 2 ++
 src/fe-text/textbuffer-view.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index deab8de8..5f24674f 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1214,6 +1214,8 @@ void mainwindows_redraw_dirty(void)
 		if (rec->dirty) {
                         rec->dirty = FALSE;
 			gui_window_redraw(rec->active);
+		} else if (WINDOW_GUI(rec->active)->view->dirty) {
+			gui_window_redraw(rec->active);
 		}
 	}
 }
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index b503ec73..b7fdcb7d 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -854,7 +854,8 @@ static int view_scroll(TEXT_BUFFER_VIEW_REC *view, LINE_REC **lines,
 				/* do not bother with vt400 scroll
 				   rectangles for now, redraw the
 				   whole view */
-				textbuffer_view_redraw(view);
+				view->dirty = TRUE;
+				irssi_set_dirty();
 			}
 		}
 	}

From 4d5982f07d7f32585c00f1d6cca3fb425183140f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 6 Jan 2018 20:02:31 +0100
Subject: [PATCH 0721/1650] Update fe-common-core.c

---
 src/fe-common/core/fe-common-core.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index bce9ab4e..4f2d210a 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -475,26 +475,29 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 		return FALSE;
 	}
 
-	int server_tag_len = dest->server_tag ? strlen(dest->server_tag) : 0;
+	int server_tag_len = dest->server_tag != NULL ? strlen(dest->server_tag) : 0;
 	for (tmp = array; *tmp != NULL; tmp++) {
 		char *str = *tmp;
 		if (*str == '\0') {
 			continue;
 		}
 
-		if (server_tag_len && !g_ascii_strncasecmp(str, dest->server_tag, server_tag_len) && str[server_tag_len] == '/') {
+		if (server_tag_len &&
+		    g_ascii_strncasecmp(str, dest->server_tag, server_tag_len) == 0 &&
+		    str[server_tag_len] == '/') {
 			str += server_tag_len + 1;
 		}
 
-		if (!g_strcmp0(str, "") || !g_strcmp0(str, "::all")) {
+		if (g_strcmp0(str, "") == 0 || g_strcmp0(str, "::all") == 0) {
 			return TRUE;
-		} else if (!g_ascii_strcasecmp(str, dest->target)) {
+		} else if (g_ascii_strcasecmp(str, dest->target) == 0) {
 			return TRUE;
 		} else if (item->type == query_type &&
-			!g_strcmp0(str, (dest->target[0] == '=') ? "::dccqueries" : "::queries")) {
+		           g_strcmp0(str, dest->target[0] == '=' ? "::dccqueries" :
+			             "::queries") == 0) {
 			return TRUE;
 		} else if (item->type == channel_type &&
-			!g_strcmp0(str, "::channels")) {
+			   g_strcmp0(str, "::channels") == 0) {
 			return TRUE;
 		}
 	}

From 121a4971e61176e326ee3d2f71867e87732f4519 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 6 Jan 2018 20:17:51 +0100
Subject: [PATCH 0722/1650] Update fe-common-core.c

fix mixed decls
---
 src/fe-common/core/fe-common-core.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 4f2d210a..a8726314 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -461,16 +461,19 @@ void fe_common_core_finish_init(void)
 
 gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 {
-	int channel_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "CHANNEL");
-	int query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY");
+	WI_ITEM_REC *item;
+	int server_tag_len, channel_type, query_type;
 	char **tmp;
 
+	channel_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "CHANNEL");
+	query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY");
+
 	g_return_val_if_fail(array != NULL, FALSE);
 	g_return_val_if_fail(dest != NULL, FALSE);
 	g_return_val_if_fail(dest->window != NULL, FALSE);
 	g_return_val_if_fail(dest->target != NULL, FALSE);
 
-	WI_ITEM_REC *item = window_item_find_window(dest->window, dest->server, dest->target);
+	item = window_item_find_window(dest->window, dest->server, dest->target);
 	if (item == NULL) {
 		return FALSE;
 	}

From 0aafd011c0adc58ddf43783764b96fdd74578243 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 23 Jun 2017 21:53:16 -0300
Subject: [PATCH 0723/1650] Add a startup warning if the TERM var is wrong
 inside tmux/screen

One of the most common and confusing issues we get in #irssi,
this should help identifying and mitigating it.
---
 src/fe-text/irssi.c         |  2 ++
 src/fe-text/term-terminfo.c | 28 ++++++++++++++++++++++++++++
 src/fe-text/term.h          |  2 ++
 3 files changed, 32 insertions(+)

diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index ef443670..0288e4f1 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -207,6 +207,8 @@ static void textui_finish_init(void)
 		fe_settings_set_print("nick");
 	if (user_settings_changed & USER_SETTINGS_HOSTNAME)
 		fe_settings_set_print("hostname");
+
+	term_environment_check();
 }
 
 static void textui_deinit(void)
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 6645cfb0..d96e235d 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -733,3 +733,31 @@ void term_gets(GArray *buffer, int *line_count)
 		}
 	}
 }
+
+static const char* term_env_warning =
+	"The TERM environment variable is set to '%s' which can cause display "
+	"glitches when running under %s.\n"
+	"Consider changing TERM to 'screen' or 'screen-256color' instead.";
+
+void term_environment_check(void)
+{
+	const char *term, *sty, *tmux, *multiplexer;
+
+	term = g_getenv("TERM");
+	sty = g_getenv("STY");
+	tmux = g_getenv("TMUX");
+
+	multiplexer = (sty && *sty) ? "screen" :
+	              (tmux && *tmux) ? "tmux" : NULL;
+
+	if (!multiplexer) {
+		return;
+	}
+
+	if (term && (g_str_has_prefix(term, "screen") ||
+	             g_str_has_prefix(term, "tmux"))) {
+		return;
+	}
+
+	g_warning(term_env_warning, term, multiplexer);
+}
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index 0c7847f6..4b1e2874 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -105,4 +105,6 @@ void term_gets(GArray *buffer, int *line_count);
 void term_common_init(void);
 void term_common_deinit(void);
 
+void term_environment_check(void);
+
 #endif

From f9c8365999c5319be6970dcf27f21190b0481314 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 7 Jan 2018 01:44:48 -0300
Subject: [PATCH 0724/1650] fe-common-core: fix redeclaration of server_tag_len

---
 src/fe-common/core/fe-common-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index a8726314..791f56d4 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -478,7 +478,7 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 		return FALSE;
 	}
 
-	int server_tag_len = dest->server_tag != NULL ? strlen(dest->server_tag) : 0;
+	server_tag_len = dest->server_tag != NULL ? strlen(dest->server_tag) : 0;
 	for (tmp = array; *tmp != NULL; tmp++) {
 		char *str = *tmp;
 		if (*str == '\0') {

From 0d5e353ef1be253106ed66417b270d03b2b91ed3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 7 Jan 2018 11:43:13 +0100
Subject: [PATCH 0725/1650] Reword warning message

Include multiplexer name in TERM recommendation
---
 src/fe-text/term-terminfo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index d96e235d..f4c4d17c 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -735,9 +735,9 @@ void term_gets(GArray *buffer, int *line_count)
 }
 
 static const char* term_env_warning =
-	"The TERM environment variable is set to '%s' which can cause display "
-	"glitches when running under %s.\n"
-	"Consider changing TERM to 'screen' or 'screen-256color' instead.";
+	"You seem to be running Irssi inside %2$s, but the TERM environment variable"
+	"is set to '%1$s', which can cause display glitches.\n"
+	"Consider changing TERM to '%2$s' or '%2$s-256color' instead.";
 
 void term_environment_check(void)
 {

From 98836f8b7ee058c32d54562903676c4d16f83aa4 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 21 Oct 2017 10:21:03 +0200
Subject: [PATCH 0726/1650] Parse the K/V form in CAP LS

This is a prerequisite for the IRC v3.2 compliance.
---
 src/irc/core/irc-cap.c     | 43 ++++++++++++++++++++++++++++++++++----
 src/irc/core/irc-servers.c |  2 +-
 src/irc/core/irc-servers.h |  2 +-
 src/perl/irc/Irc.xs        | 15 +++++++++----
 4 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 5464e493..eac6f239 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -45,7 +45,7 @@ int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 
 	if (enable && !gslist_find_string(server->cap_active, cap)) {
 		/* Make sure the required cap is supported by the server */
-		if (!gslist_find_string(server->cap_supported, cap))
+		if (!g_hash_table_lookup_extended(server->cap_supported, cap, NULL, NULL))
 			return FALSE;
 
 		irc_send_cmdv(server, "CAP REQ %s", cap);
@@ -96,9 +96,44 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 	caps_length = g_strv_length(caps);
 
 	if (!g_strcmp0(evt, "LS")) {
+		if (server->cap_supported) {
+			g_hash_table_destroy(server->cap_supported);
+		}
+		/* Start with a fresh table */
+		server->cap_supported = g_hash_table_new_full(g_str_hash,
+							      g_str_equal,
+							      g_free, g_free);
+
 		/* Create a list of the supported caps */
-		for (i = 0; i < caps_length; i++)
-			server->cap_supported = g_slist_prepend(server->cap_supported, g_strdup(caps[i]));
+		for (i = 0; i < caps_length; i++) {
+			const char *name = caps[i];
+			const char *eq = strchr(name, '=');
+			int fresh = TRUE;
+
+			if (!eq) {
+				fresh = g_hash_table_insert(server->cap_supported,
+							    g_strdup(name),
+							    NULL);
+			}
+			/* Some values are in a KEY=VALUE form, parse them */
+			else if (eq[1] != '\0') {
+				char *key = g_strndup(name, (int)(eq - name));
+				char *val = g_strdup(eq + 1);
+				fresh = g_hash_table_insert(server->cap_supported,
+							    key, val);
+			}
+			/* If the string ends after the '=' consider the value
+			 * as invalid */
+			else {
+				g_warning("Invalid CAP key/value pair");
+			}
+
+			/* The specification doesn't say anything about
+			 * duplicated values, let's just warn the user */
+			if (fresh == FALSE) {
+				g_warning("Duplicate value");
+			}
+		}
 
 		/* Request the required caps, if any */
 		if (server->cap_queue == NULL) {
@@ -111,7 +146,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 
 			/* Check whether the cap is supported by the server */
 			for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
-				if (gslist_find_string(server->cap_supported, tmp->data)) {
+				if (g_hash_table_lookup_extended(server->cap_supported, tmp->data, NULL, NULL)) {
 					if (avail_caps > 0)
 						g_string_append_c(cmd, ' ');
 					g_string_append(cmd, tmp->data);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 4eaab712..7fd83045 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -443,7 +443,7 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	gslist_free_full(server->cap_active, (GDestroyNotify) g_free);
 	server->cap_active = NULL;
 
-	gslist_free_full(server->cap_supported, (GDestroyNotify) g_free);
+	g_hash_table_destroy(server->cap_supported);
 	server->cap_supported = NULL;
 
 	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 09f3f81d..6c6002c8 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -75,7 +75,7 @@ struct _IRC_SERVER_REC {
 	int max_whois_in_cmd; /* max. number of nicks in one /WHOIS command */
 	int max_msgs_in_cmd; /* max. number of targets in one /MSG */
 
-	GSList *cap_supported; /* A list of caps supported by the server */
+	GHashTable *cap_supported; /* A list of caps supported by the server */
 	GSList *cap_active;    /* A list of caps active for this session */
 	GSList *cap_queue;     /* A list of caps to request on connection */ 
 
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 41690010..bb2d27bb 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -12,7 +12,10 @@ static void perl_irc_connect_fill_hash(HV *hv, IRC_SERVER_CONNECT_REC *conn)
 static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 {
 	AV *av;
+	HV *hv_;
 	GSList *tmp;
+	GHashTableIter iter;
+	gpointer key_, val_;
 
 	perl_irc_connect_fill_hash(hv, server->connrec);
 	perl_server_fill_hash(hv, (SERVER_REC *) server);
@@ -34,10 +37,14 @@ static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 	(void) hv_store(hv, "cap_complete", 12, newSViv(server->cap_complete), 0);
 	(void) hv_store(hv, "sasl_success", 12, newSViv(server->sasl_success), 0);
 
-	av = newAV();
-	for (tmp = server->cap_supported; tmp != NULL; tmp = tmp->next)
-		av_push(av, new_pv(tmp->data));
-	(void) hv_store(hv, "cap_supported", 13, newRV_noinc((SV*)av), 0);
+	hv_ = newHV();
+	g_hash_table_iter_init(&iter, server->cap_supported);
+	while (g_hash_table_iter_next(&iter, &key_, &val_)) {
+		char *key = (char *)key_;
+		char *val = (char *)val_;
+		hv_store(hv_, key, strlen(key), new_pv(val), 0);
+	}
+	(void) hv_store(hv, "cap_supported", 13, newRV_noinc((SV*)hv_), 0);
 
 	av = newAV();
 	for (tmp = server->cap_active; tmp != NULL; tmp = tmp->next)

From d21706e1cc78284d5e7b2d69ebe4873e459d0e9b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 21 Oct 2017 10:35:49 +0200
Subject: [PATCH 0727/1650] Factor out the parsing function

This is also needed for CAP NEW and CAP DEL.
---
 src/irc/core/irc-cap.c | 56 ++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index eac6f239..9ac232b5 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -79,6 +79,33 @@ static void cap_emit_signal (IRC_SERVER_REC *server, char *cmd, char *args)
 	g_free(signal_name);
 }
 
+static gboolean parse_cap_name(char *name, char **key, char **val)
+{
+	g_return_val_if_fail(name != NULL, FALSE);
+	g_return_val_if_fail(name[0] != '\0', FALSE);
+
+	const char *eq = strchr(name, '=');
+	/* KEY only value */
+	if (!eq) {
+		*key = g_strdup(name);
+		*val = NULL;
+		return TRUE;
+	}
+	/* Some values are in a KEY=VALUE form, parse them */
+	else if (eq[1] != '\0') {
+		*key = g_strndup(name, (int)(eq - name));
+		*val = g_strdup(eq + 1);
+		return TRUE;
+	}
+	/* If the string ends after the '=' consider the value
+	 * as invalid */
+	else {
+		*key = NULL;
+		*val = NULL;
+		return FALSE;
+	}
+}
+
 static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *address)
 {
 	GSList *tmp;
@@ -106,33 +133,20 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 
 		/* Create a list of the supported caps */
 		for (i = 0; i < caps_length; i++) {
-			const char *name = caps[i];
-			const char *eq = strchr(name, '=');
-			int fresh = TRUE;
+			char *key, *val;
 
-			if (!eq) {
-				fresh = g_hash_table_insert(server->cap_supported,
-							    g_strdup(name),
-							    NULL);
+			if (parse_cap_name(caps[i], &key, &val)) {
+				if (!g_hash_table_insert(server->cap_supported,
+							 key, val)) {
+					/* The specification doesn't say anything about
+					 * duplicated values, let's just warn the user */
+					g_warning("Duplicate value");
+				}
 			}
-			/* Some values are in a KEY=VALUE form, parse them */
-			else if (eq[1] != '\0') {
-				char *key = g_strndup(name, (int)(eq - name));
-				char *val = g_strdup(eq + 1);
-				fresh = g_hash_table_insert(server->cap_supported,
-							    key, val);
-			}
-			/* If the string ends after the '=' consider the value
-			 * as invalid */
 			else {
 				g_warning("Invalid CAP key/value pair");
 			}
 
-			/* The specification doesn't say anything about
-			 * duplicated values, let's just warn the user */
-			if (fresh == FALSE) {
-				g_warning("Duplicate value");
-			}
 		}
 
 		/* Request the required caps, if any */

From 57827ca743e95a6b6ad830fab03f46efaf1d9069 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 21 Oct 2017 10:44:53 +0200
Subject: [PATCH 0728/1650] Don't free the hash table if there's none

Glib doesn't like that and shows a harmless warning.
---
 src/irc/core/irc-servers.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 7fd83045..3b4e1a52 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -443,8 +443,10 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	gslist_free_full(server->cap_active, (GDestroyNotify) g_free);
 	server->cap_active = NULL;
 
-	g_hash_table_destroy(server->cap_supported);
-	server->cap_supported = NULL;
+	if (server->cap_supported) {
+	    g_hash_table_destroy(server->cap_supported);
+	    server->cap_supported = NULL;
+	}
 
 	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
 	server->cap_queue = NULL;

From 8c87766132b7dbb75d8a49548ff7c97037ea983b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 21 Oct 2017 11:23:44 +0200
Subject: [PATCH 0729/1650] Parse multiline responses to CAP LS

The parsing logic isn't too elegant because of the optional parameter
used for signaling if a response has a continuation one.
---
 src/irc/core/irc-cap.c | 89 +++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 32 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 9ac232b5..602a7b06 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -110,13 +110,31 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 {
 	GSList *tmp;
 	GString *cmd;
-	char *params, *evt, *list, **caps;
-	int i, caps_length, disable, avail_caps;
+	char *params, *evt, *list, *star, **caps;
+	int i, caps_length, disable, avail_caps, multiline;
 
-	params = event_get_params(args, 3, NULL, &evt, &list);
+	params = event_get_params(args, 4, NULL, &evt, &star, &list);
 	if (params == NULL)
 		return;
 
+	/* Multiline responses have an additional parameter and we have to do
+	 * this stupid dance to parse them */
+	if (evt[0] == 'L' && !strcmp(star, "*")) {
+		multiline = TRUE;
+	}
+	/* This branch covers the '*' parameter isn't present, adjust the
+	 * parameter pointer to compensate for this */
+	else if (list[0] == '\0') {
+		multiline = FALSE;
+		list = star;
+	}
+	/* Malformed request, terminate the negotiation */
+	else {
+		cap_finish_negotiation(server);
+		g_warn_if_reached();
+		return;
+	}
+
 	/* Strip the trailing whitespaces before splitting the string, some servers send responses with
 	 * superfluous whitespaces that g_strsplit the interprets as tokens */
 	caps = g_strsplit(g_strchomp(list), " ", -1);
@@ -149,37 +167,41 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 
 		}
 
-		/* Request the required caps, if any */
-		if (server->cap_queue == NULL) {
-			cap_finish_negotiation(server);
-		}
-		else {
-			cmd = g_string_new("CAP REQ :");
-
-			avail_caps = 0;
-
-			/* Check whether the cap is supported by the server */
-			for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
-				if (g_hash_table_lookup_extended(server->cap_supported, tmp->data, NULL, NULL)) {
-					if (avail_caps > 0)
-						g_string_append_c(cmd, ' ');
-					g_string_append(cmd, tmp->data);
-
-					avail_caps++;
-				}
-			}
-
-			/* Clear the queue here */
-			gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
-			server->cap_queue = NULL;
-
-			/* If the server doesn't support any cap we requested close the negotiation here */
-			if (avail_caps > 0)
-				irc_send_cmd_now(server, cmd->str);
-			else
+		/* A multiline response is always terminated by a normal one,
+		 * wait until we receive that one to require any CAP */
+		if (multiline == FALSE) {
+			/* No CAP has been requested */
+			if (server->cap_queue == NULL) {
 				cap_finish_negotiation(server);
+			}
+			else {
+				cmd = g_string_new("CAP REQ :");
 
-			g_string_free(cmd, TRUE);
+				avail_caps = 0;
+
+				/* Check whether the cap is supported by the server */
+				for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
+					if (g_hash_table_lookup_extended(server->cap_supported, tmp->data, NULL, NULL)) {
+						if (avail_caps > 0)
+							g_string_append_c(cmd, ' ');
+						g_string_append(cmd, tmp->data);
+
+						avail_caps++;
+					}
+				}
+
+				/* Clear the queue here */
+				gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
+				server->cap_queue = NULL;
+
+				/* If the server doesn't support any cap we requested close the negotiation here */
+				if (avail_caps > 0)
+					irc_send_cmd_now(server, cmd->str);
+				else
+					cap_finish_negotiation(server);
+
+				g_string_free(cmd, TRUE);
+			}
 		}
 	}
 	else if (!g_strcmp0(evt, "ACK")) {
@@ -214,6 +236,9 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		for (i = 0; i < caps_length; i++)
 			cap_emit_signal(server, "nak", caps[i]);
 	}
+	else {
+		g_warning("Unhandled CAP subcommand %s", evt);
+	}
 
 	g_strfreev(caps);
 	g_free(params);

From f4d811ddf51ce03e90e0417a6c25baeb9aa48353 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 21 Oct 2017 17:11:43 +0200
Subject: [PATCH 0730/1650] Handle CAP {ADD,DEL} from cap-notify

This is the last piece of the puzzle.
---
 src/irc/core/irc-cap.c | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 602a7b06..2378d640 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -135,6 +135,8 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		return;
 	}
 
+	g_warning("%s -> %s", evt, list);
+
 	/* Strip the trailing whitespaces before splitting the string, some servers send responses with
 	 * superfluous whitespaces that g_strsplit the interprets as tokens */
 	caps = g_strsplit(g_strchomp(list), " ", -1);
@@ -158,11 +160,11 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 							 key, val)) {
 					/* The specification doesn't say anything about
 					 * duplicated values, let's just warn the user */
-					g_warning("Duplicate value");
+					g_warning("Duplicate value %s", key);
 				}
 			}
 			else {
-				g_warning("Invalid CAP key/value pair");
+				g_warning("Invalid CAP %s key/value pair", evt);
 			}
 
 		}
@@ -236,6 +238,36 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		for (i = 0; i < caps_length; i++)
 			cap_emit_signal(server, "nak", caps[i]);
 	}
+	else if (!strcmp(evt, "NEW")) {
+		for (i = 0; i < caps_length; i++) {
+			char *key, *val;
+
+			if (parse_cap_name(caps[i], &key, &val)) {
+				g_hash_table_insert(server->cap_supported,
+						    key, val);
+			}
+			else {
+				g_warning("Invalid CAP %s key/value pair", evt);
+			}
+			cap_emit_signal(server, "new", key);
+		}
+	}
+	else if (!strcmp(evt, "DEL")) {
+		for (i = 0; i < caps_length; i++) {
+			char *key, *val;
+
+			if (parse_cap_name(caps[i], &key, &val)) {
+				g_hash_table_remove(server->cap_supported, key);
+			}
+			else {
+				g_warning("Invalid CAP %s key/value pair", evt);
+			}
+			cap_emit_signal(server, "delete", key);
+			/* The server removed this CAP, remove it from the list
+			 * of the active ones if we had requested it */
+			server->cap_active = gslist_remove_string(server->cap_active, key);
+		}
+	}
 	else {
 		g_warning("Unhandled CAP subcommand %s", evt);
 	}

From cfc8c9f8e2d982ee3ebff7afa1d1bdeb04003029 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 21 Oct 2017 17:38:06 +0200
Subject: [PATCH 0731/1650] Properly dispose the GSList chains

We forgot to free the link and the data, oops.
---
 src/core/misc.c        | 13 +++++++++++++
 src/core/misc.h        |  1 +
 src/irc/core/irc-cap.c |  8 +++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 4e9f4bbe..27741220 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -218,6 +218,19 @@ GSList *gslist_remove_string (GSList *list, const char *str)
 	return list;
 }
 
+GSList *gslist_delete_string (GSList *list, const char *str, GDestroyNotify free_func)
+{
+	GSList *l;
+
+	l = g_slist_find_custom(list, str, (GCompareFunc) g_strcmp0);
+	if (l != NULL) {
+		free_func(l->data);
+		return g_slist_delete_link(list, l);
+	}
+
+	return list;
+}
+
 /* `list' contains pointer to structure with a char* to string. */
 char *gslistptr_to_string(GSList *list, int offset, const char *delimiter)
 {
diff --git a/src/core/misc.h b/src/core/misc.h
index 375744db..689cf5c2 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -22,6 +22,7 @@ GSList *gslist_find_icase_string(GSList *list, const char *key);
 GList *glist_find_string(GList *list, const char *key);
 GList *glist_find_icase_string(GList *list, const char *key);
 GSList *gslist_remove_string (GSList *list, const char *str);
+GSList *gslist_delete_string (GSList *list, const char *str, GDestroyNotify free_func);
 
 void gslist_free_full (GSList *list, GDestroyNotify free_func);
 
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 2378d640..a5ae07aa 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -36,7 +36,7 @@ int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 			return TRUE;
 		}
 		else if (!enable && gslist_find_string(server->cap_queue, cap)) {
-			server->cap_queue = gslist_remove_string(server->cap_queue, cap);
+			server->cap_queue = gslist_delete_string(server->cap_queue, cap, g_free);
 			return TRUE;
 		}
 
@@ -135,8 +135,6 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		return;
 	}
 
-	g_warning("%s -> %s", evt, list);
-
 	/* Strip the trailing whitespaces before splitting the string, some servers send responses with
 	 * superfluous whitespaces that g_strsplit the interprets as tokens */
 	caps = g_strsplit(g_strchomp(list), " ", -1);
@@ -214,7 +212,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			disable = (*caps[i] == '-');
 
 			if (disable)
-				server->cap_active = gslist_remove_string(server->cap_active, caps[i] + 1);
+				server->cap_active = gslist_delete_string(server->cap_active, caps[i] + 1, g_free);
 			else
 				server->cap_active = g_slist_prepend(server->cap_active, g_strdup(caps[i]));
 
@@ -265,7 +263,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			cap_emit_signal(server, "delete", key);
 			/* The server removed this CAP, remove it from the list
 			 * of the active ones if we had requested it */
-			server->cap_active = gslist_remove_string(server->cap_active, key);
+			server->cap_active = gslist_delete_string(server->cap_active, key, g_free);
 		}
 	}
 	else {

From 432368bdc6b941c1ff6319748b357bd5bae1bb6e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 21 Oct 2017 17:40:45 +0200
Subject: [PATCH 0732/1650] Use strcmp instead of g_strcmp0

There's no need to use the latter.
---
 src/irc/core/irc-cap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index a5ae07aa..f448ef83 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -140,7 +140,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 	caps = g_strsplit(g_strchomp(list), " ", -1);
 	caps_length = g_strv_length(caps);
 
-	if (!g_strcmp0(evt, "LS")) {
+	if (!strcmp(evt, "LS")) {
 		if (server->cap_supported) {
 			g_hash_table_destroy(server->cap_supported);
 		}
@@ -204,7 +204,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			}
 		}
 	}
-	else if (!g_strcmp0(evt, "ACK")) {
+	else if (!strcmp(evt, "ACK")) {
 		int got_sasl = FALSE;
 
 		/* Emit a signal for every ack'd cap */
@@ -216,7 +216,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			else
 				server->cap_active = g_slist_prepend(server->cap_active, g_strdup(caps[i]));
 
-			if (!g_strcmp0(caps[i], "sasl"))
+			if (!strcmp(caps[i], "sasl"))
 				got_sasl = TRUE;
 
 			cap_emit_signal(server, "ack", caps[i]);
@@ -228,7 +228,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		if (got_sasl == FALSE)
 			cap_finish_negotiation(server);
 	}
-	else if (!g_strcmp0(evt, "NAK")) {
+	else if (!strcmp(evt, "NAK")) {
 		g_warning("The server answered with a NAK to our CAP request, this should not happen");
 
 		/* A NAK'd request means that a required cap can't be enabled or disabled, don't update the

From f683e81880ac4408693582df3ec11d640684c78d Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 23 Oct 2017 12:42:37 +0200
Subject: [PATCH 0733/1650] Prevent a NULL pointer deference

Always create the cap_supported table when a CAP event is received.
---
 src/irc/core/irc-cap.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index f448ef83..46276243 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -135,19 +135,21 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		return;
 	}
 
+	/* The table is created only when needed */
+	if (server->cap_supported == NULL) {
+		server->cap_supported = g_hash_table_new_full(g_str_hash,
+							      g_str_equal,
+							      g_free, g_free);
+	}
+
 	/* Strip the trailing whitespaces before splitting the string, some servers send responses with
 	 * superfluous whitespaces that g_strsplit the interprets as tokens */
 	caps = g_strsplit(g_strchomp(list), " ", -1);
 	caps_length = g_strv_length(caps);
 
 	if (!strcmp(evt, "LS")) {
-		if (server->cap_supported) {
-			g_hash_table_destroy(server->cap_supported);
-		}
-		/* Start with a fresh table */
-		server->cap_supported = g_hash_table_new_full(g_str_hash,
-							      g_str_equal,
-							      g_free, g_free);
+		/* Throw away everything and start from scratch */
+		g_hash_table_remove_all(server->cap_supported);
 
 		/* Create a list of the supported caps */
 		for (i = 0; i < caps_length; i++) {

From 74409aa85071390a3969fffa21c08a6736efe314 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 23 Oct 2017 20:08:19 +0200
Subject: [PATCH 0734/1650] Miscellaneous fixes

Stylistic stuff, please ignore.
---
 src/irc/core/irc-cap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 46276243..9af55130 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -86,14 +86,14 @@ static gboolean parse_cap_name(char *name, char **key, char **val)
 
 	const char *eq = strchr(name, '=');
 	/* KEY only value */
-	if (!eq) {
+	if (eq == NULL) {
 		*key = g_strdup(name);
 		*val = NULL;
 		return TRUE;
 	}
 	/* Some values are in a KEY=VALUE form, parse them */
 	else if (eq[1] != '\0') {
-		*key = g_strndup(name, (int)(eq - name));
+		*key = g_strndup(name, (gsize)(eq - name));
 		*val = g_strdup(eq + 1);
 		return TRUE;
 	}

From cd107deb463934f7a8611cdc8d17b861a93d97f9 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 23 Oct 2017 21:19:51 +0200
Subject: [PATCH 0735/1650] Prevent a memory leak

When a CAP DEL is received the key/val pair is not stored in the
hashtable at all so just free them when we're done.
---
 src/irc/core/irc-cap.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 9af55130..8be9d33f 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -266,6 +266,10 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			/* The server removed this CAP, remove it from the list
 			 * of the active ones if we had requested it */
 			server->cap_active = gslist_delete_string(server->cap_active, key, g_free);
+			/* We don't transfer the ownership of those two
+			 * variables this time, just free them when we're done. */
+			g_free(key);
+			g_free(val);
 		}
 	}
 	else {

From 9160ddaffd45b03c523320ef8f71bb3a8a9fb87a Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 23 Oct 2017 21:23:59 +0200
Subject: [PATCH 0736/1650] Keep processing the CAPs on error

If an invalid CAP is found we keep going by parsing the next one.
---
 src/irc/core/irc-cap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 8be9d33f..d93dfac4 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -165,8 +165,8 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			}
 			else {
 				g_warning("Invalid CAP %s key/value pair", evt);
+				continue;
 			}
-
 		}
 
 		/* A multiline response is always terminated by a normal one,
@@ -248,6 +248,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			}
 			else {
 				g_warning("Invalid CAP %s key/value pair", evt);
+				continue;
 			}
 			cap_emit_signal(server, "new", key);
 		}
@@ -261,6 +262,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			}
 			else {
 				g_warning("Invalid CAP %s key/value pair", evt);
+				continue;
 			}
 			cap_emit_signal(server, "delete", key);
 			/* The server removed this CAP, remove it from the list

From c00132ac4cf78702b4f72fc6a0085432bcef2fac Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 24 Oct 2017 15:47:06 +0200
Subject: [PATCH 0737/1650] Simplify the code

Early exit, simpler code.
---
 src/irc/core/irc-cap.c | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index d93dfac4..5d033bbf 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -155,18 +155,16 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		for (i = 0; i < caps_length; i++) {
 			char *key, *val;
 
-			if (parse_cap_name(caps[i], &key, &val)) {
-				if (!g_hash_table_insert(server->cap_supported,
-							 key, val)) {
-					/* The specification doesn't say anything about
-					 * duplicated values, let's just warn the user */
-					g_warning("Duplicate value %s", key);
-				}
-			}
-			else {
+			if (!parse_cap_name(caps[i], &key, &val)) {
 				g_warning("Invalid CAP %s key/value pair", evt);
 				continue;
 			}
+
+			if (!g_hash_table_insert(server->cap_supported, key, val)) {
+				/* The specification doesn't say anything about
+				 * duplicated values, let's just warn the user */
+				g_warning("Duplicate value %s", key);
+			}
 		}
 
 		/* A multiline response is always terminated by a normal one,
@@ -242,14 +240,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		for (i = 0; i < caps_length; i++) {
 			char *key, *val;
 
-			if (parse_cap_name(caps[i], &key, &val)) {
-				g_hash_table_insert(server->cap_supported,
-						    key, val);
-			}
-			else {
+			if (!parse_cap_name(caps[i], &key, &val)) {
 				g_warning("Invalid CAP %s key/value pair", evt);
 				continue;
 			}
+
+			g_hash_table_insert(server->cap_supported, key, val);
 			cap_emit_signal(server, "new", key);
 		}
 	}
@@ -257,13 +253,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		for (i = 0; i < caps_length; i++) {
 			char *key, *val;
 
-			if (parse_cap_name(caps[i], &key, &val)) {
-				g_hash_table_remove(server->cap_supported, key);
-			}
-			else {
+			if (!parse_cap_name(caps[i], &key, &val)) {
 				g_warning("Invalid CAP %s key/value pair", evt);
 				continue;
 			}
+
+			g_hash_table_remove(server->cap_supported, key);
 			cap_emit_signal(server, "delete", key);
 			/* The server removed this CAP, remove it from the list
 			 * of the active ones if we had requested it */

From 6c45ab0493e42bca08016ad70a54bb523282b7b8 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 29 Oct 2017 15:59:51 +0100
Subject: [PATCH 0738/1650] Command names may be in lower-case

Do not take the string case into account when comparing the command
name.
---
 src/irc/core/irc-cap.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 5d033bbf..1a76fc8e 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -147,7 +147,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 	caps = g_strsplit(g_strchomp(list), " ", -1);
 	caps_length = g_strv_length(caps);
 
-	if (!strcmp(evt, "LS")) {
+	if (!g_ascii_strcasecmp(evt, "LS")) {
 		/* Throw away everything and start from scratch */
 		g_hash_table_remove_all(server->cap_supported);
 
@@ -204,7 +204,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			}
 		}
 	}
-	else if (!strcmp(evt, "ACK")) {
+	else if (!g_ascii_strcasecmp(evt, "ACK")) {
 		int got_sasl = FALSE;
 
 		/* Emit a signal for every ack'd cap */
@@ -228,7 +228,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		if (got_sasl == FALSE)
 			cap_finish_negotiation(server);
 	}
-	else if (!strcmp(evt, "NAK")) {
+	else if (!g_ascii_strcasecmp(evt, "NAK")) {
 		g_warning("The server answered with a NAK to our CAP request, this should not happen");
 
 		/* A NAK'd request means that a required cap can't be enabled or disabled, don't update the
@@ -236,7 +236,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		for (i = 0; i < caps_length; i++)
 			cap_emit_signal(server, "nak", caps[i]);
 	}
-	else if (!strcmp(evt, "NEW")) {
+	else if (!g_ascii_strcasecmp(evt, "NEW")) {
 		for (i = 0; i < caps_length; i++) {
 			char *key, *val;
 
@@ -249,7 +249,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			cap_emit_signal(server, "new", key);
 		}
 	}
-	else if (!strcmp(evt, "DEL")) {
+	else if (!g_ascii_strcasecmp(evt, "DEL")) {
 		for (i = 0; i < caps_length; i++) {
 			char *key, *val;
 

From f3a535564880d73b75263b685794a7165e56f9bd Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 29 Oct 2017 16:03:28 +0100
Subject: [PATCH 0739/1650] Match LS instead of checking the first letter only

---
 src/irc/core/irc-cap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 1a76fc8e..a9d79c24 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -119,7 +119,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 
 	/* Multiline responses have an additional parameter and we have to do
 	 * this stupid dance to parse them */
-	if (evt[0] == 'L' && !strcmp(star, "*")) {
+	if (!g_ascii_strcasecmp(evt, "LS") && !strcmp(star, "*")) {
 		multiline = TRUE;
 	}
 	/* This branch covers the '*' parameter isn't present, adjust the

From 4b9fcbc15ae3561c34944e30e24fd1d54346bb99 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 29 Oct 2017 16:06:36 +0100
Subject: [PATCH 0740/1650] Nicer error message when a duplicate CAP in LS

---
 src/irc/core/irc-cap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index a9d79c24..880a15b6 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -163,7 +163,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			if (!g_hash_table_insert(server->cap_supported, key, val)) {
 				/* The specification doesn't say anything about
 				 * duplicated values, let's just warn the user */
-				g_warning("Duplicate value %s", key);
+				g_warning("The server sent the %s capability twice", key);
 			}
 		}
 

From fed791ed9100552edbe643d8b3d0e0bc271e88d4 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 30 Oct 2017 17:41:16 +0100
Subject: [PATCH 0741/1650] Fix a problem with multiline responses

Do not clear the whole table every time a response is received.
---
 src/irc/core/irc-cap.c     | 8 ++++++--
 src/irc/core/irc-servers.h | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 880a15b6..90bffd80 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -148,8 +148,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 	caps_length = g_strv_length(caps);
 
 	if (!g_ascii_strcasecmp(evt, "LS")) {
-		/* Throw away everything and start from scratch */
-		g_hash_table_remove_all(server->cap_supported);
+		if (!server->cap_in_multiline) {
+			/* Throw away everything and start from scratch */
+			g_hash_table_remove_all(server->cap_supported);
+		}
+
+		server->cap_in_multiline = multiline;
 
 		/* Create a list of the supported caps */
 		for (i = 0; i < caps_length; i++) {
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 6c6002c8..1374e846 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -68,6 +68,7 @@ struct _IRC_SERVER_REC {
 	unsigned int motd_got:1; /* We've received MOTD */
 	unsigned int isupport_sent:1; /* Server has sent us an isupport reply */
 	unsigned int cap_complete:1; /* We've done the initial CAP negotiation */
+	unsigned int cap_in_multiline:1; /* We're waiting for the multiline response to end */
 	unsigned int sasl_success:1; /* Did we authenticate successfully ? */
 
 	int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */

From 063c85da6c4e73a292525aa01b5cad70ed6bf82b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 7 Jan 2018 20:01:00 +0100
Subject: [PATCH 0742/1650] Fix space in message

---
 src/fe-text/term-terminfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index f4c4d17c..ba8bdcaf 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -735,7 +735,7 @@ void term_gets(GArray *buffer, int *line_count)
 }
 
 static const char* term_env_warning =
-	"You seem to be running Irssi inside %2$s, but the TERM environment variable"
+	"You seem to be running Irssi inside %2$s, but the TERM environment variable "
 	"is set to '%1$s', which can cause display glitches.\n"
 	"Consider changing TERM to '%2$s' or '%2$s-256color' instead.";
 

From b8e3c5d00e80a2bf24cfbb063e2e4916ef01147d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 8 Jan 2018 13:33:40 +0100
Subject: [PATCH 0743/1650] only use nonfatal assertions for GLib that actually
 supports it

Fixes tests on Debian 7 and RHEL 6
---
 tests/fe-common/core/test-formats.c | 2 ++
 tests/irc/core/test-irc.c           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c
index 9ef23fd6..08d706ac 100644
--- a/tests/fe-common/core/test-formats.c
+++ b/tests/fe-common/core/test-formats.c
@@ -31,7 +31,9 @@ int main(int argc, char **argv)
 		g_free(name);
 	}
 
+#if GLIB_CHECK_VERSION(2,38,0)
 	g_test_set_nonfatal_assertions();
+#endif
 	return g_test_run();
 }
 
diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c
index c96956df..3eaf7020 100644
--- a/tests/irc/core/test-irc.c
+++ b/tests/irc/core/test-irc.c
@@ -197,7 +197,9 @@ int main(int argc, char **argv)
 		g_free(name);
 	}
 
+#if GLIB_CHECK_VERSION(2,38,0)
 	g_test_set_nonfatal_assertions();
+#endif
 	return g_test_run();
 }
 

From 3b1ee8e7e7e9d01190d906ae5af6d3dd7dbd9a63 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 8 Jan 2018 13:47:25 +0100
Subject: [PATCH 0744/1650] change expected format_real_length test result

This change from 0 -> 4 was introduced by #697 and is thus expected
---
 tests/fe-common/core/test-formats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c
index 9ef23fd6..b3b15886 100644
--- a/tests/fe-common/core/test-formats.c
+++ b/tests/fe-common/core/test-formats.c
@@ -15,7 +15,7 @@ format_real_length_test_case const format_real_length_fixtures[] = {
 	{
 		.description = "",
 		.input = "%4%w ",
-		.result = { 0, 5, 5, -1 },
+		.result = { 4, 5, 5, -1 },
 	},
 };
 

From f2e73a7046358ed948b14180c70bab5dba5364cc Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Tue, 9 Jan 2018 23:15:08 +0100
Subject: [PATCH 0745/1650] Add perl access to hidden_level in
 TEXT_BUFFER_VIEW_REC

---
 src/perl/textui/TextUI.xs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index 5d2c8a7f..ff94ad5f 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -40,6 +40,7 @@ static void perl_text_buffer_view_fill_hash(HV *hv, TEXT_BUFFER_VIEW_REC *view)
 
 	(void) hv_store(hv, "startline", 9, plain_bless(view->startline, "Irssi::TextUI::Line"), 0);
 	(void) hv_store(hv, "subline", 7, newSViv(view->subline), 0);
+        (void) hv_store(hv, "hidden_level", 12, newSViv(view->hidden_level), 0);
 
 	(void) hv_store(hv, "bottom_startline", 16, plain_bless(view->bottom_startline, "Irssi::TextUI::Line"), 0);
 	(void) hv_store(hv, "bottom_subline", 14, newSViv(view->bottom_subline), 0);

From 4041f29711e5a6745175d0ae046e68e34f034bf4 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <jari.matilainen@istone.se>
Date: Tue, 9 Jan 2018 23:16:26 +0100
Subject: [PATCH 0746/1650] Changed spaces to tab

---
 src/perl/textui/TextUI.xs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index ff94ad5f..12732e3f 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -40,7 +40,7 @@ static void perl_text_buffer_view_fill_hash(HV *hv, TEXT_BUFFER_VIEW_REC *view)
 
 	(void) hv_store(hv, "startline", 9, plain_bless(view->startline, "Irssi::TextUI::Line"), 0);
 	(void) hv_store(hv, "subline", 7, newSViv(view->subline), 0);
-        (void) hv_store(hv, "hidden_level", 12, newSViv(view->hidden_level), 0);
+	(void) hv_store(hv, "hidden_level", 12, newSViv(view->hidden_level), 0);
 
 	(void) hv_store(hv, "bottom_startline", 16, plain_bless(view->bottom_startline, "Irssi::TextUI::Line"), 0);
 	(void) hv_store(hv, "bottom_subline", 14, newSViv(view->bottom_subline), 0);

From fa8508404f4c4a02749cae5148662e2322c2abf0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 10 Jan 2018 20:08:15 +0100
Subject: [PATCH 0747/1650] revert netsplit print optimisation

this reverts part of #465

unfortunately we need to further refine the initial patch

 - when filtering by channel, the whole split is cleaned up nevertheless
 - something similar happens for the netjoins
 - furthermore, we cannot wait only for PUBLIC msgs, j/p/q are equivalently relevant for temporal integrity
---
 src/fe-common/irc/fe-netjoin.c  | 5 +----
 src/fe-common/irc/fe-netsplit.c | 9 +++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 8272093f..bc39b27c 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -253,15 +253,12 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
 	if (!IS_IRC_SERVER(dest->server))
 		return;
 
-	if (!(dest->level & MSGLEVEL_PUBLIC))
-		return;
-
 	if (!server_ischannel(dest->server, dest->target))
 		return;
 
 	rec = netjoin_find_server(IRC_SERVER(dest->server));
 	if (rec != NULL && rec->netjoins != NULL)
-		print_netjoins(rec, dest->target);
+		print_netjoins(rec, NULL);
 }
 
 static int sig_check_netjoins(void)
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index 4c69dd10..ac3330e5 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -199,7 +199,7 @@ static void temp_split_chan_free(TEMP_SPLIT_CHAN_REC *rec)
 	g_free(rec);
 }
 
-static void print_splits(IRC_SERVER_REC *server, const char *channel)
+static void print_splits(IRC_SERVER_REC *server, const char *filter_channel)
 {
 	TEMP_SPLIT_REC temp;
 	GSList *servers;
@@ -218,7 +218,7 @@ static void print_splits(IRC_SERVER_REC *server, const char *channel)
 
 		g_hash_table_foreach(server->splits,
 				     (GHFunc) get_server_splits, &temp);
-		print_server_splits(server, &temp, channel);
+		print_server_splits(server, &temp, filter_channel);
 
 		g_slist_foreach(temp.channels,
 				(GFunc) temp_split_chan_free, NULL);
@@ -255,15 +255,12 @@ static void sig_print_starting(TEXT_DEST_REC *dest)
 	if (!IS_IRC_SERVER(dest->server))
 		return;
 
-	if (!(dest->level & MSGLEVEL_PUBLIC))
-		return;
-
 	if (!server_ischannel(dest->server, dest->target))
 		return;
 
 	rec = IRC_SERVER(dest->server);
 	if (rec->split_servers != NULL)
-		print_splits(rec, dest->target);
+		print_splits(rec, NULL);
 }
 
 static int sig_check_splits(void)

From 182673ed05a5b5cb79d104df83f34fcc163a9c7e Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Mon, 15 Jan 2018 11:59:01 -0500
Subject: [PATCH 0748/1650] Add theme_load to fe-fuzz

---
 .gitignore                              |  1 +
 configure.ac                            |  2 +
 src/fe-fuzz/Makefile.am                 |  2 +-
 src/fe-fuzz/fe-common/Makefile.am       |  1 +
 src/fe-fuzz/fe-common/core/Makefile.am  | 46 +++++++++++++++++
 src/fe-fuzz/fe-common/core/theme-load.c | 66 +++++++++++++++++++++++++
 6 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 src/fe-fuzz/fe-common/Makefile.am
 create mode 100644 src/fe-fuzz/fe-common/core/Makefile.am
 create mode 100644 src/fe-fuzz/fe-common/core/theme-load.c

diff --git a/.gitignore b/.gitignore
index b707e9ec..916457f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ docs/help/in/Makefile.am
 src/fe-text/irssi
 src/fe-fuzz/irssi-fuzz
 src/fe-fuzz/irc/core/event-get-params-fuzz
+src/fe-fuzz/fe-common/core/theme-load-fuzz
 
 src/fe-common/irc/irc-modules.c
 src/irc/irc.c
diff --git a/configure.ac b/configure.ac
index 4a499b1d..e8df7d9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,6 +652,8 @@ src/fe-common/irc/notifylist/Makefile
 src/fe-fuzz/Makefile
 src/fe-fuzz/irc/Makefile
 src/fe-fuzz/irc/core/Makefile
+src/fe-fuzz/fe-common/Makefile
+src/fe-fuzz/fe-common/core/Makefile
 src/fe-none/Makefile
 src/fe-text/Makefile
 src/lib-config/Makefile
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index ae49f3df..40abd5ba 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = irc
+SUBDIRS = irc fe-common
 
 bin_PROGRAMS = irssi-fuzz
 
diff --git a/src/fe-fuzz/fe-common/Makefile.am b/src/fe-fuzz/fe-common/Makefile.am
new file mode 100644
index 00000000..52770885
--- /dev/null
+++ b/src/fe-fuzz/fe-common/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = core
diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
new file mode 100644
index 00000000..4fe5937c
--- /dev/null
+++ b/src/fe-fuzz/fe-common/core/Makefile.am
@@ -0,0 +1,46 @@
+bin_PROGRAMS = theme-load-fuzz
+
+# Force link with CXX for libfuzzer support
+CCLD=$(CXX) $(CXXFLAGS)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core/ \
+	-I$(top_srcdir)/src/irc/core/ \
+	-I$(top_srcdir)/src/fe-common/core/ \
+	$(GLIB_CFLAGS)
+
+AM_DEPENDENCIES = \
+	../../../core/libcore.a \
+	../../../lib-config/libirssi_config.a \
+	../../../irc/libirc.a \
+	../../../irc/core/libirc_core.a \
+	../../../irc/dcc/libirc_dcc.a \
+	../../../irc/flood/libirc_flood.a \
+	../../../irc/notifylist/libirc_notifylist.a \
+	../../../fe-common/core/libfe_common_core.a \
+	../../../fe-common/irc/libfe_common_irc.a \
+	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
+	../../../fe-common/irc/notifylist/libfe_irc_notifylist.a
+
+LDADD = \
+	../../../irc/libirc.a \
+	../../../irc/core/libirc_core.a \
+	../../../irc/dcc/libirc_dcc.a \
+	../../../irc/flood/libirc_flood.a \
+	../../../irc/notifylist/libirc_notifylist.a \
+	../../../fe-common/core/libfe_common_core.a \
+	../../../fe-common/irc/libfe_common_irc.a \
+	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
+	../../../fe-common/irc/notifylist/libfe_irc_notifylist.a \
+	../../../core/libcore.a \
+	../../../lib-config/libirssi_config.a \
+	@PROG_LIBS@ \
+	$(FUZZER_LIBS)
+
+theme_load_fuzz_SOURCES = \
+        theme-load.c \
+	$(top_srcdir)/src/fe-text/module-formats.c
+
+noinst_HEADERS = \
+	$(top_srcdir)/src/fe-text/module-formats.h
diff --git a/src/fe-fuzz/fe-common/core/theme-load.c b/src/fe-fuzz/fe-common/core/theme-load.c
new file mode 100644
index 00000000..14df74c6
--- /dev/null
+++ b/src/fe-fuzz/fe-common/core/theme-load.c
@@ -0,0 +1,66 @@
+/*
+ theme-load.c : irssi
+
+    Copyright (C) 2018 Joseph Bisch
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "modules-load.h"
+#include "levels.h"
+#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text
+#include "themes.h"
+#include "core.h"
+#include "fe-common-core.h"
+#include "args.h"
+#include "printtext.h"
+#include "irc.h"
+#include "themes.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+int LLVMFuzzerInitialize(int *argc, char ***argv) {
+	core_register_options();
+	fe_common_core_register_options();
+	char *irssi_argv[] = {*argv[0], "--home", "/tmp/irssi", NULL};
+	int irssi_argc = sizeof(irssi_argv) / sizeof(char *) - 1;
+	args_execute(irssi_argc, irssi_argv);
+	core_preinit((*argv)[0]);
+	core_init();
+	fe_common_core_init();
+	theme_register(gui_text_formats);
+	module_register("core", "fe-fuzz");
+	return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+	gchar *copy = g_strndup((const gchar *)data, size);
+
+	FILE *fp = fopen("/tmp/irssi/fuzz.theme", "wb");
+	if (fp) {
+		fwrite(copy, strlen(copy), 1, fp);
+		fclose(fp);
+	}
+
+	THEME_REC *theme = theme_load("fuzz");
+	theme_destroy(theme);
+
+	g_free(copy);
+	return 0;
+}

From ef8111eebe3c9d35ef9754f68c9f7df0aea7058e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 15 Jan 2018 21:54:52 +0100
Subject: [PATCH 0749/1650] Merge branch 'maint/1.1.0' into integrate/1.1.0

---
 NEWS | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1054bb62..4b171852 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,83 @@
-v1.1-head 2018-xx-xx  The Irssi team <staff@irssi.org>
+v1.2-head 2018-xx-xx  The Irssi team <staff@irssi.org>
+
+v1.1.0 2018-01-15 The Irssi team <staff@irssi.org>
+	* Colour is now re-set when reaching a comma, matching mIRC
+	  behaviour (#742, #740, #790)
+	* Irssi now shows the initial nick and name on first start
+	  (#785, #786)
+	* lynx is no longer required to run autogen.sh (#81, #781)
+	* The command history no longer permits wrapping around (#686)
+	* /foreach now correctly sends arguments as commands, stopping
+	  you from embarassing AMSGs (#659)
+	* /server does not connect to servers anymore, use /server
+	  connect to change servers (#559, #649).
+	* The net_ip_compare API function is now deprecated, and the
+          previously deprecated net_connect has been removed
+          (#770). By Will Storey (#770)
+	+ Add an option to ignore all channels or ignore all queries
+	  using /set activity_hide_targets. By Jari Matilainen (#612,
+	  #779)
+	+ Add a startup warning if the TERM var is wrong inside
+	  tmux/screen (#726)
+	+ Add option to hide certain levels from the textbuffer using
+	  /window hidelevel (#746, #808)
+	+ Irssi now has its first unit test (for mode parsing). By
+	  Will Storey (#793)
+	+ Added access to global command history when using window
+	  history, and a binding to erase entries from the command
+	  history (erase_history_entry) (#762)
+	+ -alternate_nick is now available as a network specific
+	  property. By Paul Townsend (#120, #771)
+	+ On FreeBSD, Irssi now supports Capsicum sandbox (/capsicum
+	  enter). By Edward Tomasz Napierala (#735, #755, #772)
+	+ Filenames (directories) ending with a / now tab-complete
+	  (#741)
+	+ UTF-8 should now work in regular expressions when using
+	  GRegex (the default) (#636, #653)
+	+ Nicks are now properly escaped on completion. By Oscar
+	  Linderholm (#693, #709)
+	+ /server add -port <num> now works. By Jari Matilainen (#703)
+	+ Add a setting key_timeout to make key sequences
+	  automatically re-set when not finished (#644, #645)
+	+ Warn users about expired client certificates, as servers may
+	  refuse them (#211, #627)
+	+ Add a new net_start_ssl function for StartTLS. This is
+	  available from ABI 8 and can be used by protocol modules
+	  (#615, #622).
+	+ The %# code is now stored in the textbuffer, so for example
+	  web scripts can make use of it (#626)
+	+ Add new setting break_wide which can be used to enable
+	  breaking of wide characters (for east-asian
+	  users). Originally from FreeBSD ports. (#625)
+	+ Add fuzzing code (#610, #620, #701, #713)
+	- Netsplits show properly again (#812)
+	- Do not error on blank lines when using /exec -o. By Fabian
+	  Kurz (FS#902, #805)
+	- Detect used nickname as reported by server. By Alexandre
+	  Morignot (#219, #804)
+	- Prevent use after free error during the execution of some
+	  commands. Found by Joseph Bisch. (GL#17, GL!24)
+	- Fix MODE parameter parsing when colon was used at a place
+	  Irssi didn't expect (#601, #766)
+	- Fixed code to compile with
+	  -Werror=declaration-after-statement (#795)
+	- Clang-format is now supported for git-clang-format (#784)
+	- Fix use after free when changing the network of
+	  hilights. Reported by Rui Mathias. (#787, #788)
+	- Fix positioning error when tab-completing non-ascii
+	  strings. (#752, #754)
+	- In-development issues (#750, #751)
+	- Clarify Alis in /help list (#699, #712)
+	- Improve /lastlog performance from O(N^2) to O(N) (#715)
+	- Fix a segfault on "script destroyed" signal. By Stephen
+	  Oberholtzer (#660, #661).
+	- Fix early ISON error (#596, #647)
+	- Documentation improvements. By Paolo Martini (#639).
+	  By Tristan Pepin (#731).  By Paul Townsend (#684, #736).
+	  By Will Storey (#777)
+	- Minor cleanups (#590). By Edward Tomasz Napierala (#734,
+	  #738)
+	- Fix space issue in glib-2.0.m4 (#621)
 
 v1.0.6 2018-01-07 The Irssi team <staff@irssi.org>
 	- Fix invalid memory access when reading hilight configuration

From e7c9b3afb82f4db3958f4f08cb706aadcbd12d2c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 16 Jan 2018 11:05:47 +0100
Subject: [PATCH 0750/1650] fix test builds on some platforms

---
 tests/fe-common/core/Makefile.am | 3 +--
 tests/irc/core/Makefile.am       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am
index 070b6052..f048e95c 100644
--- a/tests/fe-common/core/Makefile.am
+++ b/tests/fe-common/core/Makefile.am
@@ -21,8 +21,7 @@ test_formats_LDADD = \
 	../../../src/fe-common/core/libfe_common_core.a \
 	../../../src/core/libcore.a \
 	../../../src/lib-config/libirssi_config.a \
-	@GLIB_LIBS@ \
-	@OPENSSL_LIBS@
+	@PROG_LIBS@
 
 test_formats_SOURCES = \
 	test-formats.c
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index ccc6aa97..86f1d547 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -22,8 +22,7 @@ test_irc_LDADD = \
 	../../../src/irc/core/libirc_core.a \
 	../../../src/core/libcore.a \
 	../../../src/lib-config/libirssi_config.a \
-	@GLIB_LIBS@ \
-	@OPENSSL_LIBS@
+	@PROG_LIBS@
 
 test_irc_SOURCES = \
 	test-irc.c

From d983ad1a878103448231c8fd56fbc9c4b8f7f501 Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@icloud.com>
Date: Tue, 16 Jan 2018 15:23:54 +0000
Subject: [PATCH 0751/1650] Update Irssi website URLs

---
 README.md                    | 2 +-
 docs/help/in/hash.in         | 2 +-
 docs/help/in/help.in         | 2 +-
 docs/irssi.1                 | 2 +-
 docs/manual.txt              | 2 +-
 irssi.conf                   | 4 ++--
 src/fe-text/module-formats.c | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0f54ccf5..3550b640 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ make && sudo make install
 
 ## [Themes](https://irssi-import.github.io/themes/)
 
-## [Scripts](http://scripts.irssi.org/)
+## [Scripts](https://scripts.irssi.org/)
 
 ## [Modules](https://irssi.org/modules/)
 
diff --git a/docs/help/in/hash.in b/docs/help/in/hash.in
index 32dfc9c7..2d5a355d 100644
--- a/docs/help/in/hash.in
+++ b/docs/help/in/hash.in
@@ -15,7 +15,7 @@
 
 %9References:%9
 
-    http://www.irssi.org
+    https://irssi.org
     https://github.com/irssi
 
 %9See also:%9 DIE, KILL, OPER
diff --git a/docs/help/in/help.in b/docs/help/in/help.in
index 555e20e1..35ab9b75 100644
--- a/docs/help/in/help.in
+++ b/docs/help/in/help.in
@@ -20,7 +20,7 @@
 
 %9References:%9
 
-    http://www.irssi.org
+    https://irssi.org
     https://github.com/irssi
 
 %9See also:%9 CONNECT, MSG, NETWORK, SERVER
diff --git a/docs/irssi.1 b/docs/irssi.1
index e1fab0d8..08be69f5 100644
--- a/docs/irssi.1
+++ b/docs/irssi.1
@@ -59,7 +59,7 @@ show a help message
 .SH SEE ALSO
 .B Irssi
 has a solid amount of documentation available; check /HELP or look online
-at http://www.irssi.org
+at https://irssi.org
 .SH FILES
 .TP
 .I ~/.irssi/config
diff --git a/docs/manual.txt b/docs/manual.txt
index b2d0de14..db40e5d3 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -1,5 +1,5 @@
 
- Irssi 0.8 documentation - http://www.irssi.org/
+ Irssi 0.8 documentation - https://irssi.org/
 
  Copyright(c) 2000 Timo Sirainen <cras@irssi.org>
 
diff --git a/irssi.conf b/irssi.conf
index 0e486807..61d2e81f 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -145,7 +145,7 @@ aliases = {
   SB          = "SCROLLBACK";
   SBAR        = "STATUSBAR";
   SIGNOFF     = "QUIT";
-  SV          = "MSG * Irssi $J ($V) - http://www.irssi.org";
+  SV          = "MSG * Irssi $J ($V) - https://irssi.org";
   T           = "TOPIC"; 
   UB          = "UNBAN";
   UMODE       = "MODE $N";
@@ -281,7 +281,7 @@ statusbar = {
     prompt_empty = "{prompt $winname}";
     
     topic       = " $topic";
-    topic_empty = " Irssi v$J - http://www.irssi.org";
+    topic_empty = " Irssi v$J - https://irssi.org";
 
     lag  = "{sb Lag: $0-}";
     act  = "{sb Act: $0-}";
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index 8fa31a0e..b234f46c 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -87,7 +87,7 @@ FORMAT_REC gui_text_formats[] =
 	  "|_ _|_ _ _____(_)%:"
 	  " | || '_(_-<_-< |%:"
 	  "|___|_| /__/__/_|%:"
-	  "Irssi v$J - http://www.irssi.org", 0 },
+	  "Irssi v$J - https://irssi.org", 0 },
 	{ "welcome_firsttime",
 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
 	  "Hi there! If this is your first time using Irssi, you%:"

From 925ae6e6adfae0b8924cfeca2a2b0ac99b042bce Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Fri, 6 Oct 2017 18:36:42 +0100
Subject: [PATCH 0752/1650] Add color support for input bar

---
 src/fe-text/gui-entry.c   | 133 +++++++++++++++++++++++++++++++-------
 src/fe-text/gui-entry.h   |   2 +
 src/perl/textui/TextUI.xs |   8 +++
 3 files changed, 121 insertions(+), 22 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index e91fcfb3..3e275e34 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -65,6 +65,8 @@ static void entry_text_grow(GUI_ENTRY_REC *entry, int grow_size)
 	entry->text_alloc = nearest_power(entry->text_alloc+grow_size);
 	entry->text = g_realloc(entry->text,
 				sizeof(unichar) * entry->text_alloc);
+	entry->colors = g_realloc(entry->colors,
+	                        sizeof(int) * entry->text_alloc);
 }
 
 GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
@@ -74,11 +76,12 @@ GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
 	rec = g_new0(GUI_ENTRY_REC, 1);
 	rec->xpos = xpos;
 	rec->ypos = ypos;
-        rec->width = width;
-        rec->text_alloc = 1024;
+	rec->width = width;
+	rec->text_alloc = 1024;
 	rec->text = g_new(unichar, rec->text_alloc);
-        rec->text[0] = '\0';
-        rec->utf8 = utf8;
+	rec->colors = g_new(int, rec->text_alloc);
+	rec->text[0] = '\0';
+	rec->utf8 = utf8;
 	return rec;
 }
 
@@ -100,9 +103,10 @@ void gui_entry_destroy(GUI_ENTRY_REC *entry)
 	}
 	g_slist_free(entry->kill_ring);
 
-        g_free(entry->text);
+	g_free(entry->text);
+	g_free(entry->colors);
 	g_free(entry->prompt);
-        g_free(entry);
+	g_free(entry);
 }
 
 /* big5 functions */
@@ -238,7 +242,8 @@ static void gui_entry_fix_cursor(GUI_ENTRY_REC *entry)
 static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 {
 	int i;
-	int xpos, end_xpos;
+	const int *col;
+	int xpos, end_xpos, color;
 
 	xpos = entry->xpos + entry->promptlen +
 		pos2scrpos(entry, pos + entry->scrstart) -
@@ -248,10 +253,13 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 	if (xpos > end_xpos)
                 return;
 
+	color = ATTR_RESET;
 	term_set_color(root_window, ATTR_RESET);
 	term_move(root_window, xpos, entry->ypos);
 
-	for (i = entry->scrstart + pos; i < entry->text_len; i++) {
+	col = entry->scrstart + pos < entry->text_len ?
+			entry->colors + entry->scrstart + pos : 0;
+	for (i = entry->scrstart + pos; i < entry->text_len; i++, col++) {
 		unichar c = entry->text[i];
 
 		if (entry->hidden)
@@ -266,6 +274,11 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 		if (xpos > end_xpos)
 			break;
 
+		if (*col != color) {
+			term_set_color(root_window, *col);
+			color = *col;
+		}
+
 		if (entry->hidden)
                         term_addch(root_window, ' ');
 		else if (unichar_isprint(c))
@@ -273,7 +286,7 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 		else {
 			term_set_color(root_window, ATTR_RESET|ATTR_REVERSE);
 			term_addch(root_window, (c & 127)+'A'-1);
-			term_set_color(root_window, ATTR_RESET);
+			term_set_color(root_window, color);
 		}
 	}
 
@@ -488,6 +501,10 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
 	g_memmove(entry->text + entry->pos + len, entry->text + entry->pos,
 		  (entry->text_len-entry->pos + 1) * sizeof(unichar));
 
+	/* make space for the color */
+	g_memmove(entry->colors + entry->pos + len, entry->colors + entry->pos,
+	          (entry->text_len-entry->pos) * sizeof(int));
+
 	if (!entry->utf8) {
 		if (term_type == TERM_TYPE_BIG5) {
 			chr = entry->text[entry->pos + len];
@@ -505,6 +522,10 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
 		}
 	}
 
+	for(i = 0; i < len; i++) {
+		entry->colors[entry->pos + i] = ATTR_RESET;
+	}
+
 	entry->text_len += len;
         entry->pos += len;
 
@@ -514,7 +535,7 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
 
 void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 {
-        g_return_if_fail(entry != NULL);
+	g_return_if_fail(entry != NULL);
 
 	if (chr == 0 || chr == 13 || chr == 10)
 		return; /* never insert NUL, CR or LF characters */
@@ -522,7 +543,7 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 	if (entry->utf8 && entry->pos == 0 && mk_wcwidth(chr) == 0)
 		return;
 
-        gui_entry_redraw_from(entry, entry->pos);
+	gui_entry_redraw_from(entry, entry->pos);
 
 	entry_text_grow(entry, 1);
 
@@ -530,9 +551,14 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 	g_memmove(entry->text + entry->pos + 1, entry->text + entry->pos,
 		  (entry->text_len-entry->pos + 1) * sizeof(unichar));
 
+	g_memmove(entry->colors + entry->pos + 1, entry->colors + entry->pos,
+	          (entry->text_len-entry->pos) * sizeof(int));
+
+
 	entry->text[entry->pos] = chr;
+	entry->colors[entry->pos] = ATTR_RESET;
 	entry->text_len++;
-        entry->pos++;
+	entry->pos++;
 
 	gui_entry_fix_cursor(entry);
 	gui_entry_draw(entry);
@@ -700,6 +726,9 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	g_memmove(entry->text + entry->pos - size, entry->text + entry->pos,
 		  (entry->text_len-entry->pos+1) * sizeof(unichar));
 
+	g_memmove(entry->colors + entry->pos - size, entry->colors + entry->pos,
+		(entry->text_len - entry->pos) * sizeof(int));
+
 	entry->pos -= size;
         entry->text_len -= size;
 
@@ -719,7 +748,10 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
 		       mk_wcwidth(entry->text[entry->pos+size]) == 0) size++;
 
 	g_memmove(entry->text + entry->pos, entry->text + entry->pos + size,
-		  (entry->text_len-entry->pos-size+1) * sizeof(unichar));
+	          (entry->text_len-entry->pos-size+1) * sizeof(unichar));
+
+	g_memmove(entry->colors + entry->pos, entry->colors + entry->pos + size,
+	          (entry->text_len-entry->pos-size) * sizeof(int));
 
 	entry->text_len -= size;
 
@@ -782,6 +814,7 @@ void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPD
 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
 {
         unichar chr;
+	int color;
 
 	if (entry->pos == 0 || entry->text_len < 2)
                 return;
@@ -794,6 +827,10 @@ void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
 	entry->text[entry->pos] = entry->text[entry->pos-1];
         entry->text[entry->pos-1] = chr;
 
+	color = entry->colors[entry->pos];
+	entry->colors[entry->pos] = entry->colors[entry->pos-1];
+	entry->colors[entry->pos-1] = color;
+
         entry->pos++;
 
 	gui_entry_redraw_from(entry, entry->pos-2);
@@ -830,31 +867,55 @@ void gui_entry_transpose_words(GUI_ENTRY_REC *entry)
 	/* do wordswap if any found */
 	if (spos1 < epos1 && epos1 < spos2 && spos2 < epos2) {
 		unichar *first, *sep, *second;
+		int *first_color, *sep_color, *second_color;
 		int i;
 
 		first  = (unichar *) g_malloc( (epos1 - spos1) * sizeof(unichar) );
 		sep    = (unichar *) g_malloc( (spos2 - epos1) * sizeof(unichar) );
 		second = (unichar *) g_malloc( (epos2 - spos2) * sizeof(unichar) );
 
-		for (i = spos1; i < epos1; i++)
+		first_color  = (int *) g_malloc( (epos1 - spos1) * sizeof(int) );
+		sep_color    = (int *) g_malloc( (spos2 - epos1) * sizeof(int) );
+		second_color = (int *) g_malloc( (epos2 - spos2) * sizeof(int) );
+
+		for (i = spos1; i < epos1; i++) {
 			first[i-spos1] = entry->text[i];
-		for (i = epos1; i < spos2; i++)
+			first_color[i-spos1] = entry->colors[i];
+		}
+		for (i = epos1; i < spos2; i++) {
 			sep[i-epos1] = entry->text[i];
-		for (i = spos2; i < epos2; i++)
+			sep_color[i-epos1] = entry->colors[i];
+		}
+		for (i = spos2; i < epos2; i++) {
 			second[i-spos2] = entry->text[i];
+			second_color[i-spos2] = entry->colors[i];
+		}
 
 		entry->pos = spos1;
-		for (i = 0; i < epos2-spos2; i++)
-			entry->text[entry->pos++] = second[i];
-		for (i = 0; i < spos2-epos1; i++)
-			entry->text[entry->pos++] = sep[i];
-		for (i = 0; i < epos1-spos1; i++)
-			entry->text[entry->pos++] = first[i];
+		for (i = 0; i < epos2-spos2; i++) {
+			entry->text[entry->pos] = second[i];
+			entry->colors[entry->pos] = second_color[i];
+			entry->pos++;
+		}
+		for (i = 0; i < spos2-epos1; i++) {
+			entry->text[entry->pos] = sep[i];
+			entry->colors[entry->pos] = sep_color[i];
+			entry->pos++;
+		}
+		for (i = 0; i < epos1-spos1; i++) {
+			entry->text[entry->pos] = first[i];
+			entry->colors[entry->pos] = first_color[i];
+			entry->pos++;
+		}
 
 		g_free(first);
 		g_free(sep);
 		g_free(second);
 
+		g_free(first_color);
+		g_free(sep_color);
+		g_free(second_color);
+
 	}
 
 	gui_entry_redraw_from(entry, spos1);
@@ -1042,3 +1103,31 @@ void gui_entry_redraw(GUI_ENTRY_REC *entry)
 	gui_entry_fix_cursor(entry);
 	gui_entry_draw(entry);
 }
+
+void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
+{
+	int i, end, update = 0;
+
+	g_return_if_fail(entry != NULL);
+
+	if (pos > entry->text_len)
+		return;
+
+	end = pos + len;
+
+	if (end > entry->text_len)
+		end = entry->text_len;
+
+	for (i = pos; i < end; i++) {
+		if (entry->colors[i] != color) {
+			entry->colors[i] = color;
+			update = 1;
+		}
+	}
+
+	if (update) {
+		gui_entry_redraw_from(entry, pos);
+		gui_entry_fix_cursor(entry);
+		gui_entry_draw(entry);
+	}
+}
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index 000c5f03..18cc5a4d 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -9,6 +9,7 @@ typedef struct {
 typedef struct {
 	int text_len, text_alloc; /* as shorts, not chars */
 	unichar *text;
+	int *colors;
 
 	GSList *kill_ring;
 
@@ -77,5 +78,6 @@ void gui_entry_move_words(GUI_ENTRY_REC *entry, int count, int to_space);
 
 void gui_entry_redraw(GUI_ENTRY_REC *entry);
 
+void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color);
 
 #endif
diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index 12732e3f..02ef6c73 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -124,6 +124,14 @@ gui_input_set(str)
 CODE:
 	gui_entry_set_text(active_entry, str);
 
+void
+gui_input_color(pos, len, color)
+	int pos
+	int len
+	int color
+CODE:
+	gui_entry_set_color(active_entry, pos, len, color);
+
 int
 gui_input_get_pos()
 CODE:

From 13b93c8c05dafd4f45ca7153ae165d6afd0ba157 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Fri, 6 Oct 2017 20:35:29 +0100
Subject: [PATCH 0753/1650] Apply changes based on review feedback

---
 src/fe-text/gui-entry.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 3e275e34..27eaa540 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -242,7 +242,6 @@ static void gui_entry_fix_cursor(GUI_ENTRY_REC *entry)
 static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 {
 	int i;
-	const int *col;
 	int xpos, end_xpos, color;
 
 	xpos = entry->xpos + entry->promptlen +
@@ -257,10 +256,9 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 	term_set_color(root_window, ATTR_RESET);
 	term_move(root_window, xpos, entry->ypos);
 
-	col = entry->scrstart + pos < entry->text_len ?
-			entry->colors + entry->scrstart + pos : 0;
-	for (i = entry->scrstart + pos; i < entry->text_len; i++, col++) {
+	for (i = entry->scrstart + pos; i < entry->text_len; i++) {
 		unichar c = entry->text[i];
+		int col = entry->colors[i];
 
 		if (entry->hidden)
 			xpos++;
@@ -274,9 +272,9 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 		if (xpos > end_xpos)
 			break;
 
-		if (*col != color) {
-			term_set_color(root_window, *col);
-			color = *col;
+		if (col != color) {
+			term_set_color(root_window, col);
+			color = col;
 		}
 
 		if (entry->hidden)
@@ -522,7 +520,7 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
 		}
 	}
 
-	for(i = 0; i < len; i++) {
+	for (i = 0; i < len; i++) {
 		entry->colors[entry->pos + i] = ATTR_RESET;
 	}
 
@@ -915,7 +913,6 @@ void gui_entry_transpose_words(GUI_ENTRY_REC *entry)
 		g_free(first_color);
 		g_free(sep_color);
 		g_free(second_color);
-
 	}
 
 	gui_entry_redraw_from(entry, spos1);
@@ -1106,7 +1103,7 @@ void gui_entry_redraw(GUI_ENTRY_REC *entry)
 
 void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
 {
-	int i, end, update = 0;
+	int i, end, update = FALSE;
 
 	g_return_if_fail(entry != NULL);
 
@@ -1121,7 +1118,7 @@ void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
 	for (i = pos; i < end; i++) {
 		if (entry->colors[i] != color) {
 			entry->colors[i] = color;
-			update = 1;
+			update = TRUE;
 		}
 	}
 

From 0f1b3873fe5b99cf8af9bc58d1a982dd5f0f66bd Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Sat, 7 Oct 2017 13:59:46 +0100
Subject: [PATCH 0754/1650] Don't accept pos<0 or len<0 in gui_entry_set_color

---
 src/fe-text/gui-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 27eaa540..bef76a96 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -1107,7 +1107,7 @@ void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
 
 	g_return_if_fail(entry != NULL);
 
-	if (pos > entry->text_len)
+	if (pos < 0 || len < 0 || pos > entry->text_len)
 		return;
 
 	end = pos + len;

From 5bae9a94c83b8ce21e21b18963db1aa43807c932 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 18 Jan 2018 12:02:29 +0100
Subject: [PATCH 0755/1650] add backwards compatible code for running tap tests

---
 utils/tap-test | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/utils/tap-test b/utils/tap-test
index 481e333e..b3ef8b04 100755
--- a/utils/tap-test
+++ b/utils/tap-test
@@ -2,4 +2,22 @@
 
 # run a GTest in tap mode. The test binary is passed as $1
 
-$1 -k --tap
+t="$1"; shift
+if ${PKG_CONFIG:-pkg-config} --atleast-version 2.40 glib-2.0; then
+exec "$t" -k --tap "$@"
+else # GTest does not support tap yet
+    (((("$t" "$@"; echo $? >&3) | ${AM_TAP_AWK:-awk} '
+{
+    if (/: /) {
+        i++
+        ok = /: OK/
+        sub(/:/, " #")
+        print (ok ? "ok " : "not ok ") i " " $0
+    } else {
+        print "# " $0
+    }
+} END {
+    print 1 ".." i
+}
+' >&4) 3>&1) | (read xs; exit $xs)) 4>&1
+fi

From 12d08f79bbec3582fe079ec5a5d0f91002f62037 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Fri, 19 Jan 2018 18:34:30 +0530
Subject: [PATCH 0756/1650] Insert colons after completing nicks preceded by a
 list of other autocompleted nicks

When pinging two people, typing `nick1<tab> nick2<tab> message` for
autocompletion will get you `nick1: nick2 message`, which is kinda
confusing.

We only insert the colon after the first autocompleted nick,
because if a nick is used in the middle of the sentence it's mentioning
the person but not targeting the message at them.

However, this breaks down when we try to ping a list of people. There
should be a colon in front of each separating the names from the
message. only having a colon at the end of the nick list works too,
but it seems like the IRC convention is to just use multiple colons.

This patch makes it so that autocompleting a nick after a list of
existing autocompleted nicks at the beginning of the message
will include a colon.
---
 src/fe-common/core/chat-completion.c | 55 +++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 97cd0565..7ecdd4a2 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -639,6 +639,59 @@ static void complete_window_nicks(GList **list, WINDOW_REC *window,
         }
 }
 
+/* Checks if a line is only nicks from autocompletion.
+   This lets us insert colons only at the beginning of a list
+   of nicks */
+static int only_nicks(const char *linestart)
+{
+	int i = 1;
+	char prev;
+
+	// at the beginning of the line
+	if (*linestart == '\0') {
+		return TRUE;
+	}
+
+	/* completion_char being a whole string introduces loads of edge cases
+	   and can't be handled generally. Skip this case; we handled the
+	   "beginning of line" case already */
+	if (completion_char[1] != '\0')
+		return FALSE;
+
+	/* This would make the completion char get inserted everywhere otherwise */
+	if (*completion_char == ' ')
+		return FALSE;
+
+	/* First ensure that the line is of the format "foo: bar: baz"
+	   we check this by ensuring each space is preceded by a colon or
+	   another space */
+	while (linestart[i] != '\0') {
+		if (linestart[i] == ' ') {
+			prev = linestart[i - 1];
+			if (prev != *completion_char && prev != ' ')
+				return FALSE;
+		}
+		i += 1;
+	}
+
+	/* There's an edge case here, if we're completing something
+	   like `foo: bar ba<tab>`, then the `linestart` line will end
+	   at "bar", and we'll miss the space. Ensure that the end
+	   of the line is a colon followed by an optional series of spaces */
+	i -= 1;
+	while (i >= 0) {
+		if (linestart[i] == ' ') {
+			i--;
+			continue;
+		} else if (linestart[i] == *completion_char) {
+			return TRUE;
+		} else {
+			break;
+		}
+	}
+	return FALSE;
+}
+
 static void sig_complete_word(GList **list, WINDOW_REC *window,
 			      const char *word, const char *linestart,
 			      int *want_space)
@@ -691,7 +744,7 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
 	} else if (channel != NULL) {
 		/* nick completion .. we could also be completing a nick
 		   after /MSG from nicks in channel */
-		const char *suffix = *linestart != '\0' ? NULL : completion_char;
+		const char *suffix = only_nicks(linestart) ? completion_char : NULL;
 		complete_window_nicks(list, window, word, suffix);
 	} else if (window->level & MSGLEVEL_MSGS) {
 		/* msgs window, complete /MSG nicks */

From d14dbbd09338f5cd8d14c1ec15bcf3c7fd43a3c7 Mon Sep 17 00:00:00 2001
From: Niklas Luokkala <niklas.luokkala@gmail.com>
Date: Wed, 24 Jan 2018 00:15:29 +0200
Subject: [PATCH 0757/1650] Add Shift-Tab completion to gui-readline

---
 src/fe-text/gui-readline.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index b3a78396..c7cf6369 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -1174,6 +1174,7 @@ void gui_readline_init(void)
 	key_bind("key", NULL, "^H", "backspace", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "^?", "backspace", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "^I", "tab", (SIGNAL_FUNC) key_combo);
+	key_bind("key", NULL, "meta2-Z", "shifttab", (SIGNAL_FUNC) key_combo);
 
         /* meta */
 	key_bind("key", NULL, "^[", "meta", (SIGNAL_FUNC) key_combo);
@@ -1280,6 +1281,7 @@ void gui_readline_init(void)
 	key_bind("send_line", "Execute the input line", "return", NULL, (SIGNAL_FUNC) key_send_line);
 	key_bind("word_completion_backward", "", NULL, NULL, (SIGNAL_FUNC) key_word_completion_backward);
 	key_bind("word_completion", "Complete the current word", "tab", NULL, (SIGNAL_FUNC) key_word_completion);
+	key_bind("word_completion_backward", "Completes the previous word", "shifttab", NULL, (SIGNAL_FUNC) key_word_completion_backward);
 	key_bind("erase_completion", "Remove the completion added by word_completion", "meta-k", NULL, (SIGNAL_FUNC) key_erase_completion);
 	key_bind("check_replaces", "Check word replaces", NULL, NULL, (SIGNAL_FUNC) key_check_replaces);
 

From 0ba1b1f2a4f0b2be6bb1077d54dda546f3db46ad Mon Sep 17 00:00:00 2001
From: Niklas Luokkala <niklas.luokkala@gmail.com>
Date: Wed, 24 Jan 2018 01:49:28 +0200
Subject: [PATCH 0758/1650] removed unnecessary repetition

---
 src/fe-text/gui-readline.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index c7cf6369..d425739d 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -1279,9 +1279,8 @@ void gui_readline_init(void)
 
         /* line transmitting */
 	key_bind("send_line", "Execute the input line", "return", NULL, (SIGNAL_FUNC) key_send_line);
-	key_bind("word_completion_backward", "", NULL, NULL, (SIGNAL_FUNC) key_word_completion_backward);
-	key_bind("word_completion", "Complete the current word", "tab", NULL, (SIGNAL_FUNC) key_word_completion);
 	key_bind("word_completion_backward", "Completes the previous word", "shifttab", NULL, (SIGNAL_FUNC) key_word_completion_backward);
+	key_bind("word_completion", "Complete the current word", "tab", NULL, (SIGNAL_FUNC) key_word_completion);
 	key_bind("erase_completion", "Remove the completion added by word_completion", "meta-k", NULL, (SIGNAL_FUNC) key_erase_completion);
 	key_bind("check_replaces", "Check word replaces", NULL, NULL, (SIGNAL_FUNC) key_check_replaces);
 

From 474ee8ee70c9ff9c69487746a9740355f38a01b2 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 7 Jan 2018 12:44:28 +0100
Subject: [PATCH 0759/1650] Address some minor stylish nits

---
 src/irc/core/irc-cap.c     | 10 +++++-----
 src/irc/core/irc-servers.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 90bffd80..95a051f0 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -81,25 +81,25 @@ static void cap_emit_signal (IRC_SERVER_REC *server, char *cmd, char *args)
 
 static gboolean parse_cap_name(char *name, char **key, char **val)
 {
+	const char *eq;
+
 	g_return_val_if_fail(name != NULL, FALSE);
 	g_return_val_if_fail(name[0] != '\0', FALSE);
 
-	const char *eq = strchr(name, '=');
+	eq = strchr(name, '=');
 	/* KEY only value */
 	if (eq == NULL) {
 		*key = g_strdup(name);
 		*val = NULL;
 		return TRUE;
-	}
 	/* Some values are in a KEY=VALUE form, parse them */
-	else if (eq[1] != '\0') {
+	} else if (eq[1] != '\0') {
 		*key = g_strndup(name, (gsize)(eq - name));
 		*val = g_strdup(eq + 1);
 		return TRUE;
-	}
 	/* If the string ends after the '=' consider the value
 	 * as invalid */
-	else {
+	} else {
 		*key = NULL;
 		*val = NULL;
 		return FALSE;
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 3b4e1a52..e154d17f 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -444,8 +444,8 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	server->cap_active = NULL;
 
 	if (server->cap_supported) {
-	    g_hash_table_destroy(server->cap_supported);
-	    server->cap_supported = NULL;
+		g_hash_table_destroy(server->cap_supported);
+		server->cap_supported = NULL;
 	}
 
 	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);

From b0b40be82e046785562fdb18dca3b1afb1b08a2b Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 24 Jan 2018 10:47:40 +0100
Subject: [PATCH 0760/1650] Deprecate gslist_remove_string

It is not used anymore and it leaks memory.
---
 src/core/misc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/misc.h b/src/core/misc.h
index 689cf5c2..a46a1432 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -21,7 +21,7 @@ GSList *gslist_find_string(GSList *list, const char *key);
 GSList *gslist_find_icase_string(GSList *list, const char *key);
 GList *glist_find_string(GList *list, const char *key);
 GList *glist_find_icase_string(GList *list, const char *key);
-GSList *gslist_remove_string (GSList *list, const char *str);
+GSList *gslist_remove_string (GSList *list, const char *str) G_GNUC_DEPRECATED;
 GSList *gslist_delete_string (GSList *list, const char *str, GDestroyNotify free_func);
 
 void gslist_free_full (GSList *list, GDestroyNotify free_func);

From 260733475c2b701c35024a3b4fbe900751b45341 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 24 Jan 2018 10:55:20 +0100
Subject: [PATCH 0761/1650] Accept CAPs with an empty value (KEY=)

---
 src/irc/core/irc-cap.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 95a051f0..dd720841 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -91,19 +91,13 @@ static gboolean parse_cap_name(char *name, char **key, char **val)
 	if (eq == NULL) {
 		*key = g_strdup(name);
 		*val = NULL;
-		return TRUE;
 	/* Some values are in a KEY=VALUE form, parse them */
-	} else if (eq[1] != '\0') {
+	} else {
 		*key = g_strndup(name, (gsize)(eq - name));
 		*val = g_strdup(eq + 1);
-		return TRUE;
-	/* If the string ends after the '=' consider the value
-	 * as invalid */
-	} else {
-		*key = NULL;
-		*val = NULL;
-		return FALSE;
 	}
+
+	return TRUE;
 }
 
 static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *address)

From 6dfe5bc8361dab212653f19d611286ac93a32638 Mon Sep 17 00:00:00 2001
From: Niklas Luokkala <niklas.luokkala@gmail.com>
Date: Wed, 24 Jan 2018 22:12:09 +0200
Subject: [PATCH 0762/1650] modified gui-readline based on the suggestions made
 to the pull request

---
 src/fe-text/gui-readline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index d425739d..88e827a7 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -1174,7 +1174,7 @@ void gui_readline_init(void)
 	key_bind("key", NULL, "^H", "backspace", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "^?", "backspace", (SIGNAL_FUNC) key_combo);
 	key_bind("key", NULL, "^I", "tab", (SIGNAL_FUNC) key_combo);
-	key_bind("key", NULL, "meta2-Z", "shifttab", (SIGNAL_FUNC) key_combo);
+	key_bind("key", NULL, "meta2-Z", "stab", (SIGNAL_FUNC) key_combo);
 
         /* meta */
 	key_bind("key", NULL, "^[", "meta", (SIGNAL_FUNC) key_combo);
@@ -1279,7 +1279,7 @@ void gui_readline_init(void)
 
         /* line transmitting */
 	key_bind("send_line", "Execute the input line", "return", NULL, (SIGNAL_FUNC) key_send_line);
-	key_bind("word_completion_backward", "Completes the previous word", "shifttab", NULL, (SIGNAL_FUNC) key_word_completion_backward);
+	key_bind("word_completion_backward", "Choose previous completion suggestion", "stab", NULL, (SIGNAL_FUNC) key_word_completion_backward);
 	key_bind("word_completion", "Complete the current word", "tab", NULL, (SIGNAL_FUNC) key_word_completion);
 	key_bind("erase_completion", "Remove the completion added by word_completion", "meta-k", NULL, (SIGNAL_FUNC) key_erase_completion);
 	key_bind("check_replaces", "Check word replaces", NULL, NULL, (SIGNAL_FUNC) key_check_replaces);

From f5aa829bd084d279f9ae7eb27a52ea674adfed5d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Thu, 25 Jan 2018 15:01:34 +0100
Subject: [PATCH 0763/1650] Do not use X509_STORE on OpenSSL < 1.0.2

---
 src/core/network-openssl.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index c7ce4b43..9e15d5c7 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -46,6 +46,7 @@
 #endif
 
 /* OpenSSL 1.1.0 also introduced some useful additions to the api */
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
 static int X509_STORE_up_ref(X509_STORE *vfy)
 {
@@ -57,6 +58,7 @@ static int X509_STORE_up_ref(X509_STORE *vfy)
     return (n > 1) ? 1 : 0;
 }
 #endif
+#endif
 
 /* ssl i/o channel object */
 typedef struct
@@ -72,7 +74,10 @@ typedef struct
 } GIOSSLChannel;
 
 static int ssl_inited = FALSE;
+/* https://github.com/irssi/irssi/issues/820 */
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
 static X509_STORE *store = NULL;
+#endif
 
 static void irssi_ssl_free(GIOChannel *handle)
 {
@@ -391,6 +396,8 @@ gboolean irssi_ssl_init(void)
 	SSL_load_error_strings();
 	OpenSSL_add_all_algorithms();
 #endif
+
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
 	store = X509_STORE_new();
 	if (store == NULL) {
 		g_error("Could not initialize OpenSSL: X509_STORE_new() failed");
@@ -404,6 +411,9 @@ gboolean irssi_ssl_init(void)
 		store = NULL;
 		/* Don't return an error; the user might have their own cafile/capath. */
 	}
+#else
+	success = success = TRUE;
+#endif
 
 	ssl_inited = TRUE;
 
@@ -522,13 +532,21 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 		g_free(scafile);
 		g_free(scapath);
 		verify = TRUE;
-	} else if (store != NULL) {
+	}
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
+	  else if (store != NULL) {
 		/* Make sure to increment the refcount every time the store is
 		 * used, that's essential not to get it free'd by OpenSSL when
 		 * the SSL_CTX is destroyed. */
 		X509_STORE_up_ref(store);
 		SSL_CTX_set_cert_store(ctx, store);
 	}
+#else
+	  else {
+		if (!SSL_CTX_set_default_verify_paths(ctx))
+			g_warning("Could not load default certificates");
+	}
+#endif
 
 	if(!(ssl = SSL_new(ctx)))
 	{

From af087e110373090e65184aebc3515555f64f4a33 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Thu, 25 Jan 2018 15:08:26 +0100
Subject: [PATCH 0764/1650] fix sequence error

---
 src/core/network-openssl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 9e15d5c7..9fddf073 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -384,7 +384,9 @@ static GIOFuncs irssi_ssl_channel_funcs = {
 
 gboolean irssi_ssl_init(void)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
 	int success;
+#endif
 
 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
 	if (!OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT, NULL)) {
@@ -411,8 +413,6 @@ gboolean irssi_ssl_init(void)
 		store = NULL;
 		/* Don't return an error; the user might have their own cafile/capath. */
 	}
-#else
-	success = success = TRUE;
 #endif
 
 	ssl_inited = TRUE;

From e91da9e4098e449dc36eaa15354aff67650e7703 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 25 Jan 2018 16:05:47 +0100
Subject: [PATCH 0765/1650] please give us nicks

---
 src/fe-common/core/chat-completion.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 97cd0565..c62d760d 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -173,6 +173,7 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 {
 	CHANNEL_REC *channel;
         int own;
+	g_return_if_fail(nick != NULL);
 
 	channel = channel_find(server, target);
 	if (channel != NULL) {
@@ -185,6 +186,7 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
 			     const char *nick, const char *address)
 {
 	CHANNEL_REC *chanrec;
+	g_return_if_fail(nick != NULL);
 
 	chanrec = channel_find(server, channel);
 	if (chanrec != NULL)

From 0909d47e5b5ab08cd07970a374e311f7f54be547 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 25 Jan 2018 16:10:21 +0100
Subject: [PATCH 0766/1650] Check that server is still existent when using
 /oper

---
 src/fe-common/irc/fe-irc-commands.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index 11a911d2..7a6b17a6 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -345,16 +345,18 @@ static void cmd_ts(const char *data)
 }
 
 typedef struct {
-	IRC_SERVER_REC *server;
+	char *server_tag;
 	char *nick;
 } OPER_PASS_REC;
 
 static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec)
 {
-        if (*password != '\0')
-		irc_send_cmdv(rec->server, "OPER %s %s", rec->nick, password);
+	SERVER_REC *server_rec = server_find_tag(rec->server_tag);
+	if (*password != '\0' && IS_IRC_SERVER(server_rec))
+		irc_send_cmdv((IRC_SERVER_REC *) server_rec, "OPER %s %s", rec->nick, password);
 	g_free(rec->nick);
-        g_free(rec);
+	g_free(rec->server_tag);
+	g_free(rec);
 }
 
 static void cmd_oper(const char *data, IRC_SERVER_REC *server)
@@ -374,7 +376,7 @@ static void cmd_oper(const char *data, IRC_SERVER_REC *server)
 		OPER_PASS_REC *rec;
 
 		rec = g_new(OPER_PASS_REC, 1);
-		rec->server = server;
+		rec->server_tag = g_strdup(server->tag);
 		rec->nick = g_strdup(*nick != '\0' ? nick : server->nick);
 
 		format = format_get_text(MODULE_NAME, NULL, server, NULL,

From a4f99ae746efb121185fe76c392a64d743a9eb92 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 20 Jan 2018 19:58:05 -0300
Subject: [PATCH 0767/1650] Revert more of the netsplit print optimisation to
 fix crashes

Now iterating over all servers to avoid crashes on server_ischannel(),
which is a macro for server->ischannel(), so it dies horribly when it's
null. Doesn't help that IS_IRC_SERVER() always returns true on null.
---
 src/fe-common/irc/fe-netjoin.c  | 16 +++++++---------
 src/fe-common/irc/fe-netsplit.c | 15 ++++++---------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index bc39b27c..a7a2e4fe 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -245,20 +245,18 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channe
    message before it. */
 static void sig_print_starting(TEXT_DEST_REC *dest)
 {
-	NETJOIN_SERVER_REC *rec;
+	GSList *tmp, *next;
 
 	if (printing_joins)
 		return;
 
-	if (!IS_IRC_SERVER(dest->server))
-		return;
+	for (tmp = joinservers; tmp != NULL; tmp = next) {
+		NETJOIN_SERVER_REC *server = tmp->data;
 
-	if (!server_ischannel(dest->server, dest->target))
-		return;
-
-	rec = netjoin_find_server(IRC_SERVER(dest->server));
-	if (rec != NULL && rec->netjoins != NULL)
-		print_netjoins(rec, NULL);
+		next = tmp->next;
+		if (server->netjoins != NULL)
+			print_netjoins(server, NULL);
+	}
 }
 
 static int sig_check_netjoins(void)
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index ac3330e5..edd3fc34 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -247,20 +247,17 @@ static int check_server_splits(IRC_SERVER_REC *server)
    message before it. */
 static void sig_print_starting(TEXT_DEST_REC *dest)
 {
-	IRC_SERVER_REC *rec;
+	GSList *tmp;
 
 	if (printing_splits)
 		return;
 
-	if (!IS_IRC_SERVER(dest->server))
-		return;
+	for (tmp = servers; tmp != NULL; tmp = tmp->next) {
+		IRC_SERVER_REC *rec = tmp->data;
 
-	if (!server_ischannel(dest->server, dest->target))
-		return;
-
-	rec = IRC_SERVER(dest->server);
-	if (rec->split_servers != NULL)
-		print_splits(rec, NULL);
+		if (IS_IRC_SERVER(rec) && rec->split_servers != NULL)
+			print_splits(rec, NULL);
+	}
 }
 
 static int sig_check_splits(void)

From 126189bb374d436280885f0f878a5075feed2fbc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 25 Jan 2018 15:54:20 +0100
Subject: [PATCH 0768/1650] we probably should not try to replace replaces

Credit to OSS-Fuzz
---
 src/fe-common/core/themes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index cb1cce8f..6692985b 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -130,7 +130,7 @@ static char *theme_replace_expand(THEME_REC *theme, int index,
 	abstract = rec->data;
 	abstract = theme_format_expand_data(theme, (const char **) &abstract,
 					    default_fg, default_bg,
-					    last_fg, last_bg, flags);
+					    last_fg, last_bg, (flags | EXPAND_FLAG_IGNORE_REPLACES));
 	ret = parse_special_string(abstract, NULL, NULL, data, NULL,
 				   PARSE_FLAG_ONLY_ARGS);
 	g_free(abstract);

From 7f4de37fbfc3a052f46619b629d7a2ea8b03ebb3 Mon Sep 17 00:00:00 2001
From: William Jackson <william@subtlecoolness.com>
Date: Tue, 30 Jan 2018 10:31:13 -0600
Subject: [PATCH 0769/1650] Fix typo in help text for /ISON command

---
 docs/help/in/ison.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/ison.in b/docs/help/in/ison.in
index c77e4c59..e9e54ee9 100644
--- a/docs/help/in/ison.in
+++ b/docs/help/in/ison.in
@@ -16,5 +16,5 @@
     /ISON mike
     /ISON sarah bob
 
-%9See also:%9 NOTIFY, WHOAS, WHOIS
+%9See also:%9 NOTIFY, WHOWAS, WHOIS
 

From 12360fb2c06b8f11db6a7348426851fac8de8a93 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 1 Feb 2018 10:21:31 +0100
Subject: [PATCH 0770/1650] protect theme recursion

---
 src/fe-common/core/themes.c | 54 ++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 6692985b..99dc90bc 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -400,12 +400,15 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format)
         return ret;
 }
 
+static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
+                                          theme_rm_col default_fg, theme_rm_col default_bg,
+                                          theme_rm_col *save_last_fg, theme_rm_col *save_last_bg,
+                                          int flags, GTree *block_list);
+
 /* expand a single {abstract ...data... } */
-static char *theme_format_expand_abstract(THEME_REC *theme,
-					  const char **formatp,
-					  theme_rm_col *last_fg,
-					  theme_rm_col *last_bg,
-					  int flags)
+static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp,
+                                          theme_rm_col *last_fg, theme_rm_col *last_bg, int flags,
+                                          GTree *block_list)
 {
 	GString *str;
 	const char *p, *format;
@@ -439,12 +442,20 @@ static char *theme_format_expand_abstract(THEME_REC *theme,
 	}
 	*formatp = format+len;
 
+	if (block_list == NULL) {
+		block_list = g_tree_new_full((GCompareDataFunc) g_strcmp0, NULL, g_free, NULL);
+	} else {
+		g_tree_ref(block_list);
+	}
+
 	/* get the abstract data */
 	data = g_hash_table_lookup(theme->abstracts, abstract);
-	g_free(abstract);
-	if (data == NULL) {
+	if (data == NULL || g_tree_lookup(block_list, abstract) != NULL) {
 		/* unknown abstract, just display the data */
 		data = "$0-";
+		g_free(abstract);
+	} else {
+		g_tree_insert(block_list, abstract, abstract);
 	}
 	abstract = g_strdup(data);
 
@@ -488,18 +499,17 @@ static char *theme_format_expand_abstract(THEME_REC *theme,
 
 	/* abstract may itself contain abstracts or replaces */
 	p = abstract;
-	ret = theme_format_expand_data(theme, &p, default_fg, default_bg,
-				       last_fg, last_bg,
-				       flags | EXPAND_FLAG_LASTCOLOR_ARG);
+	ret = theme_format_expand_data_rec(theme, &p, default_fg, default_bg, last_fg, last_bg,
+	                                   flags | EXPAND_FLAG_LASTCOLOR_ARG, block_list);
 	g_free(abstract);
+	g_tree_unref(block_list);
 	return ret;
 }
 
-/* expand the data part in {abstract data} */
-char *theme_format_expand_data(THEME_REC *theme, const char **format,
-			       theme_rm_col default_fg, theme_rm_col default_bg,
-			       theme_rm_col *save_last_fg, theme_rm_col *save_last_bg,
-			       int flags)
+static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
+                                          theme_rm_col default_fg, theme_rm_col default_bg,
+                                          theme_rm_col *save_last_fg, theme_rm_col *save_last_bg,
+                                          int flags, GTree *block_list)
 {
 	GString *str;
 	char *ret, *abstract;
@@ -545,9 +555,8 @@ char *theme_format_expand_data(THEME_REC *theme, const char **format,
 			break; /* error */
 
 		/* get a single {...} */
-		abstract = theme_format_expand_abstract(theme, format,
-							&last_fg, &last_bg,
-							recurse_flags);
+		abstract = theme_format_expand_abstract(theme, format, &last_fg, &last_bg,
+		                                        recurse_flags, block_list);
 		if (abstract != NULL) {
 			g_string_append(str, abstract);
 			g_free(abstract);
@@ -565,6 +574,15 @@ char *theme_format_expand_data(THEME_REC *theme, const char **format,
         return ret;
 }
 
+/* expand the data part in {abstract data} */
+char *theme_format_expand_data(THEME_REC *theme, const char **format, theme_rm_col default_fg,
+                               theme_rm_col default_bg, theme_rm_col *save_last_fg,
+                               theme_rm_col *save_last_bg, int flags)
+{
+	return theme_format_expand_data_rec(theme, format, default_fg, default_bg, save_last_bg,
+	                                    save_last_bg, flags, NULL);
+}
+
 #define IS_OLD_FORMAT(code, last_fg, last_bg) \
 	(((code) == 'n' && (last_fg) == 'n' && (last_bg) == 'n') || \
 	((code) != 'n' && ((code) == (last_fg) || (code) == (last_bg))))

From 4c662acf957502af186aa631d185d6edca709e15 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 1 Feb 2018 13:52:12 +0100
Subject: [PATCH 0771/1650] another replaces fix

Credit to OSS-Fuzz
---
 src/fe-common/core/themes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 99dc90bc..acb5d1c7 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -382,7 +382,8 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format)
 		} else {
 			theme_format_append_next(theme, str, format,
 						 reset, reset,
-						 &dummy, &dummy, 0);
+						 &dummy, &dummy,
+						 EXPAND_FLAG_IGNORE_REPLACES);
 			continue;
 		}
 

From f0bd434eb0b0fbeaecc10c3cc355100fbf90947a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 2 Feb 2018 09:50:08 +0100
Subject: [PATCH 0772/1650] stop the madness

---
 src/fe-text/mainwindows.c | 83 ++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 5f24674f..fd4603da 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -915,6 +915,8 @@ static int try_shrink_lower(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
+	g_return_val_if_fail(count >= 0, FALSE);
+
 	shrink_win = mainwindows_find_lower(window);
 	if (shrink_win != NULL) {
 		int ok;
@@ -959,6 +961,8 @@ static int try_shrink_upper(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
+	g_return_val_if_fail(count >= 0, FALSE);
+
 	shrink_win = mainwindows_find_upper(window);
 	if (shrink_win != NULL) {
 		int ok;
@@ -1063,6 +1067,8 @@ static int try_grow_upper(MAIN_WINDOW_REC *window, int count)
 
 static int mainwindow_shrink(MAIN_WINDOW_REC *window, int count, int resize_lower)
 {
+	g_return_val_if_fail(count >= 0, FALSE);
+
 	if (MAIN_WINDOW_TEXT_HEIGHT(window)-count < WINDOW_MIN_SIZE)
                 return FALSE;
 
@@ -1091,6 +1097,8 @@ static int try_rshrink_right(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
+	g_return_val_if_fail(count >= 0, FALSE);
+
 	shrink_win = mainwindows_find_right(window, FALSE);
 	if (shrink_win != NULL) {
 		if (MAIN_WINDOW_TEXT_WIDTH(shrink_win)-count < NEW_WINDOW_WIDTH) {
@@ -1111,6 +1119,8 @@ static int try_rshrink_left(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
+	g_return_val_if_fail(count >= 0, FALSE);
+
 	shrink_win = mainwindows_find_left(window, FALSE);
 	if (shrink_win != NULL) {
 		if (MAIN_WINDOW_TEXT_WIDTH(shrink_win)-count < NEW_WINDOW_WIDTH) {
@@ -1168,6 +1178,8 @@ static int try_rgrow_left(MAIN_WINDOW_REC *window, int count)
 
 static int mainwindow_rshrink(MAIN_WINDOW_REC *window, int count)
 {
+	g_return_val_if_fail(count >= 0, FALSE);
+
 	if (MAIN_WINDOW_TEXT_WIDTH(window)-count < NEW_WINDOW_WIDTH)
 		return FALSE;
 
@@ -1220,19 +1232,29 @@ void mainwindows_redraw_dirty(void)
 	}
 }
 
+static void mainwindow_grow_int(int count)
+{
+	if (count == 0) {
+		return;
+	} else if (count < 0) {
+		if (!mainwindow_shrink(WINDOW_MAIN(active_win), -count, FALSE)) {
+			printformat_window(active_win, MSGLEVEL_CLIENTNOTICE, TXT_WINDOW_TOO_SMALL);
+		}
+	} else {
+		if (!mainwindow_grow(WINDOW_MAIN(active_win), count, FALSE)) {
+			printformat_window(active_win, MSGLEVEL_CLIENTNOTICE, TXT_WINDOW_TOO_SMALL);
+		}
+	}
+}
+
 /* SYNTAX: WINDOW GROW [<lines>] */
 static void cmd_window_grow(const char *data)
 {
-	MAIN_WINDOW_REC *window;
 	int count;
 
 	count = *data == '\0' ? 1 : atoi(data);
-	window = WINDOW_MAIN(active_win);
 
-	if (!mainwindow_grow(window, count, FALSE)) {
-		printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
-				   TXT_WINDOW_TOO_SMALL);
-	}
+	mainwindow_grow_int(count);
 }
 
 /* SYNTAX: WINDOW SHRINK [<lines>] */
@@ -1241,16 +1263,13 @@ static void cmd_window_shrink(const char *data)
 	int count;
 
 	count = *data == '\0' ? 1 : atoi(data);
-	if (!mainwindow_shrink(WINDOW_MAIN(active_win), count, FALSE)) {
-		printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
-				   TXT_WINDOW_TOO_SMALL);
-	}
+
+	mainwindow_grow_int(-count);
 }
 
 /* SYNTAX: WINDOW SIZE <lines> */
 static void cmd_window_size(const char *data)
 {
-        char sizestr[MAX_INT_STRLEN];
 	int size;
 
 	if (!is_numeric(data, 0)) return;
@@ -1258,13 +1277,8 @@ static void cmd_window_size(const char *data)
 
 	size -= WINDOW_MAIN(active_win)->height -
 		WINDOW_MAIN(active_win)->statusbar_lines;
-	if (size == 0) return;
 
-	ltoa(sizestr, size < 0 ? -size : size);
-	if (size < 0)
-		cmd_window_shrink(sizestr);
-	else
-		cmd_window_grow(sizestr);
+	mainwindow_grow_int(size);
 }
 
 /* SYNTAX: WINDOW BALANCE */
@@ -1415,16 +1429,29 @@ static void cmd_window_rshow(const char *data)
 	_cmd_window_show_opt(data, TRUE);
 }
 
+static void window_rgrow_int(int count)
+{
+	if (count == 0) {
+		return;
+	} else if (count < 0) {
+		if (!mainwindow_rshrink(WINDOW_MAIN(active_win), -count)) {
+			printformat_window(active_win, MSGLEVEL_CLIENTNOTICE, TXT_WINDOW_TOO_SMALL);
+		}
+	} else {
+		if (!mainwindow_rgrow(WINDOW_MAIN(active_win), count)) {
+			printformat_window(active_win, MSGLEVEL_CLIENTNOTICE, TXT_WINDOW_TOO_SMALL);
+		}
+	}
+}
+
 /* SYNTAX: WINDOW RGROW [<columns>] */
 static void cmd_window_rgrow(const char *data)
 {
 	int count;
 
 	count = *data == '\0' ? 1 : atoi(data);
-	if (!mainwindow_rgrow(WINDOW_MAIN(active_win), count)) {
-		printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
-				   TXT_WINDOW_TOO_SMALL);
-	}
+
+	window_rgrow_int(count);
 }
 
 /* SYNTAX: WINDOW RSHRINK [<lines>] */
@@ -1433,29 +1460,21 @@ static void cmd_window_rshrink(const char *data)
 	int count;
 
 	count = *data == '\0' ? 1 : atoi(data);
-	if (!mainwindow_rshrink(WINDOW_MAIN(active_win), count)) {
-		printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
-				   TXT_WINDOW_TOO_SMALL);
-	}
+
+	window_rgrow_int(-count);
 }
 
 /* SYNTAX: WINDOW RSIZE <columns> */
 static void cmd_window_rsize(const char *data)
 {
-	char rsizestr[MAX_INT_STRLEN];
 	int rsize;
 
 	if (!is_numeric(data, 0)) return;
 	rsize = atoi(data);
 
 	rsize -= MAIN_WINDOW_TEXT_WIDTH(WINDOW_MAIN(active_win));
-	if (rsize == 0) return;
 
-	ltoa(rsizestr, rsize < 0 ? -rsize : rsize);
-	if (rsize < 0)
-		cmd_window_rshrink(rsizestr);
-	else
-		cmd_window_rgrow(rsizestr);
+	window_rgrow_int(rsize);
 }
 
 /* SYNTAX: WINDOW RBALANCE */

From 5b5bfef03596d95079c728f65f523570dd7b03aa Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 2 Feb 2018 10:05:37 +0100
Subject: [PATCH 0773/1650] check the error condition of mainwindow_create

---
 src/fe-text/mainwindows.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 5f24674f..0c77bcf1 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1393,6 +1393,11 @@ static void _cmd_window_show_opt(const char *data, int right)
 	}
 
 	parent = mainwindow_create(right);
+	if (parent == NULL) {
+		printformat_window(active_win, MSGLEVEL_CLIENTERROR, TXT_WINDOW_TOO_SMALL);
+		return;
+	}
+
 	parent->active = window;
 	gui_window_reparent(window, parent);
 

From 84f03e01467b90a4251987b32b2813ee976b357c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 2 Feb 2018 10:27:51 +0100
Subject: [PATCH 0774/1650] do not reuse sasl timeout

---
 src/irc/core/sasl.c | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 2b589579..c5aa2caa 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -55,10 +55,21 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
 	return FALSE;
 }
 
+static void sasl_timeout_stop(IRC_SERVER_REC *server)
+{
+	/* Stop any pending timeout, if any */
+	if (server->sasl_timeout != 0) {
+		g_source_remove(server->sasl_timeout);
+		server->sasl_timeout = 0;
+	}
+}
+
 static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *from)
 {
 	IRC_SERVER_CONNECT_REC *conn;
 
+	sasl_timeout_stop(server);
+
 	conn = server->connrec;
 
 	switch (conn->sasl_mechanism) {
@@ -77,11 +88,6 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 {
 	char *params, *error;
 
-	/* Stop any pending timeout, if any */
-	if (server->sasl_timeout != 0) {
-		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = 0;
-	}
 
 	params = event_get_params(data, 2, NULL, &error);
 
@@ -97,10 +103,7 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 
 static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	if (server->sasl_timeout != 0) {
-		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = 0;
-	}
+	sasl_timeout_stop(server);
 
 	server->sasl_success = TRUE;
 
@@ -112,10 +115,7 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
 
 static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
 {
-	if (server->sasl_timeout != 0) {
-		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = 0;
-	}
+	sasl_timeout_stop(server);
 
 	server->sasl_success = TRUE;
 
@@ -265,7 +265,7 @@ static void sasl_step_fail(IRC_SERVER_REC *server)
 	irc_send_cmd_now(server, "AUTHENTICATE *");
 	cap_finish_negotiation(server);
 
-	server->sasl_timeout = 0;
+	sasl_timeout_stop(server);
 
 	signal_emit("server sasl failure", 2, server, "The server sent an invalid payload");
 }
@@ -274,11 +274,7 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
 {
 	GString *req = NULL;
 
-	/* Stop the timer */
-	if (server->sasl_timeout != 0) {
-		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = 0;
-	}
+	sasl_timeout_stop(server);
 
 	if (!sasl_reassemble_incoming(server, data, &req)) {
 		sasl_step_fail(server);
@@ -302,10 +298,7 @@ static void sasl_disconnected(IRC_SERVER_REC *server)
 		return;
 	}
 
-	if (server->sasl_timeout != 0) {
-		g_source_remove(server->sasl_timeout);
-		server->sasl_timeout = 0;
-	}
+	sasl_timeout_stop(server);
 }
 
 void sasl_init(void)

From 9072e988194a36186bd98db844b8285e3f37069a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 10 Jan 2018 17:49:32 +0100
Subject: [PATCH 0775/1650] change color -> extents (malloc based)

---
 src/fe-text/gui-entry.c   | 566 +++++++++++++++++++++++++++++++-------
 src/fe-text/gui-entry.h   |  13 +-
 src/fe-text/irssi.c       |   2 +
 src/perl/textui/TextUI.xs |  66 ++++-
 4 files changed, 543 insertions(+), 104 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index bef76a96..52a39969 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -65,8 +65,10 @@ static void entry_text_grow(GUI_ENTRY_REC *entry, int grow_size)
 	entry->text_alloc = nearest_power(entry->text_alloc+grow_size);
 	entry->text = g_realloc(entry->text,
 				sizeof(unichar) * entry->text_alloc);
-	entry->colors = g_realloc(entry->colors,
-	                        sizeof(int) * entry->text_alloc);
+
+	if (entry->uses_extents)
+		entry->extents = g_realloc(entry->extents,
+				   sizeof(char *) * entry->text_alloc);
 }
 
 GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
@@ -79,12 +81,27 @@ GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
 	rec->width = width;
 	rec->text_alloc = 1024;
 	rec->text = g_new(unichar, rec->text_alloc);
-	rec->colors = g_new(int, rec->text_alloc);
+	rec->extents = NULL;
 	rec->text[0] = '\0';
 	rec->utf8 = utf8;
 	return rec;
 }
 
+static void destroy_extents(GUI_ENTRY_REC *entry)
+{
+	if (entry->uses_extents) {
+		int i;
+		for (i = 0; i < entry->text_alloc; i++) {
+			if (entry->extents[i] != NULL) {
+				g_free(entry->extents[i]);
+			}
+		}
+	}
+	g_free(entry->extents);
+	entry->extents = NULL;
+	entry->uses_extents = FALSE;
+}
+
 void gui_entry_destroy(GUI_ENTRY_REC *entry)
 {
 	GSList *tmp;
@@ -103,8 +120,8 @@ void gui_entry_destroy(GUI_ENTRY_REC *entry)
 	}
 	g_slist_free(entry->kill_ring);
 
+	destroy_extents(entry);
 	g_free(entry->text);
-	g_free(entry->colors);
 	g_free(entry->prompt);
 	g_free(entry);
 }
@@ -168,15 +185,36 @@ void big5_to_unichars(const char *str, unichar *out)
 	*out = '\0';
 }
 
+/* Return screen length of plain string */
+static int scrlen_str(const char *str, int utf8)
+{
+	int len = 0;
+	char *stripped;
+	g_return_val_if_fail(str != NULL, 0);
+
+	stripped = strip_codes(str);
+	len = string_width(stripped, utf8 ? TREAT_STRING_AS_UTF8 : TREAT_STRING_AS_BYTES);
+	g_free(stripped);
+	return len;
+}
+
 /* ----------------------------- */
 
-static int pos2scrpos(GUI_ENTRY_REC *entry, int pos)
+static int pos2scrpos(GUI_ENTRY_REC *entry, int pos, int cursor)
 {
 	int i;
 	int xpos = 0;
 
+	if (!cursor && pos <= 0)
+		return 0;
+
+	if (entry->uses_extents && entry->extents[0] != NULL) {
+		xpos += scrlen_str(entry->extents[0], entry->utf8);
+	}
+
 	for (i = 0; i < pos; i++) {
 		unichar c = entry->text[i];
+		const char *extent = entry->uses_extents ? entry->extents[i+1] : NULL;
 
 		if (term_type == TERM_TYPE_BIG5)
 			xpos += big5_width(c);
@@ -184,16 +222,26 @@ static int pos2scrpos(GUI_ENTRY_REC *entry, int pos)
 			xpos += unichar_isprint(c) ? mk_wcwidth(c) : 1;
 		else
 			xpos++;
+
+		if (extent != NULL) {
+			xpos += scrlen_str(extent, entry->utf8);
+		}
+
 	}
 	return xpos;
 }
 
 static int scrpos2pos(GUI_ENTRY_REC *entry, int pos)
 {
-	int i, width, xpos;
+	int i, width, xpos = 0;
 
-	for (i = 0, xpos = 0; i < entry->text_len; i++) {
+	if (entry->uses_extents && entry->extents[0] != NULL) {
+		xpos += scrlen_str(entry->extents[0], entry->utf8);
+	}
+
+	for (i = 0; i < entry->text_len && xpos < pos; i++) {
 		unichar c = entry->text[i];
+		const char *extent = entry->uses_extents ? entry->extents[i+1] : NULL;
 
 		if (term_type == TERM_TYPE_BIG5)
 			width = big5_width(c);
@@ -202,15 +250,13 @@ static int scrpos2pos(GUI_ENTRY_REC *entry, int pos)
 		else
 			width = 1;
 
-		if (xpos + width > pos)
-			break;
 		xpos += width;
-	}
 
-	if (xpos == pos)
-		return i;
-	else
-		return i-1;
+		if (extent != NULL) {
+			xpos += scrlen_str(extent, entry->utf8);
+		}
+	}
+	return i;
 }
 
 /* Fixes the cursor position in screen */
@@ -219,19 +265,19 @@ static void gui_entry_fix_cursor(GUI_ENTRY_REC *entry)
 	int old_scrstart;
 
 	/* assume prompt len == prompt scrlen */
-	int start = pos2scrpos(entry, entry->scrstart);
-	int now = pos2scrpos(entry, entry->pos);
+	int start = pos2scrpos(entry, entry->scrstart, FALSE);
+	int now = pos2scrpos(entry, entry->pos, TRUE);
 
 	old_scrstart = entry->scrstart;
-	if (now-start < entry->width - 2 - entry->promptlen && now-start > 0)
+	if (now-start < entry->width - 2 - entry->promptlen && now-start > 0) {
 		entry->scrpos = now-start;
-	else if (now < entry->width - 1 - entry->promptlen) {
+	} else if (now < entry->width - 1 - entry->promptlen) {
 		entry->scrstart = 0;
 		entry->scrpos = now;
 	} else {
 		entry->scrstart = scrpos2pos(entry, now-(entry->width -
 							 entry->promptlen)*2/3);
-		start = pos2scrpos(entry, entry->scrstart);
+		start = pos2scrpos(entry, entry->scrstart, FALSE);
 		entry->scrpos = now - start;
 	}
 
@@ -239,66 +285,140 @@ static void gui_entry_fix_cursor(GUI_ENTRY_REC *entry)
                 entry->redraw_needed_from = 0;
 }
 
+static char *text_effects_only(const char *p)
+{
+	GString *str;
+
+	str = g_string_sized_new(strlen(p));
+	for (; *p != '\0'; p++) {
+		if (*p == 4 && p[1] != '\0') {
+			if (p[1] >= FORMAT_STYLE_SPECIAL) {
+				g_string_append_len(str, p, 2);
+				p++;
+				continue;
+			}
+
+			/* irssi color */
+			if (p[2] != '\0') {
+#ifdef TERM_TRUECOLOR
+				if (p[1] == FORMAT_COLOR_24) {
+					if (p[3] == '\0') p += 2;
+					else if (p[4] == '\0') p += 3;
+					else if (p[5] == '\0') p += 4;
+					else {
+						g_string_append_len(str, p, 6);
+						p += 5;
+					}
+				} else {
+#endif /* TERM_TRUECOLOR */
+					g_string_append_len(str, p, 3);
+					p += 2;
+#ifdef TERM_TRUECOLOR
+				}
+#endif /* TERM_TRUECOLOR */
+				continue;
+			}
+		}
+	}
+
+	return g_string_free(str, FALSE);
+}
+
 static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 {
-	int i;
-	int xpos, end_xpos, color;
+	int i, start;
+	int start_xpos, xpos, new_xpos, end_xpos;
+	char *tmp;
+	GString *str;
 
-	xpos = entry->xpos + entry->promptlen +
-		pos2scrpos(entry, pos + entry->scrstart) -
-		pos2scrpos(entry, entry->scrstart);
+	start = entry->scrstart + pos;
+
+	start_xpos = xpos = entry->xpos + entry->promptlen +
+		pos2scrpos(entry, start, FALSE) -
+		pos2scrpos(entry, entry->scrstart, FALSE);
         end_xpos = entry->xpos + entry->width;
 
 	if (xpos > end_xpos)
                 return;
 
-	color = ATTR_RESET;
-	term_set_color(root_window, ATTR_RESET);
-	term_move(root_window, xpos, entry->ypos);
+	str = g_string_sized_new(entry->text_alloc);
 
-	for (i = entry->scrstart + pos; i < entry->text_len; i++) {
+	term_set_color(root_window, ATTR_RESET);
+	/* term_move(root_window, xpos, entry->ypos); */
+
+	if (entry->uses_extents && entry->extents[0] != NULL) {
+		g_string_append(str, entry->extents[0]);
+	}
+	for (i = 0; i < start && i < entry->text_len; i++) {
+		const char *extent = entry->uses_extents ? entry->extents[i+1] : NULL;
+		if (extent != NULL) {
+			g_string_append(str, extent);
+		}
+	}
+	if (i == 0) {
+		xpos += scrlen_str(str->str, entry->utf8);
+	} else {
+		tmp = text_effects_only(str->str);
+		g_string_assign(str, tmp);
+		g_free(tmp);
+	}
+
+	for (; i < entry->text_len; i++) {
 		unichar c = entry->text[i];
-		int col = entry->colors[i];
+		const char *extent = entry->uses_extents ? entry->extents[i+1] : NULL;
+		new_xpos = xpos;
 
 		if (entry->hidden)
-			xpos++;
+			new_xpos++;
 		else if (term_type == TERM_TYPE_BIG5)
-			xpos += big5_width(c);
+			new_xpos += big5_width(c);
 		else if (entry->utf8)
-			xpos += unichar_isprint(c) ? mk_wcwidth(c) : 1;
+			new_xpos += unichar_isprint(c) ? mk_wcwidth(c) : 1;
 		else
-			xpos++;
+			new_xpos++;
 
-		if (xpos > end_xpos)
+		if (new_xpos > end_xpos)
 			break;
 
-		if (col != color) {
-			term_set_color(root_window, col);
-			color = col;
-		}
-
 		if (entry->hidden)
-                        term_addch(root_window, ' ');
+                        g_string_append_c(str, ' ');
 		else if (unichar_isprint(c))
-			term_add_unichar(root_window, c);
+			g_string_append_unichar(str, c);
 		else {
-			term_set_color(root_window, ATTR_RESET|ATTR_REVERSE);
-			term_addch(root_window, (c & 127)+'A'-1);
-			term_set_color(root_window, color);
+			g_string_append_c(str, 4);
+			g_string_append_c(str, FORMAT_STYLE_REVERSE);
+			g_string_append_c(str, (c & 127)+'A'-1);
+			g_string_append_c(str, 4);
+			g_string_append_c(str, FORMAT_STYLE_REVERSE);
+		}
+		xpos = new_xpos;
+
+		if (extent != NULL) {
+			new_xpos += scrlen_str(extent, entry->utf8);
+
+			if (new_xpos > end_xpos)
+				break;
+
+			g_string_append(str, extent);
+			xpos = new_xpos;
 		}
 	}
 
         /* clear the rest of the input line */
 	if (xpos < end_xpos) {
-		if (end_xpos == term_width)
-			term_clrtoeol(root_window);
-		else {
+		if (end_xpos == term_width) {
+			g_string_append_c(str, 4);
+			g_string_append_c(str, FORMAT_STYLE_CLRTOEOL);
+		} else {
 			while (xpos < end_xpos) {
-				term_addch(root_window, ' ');
+				g_string_append_c(str, ' ');
 				xpos++;
 			}
 		}
 	}
+
+	gui_printtext_internal(start_xpos, entry->ypos, str->str);
+	g_string_free(str, TRUE);
 }
 
 static void gui_entry_draw(GUI_ENTRY_REC *entry)
@@ -370,19 +490,6 @@ void gui_entry_set_active(GUI_ENTRY_REC *entry)
 	}
 }
 
-/* Return screen length of plain string */
-static int scrlen_str(const char *str)
-{
-	int len = 0;
-	char *stripped;
-	g_return_val_if_fail(str != NULL, 0);
-
-	stripped = strip_codes(str);
-	len = string_width(stripped, -1);
-	g_free(stripped);
-	return len;
-}
-
 void gui_entry_set_prompt(GUI_ENTRY_REC *entry, const char *str)
 {
 	int oldlen;
@@ -393,7 +500,7 @@ void gui_entry_set_prompt(GUI_ENTRY_REC *entry, const char *str)
 	if (str != NULL) {
 		g_free_not_null(entry->prompt);
 		entry->prompt = g_strdup(str);
-		entry->promptlen = scrlen_str(str);
+		entry->promptlen = scrlen_str(str, entry->utf8);
 	}
 
         if (entry->prompt != NULL)
@@ -427,6 +534,7 @@ void gui_entry_set_text(GUI_ENTRY_REC *entry, const char *str)
 	entry->text_len = 0;
 	entry->pos = 0;
 	entry->text[0] = '\0';
+	destroy_extents(entry);
 
 	gui_entry_insert_text(entry, str);
 }
@@ -500,8 +608,13 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
 		  (entry->text_len-entry->pos + 1) * sizeof(unichar));
 
 	/* make space for the color */
-	g_memmove(entry->colors + entry->pos + len, entry->colors + entry->pos,
-	          (entry->text_len-entry->pos) * sizeof(int));
+	if (entry->uses_extents) {
+		g_memmove(entry->extents + entry->pos + len + 1, entry->extents + entry->pos + 1,
+			  (entry->text_len-entry->pos) * sizeof(char *));
+		for (i = 0; i < len; i++) {
+			entry->extents[entry->pos + i + 1] = NULL;
+		}
+	}
 
 	if (!entry->utf8) {
 		if (term_type == TERM_TYPE_BIG5) {
@@ -520,10 +633,6 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
 		}
 	}
 
-	for (i = 0; i < len; i++) {
-		entry->colors[entry->pos + i] = ATTR_RESET;
-	}
-
 	entry->text_len += len;
         entry->pos += len;
 
@@ -549,12 +658,13 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 	g_memmove(entry->text + entry->pos + 1, entry->text + entry->pos,
 		  (entry->text_len-entry->pos + 1) * sizeof(unichar));
 
-	g_memmove(entry->colors + entry->pos + 1, entry->colors + entry->pos,
-	          (entry->text_len-entry->pos) * sizeof(int));
-
+	if (entry->uses_extents) {
+		g_memmove(entry->extents + entry->pos + 1 + 1, entry->extents + entry->pos + 1,
+			  (entry->text_len-entry->pos) * sizeof(char *));
+		entry->extents[entry->pos + 1] = NULL;
+	}
 
 	entry->text[entry->pos] = chr;
-	entry->colors[entry->pos] = ATTR_RESET;
 	entry->text_len++;
 	entry->pos++;
 
@@ -655,7 +765,7 @@ static GUI_ENTRY_CUTBUFFER_REC *get_cutbuffer_rec(GUI_ENTRY_REC *entry, CUTBUFFE
 
 void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
-	size_t w = 0;
+	size_t i, w = 0;
 
         g_return_if_fail(entry != NULL);
 
@@ -724,8 +834,22 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	g_memmove(entry->text + entry->pos - size, entry->text + entry->pos,
 		  (entry->text_len-entry->pos+1) * sizeof(unichar));
 
-	g_memmove(entry->colors + entry->pos - size, entry->colors + entry->pos,
-		(entry->text_len - entry->pos) * sizeof(int));
+	if (entry->uses_extents) {
+		for (i = entry->pos - size; i < entry->pos; i++) {
+			if (entry->extents[i+1] != NULL) {
+				g_free(entry->extents[i+1]);
+			}
+		}
+		g_memmove(entry->extents + entry->pos - size + 1, entry->extents + entry->pos + 1,
+			  (entry->text_len - entry->pos) * sizeof(void *)); /* no null terminator here */
+		for (i = 0; i < size; i++) {
+			entry->extents[entry->text_len - i] = NULL;
+		}
+		if (entry->text_len == size && entry->extents[0] != NULL) {
+			g_free(entry->extents[0]);
+			entry->extents[0] = NULL;
+		}
+	}
 
 	entry->pos -= size;
         entry->text_len -= size;
@@ -748,12 +872,26 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
 	g_memmove(entry->text + entry->pos, entry->text + entry->pos + size,
 	          (entry->text_len-entry->pos-size+1) * sizeof(unichar));
 
-	g_memmove(entry->colors + entry->pos, entry->colors + entry->pos + size,
-	          (entry->text_len-entry->pos-size) * sizeof(int));
+	if (entry->uses_extents) {
+		int i;
+		for (i = 0; i < size; i++) {
+			g_free(entry->extents[entry->pos + i + 1]);
+		}
+		g_memmove(entry->extents + entry->pos + 1, entry->extents + entry->pos + size + 1,
+			  (entry->text_len-entry->pos-size) * sizeof(char *));
+		for (i = 0; i < size; i++) {
+			entry->extents[entry->text_len - i] = NULL;
+		}
+		if (entry->text_len == size && entry->extents[0] != NULL) {
+			g_free(entry->extents[0]);
+			entry->extents[0] = NULL;
+		}
+	}
 
 	entry->text_len -= size;
 
 	gui_entry_redraw_from(entry, entry->pos);
+	gui_entry_fix_cursor(entry);
 	gui_entry_draw(entry);
 }
 
@@ -812,7 +950,7 @@ void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPD
 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
 {
         unichar chr;
-	int color;
+	char *extent;
 
 	if (entry->pos == 0 || entry->text_len < 2)
                 return;
@@ -825,9 +963,11 @@ void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
 	entry->text[entry->pos] = entry->text[entry->pos-1];
         entry->text[entry->pos-1] = chr;
 
-	color = entry->colors[entry->pos];
-	entry->colors[entry->pos] = entry->colors[entry->pos-1];
-	entry->colors[entry->pos-1] = color;
+	if (entry->uses_extents) {
+		extent = entry->extents[entry->pos+1];
+		entry->extents[entry->pos+1] = entry->extents[entry->pos];
+		entry->extents[entry->pos] = extent;
+	}
 
         entry->pos++;
 
@@ -865,44 +1005,50 @@ void gui_entry_transpose_words(GUI_ENTRY_REC *entry)
 	/* do wordswap if any found */
 	if (spos1 < epos1 && epos1 < spos2 && spos2 < epos2) {
 		unichar *first, *sep, *second;
-		int *first_color, *sep_color, *second_color;
+		char **first_extent, **sep_extent, **second_extent;
 		int i;
 
 		first  = (unichar *) g_malloc( (epos1 - spos1) * sizeof(unichar) );
 		sep    = (unichar *) g_malloc( (spos2 - epos1) * sizeof(unichar) );
 		second = (unichar *) g_malloc( (epos2 - spos2) * sizeof(unichar) );
 
-		first_color  = (int *) g_malloc( (epos1 - spos1) * sizeof(int) );
-		sep_color    = (int *) g_malloc( (spos2 - epos1) * sizeof(int) );
-		second_color = (int *) g_malloc( (epos2 - spos2) * sizeof(int) );
+		first_extent  = (char **) g_malloc( (epos1 - spos1) * sizeof(char *) );
+		sep_extent    = (char **) g_malloc( (spos2 - epos1) * sizeof(char *) );
+		second_extent = (char **) g_malloc( (epos2 - spos2) * sizeof(char *) );
 
 		for (i = spos1; i < epos1; i++) {
 			first[i-spos1] = entry->text[i];
-			first_color[i-spos1] = entry->colors[i];
+			if (entry->uses_extents)
+				first_extent[i-spos1] = entry->extents[i+1];
 		}
 		for (i = epos1; i < spos2; i++) {
 			sep[i-epos1] = entry->text[i];
-			sep_color[i-epos1] = entry->colors[i];
+			if (entry->uses_extents)
+				sep_extent[i-epos1] = entry->extents[i+1];
 		}
 		for (i = spos2; i < epos2; i++) {
 			second[i-spos2] = entry->text[i];
-			second_color[i-spos2] = entry->colors[i];
+			if (entry->uses_extents)
+				second_extent[i-spos2] = entry->extents[i+1];
 		}
 
 		entry->pos = spos1;
 		for (i = 0; i < epos2-spos2; i++) {
 			entry->text[entry->pos] = second[i];
-			entry->colors[entry->pos] = second_color[i];
+			if (entry->uses_extents)
+				entry->extents[entry->pos+1] = second_extent[i];
 			entry->pos++;
 		}
 		for (i = 0; i < spos2-epos1; i++) {
 			entry->text[entry->pos] = sep[i];
-			entry->colors[entry->pos] = sep_color[i];
+			if (entry->uses_extents)
+				entry->extents[entry->pos+1] = sep_extent[i];
 			entry->pos++;
 		}
 		for (i = 0; i < epos1-spos1; i++) {
 			entry->text[entry->pos] = first[i];
-			entry->colors[entry->pos] = first_color[i];
+			if (entry->uses_extents)
+				entry->extents[entry->pos+1] = first_extent[i];
 			entry->pos++;
 		}
 
@@ -910,9 +1056,9 @@ void gui_entry_transpose_words(GUI_ENTRY_REC *entry)
 		g_free(sep);
 		g_free(second);
 
-		g_free(first_color);
-		g_free(sep_color);
-		g_free(second_color);
+		g_free(first_extent);
+		g_free(sep_extent);
+		g_free(second_extent);
 	}
 
 	gui_entry_redraw_from(entry, spos1);
@@ -996,11 +1142,17 @@ void gui_entry_set_pos(GUI_ENTRY_REC *entry, int pos)
 
 void gui_entry_set_text_and_pos_bytes(GUI_ENTRY_REC *entry, const char *str, int pos_bytes)
 {
-	int pos;
+	int pos, extents_alloc;
+	char **extents;
 	const char *ptr;
 
 	g_return_if_fail(entry != NULL);
 
+	extents = entry->extents;
+	extents_alloc = entry->text_alloc;
+	entry->extents = NULL;
+	entry->uses_extents = FALSE;
+
 	gui_entry_set_text(entry, str);
 
 	if (entry->utf8) {
@@ -1011,6 +1163,19 @@ void gui_entry_set_text_and_pos_bytes(GUI_ENTRY_REC *entry, const char *str, int
 	else
 		pos = pos_bytes;
 
+	if (extents != NULL) {
+		entry->uses_extents = TRUE;
+		entry->extents = extents;
+		if (extents_alloc < entry->text_alloc) {
+			int i;
+			entry->extents = g_realloc(entry->extents,
+				   sizeof(char *) * entry->text_alloc);
+			for (i = extents_alloc; i < entry->text_alloc; i++) {
+				entry->extents[i] = NULL;
+			}
+		}
+	}
+	gui_entry_redraw_from(entry, 0);
 	gui_entry_set_pos(entry, pos);
 }
 
@@ -1101,7 +1266,91 @@ void gui_entry_redraw(GUI_ENTRY_REC *entry)
 	gui_entry_draw(entry);
 }
 
-void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
+static void gui_entry_alloc_extents(GUI_ENTRY_REC *entry)
+{
+	entry->uses_extents = TRUE;
+	entry->extents = g_new0(char *, entry->text_alloc);
+}
+
+void gui_entry_set_extent(GUI_ENTRY_REC *entry, int pos, const char *text)
+{
+	int update = FALSE;
+
+	g_return_if_fail(entry != NULL);
+
+	if (pos < 0 || pos > entry->text_len)
+		return;
+
+	if (text == NULL)
+		return;
+
+	if (!entry->uses_extents) {
+		gui_entry_alloc_extents(entry);
+	}
+
+	if (g_strcmp0(entry->extents[pos], text) != 0) {
+		g_free(entry->extents[pos]);
+		if (*text == '\0') {
+			entry->extents[pos] = NULL;
+		} else {
+			entry->extents[pos] = g_strdup(text);
+		}
+		update = TRUE;
+	}
+
+	if (update) {
+		gui_entry_redraw_from(entry, pos - 1);
+		gui_entry_fix_cursor(entry);
+		gui_entry_draw(entry);
+	}
+}
+
+void gui_entry_set_extents(GUI_ENTRY_REC *entry, int pos, int len, const char *left, const char *right)
+{
+	int end, update = FALSE;
+
+	g_return_if_fail(entry != NULL);
+
+	if (pos < 0 || len < 0 || pos > entry->text_len)
+		return;
+
+	end = pos + len;
+
+	if (end > entry->text_len)
+		end = entry->text_len;
+
+	if (!entry->uses_extents) {
+		gui_entry_alloc_extents(entry);
+	}
+
+	if (g_strcmp0(entry->extents[pos], left) != 0) {
+		g_free(entry->extents[pos]);
+		if (*left == '\0') {
+			entry->extents[pos] = NULL;
+		} else {
+			entry->extents[pos] = g_strdup(left);
+		}
+		update = TRUE;
+	}
+
+	if (pos != end && g_strcmp0(entry->extents[end], right) != 0) {
+		g_free(entry->extents[end]);
+		if (*right == '\0') {
+			entry->extents[end] = NULL;
+		} else {
+			entry->extents[end] = g_strdup(right);
+		}
+		update = TRUE;
+	}
+
+	if (update) {
+		gui_entry_redraw_from(entry, pos - 1);
+		gui_entry_fix_cursor(entry);
+		gui_entry_draw(entry);
+	}
+}
+
+void gui_entry_clear_extents(GUI_ENTRY_REC *entry, int pos, int len)
 {
 	int i, end, update = FALSE;
 
@@ -1115,9 +1364,14 @@ void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
 	if (end > entry->text_len)
 		end = entry->text_len;
 
-	for (i = pos; i < end; i++) {
-		if (entry->colors[i] != color) {
-			entry->colors[i] = color;
+	if (!entry->uses_extents) {
+		return;
+	}
+
+	for (i = pos; i <= end; i++) {
+		if (entry->extents[i] != NULL) {
+			g_free(entry->extents[i]);
+			entry->extents[i] = NULL;
 			update = TRUE;
 		}
 	}
@@ -1128,3 +1382,117 @@ void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
 		gui_entry_draw(entry);
 	}
 }
+
+char *gui_entry_get_extent(GUI_ENTRY_REC *entry, int pos)
+{
+	g_return_val_if_fail(entry != NULL, NULL);
+
+	if (!entry->uses_extents)
+		return NULL;
+
+	if (pos < 0 || pos >= entry->text_len)
+		return NULL;
+
+	return entry->extents[pos];
+}
+
+#define POS_FLAG "%|"
+GSList *gui_entry_get_text_and_extents(GUI_ENTRY_REC *entry)
+{
+	GSList *list = NULL;
+	GString *str;
+	int i;
+
+	g_return_val_if_fail(entry != NULL, NULL);
+
+	if (entry->uses_extents && entry->extents[0] != NULL) {
+		if (entry->pos == 0) {
+			list = g_slist_prepend(list, g_strconcat(entry->extents[0], POS_FLAG, NULL));
+		} else {
+			list = g_slist_prepend(list, g_strdup(entry->extents[0]));
+		}
+	} else {
+		if (entry->pos == 0) {
+			list = g_slist_prepend(list, g_strdup(POS_FLAG));
+		} else {
+			list = g_slist_prepend(list, NULL);
+		}
+	}
+
+	str = g_string_sized_new(entry->text_alloc);
+	for (i = 0; i < entry->text_len; i++) {
+		if (entry->utf8) {
+			g_string_append_unichar(str, entry->text[i]);
+		} else if (term_type == TERM_TYPE_BIG5) {
+			if(entry->text[i] > 0xff)
+				g_string_append_c(str, (entry->text[i] >> 8) & 0xff);
+			g_string_append_c(str, entry->text[i] & 0xff);
+		} else {
+			g_string_append_c(str, entry->text[i]);
+		}
+		if (entry->pos == i+1 || (entry->uses_extents && entry->extents[i+1] != NULL)) {
+			list = g_slist_prepend(list, g_strdup(str->str));
+			g_string_truncate(str, 0);
+			if (entry->uses_extents && entry->extents[i+1] != NULL) {
+				if (entry->pos == i+1) {
+					list = g_slist_prepend(list, g_strconcat(entry->extents[i+1], POS_FLAG, NULL));
+				} else {
+					list = g_slist_prepend(list, g_strdup(entry->extents[i+1]));
+				}
+			} else if (entry->pos == i+1) {
+				list = g_slist_prepend(list, g_strdup(POS_FLAG));
+			}
+		}
+	}
+	if (str->len > 0) {
+		list = g_slist_prepend(list, g_strdup(str->str));
+	}
+	list = g_slist_reverse(list);
+	g_string_free(str, TRUE);
+
+	return list;
+}
+
+void gui_entry_set_text_and_extents(GUI_ENTRY_REC *entry, GSList *list)
+{
+	GSList *tmp;
+	int pos = -1;
+	int is_extent = 1;
+
+	gui_entry_set_text(entry, "");
+	for (tmp = list, is_extent = TRUE; tmp != NULL; tmp = tmp->next, is_extent ^= 1) {
+		if (is_extent) {
+			char *extent;
+			int len;
+
+			if (tmp->data == NULL)
+				continue;
+
+			extent = g_strdup(tmp->data);
+			len = strlen(extent);
+			if (len >= strlen(POS_FLAG) && g_strcmp0(&extent[len-strlen(POS_FLAG)], POS_FLAG) == 0) {
+				char *tmp;
+				tmp = extent;
+				extent = g_strndup(tmp, len - strlen(POS_FLAG));
+				g_free(tmp);
+				pos = entry->pos;
+			}
+
+			if (strlen(extent) > 0) {
+				gui_entry_set_extent(entry, entry->pos, extent);
+			}
+			g_free(extent);
+		} else {
+			gui_entry_insert_text(entry, tmp->data);
+		}
+	}
+	gui_entry_set_pos(entry, pos);
+}
+
+void gui_entry_init(void)
+{
+}
+
+void gui_entry_deinit(void)
+{
+}
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index 18cc5a4d..dff860d3 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -9,7 +9,7 @@ typedef struct {
 typedef struct {
 	int text_len, text_alloc; /* as shorts, not chars */
 	unichar *text;
-	int *colors;
+	char **extents;
 
 	GSList *kill_ring;
 
@@ -27,6 +27,7 @@ typedef struct {
 	unsigned int previous_append_next_kill:1;
 	unsigned int append_next_kill:1;
 	unsigned int yank_preceded:1;
+	unsigned int uses_extents:1;
 } GUI_ENTRY_REC;
 
 typedef enum {
@@ -78,6 +79,14 @@ void gui_entry_move_words(GUI_ENTRY_REC *entry, int count, int to_space);
 
 void gui_entry_redraw(GUI_ENTRY_REC *entry);
 
-void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color);
+void gui_entry_set_extent(GUI_ENTRY_REC *entry, int pos, const char *text);
+void gui_entry_set_extents(GUI_ENTRY_REC *entry, int pos, int len, const char *left, const char *right);
+void gui_entry_clear_extents(GUI_ENTRY_REC *entry, int pos, int len);
+char *gui_entry_get_extent(GUI_ENTRY_REC *entry, int pos);
+GSList *gui_entry_get_text_and_extents(GUI_ENTRY_REC *entry);
+void gui_entry_set_text_and_extents(GUI_ENTRY_REC *entry, GSList *list);
+
+void gui_entry_init(void);
+void gui_entry_deinit(void);
 
 #endif
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 0288e4f1..f30ce4b8 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -165,6 +165,7 @@ static void textui_finish_init(void)
 	gui_expandos_init();
 	gui_printtext_init();
 	gui_readline_init();
+	gui_entry_init();
 	lastlog_init();
 	mainwindows_init();
 	mainwindow_activity_init();
@@ -230,6 +231,7 @@ static void textui_deinit(void)
 
 	lastlog_deinit();
 	statusbar_deinit();
+	gui_entry_deinit();
 	gui_printtext_deinit();
 	gui_readline_deinit();
 	gui_windows_deinit();
diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index 02ef6c73..e2f162a0 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -125,12 +125,72 @@ CODE:
 	gui_entry_set_text(active_entry, str);
 
 void
-gui_input_color(pos, len, color)
+gui_input_set_extent(pos, text)
+	int pos
+	char *text
+PREINIT:
+	char *tt;
+CODE:
+	tt = text != NULL ? format_string_expand(text, NULL) : NULL;
+	gui_entry_set_extent(active_entry, pos, tt);
+	g_free(tt);
+
+void
+gui_input_set_extents(pos, len, left, right)
 	int pos
 	int len
-	int color
+	char *left
+	char *right
+PREINIT:
+	char *tl;
+	char *tr;
 CODE:
-	gui_entry_set_color(active_entry, pos, len, color);
+	tl = left != NULL ? format_string_expand(left, NULL) : NULL;
+	tr = right != NULL ? format_string_expand(right, NULL) : NULL;
+	gui_entry_set_extents(active_entry, pos, len, tl, tr);
+	g_free(tl);
+	g_free(tr);
+
+void
+gui_input_clear_extents(pos, len = 0)
+	int pos
+	int len
+CODE:
+	gui_entry_clear_extents(active_entry, pos, len);
+
+void
+gui_input_get_extent(pos)
+	int pos
+PREINIT:
+	char *ret;
+PPCODE:
+	ret = gui_entry_get_extent(active_entry, pos);
+	XPUSHs(sv_2mortal(new_pv(ret)));
+	g_free(ret);
+
+void
+gui_input_get_text_and_extents()
+PREINIT:
+	GSList *ret, *tmp;
+PPCODE:
+	ret = gui_entry_get_text_and_extents(active_entry);
+	for (tmp = ret; tmp != NULL; tmp = tmp->next) {
+		XPUSHs(sv_2mortal(new_pv(tmp->data)));
+	}
+	g_slist_free_full(ret, g_free);
+
+void
+gui_input_set_text_and_extents(...)
+PREINIT:
+	GSList *list;
+	int i;
+PPCODE:
+	list = NULL;
+	for (i = items; i > 0; i--) {
+		list = g_slist_prepend(list, SvPV_nolen(ST(i-1)));
+	}
+	gui_entry_set_text_and_extents(active_entry, list);
+	g_slist_free(list);
 
 int
 gui_input_get_pos()

From 2185c4ddb36e1b53548674c2e6ebf95448f2c587 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 3 Feb 2018 23:19:27 +0100
Subject: [PATCH 0776/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index ba5557e6..46d0c45a 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 13
+#define IRSSI_ABI_VERSION 14
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From b33ce255a9df6e951d90f3d3c519b005dacb7010 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 4 Feb 2018 11:18:22 +0100
Subject: [PATCH 0777/1650] check for negative bound

---
 src/fe-text/mainwindows.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index fd4603da..9cc540fb 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1263,6 +1263,7 @@ static void cmd_window_shrink(const char *data)
 	int count;
 
 	count = *data == '\0' ? 1 : atoi(data);
+	if (count < -INT_MAX) count = -INT_MAX;
 
 	mainwindow_grow_int(-count);
 }
@@ -1277,6 +1278,7 @@ static void cmd_window_size(const char *data)
 
 	size -= WINDOW_MAIN(active_win)->height -
 		WINDOW_MAIN(active_win)->statusbar_lines;
+	if (size < -INT_MAX) size = -INT_MAX;
 
 	mainwindow_grow_int(size);
 }
@@ -1460,6 +1462,7 @@ static void cmd_window_rshrink(const char *data)
 	int count;
 
 	count = *data == '\0' ? 1 : atoi(data);
+	if (count < -INT_MAX) count = -INT_MAX;
 
 	window_rgrow_int(-count);
 }

From 1e6d787401b548cf3d5cc57d9a0d0f25f1254bf7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 7 Feb 2018 11:07:22 +0100
Subject: [PATCH 0778/1650] ensure cap_supported is existent yet

---
 src/common.h        |  2 +-
 src/perl/irc/Irc.xs | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/common.h b/src/common.h
index 46d0c45a..746aad4e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 14
+#define IRSSI_ABI_VERSION 15
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index bb2d27bb..3bf81f9a 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -37,14 +37,16 @@ static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 	(void) hv_store(hv, "cap_complete", 12, newSViv(server->cap_complete), 0);
 	(void) hv_store(hv, "sasl_success", 12, newSViv(server->sasl_success), 0);
 
-	hv_ = newHV();
-	g_hash_table_iter_init(&iter, server->cap_supported);
-	while (g_hash_table_iter_next(&iter, &key_, &val_)) {
-		char *key = (char *)key_;
-		char *val = (char *)val_;
-		hv_store(hv_, key, strlen(key), new_pv(val), 0);
+	if (server->cap_supported != NULL) {
+		hv_ = newHV();
+		g_hash_table_iter_init(&iter, server->cap_supported);
+		while (g_hash_table_iter_next(&iter, &key_, &val_)) {
+			char *key = (char *)key_;
+			char *val = (char *)val_;
+			hv_store(hv_, key, strlen(key), new_pv(val), 0);
+		}
+		(void) hv_store(hv, "cap_supported", 13, newRV_noinc((SV*)hv_), 0);
 	}
-	(void) hv_store(hv, "cap_supported", 13, newRV_noinc((SV*)hv_), 0);
 
 	av = newAV();
 	for (tmp = server->cap_active; tmp != NULL; tmp = tmp->next)

From e32e9d63c67ab95ef0576154680a6c52334b97af Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 8 Feb 2018 14:11:23 +0100
Subject: [PATCH 0779/1650] Do not read beyond end of escaped string

Credit to OSS-Fuzz
---
 src/fe-common/core/themes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index acb5d1c7..5a817daa 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -485,7 +485,7 @@ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp
 	str = g_string_new(NULL);
 	p = ret;
 	while (*p != '\0') {
-		if (*p == '\\') {
+		if (*p == '\\' && p[1] != '\0') {
 			int chr;
 			p++;
 			chr = expand_escape(&p);

From 16912e1a911a503d1ee83ea42dd20c0d5b543e9a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 8 Feb 2018 14:41:02 +0100
Subject: [PATCH 0780/1650] restore compat with glib <2.40

---
 src/irc/core/irc-cap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index dd720841..1a60d99b 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -158,11 +158,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 				continue;
 			}
 
-			if (!g_hash_table_insert(server->cap_supported, key, val)) {
+			if (g_hash_table_lookup_extended(server->cap_supported, key, NULL, NULL)) {
 				/* The specification doesn't say anything about
 				 * duplicated values, let's just warn the user */
 				g_warning("The server sent the %s capability twice", key);
 			}
+			g_hash_table_insert(server->cap_supported, key, val);
 		}
 
 		/* A multiline response is always terminated by a normal one,

From 5c5ed64180a6b76315ee7b8c6000ee64ad5877a7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 25 Jan 2018 15:33:24 +0100
Subject: [PATCH 0781/1650] try to make sure the server is still good enough to
 call ischannel when printing netsplit/join

---
 src/fe-common/irc/fe-netjoin.c  | 19 +++++++++++++------
 src/fe-common/irc/fe-netsplit.c | 17 ++++++++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index a7a2e4fe..9ea633b4 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -245,17 +245,24 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channe
    message before it. */
 static void sig_print_starting(TEXT_DEST_REC *dest)
 {
-	GSList *tmp, *next;
+	NETJOIN_SERVER_REC *rec;
 
 	if (printing_joins)
 		return;
 
-	for (tmp = joinservers; tmp != NULL; tmp = next) {
-		NETJOIN_SERVER_REC *server = tmp->data;
+	if (!IS_IRC_SERVER(dest->server))
+		return;
 
-		next = tmp->next;
-		if (server->netjoins != NULL)
-			print_netjoins(server, NULL);
+	rec = netjoin_find_server(IRC_SERVER(dest->server));
+	if (rec != NULL && rec->netjoins != NULL) {
+		/* if netjoins exists, the server rec should be
+		   still valid. otherwise, calling server->ischannel
+		   may not be safe. */
+		if (dest->target != NULL &&
+		    !server_ischannel((SERVER_REC *) rec->server, dest->target))
+			return;
+
+		print_netjoins(rec, NULL);
 	}
 }
 
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index edd3fc34..258d0d57 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -247,16 +247,23 @@ static int check_server_splits(IRC_SERVER_REC *server)
    message before it. */
 static void sig_print_starting(TEXT_DEST_REC *dest)
 {
-	GSList *tmp;
+	IRC_SERVER_REC *rec;
 
 	if (printing_splits)
 		return;
 
-	for (tmp = servers; tmp != NULL; tmp = tmp->next) {
-		IRC_SERVER_REC *rec = tmp->data;
+	if (!IS_IRC_SERVER(dest->server))
+		return;
 
-		if (IS_IRC_SERVER(rec) && rec->split_servers != NULL)
-			print_splits(rec, NULL);
+	rec = IRC_SERVER(dest->server);
+	if (rec->split_servers != NULL) {
+		/* if split_servers exists, the server rec should be
+		   still valid. otherwise, calling server->ischannel
+		   may not be safe. */
+		if (dest->target != NULL && !server_ischannel((SERVER_REC *) rec, dest->target))
+			return;
+
+		print_splits(rec, NULL);
 	}
 }
 

From adc812b6b6ed2df2c670586e5308cb767955dddd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Feb 2018 00:03:17 +0100
Subject: [PATCH 0782/1650] add a peculiar bug check to autogen

---
 autogen.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index 9feb0872..17f60f89 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -57,3 +57,11 @@ if test x$NOCONFIGURE = x; then
 else
   echo Skipping configure process.
 fi
+
+if grep -q '==\|\[\[' "$srcdir"/build-aux/test-driver; then
+    echo
+    echo "************************************************************************"
+    echo "**Warning**: your build is not portable, please do not make dist"
+    echo "             see https://bugzilla.opensuse.org/show_bug.cgi?id=1076146"
+    echo "************************************************************************"
+fi

From 3cbcb4fe85ec3233aa36b56a047470df5d4221f3 Mon Sep 17 00:00:00 2001
From: "Staron, Martin" <martin.staron@mavenir.com>
Date: Mon, 12 Feb 2018 12:04:46 +0100
Subject: [PATCH 0783/1650] dcc get shouldn't fail when file attrs can't be
 changed

---
 src/irc/dcc/dcc-get.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index cecbb076..ee8b9a49 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -237,8 +237,12 @@ void sig_dccget_connected(GET_DCC_REC *dcc)
 
 		if (temphandle == -1)
 			ret = -1;
-		else
-			ret = fchmod(temphandle, dcc_file_create_mode);
+		else {
+			if (fchmod(temphandle, dcc_file_create_mode) != 0)
+				g_warning("fchmod(3) failed: %s", strerror(errno));
+			/* proceed even if chmod fails */
+			ret = 0;
+		}
 
 		close(temphandle);
 
@@ -249,7 +253,7 @@ void sig_dccget_connected(GET_DCC_REC *dcc)
 			    /* Linux */
 			    (errno == EPERM ||
 			     /* FUSE */
-			     errno == ENOSYS ||
+			     errno == ENOSYS || errno == EACCES ||
 			     /* BSD */
 			     errno == EOPNOTSUPP)) {
 				/* hard links aren't supported - some people

From a6fcd5432e495aea416ebae28d44111eadf19b82 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Feb 2018 12:31:22 +0100
Subject: [PATCH 0784/1650] improve padding performance

Credit to Oss-Fuzz
---
 src/core/special-vars.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index f254c200..e131b0ed 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -337,11 +337,14 @@ char *get_alignment(const char *text, int align, int flags, char pad)
 
 	/* add pad characters */
 	if (flags & ALIGN_PAD) {
-		while (string_width(str->str, policy) < align) {
+		int pad_len = align - string_width(str->str, policy);
+		if (pad_len > 0) {
+			char *pad_full = g_strnfill(pad_len, pad);
 			if (flags & ALIGN_RIGHT)
-				g_string_prepend_c(str, pad);
+				g_string_prepend(str, pad_full);
 			else
-				g_string_append_c(str, pad);
+				g_string_append(str, pad_full);
+			g_free(pad_full);
 		}
 	}
 

From e289d34b9a50b46f57698980e899b71f0069abda Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Feb 2018 15:04:16 +0100
Subject: [PATCH 0785/1650] limit alignment padding to a screenful

Credit to Oss-Fuzz
---
 src/core/special-vars.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index e131b0ed..33d9cd55 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -33,6 +33,8 @@
 #define isarg(c) \
 	(i_isdigit(c) || (c) == '*' || (c) == '~' || (c) == '-')
 
+#define ALIGN_MAX 222488
+
 static SPECIAL_HISTORY_FUNC history_func = NULL;
 
 static char *get_argument(char **cmd, char **arglist)
@@ -300,6 +302,10 @@ static int get_alignment_args(char **data, int *align, int *flags, char *pad)
 	if (!parse_uint(str, &endptr, 10, &align_)) {
 		return FALSE;
 	}
+	/* alignment larger than supported */
+	if (align_ > ALIGN_MAX) {
+		return FALSE;
+	}
 	str = endptr;
 	*align = align_;
 

From 5c60e72b118b9efb09639ea26e2a70d06899431f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Feb 2018 00:44:19 +0100
Subject: [PATCH 0786/1650] add additional notes to NEWS

(synced back from github releases)
---
 NEWS | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 4b171852..3a473162 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 v1.2-head 2018-xx-xx  The Irssi team <staff@irssi.org>
 
 v1.1.0 2018-01-15 The Irssi team <staff@irssi.org>
+	! Warning. Irssi is broken and will crash with OpenSSL < 1.0.2
+          due to openssl/openssl commit
+          5b4b9ce976fce09a7a92e2f25b91a1635cb840fe
 	* Colour is now re-set when reaching a comma, matching mIRC
 	  behaviour (#742, #740, #790)
 	* Irssi now shows the initial nick and name on first start
@@ -80,6 +83,9 @@ v1.1.0 2018-01-15 The Irssi team <staff@irssi.org>
 	- Fix space issue in glib-2.0.m4 (#621)
 
 v1.0.6 2018-01-07 The Irssi team <staff@irssi.org>
+	! Note: Code and aliases using `$($'-like constructs are no
+          longer supported due to issue GL#18. Sorry about the
+          inconvenience.
 	- Fix invalid memory access when reading hilight configuration
           (#787, #788).
 	- Fix null pointer dereference when the channel topic is set
@@ -123,6 +129,7 @@ v1.0.4 2017-07-07  The Irssi team <staff@irssi.org>
 	- Minor help update (#729).
 
 v1.0.3 2017-06-06  The Irssi team <staff@irssi.org>
+	! Regression info in 1.0.3: #716 Warnings on start up: invalid time '-1'
 	- Fix out of bounds read when scanning expandos (GL!11).
 	- Fix invalid memory access with quoted filenames in DCC
 	  (GL#8, GL!12).
@@ -141,6 +148,7 @@ v1.0.3 2017-06-06  The Irssi team <staff@irssi.org>
 	- Minor typo correction in help. By Michael Hansen (#707).
 
 v1.0.2 2017-03-10  The Irssi team <staff@irssi.org>
+	! Warning. Irssi is broken on GLib 2.46 (bgo#755496)
 	- Prevent some null-pointer crashes (GL!9).
 	- Fix compilation with OpenSSL 1.1.0 (#628, #597).
 	- Correct dereferencing of already freed server objects during
@@ -279,6 +287,8 @@ v0.8.20 2016-09-16  The Irssi team <staff@irssi.org>
 	  Quarkslab.
 
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
+	! If your cursor keys stopped working, try this first: `/bind
+          meta-O key meta2'
 	- Fixed regression when joining and parting channels on IRCnet (#435)
 	- Fixed SASL EXTERNAL. By Mantas Mikulėnas (grawity, #432)
 	- Fixed regression when not using SASL (#438)
@@ -294,11 +304,15 @@ v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 
 v0.8.18 2016-02-13  The Irssi team <staff@irssi.org>
 	* Modules will now require to define a
+
 	      void MODULENAME ## _abicheck(int *version)
+
 	  method to ensure that they are compiled against the correct Irssi
 	  version.
 	* The signature of "message private" has been changed to
+
 	      5: server, message, nick, address, target
+
 	  in order to support "self messages". Module authors should
 	  implement this change if they are using this signal.
 	* Removing networks will now remove all attached servers and channels
@@ -311,12 +325,14 @@ v0.8.18 2016-02-13  The Irssi team <staff@irssi.org>
 	  effect for anyone given that it has been unsupported for several years.
 	+ CAP SASL PLAIN login is now supported natively.
 	+ Paste bracket markers can be requested from terminal with
+
 	      /set paste_use_bracketed_mode on
+
 	+ "Self messages" generated by some bouncers can now be received in the
 	  proper window.
 	+ Try to split long lines on spaces to avoid words being splitted. Adds
-	  a new option: 'split_line_on_space' which defaults to on.
-	+ Add setting hilight_nick_matches_everywhere (#56).
+	  a new option: `split_line_on_space' which defaults to on.
+	+ Add setting `hilight_nick_matches_everywhere' (#56).
 	+ The config parser is more robust and prints out better diagnostics on
 	  incorrect config files.
 	+ Ctrl+^ (FS#721) and Ctrl+J can now be bound.

From 666ddc2ecdd9ad7bc966c78565a5fd9985e099c8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Feb 2018 00:55:30 +0100
Subject: [PATCH 0787/1650] Merge tag '1.0.7' into integrate/1.0.7

---
 NEWS | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/NEWS b/NEWS
index 4b171852..9ac6883f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,24 @@
 v1.2-head 2018-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.0.7 2018-02-15 The Irssi team <staff@irssi.org>
+	- Prevent use after free error during the execution of some
+	  commands. Found by Joseph Bisch (GL#17, GL!24).
+	- Revert netsplit print optimisation due to crashes (#465, #809,
+          #812, #819, #824).
+	- Fix use after free when SASL messages are received in
+          unexpected order (GL#26, GL!33).
+	- Fix null pointer dereference in the tab completion when an
+          empty nick is joined (GL#24, GL!31).
+	- Fix use after free when entering oper password (GL#22,
+          GL!32).
+	- Fix null pointer dereference when too many windows are
+          opened (GL#27, #837).
+	- Fix out of bounds access in theme strings when the last
+          escape is incomplete. Credit to Oss-Fuzz (#842).
+	- Fix out of bounds write when using negative counts on window
+          resize (GL#25, GL#29, #836).
+	- Minor help correction. By William Jackson (#834).
+
 v1.1.0 2018-01-15 The Irssi team <staff@irssi.org>
 	* Colour is now re-set when reaching a comma, matching mIRC
 	  behaviour (#742, #740, #790)

From 0b9beeb01d4ff3890120ace913884fcd915e4b26 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Feb 2018 01:17:11 +0100
Subject: [PATCH 0788/1650] Merge tag '1.1.1' into integrate/1.1.1

---
 NEWS         | 7 +++++++
 configure.ac | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9ac6883f..9d2648f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 v1.2-head 2018-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.1.1 2018-02-15 The Irssi team <staff@irssi.org>
+	! Contains all changes from 1.0.7
+	- Restore compatibility with OpenSSL < 1.0.2 (#820, #831)
+	- Fix test compilation on some platforms (#815, #816)
+	- Fix portability and backwards compatibility of test runner
+          (#818, #845)
+
 v1.0.7 2018-02-15 The Irssi team <staff@irssi.org>
 	- Prevent use after free error during the execution of some
 	  commands. Found by Joseph Bisch (GL#17, GL!24).
diff --git a/configure.ac b/configure.ac
index e8df7d9e..0231e109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.1-head)
+AC_INIT(irssi, 1.2-head)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 203f6c532947e8b7c7e30fad91220aad083c7f08 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 16 Feb 2018 13:46:29 +0100
Subject: [PATCH 0789/1650] also unblock theme elements when processing
 finished

---
 src/fe-common/core/themes.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 5a817daa..e9818be9 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -413,7 +413,7 @@ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp
 {
 	GString *str;
 	const char *p, *format;
-	char *abstract, *data, *ret;
+	char *abstract, *data, *ret, *blocking;
 	theme_rm_col default_fg, default_bg;
 	int len;
 
@@ -455,8 +455,10 @@ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp
 		/* unknown abstract, just display the data */
 		data = "$0-";
 		g_free(abstract);
+		blocking = NULL;
 	} else {
-		g_tree_insert(block_list, abstract, abstract);
+		blocking = abstract;
+		g_tree_insert(block_list, blocking, blocking);
 	}
 	abstract = g_strdup(data);
 
@@ -503,6 +505,9 @@ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp
 	ret = theme_format_expand_data_rec(theme, &p, default_fg, default_bg, last_fg, last_bg,
 	                                   flags | EXPAND_FLAG_LASTCOLOR_ARG, block_list);
 	g_free(abstract);
+	if (blocking != NULL) {
+		g_tree_remove(block_list, blocking);
+	}
 	g_tree_unref(block_list);
 	return ret;
 }

From 097a9f4988333b1d445ba70df006da6ef26bfaa9 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 16 Feb 2018 10:09:48 -0300
Subject: [PATCH 0790/1650] Document second parameter (seek position) of /cat
 command

---
 docs/help/in/cat.in                   | 6 +++++-
 src/fe-common/core/fe-core-commands.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/cat.in b/docs/help/in/cat.in
index 3a3ed32b..9f9f242f 100644
--- a/docs/help/in/cat.in
+++ b/docs/help/in/cat.in
@@ -5,12 +5,16 @@
 
 %9Parameters:%9
 
-    The file to display.
+    The file to display and optionally a position to seek in the file,
+    in bytes.
 
 %9Description:%9
 
     Displays the contents of the specified file into the active window.
 
+    The seek position parameter is used internally to display away logs, if
+    omitted the whole file is shown.
+
 %9Examples:%9
 
     /CAT /etc/network/interfaces
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index fb98cc25..222543d5 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -114,7 +114,7 @@ static void cmd_version(char *data)
 	}
 }
 
-/* SYNTAX: CAT <file> */
+/* SYNTAX: CAT <file> [<seek position>] */
 static void cmd_cat(const char *data)
 {
 	char *fname, *fposstr;

From 016b42baea9d7dcd2a284f873246c06259c560dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Sun, 4 Jan 2015 01:57:21 +0100
Subject: [PATCH 0791/1650] Add OTR support.

This patch adds support for the OTR protocol to irssi. This is an import
of the external irssi-otr project that we are now taking over
maintership for.

Major thanks to the original authors of Irssi-OTR: Uli Meis and David
Goulet. Thanks to the OTR community in #OTR on OFTC, thanks to everyone
who have helped testing the patches and submitted UI suggestions.
---
 .travis.yml             |  10 +-
 AUTHORS                 |   2 +
 configure.ac            |  69 +++
 docs/help/in/otr.in     | 111 +++++
 docs/signals.txt        |   6 +
 m4/libotr.m4            | 134 ++++++
 src/Makefile.am         |   6 +-
 src/core/net-nonblock.c |  35 --
 src/core/network.c      |  33 ++
 src/core/network.h      |   2 +
 src/fe-text/Makefile.am |   5 +-
 src/fe-text/irssi.c     |  17 +-
 src/otr/Makefile.am     |  42 ++
 src/otr/irssi-otr.h     |  39 ++
 src/otr/key.c           | 402 +++++++++++++++++
 src/otr/key.h           |  35 ++
 src/otr/module.c        | 261 +++++++++++
 src/otr/module.h        |  29 ++
 src/otr/otr-fe.c        | 344 +++++++++++++++
 src/otr/otr-fe.h        |  28 ++
 src/otr/otr-formats.c   | 108 +++++
 src/otr/otr-formats.h   | 112 +++++
 src/otr/otr-ops.c       | 362 ++++++++++++++++
 src/otr/otr.c           | 941 ++++++++++++++++++++++++++++++++++++++++
 src/otr/otr.h           | 170 ++++++++
 25 files changed, 3262 insertions(+), 41 deletions(-)
 create mode 100644 docs/help/in/otr.in
 create mode 100644 m4/libotr.m4
 create mode 100644 src/otr/Makefile.am
 create mode 100644 src/otr/irssi-otr.h
 create mode 100644 src/otr/key.c
 create mode 100644 src/otr/key.h
 create mode 100644 src/otr/module.c
 create mode 100644 src/otr/module.h
 create mode 100644 src/otr/otr-fe.c
 create mode 100644 src/otr/otr-fe.h
 create mode 100644 src/otr/otr-formats.c
 create mode 100644 src/otr/otr-formats.h
 create mode 100644 src/otr/otr-ops.c
 create mode 100644 src/otr/otr.c
 create mode 100644 src/otr/otr.h

diff --git a/.travis.yml b/.travis.yml
index e2b3f57c..a17cb3ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,17 +27,23 @@ addons:
         packages:
             - libperl-dev
             - elinks
+            - libgcrypt11-dev
 
 before_install:
     - perl -V
-    - ./autogen.sh --with-proxy --with-bot --with-perl=module
+    - wget https://otr.cypherpunks.ca/libotr-4.1.1.tar.gz
+    - tar zxf libotr-*.tar.gz
+    - cd libotr-*
+    - ./configure --prefix $HOME/otr-prefix && make && make install
+    - cd ..
+    - ./autogen.sh --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-prefix/lib --with-libotr-inc-prefix=$HOME/otr-prefix/include
     - make dist
     - cd ..
     - tar xaf */irssi-*.tar.*
     - cd irssi-*
 
 install:
-    - ./configure --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
+    - ./configure --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-prefix/lib --with-libotr-inc-prefix=$HOME/otr-prefix/include --prefix=$HOME/irssi-build
       $( $UNITTESTS && echo --enable-always-build-tests )
     - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
     - make install
diff --git a/AUTHORS b/AUTHORS
index c1280552..db5ad2de 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,8 @@ Large feature patches by:
   Heikki Orsila : DCC SEND queueing
   Mark Trumbull : DCC SERVER
   Francesco Fracassi : Passive DCC
+  Uli Meis : OTR support
+  David Goulet : OTR support
 
 Other patches (grep for "patch" in ChangeLog) by:
 
diff --git a/configure.ac b/configure.ac
index 0231e109..6cba4fb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,21 @@ AC_ARG_WITH(perl,
 	fi,
 	want_perl=static)
 
+AC_ARG_WITH(otr,
+[  --with-otr[=yes|no|module]   Build with OTR support - also specifies
+                                if it should be built into the main irssi
+                                binary or as a module (default)],
+	if test x$withval = xyes; then
+		want_otr=module
+	elif test x$withval = xstatic; then
+		want_otr=static
+	elif test x$withval = xmodule; then
+		want_otr=module
+	else
+		want_otr=no
+	fi,
+	want_otr=no)
+
 AC_ARG_ENABLE(true-color,
 [  --enable-true-color     Build with true color support in terminal],
 	if test x$enableval = xno ; then
@@ -527,6 +542,48 @@ if test "x$want_capsicum" = "xyes"; then
 	])
 fi
 
+dnl **
+dnl ** OTR checks
+dnl **
+
+have_otr=no
+if test "x$want_otr" != "xno"; then
+	AM_PATH_LIBGCRYPT(1:1.2.0, [], [AC_ERROR(libgcrypt 1.2.0 or newer is required.)])
+	AM_PATH_LIBOTR(4.1.0, [], [AC_ERROR([libotr 4.1.0 or newer is required.])])
+
+	OTR_CFLAGS="$LIBOTR_CFLAGS $LIBGCRYPT_CFLAGS"
+	OTR_LDFLAGS="$LIBOTR_LIBS $LIBGCRYPT_LIBS"
+
+	AC_SUBST(otr_module_lib)
+	AC_SUBST(otr_static_lib)
+
+	if test "x$want_otr" != "xno"; then
+		if test "x$want_otr" = "xstatic"; then
+			otr_module_lib=
+			otr_static_lib=libotr_core_static.la
+
+			OTR_LINK_LIBS="../otr/libotr_core_static.la"
+			OTR_LINK_FLAGS="$OTR_LDFLAGS"
+
+			AC_DEFINE(HAVE_STATIC_OTR)
+		else
+			otr_module_lib=libotr_core.la
+			otr_static_lib=
+		fi
+	fi
+
+	AC_SUBST(otr_module_lib)
+	AC_SUBST(otr_static_lib)
+
+	AC_SUBST(OTR_CFLAGS)
+	AC_SUBST(OTR_LDFLAGS)
+
+	AC_SUBST(OTR_LINK_LIBS)
+	AC_SUBST(OTR_LINK_FLAGS)
+
+	have_otr=yes
+fi
+
 dnl ** check what we want to build
 AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
 AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
@@ -535,6 +592,7 @@ AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
 AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
 AM_CONDITIONAL(HAVE_CAPSICUM, test "x$want_capsicum" = "xyes")
 AM_CONDITIONAL(USE_GREGEX, test "x$want_gregex" = "xyes")
+AM_CONDITIONAL(HAVE_OTR, test "x$have_otr" != "xno")
 
 # move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
 PROG_LIBS=$LIBS
@@ -629,6 +687,7 @@ fi
 AH_TEMPLATE(HAVE_GMODULE)
 AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
 AH_TEMPLATE(HAVE_STATIC_PERL)
+AH_TEMPLATE(HAVE_STATIC_OTR)
 AH_TEMPLATE(PRIuUOFF_T, [printf()-format for uoff_t, eg. "u" or "lu" or "llu"])
 AH_TEMPLATE(UOFF_T_INT, [What type should be used for uoff_t])
 AH_TEMPLATE(UOFF_T_LONG)
@@ -662,6 +721,7 @@ src/perl/common/Makefile.PL
 src/perl/irc/Makefile.PL
 src/perl/ui/Makefile.PL
 src/perl/textui/Makefile.PL
+src/otr/Makefile
 scripts/Makefile
 scripts/examples/Makefile
 tests/Makefile
@@ -755,5 +815,14 @@ echo "Building with true color support.. : $want_truecolor"
 echo "Building with GRegex ............. : $want_gregex"
 echo "Building with Capsicum ........... : $want_capsicum"
 
+if test "x$want_otr" = "xstatic"; then
+	echo "Building with OTR support ........ : static (in irssi binary)"
+elif test "x$want_otr" = "xmodule"; then
+	echo "Building with OTR support ........ : module"
+else
+	echo "Building with OTR support ........ : no"
+fi
+
+
 echo
 echo "If there are any problems, read the INSTALL file."
diff --git a/docs/help/in/otr.in b/docs/help/in/otr.in
new file mode 100644
index 00000000..c31bd8e8
--- /dev/null
+++ b/docs/help/in/otr.in
@@ -0,0 +1,111 @@
+
+OTR %|[OPTION]
+
+Command to control the OTR module. Without an option, this help is printed.
+
+This help contains three sections which are %9options, quickstart and files.%n
+
+To add the OTR status bar (highly recommended):
+
+%9/statusbar window add otr%n
+
+%9Options:%n
+
+AUTH <secret>
+    Start or respond to an authentication process.
+
+AUTHQ <question> <secret>
+    Start a SMP authentication process.
+
+    Example: %9/otr authq "My question is" "this is the secret"%n
+
+AUTHABORT
+    Abort an ongoing authentication process.
+
+CONTEXTS
+    List known contexts which basically list the known fingerprints and their
+    state.
+
+DEBUG
+    Turn on debugging.
+
+DISTRUST <fingerprint>
+    Distrust a specific fingerprint. This command can be done inside a private
+    window for which the current fingerprint of the other person will be used
+    or else set fp to a human readable OTR fingerprint available with the above
+    contexts command.
+
+    Examples: %9/otr distrust 487FFADA 5073FEDD C5AB5C14 5BB6C1FF 6D40D48A%n
+
+FINISH
+    End the OTR session. This MUST be done inside a private conversation
+    window.
+
+FORGET <fingerprint>
+    Forget a specific fingerprint (deleted from the known fingerprints). The
+    behavior is the same as the distrust command explained above.
+
+GENKEY <name>
+    Generate OTR keys for a given account name. This is done automatically
+    if someone tries to establish a secure session.
+
+    This process is done in a background worker and can take an arbitrary
+    amount of time. The completion is checked when another irssi event is
+    catched.
+
+HELP
+    Print this help.
+
+INFO
+    Display the OTR fingerprint(s) of all your account(s).
+
+INIT
+    Initialize an OTR conversation within a private conversation window.
+
+TRUST <fingerprint>
+    Trust a specific fingerprint. The behavior is the same as the forget and
+    distrust commands explained above.
+
+VERSION
+    Print the version of the OTR module.
+
+%9Quickstart:%n
+
+Start a private conversation with the person you want to initiate a secure
+session. Once in the private message window:
+
+%9/otr init%n
+
+Key generation should start if no key is found for your account name. Once the
+process is done, either type a message which should automatically start the
+session or redo the init command.
+
+Time to authenticate the person. Either use a shared secret exchange through
+phone or GPG-signed email or use the socialist millionaire problem mechanism
+(SMP) which is basically to ask a question for which the answer can only be
+known by the other person.
+
+%9/otr auth <shared-secret>%n OR %9/otr authq "A question" <shared-secret>%n
+
+Or to respond to an authentication:
+
+%9/otr auth <secret>%n
+
+%9Files:%n
+
+This otr modules creates a directory in %9$HOME/.irssi/otr%n and creates three
+files:
+
+* %9otr.key%n
+    Contains your OTR private key(s). NEVER shared this directory with someone
+    else unless you know what you are doing.
+
+* %9otr.fp%n
+    The known fingerprints with their _trust_ status.
+
+* %9otr.instag
+    Instance tag of the libotr. This should NEVER be copied to an other
+    computer. If unsure, just ignore this file.
+
+For more information on OTR, see https://otr.cypherpunks.ca/
+
diff --git a/docs/signals.txt b/docs/signals.txt
index 7776dad7..84d4518f 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -350,3 +350,9 @@ Perl
 ----
 
 "script error", PERL_SCRIPT_REC, char *errormsg
+
+OTR Core
+--------
+
+otr.c:
+ "otr event", SERVER_REC, char *nick, char *status
diff --git a/m4/libotr.m4 b/m4/libotr.m4
new file mode 100644
index 00000000..80b25f86
--- /dev/null
+++ b/m4/libotr.m4
@@ -0,0 +1,134 @@
+dnl
+dnl  Off-the-Record Messaging library
+dnl  Copyright (C) 2004-2007  Ian Goldberg, Chris Alexander, Nikita Borisov
+dnl                           <otr@cypherpunks.ca>
+dnl
+dnl  This library is free software; you can redistribute it and/or
+dnl  modify it under the terms of version 2.1 of the GNU Lesser General
+dnl  Public License as published by the Free Software Foundation.
+dnl
+dnl  This library is distributed in the hope that it will be useful,
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl  Lesser General Public License for more details.
+dnl
+dnl  You should have received a copy of the GNU Lesser General Public
+dnl  License along with this library; if not, write to the Free Software
+dnl  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+
+dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
+dnl enables arguments --with-libotr-prefix=
+dnl                   --with-libotr-inc-prefix=
+dnl
+dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
+dnl
+dnl Adapted from alsa.m4, originally by
+dnl      Richard Boulton <richard-alsa@tartarus.org>
+dnl      Christopher Lansdown <lansdoct@cs.alfred.edu>
+dnl      Jaroslav Kysela <perex@suse.cz>
+
+AC_DEFUN([AM_PATH_LIBOTR],
+[dnl Save the original CFLAGS, LDFLAGS, and LIBS
+libotr_save_CFLAGS="$CFLAGS"
+libotr_save_LDFLAGS="$LDFLAGS"
+libotr_save_LIBS="$LIBS"
+libotr_found=yes
+
+dnl
+dnl Get the cflags and libraries for libotr
+dnl
+AC_ARG_WITH(libotr-prefix,
+[  --with-libotr-prefix=PFX  Prefix where libotr is installed(optional)],
+[libotr_prefix="$withval"], [libotr_prefix=""])
+
+AC_ARG_WITH(libotr-inc-prefix,
+[  --with-libotr-inc-prefix=PFX  Prefix where libotr includes are (optional)],
+[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
+
+dnl Add any special include directories
+AC_MSG_CHECKING(for libotr CFLAGS)
+if test "$libotr_inc_prefix" != "" ; then
+	LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
+	CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
+fi
+AC_MSG_RESULT($LIBOTR_CFLAGS)
+
+dnl add any special lib dirs
+AC_MSG_CHECKING(for libotr LIBS)
+if test "$libotr_prefix" != "" ; then
+	LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
+	LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
+fi
+
+dnl add the libotr library
+LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
+LIBS="$LIBOTR_LIBS $LIBS"
+AC_MSG_RESULT($LIBOTR_LIBS)
+
+dnl Check for a working version of libotr that is of the right version.
+min_libotr_version=ifelse([$1], ,3.0.0,$1)
+no_libotr=""
+    libotr_min_major_version=`echo $min_libotr_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    libotr_min_minor_version=`echo $min_libotr_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    libotr_min_sub_version=`echo $min_libotr_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
+
+AC_LANG_SAVE
+AC_LANG_C
+AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <libotr/version.h>
+], [
+#  if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
+#    error not present
+#  else
+
+#    if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
+       exit(0);
+#    else
+#      if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
+#        error not present
+#      endif
+
+#      if(OTRL_VERSION_SUB < $libotr_min_sub_version)
+#        error not present
+#      endif
+#    endif
+#  endif
+exit(0);
+],
+  [AC_MSG_RESULT(found.)],
+  [AC_MSG_RESULT(not present.)
+   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
+   libotr_found=no]
+)
+AC_LANG_RESTORE
+
+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
+AC_CHECK_LIB([otr], [otrl_message_receiving],,
+	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
+	 libotr_found=no],
+	 $LIBGCRYPT_LIBS
+)
+
+LDFLAGS="$libotr_save_LDFLAGS"
+LIBS="$libotr_save_LIBS"
+
+if test "x$libotr_found" = "xyes" ; then
+   ifelse([$2], , :, [$2])
+else
+   LIBOTR_CFLAGS=""
+   LIBOTR_LIBS=""
+   ifelse([$3], , :, [$3])
+fi
+
+dnl That should be it.  Now just export our symbols:
+AC_SUBST(LIBOTR_CFLAGS)
+AC_SUBST(LIBOTR_LIBS)
+])
+
diff --git a/src/Makefile.am b/src/Makefile.am
index a7fb2ee2..48cdc3eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,8 +14,12 @@ if HAVE_PERL
 PERLDIR=perl
 endif
 
+if HAVE_OTR
+OTRDIR=otr
+endif
+
 pkginc_srcdir=$(pkgincludedir)/src
 pkginc_src_HEADERS = \
 	common.h
 
-SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI)
+SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(OTRDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI)
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index d6e767b6..94c53e74 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -35,41 +35,6 @@ typedef struct {
 	int tag;
 } SIMPLE_THREAD_REC;
 
-static int g_io_channel_write_block(GIOChannel *channel, void *data, int len)
-{
-        gsize ret;
-	int sent;
-	GIOStatus status;
-
-	sent = 0;
-	do {
-		status = g_io_channel_write_chars(channel, (char *) data + sent,
-						  len-sent, &ret, NULL);
-                sent += ret;
-	} while (sent < len && status != G_IO_STATUS_ERROR);
-
-	return sent < len ? -1 : 0;
-}
-
-static int g_io_channel_read_block(GIOChannel *channel, void *data, int len)
-{
-	time_t maxwait;
-        gsize ret;
-	int received;
-	GIOStatus status;
-
-	maxwait = time(NULL)+2;
-	received = 0;
-	do {
-		status = g_io_channel_read_chars(channel, (char *) data + received,
-						 len-received, &ret, NULL);
-		received += ret;
-	} while (received < len && time(NULL) < maxwait &&
-		 status != G_IO_STATUS_ERROR && status != G_IO_STATUS_EOF);
-
-	return received < len ? -1 : 0;
-}
-
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */
 int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
diff --git a/src/core/network.c b/src/core/network.c
index d280b463..0e326e22 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -48,6 +48,39 @@ GIOChannel *g_io_channel_new(int handle)
 	return chan;
 }
 
+int g_io_channel_write_block(GIOChannel *channel, void *data, int len)
+{
+	gsize ret;
+	int sent;
+	GIOStatus status;
+
+	sent = 0;
+	do {
+		status = g_io_channel_write_chars(channel, (char *) data + sent, len - sent, &ret, NULL);
+		sent += ret;
+	} while (sent < len && status != G_IO_STATUS_ERROR);
+
+	return sent < len ? -1 : 0;
+}
+
+int g_io_channel_read_block(GIOChannel *channel, void *data, int len)
+{
+	time_t maxwait;
+	gsize ret;
+	int received;
+	GIOStatus status;
+
+	maxwait = time(NULL)+2;
+	received = 0;
+	do {
+		status = g_io_channel_read_chars(channel, (char *) data + received, len - received, &ret, NULL);
+		received += ret;
+	} while (received < len && time(NULL) < maxwait &&
+		status != G_IO_STATUS_ERROR && status != G_IO_STATUS_EOF);
+
+	return received < len ? -1 : 0;
+}
+
 IPADDR ip4_any = {
 	AF_INET,
 #if defined(IN6ADDR_ANY_INIT)
diff --git a/src/core/network.h b/src/core/network.h
index e60f607f..30fd6aab 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -36,6 +36,8 @@ GIOChannel *g_io_channel_new(int handle);
 /* Returns 1 if IPADDRs are the same. */
 /* Deprecated since it is unused. It will be deleted in a later release. */
 int net_ip_compare(IPADDR *ip1, IPADDR *ip2) G_GNUC_DEPRECATED;
+int g_io_channel_write_block(GIOChannel *channel, void *data, int len);
+int g_io_channel_read_block(GIOChannel *channel, void *data, int len);
 
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
 
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index bdd3df22..6ce8427c 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -9,7 +9,8 @@ AM_CPPFLAGS = \
 irssi_DEPENDENCIES = \
 	@COMMON_LIBS@ \
 	@PERL_LINK_LIBS@ \
-	@PERL_FE_LINK_LIBS@
+	@PERL_FE_LINK_LIBS@ \
+	@OTR_LINK_LIBS@
 
 irssi_LDFLAGS = -export-dynamic
 
@@ -17,6 +18,8 @@ irssi_LDADD = \
 	@COMMON_LIBS@ \
 	@PERL_LINK_LIBS@ \
 	@PERL_FE_LINK_LIBS@ \
+	@OTR_LINK_LIBS@ \
+	@OTR_LINK_FLAGS@ \
 	@PERL_LINK_FLAGS@ \
 	@PROG_LIBS@ \
 	@TEXTUI_LIBS@
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index f30ce4b8..728f456e 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -54,6 +54,11 @@ void fe_perl_init(void);
 void fe_perl_deinit(void);
 #endif
 
+#ifdef HAVE_STATIC_OTR
+void otr_core_init(void);
+void otr_core_deinit(void);
+#endif
+
 void irc_init(void);
 void irc_deinit(void);
 
@@ -183,6 +188,10 @@ static void textui_finish_init(void)
 	fe_perl_init();
 #endif
 
+#ifdef HAVE_STATIC_OTR
+	otr_core_init();
+#endif
+
 	dirty_check();
 
 	fe_common_core_finish_init();
@@ -221,8 +230,12 @@ static void textui_deinit(void)
 		module_unload(modules->data);
 
 #ifdef HAVE_STATIC_PERL
-        perl_core_deinit();
-        fe_perl_deinit();
+	perl_core_deinit();
+	fe_perl_deinit();
+#endif
+
+#ifdef HAVE_STATIC_OTR
+	otr_core_deinit();
 #endif
 
 	dirty_check(); /* one last time to print any quit messages */
diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am
new file mode 100644
index 00000000..3b991839
--- /dev/null
+++ b/src/otr/Makefile.am
@@ -0,0 +1,42 @@
+moduledir = $(libdir)/irssi/modules
+
+module_LTLIBRARIES = $(otr_module_lib)
+noinst_LTLIBRARIES = $(otr_static_lib)
+
+EXTRA_LTLIBRARIES = \
+	libotr_core.la \
+	libotr_core_static.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core/ \
+	-I$(top_srcdir)/src/irc/core/ \
+	-I$(top_srcdir)/src/fe-common/core/ \
+	-I$(top_srcdir)/src/fe-text/ \
+	$(GLIB_CFLAGS) \
+	$(OTR_CFLAGS)
+
+libotr_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
+libotr_core_la_LIBADD = $(OTR_LDFLAGS)
+
+otr_sources = \
+	key.c \
+	module.c \
+	otr-formats.c \
+	otr-ops.c \
+	otr-fe.c \
+	otr.c
+
+libotr_core_la_SOURCES = \
+	$(otr_sources)
+
+libotr_core_static_la_SOURCES = \
+	$(otr_sources)
+
+noinst_HEADERS = \
+	irssi-otr.h \
+	key.h \
+	module.h \
+	otr-formats.h \
+	otr-fe.h \
+	otr.h
diff --git a/src/otr/irssi-otr.h b/src/otr/irssi-otr.h
new file mode 100644
index 00000000..718e1e66
--- /dev/null
+++ b/src/otr/irssi-otr.h
@@ -0,0 +1,39 @@
+/*
+ * Off-the-Record Messaging (OTR) module for the irssi IRC client
+ *
+ * Copyright (C) 2008 - Uli Meis <a.sporto+bee@gmail.com>
+ *               2012 - David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef IRSSI_IRSSI_OTR_H
+#define IRSSI_IRSSI_OTR_H
+
+/* Ease our life a bit. */
+#define OTR_IRSSI_MSG_PREFIX	"%9OTR%9: "
+
+/*
+ * Irssi macros for printing text to console.
+ */
+#define IRSSI_OTR_DEBUG(fmt, ...) \
+	do {                                                                    \
+		if (otr_debug_get()) {                                              \
+			printtext(NULL, NULL, MSGLEVEL_MSGS, OTR_IRSSI_MSG_PREFIX fmt,  \
+						## __VA_ARGS__);                                    \
+		}                                                                   \
+	} while (0)
+
+#endif /* IRSSI_IRSSI_OTR_H */
diff --git a/src/otr/key.c b/src/otr/key.c
new file mode 100644
index 00000000..4032b0b2
--- /dev/null
+++ b/src/otr/key.c
@@ -0,0 +1,402 @@
+/*
+ * Off-the-Record Messaging (OTR) modules for IRC
+ *
+ * Copyright (C) 2008 - Uli Meis <a.sporto+bee@gmail.com>
+ *               2012 - David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#define _GNU_SOURCE
+#include <glib.h>
+#include <libgen.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/poll.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include "key.h"
+
+#include "levels.h"
+#include "network.h"
+#include "pidwait.h"
+#include "printtext.h"
+
+#include "irssi-otr.h"
+#include "otr-formats.h"
+
+/*
+ * Status of key generation.
+ */
+enum key_gen_status {
+	KEY_GEN_IDLE		= 0,
+	KEY_GEN_RUNNING		= 1,
+	KEY_GEN_FINISHED	= 2,
+	KEY_GEN_ERROR		= 3,
+};
+
+/*
+ * Data of the state of key generation.
+ */
+struct key_gen_data {
+	struct otr_user_state *ustate;
+	char *account_name;
+	char *key_file_path;
+	enum key_gen_status status;
+	gcry_error_t gcry_error;
+};
+
+/*
+ * Event from the key generation process.
+ */
+struct key_gen_event {
+	enum key_gen_status status;
+	gcry_error_t error;
+};
+
+/*
+ * Key generation process.
+ */
+struct key_gen_worker {
+	int tag;
+	GIOChannel *pipes[2];
+};
+
+/*
+ * Key generation data for the thread in charge of creating the key.
+ */
+static struct key_gen_data key_gen_state = {
+	.status = KEY_GEN_IDLE,
+	.gcry_error = GPG_ERR_NO_ERROR,
+};
+
+/*
+ * Build file path concatenate to the irssi config dir.
+ */
+static char *file_path_build(const char *path)
+{
+	g_return_val_if_fail(path != NULL, NULL);
+
+	/* Either NULL or the filename is returned here which is valid. */
+	return g_strdup_printf("%s/%s", get_irssi_dir(), path);
+}
+
+/*
+ * Emit a key generation status event.
+ */
+static void emit_event(GIOChannel *pipe, enum key_gen_status status, gcry_error_t error)
+{
+	struct key_gen_event event;
+
+	g_return_if_fail(pipe != NULL);
+
+	event.status = status;
+	event.error = error;
+
+	g_io_channel_write_block(pipe, &event, sizeof(event));
+}
+
+/*
+ * Reset key generation state and status is IDLE.
+ */
+static void reset_key_gen_state(void)
+{
+	/* Safety. */
+	g_free(key_gen_state.key_file_path);
+	g_free(key_gen_state.account_name);
+
+	/* Nullify everything. */
+	memset(&key_gen_state, 0, sizeof(key_gen_state));
+	key_gen_state.status = KEY_GEN_IDLE;
+	key_gen_state.gcry_error = GPG_ERR_NO_ERROR;
+}
+
+/*
+ * Read status event from key generation worker.
+ */
+static void read_key_gen_status(struct key_gen_worker *worker, GIOChannel *pipe)
+{
+	struct key_gen_event event;
+	gcry_error_t err;
+
+	g_return_if_fail(worker != NULL);
+
+	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
+
+	if (g_io_channel_read_block(pipe, &event, sizeof(event)) == -1) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+				TXT_OTR_KEYGEN_FAILED,
+				key_gen_state.account_name,
+				g_strerror(errno));
+		return;
+	}
+
+	key_gen_state.status = event.status;
+	key_gen_state.gcry_error = event.error;
+
+	if (event.status == KEY_GEN_FINISHED || event.status == KEY_GEN_ERROR) {
+		/* Worker is done. */
+		g_source_remove(worker->tag);
+
+		g_io_channel_shutdown(worker->pipes[0], TRUE, NULL);
+		g_io_channel_unref(worker->pipes[0]);
+
+		g_io_channel_shutdown(worker->pipes[1], TRUE, NULL);
+		g_io_channel_unref(worker->pipes[1]);
+
+		g_free(worker);
+
+		if (event.status == KEY_GEN_ERROR) {
+			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+					TXT_OTR_KEYGEN_FAILED,
+					key_gen_state.account_name,
+					gcry_strerror(key_gen_state.gcry_error));
+			reset_key_gen_state();
+			return;
+		}
+
+		err = otrl_privkey_read(key_gen_state.ustate->otr_state, key_gen_state.key_file_path);
+
+		if (err != GPG_ERR_NO_ERROR) {
+			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+					TXT_OTR_KEYGEN_FAILED,
+					key_gen_state.account_name,
+					gcry_strerror(key_gen_state.gcry_error));
+		} else {
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
+					TXT_OTR_KEYGEN_COMPLETED,
+					key_gen_state.account_name);
+		}
+
+		reset_key_gen_state();
+	}
+}
+
+/*
+ * Run key generation in a seperate process (takes ages). The other process
+ * will rewrite the key file, we shouldn't change anything till it's done and
+ * we've reloaded the keys.
+ */
+void key_gen_run(struct otr_user_state *ustate, const char *account_name)
+{
+	struct key_gen_worker *worker;
+	int fd[2];
+	gcry_error_t err;
+	pid_t pid;
+
+	g_return_if_fail(ustate != NULL);
+	g_return_if_fail(account_name != NULL);
+
+	if (key_gen_state.status != KEY_GEN_IDLE) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_OTR_KEYGEN_RUNNING, key_gen_state.account_name);
+		return;
+	}
+
+	/* Make sure the pointer does not go away during the proess. */
+	key_gen_state.account_name = strdup(account_name);
+	key_gen_state.ustate = ustate;
+
+	/* Creating key file path. */
+	key_gen_state.key_file_path = file_path_build(OTR_KEYFILE);
+	if (key_gen_state.key_file_path == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+				TXT_OTR_KEYGEN_FAILED,
+				key_gen_state.account_name,
+				g_strerror(errno));
+		reset_key_gen_state();
+		return;
+	}
+
+	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_OTR_KEYGEN_STARTED, key_gen_state.account_name);
+
+	if (pipe(fd) != 0) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+				TXT_OTR_KEYGEN_FAILED,
+				key_gen_state.account_name,
+				g_strerror(errno));
+		reset_key_gen_state();
+		return;
+	}
+
+	worker = g_new0(struct key_gen_worker, 1);
+
+	if (worker == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+				TXT_OTR_KEYGEN_FAILED,
+				key_gen_state.account_name,
+				g_strerror(errno));
+		reset_key_gen_state();
+		return;
+	}
+
+	worker->pipes[0] = g_io_channel_new(fd[0]);
+	worker->pipes[1] = g_io_channel_new(fd[1]);
+
+	pid = fork();
+
+	if (pid > 0) {
+		/* Parent process */
+		pidwait_add(pid);
+		worker->tag = g_input_add(worker->pipes[0], G_INPUT_READ, (GInputFunction)read_key_gen_status, worker);
+		return;
+	}
+
+	if (pid != 0) {
+		/* error */
+		g_warning("Key generation failed: %s", g_strerror(errno));
+
+		g_source_remove(worker->tag);
+
+		g_io_channel_shutdown(worker->pipes[0], TRUE, NULL);
+		g_io_channel_unref(worker->pipes[0]);
+
+		g_io_channel_shutdown(worker->pipes[1], TRUE, NULL);
+		g_io_channel_unref(worker->pipes[1]);
+
+		g_free(worker);
+
+		return;
+	}
+
+	/* Child process */
+	key_gen_state.status = KEY_GEN_RUNNING;
+	emit_event(worker->pipes[1], KEY_GEN_RUNNING, GPG_ERR_NO_ERROR);
+
+	err = otrl_privkey_generate(key_gen_state.ustate->otr_state, key_gen_state.key_file_path, key_gen_state.account_name, OTR_PROTOCOL_ID);
+
+	if (err != GPG_ERR_NO_ERROR) {
+		emit_event(worker->pipes[1], KEY_GEN_ERROR, err);
+		_exit(99);
+		return;
+	}
+
+	emit_event(worker->pipes[1], KEY_GEN_FINISHED, GPG_ERR_NO_ERROR);
+
+	_exit(99);
+}
+
+/*
+ * Write fingerprints to file.
+ */
+void key_write_fingerprints(struct otr_user_state *ustate)
+{
+	gcry_error_t err;
+	char *filename;
+
+	g_return_if_fail(ustate != NULL);
+
+	filename = file_path_build(OTR_FINGERPRINTS_FILE);
+	g_return_if_fail(filename != NULL);
+
+	err = otrl_privkey_write_fingerprints(ustate->otr_state, filename);
+	if (err == GPG_ERR_NO_ERROR) {
+		IRSSI_OTR_DEBUG("Fingerprints saved to %9%s%9", filename);
+	} else {
+		IRSSI_OTR_DEBUG("Error writing fingerprints: %d (%d)",
+				gcry_strerror(err), gcry_strsource(err));
+	}
+
+	g_free(filename);
+}
+
+/*
+ * Write instance tags to file.
+ */
+void key_write_instags(struct otr_user_state *ustate)
+{
+	gcry_error_t err;
+	char *filename;
+
+	g_return_if_fail(ustate != NULL);
+
+	filename = file_path_build(OTR_INSTAG_FILE);
+	g_return_if_fail(filename != NULL);
+
+	err = otrl_instag_write(ustate->otr_state, filename);
+	if (err == GPG_ERR_NO_ERROR) {
+		IRSSI_OTR_DEBUG("Instance tags saved in %9%s%9", filename);
+	} else {
+		IRSSI_OTR_DEBUG("Error saving instance tags: %d (%d)",
+				gcry_strerror(err), gcry_strsource(err));
+	}
+
+	g_free(filename);
+}
+
+/*
+ * Load private keys.
+ */
+void key_load(struct otr_user_state *ustate)
+{
+	int ret;
+	gcry_error_t err;
+	char *filename;
+
+	g_return_if_fail(ustate != NULL);
+
+	filename = file_path_build(OTR_KEYFILE);
+	g_return_if_fail(filename != NULL);
+
+	ret = access(filename, F_OK);
+	if (ret < 0) {
+		IRSSI_OTR_DEBUG("No private keys found in %9%s%9", filename);
+		g_free(filename);
+		return;
+	}
+
+	err = otrl_privkey_read(ustate->otr_state, filename);
+	if (err == GPG_ERR_NO_ERROR) {
+		IRSSI_OTR_DEBUG("Private keys loaded from %9%s%9", filename);
+	} else {
+		IRSSI_OTR_DEBUG("Error loading private keys: %d (%d)",
+				gcry_strerror(err), gcry_strsource(err));
+	}
+
+	g_free(filename);
+}
+
+/*
+ * Load fingerprints.
+ */
+void key_load_fingerprints(struct otr_user_state *ustate)
+{
+	int ret;
+	gcry_error_t err;
+	char *filename;
+
+	g_return_if_fail(ustate != NULL);
+
+	filename = file_path_build(OTR_FINGERPRINTS_FILE);
+	g_return_if_fail(filename != NULL);
+
+	ret = access(filename, F_OK);
+	if (ret < 0) {
+		IRSSI_OTR_DEBUG("No fingerprints found in %9%s%9", filename);
+		g_free(filename);
+		return;
+	}
+
+	err = otrl_privkey_read_fingerprints(ustate->otr_state, filename, NULL,
+			NULL);
+	if (err == GPG_ERR_NO_ERROR) {
+		IRSSI_OTR_DEBUG("Fingerprints loaded from %9%s%9", filename);
+	} else {
+		IRSSI_OTR_DEBUG("Error loading fingerprints: %d (%d)",
+				gcry_strerror(err), gcry_strsource(err));
+	}
+
+	g_free(filename);
+}
diff --git a/src/otr/key.h b/src/otr/key.h
new file mode 100644
index 00000000..259a8e67
--- /dev/null
+++ b/src/otr/key.h
@@ -0,0 +1,35 @@
+/*
+ * Off-the-Record Messaging (OTR) modules for IRC
+ *
+ * Copyright (C) 2012 - David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef IRSSI_OTR_KEY_H
+#define IRSSI_OTR_KEY_H
+
+#include "common.h"
+#include "servers.h"
+
+#include "otr.h"
+
+void key_gen_run(struct otr_user_state *ustate, const char *account_name);
+void key_load(struct otr_user_state *ustate);
+void key_load_fingerprints(struct otr_user_state *ustate);
+void key_write_fingerprints(struct otr_user_state *ustate);
+void key_write_instags(struct otr_user_state *ustate);
+
+#endif /* IRSSI_OTR_KEY_H */
diff --git a/src/otr/module.c b/src/otr/module.c
new file mode 100644
index 00000000..ca3107b1
--- /dev/null
+++ b/src/otr/module.c
@@ -0,0 +1,261 @@
+/*
+ * Off-the-Record Messaging (OTR) module for the irssi IRC client
+ *
+ * Copyright (C) 2008  Uli Meis <a.sporto+bee@gmail.com>
+ *               2012  David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#define _GNU_SOURCE
+#include <glib.h>
+
+#include "module.h"
+
+#include "signals.h"
+#include "queries.h"
+#include "commands.h"
+
+#include "irc.h"
+#include "irc-servers.h"
+#include "irc-queries.h"
+#include "irc-commands.h"
+
+#include "key.h"
+#include "otr.h"
+#include "otr-formats.h"
+#include "otr-fe.h"
+#include "misc.h"
+
+/*
+ * Global state for the user. Init when the module loads.
+ */
+struct otr_user_state *user_state_global;
+
+/*
+ * Pipes all outgoing private messages through OTR
+ */
+static void sig_server_sendmsg(SERVER_REC *server, const char *target,
+		const char *msg, void *target_type_p)
+{
+	char *otrmsg = NULL;
+
+	if (GPOINTER_TO_INT(target_type_p) != SEND_TARGET_NICK) {
+		otrl_message_free(otrmsg);
+		return;
+	}
+
+	/* Critical section. On error, message MUST NOT be sent */
+	if (otr_send(server, msg, target, &otrmsg)) {
+		signal_stop();
+		otrl_message_free(otrmsg);
+		return;
+	}
+
+	if (otrmsg == NULL) {
+		/* Send original message */
+		signal_continue(4, server, target, msg, target_type_p);
+	} else {
+		/* Send encrypted message */
+		signal_continue(4, server, target, otrmsg, target_type_p);
+	}
+
+	otrl_message_free(otrmsg);
+}
+
+/*
+ * Pipes all incoming private messages through OTR
+ */
+void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address)
+{
+	char *new_msg = NULL;
+
+	if (otr_receive(server, msg, nick, &new_msg)) {
+		signal_stop();
+		otrl_message_free(new_msg);
+		return;
+	}
+
+	if (new_msg == NULL) {
+		/* This message was not OTR */
+		signal_continue(4, server, msg, nick, address);
+	} else {
+		/*
+		 * Check for /me IRC marker and if so, handle it so the user does not
+		 * receive a message beginning with /me but rather let irssi handle it
+		 * as a IRC action.
+		 */
+		if (strncmp(new_msg, OTR_IRC_MARKER_ME, OTR_IRC_MARKER_ME_LEN) == 0) {
+			signal_stop();
+			signal_emit("message irc action", 5, server, new_msg + OTR_IRC_MARKER_ME_LEN, nick, address, nick);
+		} else {
+			/* OTR received message */
+			signal_continue(4, server, new_msg, nick, address);
+		}
+	}
+
+	otrl_message_free(new_msg);
+}
+
+/*
+ * Finish an OTR conversation when its query is closed.
+ */
+static void sig_query_destroyed(QUERY_REC *query)
+{
+	if (query && query->server && query->server->connrec) {
+		otr_finish(query->server, query->name);
+	}
+}
+
+/*
+ * Handle /me IRC command.
+ */
+static void cmd_me(const char *data, IRC_SERVER_REC *server,
+		WI_ITEM_REC *item)
+{
+	const char *target;
+	char *msg, *otrmsg = NULL;
+	QUERY_REC *query;
+
+	query = QUERY(item);
+
+	if (query == NULL || query->server == NULL) {
+		return;
+	}
+
+	CMD_IRC_SERVER(server);
+	if (!IS_IRC_QUERY(query)) {
+		return;
+	}
+
+	if (server == NULL || !server->connected) {
+		cmd_return_error(CMDERR_NOT_CONNECTED);
+	}
+
+	target = window_item_get_target(item);
+
+	msg = g_strdup_printf(OTR_IRC_MARKER_ME "%s", data);
+	g_return_if_fail(msg != NULL);
+
+	/* Critical section. On error, message MUST NOT be sent */
+	otr_send(query->server, msg, target, &otrmsg);
+	g_free(msg);
+
+	if (otrmsg == NULL) {
+		return;
+	}
+
+	signal_stop();
+
+	if (otrmsg) {
+		/* Send encrypted message */
+		otr_send_message(SERVER(server), target, otrmsg);
+		otrl_message_free(otrmsg);
+	}
+
+	signal_emit("message irc own_action", 3, server, data, item->visible_name);
+}
+
+/*
+ * Optionally finish conversations on /quit. We're already doing this on unload
+ * but the quit handler terminates irc connections before unloading.
+ */
+static void cmd_quit(const char *data, void *server, WI_ITEM_REC *item)
+{
+	otr_finishall(user_state_global);
+}
+
+/*
+ * Create otr module directory if none exists.
+ */
+static void create_module_dir(void)
+{
+	char *dir_path = NULL;
+	struct stat statbuf;
+
+	/* Create ~/.irssi/otr directory. */
+	dir_path = g_strdup_printf("%s/%s", get_irssi_dir(), OTR_DIR);
+	g_return_if_fail(dir_path != NULL);
+
+	if (stat(dir_path, &statbuf) != 0) {
+		if (g_mkdir_with_parents(dir_path, 0700) != 0)
+			g_warning("Unable to create OTR directory path.");
+	} else if (!S_ISDIR(statbuf.st_mode)) {
+		g_warning("%s is not a directory.", dir_path);
+		g_warning("You should remove it with command: rm %s", dir_path);
+	}
+
+	g_free(dir_path);
+}
+
+void otr_send_message(SERVER_REC *server, const char *recipient, const char *msg)
+{
+	/*
+	 * Apparently, there are cases where the server record is NULL which has
+	 * been reported with the irssi xmpp plugin. In that case, just return an
+	 * do nothing.
+	 */
+	g_return_if_fail(server != NULL);
+
+	server->send_message(server, recipient, msg, GPOINTER_TO_INT(SEND_TARGET_NICK));
+}
+
+/*
+ * irssi init()
+ */
+void otr_core_init(void)
+{
+	module_register("otr", "core");
+
+	create_module_dir();
+
+	otr_lib_init();
+
+	user_state_global = otr_init_user_state();
+	g_return_if_fail(user_state_global != NULL);
+
+	signal_add_first("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
+	signal_add_first("message private", (SIGNAL_FUNC) sig_message_private);
+	signal_add("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
+
+	command_bind_first("quit", NULL, (SIGNAL_FUNC) cmd_quit);
+	command_bind_irc_first("me", NULL, (SIGNAL_FUNC) cmd_me);
+
+	otr_fe_init();
+}
+
+/*
+ * irssi deinit()
+ */
+void otr_core_deinit(void)
+{
+	signal_remove("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
+	signal_remove("message private", (SIGNAL_FUNC) sig_message_private);
+	signal_remove("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
+
+	otr_fe_deinit();
+
+	command_unbind("quit", (SIGNAL_FUNC) cmd_quit);
+	command_unbind("me", (SIGNAL_FUNC) cmd_me);
+
+	otr_finishall(user_state_global);
+
+	/* Remove glib timer if any. */
+	otr_control_timer(0, NULL);
+
+	otr_free_user_state(user_state_global);
+
+	otr_lib_uninit();
+}
diff --git a/src/otr/module.h b/src/otr/module.h
new file mode 100644
index 00000000..fdfc77bd
--- /dev/null
+++ b/src/otr/module.h
@@ -0,0 +1,29 @@
+/*
+ * Off-the-Record Messaging (OTR) module for the irssi IRC client
+ *
+ * Copyright (C) 2012 - David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef IRSSI_OTR_MODULE
+#define IRSSI_OTR_MODULE
+
+#include "common.h"
+#include "servers.h"
+
+void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address);
+
+#endif /* IRSSI_OTR_MODULE */
diff --git a/src/otr/otr-fe.c b/src/otr/otr-fe.c
new file mode 100644
index 00000000..13e37576
--- /dev/null
+++ b/src/otr/otr-fe.c
@@ -0,0 +1,344 @@
+/*
+ * Off-the-Record Messaging (OTR) module for the irssi IRC client
+ *
+ * Copyright (C) 2008  Uli Meis <a.sporto+bee@gmail.com>
+ *               2012  David Goulet <dgoulet@ev0ke.net>
+ *               2014  Alexander Færøy <ahf@0x90.dk>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#include "common.h"
+#include "levels.h"
+#include "printtext.h"
+#include "commands.h"
+#include "irc.h"
+#include "irc-servers.h"
+#include "irc-queries.h"
+#include "statusbar-item.h"
+
+#include "otr.h"
+#include "otr-formats.h"
+#include "key.h"
+
+static void cmd_otr(const char *data, SERVER_REC *server, void *item)
+{
+	if (*data == '\0')
+		data = "info"; // FIXME(ahf): Is this really what we want as default?
+
+	command_runsub("otr", data, server, item);
+
+	// We always redraw the OTR statusbar, just in case.
+	statusbar_items_redraw("otr");
+}
+
+static void cmd_otr_debug(const char *data)
+{
+	otr_debug_toggle();
+
+	if (otr_debug_get())
+		printtext(NULL, NULL, MSGLEVEL_CRAP, "OTR debugging enabled");
+	else
+		printtext(NULL, NULL, MSGLEVEL_CRAP, "OTR debugging disabled");
+}
+
+static void cmd_otr_init(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+	ConnContext *ctx;
+
+	g_return_if_fail(server != NULL);
+
+	if (!server->connected)
+		cmd_return_error(CMDERR_NOT_CONNECTED);
+
+	if (!IS_QUERY(item))
+		cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	query = QUERY(item);
+	target = query->name;
+
+	ctx = otr_find_context(server, target, FALSE);
+	if (ctx && ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
+		printformat(server, target, MSGLEVEL_CRAP, TXT_OTR_SESSION_ALREADY_SECURED, ctx->accountname);
+		return;
+	}
+
+	printformat(server, target, MSGLEVEL_CRAP, TXT_OTR_SESSION_INITIATING);
+
+	/*
+	 * Irssi does not handle well the HTML tag in the default OTR query message
+	 * so just send the OTR tag instead. Contact me for a better fix! :)
+	 */
+	otr_send_message(server, target, "?OTRv23?");
+}
+
+static void cmd_otr_finish(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+
+	g_return_if_fail(server != NULL);
+
+	if (!server->connected)
+		cmd_return_error(CMDERR_NOT_CONNECTED);
+
+	if (!IS_QUERY(item))
+		cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	query = QUERY(item);
+	target = query->name;
+
+	otr_finish(server, target);
+}
+
+static void cmd_otr_trust(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+
+	char *fingerprint, *human_fingerprint;
+	void *free_arg;
+
+	g_return_if_fail(server != NULL);
+
+	query = QUERY(item);
+	target = query ? query->name : NULL;
+
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST, &fingerprint))
+		return;
+
+	// We fallback to target if fingerprint isn't specified.
+	if (*fingerprint == '\0' && target == NULL)
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	human_fingerprint = g_ascii_strup(fingerprint, -1);
+	otr_trust(server, target, human_fingerprint, user_state_global);
+	g_free(human_fingerprint);
+
+	cmd_params_free(free_arg);
+}
+
+static void cmd_otr_distrust(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+
+	char *fingerprint, *human_fingerprint;
+	void *free_arg;
+
+	g_return_if_fail(server != NULL);
+
+	query = QUERY(item);
+	target = query ? query->name : NULL;
+
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST, &fingerprint))
+		return;
+
+	// We fallback to target if fingerprint isn't specified.
+	if (*fingerprint == '\0' && target == NULL)
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	human_fingerprint = g_ascii_strup(fingerprint, -1);
+	otr_distrust(server, target, human_fingerprint, user_state_global);
+	g_free(human_fingerprint);
+
+	cmd_params_free(free_arg);
+}
+
+static void cmd_otr_forget(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+
+	char *fingerprint, *human_fingerprint;
+	void *free_arg;
+
+	g_return_if_fail(server != NULL);
+
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST, &fingerprint))
+		return;
+
+	query = QUERY(item);
+	target = query ? query->name : NULL;
+
+	// We fallback to target if fingerprint isn't specified.
+	if (*fingerprint == '\0' && target == NULL)
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	human_fingerprint = g_ascii_strup(fingerprint, -1);
+	otr_forget(server, target, human_fingerprint, user_state_global);
+	g_free(human_fingerprint);
+
+	cmd_params_free(free_arg);
+}
+
+static void cmd_otr_authabort(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+
+	query = QUERY(item);
+	target = query ? query->name : NULL;
+
+	if (server == NULL || target == NULL)
+		cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	otr_auth_abort(server, target);
+}
+
+static void cmd_otr_auth(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+
+	char *secret;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, 1, &secret))
+		return;
+
+	query = QUERY(item);
+	target = query ? query->name : NULL;
+
+	if (server == NULL || target == NULL || *secret == '\0')
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	if (*secret == '\0')
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	otr_auth(server, target, NULL, secret);
+
+	cmd_params_free(free_arg);
+}
+
+static void cmd_otr_authq(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	QUERY_REC *query;
+	char *target;
+
+	char *question, *secret;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, 2, &question, &secret))
+		return;
+
+	query = QUERY(item);
+	target = query ? query->name : NULL;
+
+	if (server == NULL || target == NULL || *question == '\0' || *secret == '\0')
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	otr_auth(server, target, question, secret);
+
+	cmd_params_free(free_arg);
+}
+
+static void cmd_otr_genkey(const char *data)
+{
+	char *account_name;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, 1, &account_name))
+		return;
+
+	if (*account_name == '\0')
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	key_gen_run(user_state_global, account_name);
+
+	cmd_params_free(free_arg);
+}
+
+static void cmd_otr_contexts(const char *data)
+{
+	otr_contexts(user_state_global);
+}
+
+static void cmd_otr_info(const char *data)
+{
+	gboolean empty = TRUE;
+	char ownfp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
+	OtrlPrivKey *key;
+
+	for (key = user_state_global->otr_state->privkey_root; key != NULL; key = key->next) {
+		otrl_privkey_fingerprint(user_state_global->otr_state, ownfp, key->accountname, OTR_PROTOCOL_ID);
+
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_OTR_FP_NICK, key->accountname, ownfp);
+
+		empty = FALSE;
+	}
+
+	if (empty)
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_OTR_KEYS_UNAVAILABLE);
+}
+
+static void statusbar_otr(struct SBAR_ITEM_REC *item, int get_size_only)
+{
+	WI_ITEM_REC *wi_item = active_win->active;
+	QUERY_REC *query = QUERY(wi_item);
+	enum otr_status_format format = TXT_OTR_MODULE_NAME;
+
+	if (query && query->server && query->server->connrec) {
+		format = otr_get_status_format(query->server, query->name);
+	}
+
+	statusbar_item_default_handler(item, get_size_only,
+			format ? fe_otr_formats[format].def : "", " ", FALSE);
+}
+
+void otr_fe_init(void)
+{
+	theme_register(fe_otr_formats);
+
+	command_bind("otr", NULL, (SIGNAL_FUNC) cmd_otr);
+	command_bind("otr debug", NULL, (SIGNAL_FUNC) cmd_otr_debug);
+	command_bind("otr init", NULL, (SIGNAL_FUNC) cmd_otr_init);
+	command_bind("otr finish", NULL, (SIGNAL_FUNC) cmd_otr_finish);
+	command_bind("otr trust", NULL, (SIGNAL_FUNC) cmd_otr_trust);
+	command_bind("otr distrust", NULL, (SIGNAL_FUNC) cmd_otr_distrust);
+	command_bind("otr forget", NULL, (SIGNAL_FUNC) cmd_otr_forget);
+	command_bind("otr authabort", NULL, (SIGNAL_FUNC) cmd_otr_authabort);
+	command_bind("otr auth", NULL, (SIGNAL_FUNC) cmd_otr_auth);
+	command_bind("otr authq", NULL, (SIGNAL_FUNC) cmd_otr_authq);
+	command_bind("otr genkey", NULL, (SIGNAL_FUNC) cmd_otr_genkey);
+	command_bind("otr contexts", NULL, (SIGNAL_FUNC) cmd_otr_contexts);
+	command_bind("otr info", NULL, (SIGNAL_FUNC) cmd_otr_info);
+
+	statusbar_item_register("otr", NULL, statusbar_otr);
+	statusbar_items_redraw("window");
+}
+
+void otr_fe_deinit(void)
+{
+	theme_unregister();
+
+	command_unbind("otr", (SIGNAL_FUNC) cmd_otr);
+	command_unbind("otr debug", (SIGNAL_FUNC) cmd_otr_debug);
+	command_unbind("otr init", (SIGNAL_FUNC) cmd_otr_init);
+	command_unbind("otr finish", (SIGNAL_FUNC) cmd_otr_finish);
+	command_unbind("otr trust", (SIGNAL_FUNC) cmd_otr_trust);
+	command_unbind("otr distrust", (SIGNAL_FUNC) cmd_otr_distrust);
+	command_unbind("otr forget", (SIGNAL_FUNC) cmd_otr_forget);
+	command_unbind("otr authabort", (SIGNAL_FUNC) cmd_otr_authabort);
+	command_unbind("otr auth", (SIGNAL_FUNC) cmd_otr_auth);
+	command_unbind("otr authq", (SIGNAL_FUNC) cmd_otr_authq);
+	command_unbind("otr genkey", (SIGNAL_FUNC) cmd_otr_genkey);
+	command_unbind("otr contexts", (SIGNAL_FUNC) cmd_otr_contexts);
+	command_unbind("otr info", (SIGNAL_FUNC) cmd_otr_info);
+
+	statusbar_item_unregister("otr");
+}
diff --git a/src/otr/otr-fe.h b/src/otr/otr-fe.h
new file mode 100644
index 00000000..c9aaebb3
--- /dev/null
+++ b/src/otr/otr-fe.h
@@ -0,0 +1,28 @@
+/*
+ * Off-the-Record Messaging (OTR) module for the irssi IRC client
+ *
+ * Copyright (C) 2008  Uli Meis <a.sporto+bee@gmail.com>
+ *               2012  David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef IRSSI_OTR_FE_H
+#define IRSSI_OTR_FE_H
+
+void otr_fe_init(void);
+void otr_fe_deinit(void);
+
+#endif
diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c
new file mode 100644
index 00000000..e430b6b5
--- /dev/null
+++ b/src/otr/otr-formats.c
@@ -0,0 +1,108 @@
+/*
+ * Off-the-Record Messaging (OTR) modules for IRC
+ *
+ * Copyright (C) - 2012  David Goulet <dgoulet@ev0ke.net>
+ *                 2014  Alexander Færøy <ahf@0x90.dk>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#include "otr.h"
+#include "otr-formats.h"
+
+FORMAT_REC fe_otr_formats[] = {
+	{ MODULE_NAME, "Core", 0 },
+
+	/* Status bar format. */
+	{ NULL, "OTR Statusbar", 0 },
+
+	{ "otr_stb_plaintext", "{sb plaintext}", 0},
+	{ "otr_stb_finished", "{sb %yfinished%n}", 0},
+	{ "otr_stb_unknown", "{sb {hilight state unknown (BUG!)}}", 0},
+	{ "otr_stb_untrusted", "{sb %GOTR%n (%runverified%n)}", 0},
+	{ "otr_stb_trust", "{sb %GOTR%n}", 0},
+
+	/* OTR format. */
+	{ NULL, "OTR", 0 },
+
+	{ "otr_auth_aborted", "Authentication aborted", 0},
+	{ "otr_auth_initiated", "Initiated authentication", 0},
+	{ "otr_auth_ongoing_aborted", "Ongoing authentication aborted", 0},
+	{ "otr_auth_response", "Responding to authentication", 0},
+
+	{ "otr_ctx_list_header", "{hilight Contexts}", 0},
+	{ "otr_ctx_list_encrypted_line", "{hilight $0} - {hilight $1} (Encrypted)", 2, { 0, 0 }},
+	{ "otr_ctx_list_finished_line", "{hilight $0} - {hilight $1} (Finished)", 2, { 0, 0 }},
+	{ "otr_ctx_list_manual_line", "  {hilight $0} (Manual)", 1, { 0, 0 }},
+	{ "otr_ctx_list_plaintext_line", "{hilight $0} - {hilight $1} (Plaintext)", 2, { 0, 0 }},
+	{ "otr_ctx_list_smp_line", "  {hilight $0} (SMP)", 1, { 0, 0 }},
+	{ "otr_ctx_list_unknown_line", "{hilight $0} - {hilight $1} (Unknown)", 2, { 0, 0 }},
+	{ "otr_ctx_list_unused_line", "{hilight $0} - {hilight $1} (Unused)", 2, { 0, 0 }},
+	{ "otr_ctx_list_unverified_line", "  {hilight $0} (Unverified)", 1, { 0, 0 }},
+	{ "otr_ctx_list_footer", "", 0},
+	{ "otr_ctx_missing", "{error No active OTR contexts found}", 0},
+	{ "otr_ctx_nick_missing", "{error Context for {hilight $0} not found}", 1, { 1 }},
+
+	{ "otr_fp_already_distrusted", "{error Already distrusting: {hilight $0}", 1, { 0 }},
+	{ "otr_fp_already_trusted", "{error Already trusting: {hilight $0}", 1, { 0 }},
+	{ "otr_fp_ctx_encrypted", "Fingerprint context is still encrypted. Finish the OTR session before forgetting a fingerprint", 0},
+	{ "otr_fp_distrusted", "Distrusting {hilight $0}", 1, { 0 }},
+	{ "otr_fp_forgotten", "Fingerprint {hilight $0} forgotten", 1, { 0 }},
+	{ "otr_fp_info", "OTR key fingerprint: {hilight $1} for {hilight $0}", 2, { 0, 0 }},
+	{ "otr_fp_missing", "{error Fingerprint {hilight $0} not found", 1, { 0 }},
+	{ "otr_fp_nick", "Fingerprint for {hilight $0}: {hilight $1}", 2, { 0, 0 }},
+	{ "otr_fp_trusted", "Trusting {hilight $0}", 1, { 0 }},
+
+	{ "otr_keygen_completed", "OTR key generation for {hilight $0} completed", 1, { 0 }},
+	{ "otr_keygen_failed", "OTR key generation for {hilight $0} failed: {error $1}", 2, { 0, 0 }},
+	{ "otr_keygen_running", "OTR key generation for {hilight $0} is still in progress", 1, { 0 }},
+	{ "otr_keygen_started", "OTR key generation for {hilight $0} started", 1, { 0 }},
+
+	{ "otr_keys_unavailable", "{error No OTR keys available}", 0},
+
+	{ "otr_msg_encryption_ended", "{hilight $0} has closed the connection to you", 1, { 0 }},
+	{ "otr_msg_encryption_error", "{error An error occured when encrypting your message}", 0},
+	{ "otr_msg_encryption_required", "Encryptioned is required", 0},
+	{ "otr_msg_error", "Error in private conversation: {error $0}", 1, { 0 }},
+	{ "otr_msg_general_error", "General Error: {error $0}", 1, { 0 }},
+	{ "otr_msg_malformed", "Malformed message from {hilight $0}", 1, { 0 }},
+	{ "otr_msg_not_in_private", "The encrypted message from {hilight $0} was is unreadable because you're not communicating privately", 1, { 0 }},
+	{ "otr_msg_reflected", "Received reflected message from {hilight $0}", 0, { 0 }},
+	{ "otr_msg_resent", "The last message to {hilight $0} was resent: $1", 2, { 0, 0 }},
+	{ "otr_msg_unencrypted", "The following message from {hilight $0} was {error not} encrypted", 1, { 0 }},
+	{ "otr_msg_unreadable", "Unreadable encrypted message from {hilight $0}", 1, { 0 }},
+	{ "otr_msg_unrecognized", "Unrecognized OTR message from {hilight $0}", 1, { 0 }},
+
+	{ "otr_session_already_finished", "Nothing to do", 0},
+	{ "otr_session_already_secured", "Secure session with {hilight $0} already established", 1, { 0 }},
+	{ "otr_session_finished", "{hilight $0} has finished the OTR session. Use /otr init to restart or /otr finish to finish.", 1, { 0 }},
+	{ "otr_session_finishing", "Finished conversation with {hilight $0}", 1, { 0 }},
+	{ "otr_session_initiating", "Initiating OTR session ...", 0},
+	{ "otr_session_insecure", "Session insecured", 0},
+	{ "otr_session_missing", "{error No OTR session available}", 0},
+	{ "otr_session_secure", "Session secured", 0},
+	{ "otr_session_unauthenticated_warning", "Your peer is not authenticated", 0},
+
+	{ "otr_smp_answer_footer", "Use /otr auth <answer> to complete", 0},
+	{ "otr_smp_answer_header", "{hilight $0} wants to authenticate and asked:", 1, { 0 }},
+	{ "otr_smp_answer_question", "Question: {hilight $0}", 1, { 0 }},
+	{ "otr_smp_failure", "Authentication with {hilight $0} failed", 1, { 0 }},
+	{ "otr_smp_in_progress", "{hilight $0} replied to your auth request", 1, { 0 }},
+	{ "otr_smp_secret_question", "{hilight $0} wants to authenticate. Use /otr auth <secret> to complete", 1, { 0 }},
+	{ "otr_smp_success", "Authentication with {hilight $0} succesful", 1, { 0 }},
+
+	/* Last element. */
+	{ NULL, NULL, 0 }
+};
diff --git a/src/otr/otr-formats.h b/src/otr/otr-formats.h
new file mode 100644
index 00000000..454b2f6c
--- /dev/null
+++ b/src/otr/otr-formats.h
@@ -0,0 +1,112 @@
+/*
+ * Off-the-Record Messaging (OTR) modules for IRC
+ *
+ * Copyright (C) - 2012  David Goulet <dgoulet@ev0ke.net>
+ *                 2014  Alexander Færøy <ahf@0x90.dk>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef IRSSI_OTR_FORMATS_H
+#define IRSSI_OTR_FORMATS_H
+
+#include "formats.h"
+
+/*
+ * Must be in sync with the fe_otr_formats array.
+ */
+enum otr_status_format {
+	TXT_OTR_MODULE_NAME,
+
+	/* Status bar format. */
+	TXT_OTR_FILL_1,
+	TXT_OTR_STB_PLAINTEXT,
+	TXT_OTR_STB_FINISHED,
+	TXT_OTR_STB_UNKNOWN,
+	TXT_OTR_STB_UNTRUSTED,
+	TXT_OTR_STB_TRUST,
+
+	/* OTR format. */
+	TXT_OTR_FILL_2,
+	TXT_OTR_AUTH_ABORTED,
+	TXT_OTR_AUTH_INITIATED,
+	TXT_OTR_AUTH_ONGOING_ABORTED,
+	TXT_OTR_AUTH_RESPONSE,
+
+	TXT_OTR_CTX_LIST_HEADER,
+	TXT_OTR_CTX_LIST_ENCRYPTED_LINE,
+	TXT_OTR_CTX_LIST_FINISHED_LINE,
+	TXT_OTR_CTX_LIST_MANUAL_LINE,
+	TXT_OTR_CTX_LIST_PLAINTEXT_LINE,
+	TXT_OTR_CTX_LIST_SMP_LINE,
+	TXT_OTR_CTX_LIST_UNKNOWN_LINE,
+	TXT_OTR_CTX_LIST_UNUSED_LINE,
+	TXT_OTR_CTX_LIST_UNVERIFIED_LINE,
+	TXT_OTR_CTX_LIST_FOOTER,
+	TXT_OTR_CTX_MISSING,
+	TXT_OTR_CTX_NICK_MISSING,
+
+	TXT_OTR_FP_ALREADY_DISTRUSED,
+	TXT_OTR_FP_ALREADY_TRUSTED,
+	TXT_OTR_FP_CTX_ENCRYPTED,
+	TXT_OTR_FP_DISTRUSTED,
+	TXT_OTR_FP_FORGOTTEN,
+	TXT_OTR_FP_INFO,
+	TXT_OTR_FP_MISSING,
+	TXT_OTR_FP_NICK,
+	TXT_OTR_FP_TRUSTED,
+
+	TXT_OTR_KEYGEN_COMPLETED,
+	TXT_OTR_KEYGEN_FAILED,
+	TXT_OTR_KEYGEN_RUNNING,
+	TXT_OTR_KEYGEN_STARTED,
+
+	TXT_OTR_KEYS_UNAVAILABLE,
+
+	TXT_OTR_MSG_ENCRYPTION_ENDED,
+	TXT_OTR_MSG_ENCRYPTION_ERROR,
+	TXT_OTR_MSG_ENCRYPTION_REQUIRED,
+	TXT_OTR_MSG_ERROR,
+	TXT_OTR_MSG_GENERAL_ERROR,
+	TXT_OTR_MSG_MALFORMED,
+	TXT_OTR_MSG_NOT_IN_PRIVATE,
+	TXT_OTR_MSG_REFLECTED,
+	TXT_OTR_MSG_RESENT,
+	TXT_OTR_MSG_UNENCRYPTED,
+	TXT_OTR_MSG_UNREADABLE,
+	TXT_OTR_MSG_UNRECOGNIZED,
+
+	TXT_OTR_SESSION_ALREADY_FINISHED,
+	TXT_OTR_SESSION_ALREADY_SECURED,
+	TXT_OTR_SESSION_FINISHED,
+	TXT_OTR_SESSION_FINISHING,
+	TXT_OTR_SESSION_INITIATING,
+	TXT_OTR_SESSION_INSECURE,
+	TXT_OTR_SESSION_MISSING,
+	TXT_OTR_SESSION_SECURE,
+	TXT_OTR_SESSION_UNAUTHENTICATED_WARNING,
+
+	TXT_OTR_SMP_ANSWER_FOOTER,
+	TXT_OTR_SMP_ANSWER_HEADER,
+	TXT_OTR_SMP_ANSWER_QUESTION,
+	TXT_OTR_SMP_FAILURE,
+	TXT_OTR_SMP_IN_PROGRESS,
+	TXT_OTR_SMP_SECRET_QUESTION,
+	TXT_OTR_SMP_SUCCESS
+};
+
+extern FORMAT_REC fe_otr_formats[];
+
+#endif /* IRSSI_OTR_FORMATS_H */
diff --git a/src/otr/otr-ops.c b/src/otr/otr-ops.c
new file mode 100644
index 00000000..9359e63e
--- /dev/null
+++ b/src/otr/otr-ops.c
@@ -0,0 +1,362 @@
+/*
+ * Off-the-Record Messaging (OTR) modules for IRC
+ * Copyright (C) 2008  Uli Meis <a.sporto+bee@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#include "common.h"
+
+#include "signals.h"
+#include "levels.h"
+#include "printtext.h"
+#include "fe-windows.h"
+
+#include "key.h"
+#include "module.h"
+#include "otr-formats.h"
+#include "irssi-otr.h"
+
+static OtrlPolicy OTR_DEFAULT_POLICY = OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE;
+
+/*
+ * Return default policy for now.
+ */
+static OtrlPolicy ops_policy(void *opdata, ConnContext *context)
+{
+	return OTR_DEFAULT_POLICY;
+}
+
+/*
+ * Request for key generation.
+ *
+ * The lib actually expects us to be finished before the call returns. Since
+ * this can take more than an hour on some systems there isn't even a point in
+ * trying...
+ */
+static void ops_create_privkey(void *opdata, const char *accountname,
+		const char *protocol)
+{
+	key_gen_run(user_state_global, accountname);
+}
+
+/*
+ * Inject OTR message.
+ */
+static void ops_inject_msg(void *opdata, const char *accountname,
+		const char *protocol, const char *recipient, const char *message)
+{
+	SERVER_REC *server = opdata;
+
+	IRSSI_OTR_DEBUG("Inject msg:\n[%s]", message);
+	otr_send_message(server, recipient, message);
+}
+
+/*
+ * Gone secure.
+ */
+static void ops_secure(void *opdata, ConnContext *context)
+{
+	char ownfp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
+	char peerfp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
+	SERVER_REC *server = opdata;
+	struct otr_peer_context *opc;
+
+	g_return_if_fail(context != NULL);
+	/* This should *really* not happened */
+	g_return_if_fail(context->msgstate == OTRL_MSGSTATE_ENCRYPTED);
+
+	printformat(server, context->username, MSGLEVEL_CLIENTCRAP, TXT_OTR_SESSION_SECURE);
+	otr_status_change(server, context->username, OTR_STATUS_GONE_SECURE);
+
+	opc = context->app_data;
+	opc->active_fingerprint = context->active_fingerprint;
+
+	if (otrl_context_is_fingerprint_trusted(context->active_fingerprint)) {
+		/* Secure and trusted */
+		return;
+	}
+
+	/* Not authenticated. Let's print out the fingerprints for comparison. */
+	otrl_privkey_hash_to_human(peerfp, context->active_fingerprint->fingerprint);
+	otrl_privkey_fingerprint(user_state_global->otr_state, ownfp, context->accountname, OTR_PROTOCOL_ID);
+
+	printformat(server, context->username, MSGLEVEL_CLIENTCRAP, TXT_OTR_SESSION_UNAUTHENTICATED_WARNING);
+	printformat(server, context->username, MSGLEVEL_CLIENTCRAP, TXT_OTR_FP_INFO, server->nick, ownfp);
+	printformat(server, context->username, MSGLEVEL_CLIENTCRAP, TXT_OTR_FP_INFO, context->username, peerfp);
+}
+
+/*
+ * Gone insecure.
+ */
+static void ops_insecure(void *opdata, ConnContext *context)
+{
+	SERVER_REC *server = opdata;
+
+	printformat(server, context->username, MSGLEVEL_CLIENTCRAP, TXT_OTR_SESSION_INSECURE);
+	otr_status_change(server, context->username, OTR_STATUS_GONE_INSECURE);
+}
+
+/*
+ * Really critical with IRC. Unfortunately, we can't tell our peer which size
+ * to use.
+ */
+static int ops_max_msg(void *opdata, ConnContext *context)
+{
+	return OTR_MAX_MSG_SIZE;
+}
+
+static void ops_handle_msg_event(void *opdata, OtrlMessageEvent msg_event, ConnContext *context, const char *message, gcry_error_t err)
+{
+	SERVER_REC *server = opdata;
+	char *username = context->username;
+
+	switch (msg_event) {
+		case OTRL_MSGEVENT_NONE:
+			break;
+		case OTRL_MSGEVENT_ENCRYPTION_REQUIRED:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_ENCRYPTION_REQUIRED);
+			break;
+		case OTRL_MSGEVENT_ENCRYPTION_ERROR:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_ENCRYPTION_ERROR);
+			break;
+		case OTRL_MSGEVENT_CONNECTION_ENDED:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_ENCRYPTION_ENDED, username);
+			break;
+		case OTRL_MSGEVENT_SETUP_ERROR:
+			if (!err) {
+				err = GPG_ERR_INV_VALUE;
+			}
+			switch (err) {
+				case GPG_ERR_INV_VALUE:
+					printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_MALFORMED, username);
+					break;
+				default:
+					printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_ERROR, gcry_strerror(err));
+					break;
+			}
+			break;
+		case OTRL_MSGEVENT_MSG_REFLECTED:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_REFLECTED, username);
+			break;
+		case OTRL_MSGEVENT_MSG_RESENT:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_RESENT, username, message);
+			break;
+		case OTRL_MSGEVENT_RCVDMSG_NOT_IN_PRIVATE:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_NOT_IN_PRIVATE, username);
+			break;
+		case OTRL_MSGEVENT_RCVDMSG_UNREADABLE:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_UNREADABLE, username);
+			break;
+		case OTRL_MSGEVENT_RCVDMSG_MALFORMED:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_MALFORMED, username);
+			break;
+		case OTRL_MSGEVENT_LOG_HEARTBEAT_RCVD:
+			IRSSI_OTR_DEBUG("Heartbeat received from %s.", username);
+			break;
+		case OTRL_MSGEVENT_LOG_HEARTBEAT_SENT:
+			IRSSI_OTR_DEBUG("Heartbeat sent to %s.", username);
+			break;
+		case OTRL_MSGEVENT_RCVDMSG_GENERAL_ERR:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_ERROR, message);
+			break;
+		case OTRL_MSGEVENT_RCVDMSG_UNENCRYPTED:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_UNENCRYPTED, username);
+
+			/*
+			 * This is a hack I found to send the message in a private window of
+			 * the username without creating an infinite loop since the 'message
+			 * private' signal is hijacked in this module. If someone is able to
+			 * clean this up with a more elegant solution, by all means PLEASE
+			 * submit a patch or email me a better way.
+			 */
+			signal_remove("message private", (SIGNAL_FUNC) sig_message_private);
+			signal_emit("message private", 4, server, message, username, server->connrec->address);
+			signal_add_first("message private", (SIGNAL_FUNC) sig_message_private);
+			break;
+		case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED:
+			printformat(server, username, MSGLEVEL_CLIENTERROR, TXT_OTR_MSG_UNRECOGNIZED, username);
+			break;
+		case OTRL_MSGEVENT_RCVDMSG_FOR_OTHER_INSTANCE:
+			IRSSI_OTR_DEBUG("%s has sent a message for a different instance.", username);
+			break;
+	}
+}
+
+/*
+ * A context changed.
+ */
+static void ops_up_ctx_list(void *opdata)
+{
+	otr_status_change(opdata, NULL, OTR_STATUS_CTX_UPDATE);
+}
+
+/*
+ * Save fingerprint changes.
+ */
+static void ops_write_fingerprints(void *data)
+{
+	key_write_fingerprints(user_state_global);
+}
+
+static int ops_is_logged_in(void *opdata, const char *accountname, const char *protocol, const char *recipient)
+{
+	int ret;
+	SERVER_REC *server = opdata;
+
+	/* Logged in? */
+	ret = server != NULL;
+
+	IRSSI_OTR_DEBUG("User %s %s logged in", accountname, ret ? "" : "not");
+
+	return ret;
+}
+
+static void ops_create_instag(void *opdata, const char *accountname,
+		const char *protocol)
+{
+	otrl_instag_generate(user_state_global->otr_state, "/dev/null", accountname, protocol);
+	key_write_instags(user_state_global);
+}
+
+static void ops_smp_event(void *opdata, OtrlSMPEvent smp_event,
+		ConnContext *context, unsigned short progress_percent, char *question)
+{
+	SERVER_REC *server = opdata;
+	const char *from = context->username;
+	struct otr_peer_context *opc = context->app_data;
+
+	/*
+	 * Without a peer context, we can't update the status bar. Code flow error
+	 * if none is found. This context is created automatically by an otrl_*
+	 * call or if non existent when returned from
+	 * otrl_message_sending/receiving.
+	 */
+	g_return_if_fail(opc != NULL);
+
+	opc->smp_event = smp_event;
+
+	switch (smp_event) {
+		case OTRL_SMPEVENT_ASK_FOR_SECRET:
+			printformat(server, from, MSGLEVEL_CLIENTCRAP, TXT_OTR_SMP_SECRET_QUESTION, from);
+			opc->ask_secret = 1;
+			otr_status_change(server, from, OTR_STATUS_SMP_INCOMING);
+			break;
+		case OTRL_SMPEVENT_ASK_FOR_ANSWER:
+			printformat(server, from, MSGLEVEL_CLIENTCRAP, TXT_OTR_SMP_ANSWER_HEADER, from);
+			printformat(server, from, MSGLEVEL_CLIENTCRAP, TXT_OTR_SMP_ANSWER_QUESTION, question);
+			printformat(server, from, MSGLEVEL_CLIENTCRAP, TXT_OTR_SMP_ANSWER_FOOTER);
+			opc->ask_secret = 1;
+			otr_status_change(server, from, OTR_STATUS_SMP_INCOMING);
+			break;
+		case OTRL_SMPEVENT_IN_PROGRESS:
+			printformat(server, from, MSGLEVEL_CLIENTCRAP, TXT_OTR_SMP_IN_PROGRESS, from);
+			otr_status_change(server, from, OTR_STATUS_SMP_FINALIZE);
+			break;
+		case OTRL_SMPEVENT_SUCCESS:
+			printformat(server, from, MSGLEVEL_CLIENTCRAP, TXT_OTR_SMP_SUCCESS, from);
+			otr_status_change(server, from, OTR_STATUS_SMP_SUCCESS);
+			break;
+		case OTRL_SMPEVENT_ABORT:
+			otr_auth_abort(server, context->username);
+			otr_status_change(server, from, OTR_STATUS_SMP_ABORTED);
+			break;
+		case OTRL_SMPEVENT_FAILURE:
+		case OTRL_SMPEVENT_CHEATED:
+		case OTRL_SMPEVENT_ERROR:
+			printformat(server, from, MSGLEVEL_CLIENTERROR, TXT_OTR_SMP_FAILURE, from);
+			otr_status_change(server, from, OTR_STATUS_SMP_FAILED);
+			break;
+		default:
+			g_warning("Received unknown SMP event: %d", smp_event);
+			break;
+	}
+}
+
+/*
+ * timer_control callback.
+ */
+static void ops_timer_control(void *opdata, unsigned int interval)
+{
+	otr_control_timer(interval, opdata);
+}
+
+/*
+ * Handle otr error message.
+ */
+static const char *ops_otr_error_message(void *opdata, ConnContext *context,
+		OtrlErrorCode code)
+{
+	char *msg = NULL;
+
+	switch (code) {
+	case OTRL_ERRCODE_NONE:
+		break;
+	case OTRL_ERRCODE_ENCRYPTION_ERROR:
+		msg = strdup("Error occurred encrypting message.");
+		break;
+	case OTRL_ERRCODE_MSG_NOT_IN_PRIVATE:
+		if (context) {
+			msg = strdup("You sent encrypted data which was unexpected");
+		}
+		break;
+	case OTRL_ERRCODE_MSG_UNREADABLE:
+		msg = strdup("You transmitted an unreadable encrypted message");
+		break;
+	case OTRL_ERRCODE_MSG_MALFORMED:
+		msg = strdup("You transmitted a malformed data message.");
+		break;
+	}
+
+	return msg;
+}
+
+/*
+ * Free otr error message callback.
+ */
+static void ops_otr_error_message_free(void *opdata, const char *err_msg)
+{
+	g_free_not_null((char *)err_msg);
+}
+
+/*
+ * Assign OTR message operations.
+ */
+OtrlMessageAppOps otr_ops = {
+	ops_policy,
+	ops_create_privkey,
+	ops_is_logged_in,
+	ops_inject_msg,
+	ops_up_ctx_list,
+	NULL, /* new_fingerprint */
+	ops_write_fingerprints,
+	ops_secure,
+	ops_insecure,
+	NULL, /* still_secure */
+	ops_max_msg,
+	NULL, /* account_name */
+	NULL, /* account_name_free */
+	NULL, /* received_symkey */
+	ops_otr_error_message,
+	ops_otr_error_message_free,
+	NULL, /* resent_msg_prefix */
+	NULL, /* resent_msg_prefix_free */
+	ops_smp_event,
+	ops_handle_msg_event,
+	ops_create_instag,
+	NULL, /* convert_msg */
+	NULL, /* convert_free */
+	ops_timer_control,
+};
diff --git a/src/otr/otr.c b/src/otr/otr.c
new file mode 100644
index 00000000..765bc048
--- /dev/null
+++ b/src/otr/otr.c
@@ -0,0 +1,941 @@
+/*
+ * Off-the-Record Messaging (OTR) modules for IRC
+ *
+ * Copyright (C) 2008 - Uli Meis <a.sporto+bee@gmail.com>
+ *               2012 - David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#define _GNU_SOURCE
+#include <glib.h>
+#include <gcrypt.h>
+#include <unistd.h>
+
+#include "common.h"
+#include "levels.h"
+#include "signals.h"
+#include "printtext.h"
+#include "statusbar-item.h"
+
+#include "irssi-otr.h"
+#include "otr-formats.h"
+#include "key.h"
+
+static int otr_debug = 0;
+
+static const char *statusbar_txt[] = {
+	"FINISHED",
+	"TRUST_MANUAL",
+	"TRUST_SMP",
+	"SMP_ABORT",
+	"SMP_STARTED",
+	"SMP_RESPONDED",
+	"SMP_INCOMING",
+	"SMP_FINALIZE",
+	"SMP_ABORTED",
+	"PEER_FINISHED",
+	"SMP_FAILED",
+	"SMP_SUCCESS",
+	"GONE_SECURE",
+	"GONE_INSECURE",
+	"CTX_UPDATE"
+};
+
+/* Glib timer for otr. */
+static guint otr_timerid;
+
+/*
+ * Load instance tags.
+ */
+static void instag_load(struct otr_user_state *ustate)
+{
+	int ret;
+	char *filename;
+	gcry_error_t err;
+
+	g_return_if_fail(ustate != NULL);
+
+	/* Getting the otr instance filename path */
+	filename = g_strdup_printf("%s%s", get_irssi_dir(), OTR_INSTAG_FILE);
+	g_return_if_fail(filename != NULL);
+
+	ret = access(filename, F_OK);
+	if (ret < 0) {
+		IRSSI_OTR_DEBUG("no instance tags found at %9%s%9", filename);
+		g_free(filename);
+		return;
+	}
+
+	err = otrl_instag_read(ustate->otr_state, filename);
+	if (err == GPG_ERR_NO_ERROR)
+		IRSSI_OTR_DEBUG("Instance tags loaded from %9%s%9", filename);
+	else
+		IRSSI_OTR_DEBUG("Error loading instance tags: %d (%d)", gcry_strerror(err), gcry_strsource(err));
+
+	g_free(filename);
+}
+
+/*
+ * Free otr peer context. Callback passed to libotr.
+ */
+static void free_peer_context_cb(void *data)
+{
+	g_free_not_null(data);
+}
+
+/*
+ * Allocate otr peer context. Callback passed to libotr.
+ */
+static void add_peer_context_cb(void *data, ConnContext *context)
+{
+	struct otr_peer_context *opc;
+
+	opc = otr_create_peer_context();
+	if (opc == NULL) {
+		return;
+	}
+
+	opc->active_fingerprint = context->active_fingerprint;
+
+	context->app_data = opc;
+	context->app_data_free = free_peer_context_cb;
+
+	IRSSI_OTR_DEBUG("Peer context created for %s", context->username);
+}
+
+/*
+ * Find Irssi server record by network name.
+ */
+static SERVER_REC *find_server_by_network(const char *network)
+{
+	GSList *tmp;
+	SERVER_REC *server;
+
+	g_return_val_if_fail(network != NULL, NULL);
+
+	for (tmp = servers; tmp; tmp = tmp->next) {
+		server = tmp->data;
+
+		if (g_ascii_strncasecmp(server->tag, network, strlen(server->tag)))
+			return server;
+	}
+
+	return NULL;
+}
+
+/*
+ * Check if fingerprint is in an encrypted context.
+ *
+ * Return 1 if it does, else 0.
+ */
+static int check_fp_encrypted_msgstate(Fingerprint *fp)
+{
+	ConnContext *context;
+
+	g_return_val_if_fail(fp != NULL, 0);
+
+	/* Loop on all fingerprint's context(es). */
+	for (context = fp->context;
+			context != NULL && context->m_context == fp->context;
+			context = context->next) {
+		if (context->msgstate == OTRL_MSGSTATE_ENCRYPTED &&
+				context->active_fingerprint == fp) {
+			return 1;
+		}
+	}
+
+	/* No state is encrypted. */
+	return 0;
+}
+
+/*
+ * Timer called from the glib main loop and set up by the timer_control
+ * callback of libotr.
+ */
+static gboolean timer_fired_cb(gpointer data)
+{
+	otrl_message_poll(user_state_global->otr_state, &otr_ops, NULL);
+	return TRUE;
+}
+
+void otr_control_timer(unsigned int interval, void *opdata)
+{
+	if (otr_timerid) {
+		g_source_remove(otr_timerid);
+		otr_timerid = 0;
+	}
+
+	if (interval > 0) {
+		otr_timerid = g_timeout_add_seconds(interval, timer_fired_cb, opdata);
+	}
+}
+
+/*
+ * Is OTR debugging enabled or disabled?
+ */
+int otr_debug_get(void)
+{
+    return otr_debug;
+}
+
+/*
+ * Toggle OTR debugging.
+ */
+void otr_debug_toggle(void)
+{
+    otr_debug = !otr_debug;
+}
+
+/*
+ * Find context from nickname and irssi server record.
+ */
+ConnContext *otr_find_context(SERVER_REC *server, const char *nick, int create)
+{
+	ConnContext *ctx = NULL;
+
+	g_return_val_if_fail(server != NULL, NULL);
+	g_return_val_if_fail(server->tag != NULL, NULL);
+	g_return_val_if_fail(nick != NULL, NULL);
+
+	ctx = otrl_context_find(user_state_global->otr_state, nick, server->tag,
+			OTR_PROTOCOL_ID, OTRL_INSTAG_BEST, create, NULL,
+			add_peer_context_cb, server);
+
+	return ctx;
+}
+
+/*
+ * Create otr peer context.
+ */
+struct otr_peer_context *otr_create_peer_context(void)
+{
+	return g_new0(struct otr_peer_context, 1);
+}
+
+/*
+ * Return a newly allocated OTR user state.
+ */
+struct otr_user_state *otr_init_user_state(void)
+{
+	struct otr_user_state *ous = NULL;
+
+	ous = g_new0(struct otr_user_state, 1);
+	if (ous == NULL) {
+		return ous;
+	}
+
+	ous->otr_state = otrl_userstate_create();
+
+	instag_load(ous);
+
+	/* Load keys and fingerprints. */
+	key_load(ous);
+	key_load_fingerprints(ous);
+
+	return ous;
+}
+
+/*
+ * Destroy otr user state.
+ */
+void otr_free_user_state(struct otr_user_state *ustate)
+{
+	if (ustate->otr_state) {
+		otrl_userstate_free(ustate->otr_state);
+		ustate->otr_state = NULL;
+	}
+
+	g_free(ustate);
+}
+
+/*
+ * init otr lib.
+ */
+void otr_lib_init()
+{
+	OTRL_INIT;
+}
+
+/*
+ * deinit otr lib.
+ */
+void otr_lib_uninit()
+{
+}
+
+/*
+ * Hand the given message to OTR.
+ *
+ * Return 0 if the message was successfully handled or else a negative value.
+ */
+int otr_send(SERVER_REC *server, const char *msg, const char *to, char **otr_msg)
+{
+	gcry_error_t err;
+	ConnContext *ctx = NULL;
+
+	g_return_val_if_fail(server != NULL, -1);
+	g_return_val_if_fail(server->tag != NULL, -1);
+
+	IRSSI_OTR_DEBUG("OTR: Sending message: %s", msg);
+
+	err = otrl_message_sending(user_state_global->otr_state, &otr_ops,
+		server, server->tag, OTR_PROTOCOL_ID, to, OTRL_INSTAG_BEST, msg, NULL, otr_msg,
+		OTRL_FRAGMENT_SEND_ALL_BUT_LAST, &ctx, add_peer_context_cb, server);
+	if (err) {
+		g_warning("OTR: Send failed: %s", gcry_strerror(err));
+		return -1;
+	}
+
+	/* Add peer context to OTR context if none exists. */
+	if (ctx && !ctx->app_data) {
+		add_peer_context_cb(server, ctx);
+	}
+
+	return 0;
+}
+
+/*
+ * List otr contexts to the main Irssi windows.
+ */
+void otr_contexts(struct otr_user_state *ustate)
+{
+	char human_fp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN], *trust;
+	ConnContext *ctx, *c_iter;
+	Fingerprint *fp;
+
+	g_return_if_fail(ustate != NULL);
+
+	if (ustate->otr_state->context_root == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_OTR_CTX_MISSING);
+		return;
+	}
+
+	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_HEADER);
+
+	/* Iterate over all contextes of the user state. */
+	for (ctx = ustate->otr_state->context_root; ctx != NULL; ctx = ctx->next) {
+		OtrlMessageState best_mstate = OTRL_MSGSTATE_PLAINTEXT;
+
+		/* Skip master context. */
+		if (ctx != ctx->m_context)
+			continue;
+
+		for (fp = ctx->fingerprint_root.next; fp != NULL; fp = fp->next) {
+			int used = 0;
+			char *username, *accountname;
+
+			username = ctx->username;
+			accountname = ctx->accountname;
+
+			for (c_iter = ctx->m_context; c_iter && c_iter->m_context == ctx->m_context; c_iter = c_iter->next) {
+				/* Print account name, username and msgstate. */
+				if (c_iter->active_fingerprint == fp) {
+					used = 1;
+
+					if (c_iter->msgstate == OTRL_MSGSTATE_ENCRYPTED)
+						best_mstate = OTRL_MSGSTATE_ENCRYPTED;
+					else if (c_iter->msgstate == OTRL_MSGSTATE_FINISHED && best_mstate == OTRL_MSGSTATE_PLAINTEXT)
+						best_mstate = OTRL_MSGSTATE_FINISHED;
+				}
+			}
+
+			if (used) {
+				switch (best_mstate) {
+					case OTRL_MSGSTATE_ENCRYPTED:
+						printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_ENCRYPTED_LINE, accountname, username);
+						break;
+					case OTRL_MSGSTATE_PLAINTEXT:
+						printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_PLAINTEXT_LINE, accountname, username);
+						break;
+					case OTRL_MSGSTATE_FINISHED:
+						printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_FINISHED_LINE, accountname, username);
+						break;
+					default:
+						printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_UNKNOWN_LINE, accountname, username);
+						break;
+				};
+			} else
+				printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_UNUSED_LINE, accountname, username);
+
+			/* Hash fingerprint to human. */
+			otrl_privkey_hash_to_human(human_fp, fp->fingerprint);
+
+			trust = fp->trust;
+			if (trust && trust[0] != '\0') {
+				if (strncmp(trust, "smp", 3) == 0)
+					printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_SMP_LINE, human_fp);
+				else
+					printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_MANUAL_LINE, human_fp);
+			} else
+				printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_UNVERIFIED_LINE, human_fp);
+		}
+	}
+
+	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_OTR_CTX_LIST_FOOTER);
+}
+
+/*
+ * Finish the conversation.
+ */
+void otr_finish(SERVER_REC *server, const char *nick)
+{
+	ConnContext *ctx;
+
+	g_return_if_fail(server != NULL);
+	g_return_if_fail(nick != NULL);
+
+	ctx = otr_find_context(server, nick, FALSE);
+	if (ctx == NULL) {
+		printformat(server, nick, MSGLEVEL_CRAP, TXT_OTR_SESSION_ALREADY_FINISHED);
+		return;
+	}
+
+	otrl_message_disconnect(user_state_global->otr_state, &otr_ops, server,
+			ctx->accountname, OTR_PROTOCOL_ID, nick, ctx->their_instance);
+
+	otr_status_change(server, nick, OTR_STATUS_FINISHED);
+
+	printformat(server, nick, MSGLEVEL_CRAP, TXT_OTR_SESSION_FINISHING, nick);
+}
+
+/*
+ * Finish all otr contexts.
+ */
+void otr_finishall(struct otr_user_state *ustate)
+{
+	ConnContext *context;
+	SERVER_REC *server;
+
+	g_return_if_fail(ustate != NULL);
+
+	for (context = ustate->otr_state->context_root; context;
+			context = context->next) {
+		/* Only finish encrypted session. */
+		if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) {
+			continue;
+		}
+
+		server = find_server_by_network(context->accountname);
+		if (server == NULL) {
+			IRSSI_OTR_DEBUG("Unable to find server window for account %s", context->accountname);
+			continue;
+		}
+
+		otr_finish(server, context->username);
+	}
+}
+
+/*
+ * Trust our peer.
+ */
+void otr_trust(SERVER_REC *server, const char *nick, char *str_fp,
+		struct otr_user_state *ustate)
+{
+	char peerfp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
+	struct otr_peer_context *opc;
+	ConnContext *ctx;
+	Fingerprint *fp_trust;
+
+	g_return_if_fail(ustate != NULL);
+
+	/* No human string fingerprint given. */
+	if (*str_fp == '\0') {
+		ctx = otr_find_context(server, nick, FALSE);
+		if (ctx == NULL) {
+			return;
+		}
+
+		opc = ctx->app_data;
+		/* Always NEED a peer context or else code error. */
+		g_return_if_fail(opc != NULL);
+
+		fp_trust = ctx->active_fingerprint;
+	} else {
+		fp_trust = otr_find_hash_fingerprint_from_human(str_fp, ustate);
+	}
+
+	if (fp_trust != NULL) {
+		otrl_privkey_hash_to_human(peerfp, fp_trust->fingerprint);
+
+		if (otrl_context_is_fingerprint_trusted(fp_trust)) {
+			printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_FP_ALREADY_TRUSTED, peerfp);
+			return;
+		}
+
+		/* Trust level is manual at this point. */
+		otrl_context_set_trust(fp_trust, "manual");
+		key_write_fingerprints(ustate);
+
+		otr_status_change(server, nick, OTR_STATUS_TRUST_MANUAL);
+
+		printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_FP_TRUSTED, peerfp);
+	} else
+		printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_FP_MISSING, str_fp);
+}
+
+/*
+ * implements /otr authabort
+ */
+void otr_auth_abort(SERVER_REC *server, const char *nick)
+{
+	ConnContext *ctx;
+
+	g_return_if_fail(server != NULL);
+	g_return_if_fail(nick != NULL);
+
+	ctx = otr_find_context(server, nick, FALSE);
+	if (ctx == NULL) {
+		printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_CTX_NICK_MISSING, nick);
+		return;
+	}
+
+	otrl_message_abort_smp(user_state_global->otr_state, &otr_ops, server, ctx);
+	otr_status_change(server, nick, OTR_STATUS_SMP_ABORT);
+
+	if (ctx->smstate->nextExpected != OTRL_SMP_EXPECT1)
+		printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_AUTH_ONGOING_ABORTED);
+	else
+		printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_AUTH_ABORTED);
+}
+
+/*
+ * Initiate or respond to SMP authentication.
+ */
+void otr_auth(SERVER_REC *server, const char *nick, const char *question,
+		const char *secret)
+{
+	int ret;
+	size_t secret_len = 0;
+	ConnContext *ctx;
+	struct otr_peer_context *opc;
+
+	g_return_if_fail(server != NULL);
+	g_return_if_fail(nick != NULL);
+
+	ctx = otr_find_context(server, nick, 0);
+	if (ctx == NULL) {
+		printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_CTX_NICK_MISSING, nick);
+		return;
+	}
+
+	opc = ctx->app_data;
+	/* Again, code flow error. */
+	g_return_if_fail(opc != NULL);
+
+	if (ctx->msgstate != OTRL_MSGSTATE_ENCRYPTED) {
+		printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_SESSION_MISSING);
+		return;
+	}
+
+	/* Aborting an ongoing auth */
+	if (ctx->smstate->nextExpected != OTRL_SMP_EXPECT1) {
+		otr_auth_abort(server, nick);
+	}
+
+	/* reset trust level */
+	if (ctx->active_fingerprint) {
+		ret = otrl_context_is_fingerprint_trusted(ctx->active_fingerprint);
+		if (!ret) {
+			otrl_context_set_trust(ctx->active_fingerprint, "");
+			key_write_fingerprints(user_state_global);
+		}
+	}
+
+	/* Libotr allows empty secret. */
+	if (secret) {
+		secret_len = strlen(secret);
+	}
+
+	if (opc->ask_secret) {
+		otrl_message_respond_smp(user_state_global->otr_state, &otr_ops,
+				server, ctx, (unsigned char *) secret, secret_len);
+		otr_status_change(server, nick, OTR_STATUS_SMP_RESPONDED);
+		printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_AUTH_RESPONSE);
+	} else {
+		if (question != NULL)
+			otrl_message_initiate_smp_q(user_state_global->otr_state, &otr_ops, server, ctx, question, (unsigned char *) secret, secret_len);
+		else
+			otrl_message_initiate_smp(user_state_global->otr_state, &otr_ops, server, ctx, (unsigned char *) secret, secret_len);
+
+		otr_status_change(server, nick, OTR_STATUS_SMP_STARTED);
+		printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_AUTH_INITIATED);
+	}
+
+	opc->ask_secret = 0;
+}
+
+/*
+ * For the given message we received through irssi, check if we need to queue
+ * it for the case where that message is part of a bigger OTR full message.
+ * This can happen with bitlbee for instance where OTR message are split in
+ * different PRIVMSG.
+ *
+ * This uses a "queue" in the peer context so it's it very important to have
+ * the peer context associated with the message (nickname + irssi object).
+ *
+ * Return an otr_msg_status code indicating the caller what to do with the msg.
+ * OTR_MSG_ERROR indicates an error probably memory related. OTR_MSG_WAIT_MORE
+ * tells the caller to NOT send out the message since we are waiting for more
+ * to complete the OTR original message. OTR_MSG_ORIGINAL tell the caller to
+ * simply use the original message. OTR_MSG_USE_QUEUE indicates that full_msg
+ * can be used containing the reconstructed message. The caller SHOULD free(3)
+ * this pointer after use.
+ */
+static enum otr_msg_status enqueue_otr_fragment(const char *msg, struct otr_peer_context *opc, char **full_msg)
+{
+	enum otr_msg_status ret;
+	size_t msg_len;
+
+	g_return_val_if_fail(msg != NULL, OTR_MSG_ERROR);
+	g_return_val_if_fail(opc != NULL, OTR_MSG_ERROR);
+
+	/* We are going to use it quite a bit so ease our life a bit. */
+	msg_len = strlen(msg);
+
+	if (opc->full_msg) {
+		if (msg_len > (opc->msg_size - opc->msg_len)) {
+			char *tmp_ptr;
+
+			/* Realloc memory if there is not enough space. */
+			tmp_ptr = realloc(opc->full_msg, opc->msg_size + msg_len + 1);
+			if (tmp_ptr == NULL) {
+				free(opc->full_msg);
+				opc->full_msg = NULL;
+				ret = OTR_MSG_ERROR;
+				return ret;
+			}
+			opc->full_msg = tmp_ptr;
+			opc->msg_size += msg_len + 1;
+		}
+
+		/* Copy msg to full message since we already have a part pending. */
+		strncpy(opc->full_msg + opc->msg_len, msg, msg_len);
+		opc->msg_len += msg_len;
+		opc->full_msg[opc->msg_len] = '\0';
+
+		IRSSI_OTR_DEBUG("Partial OTR message added to queue: %s", msg);
+
+		/*
+		 * Are we waiting for more? If the message ends with a ".", the
+		 * transmission has ended else we have to wait for more.
+		 */
+		if (msg[msg_len - 1] != OTR_MSG_END_TAG) {
+			ret = OTR_MSG_WAIT_MORE;
+			return ret;
+		}
+
+		/*
+		 * Dup the string with enough space for the NULL byte since we are
+		 * about to free it before passing it to the caller.
+		 */
+		*full_msg = strndup(opc->full_msg, opc->msg_len + 1);
+		/* Reset everything. */
+		free(opc->full_msg);
+		opc->full_msg = NULL;
+		opc->msg_size = opc->msg_len = 0;
+		ret = OTR_MSG_USE_QUEUE;
+		return ret;
+	} else {
+		char *pos;
+
+		/*
+		 * Try to find the OTR message tag at the _beginning_of the packet and
+		 * check if this packet is not the end with the end tag of OTR "."
+		 */
+		pos = strstr(msg, OTR_MSG_BEGIN_TAG);
+		if (pos && (pos == msg) && msg[msg_len - 1] != OTR_MSG_END_TAG) {
+			/* Allocate full message buffer with an extra for NULL byte. */
+			opc->full_msg = g_new0(char, (msg_len * 2) + 1);
+			if (!opc->full_msg) {
+				ret = OTR_MSG_ERROR;
+				return ret;
+			}
+			/* Copy full message with NULL terminated byte. */
+			strncpy(opc->full_msg, msg, msg_len);
+			opc->msg_len += msg_len;
+			opc->msg_size += ((msg_len * 2) + 1);
+			opc->full_msg[opc->msg_len] = '\0';
+			ret = OTR_MSG_WAIT_MORE;
+			IRSSI_OTR_DEBUG("Partial OTR message begins the queue: %s", msg);
+			return ret;
+		}
+
+		/* Use original message. */
+		ret = OTR_MSG_ORIGINAL;
+	}
+
+	return ret;
+}
+
+/*
+ * Hand the given message to OTR.
+ *
+ * Returns 0 if its an OTR protocol message or else negative value.
+ */
+int otr_receive(SERVER_REC *server, const char *msg, const char *from, char **new_msg)
+{
+	int ret = -1;
+	char *full_msg = NULL;
+	const char *recv_msg = NULL;
+	OtrlTLV *tlvs;
+	ConnContext *ctx;
+	struct otr_peer_context *opc;
+	OtrlTLV *tlv = NULL;
+
+	g_return_val_if_fail(server != NULL, -1);
+	g_return_val_if_fail(server->tag != NULL, -1);
+
+	IRSSI_OTR_DEBUG("Receiving message: %s", msg);
+
+	ctx = otr_find_context(server, from, 1);
+	if (ctx == NULL) {
+		return ret;
+	}
+
+	/* Add peer context to OTR context if none exists */
+	if (ctx->app_data == NULL)
+		add_peer_context_cb(server, ctx);
+
+	opc = ctx->app_data;
+	g_return_val_if_fail(opc != NULL, -1);
+
+	ret = enqueue_otr_fragment(msg, opc, &full_msg);
+	switch (ret) {
+		case OTR_MSG_ORIGINAL:
+			recv_msg = msg;
+			break;
+		case OTR_MSG_USE_QUEUE:
+			recv_msg = full_msg;
+			break;
+		case OTR_MSG_WAIT_MORE:
+			ret = 1;
+			g_free_not_null(full_msg);
+			return ret;
+		case OTR_MSG_ERROR:
+			ret = -1;
+			g_free_not_null(full_msg);
+			return ret;
+	}
+
+	ret = otrl_message_receiving(user_state_global->otr_state,
+		&otr_ops, server, server->tag, OTR_PROTOCOL_ID, from, recv_msg, new_msg,
+		&tlvs, &ctx, add_peer_context_cb, server);
+	if (ret) {
+		IRSSI_OTR_DEBUG("Ignoring message of length %d from %s to %s.\n%s", strlen(msg), from, server->tag, msg);
+	} else {
+		if (*new_msg) {
+			IRSSI_OTR_DEBUG("Converted received message.");
+		}
+	}
+
+	/* Check for disconnected message */
+	tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
+	if (tlv != NULL) {
+		otr_status_change(server, from, OTR_STATUS_PEER_FINISHED);
+		printformat(server, from, MSGLEVEL_CLIENTCRAP, TXT_OTR_SESSION_FINISHED, from);
+	}
+
+	otrl_tlv_free(tlvs);
+
+	IRSSI_OTR_DEBUG("Message received.");
+
+	g_free_not_null(full_msg);
+
+	return ret;
+}
+
+/*
+ * Get the OTR status of this conversation.
+ */
+enum otr_status_format otr_get_status_format(SERVER_REC *server, const char *nick)
+{
+	int ret;
+	enum otr_status_format code;
+	ConnContext *ctx = NULL;
+
+	g_return_val_if_fail(server != NULL, TXT_OTR_STB_UNKNOWN);
+
+	ctx = otr_find_context(server, nick, FALSE);
+	if (ctx == NULL) {
+		code = TXT_OTR_STB_PLAINTEXT;
+		return code;
+	}
+
+	switch (ctx->msgstate) {
+		case OTRL_MSGSTATE_PLAINTEXT:
+			code = TXT_OTR_STB_PLAINTEXT;
+			break;
+		case OTRL_MSGSTATE_ENCRYPTED:
+			/* Begin by checking trust. */
+			ret = otrl_context_is_fingerprint_trusted(ctx->active_fingerprint);
+			if (ret) {
+				code = TXT_OTR_STB_TRUST;
+			} else {
+				code = TXT_OTR_STB_UNTRUSTED;
+			}
+			break;
+		case OTRL_MSGSTATE_FINISHED:
+			code = TXT_OTR_STB_FINISHED;
+			break;
+		default:
+			g_warning("BUG! Invalid msgstate: %d", ctx->msgstate);
+			code = TXT_OTR_STB_UNKNOWN;
+			break;
+	}
+
+	if (ctx) {
+		IRSSI_OTR_DEBUG("Code: %d, state: %d, sm_prog_state: %d, auth state: %d",
+				code, ctx->msgstate, ctx->smstate->sm_prog_state,
+				ctx->auth.authstate);
+	}
+	return code;
+}
+
+/*
+ * Change status bar text for a given nickname.
+ */
+void otr_status_change(SERVER_REC *server, const char *nick,
+		enum otr_status_event event)
+{
+	statusbar_items_redraw("otr");
+	signal_emit("otr event", 3, server, nick, statusbar_txt[event]);
+}
+
+/*
+ * Search for a OTR Fingerprint object from the given human readable string and
+ * return a pointer to the object if found else NULL.
+ */
+Fingerprint *otr_find_hash_fingerprint_from_human(const char *human_fp, struct otr_user_state *ustate)
+{
+	char str_fp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
+	Fingerprint *fp = NULL, *fp_iter = NULL;
+	ConnContext *context;
+
+	/* Loop on all context of the user state */
+	for (context = ustate->otr_state->context_root; context != NULL;
+			context = context->next) {
+		/* Loop on all fingerprint of the context */
+		for (fp_iter = context->fingerprint_root.next; fp_iter;
+				fp_iter = fp_iter->next) {
+			otrl_privkey_hash_to_human(str_fp, fp_iter->fingerprint);
+			/* Compare human fingerprint given in argument to the current. */
+			if (strncmp(str_fp, human_fp, sizeof(str_fp)) == 0) {
+				fp = otrl_context_find_fingerprint(context,
+						fp_iter->fingerprint, 0, NULL);
+				return fp;
+			}
+		}
+	}
+
+	return fp;
+}
+
+/*
+ * Forget a fingerprint.
+ *
+ * If str_fp is not NULL, it must be on the OTR human format like this:
+ * "487FFADA 5073FEDD C5AB5C14 5BB6C1FF 6D40D48A". If str_fp is NULL, get the
+ * context of the target nickname, check for the OTR peer context active
+ * fingerprint and forget this one if possible.
+ */
+void otr_forget(SERVER_REC *server, const char *nick, char *str_fp, struct otr_user_state *ustate)
+{
+	char fp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
+	Fingerprint *fp_forget;
+	ConnContext *ctx = NULL;
+	struct otr_peer_context *opc;
+
+	/* No human string fingerprint given. */
+	if (*str_fp == '\0') {
+		ctx = otr_find_context(server, nick, FALSE);
+		if (ctx == NULL) {
+			return;
+		}
+
+		opc = ctx->app_data;
+		/* Always NEED a peer context or else code error. */
+		g_return_if_fail(opc != NULL);
+
+		fp_forget = opc->active_fingerprint;
+	} else {
+		fp_forget = otr_find_hash_fingerprint_from_human(str_fp, ustate);
+	}
+
+	if (fp_forget) {
+		/* Don't do anything if context is in encrypted state. */
+		if (check_fp_encrypted_msgstate(fp_forget)) {
+			printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_FP_CTX_ENCRYPTED);
+			return;
+		}
+
+		otrl_privkey_hash_to_human(fp, fp_forget->fingerprint);
+		/* Forget fp and context if it's the only one remaining. */
+		otrl_context_forget_fingerprint(fp_forget, 1);
+		/* Update fingerprints file. */
+		key_write_fingerprints(ustate);
+		printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_FP_FORGOTTEN, fp);
+	} else
+		printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_FP_MISSING, str_fp);
+}
+
+/*
+ * Distrust a fingerprint.
+ *
+ * If str_fp is not NULL, it must be on the OTR human format like this:
+ * "487FFADA 5073FEDD C5AB5C14 5BB6C1FF 6D40D48A". If str_fp is NULL, get the
+ * context of the target nickname, check for the OTR peer context active
+ * fingerprint and distrust it.
+ */
+void otr_distrust(SERVER_REC *server, const char *nick, char *str_fp,
+		struct otr_user_state *ustate)
+{
+	char fp[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
+	Fingerprint *fp_distrust;
+	ConnContext *ctx;
+	struct otr_peer_context *opc;
+
+	/* No human string fingerprint given. */
+	if (*str_fp == '\0') {
+		ctx = otr_find_context(server, nick, FALSE);
+		if (ctx == NULL) {
+			return;
+		}
+
+		opc = ctx->app_data;
+		/* Always NEED a peer context or else code error. */
+		g_return_if_fail(opc != NULL);
+
+		fp_distrust = opc->active_fingerprint;
+	} else
+		fp_distrust = otr_find_hash_fingerprint_from_human(str_fp, ustate);
+
+	if (fp_distrust != NULL) {
+		otrl_privkey_hash_to_human(fp, fp_distrust->fingerprint);
+
+		if (!otrl_context_is_fingerprint_trusted(fp_distrust)) {
+			/* Fingerprint already not trusted. Do nothing. */
+			printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_FP_ALREADY_DISTRUSED, fp);
+			return;
+		}
+
+		otrl_context_set_trust(fp_distrust, "");
+
+		/* Update fingerprints file. */
+		key_write_fingerprints(ustate);
+		printformat(server, nick, MSGLEVEL_CLIENTCRAP, TXT_OTR_FP_DISTRUSTED, fp);
+	} else
+		printformat(server, nick, MSGLEVEL_CLIENTERROR, TXT_OTR_FP_MISSING, str_fp);
+}
diff --git a/src/otr/otr.h b/src/otr/otr.h
new file mode 100644
index 00000000..60a08184
--- /dev/null
+++ b/src/otr/otr.h
@@ -0,0 +1,170 @@
+/*
+ * Off-the-Record Messaging (OTR) modules for IRC
+ *
+ * Copyright (C) 2008 - Uli Meis <a.sporto+bee@gmail.com>
+ *               2012 - David Goulet <dgoulet@ev0ke.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
+ */
+
+#ifndef IRSSI_OTR_OTR_H
+#define IRSSI_OTR_OTR_H
+
+/* Libotr */
+#include <libotr/proto.h>
+#include <libotr/message.h>
+#include <libotr/context.h>
+#include <libotr/privkey.h>
+
+#include "common.h"
+#include "servers.h"
+
+/* irssi module name */
+#define MODULE_NAME                   "otr/core"
+
+/*
+ * XXX: Maybe this should be configurable?
+ */
+#define OTR_MAX_MSG_SIZE              400
+
+/* OTR protocol id */
+#define OTR_PROTOCOL_ID               "IRC"
+
+#define OTR_DIR                       "otr"
+#define OTR_KEYFILE                   OTR_DIR "/otr.key"
+#define OTR_FINGERPRINTS_FILE         OTR_DIR "/otr.fp"
+#define OTR_INSTAG_FILE               OTR_DIR "/otr.instag"
+
+/*
+ * Specified in OTR protocol version 3. See:
+ * http://www.cypherpunks.ca/otr/Protocol-v3-4.0.0.html
+ */
+#define OTR_MSG_BEGIN_TAG             "?OTR:"
+#define OTR_MSG_END_TAG               '.'
+
+/* IRC /me command marker and len. */
+#define OTR_IRC_MARKER_ME             "/me "
+#define OTR_IRC_MARKER_ME_LEN         sizeof(OTR_IRC_MARKER_ME) - 1
+
+/* Irssi otr user state */
+struct otr_user_state {
+	OtrlUserState otr_state;
+};
+
+/*
+ * Peer OTR internal context.
+ */
+struct otr_peer_context {
+	/* The SMP event status. Used for the Irssi status bar. */
+	OtrlSMPEvent smp_event;
+	/* Did the SMP secret was asked so are we in a responder state? */
+	unsigned int ask_secret;
+	/*
+	 * The fingerprint of the private message OTR session. This is useful for
+	 * the forget command for which we can recover the fingerprint
+	 * automatically.
+	 */
+	Fingerprint *active_fingerprint;
+	/*
+	 * If needed, used to reconstruct the full message from fragmentation.
+	 * Bitlbee for instance does that where we receive a *long* OTR message
+	 * split in multiple PRIVMSG so we need to reconstruct it.
+	 */
+	char *full_msg;
+	/* Size of full_msg. Note this is the allocated memory size. */
+	size_t msg_size;
+	/* Len of the actual string in full_msg NOT counting the NULL byte. */
+	size_t msg_len;
+};
+
+/* given to otr_status_change */
+enum otr_status_event {
+	OTR_STATUS_FINISHED,
+	OTR_STATUS_TRUST_MANUAL,
+	OTR_STATUS_TRUST_SMP,
+	OTR_STATUS_SMP_ABORT,
+	OTR_STATUS_SMP_STARTED,
+	OTR_STATUS_SMP_RESPONDED,
+	OTR_STATUS_SMP_INCOMING,
+	OTR_STATUS_SMP_FINALIZE,
+	OTR_STATUS_SMP_ABORTED,
+	OTR_STATUS_PEER_FINISHED,
+	OTR_STATUS_SMP_FAILED,
+	OTR_STATUS_SMP_SUCCESS,
+	OTR_STATUS_GONE_SECURE,
+	OTR_STATUS_GONE_INSECURE,
+	OTR_STATUS_CTX_UPDATE
+};
+
+enum otr_msg_status {
+	OTR_MSG_ORIGINAL		= 1,
+	OTR_MSG_WAIT_MORE		= 2,
+	OTR_MSG_USE_QUEUE		= 3,
+	OTR_MSG_ERROR			= 4,
+};
+
+/* there can be only one */
+extern struct otr_user_state *user_state_global;
+
+/* Libotr ops functions */
+extern OtrlMessageAppOps otr_ops;
+
+int otr_debug_get(void);
+void otr_debug_toggle(void);
+
+void otr_send_message(SERVER_REC *irssi, const char *recipient,
+		const char *message);
+void otr_status_change(SERVER_REC *irssi, const char *nick,
+		enum otr_status_event event);
+
+/* init stuff */
+
+struct otr_user_state *otr_init_user_state(void);
+void otr_free_user_state(struct otr_user_state *ustate);
+
+void otr_lib_init();
+void otr_lib_uninit();
+
+void otr_control_timer(unsigned int interval, void *opdata);
+
+/* Message transport. */
+int otr_send(SERVER_REC *irssi, const char *msg, const char *to,
+		char **otr_msg);
+int otr_receive(SERVER_REC *irssi, const char *msg,
+		const char *from, char **new_msg);
+
+/* User interaction */
+void otr_finish(SERVER_REC *irssi, const char *nick);
+void otr_auth(SERVER_REC *irssi, const char *nick, const char *question,
+		const char *secret);
+void otr_auth_abort(SERVER_REC *irssi, const char *nick);
+void otr_contexts(struct otr_user_state *ustate);
+void otr_finishall(struct otr_user_state *ustate);
+void otr_forget(SERVER_REC *irssi, const char *nick, char *str_fp,
+		struct otr_user_state *ustate);
+void otr_distrust(SERVER_REC *irssi, const char *nick, char *str_fp,
+		struct otr_user_state *ustate);
+void otr_trust(SERVER_REC *irssi, const char *nick, char *str_fp,
+		struct otr_user_state *ustate);
+
+enum otr_status_format otr_get_status_format(SERVER_REC *irssi,
+		const char *nick);
+
+struct otr_peer_context *otr_create_peer_context(void);
+ConnContext *otr_find_context(SERVER_REC *irssi, const char *nick, int create);
+Fingerprint *otr_find_hash_fingerprint_from_human(const char *human_fp,
+		struct otr_user_state *ustate);
+
+#endif /* IRSSI_OTR_OTR_H */

From 7a4bfc16021e7762bd8e6c5d11d0f913101dc5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@irssi.org>
Date: Tue, 27 Feb 2018 00:04:56 +0100
Subject: [PATCH 0792/1650] Better wording.

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6cba4fb3..2852480c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,9 +149,9 @@ AC_ARG_WITH(perl,
 	want_perl=static)
 
 AC_ARG_WITH(otr,
-[  --with-otr[=yes|no|module]   Build with OTR support - also specifies
+[  --with-otr[=yes|no|static]   Build with OTR support - also specifies
                                 if it should be built into the main irssi
-                                binary or as a module (default)],
+                                binary (static) or as a module (default)],
 	if test x$withval = xyes; then
 		want_otr=module
 	elif test x$withval = xstatic; then

From 0b057b4ff43cfc560f67fe8312830289534de7d5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 7 Mar 2018 02:22:58 +0100
Subject: [PATCH 0793/1650] run syncdocs.sh and syncscripts.sh

Sync startup howto to fd1ed2227d529a7ee00d6206caa871ee40c08b69
Sync scriptassist to (2003020806) 211cd515ec87cf9a5d893e97894c2e4b58952f19
---
 docs/startup-HOWTO.html |  6 +++---
 docs/startup-HOWTO.txt  | 15 ++++++++-------
 scripts/scriptassist.pl | 13 +++++++++----
 utils/syncdocs.sh       |  2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index aaf9e5fe..8cd7a010 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -411,7 +411,7 @@ Ctrl-X                - set the next server in list active
 
 <p>Irssi supports connecting to IRC servers via a proxy. All server connections are then made through it, and if you’ve set up everything properly, you don’t need to do any <code>/QUOTE SERVER</code> commands manually.</p>
 
-<p>Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:</p>
+<p>Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dal.net and irc.efnet.org. First you’d need to setup the bouncer:</p>
 
 <div><div><pre><code>/SET use_proxy ON
 /SET proxy_address irc.bouncer.org
@@ -434,7 +434,7 @@ Ctrl-X                - set the next server in list active
 
 <p><strong>Proxy specific settings:</strong></p>
 
-<p>All proxies have these settings in common:</p>
+<p>All proxies except irssi proxy and socks proxy have these settings in common:</p>
 
 <div><div><pre><code>/SET use_proxy ON
 /SET proxy_address &lt;Proxy host address&gt;
@@ -488,7 +488,7 @@ Ctrl-X                - set the next server in list active
 
 <p>Irssi contains it’s own proxy which you can build giving <code>\--with-proxy</code> option to configure. You’ll still need to run irssi in a screen to use it though.</p>
 
-<p>Irssi proxy is a bit different than most proxies, normally proxies create a new connection to IRC server when you connect to it, but <strong>irssi proxy shares your existing IRC connection(s) to multiple clients</strong>. And even more clearly: <strong>You can use only one IRC server connection to IRC with as many clients as you want</strong>. Can anyone figure out even more easier ways to say this, so I wouldn’t need to try to explain this thing for minutes every time? :)</p>
+<p>Irssi proxy is a bit different than most proxies, normally proxies create a new connection to IRC server when a new client connects to it, but <strong>irssi proxy shares your existing IRC connection(s) to multiple clients</strong>. And even more clearly: <strong>You can use only one IRC server connection of the irssi proxy to IRC with as many clients as you want</strong>. Can anyone figure out even more easier ways to say this, so I wouldn’t need to try to explain this thing for minutes every time? :)</p>
 
 <p>Irssi proxy supports sharing multiple server connections in different ports, like you can share network in port 2777 and efnet in port 2778.</p>
 
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 23d7cf94..88912ef3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -460,7 +460,7 @@ need to do any /QUOTE SERVER commands manually.
 
 Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening
 in irc.bouncer.org port 5000. You want to use it to connect to servers
-irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:
+irc.dal.net and irc.efnet.org. First you’d need to setup the bouncer:
 
 /SET use_proxy ON
 /SET proxy_address irc.bouncer.org
@@ -485,7 +485,7 @@ which you can give to /SERVER and /SERVER ADD commands.
 
 Proxy specific settings:
 
-All proxies have these settings in common:
+All proxies except irssi proxy and socks proxy have these settings in common:
 
 /SET use_proxy ON
 /SET proxy_address <Proxy host address>
@@ -543,11 +543,12 @@ Irssi contains it’s own proxy which you can build giving \--with-proxy option
 to configure. You’ll still need to run irssi in a screen to use it though.
 
 Irssi proxy is a bit different than most proxies, normally proxies create a new
-connection to IRC server when you connect to it, but irssi proxy shares your
-existing IRC connection(s) to multiple clients. And even more clearly: You can
-use only one IRC server connection to IRC with as many clients as you want. Can
-anyone figure out even more easier ways to say this, so I wouldn’t need to try
-to explain this thing for minutes every time? :)
+connection to IRC server when a new client connects to it, but irssi proxy
+shares your existing IRC connection(s) to multiple clients. And even more
+clearly: You can use only one IRC server connection of the irssi proxy to IRC
+with as many clients as you want. Can anyone figure out even more easier ways
+to say this, so I wouldn’t need to try to explain this thing for minutes every
+time? :)
 
 Irssi proxy supports sharing multiple server connections in different ports,
 like you can share network in port 2777 and efnet in port 2778.
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 459d97f6..68708945 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2003020804';
+our $VERSION = '2003020806';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -315,6 +315,7 @@ sub get_new {
     my $xml = get_scripts();
     foreach (sort {$xml->{$b}{last_modified} cmp $xml->{$a}{last_modified}} keys %$xml) {
 	my %entry = %{ $xml->{$_} };
+	next if $entry{HIDDEN};
 	$result->{$_} = \%entry;
 	$num--;
 	last unless $num;
@@ -390,6 +391,7 @@ sub search_scripts {
     my %result;
     foreach (sort keys %{$database}) {
 	my %entry = %{$database->{$_}};
+	next if $entry{HIDDEN};
 	my $string = $_." ";
 	$string .= $entry{description} if defined $entry{description};
 	if ($string =~ /$query/i) {
@@ -1051,7 +1053,7 @@ sub toggle_autorun {
     my $dir = Irssi::get_irssi_dir()."/scripts/";
     mkdir $dir."autorun/" unless (-e $dir."autorun/");
     return unless (-e $dir.$plname);
-    if (check_autorun($sname)) {
+    if (-e $dir."/autorun/".$plname) {
 	if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
 	    if (unlink($dir."/autorun/".$plname)) {
 		print CLIENTCRAP "%R>>%n Autorun of ".$sname." disabled";
@@ -1062,8 +1064,11 @@ sub toggle_autorun {
 	    print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$plname." is not a correct link";
 	}
     } else {
-	symlink("../".$plname, $dir."/autorun/".$plname);
-    	print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
+	if (symlink("../".$plname, $dir."/autorun/".$plname)) {
+    	    print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
+	} else {
+	    print CLIENTCRAP "%R>>%n Unable to create autorun link";
+	}
     }
 }
 
diff --git a/utils/syncdocs.sh b/utils/syncdocs.sh
index e723edd2..ed76bf85 100755
--- a/utils/syncdocs.sh
+++ b/utils/syncdocs.sh
@@ -11,7 +11,7 @@ howto=$site/documentation/startup/
 # remove everything until H1 and optionally 2 DIVs before the
 # FOOTER. May need to be adjusted as the source pages change
 pageclean_regex='s{.*(?=<h1)}{}s;
-s{\s*(</div>\s*)?(</div>\s*)?<footer.*}{}s;
+s{(\s*<script\s.*?</script>)?\s*(</div>\s*){0,3}<footer.*}{}s;
 s{(<.*?)\sclass="(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;'
 
 srcdir=`dirname "$0"`

From fb9f5174c2f85c113dac8dbc1d146fe530e53e44 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Thu, 8 Mar 2018 20:35:00 +0100
Subject: [PATCH 0794/1650] Compare channels/networks fields case-insensitively

Fixes #856
---
 src/core/channels-setup.c | 9 +++++++--
 src/core/servers-setup.c  | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index 4966d77d..8002646d 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -37,9 +37,14 @@ static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
 	name = config_node_get_str(node, "name", NULL);
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 
-	if (g_strcmp0(name, channel->name) != 0 || 
-	    g_strcmp0(chatnet, channel->chatnet) != 0)
+	if (name == NULL || chatnet == NULL) {
+		return 0;
+	}
+
+	if (g_ascii_strcasecmp(name, channel->name) != 0 ||
+	    g_ascii_strcasecmp(chatnet, channel->chatnet) != 0) {
 		return 1;
+	}
 
 	return 0;
 }
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 9492c58c..878dd0ea 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -474,10 +474,15 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 	port = config_node_get_int(node, "port", 0);
 
+	if (address == NULL || chatnet == NULL) {
+		return 0;
+	}
+
 	if (g_strcmp0(address, server->address) != 0 ||
 	    g_strcmp0(chatnet, server->chatnet) != 0 ||
-	    port != server->port)
+	    port != server->port) {
 		return 1;
+	}
 
 	return 0;
 }

From 76d958a87fea1d744f45a9e022cf980752c7ea73 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 9 Mar 2018 17:36:28 +0100
Subject: [PATCH 0795/1650] More g_strcmp0 -> g_ascii_strcasecmp

---
 src/core/servers-setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 878dd0ea..2a92a367 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -478,8 +478,8 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 		return 0;
 	}
 
-	if (g_strcmp0(address, server->address) != 0 ||
-	    g_strcmp0(chatnet, server->chatnet) != 0 ||
+	if (g_ascii_strcasecmp(address, server->address) != 0 ||
+	    g_ascii_strcasecmp(chatnet, server->chatnet) != 0 ||
 	    port != server->port) {
 		return 1;
 	}

From 7ec6c500b4abed6f3a93a7afaba26ba08ca09be9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 12 Mar 2018 17:46:26 +0100
Subject: [PATCH 0796/1650] make default keybinds deletable

---
 src/fe-common/core/keyboard.c | 54 +++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index 6f7907eb..c3df5ed7 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -156,6 +156,7 @@ static void keyconfig_save(const char *id, const char *key, const char *data)
 static void keyconfig_clear(const char *key)
 {
 	CONFIG_NODE *node;
+	KEY_REC *rec;
 
 	g_return_if_fail(key != NULL);
 
@@ -165,6 +166,11 @@ static void keyconfig_clear(const char *key)
 		iconfig_node_remove(iconfig_node_traverse("(keyboard", FALSE),
 				    node);
 	}
+	if ((rec = g_hash_table_lookup(default_keys, key)) != NULL) {
+		node = iconfig_node_traverse("(keyboard", TRUE);
+		node = iconfig_node_section(node, NULL, NODE_TYPE_BLOCK);
+		iconfig_node_set_str(node, "key", key);
+	}
 }
 
 KEYINFO_REC *key_info_find(const char *id)
@@ -569,13 +575,38 @@ void key_configure_remove(const char *key)
 
 	g_return_if_fail(key != NULL);
 
+	keyconfig_clear(key);
+
 	rec = g_hash_table_lookup(keys, key);
 	if (rec == NULL) return;
 
-        keyconfig_clear(key);
 	key_configure_destroy(rec);
 }
 
+/* Reset key to default */
+void key_configure_reset(const char *key)
+{
+	KEY_REC *rec;
+	CONFIG_NODE *node;
+
+	g_return_if_fail(key != NULL);
+
+	node = key_config_find(key);
+	if (node != NULL) {
+		iconfig_node_remove(iconfig_node_traverse("(keyboard", FALSE), node);
+	}
+
+	if ((rec = g_hash_table_lookup(default_keys, key)) != NULL) {
+		key_configure_create(rec->info->id, rec->key, rec->data);
+	} else {
+		rec = g_hash_table_lookup(keys, key);
+		if (rec == NULL)
+			return;
+
+		key_configure_destroy(rec);
+	}
+}
+
 static int key_emit_signal(KEYBOARD_REC *keyboard, KEY_REC *key)
 {
 	int consumed;
@@ -739,7 +770,9 @@ static void cmd_show_keys(const char *searchkey, int full)
 		for (key = rec->keys; key != NULL; key = key->next) {
 			KEY_REC *rec = key->data;
 
-			if ((len == 0 || g_ascii_strncasecmp(rec->key, searchkey, len) == 0) &&
+			if ((len == 0 ||
+			     (full ? strncmp(rec->key, searchkey, len) == 0 :
+			             g_ascii_strncasecmp(rec->key, searchkey, len) == 0)) &&
 			    (!full || rec->key[len] == '\0')) {
 				printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_BIND_LIST,
 					    rec->key, rec->info->id, rec->data == NULL ? "" : rec->data);
@@ -750,7 +783,7 @@ static void cmd_show_keys(const char *searchkey, int full)
 	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_BIND_FOOTER);
 }
 
-/* SYNTAX: BIND [-list] [-delete] [<key> [<command> [<data>]]] */
+/* SYNTAX: BIND [-list] [-delete | -reset] [<key> [<command> [<data>]]] */
 static void cmd_bind(const char *data)
 {
 	GHashTable *optlist;
@@ -780,6 +813,12 @@ static void cmd_bind(const char *data)
 		key_configure_remove(key);
 		cmd_params_free(free_arg);
 		return;
+	} else if (*key != '\0' && g_hash_table_lookup(optlist, "reset")) {
+		/* reset key */
+		key_configure_reset(key);
+		cmd_show_keys(key, TRUE);
+		cmd_params_free(free_arg);
+		return;
 	}
 
 	if (*id == '\0') {
@@ -878,8 +917,13 @@ static void key_config_read(CONFIG_NODE *node)
 	id = config_node_get_str(node, "id", NULL);
 	data = config_node_get_str(node, "data", NULL);
 
-	if (key != NULL && id != NULL)
+	if (key != NULL && id != NULL) {
 		key_configure_create(id, key, data);
+	} else if (key != NULL && id == NULL && data == NULL) {
+		KEY_REC *rec = g_hash_table_lookup(keys, key);
+		if (rec != NULL)
+			key_configure_destroy(rec);
+	}
 }
 
 static void read_keyboard_config(void)
@@ -938,7 +982,7 @@ void keyboard_init(void)
 	signal_add("complete command bind", (SIGNAL_FUNC) sig_complete_bind);
 
 	command_bind("bind", NULL, (SIGNAL_FUNC) cmd_bind);
-	command_set_options("bind", "delete list");
+	command_set_options("bind", "delete reset list");
 }
 
 void keyboard_deinit(void)

From b7906b87065829029f3b7ea21eb29699f7dc21fc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Mar 2018 10:06:29 +0100
Subject: [PATCH 0797/1650] in fact hidden levels should not be re-set when you
 run /set

---
 src/fe-text/gui-windows.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 3efb9803..f761e390 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -207,8 +207,6 @@ void gui_windows_reset_settings(void)
 		WINDOW_REC *rec = tmp->data;
 		GUI_WINDOW_REC *gui = WINDOW_GUI(rec);
 
-		textbuffer_view_set_hidden_level(gui->view, MSGLEVEL_HIDDEN);
-
 		textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
 
 		textbuffer_view_set_default_indent(gui->view,

From 8d07f52bae6fa7e85988125293f08a72e39de8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@irssi.org>
Date: Thu, 15 Mar 2018 14:01:50 +0100
Subject: [PATCH 0798/1650] Add ABI check for otr_core module.

---
 src/otr/module.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/otr/module.c b/src/otr/module.c
index ca3107b1..0d83629f 100644
--- a/src/otr/module.c
+++ b/src/otr/module.c
@@ -24,6 +24,7 @@
 
 #include "module.h"
 
+#include "common.h"
 #include "signals.h"
 #include "queries.h"
 #include "commands.h"
@@ -259,3 +260,8 @@ void otr_core_deinit(void)
 
 	otr_lib_uninit();
 }
+
+void otr_core_abicheck(int *version)
+{
+	*version = IRSSI_ABI_VERSION;
+}

From 65a139aa9e8a7cb7a7a123ab57ee05836c9e89ea Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 16 Mar 2018 12:44:04 +0100
Subject: [PATCH 0799/1650] move no window printing code

---
 src/fe-text/gui-printtext.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index c52f9ced..13d8c233 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -249,9 +249,26 @@ static void view_add_eol(TEXT_BUFFER_VIEW_REC *view, LINE_REC **line)
 	textbuffer_view_insert_line(view, *line);
 }
 
+static void print_text_no_window(int flags, int fg, int bg, int attr, const char *str)
+{
+	g_return_if_fail(next_xpos != -1);
+
+	term_set_color2(root_window, attr, fg, bg);
+
+	term_move(root_window, next_xpos, next_ypos);
+	if (flags & GUI_PRINT_FLAG_CLRTOEOL) {
+		if (clrtoeol_info->window != NULL) {
+			term_window_clrtoeol_abs(clrtoeol_info->window, next_ypos);
+		} else {
+			term_clrtoeol(root_window);
+		}
+	}
+	next_xpos += term_addstr(root_window, str);
+}
+
 static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 			       void *bgcolor, void *pflags,
-			       char *str, TEXT_DEST_REC *dest)
+			       const char *str, TEXT_DEST_REC *dest)
 {
         GUI_WINDOW_REC *gui;
         TEXT_BUFFER_VIEW_REC *view;
@@ -265,19 +282,7 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 	get_colors(flags, &fg, &bg, &attr);
 
 	if (window == NULL) {
-		g_return_if_fail(next_xpos != -1);
-
-		term_set_color2(root_window, attr, fg, bg);
-
-		term_move(root_window, next_xpos, next_ypos);
-		if (flags & GUI_PRINT_FLAG_CLRTOEOL) {
-			if (clrtoeol_info->window != NULL) {
-				term_window_clrtoeol_abs(clrtoeol_info->window, next_ypos);
-			} else {
-				term_clrtoeol(root_window);
-			}
-		}
-		next_xpos += term_addstr(root_window, str);
+		print_text_no_window(flags, fg, bg, attr, str);
 		return;
 	}
 

From c7ca8102c002287f492ca71f2193ee9b269f5bf5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:36:38 +0100
Subject: [PATCH 0800/1650] fix a crash when trying to append to a NULL line

reported by @vague666
---
 src/fe-text/gui-printtext.c   | 7 +++++++
 src/fe-text/textbuffer-view.c | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 13d8c233..83a36f14 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -120,12 +120,19 @@ void gui_printtext_internal(int xpos, int ypos, const char *str)
 	next_xpos = next_ypos = -1;
 }
 
+static void view_add_eol(TEXT_BUFFER_VIEW_REC *view, LINE_REC **line);
+
 void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str, time_t time)
 {
 	GUI_WINDOW_REC *gui;
 
 	gui = WINDOW_GUI(dest->window);
 
+	if (prev == NULL && !gui->view->buffer->last_eol) {
+		/* we have an unfinished line in the buffer still */
+		view_add_eol(gui->view, &gui->insert_after);
+	}
+
 	gui->use_insert_after = TRUE;
 	gui->insert_after = prev;
 	gui->insert_after_time = time;
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 99625ecc..3ccd95f5 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -913,11 +913,14 @@ void textbuffer_view_resize(TEXT_BUFFER_VIEW_REC *view, int width, int height)
 	} else if (view->startline == view->bottom_startline &&
 		   view->subline > view->bottom_subline) {
                 view->subline = view->bottom_subline;
-	} else {
+	} else if (view->startline != NULL) {
 		/* make sure the subline is still in allowed range */
 		linecount = view_get_linecount(view, view->startline);
 		if (view->subline > linecount)
                         view->subline = linecount;
+	} else {
+		/* we don't have a startline. still under construction? */
+		view->subline = 0;
 	}
 
 	textbuffer_view_init_ypos(view);

From 77a671c03726969525367f36429c448a3a0aaae8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Mar 2018 09:11:02 +0100
Subject: [PATCH 0801/1650] update bind help

---
 docs/help/in/bind.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/help/in/bind.in b/docs/help/in/bind.in
index d6151b23..8fcc744b 100644
--- a/docs/help/in/bind.in
+++ b/docs/help/in/bind.in
@@ -6,7 +6,8 @@
 %9Parameters:%9
 
     -list:      Displays a list of all the bindable commands.
-    -delete:    Removes the binding,
+    -delete:    Removes the binding.
+    -reset:     Reset a key to its default binding.
 
     A name of the binding and the command to perform; if no parameter is given,
     the list of bindings will be displayed.

From d845ee7361886599f6ffa4f403b44a3f45fd88db Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Mar 2018 09:18:42 +0100
Subject: [PATCH 0802/1650] change the statusbar commands so that no accidenal
 status bars are created

---
 docs/help/in/statusbar.in      |  51 ++--
 src/fe-text/statusbar-config.c | 449 +++++++++++++++++++++------------
 2 files changed, 316 insertions(+), 184 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index 7d64b816..9d68d1c9 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -5,27 +5,35 @@
 
 %9Parameters:%9
 
-    ENABLE:       Adds a statusbar to the list of statusbars.
-    DISABLE:      Removes a statusbar from the list. Note that for
-                  built-in statusbars they can be enabled again should the
-                  user wish to add back the default statusbars.
+    ADD:          Adds a statusbar to the list of statusbars.
+    MODIFY:       Modifies the configuration of a statusbar.
     RESET:        Restores the default statusbar configuration.
-    TYPE:         Sets the type of statusbar, for each split window or only
+    ADDITEM:      Adds an item to the specified statusbar. It can be set to
+                  appear before/after another item and left/right aligned
+                  to a specified position on the screen.
+    MODIFYITEM:   Changes an item position inside a bar.
+    REMOVEITEM:   Removes an item from the specified statusbar.
+    INFO:         List the current details and items of the specified
+                  statusbar.
+
+    -disable:     Removes a statusbar from the list.
+    -type:        Sets the type of statusbar, for each split window or only
                   for the current root screen.
-    PLACEMENT:    Sets the placement of the statusbar, either at the top or
+    -placement:   Sets the placement of the statusbar, either at the top or
                   the bottom of the screen.
-    POSITION:     Sets the position of the statusbar. Represented as a
+    -position:    Sets the position of the statusbar. Represented as a
                   number, with 0 implying the first position.
-    VISIBLE:      Sets the visibility of the statusbar or item. If set to
+    -visible:     Sets the visibility of the statusbar or item. If set to
                   always it is visible on all screens, otherwise if set to
                   inactive or active then it is only visible on inactive
                   or active screens, respectively.
-    ADD:          Adds an item to the specified statusbar. It can be set to
-                  appear before/after another item and left/right aligned
-                  to a specified position on the screen.
-    REMOVE:       Removes an item from the specified statusbar.
+    -before:      This item is added before the other item.
+    -after:       This item is added after the other item.
+    -priority:    When the statusbar items overflow, the item with the
+                  lowest priority is removed first
+    -alignment:   Display the item on the right side.
 
-    Where name refers to the name of the statusbar; if no argument is
+    Where statusbar refers to the name of the statusbar; if no argument is
     given, the entire list of statusbars will be displayed.
 
 %9Description:%9
@@ -36,12 +44,17 @@
 %9Examples:%9
 
     /STATUSBAR
-    /STATUSBAR window
-    /STATUSBAR window REMOVE time
-    /STATUSBAR window ADD time
-    /STATUSBAR window RESET
-    /STATUSBAR topic DISABLE
-    /STATUSBAR topic ENABLE
+    /STATUSBAR INFO window
+    /STATUSBAR REMOVEITEM time window
+    /STATUSBAR ADDITEM time window
+    /STATUSBAR RESET window
+    /STATUSBAR MODIFY -disable topic
+    /STATUSBAR MODIFY -nodisable topic
+
+%9Remarks:%9
+
+    Statusbar syntax was changed in Irssi 1.2. The old syntax is still
+    accepted for backward compatibility, but no longer documented.
 
 %9See also:%9 WINDOW
 
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 48f4aa61..391a5768 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -95,8 +95,10 @@ statusbar_config_find(STATUSBAR_GROUP_REC *group, const char *name)
 	for (tmp = group->config_bars; tmp != NULL; tmp = tmp->next) {
 		STATUSBAR_CONFIG_REC *config = tmp->data;
 
-		if (g_strcmp0(config->name, name) == 0)
-                        return config;
+		if ((config->name == NULL || name == NULL) ?
+		        config->name == name :
+		        g_ascii_strcasecmp(config->name, name) == 0)
+			return config;
 	}
 
         return NULL;
@@ -273,6 +275,24 @@ static const char *sbar_get_visibility(STATUSBAR_CONFIG_REC *rec)
 		rec->visible == STATUSBAR_VISIBLE_INACTIVE ? "inactive" : "??";
 }
 
+static CONFIG_NODE *sbar_node(const char *name, gboolean create)
+{
+	CONFIG_NODE *node;
+	STATUSBAR_CONFIG_REC *rec = statusbar_config_find(active_statusbar_group, name);
+	if (rec != NULL) {
+		name = rec->name;
+	} else if (!create) {
+		return NULL;
+	}
+
+	/* lookup/create the statusbar node */
+	node = iconfig_node_traverse("statusbar", TRUE);
+	node = iconfig_node_section(node, active_statusbar_group->name, NODE_TYPE_BLOCK);
+	node = iconfig_node_section(node, name, NODE_TYPE_BLOCK);
+
+	return node;
+}
+
 static void statusbar_list_items(STATUSBAR_CONFIG_REC *bar)
 {
 	GSList *tmp;
@@ -334,98 +354,133 @@ static void cmd_statusbar_list(void)
 
 static void cmd_statusbar_print_info(const char *name)
 {
-	GSList *tmp;
+	STATUSBAR_CONFIG_REC *rec = statusbar_config_find(active_statusbar_group, name);
 
-        tmp = active_statusbar_group->config_bars;
-	for (; tmp != NULL; tmp = tmp->next) {
-		STATUSBAR_CONFIG_REC *rec = tmp->data;
-
-		if (g_ascii_strcasecmp(rec->name, name) == 0) {
-                        statusbar_print(rec);
-			return;
-		}
+	if (rec != NULL) {
+		statusbar_print(rec);
+		return;
 	}
 
 	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
 		    TXT_STATUSBAR_NOT_FOUND, name);
 }
 
-/* SYNTAX: STATUSBAR <name> ENABLE */
-static void cmd_statusbar_enable(const char *data, void *server,
-				 void *item, CONFIG_NODE *node)
+/* SYNTAX: STATUSBAR ADD|MODIFY [-disable | -nodisable] [-type window|root]
+           [-placement top|bottom] [-position #] [-visible always|active|inactive] <statusbar> */
+static void cmd_statusbar_add_modify(const char *data, void *server, void *witem)
 {
-        iconfig_node_set_str(node, "disabled", NULL);
+	GHashTable *optlist;
+	CONFIG_NODE *node;
+	char *name, *type, *placement, *visible;
+	void *free_arg;
+	int error;
+
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
+	                    "statusbar add", &optlist, &name))
+		return;
+
+	if (*name == '\0') {
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
+
+	error = 0;
+
+	type = NULL;
+	data = g_hash_table_lookup(optlist, "type");
+	if (data != NULL) {
+		if (g_ascii_strcasecmp(data, "window") == 0)
+			type = "window";
+		else if (g_ascii_strcasecmp(data, "root") == 0)
+			type = "root";
+		else {
+			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_UNKNOWN_TYPE,
+			            data);
+			error++;
+		}
+	}
+
+	placement = NULL;
+	data = g_hash_table_lookup(optlist, "placement");
+	if (data != NULL) {
+		if (g_ascii_strcasecmp(data, "top") == 0)
+			placement = "top";
+		else if (g_ascii_strcasecmp(data, "bottom") == 0)
+			placement = "bottom";
+		else {
+			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+			            TXT_STATUSBAR_UNKNOWN_PLACEMENT, data);
+			error++;
+		}
+	}
+
+	visible = NULL;
+	data = g_hash_table_lookup(optlist, "visible");
+	if (data != NULL) {
+		if (g_ascii_strcasecmp(data, "always") == 0)
+			visible = "always";
+		else if (g_ascii_strcasecmp(data, "active") == 0)
+			visible = "active";
+		else if (g_ascii_strcasecmp(data, "inactive") == 0)
+			visible = "inactive";
+		else {
+			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+			            TXT_STATUSBAR_UNKNOWN_VISIBILITY, data);
+			error++;
+		}
+	}
+
+	if (error) {
+		cmd_params_free(free_arg);
+		return;
+	}
+
+	node = sbar_node(name, TRUE);
+	if (g_hash_table_lookup(optlist, "nodisable"))
+		iconfig_node_set_str(node, "disabled", NULL);
+	if (g_hash_table_lookup(optlist, "disable"))
+		iconfig_node_set_bool(node, "disabled", TRUE);
+	if (type != NULL)
+		iconfig_node_set_str(node, "type", type);
+	if (placement != NULL)
+		iconfig_node_set_str(node, "placement", placement);
+	data = g_hash_table_lookup(optlist, "position");
+	if (data != NULL)
+		iconfig_node_set_int(node, "position", atoi(data));
+	if (visible != NULL)
+		iconfig_node_set_str(node, "visible", visible);
+
+	read_statusbar_config();
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: STATUSBAR <name> DISABLE */
-static void cmd_statusbar_disable(const char *data, void *server,
-				  void *item, CONFIG_NODE *node)
+/* SYNTAX: STATUSBAR RESET <statusbar> */
+static void cmd_statusbar_reset(const char *data, void *server, void *witem)
 {
-        iconfig_node_set_bool(node, "disabled", TRUE);
-}
+	CONFIG_NODE *node, *parent;
+	char *name;
+	void *free_arg;
 
-/* SYNTAX: STATUSBAR <name> RESET */
-static void cmd_statusbar_reset(const char *data, void *server,
-				void *item, CONFIG_NODE *node)
-{
-	CONFIG_NODE *parent;
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_STRIP_TRAILING_WS, &name))
+		return;
+
+	if (*name == '\0') {
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
+
+	node = sbar_node(name, FALSE);
+	if (node == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, name);
+		cmd_params_free(free_arg);
+		return;
+	}
 
 	parent = iconfig_node_traverse("statusbar", TRUE);
-	parent = iconfig_node_section(parent, active_statusbar_group->name,
-				     NODE_TYPE_BLOCK);
+	parent = iconfig_node_section(parent, active_statusbar_group->name, NODE_TYPE_BLOCK);
 
-        iconfig_node_set_str(parent, node->key, NULL);
-}
+	iconfig_node_set_str(parent, node->key, NULL);
 
-/* SYNTAX: STATUSBAR <name> TYPE window|root */
-static void cmd_statusbar_type(const char *data, void *server,
-			       void *item, CONFIG_NODE *node)
-{
-	if (g_ascii_strcasecmp(data, "window") == 0)
-		iconfig_node_set_str(node, "type", "window");
-        else if (g_ascii_strcasecmp(data, "root") == 0)
-		iconfig_node_set_str(node, "type", "root");
-	else {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_STATUSBAR_UNKNOWN_TYPE, data);
-	}
-}
-
-/* SYNTAX: STATUSBAR <name> PLACEMENT top|bottom */
-static void cmd_statusbar_placement(const char *data, void *server,
-				    void *item, CONFIG_NODE *node)
-{
-	if (g_ascii_strcasecmp(data, "top") == 0)
-		iconfig_node_set_str(node, "placement", "top");
-        else if (g_ascii_strcasecmp(data, "bottom") == 0)
-		iconfig_node_set_str(node, "placement", "bottom");
-	else {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_STATUSBAR_UNKNOWN_PLACEMENT, data);
-	}
-}
-
-/* SYNTAX: STATUSBAR <name> POSITION <num> */
-static void cmd_statusbar_position(const char *data, void *server,
-                                   void *item, CONFIG_NODE *node)
-{
-	iconfig_node_set_int(node, "position", atoi(data));
-}
-
-/* SYNTAX: STATUSBAR <name> VISIBLE always|active|inactive */
-static void cmd_statusbar_visible(const char *data, void *server,
-				  void *item, CONFIG_NODE *node)
-{
-	if (g_ascii_strcasecmp(data, "always") == 0)
-		iconfig_node_set_str(node, "visible", "always");
-        else if (g_ascii_strcasecmp(data, "active") == 0)
-		iconfig_node_set_str(node, "visible", "active");
-        else if (g_ascii_strcasecmp(data, "inactive") == 0)
-		iconfig_node_set_str(node, "visible", "inactive");
-	else {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_STATUSBAR_UNKNOWN_VISIBILITY, data);
-	}
+	read_statusbar_config();
+	cmd_params_free(free_arg);
 }
 
 static CONFIG_NODE *statusbar_items_section(CONFIG_NODE *parent)
@@ -455,45 +510,58 @@ static CONFIG_NODE *statusbar_items_section(CONFIG_NODE *parent)
 		node = iconfig_node_section(parent, rec->name,
 					   NODE_TYPE_BLOCK);
 		if (rec->priority != 0)
-                        iconfig_node_set_int(node, "priority", rec->priority);
+			iconfig_node_set_int(node, "priority", rec->priority);
 		if (rec->right_alignment)
-                        iconfig_node_set_str(node, "alignment", "right");
+			iconfig_node_set_str(node, "alignment", "right");
 	}
 
-        return parent;
+	return parent;
 }
 
-/* SYNTAX: STATUSBAR <name> ADD [-before | -after <item>]
-           [-priority #] [-alignment left|right] <item> */
-static void cmd_statusbar_add(const char *data, void *server,
-			      void *item, CONFIG_NODE *node)
+/* SYNTAX: STATUSBAR ADDITEM|MODIFYITEM [-before | -after <item>]
+           [-priority #] [-alignment left|right] <item> <statusbar> */
+static void cmd_statusbar_additem_modifyitem(const char *data, void *server, void *witem)
 {
-        GHashTable *optlist;
-        char *name, *value;
+	CONFIG_NODE *node;
+	GHashTable *optlist;
+	char *item, *statusbar, *value;
 	void *free_arg;
-        int index;
+	int index;
 
-	node = statusbar_items_section(node);
-	if (node == NULL)
-                return;
-
-	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS,
-			    "statusbar add", &optlist, &name))
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
+	                    "statusbar additem", &optlist, &item, &statusbar))
 		return;
 
-        /* get the index */
+	if (*statusbar == '\0') {
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
+
+	node = sbar_node(statusbar, FALSE);
+	if (node == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
+		cmd_params_free(free_arg);
+		return;
+	}
+
+	node = statusbar_items_section(node);
+	if (node == NULL) {
+		cmd_params_free(free_arg);
+		return;
+	}
+
+	/* get the index */
 	index = -1;
 	value = g_hash_table_lookup(optlist, "before");
 	if (value != NULL) index = config_node_index(node, value);
 	value = g_hash_table_lookup(optlist, "after");
 	if (value != NULL) index = config_node_index(node, value)+1;
 
-        /* create/move item */
-	node = iconfig_node_section_index(node, name, index, NODE_TYPE_BLOCK);
+	/* create/move item */
+	node = iconfig_node_section_index(node, item, index, NODE_TYPE_BLOCK);
 
-        /* set the options */
-        value = g_hash_table_lookup(optlist, "priority");
-        if (value != NULL) iconfig_node_set_int(node, "priority", atoi(value));
+	/* set the options */
+	value = g_hash_table_lookup(optlist, "priority");
+	if (value != NULL) iconfig_node_set_int(node, "priority", atoi(value));
 
 	value = g_hash_table_lookup(optlist, "alignment");
 	if (value != NULL) {
@@ -502,67 +570,115 @@ static void cmd_statusbar_add(const char *data, void *server,
 				     "right" : NULL);
 	}
 
+	read_statusbar_config();
 	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: STATUSBAR <name> REMOVE <item> */
-static void cmd_statusbar_remove(const char *data, void *server,
-				 void *item, CONFIG_NODE *node)
+/* SYNTAX: STATUSBAR REMOVEITEM <item> <statusbar> */
+static void cmd_statusbar_removeitem(const char *data, void *server, void *witem)
 {
-        node = statusbar_items_section(node);
-	if (node == NULL)
-                return;
+	CONFIG_NODE *node;
+	char *item, *statusbar;
+	void *free_arg;
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_STRIP_TRAILING_WS, &item, &statusbar))
+		return;
 
-	if (iconfig_node_section(node, data, -1) != NULL)
-		iconfig_node_set_str(node, data, NULL);
-	else {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_STATUSBAR_ITEM_NOT_FOUND, data);
+	if (*statusbar == '\0') {
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 	}
+
+	node = sbar_node(statusbar, FALSE);
+	if (node == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
+		cmd_params_free(free_arg);
+		return;
+	}
+
+	node = statusbar_items_section(node);
+	if (node == NULL) {
+		cmd_params_free(free_arg);
+		return;
+	}
+
+	if (iconfig_node_section(node, item, -1) != NULL)
+		iconfig_node_set_str(node, item, NULL);
+	else {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
+	}
+
+	read_statusbar_config();
+	cmd_params_free(free_arg);
+}
+
+/* SYNTAX: STATUSBAR INFO <statusbar> */
+static void cmd_statusbar_info(const char *data)
+{
+	void *free_arg;
+	char *name;
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_STRIP_TRAILING_WS, &name))
+		return;
+
+	if (*name == '\0') {
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
+
+	/* print statusbar info */
+	cmd_statusbar_print_info(name);
+	cmd_params_free(free_arg);
+	return;
 }
 
 static void cmd_statusbar(const char *data)
 {
-        CONFIG_NODE *node;
-	char *name, *cmd, *params, *signal;
+	char *arg1, *arg2, *params, *oldcmd;
 	void *free_arg;
 
-	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
-			    &name, &cmd, &params))
+	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
+	                    &arg1, &arg2, &params))
 		return;
 
-	if (*name == '\0') {
-		/* list all statusbars */
-                cmd_statusbar_list();
-		cmd_params_free(free_arg);
-                return;
+	/* backward compatibility layer */
+	oldcmd = NULL;
+	if (*arg1 == '\0') {
+		oldcmd = g_strdup("list");
+	} else if (g_ascii_strcasecmp(arg2, "enable") == 0) {
+		oldcmd = g_strdup_printf("add -nodisable %s %s", arg1, params);
+	} else if (g_ascii_strcasecmp(arg2, "disable") == 0) {
+		oldcmd = g_strdup_printf("add -disable %s %s", arg1, params);
+	} else if (g_ascii_strcasecmp(arg2, "reset") == 0) {
+		oldcmd = g_strdup_printf("reset %s", arg1);
+	} else if (g_ascii_strcasecmp(arg2, "type") == 0) {
+		oldcmd = g_strdup_printf("add -type %s %s", params, arg1);
+	} else if (g_ascii_strcasecmp(arg2, "placement") == 0) {
+		oldcmd = g_strdup_printf("add -placement %s %s", params, arg1);
+	} else if (g_ascii_strcasecmp(arg2, "position") == 0) {
+		oldcmd = g_strdup_printf("add -position %s %s", params, arg1);
+	} else if (g_ascii_strcasecmp(arg2, "visible") == 0) {
+		oldcmd = g_strdup_printf("add -visible %s %s", params, arg1);
+	} else if (g_ascii_strcasecmp(arg2, "add") == 0) {
+		oldcmd = g_strdup_printf("additem %s %s", params, arg1);
+	} else if (g_ascii_strcasecmp(arg2, "remove") == 0) {
+		oldcmd = g_strdup_printf("removeitem %s %s", params, arg1);
+	} else if (*arg2 == '\0') {
+		oldcmd = g_strdup_printf("statusbar %s", arg1);
+		if (command_find(oldcmd) == NULL) {
+			g_free(oldcmd);
+			oldcmd = g_strdup_printf("info %s", arg1);
+		} else {
+			g_free(oldcmd);
+			oldcmd = NULL;
+		}
 	}
 
-	if (*cmd == '\0') {
-		/* print statusbar info */
-                cmd_statusbar_print_info(name);
-		cmd_params_free(free_arg);
-                return;
-	}
-
-        /* lookup/create the statusbar node */
-	node = iconfig_node_traverse("statusbar", TRUE);
-	node = iconfig_node_section(node, active_statusbar_group->name,
-				   NODE_TYPE_BLOCK);
-	node = iconfig_node_section(node, name, NODE_TYPE_BLOCK);
-
-	/* call the subcommand */
-	signal = g_strconcat("command statusbar ", cmd, NULL);
-	ascii_strdown(signal);
-	if (!signal_emit(signal, 4, params, NULL, NULL, node)) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_STATUSBAR_UNKNOWN_COMMAND, cmd);
-	} else {
-                read_statusbar_config();
-	}
-	g_free(signal);
-
 	cmd_params_free(free_arg);
+	if (oldcmd) {
+		command_runsub("statusbar", oldcmd, NULL, NULL);
+		g_free(oldcmd);
+	} else {
+		command_runsub("statusbar", data, NULL, NULL);
+	}
+
+	return;
 }
 
 void statusbar_config_init(void)
@@ -571,18 +687,22 @@ void statusbar_config_init(void)
 	signal_add_last("setup reread", (SIGNAL_FUNC) read_statusbar_config);
 	signal_add("theme changed", (SIGNAL_FUNC) read_statusbar_config);
 
-        command_bind("statusbar", NULL, (SIGNAL_FUNC) cmd_statusbar);
-        command_bind("statusbar enable", NULL, (SIGNAL_FUNC) cmd_statusbar_enable);
-        command_bind("statusbar disable", NULL, (SIGNAL_FUNC) cmd_statusbar_disable);
-        command_bind("statusbar reset", NULL, (SIGNAL_FUNC) cmd_statusbar_reset);
-        command_bind("statusbar add", NULL, (SIGNAL_FUNC) cmd_statusbar_add);
-        command_bind("statusbar remove", NULL, (SIGNAL_FUNC) cmd_statusbar_remove);
-        command_bind("statusbar type", NULL, (SIGNAL_FUNC) cmd_statusbar_type);
-        command_bind("statusbar placement", NULL, (SIGNAL_FUNC) cmd_statusbar_placement);
-        command_bind("statusbar position", NULL, (SIGNAL_FUNC) cmd_statusbar_position);
-        command_bind("statusbar visible", NULL, (SIGNAL_FUNC) cmd_statusbar_visible);
+	command_bind("statusbar", NULL, (SIGNAL_FUNC) cmd_statusbar);
+	command_bind("statusbar list", NULL, (SIGNAL_FUNC) cmd_statusbar_list);
+	command_bind("statusbar add", NULL, (SIGNAL_FUNC) cmd_statusbar_add_modify);
+	command_bind("statusbar modify", NULL, (SIGNAL_FUNC) cmd_statusbar_add_modify);
+	command_bind("statusbar reset", NULL, (SIGNAL_FUNC) cmd_statusbar_reset);
+	command_bind("statusbar info", NULL, (SIGNAL_FUNC) cmd_statusbar_info);
+	command_bind("statusbar additem", NULL, (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
+	command_bind("statusbar modifyitem", NULL, (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
+	command_bind("statusbar removeitem", NULL, (SIGNAL_FUNC) cmd_statusbar_removeitem);
 
-	command_set_options("statusbar add", "+before +after +priority +alignment");
+	command_set_options("statusbar additem", "+before +after +priority +alignment");
+	command_set_options("statusbar modifyitem", "+before +after +priority +alignment");
+	command_set_options("statusbar add",
+	                    "disable nodisable +type +placement +position +visible");
+	command_set_options("statusbar modify",
+	                    "disable nodisable +type +placement +position +visible");
 }
 
 void statusbar_config_deinit(void)
@@ -590,14 +710,13 @@ void statusbar_config_deinit(void)
 	signal_remove("setup reread", (SIGNAL_FUNC) read_statusbar_config);
 	signal_remove("theme changed", (SIGNAL_FUNC) read_statusbar_config);
 
-        command_unbind("statusbar", (SIGNAL_FUNC) cmd_statusbar);
-        command_unbind("statusbar enable", (SIGNAL_FUNC) cmd_statusbar_enable);
-        command_unbind("statusbar disable", (SIGNAL_FUNC) cmd_statusbar_disable);
-        command_unbind("statusbar reset", (SIGNAL_FUNC) cmd_statusbar_reset);
-        command_unbind("statusbar add", (SIGNAL_FUNC) cmd_statusbar_add);
-        command_unbind("statusbar remove", (SIGNAL_FUNC) cmd_statusbar_remove);
-        command_unbind("statusbar type", (SIGNAL_FUNC) cmd_statusbar_type);
-        command_unbind("statusbar placement", (SIGNAL_FUNC) cmd_statusbar_placement);
-        command_unbind("statusbar position", (SIGNAL_FUNC) cmd_statusbar_position);
-        command_unbind("statusbar visible", (SIGNAL_FUNC) cmd_statusbar_visible);
+	command_unbind("statusbar", (SIGNAL_FUNC) cmd_statusbar);
+	command_unbind("statusbar list", (SIGNAL_FUNC) cmd_statusbar_list);
+	command_unbind("statusbar add", (SIGNAL_FUNC) cmd_statusbar_add_modify);
+	command_unbind("statusbar modify", (SIGNAL_FUNC) cmd_statusbar_add_modify);
+	command_unbind("statusbar reset", (SIGNAL_FUNC) cmd_statusbar_reset);
+	command_unbind("statusbar info", (SIGNAL_FUNC) cmd_statusbar_info);
+	command_unbind("statusbar additem", (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
+	command_unbind("statusbar modifyitem", (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
+	command_unbind("statusbar removeitem", (SIGNAL_FUNC) cmd_statusbar_removeitem);
 }

From 61c58b7690e9eec159ba32e5ea40809ed17ef424 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Mar 2018 10:35:39 +0100
Subject: [PATCH 0803/1650] actually check which of add or modify was called

---
 src/fe-text/statusbar-config.c | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 391a5768..75d10612 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -374,6 +374,7 @@ static void cmd_statusbar_add_modify(const char *data, void *server, void *witem
 	char *name, *type, *placement, *visible;
 	void *free_arg;
 	int error;
+	int add = GPOINTER_TO_INT(signal_get_user_data());
 
 	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
 	                    "statusbar add", &optlist, &name))
@@ -429,12 +430,20 @@ static void cmd_statusbar_add_modify(const char *data, void *server, void *witem
 		}
 	}
 
+	if (!error) {
+		node = sbar_node(name, add);
+
+		if (node == NULL) {
+			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, name);
+			error++;
+		}
+	}
+
 	if (error) {
 		cmd_params_free(free_arg);
 		return;
 	}
 
-	node = sbar_node(name, TRUE);
 	if (g_hash_table_lookup(optlist, "nodisable"))
 		iconfig_node_set_str(node, "disabled", NULL);
 	if (g_hash_table_lookup(optlist, "disable"))
@@ -527,6 +536,7 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 	char *item, *statusbar, *value;
 	void *free_arg;
 	int index;
+	int additem = GINT_TO_POINTER(signal_get_user_data());
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
 	                    "statusbar additem", &optlist, &item, &statusbar))
@@ -556,6 +566,12 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 	value = g_hash_table_lookup(optlist, "after");
 	if (value != NULL) index = config_node_index(node, value)+1;
 
+	if (!additem && iconfig_node_section(node, item, -1) == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
+		cmd_params_free(free_arg);
+		return;
+	}
+
 	/* create/move item */
 	node = iconfig_node_section_index(node, item, index, NODE_TYPE_BLOCK);
 
@@ -689,12 +705,12 @@ void statusbar_config_init(void)
 
 	command_bind("statusbar", NULL, (SIGNAL_FUNC) cmd_statusbar);
 	command_bind("statusbar list", NULL, (SIGNAL_FUNC) cmd_statusbar_list);
-	command_bind("statusbar add", NULL, (SIGNAL_FUNC) cmd_statusbar_add_modify);
-	command_bind("statusbar modify", NULL, (SIGNAL_FUNC) cmd_statusbar_add_modify);
+	command_bind_data("statusbar add", NULL, (SIGNAL_FUNC) cmd_statusbar_add_modify, GINT_TO_POINTER(TRUE));
+	command_bind_data("statusbar modify", NULL, (SIGNAL_FUNC) cmd_statusbar_add_modify, GINT_TO_POINTER(FALSE));
 	command_bind("statusbar reset", NULL, (SIGNAL_FUNC) cmd_statusbar_reset);
 	command_bind("statusbar info", NULL, (SIGNAL_FUNC) cmd_statusbar_info);
-	command_bind("statusbar additem", NULL, (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
-	command_bind("statusbar modifyitem", NULL, (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
+	command_bind_data("statusbar additem", NULL, (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem, GINT_TO_POINTER(TRUE));
+	command_bind_data("statusbar modifyitem", NULL, (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem, GINT_TO_POINTER(FALSE));
 	command_bind("statusbar removeitem", NULL, (SIGNAL_FUNC) cmd_statusbar_removeitem);
 
 	command_set_options("statusbar additem", "+before +after +priority +alignment");
@@ -712,11 +728,11 @@ void statusbar_config_deinit(void)
 
 	command_unbind("statusbar", (SIGNAL_FUNC) cmd_statusbar);
 	command_unbind("statusbar list", (SIGNAL_FUNC) cmd_statusbar_list);
-	command_unbind("statusbar add", (SIGNAL_FUNC) cmd_statusbar_add_modify);
-	command_unbind("statusbar modify", (SIGNAL_FUNC) cmd_statusbar_add_modify);
+	command_unbind_full("statusbar add", (SIGNAL_FUNC) cmd_statusbar_add_modify, GINT_TO_POINTER(TRUE));
+	command_unbind_full("statusbar modify", (SIGNAL_FUNC) cmd_statusbar_add_modify, GINT_TO_POINTER(FALSE));
 	command_unbind("statusbar reset", (SIGNAL_FUNC) cmd_statusbar_reset);
 	command_unbind("statusbar info", (SIGNAL_FUNC) cmd_statusbar_info);
-	command_unbind("statusbar additem", (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
-	command_unbind("statusbar modifyitem", (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem);
+	command_unbind_full("statusbar additem", (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem, GINT_TO_POINTER(TRUE));
+	command_unbind_full("statusbar modifyitem", (SIGNAL_FUNC) cmd_statusbar_additem_modifyitem, GINT_TO_POINTER(FALSE));
 	command_unbind("statusbar removeitem", (SIGNAL_FUNC) cmd_statusbar_removeitem);
 }

From c8191b33155ae7ee1ebb07d87b8e001f75188eeb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 12 Mar 2018 09:41:53 +0100
Subject: [PATCH 0804/1650] abi bump

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 746aad4e..de29abd5 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 15
+#define IRSSI_ABI_VERSION 16
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 501c150ec21b1dceeecc0c201d22fc1bad161cf4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Mar 2018 17:39:08 +0100
Subject: [PATCH 0805/1650] make new status bar actually work

---
 src/fe-text/statusbar-config.c | 196 ++++++++++++++++++++++++++-------
 1 file changed, 154 insertions(+), 42 deletions(-)

diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 75d10612..a6ec81fe 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -275,22 +275,49 @@ static const char *sbar_get_visibility(STATUSBAR_CONFIG_REC *rec)
 		rec->visible == STATUSBAR_VISIBLE_INACTIVE ? "inactive" : "??";
 }
 
-static CONFIG_NODE *sbar_node(const char *name, gboolean create)
+#define iconfig_sbar_node(a, b) config_sbar_node(mainconfig, a, b)
+static CONFIG_NODE *config_sbar_node(CONFIG_REC *config, const char *name, gboolean create)
 {
 	CONFIG_NODE *node;
+
+	node = config_node_traverse(config, "statusbar", create);
+	if (node != NULL) {
+		node = config_node_section(config, node, active_statusbar_group->name,
+		                           create ? NODE_TYPE_BLOCK : -1);
+	}
+
+	if (node != NULL) {
+		node = config_node_section(config, node, name, create ? NODE_TYPE_BLOCK : -1);
+	}
+
+	return node;
+}
+
+static CONFIG_NODE *sbar_node(const char *name, gboolean create)
+{
 	STATUSBAR_CONFIG_REC *rec = statusbar_config_find(active_statusbar_group, name);
 	if (rec != NULL) {
 		name = rec->name;
-	} else if (!create) {
-		return NULL;
 	}
 
 	/* lookup/create the statusbar node */
-	node = iconfig_node_traverse("statusbar", TRUE);
-	node = iconfig_node_section(node, active_statusbar_group->name, NODE_TYPE_BLOCK);
-	node = iconfig_node_section(node, name, NODE_TYPE_BLOCK);
+	return iconfig_sbar_node(name, create);
+}
 
-	return node;
+static gboolean sbar_node_isdefault(const char *name)
+{
+	CONFIG_REC *config;
+	CONFIG_NODE *node;
+
+	/* read the default statusbar settings from internal config */
+	config = config_open(NULL, -1);
+	config_parse_data(config, default_config, "internal");
+
+	node = config_sbar_node(config, name, FALSE);
+
+	config_close(config);
+
+	return node != NULL ? TRUE : FALSE;
 }
 
 static void statusbar_list_items(STATUSBAR_CONFIG_REC *bar)
@@ -432,6 +459,11 @@ static void cmd_statusbar_add_modify(const char *data, void *server, void *witem
 
 	if (!error) {
 		node = sbar_node(name, add);
+		if (node == NULL && !add && sbar_node_isdefault(name)) {
+			/* If this node is a default status bar, we need to create it in the config
+			 * to configure it */
+			node = sbar_node(name, TRUE);
+		}
 
 		if (node == NULL) {
 			printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, name);
@@ -477,50 +509,59 @@ static void cmd_statusbar_reset(const char *data, void *server, void *witem)
 	}
 
 	node = sbar_node(name, FALSE);
-	if (node == NULL) {
+	if (node == NULL && !sbar_node_isdefault(name)) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, name);
 		cmd_params_free(free_arg);
 		return;
 	}
 
-	parent = iconfig_node_traverse("statusbar", TRUE);
-	parent = iconfig_node_section(parent, active_statusbar_group->name, NODE_TYPE_BLOCK);
+	parent = iconfig_node_traverse("statusbar", FALSE);
+	if (parent != NULL) {
+		parent = iconfig_node_section(parent, active_statusbar_group->name, -1);
+	}
 
-	iconfig_node_set_str(parent, node->key, NULL);
+	if (parent != NULL && node != NULL) {
+		iconfig_node_set_str(parent, node->key, NULL);
+	}
 
 	read_statusbar_config();
 	cmd_params_free(free_arg);
 }
 
-static CONFIG_NODE *statusbar_items_section(CONFIG_NODE *parent)
+#define iconfig_sbar_items_section(a, b) config_sbar_items_section(mainconfig, a, b)
+static CONFIG_NODE *config_sbar_items_section(CONFIG_REC *config, CONFIG_NODE *parent,
+                                              gboolean create)
+{
+	return config_node_section(config, parent, "items", create ? NODE_TYPE_BLOCK : -1);
+}
+
+static CONFIG_NODE *statusbar_copy_config(CONFIG_REC *config, CONFIG_NODE *source,
+                                          CONFIG_NODE *parent)
 {
-	STATUSBAR_CONFIG_REC *bar;
-        CONFIG_NODE *node;
         GSList *tmp;
 
-	node = iconfig_node_section(parent, "items", -1);
-	if (node != NULL)
-		return node;
+	g_return_val_if_fail(parent != NULL, NULL);
 
-        /* find the statusbar configuration from memory */
-	bar = statusbar_config_find(active_statusbar_group, parent->key);
-	if (bar == NULL) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_STATUSBAR_NOT_FOUND, parent->key);
-                return NULL;
-	}
+	parent = iconfig_sbar_items_section(parent, TRUE);
 
 	/* since items list in config file overrides defaults,
 	   we'll need to copy the whole list. */
-	parent = iconfig_node_section(parent, "items", NODE_TYPE_BLOCK);
-	for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
-		SBAR_ITEM_CONFIG_REC *rec = tmp->data;
+	for (tmp = config_node_first(source->value); tmp != NULL; tmp = config_node_next(tmp)) {
+		int priority, right_alignment;
+		CONFIG_NODE *node, *snode;
 
-		node = iconfig_node_section(parent, rec->name,
-					   NODE_TYPE_BLOCK);
-		if (rec->priority != 0)
-			iconfig_node_set_int(node, "priority", rec->priority);
-		if (rec->right_alignment)
+		snode = tmp->data;
+
+		priority = config_node_get_int(snode, "priority", 0);
+		right_alignment =
+		    g_strcmp0(config_node_get_str(snode, "alignment", ""), "right") == 0;
+
+		/* create new item */
+		node = iconfig_node_section(parent, snode->key, NODE_TYPE_BLOCK);
+
+		if (priority != 0)
+			iconfig_node_set_int(node, "priority", priority);
+		if (right_alignment)
 			iconfig_node_set_str(node, "alignment", "right");
 	}
 
@@ -531,12 +572,13 @@ static CONFIG_NODE *statusbar_items_section(CONFIG_NODE *parent)
            [-priority #] [-alignment left|right] <item> <statusbar> */
 static void cmd_statusbar_additem_modifyitem(const char *data, void *server, void *witem)
 {
+	CONFIG_REC *config, *close_config;
 	CONFIG_NODE *node;
 	GHashTable *optlist;
 	char *item, *statusbar, *value;
 	void *free_arg;
 	int index;
-	int additem = GINT_TO_POINTER(signal_get_user_data());
+	int additem = GPOINTER_TO_INT(signal_get_user_data());
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
 	                    "statusbar additem", &optlist, &item, &statusbar))
@@ -546,15 +588,33 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 	}
 
+	close_config = NULL;
+	config = mainconfig;
+
 	node = sbar_node(statusbar, FALSE);
+	if (node == NULL) {
+		/* we are looking up defaults from the internal config */
+		close_config = config = config_open(NULL, -1);
+		config_parse_data(config, default_config, "internal");
+		node = config_sbar_node(config, statusbar, FALSE);
+	}
+
 	if (node == NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
+		if (close_config != NULL) {
+			config_close(close_config);
+		}
 		cmd_params_free(free_arg);
 		return;
 	}
 
-	node = statusbar_items_section(node);
+	node = config_sbar_items_section(config, node, additem);
+
 	if (node == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
+		if (close_config != NULL) {
+			config_close(close_config);
+		}
 		cmd_params_free(free_arg);
 		return;
 	}
@@ -566,8 +626,28 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 	value = g_hash_table_lookup(optlist, "after");
 	if (value != NULL) index = config_node_index(node, value)+1;
 
-	if (!additem && iconfig_node_section(node, item, -1) == NULL) {
+	if (!additem && config_node_section(config, node, item, -1) == NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
+		if (close_config != NULL) {
+			config_close(close_config);
+		}
+		cmd_params_free(free_arg);
+		return;
+	}
+
+	if (config != mainconfig) {
+		/* we need to copy default to user config */
+		node = statusbar_copy_config(config, node, sbar_node(statusbar, TRUE));
+		config = mainconfig;
+	}
+
+	if (close_config != NULL) {
+		config_close(close_config);
+		close_config = NULL;
+	}
+
+	if (node == NULL) {
+		g_warning("node not found");
 		cmd_params_free(free_arg);
 		return;
 	}
@@ -593,6 +673,7 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 /* SYNTAX: STATUSBAR REMOVEITEM <item> <statusbar> */
 static void cmd_statusbar_removeitem(const char *data, void *server, void *witem)
 {
+	CONFIG_REC *config, *close_config;
 	CONFIG_NODE *node;
 	char *item, *statusbar;
 	void *free_arg;
@@ -603,25 +684,56 @@ static void cmd_statusbar_removeitem(const char *data, void *server, void *witem
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 	}
 
+	close_config = NULL;
+	config = mainconfig;
+
 	node = sbar_node(statusbar, FALSE);
 	if (node == NULL) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
-		cmd_params_free(free_arg);
-		return;
+		/* we are looking up defaults from the internal config */
+		close_config = config = config_open(NULL, -1);
+		config_parse_data(config, default_config, "internal");
+		node = config_sbar_node(config, statusbar, FALSE);
 	}
 
-	node = statusbar_items_section(node);
 	if (node == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
+		if (close_config != NULL) {
+			config_close(close_config);
+		}
 		cmd_params_free(free_arg);
 		return;
 	}
 
-	if (iconfig_node_section(node, item, -1) != NULL)
-		iconfig_node_set_str(node, item, NULL);
-	else {
+	node = config_sbar_items_section(config, node, FALSE);
+
+	if (node == NULL || config_node_section(config, node, item, -1) == NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
+		if (close_config != NULL) {
+			config_close(close_config);
+		}
+		cmd_params_free(free_arg);
+		return;
 	}
 
+	if (config != mainconfig) {
+		/* we need to copy default to user config */
+		node = statusbar_copy_config(config, node, sbar_node(statusbar, TRUE));
+		config = mainconfig;
+	}
+
+	if (close_config != NULL) {
+		config_close(close_config);
+		close_config = NULL;
+	}
+
+	if (node == NULL) {
+		g_warning("node not found");
+		cmd_params_free(free_arg);
+		return;
+	}
+
+	iconfig_node_set_str(node, item, NULL);
+
 	read_statusbar_config();
 	cmd_params_free(free_arg);
 }

From 977c2c0a0d911e3b7b43387ed19c5bfee565c617 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Mar 2018 17:53:03 +0100
Subject: [PATCH 0806/1650] refactor common parts

---
 src/fe-text/statusbar-config.c | 155 +++++++++++----------------------
 1 file changed, 52 insertions(+), 103 deletions(-)

diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index a6ec81fe..0c6070fa 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -568,11 +568,54 @@ static CONFIG_NODE *statusbar_copy_config(CONFIG_REC *config, CONFIG_NODE *sourc
 	return parent;
 }
 
+static CONFIG_NODE *sbar_find_item_with_defaults(const char *statusbar, const char *item,
+                                                 gboolean create)
+{
+	CONFIG_REC *config, *close_config;
+	CONFIG_NODE *node;
+
+	close_config = NULL;
+	config = mainconfig;
+	node = sbar_node(statusbar, FALSE);
+
+	if (node == NULL) {
+		/* we are looking up defaults from the internal config */
+		close_config = config = config_open(NULL, -1);
+		config_parse_data(config, default_config, "internal");
+		node = config_sbar_node(config, statusbar, FALSE);
+	}
+
+	if (node == NULL) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
+		if (close_config != NULL)
+			config_close(close_config);
+		return NULL;
+	}
+
+	node = config_sbar_items_section(config, node, create);
+
+	if (node == NULL || (!create && config_node_section(config, node, item, -1) == NULL)) {
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
+		if (close_config != NULL)
+			config_close(close_config);
+		return NULL;
+	}
+
+	if (config != mainconfig) {
+		/* we need to copy default to user config */
+		node = statusbar_copy_config(config, node, sbar_node(statusbar, TRUE));
+	}
+
+	if (close_config != NULL)
+		config_close(close_config);
+
+	return node;
+}
+
 /* SYNTAX: STATUSBAR ADDITEM|MODIFYITEM [-before | -after <item>]
            [-priority #] [-alignment left|right] <item> <statusbar> */
 static void cmd_statusbar_additem_modifyitem(const char *data, void *server, void *witem)
 {
-	CONFIG_REC *config, *close_config;
 	CONFIG_NODE *node;
 	GHashTable *optlist;
 	char *item, *statusbar, *value;
@@ -588,33 +631,8 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 	}
 
-	close_config = NULL;
-	config = mainconfig;
-
-	node = sbar_node(statusbar, FALSE);
+	node = sbar_find_item_with_defaults(statusbar, item, additem);
 	if (node == NULL) {
-		/* we are looking up defaults from the internal config */
-		close_config = config = config_open(NULL, -1);
-		config_parse_data(config, default_config, "internal");
-		node = config_sbar_node(config, statusbar, FALSE);
-	}
-
-	if (node == NULL) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
-		if (close_config != NULL) {
-			config_close(close_config);
-		}
-		cmd_params_free(free_arg);
-		return;
-	}
-
-	node = config_sbar_items_section(config, node, additem);
-
-	if (node == NULL) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
-		if (close_config != NULL) {
-			config_close(close_config);
-		}
 		cmd_params_free(free_arg);
 		return;
 	}
@@ -622,35 +640,11 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 	/* get the index */
 	index = -1;
 	value = g_hash_table_lookup(optlist, "before");
-	if (value != NULL) index = config_node_index(node, value);
+	if (value != NULL)
+		index = config_node_index(node, value);
 	value = g_hash_table_lookup(optlist, "after");
-	if (value != NULL) index = config_node_index(node, value)+1;
-
-	if (!additem && config_node_section(config, node, item, -1) == NULL) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
-		if (close_config != NULL) {
-			config_close(close_config);
-		}
-		cmd_params_free(free_arg);
-		return;
-	}
-
-	if (config != mainconfig) {
-		/* we need to copy default to user config */
-		node = statusbar_copy_config(config, node, sbar_node(statusbar, TRUE));
-		config = mainconfig;
-	}
-
-	if (close_config != NULL) {
-		config_close(close_config);
-		close_config = NULL;
-	}
-
-	if (node == NULL) {
-		g_warning("node not found");
-		cmd_params_free(free_arg);
-		return;
-	}
+	if (value != NULL)
+		index = config_node_index(node, value) + 1;
 
 	/* create/move item */
 	node = iconfig_node_section_index(node, item, index, NODE_TYPE_BLOCK);
@@ -684,55 +678,10 @@ static void cmd_statusbar_removeitem(const char *data, void *server, void *witem
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 	}
 
-	close_config = NULL;
-	config = mainconfig;
+	node = sbar_find_item_with_defaults(statusbar, item, FALSE);
 
-	node = sbar_node(statusbar, FALSE);
-	if (node == NULL) {
-		/* we are looking up defaults from the internal config */
-		close_config = config = config_open(NULL, -1);
-		config_parse_data(config, default_config, "internal");
-		node = config_sbar_node(config, statusbar, FALSE);
-	}
-
-	if (node == NULL) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_NOT_FOUND, statusbar);
-		if (close_config != NULL) {
-			config_close(close_config);
-		}
-		cmd_params_free(free_arg);
-		return;
-	}
-
-	node = config_sbar_items_section(config, node, FALSE);
-
-	if (node == NULL || config_node_section(config, node, item, -1) == NULL) {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_STATUSBAR_ITEM_NOT_FOUND, item);
-		if (close_config != NULL) {
-			config_close(close_config);
-		}
-		cmd_params_free(free_arg);
-		return;
-	}
-
-	if (config != mainconfig) {
-		/* we need to copy default to user config */
-		node = statusbar_copy_config(config, node, sbar_node(statusbar, TRUE));
-		config = mainconfig;
-	}
-
-	if (close_config != NULL) {
-		config_close(close_config);
-		close_config = NULL;
-	}
-
-	if (node == NULL) {
-		g_warning("node not found");
-		cmd_params_free(free_arg);
-		return;
-	}
-
-	iconfig_node_set_str(node, item, NULL);
+	if (node != NULL)
+		iconfig_node_set_str(node, item, NULL);
 
 	read_statusbar_config();
 	cmd_params_free(free_arg);

From ee04cd503ff70a1aed79cdb2c9f787c98b075182 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Mar 2018 17:59:11 +0100
Subject: [PATCH 0807/1650] add disabled txt

---
 src/fe-text/module-formats.c   | 1 +
 src/fe-text/module-formats.h   | 1 +
 src/fe-text/statusbar-config.c | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index b234f46c..277872c6 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -67,6 +67,7 @@ FORMAT_REC gui_text_formats[] =
 	{ "statusbar_info_item_footer", "", 0 },
 	{ "statusbar_info_item_name",  "%#         : $[35]0 $[9]1 $2", 3, { 0, 1, 0 } },
 	{ "statusbar_not_found", "Statusbar doesn't exist: $0", 1, { 0 } },
+	{ "statusbar_not_found", "Statusbar is disabled: $0", 1, { 0 } },
 	{ "statusbar_item_not_found", "Statusbar item doesn't exist: $0", 1, { 0 } },
 	{ "statusbar_unknown_command", "Unknown statusbar command: $0", 1, { 0 } },
 	{ "statusbar_unknown_type", "Statusbar type must be 'window' or 'root'", 1, { 0 } },
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index b753238b..a9f4c6ae 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -42,6 +42,7 @@ enum {
 	TXT_STATUSBAR_INFO_ITEM_FOOTER,
         TXT_STATUSBAR_INFO_ITEM_NAME,
         TXT_STATUSBAR_NOT_FOUND,
+        TXT_STATUSBAR_NOT_ENABLED,
         TXT_STATUSBAR_ITEM_NOT_FOUND,
 	TXT_STATUSBAR_UNKNOWN_COMMAND,
         TXT_STATUSBAR_UNKNOWN_TYPE,
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 0c6070fa..7b5b6884 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -388,8 +388,12 @@ static void cmd_statusbar_print_info(const char *name)
 		return;
 	}
 
-	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-		    TXT_STATUSBAR_NOT_FOUND, name);
+	if (sbar_node(name, FALSE) != NULL || sbar_node_isdefault(name))
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+			    TXT_STATUSBAR_NOT_ENABLED, name);
+	else
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+			    TXT_STATUSBAR_NOT_FOUND, name);
 }
 
 /* SYNTAX: STATUSBAR ADD|MODIFY [-disable | -nodisable] [-type window|root]

From 138eca0749dd05a4a16df9e43d87af2143b224f2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Mar 2018 18:11:12 +0100
Subject: [PATCH 0808/1650] fix build

---
 src/fe-text/module-formats.h   | 18 +++++++++---------
 src/fe-text/statusbar-config.c |  5 ++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index a9f4c6ae..ac60fdb7 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -30,24 +30,24 @@ enum {
 
 	TXT_FILL_3,
 
-        TXT_STATUSBAR_LIST_HEADER,
+	TXT_STATUSBAR_LIST_HEADER,
 	TXT_STATUSBAR_LIST_FOOTER,
 	TXT_STATUSBAR_LIST,
 	TXT_STATUSBAR_INFO_NAME,
 	TXT_STATUSBAR_INFO_TYPE,
-        TXT_STATUSBAR_INFO_PLACEMENT,
+	TXT_STATUSBAR_INFO_PLACEMENT,
 	TXT_STATUSBAR_INFO_POSITION,
 	TXT_STATUSBAR_INFO_VISIBLE,
-        TXT_STATUSBAR_INFO_ITEM_HEADER,
+	TXT_STATUSBAR_INFO_ITEM_HEADER,
 	TXT_STATUSBAR_INFO_ITEM_FOOTER,
-        TXT_STATUSBAR_INFO_ITEM_NAME,
-        TXT_STATUSBAR_NOT_FOUND,
-        TXT_STATUSBAR_NOT_ENABLED,
-        TXT_STATUSBAR_ITEM_NOT_FOUND,
+	TXT_STATUSBAR_INFO_ITEM_NAME,
+	TXT_STATUSBAR_NOT_FOUND,
+	TXT_STATUSBAR_NOT_ENABLED,
+	TXT_STATUSBAR_ITEM_NOT_FOUND,
 	TXT_STATUSBAR_UNKNOWN_COMMAND,
-        TXT_STATUSBAR_UNKNOWN_TYPE,
+	TXT_STATUSBAR_UNKNOWN_TYPE,
 	TXT_STATUSBAR_UNKNOWN_PLACEMENT,
-        TXT_STATUSBAR_UNKNOWN_VISIBILITY,
+	TXT_STATUSBAR_UNKNOWN_VISIBILITY,
 
 	TXT_FILL_4,
 
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 7b5b6884..314befaa 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -101,7 +101,7 @@ statusbar_config_find(STATUSBAR_GROUP_REC *group, const char *name)
 			return config;
 	}
 
-        return NULL;
+	return NULL;
 }
 
 static void statusbar_reset_defaults(void)
@@ -542,7 +542,7 @@ static CONFIG_NODE *config_sbar_items_section(CONFIG_REC *config, CONFIG_NODE *p
 static CONFIG_NODE *statusbar_copy_config(CONFIG_REC *config, CONFIG_NODE *source,
                                           CONFIG_NODE *parent)
 {
-        GSList *tmp;
+	GSList *tmp;
 
 	g_return_val_if_fail(parent != NULL, NULL);
 
@@ -671,7 +671,6 @@ static void cmd_statusbar_additem_modifyitem(const char *data, void *server, voi
 /* SYNTAX: STATUSBAR REMOVEITEM <item> <statusbar> */
 static void cmd_statusbar_removeitem(const char *data, void *server, void *witem)
 {
-	CONFIG_REC *config, *close_config;
 	CONFIG_NODE *node;
 	char *item, *statusbar;
 	void *free_arg;

From 25a44dacf4114f33f3a887f358c02f4fd9938427 Mon Sep 17 00:00:00 2001
From: Dorian Harmans <dorian@woohooyeah.nl>
Date: Fri, 23 Mar 2018 21:35:35 +0100
Subject: [PATCH 0809/1650] fix build with LibreSSL 2.7.0

---
 src/core/network-openssl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 9fddf073..692c7e71 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -35,7 +35,8 @@
 #include <openssl/err.h>
 
 /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
+    (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
 /* The two functions below could be already defined if OPENSSL_API_COMPAT is
  * below the 1.1.0 version so let's do a clean start */
 #undef  X509_get_notBefore
@@ -47,7 +48,8 @@
 
 /* OpenSSL 1.1.0 also introduced some useful additions to the api */
 #if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+    (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
 static int X509_STORE_up_ref(X509_STORE *vfy)
 {
     int n;

From b52cf1015eaa4d759c9377df35a56988655dce89 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 28 Mar 2018 22:40:17 -0300
Subject: [PATCH 0810/1650] otr: add KEY_GEN_STARTED state to avoid starting it
 twice

Fun race condition there, got this when testing with the jabber
xmlconsole open in bitlbee
---
 src/otr/key.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/otr/key.c b/src/otr/key.c
index 4032b0b2..7fee4084 100644
--- a/src/otr/key.c
+++ b/src/otr/key.c
@@ -43,9 +43,10 @@
  */
 enum key_gen_status {
 	KEY_GEN_IDLE		= 0,
-	KEY_GEN_RUNNING		= 1,
-	KEY_GEN_FINISHED	= 2,
-	KEY_GEN_ERROR		= 3,
+	KEY_GEN_STARTED		= 1,
+	KEY_GEN_RUNNING		= 2,
+	KEY_GEN_FINISHED	= 3,
+	KEY_GEN_ERROR		= 4,
 };
 
 /*
@@ -208,6 +209,7 @@ void key_gen_run(struct otr_user_state *ustate, const char *account_name)
 	/* Make sure the pointer does not go away during the proess. */
 	key_gen_state.account_name = strdup(account_name);
 	key_gen_state.ustate = ustate;
+	key_gen_state.status = KEY_GEN_STARTED;
 
 	/* Creating key file path. */
 	key_gen_state.key_file_path = file_path_build(OTR_KEYFILE);

From dd7dc7ca7d0b04ae2d522a209845c453bfd9aab5 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 28 Mar 2018 23:06:47 -0300
Subject: [PATCH 0811/1650] otr: fix missing 'target' param in 'message
 private' signal

Fixes warnings like these on '/msg yourself'

-!- Irssi: critical privmsg_get_query: assertion 'nick != NULL' failed
-!- Irssi: critical query_find: assertion 'nick != NULL' failed
---
 src/otr/module.c | 6 +++---
 src/otr/module.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/otr/module.c b/src/otr/module.c
index 0d83629f..f561b91c 100644
--- a/src/otr/module.c
+++ b/src/otr/module.c
@@ -79,7 +79,7 @@ static void sig_server_sendmsg(SERVER_REC *server, const char *target,
 /*
  * Pipes all incoming private messages through OTR
  */
-void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address)
+void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target)
 {
 	char *new_msg = NULL;
 
@@ -91,7 +91,7 @@ void sig_message_private(SERVER_REC *server, const char *msg, const char *nick,
 
 	if (new_msg == NULL) {
 		/* This message was not OTR */
-		signal_continue(4, server, msg, nick, address);
+		signal_continue(5, server, msg, nick, address, target);
 	} else {
 		/*
 		 * Check for /me IRC marker and if so, handle it so the user does not
@@ -103,7 +103,7 @@ void sig_message_private(SERVER_REC *server, const char *msg, const char *nick,
 			signal_emit("message irc action", 5, server, new_msg + OTR_IRC_MARKER_ME_LEN, nick, address, nick);
 		} else {
 			/* OTR received message */
-			signal_continue(4, server, new_msg, nick, address);
+			signal_continue(5, server, new_msg, nick, address, target);
 		}
 	}
 
diff --git a/src/otr/module.h b/src/otr/module.h
index fdfc77bd..513ee03b 100644
--- a/src/otr/module.h
+++ b/src/otr/module.h
@@ -24,6 +24,6 @@
 #include "common.h"
 #include "servers.h"
 
-void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address);
+void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target);
 
 #endif /* IRSSI_OTR_MODULE */

From 7d7c6975edc13d6f285c00dfc8a4f1a98ffa6702 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Wed, 28 Mar 2018 23:36:03 -0300
Subject: [PATCH 0812/1650] otr: add target param to the unencrypted 'message
 private' signal

Same case as the previous commit.
---
 src/otr/otr-ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/otr/otr-ops.c b/src/otr/otr-ops.c
index 9359e63e..4e8c4e81 100644
--- a/src/otr/otr-ops.c
+++ b/src/otr/otr-ops.c
@@ -183,7 +183,7 @@ static void ops_handle_msg_event(void *opdata, OtrlMessageEvent msg_event, ConnC
 			 * submit a patch or email me a better way.
 			 */
 			signal_remove("message private", (SIGNAL_FUNC) sig_message_private);
-			signal_emit("message private", 4, server, message, username, server->connrec->address);
+			signal_emit("message private", 5, server, message, username, server->connrec->address, server->nick);
 			signal_add_first("message private", (SIGNAL_FUNC) sig_message_private);
 			break;
 		case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED:

From a3b9e2370fd02eb6a400744e31d7db27c8fe92b8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 29 Mar 2018 22:00:40 +0200
Subject: [PATCH 0813/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 746aad4e..de29abd5 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 15
+#define IRSSI_ABI_VERSION 16
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 2830d91a89277052ee8e6978a41a7773c9fe5025 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 29 Mar 2018 22:41:12 +0200
Subject: [PATCH 0814/1650] use precompiled libotr

---
 .travis.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a17cb3ec..30f9cc35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,19 +31,16 @@ addons:
 
 before_install:
     - perl -V
-    - wget https://otr.cypherpunks.ca/libotr-4.1.1.tar.gz
-    - tar zxf libotr-*.tar.gz
-    - cd libotr-*
-    - ./configure --prefix $HOME/otr-prefix && make && make install
-    - cd ..
-    - ./autogen.sh --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-prefix/lib --with-libotr-inc-prefix=$HOME/otr-prefix/include
+    - wget https://github.com/irssi-import/libotr/releases/download/4.1.1/travis-trusty-libotr-4.1.1.tar.gz
+    - tar zxf travis-trusty-libotr*.tar.gz -C $HOME
+    - ./autogen.sh --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-build/lib --with-libotr-inc-prefix=$HOME/otr-build/include
     - make dist
     - cd ..
     - tar xaf */irssi-*.tar.*
     - cd irssi-*
 
 install:
-    - ./configure --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-prefix/lib --with-libotr-inc-prefix=$HOME/otr-prefix/include --prefix=$HOME/irssi-build
+    - ./configure --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-build/lib --with-libotr-inc-prefix=$HOME/otr-build/include --prefix=$HOME/irssi-build
       $( $UNITTESTS && echo --enable-always-build-tests )
     - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
     - make install

From c08685a1a3e4a719fcfe8f30a338a91db8c3b8d1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 19 Mar 2018 16:06:46 +0100
Subject: [PATCH 0815/1650] also reconnect lookup_servers

---
 src/core/servers-reconnect.c | 15 +++++++++++++++
 src/core/servers.c           |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 1727704c..5f609cf5 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -111,6 +111,21 @@ static int server_reconnect_timeout(void)
 		}
 	}
 
+	for (tmp = lookup_servers; tmp != NULL; tmp = next) {
+		SERVER_REC *server = tmp->data;
+
+		next = tmp->next;
+		if (server->connect_time + connect_timeout < now &&
+		    connect_timeout > 0) {
+			if (server->connect_tag != -1) {
+				g_source_remove(server->connect_tag);
+				server->connect_tag = -1;
+			}
+			server->connection_lost = TRUE;
+			server_connect_failed(server, "Timeout");
+		}
+	}
+
 	/* If server_connect() removes the next reconnection in queue,
 	   we're screwed. I don't think this should happen anymore, but just
 	   to be sure we don't crash, do this safely. */
diff --git a/src/core/servers.c b/src/core/servers.c
index 11eccc53..81bdb89e 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -426,6 +426,7 @@ int server_start_connect(SERVER_REC *server)
 				    server_connect_callback_readpipe,
 				    server);
 
+		server->connect_time = time(NULL);
 		lookup_servers = g_slist_append(lookup_servers, server);
 
 		signal_emit("server looking", 1, server);

From 4501917cae4523d11fb049a5d20e5582bb0893ea Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 31 Mar 2018 01:46:10 -0300
Subject: [PATCH 0816/1650] otr: rename module.c to otr-module.c

---
 src/otr/Makefile.am                | 2 +-
 src/otr/{module.c => otr-module.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/otr/{module.c => otr-module.c} (100%)

diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am
index 3b991839..7cc02d6d 100644
--- a/src/otr/Makefile.am
+++ b/src/otr/Makefile.am
@@ -21,7 +21,7 @@ libotr_core_la_LIBADD = $(OTR_LDFLAGS)
 
 otr_sources = \
 	key.c \
-	module.c \
+	otr-module.c \
 	otr-formats.c \
 	otr-ops.c \
 	otr-fe.c \
diff --git a/src/otr/module.c b/src/otr/otr-module.c
similarity index 100%
rename from src/otr/module.c
rename to src/otr/otr-module.c

From 0b2f5b0a1e30932b07245c508a673eb0e9b6ab37 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 31 Mar 2018 01:51:47 -0300
Subject: [PATCH 0817/1650] otr: fix blatant lies in help text

---
 docs/help/in/otr.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/otr.in b/docs/help/in/otr.in
index c31bd8e8..f76a2d53 100644
--- a/docs/help/in/otr.in
+++ b/docs/help/in/otr.in
@@ -1,7 +1,7 @@
 
 OTR %|[OPTION]
 
-Command to control the OTR module. Without an option, this help is printed.
+Command to control the OTR module. Without an option, /OTR INFO is printed.
 
 This help contains three sections which are %9options, quickstart and files.%n
 

From 407680efdc662787ecbd1297d1f4781acdb5168c Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 2 Apr 2018 12:30:59 -0300
Subject: [PATCH 0818/1650] Add libgcrypt.m4 so autogen doesn't require
 libgcrypt-dev

---
 m4/libgcrypt.m4 | 143 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 m4/libgcrypt.m4

diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
new file mode 100644
index 00000000..c67cfece
--- /dev/null
+++ b/m4/libgcrypt.m4
@@ -0,0 +1,143 @@
+# libgcrypt.m4 - Autoconf macros to detect libgcrypt
+# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Last-changed: 2014-10-02
+
+
+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl with the API version to also check the API compatibility. Example:
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
+dnl this features allows to prevent build against newer versions of libgcrypt
+dnl with a changed API.
+dnl
+dnl If a prefix option is not used, the config script is first
+dnl searched in $SYSROOT/bin and then along $PATH.  If the used
+dnl config script does not match the host specification the script
+dnl is added to the gpg_config_script_warn variable.
+dnl
+AC_DEFUN([AM_PATH_LIBGCRYPT],
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_ARG_WITH(libgcrypt-prefix,
+            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+                           [prefix where LIBGCRYPT is installed (optional)]),
+     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
+  if test x"${LIBGCRYPT_CONFIG}" = x ; then
+     if test x"${libgcrypt_config_prefix}" != x ; then
+        LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
+     else
+       case "${SYSROOT}" in
+         /*)
+           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+           fi
+           ;;
+         '')
+           ;;
+          *)
+           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+           ;;
+       esac
+     fi
+  fi
+
+  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+  tmp=ifelse([$1], ,1:1.2.0,$1)
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+  else
+     req_libgcrypt_api=0
+     min_libgcrypt_version="$tmp"
+  fi
+
+  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
+  ok=no
+  if test "$LIBGCRYPT_CONFIG" != "no" ; then
+    req_major=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+    req_minor=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+    req_micro=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    major=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+    minor=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+    micro=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+    if test "$major" -gt "$req_major"; then
+        ok=yes
+    else
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -gt "$req_minor"; then
+               ok=yes
+            else
+               if test "$minor" -eq "$req_minor"; then
+                   if test "$micro" -ge "$req_micro"; then
+                     ok=yes
+                   fi
+               fi
+            fi
+        fi
+    fi
+  fi
+  if test $ok = yes; then
+    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
+  else
+    AC_MSG_RESULT(no)
+  fi
+  if test $ok = yes; then
+     # If we have a recent libgcrypt, we should also check that the
+     # API is compatible
+     if test "$req_libgcrypt_api" -gt 0 ; then
+        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+        if test "$tmp" -gt 0 ; then
+           AC_MSG_CHECKING([LIBGCRYPT API version])
+           if test "$req_libgcrypt_api" -eq "$tmp" ; then
+             AC_MSG_RESULT([okay])
+           else
+             ok=no
+             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
+           fi
+        fi
+     fi
+  fi
+  if test $ok = yes; then
+    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+    ifelse([$2], , :, [$2])
+    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    if test x"$libgcrypt_config_host" != xnone ; then
+      if test x"$libgcrypt_config_host" != x"$host" ; then
+  AC_MSG_WARN([[
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***]])
+        gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
+      fi
+    fi
+  else
+    LIBGCRYPT_CFLAGS=""
+    LIBGCRYPT_LIBS=""
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(LIBGCRYPT_CFLAGS)
+  AC_SUBST(LIBGCRYPT_LIBS)
+])

From 8607a5fa78ba44db51cc75a020e1a53c4e04a057 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 7 Apr 2018 21:47:38 -0300
Subject: [PATCH 0819/1650] signals.txt: add missing 'server cap new|delete'
 signals

Emitted by cap_emit_signal in irc/core/irc-cap.c, added as part of the
CAP 3.2 PR merged recentlyish.
---
 docs/signals.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/signals.txt b/docs/signals.txt
index 84d4518f..4dbfb2e2 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -132,6 +132,8 @@ irc-servers.c:
 irc-cap.c
  "server cap ack "<cmd>, SERVER_REC
  "server cap nak "<cmd>, SERVER_REC
+ "server cap new "<cmd>, SERVER_REC
+ "server cap delete "<cmd>, SERVER_REC
  "server cap end", SERVER_REC
 
 sasl.c

From af5ee997e7544eb59ed509ef8fb79ec449756e90 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 8 Apr 2018 01:24:48 -0300
Subject: [PATCH 0820/1650] Add "server cap req" signal, emitted before
 requesting caps

---
 docs/signals.txt       |  1 +
 src/irc/core/irc-cap.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 84d4518f..97ce6c69 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -133,6 +133,7 @@ irc-cap.c
  "server cap ack "<cmd>, SERVER_REC
  "server cap nak "<cmd>, SERVER_REC
  "server cap end", SERVER_REC
+ "server cap req", SERVER_REC, char *caps
 
 sasl.c
  "server sasl failure", SERVER_REC, char *reason
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 1a60d99b..bcaeb10d 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -48,11 +48,17 @@ int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 		if (!g_hash_table_lookup_extended(server->cap_supported, cap, NULL, NULL))
 			return FALSE;
 
+		signal_emit("server cap req", 2, server, cap);
 		irc_send_cmdv(server, "CAP REQ %s", cap);
 		return TRUE;
 	}
 	else if (!enable && gslist_find_string(server->cap_active, cap)) {
-		irc_send_cmdv(server, "CAP REQ -%s", cap);
+		char *negcap = g_strdup_printf("-%s", cap);
+
+		signal_emit("server cap req", 2, server, negcap);
+		irc_send_cmdv(server, "CAP REQ %s", negcap);
+
+		g_free(negcap);
 		return TRUE;
 	}
 
@@ -194,10 +200,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 				server->cap_queue = NULL;
 
 				/* If the server doesn't support any cap we requested close the negotiation here */
-				if (avail_caps > 0)
+				if (avail_caps > 0) {
+					signal_emit("server cap req", 2, server, cmd->str + sizeof("CAP REQ :") - 1);
 					irc_send_cmd_now(server, cmd->str);
-				else
+				} else {
 					cap_finish_negotiation(server);
+				}
 
 				g_string_free(cmd, TRUE);
 			}

From d0151fd5a21cf026afa67239ad79f23bc26f0a10 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 8 Apr 2018 01:26:11 -0300
Subject: [PATCH 0821/1650] Add fe-cap to show messages for CAP-related events
 in the UI

Replaces cap.pl
---
 src/fe-common/irc/Makefile.am      |  1 +
 src/fe-common/irc/fe-cap.c         | 84 ++++++++++++++++++++++++++++++
 src/fe-common/irc/fe-common-irc.c  |  5 ++
 src/fe-common/irc/module-formats.c |  7 +++
 src/fe-common/irc/module-formats.h |  7 +++
 5 files changed, 104 insertions(+)
 create mode 100644 src/fe-common/irc/fe-cap.c

diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index bf88f5cd..a5e95885 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -27,6 +27,7 @@ real_sources = \
 	fe-common-irc.c \
 	fe-whois.c \
 	fe-sasl.c \
+	fe-cap.c \
 	irc-completion.c \
 	module-formats.c 
 
diff --git a/src/fe-common/irc/fe-cap.c b/src/fe-common/irc/fe-cap.c
new file mode 100644
index 00000000..4f9d8ea9
--- /dev/null
+++ b/src/fe-common/irc/fe-cap.c
@@ -0,0 +1,84 @@
+/*
+    fe-cap.c : irssi
+
+    Copyright (C) 2018 dequis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "module-formats.h"
+#include "signals.h"
+#include "levels.h"
+#include "misc.h"
+
+#include "irc-servers.h"
+
+#include "printtext.h"
+
+static const struct {
+	const char *command;
+	const int template;
+} fe_cap_messages[] = {
+	{"LS", IRCTXT_CAP_LS},
+	{"ACK", IRCTXT_CAP_ACK},
+	{"NAK", IRCTXT_CAP_NAK},
+	{"LIST", IRCTXT_CAP_LIST},
+	{"NEW", IRCTXT_CAP_NEW},
+	{"DEL", IRCTXT_CAP_DEL},
+};
+
+static void event_cap(IRC_SERVER_REC *server, char *args, char *nick, char *address)
+{
+	int i;
+	char *params, *evt, *list, *star;
+
+	params = event_get_params(args, 4, NULL, &evt, &star, &list);
+
+	if (params == NULL) {
+		return;
+	}
+
+	/* With multiline CAP LS, if the '*' parameter isn't present,
+	 * adjust the parameter pointer to compensate for this */
+	if (strcmp(star, "*") != 0 && list[0] == '\0') {
+		list = star;
+	}
+
+	for (i = 0; i < G_N_ELEMENTS(fe_cap_messages); i++) {
+		if (!g_ascii_strcasecmp(evt, fe_cap_messages[i].command)) {
+			printformat(server, NULL, MSGLEVEL_CRAP, fe_cap_messages[i].template, list);
+		}
+	}
+
+	g_free(params);
+}
+
+static void sig_server_cap_req(IRC_SERVER_REC *server, char *caps)
+{
+	printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_CAP_REQ, caps);
+}
+
+void fe_cap_init(void)
+{
+	signal_add("event cap", (SIGNAL_FUNC) event_cap);
+	signal_add("server cap req", (SIGNAL_FUNC) sig_server_cap_req);
+}
+
+void fe_cap_deinit(void)
+{
+	signal_remove("event cap", (SIGNAL_FUNC) event_cap);
+	signal_remove("server cap req", (SIGNAL_FUNC) sig_server_cap_req);
+}
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index 4a3ef1d3..b1bfb525 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -72,6 +72,9 @@ void fe_whois_deinit(void);
 void fe_sasl_init(void);
 void fe_sasl_deinit(void);
 
+void fe_cap_init(void);
+void fe_cap_deinit(void);
+
 void irc_completion_init(void);
 void irc_completion_deinit(void);
 
@@ -95,6 +98,7 @@ void fe_common_irc_init(void)
 	fe_netjoin_init();
         fe_whois_init();
 	fe_sasl_init();
+	fe_cap_init();
         irc_completion_init();
 
 	settings_check();
@@ -121,6 +125,7 @@ void fe_common_irc_deinit(void)
 	fe_netjoin_deinit();
         fe_whois_deinit();
 	fe_sasl_deinit();
+	fe_cap_deinit();
         irc_completion_deinit();
 
 	theme_unregister();
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index f7b074ec..722aed73 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -46,6 +46,13 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "setupserver_footer", "", 0 },
 	{ "sasl_success", "SASL authentication succeeded", 0 },
 	{ "sasl_error", "Cannot authenticate via SASL ($0)", 1, { 0 } },
+	{ "cap_req",  "Capabilities requested: $0", 1, { 0 } },
+	{ "cap_ls",   "Capabilities supported: $0", 1, { 0 } },
+	{ "cap_ack",  "Capabilities acknowledged: $0", 1, { 0 } },
+	{ "cap_nak",  "Capabilities refused: $0", 1, { 0 } },
+	{ "cap_list", "Capabilities currently enabled: $0", 1, { 0 } },
+	{ "cap_new",  "Capabilities now available: $0", 1, { 0 } },
+	{ "cap_del",  "Capabilities removed: $0", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Channels", 0 },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index c45f4562..7969b5ac 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -24,6 +24,13 @@ enum {
 	IRCTXT_SETUPSERVER_FOOTER,
 	IRCTXT_SASL_SUCCESS,
 	IRCTXT_SASL_ERROR,
+	IRCTXT_CAP_REQ,
+	IRCTXT_CAP_LS,
+	IRCTXT_CAP_ACK,
+	IRCTXT_CAP_NAK,
+	IRCTXT_CAP_LIST,
+	IRCTXT_CAP_NEW,
+	IRCTXT_CAP_DEL,
 
 	IRCTXT_FILL_2,
 

From 8deb6182c692904733544568479035b31fe1007e Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 8 Apr 2018 15:52:09 -0300
Subject: [PATCH 0822/1650] Make config_write more atomic to prevent truncation
 when out of space

This is modeled after glib's g_file_set_contents. It doesn't use that
function directly because the writing is done with GIOChannel
streaming-like writes and g_file_set_contents expects the whole thing to
be in-memory.

Main differences with g_file_set_contents:

- complete lack of win32 special casing (cygwin/WSL should work though)
- no fallocate() (linux only, but we don't know the size upfront, anyway)
- always calls fsync (glib skips it on btrfs or when not overwriting)

Other than that, it's the same old mkstemp + fsync + rename.
---
 src/lib-config/write.c | 45 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index 37e51f09..ab2c6975 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -301,30 +301,67 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 {
 	int ret;
 	int fd;
+	int save_errno;
+	char *tmp_name;
+	const char *dest_name;
 
 	g_return_val_if_fail(rec != NULL, -1);
         g_return_val_if_fail(fname != NULL || rec->fname != NULL, -1);
         g_return_val_if_fail(create_mode != -1 || rec->create_mode != -1, -1);
 
-	fd = open(fname != NULL ? fname : rec->fname,
+	dest_name = fname != NULL ? fname : rec->fname;
+	tmp_name = g_strdup_printf("%s.XXXXXX", dest_name);
+
+	fd = g_mkstemp_full(tmp_name,
 			   O_WRONLY | O_TRUNC | O_CREAT,
 			   create_mode != -1 ? create_mode : rec->create_mode);
-	if (fd == -1)
-		return config_error(rec, g_strerror(errno));
+	if (fd == -1) {
+		config_error(rec, g_strerror(errno));
+		ret = -1;
+		goto out;
+	}
 
 	rec->handle = g_io_channel_unix_new(fd);
 	g_io_channel_set_encoding(rec->handle, NULL, NULL);
 	g_io_channel_set_close_on_unref(rec->handle, TRUE);
+
 	rec->tmp_indent_level = 0;
 	rec->tmp_last_lf = TRUE;
         ret = config_write_block(rec, rec->mainnode, FALSE, TRUE);
+	save_errno = errno;
+
 	if (ret == -1) {
 		/* write error */
-		config_error(rec, errno == 0 ? "bug" : g_strerror(errno));
+		unlink(tmp_name);
+		config_error(rec, save_errno == 0 ? "bug" : g_strerror(save_errno));
+		goto out;
+	}
+
+	ret = fsync(fd);
+	save_errno = errno;
+
+	if (ret == -1) {
+		unlink(tmp_name);
+		config_error(rec, g_strerror(errno));
+		goto out;
 	}
 
 	g_io_channel_unref(rec->handle);
 	rec->handle = NULL;
 
+	if (rename(tmp_name, dest_name) == -1) {
+		unlink(tmp_name);
+		config_error(rec, g_strerror(errno));
+		goto out;
+	}
+
+out:
+	if (rec->handle) {
+		g_io_channel_unref(rec->handle);
+		rec->handle = NULL;
+	}
+
+	g_free(tmp_name);
+
 	return ret;
 }

From 34b31e8451829e7b515a60cf12183203a059d1c4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 16 Apr 2018 16:19:54 +0200
Subject: [PATCH 0823/1650] record line info on empty lines

---
 src/fe-common/core/formats.c | 9 +++++++++
 src/fe-text/textbuffer.c     | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 4c819c2d..8ad4b3af 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1233,6 +1233,15 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 	dup = str = g_strdup(text);
 
 	flags = 0; fgcolor = theme->default_color; bgcolor = -1;
+
+	if (*str == '\0') {
+		/* empty line, write line info only */
+		signal_emit_id(signal_gui_print_text, 6, dest->window,
+			       GINT_TO_POINTER(fgcolor),
+			       GINT_TO_POINTER(bgcolor),
+			       GINT_TO_POINTER(flags), str,
+			       dest);
+	}
 	while (*str != '\0') {
 		type = '\0';
 		for (ptr = str; *ptr != '\0'; ptr++) {
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 01cdd118..9e1ace96 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -355,9 +355,6 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after,
 	g_return_val_if_fail(buffer != NULL, NULL);
 	g_return_val_if_fail(data != NULL, NULL);
 
-	if (len == 0)
-                return insert_after;
-
 	line = !buffer->last_eol ? insert_after :
 		textbuffer_line_insert(buffer, insert_after);
 

From 3075cbc6fb383024b87563611021f9fb712182fd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 24 Apr 2018 14:00:30 +0200
Subject: [PATCH 0824/1650] Fix test compilation on old glib

e.g. Debian 7
---
 tests/irc/flood/test-796.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index 2e4affa0..0c98509b 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -165,7 +165,9 @@ int main(int argc, char **argv)
 		   server_destroy_flood_set_up, test_server_destroy_flood,
 		   server_destroy_flood_tear_down);
 
+#if GLIB_CHECK_VERSION(2,38,0)
 	g_test_set_nonfatal_assertions();
+#endif
 
 	core_preinit(*argv);
 	irssi_gui = IRSSI_GUI_NONE;

From 631650bd8ab467af8347b5d9b51b2b0193adfe63 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 7 May 2018 21:22:43 +0200
Subject: [PATCH 0825/1650] Revert "record line info on empty lines"

---
 src/fe-common/core/formats.c | 9 ---------
 src/fe-text/textbuffer.c     | 3 +++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 8ad4b3af..4c819c2d 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1233,15 +1233,6 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 	dup = str = g_strdup(text);
 
 	flags = 0; fgcolor = theme->default_color; bgcolor = -1;
-
-	if (*str == '\0') {
-		/* empty line, write line info only */
-		signal_emit_id(signal_gui_print_text, 6, dest->window,
-			       GINT_TO_POINTER(fgcolor),
-			       GINT_TO_POINTER(bgcolor),
-			       GINT_TO_POINTER(flags), str,
-			       dest);
-	}
 	while (*str != '\0') {
 		type = '\0';
 		for (ptr = str; *ptr != '\0'; ptr++) {
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 9e1ace96..01cdd118 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -355,6 +355,9 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after,
 	g_return_val_if_fail(buffer != NULL, NULL);
 	g_return_val_if_fail(data != NULL, NULL);
 
+	if (len == 0)
+                return insert_after;
+
 	line = !buffer->last_eol ? insert_after :
 		textbuffer_line_insert(buffer, insert_after);
 

From db3b671328d0e6890b17c23baf9d4280d086e89b Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Tue, 5 Jun 2018 14:43:37 +0200
Subject: [PATCH 0826/1650] Added HIDDEN level to ignores

---
 src/core/ignore.c                            | 17 +++++++++---
 src/core/ignore.h                            |  2 ++
 src/fe-common/core/fe-ignore.c               |  9 ++++++-
 src/fe-common/core/fe-messages.c             | 27 ++++++++++++++++++++
 src/fe-common/core/window-activity.c         |  2 +-
 src/fe-common/irc/dcc/fe-dcc-chat-messages.c | 12 +++++++++
 src/fe-common/irc/fe-irc-messages.c          |  9 +++++++
 7 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index cec91e6b..8aece6fc 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -82,9 +82,9 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
  * However we also want to allow NO_ACT combined with levels, so mask it out and
  * match levels if set. */
 #define ignore_match_level(rec, level) \
-        (((level & MSGLEVEL_NO_ACT) != 0) ? \
-         ((~MSGLEVEL_NO_ACT & level) & (rec)->level) != 0 : \
-         ((rec)->level & MSGLEVEL_NO_ACT ? 0 : \
+        (((level & (MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN)) != 0) ? \
+         ((~(MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN) & level) & (rec)->level) != 0 : \
+         ((rec)->level & (MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN) ? 0 : \
          (level & (rec)->level) != 0))
 
 #define ignore_match_nickmask(rec, nick, nickmask) \
@@ -212,6 +212,12 @@ IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char
 		if (!(flags & IGNORE_FIND_NOACT) && (rec->level & MSGLEVEL_NO_ACT) != 0)
 			continue;
 
+		if ((flags & IGNORE_FIND_HIDDEN) && (rec->level & MSGLEVEL_HIDDEN) == 0)
+			continue;
+
+		if (!(flags & IGNORE_FIND_HIDDEN) && (rec->level & MSGLEVEL_HIDDEN) != 0)
+			continue;
+
 		if ((rec->mask == NULL && mask != NULL) ||
 		    (rec->mask != NULL && mask == NULL))
 			continue;
@@ -264,6 +270,11 @@ IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **ch
 	return ignore_find_full(servertag, mask, NULL, channels, IGNORE_FIND_NOACT);
 }
 
+IGNORE_REC *ignore_find_hidden(const char *servertag, const char *mask, char **channels, int hidden)
+{
+	return ignore_find_full(servertag, mask, NULL, channels, IGNORE_FIND_HIDDEN);
+}
+
 static void ignore_set_config(IGNORE_REC *rec)
 {
 	CONFIG_NODE *node;
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 31171b58..439927ed 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -29,6 +29,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 enum {
 	IGNORE_FIND_PATTERN = 0x01, /* Match the pattern */
 	IGNORE_FIND_NOACT   = 0x02, /* Exclude the targets with NOACT level */
+	IGNORE_FIND_HIDDEN  = 0x03, /* Exclude the targets with HIDDEN level */
 };
 
 IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern,
@@ -38,6 +39,7 @@ IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const cha
 
 IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
 IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact);
+IGNORE_REC *ignore_find_hidden(const char *servertag, const char *mask, char **channels, int hidden);
 
 void ignore_add_rec(IGNORE_REC *rec);
 void ignore_update_rec(IGNORE_REC *rec);
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 03fd4dd2..88dc48f7 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -157,7 +157,8 @@ static void cmd_ignore(const char *data)
 		g_strsplit(chanarg, ",", -1);
 
 	rec = ignore_find_full(servertag, mask, patternarg, channels,
-			  IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0));
+			  IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0) |
+			  ((level & MSGLEVEL_HIDDEN) ? IGNORE_FIND_HIDDEN : 0));
 	new_ignore = rec == NULL;
 
 	if (rec == NULL) {
@@ -179,6 +180,12 @@ static void cmd_ignore(const char *data)
 		rec->level |= MSGLEVEL_ALL;
 	}
 
+	if (rec->level == MSGLEVEL_HIDDEN) {
+		/* If only HIDDEN was specified add all levels; it makes no
+		 * sense on its own. */
+		rec->level |= MSGLEVEL_ALL;
+	}
+
 	if (new_ignore && rec->level == 0) {
 		/* tried to unignore levels from nonexisting ignore */
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 487a5754..05c64d70 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -204,6 +204,9 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	if (ignore_check(server, nick, address, target, msg, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, nick, address, target, msg, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) chanrec, msg);
 
@@ -263,6 +266,9 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
 	if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	if (own) {
 		printformat(server, target, level,
 			    query == NULL ? TXT_OWN_MSG_PRIVATE :
@@ -358,6 +364,9 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
 	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	printformat(server, channel, level,
 		    TXT_JOIN, nick, address, channel);
 }
@@ -371,6 +380,9 @@ static void sig_message_part(SERVER_REC *server, const char *channel,
 	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	printformat(server, channel, level,
 		    TXT_PART, nick, address, channel, reason);
 }
@@ -390,6 +402,9 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 	if (ignore_check(server, nick, address, NULL, reason, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, nick, address, NULL, reason, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	print_channel = NULL;
 	once = settings_get_bool("show_quit_once");
 
@@ -412,6 +427,9 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 		if (ignore_check(server, nick, address, rec->visible_name, reason, MSGLEVEL_NO_ACT))
 			level |= MSGLEVEL_NO_ACT;
 
+		if (ignore_check(server, nick, address, rec->visible_name, reason, MSGLEVEL_HIDDEN))
+			level |= MSGLEVEL_HIDDEN;
+
 		if (print_channel == NULL ||
 		    active_win->active == (WI_ITEM_REC *) rec)
 			print_channel = rec->visible_name;
@@ -461,6 +479,9 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
 	if (ignore_check(server, kicker, address, channel, reason, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, kicker, address, channel, reason, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	printformat(server, channel, level,
 		    TXT_KICK, nick, channel, kicker, reason, address);
 }
@@ -482,6 +503,9 @@ static void print_nick_change_channel(SERVER_REC *server, const char *channel,
 	if (!(level & MSGLEVEL_NO_ACT) && ignore_check(server, oldnick, address, channel, newnick, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (!(level & MSGLEVEL_HIDDEN) && ignore_check(server, oldnick, address, channel, newnick, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	printformat(server, channel, level,
 		    ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
 		    oldnick, newnick, channel, address);
@@ -561,6 +585,9 @@ static void sig_message_topic(SERVER_REC *server, const char *channel,
 	if (ignore_check(server, nick, address, channel, topic, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, nick, address, channel, topic, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	printformat(server, channel, level,
 		    *topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
 		    nick, channel, topic, address);
diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 3be30ae7..89493aea 100644
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@@ -125,7 +125,7 @@ static void read_settings(void)
 	hide_targets = *targets == '\0' ? NULL :
 		g_strsplit(targets, " ", -1);
 
-	hide_level = MSGLEVEL_NEVER | MSGLEVEL_NO_ACT |
+	hide_level = MSGLEVEL_NEVER | MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN |
 		settings_get_level("activity_hide_level");
 	msg_level = settings_get_level("activity_msg_level");
 	hilight_level = MSGLEVEL_HILIGHT |
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
index 45791f56..3a45a36b 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
@@ -96,6 +96,10 @@ static void sig_message_dcc(CHAT_DCC_REC *dcc, const char *msg)
 				level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+				level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
 			       level, NULL);
 
@@ -118,6 +122,10 @@ static void sig_message_dcc_action(CHAT_DCC_REC *dcc, const char *msg)
 				level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+				level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
 			       level, NULL);
 
@@ -139,6 +147,10 @@ static void sig_message_dcc_ctcp(CHAT_DCC_REC *dcc, const char *cmd,
 				level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
+				level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
 			       level, NULL);
 
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 40ca306d..e8558a17 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -162,6 +162,10 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 			 level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(SERVER(server), nick, address, target, msg,
+			 level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	if (server_ischannel(SERVER(server), target)) {
 		item = irc_channel_find(server, target);
 	} else {
@@ -241,6 +245,11 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 			 msg, level | MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
+	if (ignore_check(server, nick, address,
+			 server_ischannel(SERVER(server), target) ? target : NULL,
+			 msg, level | MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
         if (server_ischannel(SERVER(server), target)) {
 		/* notice in some channel */
 		printformat(server, target, level,

From ac3af3fb56d98b884d03646e3c15435c8a435bf3 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 6 Jun 2018 10:00:38 +0200
Subject: [PATCH 0827/1650] these were bitflags

---
 src/core/ignore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/ignore.h b/src/core/ignore.h
index 439927ed..958aa801 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -29,7 +29,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 enum {
 	IGNORE_FIND_PATTERN = 0x01, /* Match the pattern */
 	IGNORE_FIND_NOACT   = 0x02, /* Exclude the targets with NOACT level */
-	IGNORE_FIND_HIDDEN  = 0x03, /* Exclude the targets with HIDDEN level */
+	IGNORE_FIND_HIDDEN  = 0x04, /* Exclude the targets with HIDDEN level */
 };
 
 IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern,

From 1547248e9448c22476a56c630ee18d95a57dc05f Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 6 Jun 2018 11:03:44 +0200
Subject: [PATCH 0828/1650] simplify code

---
 src/fe-common/core/fe-ignore.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 88dc48f7..39c4dd9f 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -118,7 +118,7 @@ static void cmd_ignore(const char *data)
 	char *patternarg, *chanarg, *mask, *levels, *timestr, *servertag;
 	char **channels;
 	void *free_arg;
-	int new_ignore, msecs, level;
+	int new_ignore, msecs, level, flags;
 
 	if (*data == '\0') {
 		cmd_ignore_show();
@@ -156,9 +156,13 @@ static void cmd_ignore(const char *data)
 	channels = (chanarg == NULL || *chanarg == '\0') ? NULL :
 		g_strsplit(chanarg, ",", -1);
 
-	rec = ignore_find_full(servertag, mask, patternarg, channels,
-			  IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0) |
-			  ((level & MSGLEVEL_HIDDEN) ? IGNORE_FIND_HIDDEN : 0));
+	flags = IGNORE_FIND_PATTERN;
+	if (level & MSGLEVEL_NO_ACT)
+		flags |= IGNORE_FIND_NOACT;
+	if (level & MSGLEVEL_HIDDEN)
+		flags |= IGNORE_FIND_HIDDEN;
+
+	rec = ignore_find_full(servertag, mask, patternarg, channels, flags);
 	new_ignore = rec == NULL;
 
 	if (rec == NULL) {

From d2e1caf7205220c9fd73861604de8248eb07f0d6 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Thu, 7 Jun 2018 15:17:46 +0200
Subject: [PATCH 0829/1650] simplifying code

---
 src/core/ignore.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 8aece6fc..574ecb5d 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -81,10 +81,11 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
  * used as a flag to indicate it should only look at ignore items with NO_ACT.
  * However we also want to allow NO_ACT combined with levels, so mask it out and
  * match levels if set. */
+#define FLAG_MSGLEVELS ( MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN )
 #define ignore_match_level(rec, level) \
-        (((level & (MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN)) != 0) ? \
-         ((~(MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN) & level) & (rec)->level) != 0 : \
-         ((rec)->level & (MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN) ? 0 : \
+        (((level & FLAG_MSGLEVELS)!= 0) ? \
+         ((~FLAG_MSGLEVELS & level) & (rec)->level) != 0 : \
+         ((rec)->level & FLAG_MSGLEVELS ? 0 : \
          (level & (rec)->level) != 0))
 
 #define ignore_match_nickmask(rec, nick, nickmask) \

From ba2554dd1485259b95b4b37f281c989086b24739 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Sat, 9 Jun 2018 05:55:25 +0200
Subject: [PATCH 0830/1650] missing space

---
 src/core/ignore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 574ecb5d..8745c434 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -83,7 +83,7 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
  * match levels if set. */
 #define FLAG_MSGLEVELS ( MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN )
 #define ignore_match_level(rec, level) \
-        (((level & FLAG_MSGLEVELS)!= 0) ? \
+        (((level & FLAG_MSGLEVELS) != 0) ? \
          ((~FLAG_MSGLEVELS & level) & (rec)->level) != 0 : \
          ((rec)->level & FLAG_MSGLEVELS ? 0 : \
          (level & (rec)->level) != 0))

From 1ab679bf32028b175c14f977659af540550bba47 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Thu, 14 Jun 2018 20:02:30 +0200
Subject: [PATCH 0831/1650] remove = from format because people get confused by
 it

---
 src/fe-common/core/module-formats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index eb0ddb61..d3c7251b 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -282,7 +282,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "glib_error", "{error $0} $1", 2, { 0, 0 } },
 	{ "overwrite_config", "Overwrite config (y/N)?", 0 },
 	{ "set_title", "[{hilight $0}]", 1, { 0 } },
-	{ "set_item", "$0 = $1", 2, { 0, 0 } },
+	{ "set_item", "$[-!32]0 %_$1", 2, { 0, 0 } },
 	{ "set_unknown", "Unknown setting $0", 1, { 0 } },
 	{ "set_not_boolean", "Setting {hilight $0} isn't boolean, use /SET", 1, { 0 } },
 	{ "no_completions", "There are no completions", 0 },

From d84a24444fbef8af6ae72888cfc3a539e0a1f005 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Fri, 29 Jun 2018 09:00:38 -0400
Subject: [PATCH 0832/1650] core/ignore: fix ignore_match_level handling of
 flag levels

---
 src/core/ignore.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 8745c434..3f08cb10 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -82,11 +82,17 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
  * However we also want to allow NO_ACT combined with levels, so mask it out and
  * match levels if set. */
 #define FLAG_MSGLEVELS ( MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN )
-#define ignore_match_level(rec, level) \
-        (((level & FLAG_MSGLEVELS) != 0) ? \
-         ((~FLAG_MSGLEVELS & level) & (rec)->level) != 0 : \
-         ((rec)->level & FLAG_MSGLEVELS ? 0 : \
-         (level & (rec)->level) != 0))
+static int ignore_match_level(IGNORE_REC *rec, int level)
+{
+	if (level & FLAG_MSGLEVELS) {
+		int flaglevel = level & FLAG_MSGLEVELS;
+		return (level & rec->level) && (flaglevel & rec->level);
+	} else if (!(rec->level & FLAG_MSGLEVELS)) {
+		return (level & rec->level);
+	} else {
+		return FALSE;
+	}
+}
 
 #define ignore_match_nickmask(rec, nick, nickmask) \
 	((rec)->mask == NULL || \

From 4f45828ff3de2952fa2d6be8515e67986213e7a8 Mon Sep 17 00:00:00 2001
From: Janik Rabe <info@janikrabe.com>
Date: Wed, 18 Jul 2018 21:12:38 +0300
Subject: [PATCH 0833/1650] Keep errstr set to NULL if errno is not set

Don't use errno if it is not set and show the default error message
instead. This prevents messages like "SSL handshake failed: Success"
from being shown.
---
 src/core/network-openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 692c7e71..95697135 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -842,7 +842,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
 				return -1;
 			case SSL_ERROR_SYSCALL:
 				errstr = ERR_reason_error_string(ERR_get_error());
-				if (errstr == NULL && ret == -1)
+				if (errstr == NULL && ret == -1 && errno)
 					errstr = strerror(errno);
 				g_warning("SSL handshake failed: %s", errstr != NULL ? errstr : "server closed connection unexpectedly");
 				return -1;

From 0e187cf9cfb99c19f3dc9cf532fb5bac92dd1145 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Tue, 24 Jul 2018 18:29:31 -0700
Subject: [PATCH 0834/1650] Fix typo in comment

---
 src/irc/core/channel-events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 46bbd5fa..6cdfe147 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -126,7 +126,7 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 
 	chanrec = channel_find(SERVER(server), channel);
 	if (chanrec == NULL) return;
-	/* the topic may be send out encoded, so we need to
+	/* the topic may be sent out encoded, so we need to
 	   recode it back or /topic <tab> will not work properly */
 	recoded = recode_in(SERVER(server), topic, channel);
 	if (topic != NULL) {

From b9e301362db545a4108b5d08c7eda45441a475f5 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Tue, 24 Jul 2018 18:30:51 -0700
Subject: [PATCH 0835/1650] Ignore vim editor files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 916457f8..1ab7df5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ tests/irc/core/test-irc.trs
 *.la
 *.lo
 *.o
+*.swp
 *~
 
 *.tar.bz2

From 15840ac27bd05e710ae13afe1a3c29853d2d6a0b Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Tue, 24 Jul 2018 18:31:57 -0700
Subject: [PATCH 0836/1650] If we receive a 0 length topic, record it as unset

Fixes #888.

Previously we showed that there was a topic set when using /topic, just
an empty one. This was different than how we show such topics when
initially joining a channel. Now we say that the topic is unset in both
cases.
---
 src/irc/core/channel-events.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 6cdfe147..38cc0bdd 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -126,23 +126,25 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 
 	chanrec = channel_find(SERVER(server), channel);
 	if (chanrec == NULL) return;
+
+	g_free_and_null(chanrec->topic);
+	g_free_and_null(chanrec->topic_by);
+	chanrec->topic_time = 0;
+
 	/* the topic may be sent out encoded, so we need to
 	   recode it back or /topic <tab> will not work properly */
 	recoded = recode_in(SERVER(server), topic, channel);
-	if (topic != NULL) {
-		g_free_not_null(chanrec->topic);
-		chanrec->topic = recoded == NULL ? NULL : g_strdup(recoded);
+	if (recoded == NULL || strlen(recoded) == 0) {
+		signal_emit("channel topic changed", 1, chanrec);
+		g_free(recoded);
+		return;
 	}
-	g_free(recoded);
 
-	g_free_not_null(chanrec->topic_by);
+	chanrec->topic = recoded;
 	chanrec->topic_by = g_strdup(setby);
-
-	if (chanrec->topic_by == NULL) {
+	if (chanrec->topic_by != NULL) {
 		/* ensure invariant topic_time > 0 <=> topic_by != NULL.
 		   this could be triggered by a topic command without sender */
-		chanrec->topic_time = 0;
-	} else {
 		chanrec->topic_time = settime;
 	}
 

From b114b11e36598157b7b014cc8d4325fbf04c9b1e Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 30 Jul 2018 23:45:56 -0300
Subject: [PATCH 0837/1650] channel_change_topic: change one strlen == 0 to
 *str == '\0'

---
 src/irc/core/channel-events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 38cc0bdd..4b74b322 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -134,7 +134,7 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 	/* the topic may be sent out encoded, so we need to
 	   recode it back or /topic <tab> will not work properly */
 	recoded = recode_in(SERVER(server), topic, channel);
-	if (recoded == NULL || strlen(recoded) == 0) {
+	if (recoded == NULL || *recoded == '\0') {
 		signal_emit("channel topic changed", 1, chanrec);
 		g_free(recoded);
 		return;

From f3909b8bcb509bbb57d685ec5a2b9f93097b5755 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Fri, 3 Aug 2018 17:07:06 -0400
Subject: [PATCH 0838/1650] core/ignore: fix #900

---
 src/core/ignore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 3f08cb10..57c84623 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -86,7 +86,8 @@ static int ignore_match_level(IGNORE_REC *rec, int level)
 {
 	if (level & FLAG_MSGLEVELS) {
 		int flaglevel = level & FLAG_MSGLEVELS;
-		return (level & rec->level) && (flaglevel & rec->level);
+		int msglevel = level & ~FLAG_MSGLEVELS;
+		return (msglevel & rec->level) && (flaglevel & rec->level);
 	} else if (!(rec->level & FLAG_MSGLEVELS)) {
 		return (level & rec->level);
 	} else {

From 10f632664989117afe6d4496a419f712fbb4c3b6 Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Tue, 24 Jul 2018 19:31:45 +1200
Subject: [PATCH 0839/1650] Redraw on SIGWINCH when screen size hasn't changed

Some programs and users send SIGWINCH as a request for the client to redraw
in the event of session detachment/reattachment (e.g. abduco). A well-formed
terminal will only send SIGWINCH when the window size has changed, so there
is no need to optimise this case out.
---
 src/fe-text/term.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/fe-text/term.c b/src/fe-text/term.c
index 4600f02e..408dc7ef 100644
--- a/src/fe-text/term.c
+++ b/src/fe-text/term.c
@@ -81,11 +81,9 @@ void term_resize_dirty(void)
 	if (!term_get_size(&width, &height))
 		width = height = -1;
 
-	if (height != term_height || width != term_width) {
-		term_resize(width, height);
-		mainwindows_resize(term_width, term_height);
-		term_resize_final(width, height);
-	}
+	term_resize(width, height);
+	mainwindows_resize(term_width, term_height);
+	term_resize_final(width, height);
 }
 
 #ifdef SIGWINCH

From 764f8215a9dad09b93832fdbb0c87eb1b0e6e773 Mon Sep 17 00:00:00 2001
From: Lukas Waymann <meribold@gmail.com>
Date: Sun, 12 Aug 2018 07:22:14 +0000
Subject: [PATCH 0840/1650] Fix `/save` replacing symlinks with regular files

A side-effect of 8deb618 is that `/save` may replace configuration files
that are symlinks with regular files.  Fix this by resolving all
symlinks before renaming the temporary file.
---
 src/lib-config/write.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index ab2c6975..d325fc52 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -304,6 +304,7 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	int save_errno;
 	char *tmp_name;
 	const char *dest_name;
+	char *real_dest = NULL;
 
 	g_return_val_if_fail(rec != NULL, -1);
         g_return_val_if_fail(fname != NULL || rec->fname != NULL, -1);
@@ -349,7 +350,15 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	g_io_channel_unref(rec->handle);
 	rec->handle = NULL;
 
-	if (rename(tmp_name, dest_name) == -1) {
+	/* expand all symlinks; else we may replace a symlink with a regular file */
+	real_dest = realpath(dest_name, NULL);
+	if (real_dest == NULL) {
+		unlink(tmp_name);
+		config_error(rec, g_strerror(errno));
+		goto out;
+	}
+
+	if (rename(tmp_name, real_dest) == -1) {
 		unlink(tmp_name);
 		config_error(rec, g_strerror(errno));
 		goto out;
@@ -362,6 +371,7 @@ out:
 	}
 
 	g_free(tmp_name);
+	g_free(real_dest);
 
 	return ret;
 }

From 7d3eb47ab51a93defb267912704e84b3241b4db6 Mon Sep 17 00:00:00 2001
From: Lukas Waymann <meribold@gmail.com>
Date: Sun, 12 Aug 2018 10:55:47 +0000
Subject: [PATCH 0841/1650] Fix potential `rename(3)` across file systems

Make sure the temporary file in the `config_write` function is created
on the same file system as the file we `rename` it to later.
---
 src/lib-config/write.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index d325fc52..255d79c0 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -302,15 +302,21 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	int ret;
 	int fd;
 	int save_errno;
-	char *tmp_name;
-	const char *dest_name;
-	char *real_dest = NULL;
+	char *tmp_name = NULL;
+	char *dest_name = NULL;
 
 	g_return_val_if_fail(rec != NULL, -1);
         g_return_val_if_fail(fname != NULL || rec->fname != NULL, -1);
         g_return_val_if_fail(create_mode != -1 || rec->create_mode != -1, -1);
 
-	dest_name = fname != NULL ? fname : rec->fname;
+	/* expand all symlinks; else we may replace a symlink with a regular file */
+	dest_name = realpath(fname != NULL ? fname : rec->fname, NULL);
+	if (dest_name == NULL) {
+		config_error(rec, g_strerror(errno));
+		ret = -1;
+		goto out;
+	}
+
 	tmp_name = g_strdup_printf("%s.XXXXXX", dest_name);
 
 	fd = g_mkstemp_full(tmp_name,
@@ -350,15 +356,7 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	g_io_channel_unref(rec->handle);
 	rec->handle = NULL;
 
-	/* expand all symlinks; else we may replace a symlink with a regular file */
-	real_dest = realpath(dest_name, NULL);
-	if (real_dest == NULL) {
-		unlink(tmp_name);
-		config_error(rec, g_strerror(errno));
-		goto out;
-	}
-
-	if (rename(tmp_name, real_dest) == -1) {
+	if (rename(tmp_name, dest_name) == -1) {
 		unlink(tmp_name);
 		config_error(rec, g_strerror(errno));
 		goto out;
@@ -371,7 +369,7 @@ out:
 	}
 
 	g_free(tmp_name);
-	g_free(real_dest);
+	g_free(dest_name);
 
 	return ret;
 }

From 817179a7606b616795cf67e24505526dded34381 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 13 Aug 2018 14:43:25 +0200
Subject: [PATCH 0842/1650] Revert "Flag topic as unset if it is zero length"

---
 .gitignore                    |  1 -
 src/irc/core/channel-events.c | 22 ++++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ab7df5f..916457f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,6 @@ tests/irc/core/test-irc.trs
 *.la
 *.lo
 *.o
-*.swp
 *~
 
 *.tar.bz2
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 4b74b322..46bbd5fa 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -126,25 +126,23 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 
 	chanrec = channel_find(SERVER(server), channel);
 	if (chanrec == NULL) return;
-
-	g_free_and_null(chanrec->topic);
-	g_free_and_null(chanrec->topic_by);
-	chanrec->topic_time = 0;
-
-	/* the topic may be sent out encoded, so we need to
+	/* the topic may be send out encoded, so we need to
 	   recode it back or /topic <tab> will not work properly */
 	recoded = recode_in(SERVER(server), topic, channel);
-	if (recoded == NULL || *recoded == '\0') {
-		signal_emit("channel topic changed", 1, chanrec);
-		g_free(recoded);
-		return;
+	if (topic != NULL) {
+		g_free_not_null(chanrec->topic);
+		chanrec->topic = recoded == NULL ? NULL : g_strdup(recoded);
 	}
+	g_free(recoded);
 
-	chanrec->topic = recoded;
+	g_free_not_null(chanrec->topic_by);
 	chanrec->topic_by = g_strdup(setby);
-	if (chanrec->topic_by != NULL) {
+
+	if (chanrec->topic_by == NULL) {
 		/* ensure invariant topic_time > 0 <=> topic_by != NULL.
 		   this could be triggered by a topic command without sender */
+		chanrec->topic_time = 0;
+	} else {
 		chanrec->topic_time = settime;
 	}
 

From 4f5f62ac63697d23e8a4d432f181a85c45a49d5e Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Wed, 15 Aug 2018 11:11:09 -0400
Subject: [PATCH 0843/1650] Add server-fuzz to fe-fuzz

Based on test-796.c in the tests directory.
---
 src/fe-fuzz/Makefile.am |  17 +++-
 src/fe-fuzz/server.c    | 176 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+), 3 deletions(-)
 create mode 100644 src/fe-fuzz/server.c

diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index 40abd5ba..f52d9c47 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = irc fe-common
 
-bin_PROGRAMS = irssi-fuzz
+bin_PROGRAMS = irssi-fuzz server-fuzz
 
 # Force link with CXX for libfuzzer support
 CCLD=$(CXX) $(CXXFLAGS)
@@ -21,7 +21,18 @@ irssi_fuzz_LDADD = \
 
 irssi_fuzz_SOURCES = \
         irssi.c \
-	$(top_srcdir)/src/fe-text/module-formats.c
+	../fe-text/module-formats.c
+
+server_fuzz_DEPENDENCIES = @COMMON_LIBS@
+
+server_fuzz_LDADD = \
+	@COMMON_LIBS@ \
+	@PROG_LIBS@ \
+	$(FUZZER_LIBS)
+
+server_fuzz_SOURCES = \
+	server.c \
+	../fe-text/module-formats.c
 
 noinst_HEADERS = \
-	$(top_srcdir)/src/fe-text/module-formats.h
+	../fe-text/module-formats.h
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
new file mode 100644
index 00000000..76eeb17e
--- /dev/null
+++ b/src/fe-fuzz/server.c
@@ -0,0 +1,176 @@
+/*
+ server.c : irssi
+
+    Copyright (C) 2018 Joseph Bisch
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include "modules-load.h"
+#include "module-formats.h"
+#include "levels.h"
+#include "themes.h"
+#include "core.h"
+#include "fe-common-core.h"
+#include "args.h"
+#include "printtext.h"
+#include "misc.h"
+#include "servers-setup.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "irc.h"
+#include "irc-servers.h"
+#include "irc-channels.h"
+
+/* irc.c */
+void irc_init(void);
+void irc_deinit(void);
+
+/* irc-session.c */
+void irc_session_init(void);
+void irc_session_deinit(void);
+
+/* fe-common-irc.c */
+void fe_common_irc_init(void);
+void fe_common_irc_deinit(void);
+
+SERVER_REC *server;
+
+void event_connected(IRC_SERVER_REC *server, const char *data, const char *from)
+{
+	char *params, *nick;
+
+	g_return_if_fail(server != NULL);
+
+	params = event_get_params(data, 1, &nick);
+
+	if (g_strcmp0(server->nick, nick) != 0) {
+		/* nick changed unexpectedly .. connected via proxy, etc. */
+		g_free(server->nick);
+		server->nick = g_strdup(nick);
+	}
+
+	/* set the server address */
+	g_free(server->real_address);
+	server->real_address = from == NULL ?
+		g_strdup(server->connrec->address) : /* shouldn't happen.. */
+		g_strdup(from);
+
+	/* last welcome message found - commands can be sent to server now. */
+	server->connected = 1;
+	server->real_connect_time = time(NULL);
+
+	/* let the queue send now that we are identified */
+	g_get_current_time(&server->wait_cmd);
+
+	if (server->connrec->usermode != NULL) {
+		/* Send the user mode, before the autosendcmd.
+		 * Do not pass this through cmd_mode because it
+		 * is not known whether the resulting MODE message
+		 * (if any) is the initial umode or a reply to this.
+		 */
+		irc_send_cmdv(server, "MODE %s %s", server->nick,
+				server->connrec->usermode);
+		g_free_not_null(server->wanted_usermode);
+		server->wanted_usermode = g_strdup(server->connrec->usermode);
+	}
+
+	signal_emit("event connected", 1, server);
+	g_free(params);
+}
+
+void irc_server_init_bare_minimum(IRC_SERVER_REC *server) {
+	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
+					    (GCompareFunc) g_istr_equal);
+
+	/* set the standards */
+	g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
+	g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
+}
+
+void test_server() {
+	//SERVER_REC *server; /* = g_new0(IRC_SERVER_REC, 1); */
+	CHAT_PROTOCOL_REC *proto;
+	SERVER_CONNECT_REC *conn;
+
+	proto = chat_protocol_find("IRC");
+	conn = server_create_conn(proto->id, "localhost", 0, "", "", "user");
+	server = proto->server_init_connect(conn);
+	server->session_reconnect = TRUE;
+	server->tag = g_strdup("testserver");
+
+	/* we skip some initialisations that would try to send data */
+	/* irc_servers_deinit(); */
+	irc_session_deinit();
+	irc_irc_deinit();
+
+	server_connect_finished(server);
+
+	/* make up for the skipped session init */
+	irc_server_init_bare_minimum(IRC_SERVER(server));
+
+	irc_irc_init();
+	irc_session_init();
+	/* irc_servers_init(); */
+
+	server_connect_unref(conn);
+}
+
+int LLVMFuzzerInitialize(int *argc, char ***argv) {
+	core_register_options();
+	fe_common_core_register_options();
+	/* no args */
+	args_execute(0, NULL);
+	core_preinit((*argv)[0]);
+	core_init();
+	irc_init();
+	fe_common_core_init();
+	fe_common_irc_init();
+	signal_add("event 001", (SIGNAL_FUNC) event_connected);
+	module_register("core", "fe-fuzz");
+	return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+	if (size < 1) return 0;
+
+	test_server();
+	gboolean prefixedChoice = (gboolean)*data;
+	gchar *copy = g_strndup((const gchar *)data+1, size-1);
+	gchar **lines = g_strsplit(copy, "\r\n", -1);
+	gchar **head = lines;
+
+	for (; *lines != NULL; lines++) {
+		gchar *prefixedLine;
+		if (prefixedChoice) {
+			prefixedLine = g_strdup_printf(":user %s\n", *lines);
+		} else {
+			prefixedLine = g_strdup_printf("%s\n", *lines);
+		}
+		signal_emit("server incoming", 2, server, prefixedLine);
+		g_free(prefixedLine);
+	}
+
+	g_strfreev(head);
+	g_free(copy);
+	server_unref(server);
+	return 0;
+}

From a19b503a31fa4fb31c2e6ee79ffdc18bf4a87db0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 21 Aug 2018 00:31:12 +0200
Subject: [PATCH 0844/1650] properly record line info on empty lines

---
 src/fe-common/core/formats.c |  7 +++++++
 src/fe-text/gui-printtext.c  | 12 +++++++++---
 src/fe-text/textbuffer.c     |  6 ++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 4c819c2d..f7466337 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1233,6 +1233,13 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 	dup = str = g_strdup(text);
 
 	flags = 0; fgcolor = theme->default_color; bgcolor = -1;
+
+	if (*str == '\0') {
+		/* empty line, write line info only */
+		signal_emit_id(signal_gui_print_text, 6, dest->window, GINT_TO_POINTER(fgcolor),
+		               GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, dest);
+	}
+
 	while (*str != '\0') {
 		type = '\0';
 		for (ptr = str; *ptr != '\0'; ptr++) {
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 83a36f14..f860dc1c 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -307,9 +307,15 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 	}
 	textbuffer_line_add_colors(view->buffer, &insert_after, fg, bg, flags);
 
-	insert_after = textbuffer_insert(view->buffer, insert_after,
-					 (unsigned char *) str,
-					 strlen(str), &lineinfo);
+	/* for historical reasons, the \n will set
+	   GUI_PRINT_FLAG_NEWLINE and print an empty string. in this
+	   special case, ignore the empty string which would otherwise
+	   start another new line */
+	if (~flags & GUI_PRINT_FLAG_NEWLINE || *str != '\0') {
+		insert_after = textbuffer_insert(view->buffer, insert_after, (unsigned char *) str,
+		                                 strlen(str), &lineinfo);
+	}
+
 	if (gui->use_insert_after)
                 gui->insert_after = insert_after;
 }
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 01cdd118..cf530212 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -333,8 +333,9 @@ void textbuffer_line_add_colors(TEXT_BUFFER_REC *buffer, LINE_REC **line,
 		data[pos++] = LINE_CMD_INDENT;
 	}
 
-        if (pos > 0)
+	if (pos > 0) {
 		*line = textbuffer_insert(buffer, *line, data, pos, NULL);
+	}
 
 	buffer->last_flags = flags;
 }
@@ -355,9 +356,6 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after,
 	g_return_val_if_fail(buffer != NULL, NULL);
 	g_return_val_if_fail(data != NULL, NULL);
 
-	if (len == 0)
-                return insert_after;
-
 	line = !buffer->last_eol ? insert_after :
 		textbuffer_line_insert(buffer, insert_after);
 

From af1e4d6e34317452ac32380bed795aecb00f5d88 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 21 Aug 2018 09:21:23 +0200
Subject: [PATCH 0845/1650] initialise the line to zeros

---
 src/fe-text/textbuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index cf530212..5f9e68ad 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -192,7 +192,7 @@ static LINE_REC *textbuffer_line_create(TEXT_BUFFER_REC *buffer)
 	if (buffer->cur_text == NULL)
                 text_chunk_create(buffer);
 
-	rec = g_slice_new(LINE_REC);
+	rec = g_slice_new0(LINE_REC);
 	rec->text = buffer->cur_text->buffer + buffer->cur_text->pos;
 
 	buffer->cur_text->refcount++;

From 0d8632943d8fb526fbd4d853c86294d0037c43f6 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 23 Aug 2018 02:02:33 -0300
Subject: [PATCH 0846/1650] Add a wrapper of wcwidth() that picks the best
 implementation

This adds a i_wcwidth() function that replaces mk_wcwidth(), and a
'wcwidth_implementation' setting to pick which one it wraps.

Values:

- old: uses our local mk_wcwidth() which implements unicode 5.0
- system: uses the libc-provided wcwidth(), which may be better or worse
  than ours depending on how up to date the system is.
- auto: tests the system one against two characters that became
  fullwidth in unicode 5.2 and 9.0 respectively. If either of them pass,
  pick the system implementation, otherwise pick ours.

It defaults to auto.

mk_wcwidth() is still preferable in some cases, since the way it uses
ranges for fullwidth characters means most CJK blocks are covered even
if their characters didn't exist back then.

The "system" implementation is also wrapped to never return -1, but to
assume those unknown characters use one cell. Quoting the code:

    /* Treat all unknown characters as taking one cell. This is
     * the reason mk_wcwidth and other outdated implementations
     * mostly worked with newer unicode, while glibc's wcwidth
     * needs updating to recognize new characters.
     *
     * Instead of relying on that, we keep the behavior of assuming
     * one cell even for glibc's implementation, which is still
     * highly accurate and less of a headache overall.
     */
---
 src/core/Makefile.am          |   1 +
 src/core/core.c               |   5 ++
 src/core/utf8.c               |   2 +-
 src/core/utf8.h               |   6 ++
 src/core/wcwidth-wrapper.c    | 117 ++++++++++++++++++++++++++++++++++
 src/fe-text/gui-entry.c       |  16 ++---
 src/fe-text/term-terminfo.c   |   4 +-
 src/fe-text/textbuffer-view.c |   2 +-
 8 files changed, 141 insertions(+), 12 deletions(-)
 create mode 100644 src/core/wcwidth-wrapper.c

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index f64d9e2e..4cc2226c 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -53,6 +53,7 @@ libcore_a_SOURCES = \
 	utf8.c \
 	$(regex_impl) \
 	wcwidth.c \
+	wcwidth-wrapper.c \
 	tls.c \
 	write-buffer.c
 
diff --git a/src/core/core.c b/src/core/core.c
index 506d6a13..3c335fd2 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -60,6 +60,9 @@ void chat_commands_deinit(void);
 void log_away_init(void);
 void log_away_deinit(void);
 
+void wcwidth_wrapper_init(void);
+void wcwidth_wrapper_deinit(void);
+
 int irssi_gui;
 int irssi_init_finished;
 int reload_config;
@@ -258,6 +261,7 @@ void core_init(void)
 	nicklist_init();
 
 	chat_commands_init();
+	wcwidth_wrapper_init();
 
 	settings_add_str("misc", "ignore_signals", "");
 	settings_add_bool("misc", "override_coredump_limit", FALSE);
@@ -281,6 +285,7 @@ void core_deinit(void)
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 	signal_remove("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);
 
+	wcwidth_wrapper_deinit();
 	chat_commands_deinit();
 
 	nicklist_deinit();
diff --git a/src/core/utf8.c b/src/core/utf8.c
index c53d8816..c44fdbd6 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -36,7 +36,7 @@ int string_advance(char const **str, int policy)
 		c = g_utf8_get_char(*str);
 		*str = g_utf8_next_char(*str);
 
-		return unichar_isprint(c) ? mk_wcwidth(c) : 1;
+		return unichar_isprint(c) ? i_wcwidth(c) : 1;
 	} else {
 		/* Assume TREAT_STRING_AS_BYTES: */
 		*str += 1;
diff --git a/src/core/utf8.h b/src/core/utf8.h
index 5bb53193..9f7d1aaa 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -12,8 +12,14 @@
 typedef guint32 unichar;
 
 /* Returns width for character (0-2). */
+int i_wcwidth(unichar c);
+
+/* Older variant of the above */
 int mk_wcwidth(unichar c);
 
+/* Signature for wcwidth implementations */
+typedef int (*WCWIDTH_FUNC) (unichar ucs);
+
 /* Advance the str pointer one character further; return the number of columns
  * occupied by the skipped character.
  */
diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
new file mode 100644
index 00000000..e08707e9
--- /dev/null
+++ b/src/core/wcwidth-wrapper.c
@@ -0,0 +1,117 @@
+/*
+ wcwidth-wrapper.c : irssi
+
+    Copyright (C) 2018 dequis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#define _XOPEN_SOURCE
+#include <wchar.h>
+
+#include "module.h"
+#include "signals.h"
+#include "settings.h"
+#include "utf8.h"
+
+/* wcwidth=2 since unicode 5.2.0 */
+#define UNICODE_SQUARE_HIRAGANA_HOKA 0x1F200
+
+/* wcwidth=2 since unicode 9.0.0 */
+#define UNICODE_IRSSI_LOGO 0x1F525
+
+enum {
+	WCWIDTH_IMPL_AUTO = 0,
+	WCWIDTH_IMPL_OLD,
+	WCWIDTH_IMPL_SYSTEM,
+};
+
+WCWIDTH_FUNC wcwidth_impl_func = mk_wcwidth;
+
+int i_wcwidth(unichar ucs)
+{
+	return (*wcwidth_impl_func)(ucs);
+}
+
+static int system_wcwidth(unichar ucs)
+{
+	int retval = wcwidth((wchar_t) ucs);
+
+	if (retval < 0) {
+		/* Treat all unknown characters as taking one cell. This is
+		 * the reason mk_wcwidth and other outdated implementations
+		 * mostly worked with newer unicode, while glibc's wcwidth
+		 * needs updating to recognize new characters.
+		 *
+		 * Instead of relying on that, we keep the behavior of assuming
+		 * one cell even for glibc's implementation, which is still
+		 * highly accurate and less of a headache overall.
+		 */
+		return 1;
+	}
+
+	return retval;
+}
+
+static void read_settings(void)
+{
+	static int choice = -1;
+	int newchoice;
+
+	newchoice = settings_get_choice("wcwidth_implementation");
+
+	if (choice == newchoice) {
+		return;
+	}
+
+	choice = newchoice;
+
+	switch (choice) {
+	case WCWIDTH_IMPL_AUTO:
+		/* Test against characters that have wcwidth=2
+		 * since unicode 5.2 and 9.0 respectively */
+
+		if (system_wcwidth(UNICODE_SQUARE_HIRAGANA_HOKA) == 2 ||
+		    system_wcwidth(UNICODE_IRSSI_LOGO) == 2) {
+			wcwidth_impl_func = &system_wcwidth;
+		} else {
+			/* Fall back to our own (which implements 5.0) */
+			wcwidth_impl_func = &mk_wcwidth;
+		}
+		break;
+
+	case WCWIDTH_IMPL_OLD:
+		wcwidth_impl_func = &mk_wcwidth;
+		break;
+
+	case WCWIDTH_IMPL_SYSTEM:
+		wcwidth_impl_func = &system_wcwidth;
+		break;
+	}
+
+}
+
+void wcwidth_wrapper_init(void)
+{
+	settings_add_choice("misc", "wcwidth_implementation", WCWIDTH_IMPL_AUTO, "auto;old;system");
+
+	read_settings();
+	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
+}
+
+void wcwidth_wrapper_deinit(void)
+{
+	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+}
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 52a39969..b3c73c15 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -51,7 +51,7 @@ static unichar i_tolower(unichar c)
 static int i_isalnum(unichar c)
 {
 	if (term_type == TERM_TYPE_UTF8)
-		return (g_unichar_isalnum(c) || mk_wcwidth(c) == 0);
+		return (g_unichar_isalnum(c) || i_wcwidth(c) == 0);
 	return c <= 255 ? isalnum(c) : 0;
 }
 
@@ -219,7 +219,7 @@ static int pos2scrpos(GUI_ENTRY_REC *entry, int pos, int cursor)
 		if (term_type == TERM_TYPE_BIG5)
 			xpos += big5_width(c);
 		else if (entry->utf8)
-			xpos += unichar_isprint(c) ? mk_wcwidth(c) : 1;
+			xpos += unichar_isprint(c) ? i_wcwidth(c) : 1;
 		else
 			xpos++;
 
@@ -246,7 +246,7 @@ static int scrpos2pos(GUI_ENTRY_REC *entry, int pos)
 		if (term_type == TERM_TYPE_BIG5)
 			width = big5_width(c);
 		else if (entry->utf8)
-			width = unichar_isprint(c) ? mk_wcwidth(c) : 1;
+			width = unichar_isprint(c) ? i_wcwidth(c) : 1;
 		else
 			width = 1;
 
@@ -373,7 +373,7 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 		else if (term_type == TERM_TYPE_BIG5)
 			new_xpos += big5_width(c);
 		else if (entry->utf8)
-			new_xpos += unichar_isprint(c) ? mk_wcwidth(c) : 1;
+			new_xpos += unichar_isprint(c) ? i_wcwidth(c) : 1;
 		else
 			new_xpos++;
 
@@ -647,7 +647,7 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 	if (chr == 0 || chr == 13 || chr == 10)
 		return; /* never insert NUL, CR or LF characters */
 
-	if (entry->utf8 && entry->pos == 0 && mk_wcwidth(chr) == 0)
+	if (entry->utf8 && entry->pos == 0 && i_wcwidth(chr) == 0)
 		return;
 
 	gui_entry_redraw_from(entry, entry->pos);
@@ -829,7 +829,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 
 	if (entry->utf8)
 		while (entry->pos-size-w > 0 &&
-		       mk_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
+		       i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
 
 	g_memmove(entry->text + entry->pos - size, entry->text + entry->pos,
 		  (entry->text_len-entry->pos+1) * sizeof(unichar));
@@ -867,7 +867,7 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
 
 	if (entry->utf8)
 		while (entry->pos+size < entry->text_len &&
-		       mk_wcwidth(entry->text[entry->pos+size]) == 0) size++;
+		       i_wcwidth(entry->text[entry->pos+size]) == 0) size++;
 
 	g_memmove(entry->text + entry->pos, entry->text + entry->pos + size,
 	          (entry->text_len-entry->pos-size+1) * sizeof(unichar));
@@ -1188,7 +1188,7 @@ void gui_entry_move_pos(GUI_ENTRY_REC *entry, int pos)
 
 	if (entry->utf8) {
 		int step = pos < 0 ? -1 : 1;
-		while(mk_wcwidth(entry->text[entry->pos]) == 0 &&
+		while(i_wcwidth(entry->text[entry->pos]) == 0 &&
 		      entry->pos + step >= 0 && entry->pos + step <= entry->text_len)
 			entry->pos += step;
 	}
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 68947f0c..6e031ebf 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -515,7 +515,7 @@ void term_add_unichar(TERM_WINDOW *window, unichar chr)
 
 	switch (term_type) {
 	case TERM_TYPE_UTF8:
-	  	term_printed_text(unichar_isprint(chr) ? mk_wcwidth(chr) : 1);
+		term_printed_text(unichar_isprint(chr) ? i_wcwidth(chr) : 1);
                 term_addch_utf8(window, chr);
 		break;
 	case TERM_TYPE_BIG5:
@@ -558,7 +558,7 @@ int term_addstr(TERM_WINDOW *window, const char *str)
 				len++;
 				ptr++;
 			} else {
-				len += unichar_isprint(tmp) ? mk_wcwidth(tmp) : 1;
+				len += unichar_isprint(tmp) ? i_wcwidth(tmp) : 1;
 				ptr = g_utf8_next_char(ptr);
 			}
 		}
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 3ccd95f5..dda2ed97 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -197,7 +197,7 @@ static inline unichar read_unichar(const unsigned char *data, const unsigned cha
 		*width = 1;
 	} else {
 		*next = (unsigned char *)g_utf8_next_char(data);
-		*width = unichar_isprint(chr) ? mk_wcwidth(chr) : 1;
+		*width = unichar_isprint(chr) ? i_wcwidth(chr) : 1;
 	}
 	return chr;
 }

From 24f1ed7edb7d8498fdc6ec34e7727bca93fde74d Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 23 Aug 2018 03:22:30 -0300
Subject: [PATCH 0847/1650] irc-cap: Don't show warning on CAP LIST response

---
 src/irc/core/irc-cap.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index bcaeb10d..5ab8d94f 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -276,6 +276,9 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			g_free(val);
 		}
 	}
+	else if (!g_ascii_strcasecmp(evt, "LIST")) {
+		/* do nothing, fe-cap will handle it */
+	}
 	else {
 		g_warning("Unhandled CAP subcommand %s", evt);
 	}

From b95ce3e812b1d7218b6e5cea47084160cce84da7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 23 Aug 2018 13:16:50 +0200
Subject: [PATCH 0848/1650] add julia's utf8proc wcwidth implementation

---
 configure.ac               |  7 ++++++-
 src/core/wcwidth-wrapper.c | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d29c132b..a7d3feb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,11 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], [
 	])
 ])
 
+dnl **
+dnl ** utf8proc
+dnl **
+AC_CHECK_LIB([utf8proc], [utf8proc_version])
+
 dnl **
 dnl ** curses checks
 dnl **
@@ -815,7 +820,7 @@ echo "Building with 64bit DCC support .. : $offt_64bit"
 echo "Building with true color support.. : $want_truecolor"
 echo "Building with GRegex ............. : $want_gregex"
 echo "Building with Capsicum ........... : $want_capsicum"
-
+echo "Building with utf8proc ........... : $ac_cv_lib_utf8proc_utf8proc_version"
 if test "x$want_otr" = "xstatic"; then
 	echo "Building with OTR support ........ : static (in irssi binary)"
 elif test "x$want_otr" = "xmodule"; then
diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
index e08707e9..7b0a4def 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -26,6 +26,10 @@
 #include "settings.h"
 #include "utf8.h"
 
+#ifdef HAVE_LIBUTF8PROC
+#include <utf8proc.h>
+#endif
+
 /* wcwidth=2 since unicode 5.2.0 */
 #define UNICODE_SQUARE_HIRAGANA_HOKA 0x1F200
 
@@ -35,7 +39,10 @@
 enum {
 	WCWIDTH_IMPL_AUTO = 0,
 	WCWIDTH_IMPL_OLD,
-	WCWIDTH_IMPL_SYSTEM,
+	WCWIDTH_IMPL_SYSTEM
+#ifdef HAVE_LIBUTF8PROC
+	,WCWIDTH_IMPL_JULIA
+#endif
 };
 
 WCWIDTH_FUNC wcwidth_impl_func = mk_wcwidth;
@@ -99,13 +106,23 @@ static void read_settings(void)
 	case WCWIDTH_IMPL_SYSTEM:
 		wcwidth_impl_func = &system_wcwidth;
 		break;
+
+#ifdef HAVE_LIBUTF8PROC
+	case WCWIDTH_IMPL_JULIA:
+		wcwidth_impl_func = (WCWIDTH_FUNC) &utf8proc_charwidth;
+		break;
+#endif
 	}
 
 }
 
 void wcwidth_wrapper_init(void)
 {
+#ifdef HAVE_LIBUTF8PROC
+	settings_add_choice("misc", "wcwidth_implementation", WCWIDTH_IMPL_AUTO, "auto;old;system;julia");
+#else
 	settings_add_choice("misc", "wcwidth_implementation", WCWIDTH_IMPL_AUTO, "auto;old;system");
+#endif
 
 	read_settings();
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);

From 3ef0b9b3d06ae1c004fa1e140042eefe00acb9c0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 23 Aug 2018 14:03:16 +0200
Subject: [PATCH 0849/1650] move "auto" to default instead

---
 src/core/wcwidth-wrapper.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
index 7b0a4def..b010069b 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -37,7 +37,6 @@
 #define UNICODE_IRSSI_LOGO 0x1F525
 
 enum {
-	WCWIDTH_IMPL_AUTO = 0,
 	WCWIDTH_IMPL_OLD,
 	WCWIDTH_IMPL_SYSTEM
 #ifdef HAVE_LIBUTF8PROC
@@ -86,19 +85,6 @@ static void read_settings(void)
 	choice = newchoice;
 
 	switch (choice) {
-	case WCWIDTH_IMPL_AUTO:
-		/* Test against characters that have wcwidth=2
-		 * since unicode 5.2 and 9.0 respectively */
-
-		if (system_wcwidth(UNICODE_SQUARE_HIRAGANA_HOKA) == 2 ||
-		    system_wcwidth(UNICODE_IRSSI_LOGO) == 2) {
-			wcwidth_impl_func = &system_wcwidth;
-		} else {
-			/* Fall back to our own (which implements 5.0) */
-			wcwidth_impl_func = &mk_wcwidth;
-		}
-		break;
-
 	case WCWIDTH_IMPL_OLD:
 		wcwidth_impl_func = &mk_wcwidth;
 		break;
@@ -118,10 +104,22 @@ static void read_settings(void)
 
 void wcwidth_wrapper_init(void)
 {
+	int wcwidth_impl_default = 0;
+	/* Test against characters that have wcwidth=2
+	 * since unicode 5.2 and 9.0 respectively */
+
+	if (system_wcwidth(UNICODE_SQUARE_HIRAGANA_HOKA) == 2 ||
+	    system_wcwidth(UNICODE_IRSSI_LOGO) == 2) {
+		wcwidth_impl_default = WCWIDTH_IMPL_SYSTEM;
+	} else {
+		/* Fall back to our own (which implements 5.0) */
+		wcwidth_impl_default = WCWIDTH_IMPL_OLD;
+	}
+
 #ifdef HAVE_LIBUTF8PROC
-	settings_add_choice("misc", "wcwidth_implementation", WCWIDTH_IMPL_AUTO, "auto;old;system;julia");
+	settings_add_choice("misc", "wcwidth_implementation", wcwidth_impl_default, "old;system;julia");
 #else
-	settings_add_choice("misc", "wcwidth_implementation", WCWIDTH_IMPL_AUTO, "auto;old;system");
+	settings_add_choice("misc", "wcwidth_implementation", wcwidth_impl_default, "old;system");
 #endif
 
 	read_settings();

From b2a429bfb45c63d6518ff8af5d8861618434bdae Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 23 Aug 2018 14:03:53 +0200
Subject: [PATCH 0850/1650] update line cache on switching wcwidth
 implementation

---
 src/core/wcwidth-wrapper.c    |  2 +-
 src/fe-text/gui-windows.c     | 12 ++++++++++++
 src/fe-text/textbuffer-view.c |  8 ++++----
 src/fe-text/textbuffer-view.h |  2 ++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
index b010069b..b670396d 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -123,7 +123,7 @@ void wcwidth_wrapper_init(void)
 #endif
 
 	read_settings();
-	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_add_first("setup changed", (SIGNAL_FUNC) read_settings);
 }
 
 void wcwidth_wrapper_deinit(void)
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index f761e390..0ad4c921 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -31,6 +31,7 @@
 #include "gui-printtext.h"
 
 static int window_create_override;
+int wcwidth_impl;
 
 static GUI_WINDOW_REC *gui_window_init(WINDOW_REC *window,
 				       MAIN_WINDOW_REC *parent)
@@ -51,6 +52,7 @@ static GUI_WINDOW_REC *gui_window_init(WINDOW_REC *window,
 					   !settings_get_bool("indent_always"),
 					   get_default_indent_func());
 	textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
+	wcwidth_impl = settings_get_choice("wcwidth_implementation");
 	textbuffer_view_set_hidden_level(gui->view, MSGLEVEL_HIDDEN);
 	if (parent->active == window)
 		textbuffer_view_set_window(gui->view, parent->screen_win);
@@ -202,11 +204,17 @@ void gui_window_reparent(WINDOW_REC *window, MAIN_WINDOW_REC *parent)
 void gui_windows_reset_settings(void)
 {
 	GSList *tmp;
+	int old_wcwidth_impl = wcwidth_impl;
+	wcwidth_impl  = settings_get_choice("wcwidth_implementation");
 
 	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
 		WINDOW_REC *rec = tmp->data;
 		GUI_WINDOW_REC *gui = WINDOW_GUI(rec);
 
+		if (old_wcwidth_impl != wcwidth_impl) {
+			textbuffer_view_reset_cache(gui->view);
+		}
+
 		textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
 
 		textbuffer_view_set_default_indent(gui->view,
@@ -217,6 +225,10 @@ void gui_windows_reset_settings(void)
 		textbuffer_view_set_scroll(gui->view,
 					   gui->use_scroll ? gui->scroll :
 					   settings_get_bool("scroll"));
+
+		if (old_wcwidth_impl != wcwidth_impl) {
+			textbuffer_view_redraw(gui->view);
+		}
 	}
 }
 
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index dda2ed97..e85381e0 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -374,7 +374,7 @@ static void view_update_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 		view->cache->last_linecount = view_get_linecount(view, line);
 }
 
-static void view_reset_cache(TEXT_BUFFER_VIEW_REC *view)
+void textbuffer_view_reset_cache(TEXT_BUFFER_VIEW_REC *view)
 {
 	GSList *tmp;
 
@@ -691,7 +691,7 @@ void textbuffer_view_set_break_wide(TEXT_BUFFER_VIEW_REC *view,
 {
 	if (view->break_wide != break_wide) {
 		view->break_wide = break_wide;
-		view_reset_cache(view);
+		textbuffer_view_reset_cache(view);
 	}
 }
 
@@ -703,7 +703,7 @@ static void view_unregister_indent_func(TEXT_BUFFER_VIEW_REC *view,
 
 	/* recreate cache so it won't contain references
 	   to the indent function */
-	view_reset_cache(view);
+	textbuffer_view_reset_cache(view);
 	view->cache = textbuffer_cache_get(view->siblings, view->width);
 }
 
@@ -1314,7 +1314,7 @@ void textbuffer_view_remove_all_lines(TEXT_BUFFER_VIEW_REC *view)
 	g_hash_table_foreach_remove(view->bookmarks,
 				    (GHRFunc) g_free_true, NULL);
 
-	view_reset_cache(view);
+	textbuffer_view_reset_cache(view);
 	textbuffer_view_clear(view);
 	g_slist_foreach(view->siblings, (GFunc) textbuffer_view_clear, NULL);
 }
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index a670df2b..1ae7c163 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -129,6 +129,8 @@ void textbuffer_view_scroll_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line);
 /* Return line cache */
 LINE_CACHE_REC *textbuffer_view_get_line_cache(TEXT_BUFFER_VIEW_REC *view,
 					       LINE_REC *line);
+/* Reset the whole line cache */
+void textbuffer_view_reset_cache(TEXT_BUFFER_VIEW_REC *view);
 
 /*
    Functions for manipulating the text buffer, using these commands update

From 610ab2dafac4668732733009b079ebcf585dee9f Mon Sep 17 00:00:00 2001
From: "coypu@sdf.org" <coypu@sdf.org>
Date: Sat, 11 Aug 2018 22:28:14 +0000
Subject: [PATCH 0851/1650] Use-after-frees

Hi folks!

I tried clang-static-analyzer on irssi 1.1.1, it seems like it
finds some things. Here's a diff, but there might be more that you would
want to check, or choose to work differently.

(in special-vars.c, ret is commands->data sometime)

I hope it's not too much trouble if reported as a confidential bug.
Thanks.
---
 src/core/modules.c          | 3 ++-
 src/core/rawlog.c           | 3 ++-
 src/core/special-vars.c     | 2 +-
 src/fe-common/core/themes.c | 3 ++-
 src/irc/dcc/dcc.c           | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/core/modules.c b/src/core/modules.c
index a2542c84..4b7a91ca 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -289,8 +289,9 @@ void modules_deinit(void)
 
 	while (list != NULL) {
 		module_uniq_destroy(list->data);
-		g_free(list->data);
+		gconstpointer tmp = list->data;
 		list = g_slist_remove(list, list->data);
+		g_free(tmp);
 	}
 
 	g_hash_table_destroy(idlookup);
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index fdd51241..da63fa50 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -64,9 +64,10 @@ static void rawlog_add(RAWLOG_REC *rawlog, char *str)
 	if (rawlog->nlines < rawlog_lines || rawlog_lines <= 2)
 		rawlog->nlines++;
 	else {
-		g_free(rawlog->lines->data);
+		gconstpointer tmp = rawlog->lines->data;
 		rawlog->lines = g_slist_remove(rawlog->lines,
 					       rawlog->lines->data);
+		g_free(tmp);
 	}
 
 	if (rawlog->logging) {
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index 33d9cd55..7081b602 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -620,8 +620,8 @@ void eval_special_string(const char *cmd, const char *data,
 		/* FIXME: window item would need reference counting as well,
 		   eg. "/EVAL win close;say hello" wouldn't work now.. */
 
-		g_free(ret);
 		commands = g_slist_remove(commands, commands->data);
+		g_free(ret);
 	}
 	g_free(orig);
 }
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index e9818be9..cb3a7717 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -1424,8 +1424,9 @@ void themes_reload(void)
 	change_theme(settings_get_str("theme"), FALSE);
 
 	while (refs != NULL) {
-		theme_unref(refs->data);
+		gconstpointer tmp = refs->data;
 		refs = g_slist_remove(refs, refs->data);
+		theme_unref(tmp);
 	}
 }
 
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index c51f7c7a..eca4fe64 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -57,8 +57,8 @@ void dcc_unregister_type(const char *type)
 
 	pos = gslist_find_string(dcc_types, type);
 	if (pos != NULL) {
-		g_free(pos->data);
                 dcc_types = g_slist_remove(dcc_types, pos->data);
+		g_free(pos->data);
 	}
 }
 

From 071ada830bd77055107220a420c96b41702f8cc2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 23 Aug 2018 14:21:37 +0200
Subject: [PATCH 0852/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index de29abd5..8d4da02f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 16
+#define IRSSI_ABI_VERSION 17
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 9dd836b87663929ae540b6b3c724c53b24e512ba Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 24 Aug 2018 02:11:22 -0300
Subject: [PATCH 0853/1650] =?UTF-8?q?Fix=20"discards=20=E2=80=98const?=
 =?UTF-8?q?=E2=80=99=20qualifier"=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/modules.c          | 2 +-
 src/core/rawlog.c           | 2 +-
 src/fe-common/core/themes.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/modules.c b/src/core/modules.c
index 4b7a91ca..8439b73d 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -289,7 +289,7 @@ void modules_deinit(void)
 
 	while (list != NULL) {
 		module_uniq_destroy(list->data);
-		gconstpointer tmp = list->data;
+		void *tmp = list->data;
 		list = g_slist_remove(list, list->data);
 		g_free(tmp);
 	}
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index da63fa50..e6bb7017 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -64,7 +64,7 @@ static void rawlog_add(RAWLOG_REC *rawlog, char *str)
 	if (rawlog->nlines < rawlog_lines || rawlog_lines <= 2)
 		rawlog->nlines++;
 	else {
-		gconstpointer tmp = rawlog->lines->data;
+		void *tmp = rawlog->lines->data;
 		rawlog->lines = g_slist_remove(rawlog->lines,
 					       rawlog->lines->data);
 		g_free(tmp);
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index cb3a7717..a95f6180 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -1424,7 +1424,7 @@ void themes_reload(void)
 	change_theme(settings_get_str("theme"), FALSE);
 
 	while (refs != NULL) {
-		gconstpointer tmp = refs->data;
+		void *tmp = refs->data;
 		refs = g_slist_remove(refs, refs->data);
 		theme_unref(tmp);
 	}

From ade2f87fe599773886a044b7c29a482622dfaea4 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 24 Aug 2018 02:19:42 -0300
Subject: [PATCH 0854/1650] Fix use after free introduced by the use after free
 patch

---
 src/irc/dcc/dcc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index eca4fe64..01ab0e59 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -57,8 +57,9 @@ void dcc_unregister_type(const char *type)
 
 	pos = gslist_find_string(dcc_types, type);
 	if (pos != NULL) {
-                dcc_types = g_slist_remove(dcc_types, pos->data);
-		g_free(pos->data);
+		void *tmp = pos->data;
+		dcc_types = g_slist_remove(dcc_types, pos->data);
+		g_free(tmp);
 	}
 }
 

From e450a7f8c1c74132625d0a884f0ca851abd69197 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Fri, 24 Aug 2018 02:27:45 -0300
Subject: [PATCH 0855/1650] modules_deinit: Fix
 -Werror=declaration-after-statement

---
 src/core/modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/modules.c b/src/core/modules.c
index 8439b73d..9b531899 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -288,8 +288,8 @@ void modules_deinit(void)
 	g_hash_table_foreach(stridlookup, (GHFunc) uniq_get_modules, &list);
 
 	while (list != NULL) {
-		module_uniq_destroy(list->data);
 		void *tmp = list->data;
+		module_uniq_destroy(list->data);
 		list = g_slist_remove(list, list->data);
 		g_free(tmp);
 	}

From 92804cb1aa753fa1f5e9b588a4bd7125bc98ce49 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 27 Aug 2018 00:01:47 -0300
Subject: [PATCH 0856/1650] gui-windows: make the wcwidth_impl global var into
 static

---
 src/fe-text/gui-windows.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 0ad4c921..e7f799c8 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -31,7 +31,7 @@
 #include "gui-printtext.h"
 
 static int window_create_override;
-int wcwidth_impl;
+static int wcwidth_impl;
 
 static GUI_WINDOW_REC *gui_window_init(WINDOW_REC *window,
 				       MAIN_WINDOW_REC *parent)
@@ -205,7 +205,8 @@ void gui_windows_reset_settings(void)
 {
 	GSList *tmp;
 	int old_wcwidth_impl = wcwidth_impl;
-	wcwidth_impl  = settings_get_choice("wcwidth_implementation");
+
+	wcwidth_impl = settings_get_choice("wcwidth_implementation");
 
 	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
 		WINDOW_REC *rec = tmp->data;

From 7b70d051da10e6ea54cc118e8f7f254ddd07f6c1 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 27 Aug 2018 00:14:01 -0300
Subject: [PATCH 0857/1650] wcwidth-wrapper: avoid cast with a tiny wrapper,
 julia_wcwidth()

---
 src/core/wcwidth-wrapper.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
index b670396d..8dd9dac7 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -71,6 +71,15 @@ static int system_wcwidth(unichar ucs)
 	return retval;
 }
 
+#ifdef HAVE_LIBUTF8PROC
+/* wrapper because the function signatures are different
+ * (the parameter is unsigned for us, signed for them) */
+static int julia_wcwidth(unichar ucs)
+{
+	return utf8proc_charwidth(ucs);
+}
+#endif
+
 static void read_settings(void)
 {
 	static int choice = -1;
@@ -95,7 +104,7 @@ static void read_settings(void)
 
 #ifdef HAVE_LIBUTF8PROC
 	case WCWIDTH_IMPL_JULIA:
-		wcwidth_impl_func = (WCWIDTH_FUNC) &utf8proc_charwidth;
+		wcwidth_impl_func = &julia_wcwidth;
 		break;
 #endif
 	}

From bbca1a5a0fa59567fc3082263dc5e9b087e02da6 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 27 Aug 2018 20:50:17 -0700
Subject: [PATCH 0858/1650] Revert "Revert "Flag topic as unset if it is zero
 length""

This reverts commit 817179a7606b616795cf67e24505526dded34381.
---
 .gitignore                    |  1 +
 src/irc/core/channel-events.c | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 916457f8..1ab7df5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ tests/irc/core/test-irc.trs
 *.la
 *.lo
 *.o
+*.swp
 *~
 
 *.tar.bz2
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 46bbd5fa..4b74b322 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -126,23 +126,25 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 
 	chanrec = channel_find(SERVER(server), channel);
 	if (chanrec == NULL) return;
-	/* the topic may be send out encoded, so we need to
+
+	g_free_and_null(chanrec->topic);
+	g_free_and_null(chanrec->topic_by);
+	chanrec->topic_time = 0;
+
+	/* the topic may be sent out encoded, so we need to
 	   recode it back or /topic <tab> will not work properly */
 	recoded = recode_in(SERVER(server), topic, channel);
-	if (topic != NULL) {
-		g_free_not_null(chanrec->topic);
-		chanrec->topic = recoded == NULL ? NULL : g_strdup(recoded);
+	if (recoded == NULL || *recoded == '\0') {
+		signal_emit("channel topic changed", 1, chanrec);
+		g_free(recoded);
+		return;
 	}
-	g_free(recoded);
 
-	g_free_not_null(chanrec->topic_by);
+	chanrec->topic = recoded;
 	chanrec->topic_by = g_strdup(setby);
-
-	if (chanrec->topic_by == NULL) {
+	if (chanrec->topic_by != NULL) {
 		/* ensure invariant topic_time > 0 <=> topic_by != NULL.
 		   this could be triggered by a topic command without sender */
-		chanrec->topic_time = 0;
-	} else {
 		chanrec->topic_time = settime;
 	}
 

From 04db359a6d0f6d8630c2439fb26b7420ecc48582 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Thu, 9 Aug 2018 13:49:46 -0700
Subject: [PATCH 0859/1650] Handle topic info numeric separately from topic &
 topic numeric

As we called the same function for the topic info numeric, we ended up
losing the topic as that numeric does not include it. We now call a
different function to handle this case more carefully. Fixes #903.
---
 src/irc/core/channel-events.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 4b74b322..e533a6f0 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -28,6 +28,9 @@
 #include "irc-servers.h"
 #include "irc-channels.h"
 
+static void set_topic_info(CHANNEL_REC *const, char const *const,
+		time_t const);
+
 static void check_join_failure(IRC_SERVER_REC *server, const char *channel)
 {
 	CHANNEL_REC *chanrec;
@@ -141,14 +144,36 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 	}
 
 	chanrec->topic = recoded;
+	set_topic_info(chanrec, setby, settime);
+
+	signal_emit("channel topic changed", 1, chanrec);
+}
+
+static void channel_change_topic_info(IRC_SERVER_REC *server,
+				 const char *channel, const char *setby, time_t settime)
+{
+	CHANNEL_REC *chanrec;
+
+	chanrec = channel_find(SERVER(server), channel);
+	if (chanrec == NULL) return;
+
+	g_free_and_null(chanrec->topic_by);
+	chanrec->topic_time = 0;
+
+	set_topic_info(chanrec, setby, settime);
+
+	signal_emit("channel topic changed", 1, chanrec);
+}
+
+static void set_topic_info(CHANNEL_REC *const chanrec, char const *const setby,
+		time_t const settime)
+{
 	chanrec->topic_by = g_strdup(setby);
 	if (chanrec->topic_by != NULL) {
 		/* ensure invariant topic_time > 0 <=> topic_by != NULL.
 		   this could be triggered by a topic command without sender */
 		chanrec->topic_time = settime;
 	}
-
-	signal_emit("channel topic changed", 1, chanrec);
 }
 
 static void event_topic_get(IRC_SERVER_REC *server, const char *data)
@@ -188,7 +213,7 @@ static void event_topic_info(IRC_SERVER_REC *server, const char *data)
 				  &topicby, &topictime);
 
 	t = (time_t) atol(topictime);
-	channel_change_topic(server, channel, NULL, topicby, t);
+	channel_change_topic_info(server, channel, topicby, t);
 	g_free(params);
 }
 

From 2d6033542e0e47072d61ef442430c3014e3b430f Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 11 Aug 2018 10:48:00 -0700
Subject: [PATCH 0860/1650] Add functions to override irssi dir and config

Setting up to test is easier this way.
---
 src/core/core.c | 10 ++++++++++
 src/core/core.h |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/src/core/core.c b/src/core/core.c
index 506d6a13..d87e86e2 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -73,12 +73,22 @@ const char *get_irssi_dir(void)
         return irssi_dir;
 }
 
+void set_irssi_dir(char *const s)
+{
+	irssi_dir = s;
+}
+
 /* return full path for ~/.irssi/config */
 const char *get_irssi_config(void)
 {
         return irssi_config_file;
 }
 
+void set_irssi_config(char *const s)
+{
+	irssi_config_file = s;
+}
+
 static void sig_reload_config(int signo)
 {
         reload_config = TRUE;
diff --git a/src/core/core.h b/src/core/core.h
index 982dbaad..395e5c83 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -16,6 +16,9 @@ extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is se
 extern int reload_config; /* TRUE after received SIGHUP. */
 extern time_t client_start_time;
 
+void set_irssi_dir(char *const);
+void set_irssi_config(char *const);
+
 void core_preinit(const char *path);
 
 void core_register_options(void);

From 2ccb312b8b56db9585a4801184c064bfd3e3ff90 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 11 Aug 2018 10:49:26 -0700
Subject: [PATCH 0861/1650] Expose functions for testing

---
 src/irc/core/Makefile.am      |  1 +
 src/irc/core/channel-events.c |  7 ++++---
 src/irc/core/channel-events.h | 12 ++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 src/irc/core/channel-events.h

diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index 20caaeb1..c668faea 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -40,6 +40,7 @@ pkginc_irc_coredir=$(pkgincludedir)/src/irc/core
 pkginc_irc_core_HEADERS = \
 	bans.h \
         ctcp.h \
+	channel-events.h \
         channel-rejoin.h \
         irc.h \
         irc-channels.h \
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index e533a6f0..0cdb47fd 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -21,6 +21,7 @@
 #include "module.h"
 #include "signals.h"
 #include "misc.h"
+#include "channel-events.h"
 #include "channels-setup.h"
 #include "settings.h"
 #include "recode.h"
@@ -176,7 +177,7 @@ static void set_topic_info(CHANNEL_REC *const chanrec, char const *const setby,
 	}
 }
 
-static void event_topic_get(IRC_SERVER_REC *server, const char *data)
+void event_topic_get(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *channel, *topic;
 
@@ -187,7 +188,7 @@ static void event_topic_get(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-static void event_topic(IRC_SERVER_REC *server, const char *data,
+void event_topic(IRC_SERVER_REC *server, const char *data,
 			const char *nick, const char *addr)
 {
 	char *params, *channel, *topic, *mask;
@@ -202,7 +203,7 @@ static void event_topic(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
-static void event_topic_info(IRC_SERVER_REC *server, const char *data)
+void event_topic_info(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *channel, *topicby, *topictime;
 	time_t t;
diff --git a/src/irc/core/channel-events.h b/src/irc/core/channel-events.h
new file mode 100644
index 00000000..f0dea8b4
--- /dev/null
+++ b/src/irc/core/channel-events.h
@@ -0,0 +1,12 @@
+#ifndef __CHANNEL_EVENTS_H
+#define __CHANNEL_EVENTS_H
+
+#include "irc.h"
+
+/* Not private for tests. */
+void event_topic_get(IRC_SERVER_REC *, const char *);
+void event_topic(IRC_SERVER_REC *, const char *,
+			const char *, const char *);
+void event_topic_info(IRC_SERVER_REC *, const char *);
+
+#endif

From 6f38d67d87f2ef443172cca4d9ee82300d9f5ca4 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 11 Aug 2018 10:49:47 -0700
Subject: [PATCH 0862/1650] Add tests for channel change events

---
 tests/irc/core/Makefile.am           |  11 +-
 tests/irc/core/test-channel-events.c | 202 +++++++++++++++++++++++++++
 2 files changed, 209 insertions(+), 4 deletions(-)
 create mode 100644 tests/irc/core/test-channel-events.c

diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index 86f1d547..f60da03f 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -8,21 +8,24 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
-test_programs = test-irc
+test_programs = test-channel-events test-irc
 
-test_irc_CPPFLAGS = \
+CPPFLAGS = \
 	-I$(top_srcdir)/src/irc/core \
 	$(AM_CPPFLAGS)
 
-test_irc_DEPENDENCIES = \
+DEPENDENCIES = \
 	../../../src/core/libcore.a \
 	../../../src/lib-config/libirssi_config.a
 
-test_irc_LDADD = \
+LDADD = \
 	../../../src/irc/core/libirc_core.a \
 	../../../src/core/libcore.a \
 	../../../src/lib-config/libirssi_config.a \
 	@PROG_LIBS@
 
+test_channel_events_SOURCES = \
+	test-channel-events.c
+
 test_irc_SOURCES = \
 	test-irc.c
diff --git a/tests/irc/core/test-channel-events.c b/tests/irc/core/test-channel-events.c
new file mode 100644
index 00000000..477e235c
--- /dev/null
+++ b/tests/irc/core/test-channel-events.c
@@ -0,0 +1,202 @@
+/*
+ test-irc.c : irssi
+
+    Copyright (C) 2018 Will Storey
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <glib.h>
+
+#include <channel-events.h>
+#include <common.h>
+#include <core.h>
+#include <irc.h>
+#include <irc-channels.h>
+#include <irc-servers.h>
+#include <modules.h>
+#include <recode.h>
+#include <settings.h>
+#include <signals.h>
+#include <time.h>
+
+#define MODULE_NAME "test-channel-events"
+
+typedef struct {
+	char const *const description;
+	char const *const input;
+	char const *const topic;
+	char const *const topic_by;
+	time_t const topic_time;
+} topic_test_case;
+
+static void test_event_topic_get(topic_test_case const *const);
+static void test_event_topic(topic_test_case const *const);
+static void test_event_topic_info(topic_test_case const *const);
+static void setup(void);
+static void teardown(void);
+
+static IRC_SERVER_REC *server;
+static CHANNEL_REC *channel;
+
+topic_test_case const event_topic_get_test_cases[] = {
+	{
+		.description = "Normal 332 message with a topic with multiple words",
+		.input       = "testnick #test :new topic",
+		.topic       = "new topic",
+		.topic_by    = NULL,
+		.topic_time  = 0,
+	},
+};
+
+topic_test_case const event_topic_info_test_cases[] = {
+	{
+		.description = "Normal 333 message",
+		.input       = "testnick #test newnick!user@example.com 1533866229",
+		.topic       = "initial topic",
+		.topic_by    = "newnick!user@example.com",
+		.topic_time  = 1533866229,
+	},
+};
+
+topic_test_case const event_topic_test_cases[] = {
+	{
+		.description = "Normal TOPIC message",
+		.input       = "#test :new topic",
+		.topic       = "new topic",
+		.topic_by    = "newnick!user@example.com",
+		.topic_time  = 0, /* Dynamic */
+	},
+};
+
+int main(int argc, char **argv)
+{
+	int i, res;
+
+	g_test_init(&argc, &argv, NULL);
+
+	modules_init();
+	signals_init();
+	set_irssi_dir("/tmp/irssi");
+	set_irssi_config("/tmp/irssi/config");
+	settings_init();
+	recode_init();
+
+	settings_add_str("lookandfeel", "term_charset", "UTF-8");
+	recode_update_charset();
+
+	for (i = 0; i < G_N_ELEMENTS(event_topic_get_test_cases); i++) {
+		char *const name = g_strdup_printf("/test/event_topic_get/%d", i);
+		g_test_add_data_func(name, &event_topic_get_test_cases[i],
+				(GTestDataFunc)test_event_topic_get);
+		g_free(name);
+	}
+
+	for (i = 0; i < G_N_ELEMENTS(event_topic_test_cases); i++) {
+		char *const name = g_strdup_printf("/test/event_topic/%d", i);
+		g_test_add_data_func(name, &event_topic_test_cases[i],
+				(GTestDataFunc)test_event_topic);
+		g_free(name);
+	}
+
+	for (i = 0; i < G_N_ELEMENTS(event_topic_info_test_cases); i++) {
+		char *const name = g_strdup_printf("/test/event_topic_info/%d", i);
+		g_test_add_data_func(name, &event_topic_info_test_cases[i],
+				(GTestDataFunc)test_event_topic_info);
+		g_free(name);
+	}
+
+#if GLIB_CHECK_VERSION(2,38,0)
+	g_test_set_nonfatal_assertions();
+#endif
+	res = g_test_run();
+
+	recode_deinit();
+	settings_deinit();
+	signals_deinit();
+	modules_deinit();
+
+	return res;
+}
+
+static void test_event_topic_get(topic_test_case const *const test)
+{
+	setup();
+
+	event_topic_get(server, test->input);
+
+	g_assert_cmpstr(channel->topic,      ==, test->topic);
+	g_assert_cmpstr(channel->topic_by,   ==, test->topic_by);
+	g_assert_cmpint(channel->topic_time, ==, test->topic_time);
+
+	teardown();
+}
+
+static void test_event_topic(topic_test_case const *const test)
+{
+	time_t now;
+
+	setup();
+
+	now = time(NULL);
+	event_topic(server, test->input, "newnick", "user@example.com");
+
+	g_assert_cmpstr(channel->topic,      ==, test->topic);
+	g_assert_cmpstr(channel->topic_by,   ==, test->topic_by);
+	g_assert_cmpint(channel->topic_time, >=, now);
+
+	teardown();
+}
+
+static void test_event_topic_info(topic_test_case const *const test)
+{
+	setup();
+
+	event_topic_info(server, test->input);
+
+	g_assert_cmpstr(channel->topic,      ==, test->topic);
+	g_assert_cmpstr(channel->topic_by,   ==, test->topic_by);
+	g_assert_cmpint(channel->topic_time, ==, test->topic_time);
+
+	teardown();
+}
+
+static void setup(void)
+{
+	server = g_new0(IRC_SERVER_REC, 1);
+	MODULE_DATA_INIT(server);
+	server->type = module_get_uniq_id("SERVER", 0);
+
+	channel = g_new0(CHANNEL_REC, 1);
+	channel->name = "#test";
+	server->channels = g_slist_append(server->channels, channel);
+
+	g_assert_nonnull(channel_find(SERVER(server), "#test"));
+
+	channel->topic = g_strdup("initial topic");
+	channel->topic_by = g_strdup("initialnick!user@example.com");
+	channel->topic_time = 123;
+}
+
+static void teardown(void)
+{
+	g_slist_free(server->channels);
+	MODULE_DATA_DEINIT(server);
+	g_free(server);
+
+	g_free(channel->topic);
+	g_free(channel->topic_by);
+	g_free(channel);
+}

From 0edb64c4dc731065705f3303307f20b3ccb5674a Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 11 Aug 2018 10:52:39 -0700
Subject: [PATCH 0863/1650] Add test files to .gitignore

---
 .gitignore | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ab7df5f..ee1480cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,8 +51,23 @@ src/perl/*/Makefile.old
 src/fe-fuzz/crash-*
 src/fe-fuzz/oom-*
 
-tests/irc/core/test-irc
-tests/irc/core/test-irc.trs
+/core
+/tests/fe-common/core/test-formats
+/tests/fe-common/core/test-formats.log
+/tests/fe-common/core/test-formats.trs
+/tests/fe-common/core/test-suite.log
+/tests/irc/core/core
+/tests/irc/core/test-channel-events
+/tests/irc/core/test-channel-events.log
+/tests/irc/core/test-channel-events.trs
+/tests/irc/core/test-irc
+/tests/irc/core/test-irc.log
+/tests/irc/core/test-irc.trs
+/tests/irc/core/test-suite.log
+/tests/irc/flood/test-796
+/tests/irc/flood/test-796.log
+/tests/irc/flood/test-796.trs
+/tests/irc/flood/test-suite.log
 
 *.a
 *.bs

From b11932d24f01703d07eb0f7a0de6c226ebcde195 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 27 Aug 2018 21:04:23 -0700
Subject: [PATCH 0864/1650] Make channel event functions static again

---
 src/irc/core/channel-events.c | 6 +++---
 src/irc/core/channel-events.h | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 0cdb47fd..85d985ea 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -177,7 +177,7 @@ static void set_topic_info(CHANNEL_REC *const chanrec, char const *const setby,
 	}
 }
 
-void event_topic_get(IRC_SERVER_REC *server, const char *data)
+static void event_topic_get(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *channel, *topic;
 
@@ -188,7 +188,7 @@ void event_topic_get(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-void event_topic(IRC_SERVER_REC *server, const char *data,
+static void event_topic(IRC_SERVER_REC *server, const char *data,
 			const char *nick, const char *addr)
 {
 	char *params, *channel, *topic, *mask;
@@ -203,7 +203,7 @@ void event_topic(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
-void event_topic_info(IRC_SERVER_REC *server, const char *data)
+static void event_topic_info(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *channel, *topicby, *topictime;
 	time_t t;
diff --git a/src/irc/core/channel-events.h b/src/irc/core/channel-events.h
index f0dea8b4..6d01c48e 100644
--- a/src/irc/core/channel-events.h
+++ b/src/irc/core/channel-events.h
@@ -3,10 +3,7 @@
 
 #include "irc.h"
 
-/* Not private for tests. */
-void event_topic_get(IRC_SERVER_REC *, const char *);
-void event_topic(IRC_SERVER_REC *, const char *,
-			const char *, const char *);
-void event_topic_info(IRC_SERVER_REC *, const char *);
+void channel_events_init(void);
+void channel_events_deinit(void);
 
 #endif

From 7b09cac9ec0ce7e549ae8fecf4db8b8d811c18b1 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 27 Aug 2018 21:04:54 -0700
Subject: [PATCH 0865/1650] Call functions via signals rather than directly

This allows us to leave functions static.
---
 tests/irc/core/test-channel-events.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/irc/core/test-channel-events.c b/tests/irc/core/test-channel-events.c
index 477e235c..98c70ce8 100644
--- a/tests/irc/core/test-channel-events.c
+++ b/tests/irc/core/test-channel-events.c
@@ -93,6 +93,7 @@ int main(int argc, char **argv)
 	set_irssi_config("/tmp/irssi/config");
 	settings_init();
 	recode_init();
+	channel_events_init();
 
 	settings_add_str("lookandfeel", "term_charset", "UTF-8");
 	recode_update_charset();
@@ -123,6 +124,7 @@ int main(int argc, char **argv)
 #endif
 	res = g_test_run();
 
+	channel_events_deinit();
 	recode_deinit();
 	settings_deinit();
 	signals_deinit();
@@ -135,7 +137,7 @@ static void test_event_topic_get(topic_test_case const *const test)
 {
 	setup();
 
-	event_topic_get(server, test->input);
+	signal_emit("event 332", 2, server, test->input);
 
 	g_assert_cmpstr(channel->topic,      ==, test->topic);
 	g_assert_cmpstr(channel->topic_by,   ==, test->topic_by);
@@ -151,7 +153,8 @@ static void test_event_topic(topic_test_case const *const test)
 	setup();
 
 	now = time(NULL);
-	event_topic(server, test->input, "newnick", "user@example.com");
+	signal_emit("event topic", 4, server, test->input, "newnick",
+			"user@example.com");
 
 	g_assert_cmpstr(channel->topic,      ==, test->topic);
 	g_assert_cmpstr(channel->topic_by,   ==, test->topic_by);
@@ -164,7 +167,7 @@ static void test_event_topic_info(topic_test_case const *const test)
 {
 	setup();
 
-	event_topic_info(server, test->input);
+	signal_emit("event 333", 2, server, test->input);
 
 	g_assert_cmpstr(channel->topic,      ==, test->topic);
 	g_assert_cmpstr(channel->topic_by,   ==, test->topic_by);

From 82702de047237550d1299cb9b7461a952e6cc74d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 29 Aug 2018 09:09:58 +0200
Subject: [PATCH 0866/1650] Add information about crash on unload to perl.txt

reported by urchlay: http://urchlay.naptime.net/repos/misc-scripts/tree/selfunload.pl
---
 docs/perl.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/perl.txt b/docs/perl.txt
index 59f65462..4f875c97 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -1192,6 +1192,7 @@ Client->{}
  Bugs and Limitations
  --------------------
 * Calling die in 'script error' handler causes segfault (#101)
+* Calling "script unload" from your own script causes segfault
 * Storing and later using any Irssi object may result in use-after-free related crash
   - Workaround: always acquire fresh objects
 * Calling $dcc->close from the "dcc created" signal will cause unstable behaviour and crashes (#386)

From 3351c54a2f8ac2add41ba7ce829c215a65d3c923 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sat, 1 Sep 2018 19:12:17 -0300
Subject: [PATCH 0867/1650] Fix /save not working if the config didn't
 previously exist

realpath() was supposed to resolve symlinks but it also fails with
ENOENT (no such file or directory) if the file just isn't there.
---
 src/lib-config/write.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index 255d79c0..b8ef6156 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -302,6 +302,7 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	int ret;
 	int fd;
 	int save_errno;
+	const char *base_name;
 	char *tmp_name = NULL;
 	char *dest_name = NULL;
 
@@ -309,12 +310,20 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
         g_return_val_if_fail(fname != NULL || rec->fname != NULL, -1);
         g_return_val_if_fail(create_mode != -1 || rec->create_mode != -1, -1);
 
+	base_name = fname != NULL ? fname : rec->fname;
+
 	/* expand all symlinks; else we may replace a symlink with a regular file */
-	dest_name = realpath(fname != NULL ? fname : rec->fname, NULL);
+	dest_name = realpath(base_name, NULL);
+
 	if (dest_name == NULL) {
-		config_error(rec, g_strerror(errno));
-		ret = -1;
-		goto out;
+		if (errno == ENOENT) {
+			dest_name = g_strdup(base_name);
+			errno = 0;
+		} else {
+			config_error(rec, g_strerror(errno));
+			ret = -1;
+			goto out;
+		}
 	}
 
 	tmp_name = g_strdup_printf("%s.XXXXXX", dest_name);

From e2e27d1809684a6745d7b449561aeb5f30a42a74 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 2 Sep 2018 01:20:09 -0300
Subject: [PATCH 0868/1650] Improve error message when failing to create the
 config dir

---
 src/core/settings.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 3ebb9e4a..5fc37ded 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -762,7 +762,8 @@ static void init_configfile(void)
 	if (stat(get_irssi_dir(), &statbuf) != 0) {
 		/* ~/.irssi not found, create it. */
 		if (g_mkdir_with_parents(get_irssi_dir(), 0700) != 0) {
-			g_error("Couldn't create %s directory", get_irssi_dir());
+			g_error("Couldn't create %s directory: %s",
+			        get_irssi_dir(), g_strerror(errno));
 		}
 	} else if (!S_ISDIR(statbuf.st_mode)) {
 		g_error("%s is not a directory.\n"

From 04497ed69d35cf44b0700437bf427f48dbc42871 Mon Sep 17 00:00:00 2001
From: Dominyk Tiller <dominyktiller@gmail.com>
Date: Mon, 3 Sep 2018 00:30:48 +0100
Subject: [PATCH 0869/1650] configure: fix Perl detection on macOS Mojave

Apple has significantly changed the way `perl` is structured in macOS
Mojave/10.14, which is due to ship stable this month. The `perl`
restructuring has been an issue for a while but I recently obtained
confirmation from Apple the changes were intentional & consequently not
something that was going to be walked back before Mojave reaches its
stable release.

As of 10.14 the Perl headers are moving inside the SDK, instead of
residing in `/System` directly. There's a flag to tell Clang to look
inside the SDK without projects having to explicitly locate the SDK &
fiddle with the location themselves, which is `-iwithsysroot`, and
that's what `perl` outputs now when `configure` checks
`perl -MExtUtils::Embed -e ccopts`:

```
  -g -pipe -fno-common -DPERL_DARWIN -fno-strict-aliasing -fstack-protector  -iwithsysroot /System/Library/Perl/5.18/darwin-thread-multi-2level/CORE
```

The latter bit of that was previously
`-I/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE`. The
problem here is that `configure` filters out flags that start with a
lowercase `i` and consequently the Perl elements fail to build. This
tiny patch fixes that issue, restoring Perl support to `irssi` when
built on macOS 10.14.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d29c132b..9b2c54d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -388,8 +388,8 @@ if test "$want_perl" != "no"; then
 		dnl * fix those command line options a bit so GCC won't
 		dnl * complain about them. Normally there's only few options
 		dnl * that we want to keep:
-		dnl * -Ddefine -Uundef -I/path -fopt -mopt
-		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIfm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
+		dnl * -Ddefine -Uundef -I/path -fopt -mopt -iwithsysroot
+		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIifm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
 
 		PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
 		AC_SUBST(PERL_EXTRA_OPTS)

From 329448939ba8f9cc9803d4b3045d517b0ab0f9aa Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Sep 2018 09:36:45 +0200
Subject: [PATCH 0870/1650] Fix gnu wcwidth

---
 src/core/wcwidth-wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
index 8dd9dac7..03d0dc0c 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -18,7 +18,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#define _XOPEN_SOURCE
+#define _GNU_SOURCE
 #include <wchar.h>
 
 #include "module.h"

From 3f0a4ef1970a164d7bce64e2fa887036fd162236 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Sep 2018 10:17:20 +0200
Subject: [PATCH 0871/1650] Remove incorrectly copied automake commands from
 fuzzer

---
 src/fe-fuzz/fe-common/core/Makefile.am | 13 -------------
 src/fe-fuzz/irc/core/Makefile.am       | 13 -------------
 2 files changed, 26 deletions(-)

diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
index 4fe5937c..9aa39a84 100644
--- a/src/fe-fuzz/fe-common/core/Makefile.am
+++ b/src/fe-fuzz/fe-common/core/Makefile.am
@@ -10,19 +10,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS)
 
-AM_DEPENDENCIES = \
-	../../../core/libcore.a \
-	../../../lib-config/libirssi_config.a \
-	../../../irc/libirc.a \
-	../../../irc/core/libirc_core.a \
-	../../../irc/dcc/libirc_dcc.a \
-	../../../irc/flood/libirc_flood.a \
-	../../../irc/notifylist/libirc_notifylist.a \
-	../../../fe-common/core/libfe_common_core.a \
-	../../../fe-common/irc/libfe_common_irc.a \
-	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
-	../../../fe-common/irc/notifylist/libfe_irc_notifylist.a
-
 LDADD = \
 	../../../irc/libirc.a \
 	../../../irc/core/libirc_core.a \
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
index fa614abb..cb8b7e31 100644
--- a/src/fe-fuzz/irc/core/Makefile.am
+++ b/src/fe-fuzz/irc/core/Makefile.am
@@ -10,19 +10,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS)
 
-AM_DEPENDENCIES = \
-	../../../core/libcore.a \
-	../../../lib-config/libirssi_config.a \
-	../../../irc/libirc.a \
-	../../../irc/core/libirc_core.a \
-	../../../irc/dcc/libirc_dcc.a \
-	../../../irc/flood/libirc_flood.a \
-	../../../irc/notifylist/libirc_notifylist.a \
-	../../../fe-common/core/libfe_common_core.a \
-	../../../fe-common/irc/libfe_common_irc.a \
-	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
-	../../../fe-common/irc/notifylist/libfe_irc_notifylist a
-
 LDADD = \
 	../../../irc/libirc.a \
 	../../../irc/core/libirc_core.a \

From 74e8371bde8143535da46a833835313d75ae8f4e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Sep 2018 14:12:03 +0200
Subject: [PATCH 0872/1650] fix accessing unallocated text when checking entry
 position

fixes #928
---
 src/fe-text/gui-entry.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index b3c73c15..ee3de77d 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -212,7 +212,7 @@ static int pos2scrpos(GUI_ENTRY_REC *entry, int pos, int cursor)
 		xpos += scrlen_str(entry->extents[0], entry->utf8);
 	}
 
-	for (i = 0; i < pos; i++) {
+	for (i = 0; i < entry->text_len && i < pos; i++) {
 		unichar c = entry->text[i];
 		const char *extent = entry->uses_extents ? entry->extents[i+1] : NULL;
 
@@ -226,9 +226,8 @@ static int pos2scrpos(GUI_ENTRY_REC *entry, int pos, int cursor)
 		if (extent != NULL) {
 			xpos += scrlen_str(extent, entry->utf8);
 		}
-
 	}
-	return xpos;
+	return xpos + pos - i;
 }
 
 static int scrpos2pos(GUI_ENTRY_REC *entry, int pos)

From c80946bcf5f1a9c48213fd718a8c8bffc6dd1307 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Sep 2018 15:50:58 +0200
Subject: [PATCH 0873/1650] Disconnect SASL properly in case the sasl module
 got unloaded from server

stops from getting on the network when sasl is unavailable

fixes #629
---
 src/fe-common/irc/fe-sasl.c      | 22 -------------------
 src/irc/core/irc-servers-setup.c |  2 +-
 src/irc/core/sasl.c              | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
index fc8105fc..ed11f047 100644
--- a/src/fe-common/irc/fe-sasl.c
+++ b/src/fe-common/irc/fe-sasl.c
@@ -40,36 +40,14 @@ static void sig_sasl_failure(IRC_SERVER_REC *server, const char *reason)
 	printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_ERROR, reason);
 }
 
-static void sig_cap_end(IRC_SERVER_REC *server)
-{
-	/* The negotiation has now been terminated, if we didn't manage to
-	 * authenticate successfully with the server just disconnect. */
-	if (!server->sasl_success &&
-	    server->connrec->sasl_mechanism != SASL_MECHANISM_NONE &&
-	    settings_get_bool("sasl_disconnect_on_failure")) {
-		/* We can't use server_disconnect() here because we'd end up
-		 * freeing the 'server' object and be guilty of a slew of UaF. */
-		server->connection_lost = TRUE;
-		/* By setting connection_lost we make sure the communication is
-		 * halted and when the control goes back to irc_parse_incoming
-		 * the server object is safely destroyed. */
-		signal_stop();
-	}
-
-}
-
 void fe_sasl_init(void)
 {
-	settings_add_bool("server", "sasl_disconnect_on_failure", TRUE);
-
 	signal_add("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
 	signal_add("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
-	signal_add_first("server cap end", (SIGNAL_FUNC) sig_cap_end);
 }
 
 void fe_sasl_deinit(void)
 {
 	signal_remove("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
 	signal_remove("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
-	signal_remove("server cap end", (SIGNAL_FUNC) sig_cap_end);
 }
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index e79557ab..0af93902 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -98,9 +98,9 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 	if (ircnet->sasl_mechanism != NULL) {
 		if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "plain")) {
 			/* The PLAIN method needs both the username and the password */
+			conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
 			if (ircnet->sasl_username != NULL && *ircnet->sasl_username &&
 			    ircnet->sasl_password != NULL && *ircnet->sasl_password) {
-				conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
 				conn->sasl_username = ircnet->sasl_username;
 				conn->sasl_password = ircnet->sasl_password;
 			} else
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index c5aa2caa..b7abe748 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -301,9 +301,42 @@ static void sasl_disconnected(IRC_SERVER_REC *server)
 	sasl_timeout_stop(server);
 }
 
+static void sig_sasl_over(IRC_SERVER_REC *server)
+{
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	/* The negotiation has now been terminated, if we didn't manage to
+	 * authenticate successfully with the server just disconnect. */
+	if (!server->sasl_success &&
+	    server->connrec->sasl_mechanism != SASL_MECHANISM_NONE) {
+		if (server->cap_supported == NULL ||
+		    !g_hash_table_lookup_extended(server->cap_supported, "sasl", NULL, NULL)) {
+			signal_emit("server sasl failure", 2, server, "The server did not offer SASL");
+		}
+
+		if (settings_get_bool("sasl_disconnect_on_failure")) {
+			/* We can't use server_disconnect() here because we'd end up
+			 * freeing the 'server' object and be guilty of a slew of UaF. */
+			server->connection_lost = TRUE;
+			/* By setting connection_lost we make sure the communication is
+			 * halted and when the control goes back to irc_parse_incoming
+			 * the server object is safely destroyed. */
+			signal_stop();
+		}
+	}
+
+}
+
 void sasl_init(void)
 {
+	settings_add_bool("server", "sasl_disconnect_on_failure", TRUE);
+
+	signal_add_first("event 001", (SIGNAL_FUNC) sig_sasl_over);
+	/* this event can get us connected on broken ircds, see irc-servers.c */
+	signal_add_first("event 375", (SIGNAL_FUNC) sig_sasl_over);
 	signal_add_first("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
+	signal_add_first("server cap end", (SIGNAL_FUNC) sig_sasl_over);
 	signal_add_first("event authenticate", (SIGNAL_FUNC) sasl_step);
 	signal_add_first("event 903", (SIGNAL_FUNC) sasl_success);
 	signal_add_first("event 902", (SIGNAL_FUNC) sasl_fail);
@@ -316,7 +349,10 @@ void sasl_init(void)
 
 void sasl_deinit(void)
 {
+	signal_remove("event 001", (SIGNAL_FUNC) sig_sasl_over);
+	signal_remove("event 375", (SIGNAL_FUNC) sig_sasl_over);
 	signal_remove("server cap ack sasl", (SIGNAL_FUNC) sasl_start);
+	signal_remove("server cap end", (SIGNAL_FUNC) sig_sasl_over);
 	signal_remove("event authenticate", (SIGNAL_FUNC) sasl_step);
 	signal_remove("event 903", (SIGNAL_FUNC) sasl_success);
 	signal_remove("event 902", (SIGNAL_FUNC) sasl_fail);

From c174247502ebffe615f1e55ba7a5010856db41d3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 14 Sep 2018 11:59:05 +0200
Subject: [PATCH 0874/1650] fix compilation of theme-indent module

---
 src/fe-text/Makefile.am | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 6ce8427c..ef2e3611 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -53,20 +53,20 @@ irssi_SOURCES = \
 
 pkginc_fe_textdir=$(pkgincludedir)/src/fe-text
 pkginc_fe_text_HEADERS = \
-	statusbar-item.h
+	gui-printtext.h \
+	gui-windows.h \
+	mainwindows.h \
+	statusbar-item.h \
+	term.h \
+	textbuffer.h \
+	textbuffer-view.h
 
 noinst_HEADERS = \
-        gui-entry.h \
-        gui-printtext.h \
-        gui-readline.h \
-        gui-windows.h \
-        mainwindows.h \
-        statusbar.h \
-        statusbar-config.h \
-	term.h \
+	gui-entry.h \
+	gui-readline.h \
+	statusbar.h \
+	statusbar-config.h \
 	terminfo-core.h \
-        textbuffer.h \
-        textbuffer-view.h \
 	module.h \
 	module-formats.h
 

From 20dcf4e53e05f61ed6e901f203e6f1ab90bc2bea Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 14 Sep 2018 12:44:41 +0200
Subject: [PATCH 0875/1650] fix compilation of python module

---
 src/fe-text/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index ef2e3611..448a9389 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -56,6 +56,7 @@ pkginc_fe_text_HEADERS = \
 	gui-printtext.h \
 	gui-windows.h \
 	mainwindows.h \
+	statusbar.h \
 	statusbar-item.h \
 	term.h \
 	textbuffer.h \
@@ -64,7 +65,6 @@ pkginc_fe_text_HEADERS = \
 noinst_HEADERS = \
 	gui-entry.h \
 	gui-readline.h \
-	statusbar.h \
 	statusbar-config.h \
 	terminfo-core.h \
 	module.h \

From b9a274a81d4020b4a1c5809b150ec869c897f17b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 17 Sep 2018 12:26:13 +0200
Subject: [PATCH 0876/1650] correctly separate ignore flags (no_act, hidden)
 from level

---
 src/core/ignore.c                            | 32 ++++++++---------
 src/core/ignore.h                            |  2 ++
 src/fe-common/core/fe-messages.c             | 36 ++++++++++----------
 src/fe-common/irc/dcc/fe-dcc-chat-messages.c | 24 ++++++-------
 src/fe-common/irc/fe-irc-messages.c          | 16 ++++-----
 src/fe-common/irc/fe-modes.c                 | 16 +++++++--
 src/perl/common/Ignore.xs                    | 23 +++++++++++++
 7 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 57c84623..5b89f6f4 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -82,17 +82,12 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
  * However we also want to allow NO_ACT combined with levels, so mask it out and
  * match levels if set. */
 #define FLAG_MSGLEVELS ( MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN )
-static int ignore_match_level(IGNORE_REC *rec, int level)
+static int ignore_match_level(IGNORE_REC *rec, int level, int flags)
 {
-	if (level & FLAG_MSGLEVELS) {
-		int flaglevel = level & FLAG_MSGLEVELS;
-		int msglevel = level & ~FLAG_MSGLEVELS;
-		return (msglevel & rec->level) && (flaglevel & rec->level);
-	} else if (!(rec->level & FLAG_MSGLEVELS)) {
-		return (level & rec->level);
-	} else {
-		return FALSE;
-	}
+	level &= ~FLAG_MSGLEVELS;
+	flags &= FLAG_MSGLEVELS;
+
+	return ((flags & rec->level) == flags) && ((level & rec->level) != 0);
 }
 
 #define ignore_match_nickmask(rec, nick, nickmask) \
@@ -109,7 +104,7 @@ static int ignore_match_level(IGNORE_REC *rec, int level)
 	((rec)->channels == NULL || ((channel) != NULL && \
 		strarray_find((rec)->channels, (channel)) != -1))
 
-static int ignore_check_replies(CHANNEL_REC *chanrec, const char *text, int level)
+static int ignore_check_replies(CHANNEL_REC *chanrec, const char *text, int level, int flags)
 {
 	GSList *tmp;
 
@@ -121,7 +116,7 @@ static int ignore_check_replies(CHANNEL_REC *chanrec, const char *text, int leve
 		IGNORE_REC *rec = tmp->data;
 
 		if (rec->mask != NULL && rec->replies &&
-		    ignore_match_level(rec, level) &&
+		    ignore_match_level(rec, level, flags) &&
 		    ignore_match_channel(rec, chanrec->name) &&
 		    ignore_check_replies_rec(rec, chanrec, text))
 			return TRUE;
@@ -130,8 +125,8 @@ static int ignore_check_replies(CHANNEL_REC *chanrec, const char *text, int leve
 	return FALSE;
 }
 
-int ignore_check(SERVER_REC *server, const char *nick, const char *host,
-		 const char *channel, const char *text, int level)
+int ignore_check_flags(SERVER_REC *server, const char *nick, const char *host,
+		       const char *channel, const char *text, int level, int flags)
 {
 	CHANNEL_REC *chanrec;
 	NICK_REC *nickrec;
@@ -167,7 +162,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 				ignore_match_channel(rec, channel) &&
 				ignore_match_nickmask(rec, nick, nickmask);
 		if (match &&
-		    ignore_match_level(rec, level) &&
+		    ignore_match_level(rec, level, flags) &&
 		    ignore_match_pattern(rec, text)) {
 			len = rec->mask == NULL ? 0 : strlen(rec->mask);
 			if (len > best_mask) {
@@ -188,7 +183,12 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 	if (best_match || (level & MSGLEVEL_PUBLIC) == 0)
 		return best_match;
 
-        return ignore_check_replies(chanrec, text, level);
+        return ignore_check_replies(chanrec, text, level, flags);
+}
+
+int ignore_check(SERVER_REC *server, const char *nick, const char *host,
+		 const char *channel, const char *text, int level) {
+	return ignore_check_flags(server, nick, host, channel, text, level, 0);
 }
 
 IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char *pattern,
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 958aa801..607ee115 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -25,6 +25,8 @@ extern GSList *ignores;
 
 int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 		 const char *channel, const char *text, int level);
+int ignore_check_flags(SERVER_REC *server, const char *nick, const char *host,
+		       const char *channel, const char *text, int level, int flags);
 
 enum {
 	IGNORE_FIND_PATTERN = 0x01, /* Match the pattern */
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 05c64d70..31a2011d 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -201,10 +201,10 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	if (for_me)
 		level |= MSGLEVEL_HILIGHT;
 
-	if (ignore_check(server, nick, address, target, msg, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, nick, address, target, msg, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, nick, address, target, msg, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, nick, address, target, msg, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	if (settings_get_bool("emphasis"))
@@ -263,10 +263,10 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) query, msg);
 
-	if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, nick, address, NULL, msg, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, nick, address, NULL, msg, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	if (own) {
@@ -361,10 +361,10 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_JOINS;
 
-	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	printformat(server, channel, level,
@@ -377,10 +377,10 @@ static void sig_message_part(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_PARTS;
 
-	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, nick, address, channel, NULL, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	printformat(server, channel, level,
@@ -399,10 +399,10 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 	if (ignore_check(server, nick, address, NULL, reason, MSGLEVEL_QUITS))
 		return;
 
-	if (ignore_check(server, nick, address, NULL, reason, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, nick, address, NULL, reason, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, nick, address, NULL, reason, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, nick, address, NULL, reason, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	print_channel = NULL;
@@ -424,10 +424,10 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 			continue;
 		}
 
-		if (ignore_check(server, nick, address, rec->visible_name, reason, MSGLEVEL_NO_ACT))
+		if (ignore_check_flags(server, nick, address, rec->visible_name, reason, MSGLEVEL_QUITS, MSGLEVEL_NO_ACT))
 			level |= MSGLEVEL_NO_ACT;
 
-		if (ignore_check(server, nick, address, rec->visible_name, reason, MSGLEVEL_HIDDEN))
+		if (ignore_check_flags(server, nick, address, rec->visible_name, reason, MSGLEVEL_QUITS, MSGLEVEL_HIDDEN))
 			level |= MSGLEVEL_HIDDEN;
 
 		if (print_channel == NULL ||
@@ -476,10 +476,10 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_KICKS;
 
-	if (ignore_check(server, kicker, address, channel, reason, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, kicker, address, channel, reason, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, kicker, address, channel, reason, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, kicker, address, channel, reason, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	printformat(server, channel, level,
@@ -500,10 +500,10 @@ static void print_nick_change_channel(SERVER_REC *server, const char *channel,
 	level = MSGLEVEL_NICKS;
         if (ownnick) level |= MSGLEVEL_NO_ACT;
 
-	if (!(level & MSGLEVEL_NO_ACT) && ignore_check(server, oldnick, address, channel, newnick, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, oldnick, address, channel, newnick, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (!(level & MSGLEVEL_HIDDEN) && ignore_check(server, oldnick, address, channel, newnick, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, oldnick, address, channel, newnick, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	printformat(server, channel, level,
@@ -582,10 +582,10 @@ static void sig_message_topic(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_TOPICS;
 
-	if (ignore_check(server, nick, address, channel, topic, level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(server, nick, address, channel, topic, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, nick, address, channel, topic, level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(server, nick, address, channel, topic, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	printformat(server, channel, level,
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
index 3a45a36b..9ae88c8e 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
@@ -92,12 +92,12 @@ static void sig_message_dcc(CHAT_DCC_REC *dcc, const char *msg)
 	tag = g_strconcat("=", dcc->id, NULL);
 	query = query_find(NULL, tag);
 
-	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-				level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+			       level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-				level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+			       level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
@@ -118,12 +118,12 @@ static void sig_message_dcc_action(CHAT_DCC_REC *dcc, const char *msg)
 	tag = g_strconcat("=", dcc->id, NULL);
 	query = query_find(NULL, tag);
 
-	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-				level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+			       level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-				level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+			       level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
@@ -143,12 +143,12 @@ static void sig_message_dcc_ctcp(CHAT_DCC_REC *dcc, const char *cmd,
 
 	tag = g_strconcat("=", dcc->id, NULL);
 
-	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
-				level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
+			       level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
-				level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
+			       level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index e8558a17..86e0836c 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -158,12 +158,12 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	if (ignore_check(SERVER(server), nick, address, target, msg, level))
 		return;
 
-	if (ignore_check(SERVER(server), nick, address, target, msg,
-			 level | MSGLEVEL_NO_ACT))
+	if (ignore_check_flags(SERVER(server), nick, address, target, msg,
+			       level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(SERVER(server), nick, address, target, msg,
-			 level | MSGLEVEL_HIDDEN))
+	if (ignore_check_flags(SERVER(server), nick, address, target, msg,
+			       level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
 	if (server_ischannel(SERVER(server), target)) {
@@ -240,14 +240,14 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 			 msg, level))
 		return;
 
-	if (ignore_check(server, nick, address,
+	if (ignore_check_flags(server, nick, address,
 			 server_ischannel(SERVER(server), target) ? target : NULL,
-			 msg, level | MSGLEVEL_NO_ACT))
+			       msg, level, MSGLEVEL_NO_ACT))
 		level |= MSGLEVEL_NO_ACT;
 
-	if (ignore_check(server, nick, address,
+	if (ignore_check_flags(server, nick, address,
 			 server_ischannel(SERVER(server), target) ? target : NULL,
-			 msg, level | MSGLEVEL_HIDDEN))
+			       msg, level, MSGLEVEL_HIDDEN))
 		level |= MSGLEVEL_HIDDEN;
 
         if (server_ischannel(SERVER(server), target)) {
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index 53e56c97..ad829757 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -162,19 +162,29 @@ static void sig_message_mode(IRC_SERVER_REC *server, const char *channel,
 			     const char *nick, const char *addr,
 			     const char *mode)
 {
+	int level = MSGLEVEL_MODES;
+
 	if (nick == NULL) nick = server->real_address;
 
 	if (ignore_check(SERVER(server), nick, addr, channel,
 			 mode, MSGLEVEL_MODES))
 		return;
 
+	if (ignore_check_flags(SERVER(server), nick, addr, channel,
+			       mode, MSGLEVEL_MODES, MSGLEVEL_NO_ACT))
+		level |= MSGLEVEL_NO_ACT;
+
+	if (ignore_check_flags(SERVER(server), nick, addr, channel,
+			       mode, MSGLEVEL_MODES, MSGLEVEL_HIDDEN))
+		level |= MSGLEVEL_HIDDEN;
+
 	if (!server_ischannel(SERVER(server), channel)) {
 		/* user mode change */
-		printformat(server, NULL, MSGLEVEL_MODES,
+		printformat(server, NULL, level,
 			    IRCTXT_USERMODE_CHANGE, mode, channel);
 	} else if (addr == NULL) {
 		/* channel mode changed by server */
-		printformat(server, channel, MSGLEVEL_MODES,
+		printformat(server, channel, level,
 			    IRCTXT_SERVER_CHANMODE_CHANGE,
 			    channel, mode, nick);
 	} else {
@@ -187,7 +197,7 @@ static void sig_message_mode(IRC_SERVER_REC *server, const char *channel,
 		if (chanrec != NULL && g_ascii_strcasecmp(nick, server->nick) != 0)
 			msg_multi_mode(chanrec, nick, addr, mode);
 		else {
-			printformat(server, channel, MSGLEVEL_MODES,
+			printformat(server, channel, level,
 				    IRCTXT_CHANMODE_CHANGE,
 				    channel, mode, nick, addr);
 		}
diff --git a/src/perl/common/Ignore.xs b/src/perl/common/Ignore.xs
index 8dfd0ad3..144497de 100644
--- a/src/perl/common/Ignore.xs
+++ b/src/perl/common/Ignore.xs
@@ -25,6 +25,19 @@ CODE:
 OUTPUT:
 	RETVAL
 
+int
+ignore_check_flags(nick, host, channel, text, level, flags)
+	char *nick
+	char *host
+	char *channel
+	char *text
+	int level
+	int flags
+CODE:
+	RETVAL = ignore_check_flags(NULL, nick, host, channel, text, level, flags);
+OUTPUT:
+	RETVAL
+
 #*******************************
 MODULE = Irssi::Ignore  PACKAGE = Irssi::Server
 #*******************************
@@ -38,6 +51,16 @@ ignore_check(server, nick, host, channel, text, level)
 	char *text
 	int level
 
+int
+ignore_check_flags(server, nick, host, channel, text, level, flags)
+	Irssi::Server server
+	char *nick
+	char *host
+	char *channel
+	char *text
+	int level
+	int flags
+
 #*******************************
 MODULE = Irssi::Ignore  PACKAGE = Irssi::Ignore  PREFIX = ignore_
 #*******************************

From 7e9f8c694b38ae785771fb837fb0a4a434b614d3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 17 Sep 2018 12:48:42 +0200
Subject: [PATCH 0877/1650] simplify ignore hidden/no_act code

---
 src/core/ignore.c                            | 16 +++++
 src/core/ignore.h                            |  2 +
 src/fe-common/core/fe-messages.c             | 67 ++++----------------
 src/fe-common/irc/dcc/fe-dcc-chat-messages.c | 27 ++------
 src/fe-common/irc/fe-irc-messages.c          | 31 ++-------
 src/fe-common/irc/fe-modes.c                 | 12 +---
 6 files changed, 45 insertions(+), 110 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 5b89f6f4..58999709 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -191,6 +191,22 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 	return ignore_check_flags(server, nick, host, channel, text, level, 0);
 }
 
+int ignore_check_plus(SERVER_REC *server, const char *nick, const char *address,
+		      const char *target, const char *msg, int *level, int test_ignore) {
+	int olevel = *level;
+
+	if (test_ignore && ignore_check(server, nick, address, target, msg, olevel))
+		return TRUE;
+
+	if (ignore_check_flags(server, nick, address, target, msg, olevel, MSGLEVEL_NO_ACT))
+		*level |= MSGLEVEL_NO_ACT;
+
+	if (ignore_check_flags(server, nick, address, target, msg, olevel, MSGLEVEL_HIDDEN))
+		*level |= MSGLEVEL_HIDDEN;
+
+	return FALSE;
+}
+
 IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char *pattern,
 		char **channels, const int flags)
 {
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 607ee115..20c5475e 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -27,6 +27,8 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
 		 const char *channel, const char *text, int level);
 int ignore_check_flags(SERVER_REC *server, const char *nick, const char *host,
 		       const char *channel, const char *text, int level, int flags);
+int ignore_check_plus(SERVER_REC *server, const char *nick, const char *host,
+		      const char *channel, const char *text, int *level, int test_ignore);
 
 enum {
 	IGNORE_FIND_PATTERN = 0x01, /* Match the pattern */
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 31a2011d..12cb1055 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -201,11 +201,7 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 	if (for_me)
 		level |= MSGLEVEL_HILIGHT;
 
-	if (ignore_check_flags(server, nick, address, target, msg, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, nick, address, target, msg, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(server, nick, address, target, msg, &level, FALSE);
 
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) chanrec, msg);
@@ -263,11 +259,7 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) query, msg);
 
-	if (ignore_check_flags(server, nick, address, NULL, msg, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, nick, address, NULL, msg, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(server, nick, address, NULL, msg, &level, FALSE);
 
 	if (own) {
 		printformat(server, target, level,
@@ -361,11 +353,7 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_JOINS;
 
-	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(server, nick, address, channel, NULL, &level, FALSE);
 
 	printformat(server, channel, level,
 		    TXT_JOIN, nick, address, channel);
@@ -377,11 +365,7 @@ static void sig_message_part(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_PARTS;
 
-	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, nick, address, channel, NULL, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(server, nick, address, channel, NULL, &level, FALSE);
 
 	printformat(server, channel, level,
 		    TXT_PART, nick, address, channel, reason);
@@ -396,15 +380,9 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 	char *print_channel;
 	int once, count, level = MSGLEVEL_QUITS;
 
-	if (ignore_check(server, nick, address, NULL, reason, MSGLEVEL_QUITS))
+	if (ignore_check_plus(server, nick, address, NULL, reason, &level, TRUE))
 		return;
 
-	if (ignore_check_flags(server, nick, address, NULL, reason, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, nick, address, NULL, reason, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
-
 	print_channel = NULL;
 	once = settings_get_bool("show_quit_once");
 
@@ -418,18 +396,12 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 		if (!nicklist_find(rec, nick))
 			continue;
 
-		if (ignore_check(server, nick, address, rec->visible_name,
-				 reason, MSGLEVEL_QUITS)) {
+		if (ignore_check_plus(server, nick, address, rec->visible_name,
+				      reason, &level, TRUE)) {
 			count++;
 			continue;
 		}
 
-		if (ignore_check_flags(server, nick, address, rec->visible_name, reason, MSGLEVEL_QUITS, MSGLEVEL_NO_ACT))
-			level |= MSGLEVEL_NO_ACT;
-
-		if (ignore_check_flags(server, nick, address, rec->visible_name, reason, MSGLEVEL_QUITS, MSGLEVEL_HIDDEN))
-			level |= MSGLEVEL_HIDDEN;
-
 		if (print_channel == NULL ||
 		    active_win->active == (WI_ITEM_REC *) rec)
 			print_channel = rec->visible_name;
@@ -476,11 +448,7 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_KICKS;
 
-	if (ignore_check_flags(server, kicker, address, channel, reason, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, kicker, address, channel, reason, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(server, kicker, address, channel, reason, &level, FALSE);
 
 	printformat(server, channel, level,
 		    TXT_KICK, nick, channel, kicker, reason, address);
@@ -493,18 +461,11 @@ static void print_nick_change_channel(SERVER_REC *server, const char *channel,
 {
 	int level;
 
-	if (ignore_check(server, oldnick, address,
-			 channel, newnick, MSGLEVEL_NICKS))
-		return;
-
 	level = MSGLEVEL_NICKS;
         if (ownnick) level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, oldnick, address, channel, newnick, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, oldnick, address, channel, newnick, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	if (ignore_check_plus(server, oldnick, address,
+			      channel, newnick, &level, TRUE))
+		return;
 
 	printformat(server, channel, level,
 		    ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
@@ -582,11 +543,7 @@ static void sig_message_topic(SERVER_REC *server, const char *channel,
 {
 	int level = MSGLEVEL_TOPICS;
 
-	if (ignore_check_flags(server, nick, address, channel, topic, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, nick, address, channel, topic, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(server, nick, address, channel, topic, &level, FALSE);
 
 	printformat(server, channel, level,
 		    *topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
index 9ae88c8e..41cea64c 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
@@ -92,13 +92,8 @@ static void sig_message_dcc(CHAT_DCC_REC *dcc, const char *msg)
 	tag = g_strconcat("=", dcc->id, NULL);
 	query = query_find(NULL, tag);
 
-	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-			       level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-			       level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+			  &level, FALSE);
 
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
 			       level, NULL);
@@ -118,13 +113,8 @@ static void sig_message_dcc_action(CHAT_DCC_REC *dcc, const char *msg)
 	tag = g_strconcat("=", dcc->id, NULL);
 	query = query_find(NULL, tag);
 
-	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-			       level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
-			       level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(SERVER(dcc->server), tag, dcc->addrstr, NULL, msg,
+			  &level, FALSE);
 
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
 			       level, NULL);
@@ -143,13 +133,8 @@ static void sig_message_dcc_ctcp(CHAT_DCC_REC *dcc, const char *cmd,
 
 	tag = g_strconcat("=", dcc->id, NULL);
 
-	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
-			       level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
-			       level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
+	ignore_check_plus(SERVER(dcc->server), tag, dcc->addrstr, NULL, cmd,
+			  &level, FALSE);
 
 	format_create_dest_tag(&dest, dcc->server, dcc->servertag, tag,
 			       level, NULL);
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 86e0836c..89c501a8 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -155,17 +155,9 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	level = MSGLEVEL_ACTIONS |
 		(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
 
-	if (ignore_check(SERVER(server), nick, address, target, msg, level))
+	if (ignore_check_plus(SERVER(server), nick, address, target, msg, &level, TRUE))
 		return;
 
-	if (ignore_check_flags(SERVER(server), nick, address, target, msg,
-			       level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(SERVER(server), nick, address, target, msg,
-			       level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
-
 	if (server_ischannel(SERVER(server), target)) {
 		item = irc_channel_find(server, target);
 	} else {
@@ -226,30 +218,21 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 
 	if (address == NULL || *address == '\0') {
+		level = MSGLEVEL_SNOTES;
 		/* notice from server */
-		if (!ignore_check(server, nick, "",
-				  target, msg, MSGLEVEL_SNOTES)) {
-			printformat(server, target, MSGLEVEL_SNOTES,
+		if (!ignore_check_plus(server, nick, "",
+				       target, msg, &level, TRUE)) {
+			printformat(server, target, level,
 				    IRCTXT_NOTICE_SERVER, nick, msg);
 		}
                 return;
 	}
 
-	if (ignore_check(server, nick, address,
+	if (ignore_check_plus(server, nick, address,
 			 server_ischannel(SERVER(server), target) ? target : NULL,
-			 msg, level))
+			      msg, &level, TRUE))
 		return;
 
-	if (ignore_check_flags(server, nick, address,
-			 server_ischannel(SERVER(server), target) ? target : NULL,
-			       msg, level, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(server, nick, address,
-			 server_ischannel(SERVER(server), target) ? target : NULL,
-			       msg, level, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
-
         if (server_ischannel(SERVER(server), target)) {
 		/* notice in some channel */
 		printformat(server, target, level,
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index ad829757..dfe65c2d 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -166,18 +166,10 @@ static void sig_message_mode(IRC_SERVER_REC *server, const char *channel,
 
 	if (nick == NULL) nick = server->real_address;
 
-	if (ignore_check(SERVER(server), nick, addr, channel,
-			 mode, MSGLEVEL_MODES))
+	if (ignore_check_plus(SERVER(server), nick, addr, channel,
+			      mode, &level, TRUE))
 		return;
 
-	if (ignore_check_flags(SERVER(server), nick, addr, channel,
-			       mode, MSGLEVEL_MODES, MSGLEVEL_NO_ACT))
-		level |= MSGLEVEL_NO_ACT;
-
-	if (ignore_check_flags(SERVER(server), nick, addr, channel,
-			       mode, MSGLEVEL_MODES, MSGLEVEL_HIDDEN))
-		level |= MSGLEVEL_HIDDEN;
-
 	if (!server_ischannel(SERVER(server), channel)) {
 		/* user mode change */
 		printformat(server, NULL, level,

From 011d9437d158ae815cfab55a5e2c0b0a57430353 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 17 Sep 2018 13:08:43 +0200
Subject: [PATCH 0878/1650] oops

---
 src/core/ignore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 58999709..9bfcfaf5 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -87,7 +87,7 @@ static int ignore_match_level(IGNORE_REC *rec, int level, int flags)
 	level &= ~FLAG_MSGLEVELS;
 	flags &= FLAG_MSGLEVELS;
 
-	return ((flags & rec->level) == flags) && ((level & rec->level) != 0);
+	return ((FLAG_MSGLEVELS & rec->level) == flags) && ((level & rec->level) != 0);
 }
 
 #define ignore_match_nickmask(rec, nick, nickmask) \

From cb6279c63bbb98a419f9f72495b8a8232a3e7529 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Mon, 17 Sep 2018 13:28:46 +0000
Subject: [PATCH 0879/1650] fe-text: add window_default_hidelevel setting

Allows specifying the hidelevel that new windows get by default.
---
 src/fe-text/gui-windows.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index e7f799c8..0890fe6f 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -53,7 +53,7 @@ static GUI_WINDOW_REC *gui_window_init(WINDOW_REC *window,
 					   get_default_indent_func());
 	textbuffer_view_set_break_wide(gui->view, settings_get_bool("break_wide"));
 	wcwidth_impl = settings_get_choice("wcwidth_implementation");
-	textbuffer_view_set_hidden_level(gui->view, MSGLEVEL_HIDDEN);
+	textbuffer_view_set_hidden_level(gui->view, settings_get_level("window_default_hidelevel"));
 	if (parent->active == window)
 		textbuffer_view_set_window(gui->view, parent->screen_win);
 	return gui;
@@ -303,6 +303,7 @@ void gui_windows_init(void)
 	settings_add_bool("lookandfeel", "indent_always", FALSE);
 	settings_add_bool("lookandfeel", "break_wide", FALSE);
 	settings_add_bool("lookandfeel", "scroll", TRUE);
+	settings_add_level("lookandfeel", "window_default_hidelevel", "HIDDEN");
 
 	window_create_override = MAIN_WINDOW_TYPE_NONE;
 

From 074e6cf768b9c153b64a916b4b2d332d8ba6bef4 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Mon, 17 Sep 2018 14:26:25 +0000
Subject: [PATCH 0880/1650] fe-text: only save non-default window hidelevel

This will only save the window hidelevel in the layout if it differs
from window_default_hidelevel.
---
 src/fe-text/mainwindows-layout.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index 17c6647b..b937dffe 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -42,7 +42,7 @@ static void sig_layout_window_save(WINDOW_REC *window, CONFIG_NODE *node)
 			iconfig_node_set_int(node, "parent", active->refnum);
 	}
 
-	if (gui->view->hidden_level != MSGLEVEL_HIDDEN) {
+	if (gui->view->hidden_level != settings_get_level("window_default_hidelevel")) {
 		char *level = bits2level(gui->view->hidden_level);
 		iconfig_node_set_str(node, "hidelevel", level);
 		g_free(level);
@@ -56,6 +56,7 @@ static void sig_layout_window_restore(WINDOW_REC *window, CONFIG_NODE *node)
 {
 	WINDOW_REC *parent;
 	GUI_WINDOW_REC *gui;
+	char *default_hidelevel = settings_get_str("window_default_hidelevel");
 
 	gui = WINDOW_GUI(window);
 
@@ -66,7 +67,7 @@ static void sig_layout_window_restore(WINDOW_REC *window, CONFIG_NODE *node)
 	if (config_node_get_bool(node, "sticky", FALSE))
 		gui_window_set_sticky(window);
 
-	textbuffer_view_set_hidden_level(gui->view, level2bits(config_node_get_str(node, "hidelevel", "HIDDEN"), NULL));
+	textbuffer_view_set_hidden_level(gui->view, level2bits(config_node_get_str(node, "hidelevel", default_hidelevel), NULL));
 
 	if (config_node_get_str(node, "scroll", NULL) != NULL) {
 		gui->use_scroll = TRUE;

From cad79f1db74787c68951e166cdc68af21ec67301 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Mon, 17 Sep 2018 14:34:06 +0000
Subject: [PATCH 0881/1650] Fix compilation warning

---
 src/fe-text/mainwindows-layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index b937dffe..b3f8e741 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -56,7 +56,7 @@ static void sig_layout_window_restore(WINDOW_REC *window, CONFIG_NODE *node)
 {
 	WINDOW_REC *parent;
 	GUI_WINDOW_REC *gui;
-	char *default_hidelevel = settings_get_str("window_default_hidelevel");
+	const char *default_hidelevel = settings_get_str("window_default_hidelevel");
 
 	gui = WINDOW_GUI(window);
 

From f231a59e81a7487dc46ad58fbdbde90d3b750435 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 20 Sep 2018 17:50:35 +0200
Subject: [PATCH 0882/1650] properly document the ignore_match_level so I
 understand it next time

---
 src/core/ignore.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 9bfcfaf5..371da83b 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -87,7 +87,17 @@ static int ignore_match_level(IGNORE_REC *rec, int level, int flags)
 	level &= ~FLAG_MSGLEVELS;
 	flags &= FLAG_MSGLEVELS;
 
-	return ((FLAG_MSGLEVELS & rec->level) == flags) && ((level & rec->level) != 0);
+	if (!flags) {
+		/* case: we are not checking special flags. then, the
+		   record must not have any flags either, but it must
+		   have some of the levels */
+		return !(FLAG_MSGLEVELS & rec->level) && (level & rec->level);
+	} else {
+		 /* case: we want to test if some special flags
+		    apply. then, the record must have some of the
+		    flags and some of the levels */
+		return (flags & rec->level) && (level & rec->level);
+	}
 }
 
 #define ignore_match_nickmask(rec, nick, nickmask) \

From 01f961cdf1d009ea4a8adc55fd6688f81dbb76c6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 17 Sep 2018 12:56:06 +0200
Subject: [PATCH 0883/1650] Don't trigger activity on hidden lines by default

This is controlled by a new activity_hide_window_hidelevel setting.
---
 docs/signals.txt                     |  1 +
 src/fe-common/core/window-activity.c | 12 +++++++++--
 src/fe-text/textbuffer-commands.c    | 31 ++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 270315b8..959387b2 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -286,6 +286,7 @@ themes.c:
 
 window-activity.c:
  "window hilight", WINDOW_REC
+ "window hilight check", TEXT_DEST_REC, char *msg, int *data_level, int *should_ignore
  "window dehilight", WINDOW_REC
  "window activity", WINDOW_REC, int old_level
  "window item hilight", WI_ITEM_REC
diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 89493aea..77d6d4a0 100644
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@@ -34,7 +34,7 @@
 #include "fe-common-core.h"
 
 static char **hide_targets;
-static int hide_level, msg_level, hilight_level;
+static int hide_level, msg_level, hilight_level, signal_window_hilight_check;
 
 void window_activity(WINDOW_REC *window, int data_level,
 		     const char *hilight_color)
@@ -74,6 +74,7 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg)
 {
 	WI_ITEM_REC *item;
 	int data_level;
+	int cb_ignore = 0;
 
 	if (dest->window == active_win || (dest->level & hide_level))
 		return;
@@ -91,6 +92,12 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg)
 			return;
 	}
 
+	/* we should ask the text view if this line is hidden */
+	signal_emit_id(signal_window_hilight_check, 5, dest, msg, &data_level, &cb_ignore);
+	if (cb_ignore) {
+		return;
+	}
+
 	if (dest->target != NULL) {
 		item = window_item_find(dest->server, dest->target);
 		if (item != NULL) {
@@ -125,7 +132,7 @@ static void read_settings(void)
 	hide_targets = *targets == '\0' ? NULL :
 		g_strsplit(targets, " ", -1);
 
-	hide_level = MSGLEVEL_NEVER | MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN |
+	hide_level = MSGLEVEL_NEVER | MSGLEVEL_NO_ACT |
 		settings_get_level("activity_hide_level");
 	msg_level = settings_get_level("activity_msg_level");
 	hilight_level = MSGLEVEL_HILIGHT |
@@ -138,6 +145,7 @@ void window_activity_init(void)
 	settings_add_level("lookandfeel", "activity_hide_level", "");
 	settings_add_level("lookandfeel", "activity_msg_level", "PUBLIC");
 	settings_add_level("lookandfeel", "activity_hilight_level", "MSGS DCCMSGS");
+	signal_window_hilight_check = signal_get_uniq_id("window hilight check");
 
 	read_settings();
 	signal_add("print text", (SIGNAL_FUNC) sig_hilight_text);
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 97d897f3..7278772c 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -30,6 +30,8 @@
 #include "printtext.h"
 #include "gui-windows.h"
 
+static int activity_hide_window_hidelevel;
+
 /* SYNTAX: CLEAR [-all] [<refnum>] */
 static void cmd_clear(const char *data)
 {
@@ -373,8 +375,32 @@ static void sig_away_changed(SERVER_REC *server)
 	}
 }
 
+static void sig_window_hilight_check(TEXT_DEST_REC *dest, char *msg, int *data_level, int *ignore)
+{
+	GUI_WINDOW_REC *gui;
+
+	g_return_if_fail(dest != NULL);
+	g_return_if_fail(ignore != NULL);
+
+	if (*ignore != 0 || !activity_hide_window_hidelevel || dest->window == NULL)
+		return;
+
+	gui = WINDOW_GUI(dest->window);
+
+	if (dest->level & gui->view->hidden_level) {
+		*ignore = TRUE;
+	}
+}
+
+static void read_settings(void)
+{
+	activity_hide_window_hidelevel = settings_get_bool("activity_hide_window_hidelevel");
+}
+
 void textbuffer_commands_init(void)
 {
+	settings_add_bool("lookandfeel", "activity_hide_window_hidelevel", TRUE);
+
 	command_bind("clear", NULL, (SIGNAL_FUNC) cmd_clear);
 	command_bind("window scroll", NULL, (SIGNAL_FUNC) cmd_window_scroll);
 	command_bind("window hidelevel", NULL, (SIGNAL_FUNC) cmd_window_hidelevel);
@@ -390,7 +416,10 @@ void textbuffer_commands_init(void)
 	command_set_options("scrollback clear", "all");
 	command_set_options("scrollback levelclear", "all -level");
 
+	read_settings();
+	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 	signal_add("away mode changed", (SIGNAL_FUNC) sig_away_changed);
+	signal_add("window hilight check", (SIGNAL_FUNC) sig_window_hilight_check);
 }
 
 void textbuffer_commands_deinit(void)
@@ -406,5 +435,7 @@ void textbuffer_commands_deinit(void)
 	command_unbind("scrollback end", (SIGNAL_FUNC) cmd_scrollback_end);
 	command_unbind("scrollback status", (SIGNAL_FUNC) cmd_scrollback_status);
 
+	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 	signal_remove("away mode changed", (SIGNAL_FUNC) sig_away_changed);
+	signal_remove("window hilight check", (SIGNAL_FUNC) sig_window_hilight_check);
 }

From db005007cf3c951ace57b1810b30248fe371e4be Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 26 Sep 2018 14:16:09 +0200
Subject: [PATCH 0884/1650] fix irssi being stuck when resized very small

---
 src/fe-text/mainwindows.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 83a3e0cc..68cb9880 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -285,8 +285,13 @@ static MAIN_WINDOW_REC *mainwindows_find_lower(MAIN_WINDOW_REC *window)
 	MAIN_WINDOW_REC *best;
 	GSList *tmp;
 
+	/* unfortunate special case: if the window has been resized
+	   and there is not enough room, the last_line could become
+	   smaller than the first_line, sending us in an infinite
+	   loop */
 	if (window != NULL)
-		last_line = window->last_line;
+		last_line =
+		    window->last_line > window->first_line ? window->last_line : window->first_line;
 	else
 		last_line = -1;
 

From 76b934d18e81ffbfa1e7480396d47fcced9394e8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 26 Sep 2018 15:19:44 +0200
Subject: [PATCH 0885/1650] Fix broken display after resizing many windows very
 small

---
 src/fe-text/mainwindows.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 83a3e0cc..d9b26a97 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -520,7 +520,7 @@ static void gui_windows_remove_parent(MAIN_WINDOW_REC *window)
 	}
 }
 
-void mainwindow_destroy(MAIN_WINDOW_REC *window)
+static void mainwindow_destroy_full(MAIN_WINDOW_REC *window, int respace)
 {
 	g_return_if_fail(window != NULL);
 
@@ -531,7 +531,7 @@ void mainwindow_destroy(MAIN_WINDOW_REC *window)
 
 	if (mainwindows != NULL) {
 		gui_windows_remove_parent(window);
-		if (!quitting) {
+		if (respace) {
 			mainwindows_add_space(window);
 			mainwindows_redraw();
 		}
@@ -542,12 +542,14 @@ void mainwindow_destroy(MAIN_WINDOW_REC *window)
 	if (active_mainwin == window) active_mainwin = NULL;
 }
 
+void mainwindow_destroy(MAIN_WINDOW_REC *window)
+{
+	mainwindow_destroy_full(window, !quitting);
+}
+
 void mainwindow_destroy_half(MAIN_WINDOW_REC *window)
 {
-	int really_quitting = quitting;
-	quitting = TRUE;
-	mainwindow_destroy(window);
-	quitting = really_quitting;
+	mainwindow_destroy_full(window, FALSE);
 }
 
 void mainwindows_redraw(void)
@@ -821,6 +823,12 @@ void mainwindows_resize(int width, int height)
 		mainwindows_resize_smaller(ydiff);
 	}
 
+	/* if we lost our active mainwin, get a new one */
+	if (active_mainwin == NULL && !quitting) {
+		active_mainwin = WINDOW_MAIN(active_win);
+		window_set_active(active_mainwin->active);
+	}
+
 	signal_emit("terminal resized", 0);
 
 	irssi_redraw();

From 8684ccb45c267fdeaaa779fce9323047aa5a9e38 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 28 Sep 2018 11:40:50 +0200
Subject: [PATCH 0886/1650] invalidate startline and bottom_startline when
 hidden

this was overlooked when adding hidden line support. if the lines are
removed, Irssi has to update the startline. It does that by "scrolling"
the lines to the proper place. The scroll function was adjusted to
calculate 0 for hidden lines, thus it would miss them.
---
 src/fe-text/textbuffer-view.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index e85381e0..e5141430 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -1230,6 +1230,11 @@ static void view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 			if (is_last == 1)
 				view->startline = NULL;
 		}
+
+		if (view->startline == line) {
+			view->startline = line->next;
+			view->subline = 0;
+		}
 	} else {
 		if (textbuffer_line_exists_after(view->bottom_startline,
 						 line)) {
@@ -1239,6 +1244,11 @@ static void view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 			view->empty_linecount += linecount-realcount;
 		}
 
+		if (view->bottom_startline == line) {
+			view->bottom_startline = view->bottom_startline->next;
+			view->bottom_subline = 0;
+		}
+
 		if (textbuffer_line_exists_after(view->startline,
 						 line)) {
 			view_remove_line_update_startline(view, line,

From 04daf62dbf9a1668b5eb12b64f90701b11f374ca Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 28 Sep 2018 14:30:39 +0200
Subject: [PATCH 0887/1650] Fix insufficient size of help column when the
 window width is small

---
 src/fe-common/core/fe-help.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-help.c b/src/fe-common/core/fe-help.c
index 23a6e701..c7566113 100644
--- a/src/fe-common/core/fe-help.c
+++ b/src/fe-common/core/fe-help.c
@@ -77,7 +77,12 @@ static void help_category(GSList *cmdlist, int items)
 				    max_width, 6, 1, 3, &columns, &rows);
 	cmdlist = columns_sort_list(cmdlist, rows);
 
-        /* rows in last column */
+	/* if the screen is too narrow the window width may be not
+	   enough for even 1 column */
+	if (cols == 1 && columns[0] > max_width)
+		max_width = columns[0];
+
+	/* rows in last column */
 	last_col_rows = rows-(cols*rows-g_slist_length(cmdlist));
 	if (last_col_rows == 0)
                 last_col_rows = rows;

From b264540f4ed5e273835a2d5feb10decb18a4fed6 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sat, 29 Sep 2018 07:13:32 -0400
Subject: [PATCH 0888/1650] fe-text: clear hidelevel in layout if default

This is required, otherwise setting the hidelevel to the default will
not be written in the layout and so won't persist.
---
 src/fe-text/mainwindows-layout.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index b3f8e741..bb53fdab 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -46,6 +46,8 @@ static void sig_layout_window_save(WINDOW_REC *window, CONFIG_NODE *node)
 		char *level = bits2level(gui->view->hidden_level);
 		iconfig_node_set_str(node, "hidelevel", level);
 		g_free(level);
+	} else {
+		iconfig_node_set_str(node, "hidelevel", NULL);
 	}
 
 	if (gui->use_scroll)

From f5e587a83b0f3569a8024b54713667d55e157370 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sat, 29 Sep 2018 18:37:10 -0400
Subject: [PATCH 0889/1650] Fix 01f961c

---
 src/fe-common/core/window-activity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 77d6d4a0..48e909a4 100644
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@@ -93,7 +93,7 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg)
 	}
 
 	/* we should ask the text view if this line is hidden */
-	signal_emit_id(signal_window_hilight_check, 5, dest, msg, &data_level, &cb_ignore);
+	signal_emit_id(signal_window_hilight_check, 4, dest, msg, &data_level, &cb_ignore);
 	if (cb_ignore) {
 		return;
 	}

From c4bf228e6c2a045f4906b38e9eaf2591cc4f984e Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sun, 30 Sep 2018 05:38:13 +0000
Subject: [PATCH 0890/1650] Fix check for C99 in printtext.h

---
 src/fe-common/core/printtext.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h
index ab8dfac1..db53c611 100644
--- a/src/fe-common/core/printtext.h
+++ b/src/fe-common/core/printtext.h
@@ -46,16 +46,16 @@ void printtext_deinit(void);
 	printformat_module_dest(MODULE_NAME, dest, ##formatnum)
 #  define printformat_gui(formatnum...) \
 	printformat_module_gui(MODULE_NAME, ##formatnum)
-#elif defined (_ISOC99_SOURCE)
+#elif __STDC_VERSION__ >= 199901L
 /* C99 */
 #  define printformat(server, target, level, formatnum, ...) \
-	printformat_module(MODULE_NAME, server, target, level, formatnum, __VA_ARGS__)
+	printformat_module(MODULE_NAME, server, target, level, formatnum, ##__VA_ARGS__)
 #  define printformat_window(window, level, formatnum, ...) \
-	printformat_module_window(MODULE_NAME, window, level, formatnum, __VA_ARGS__)
+	printformat_module_window(MODULE_NAME, window, level, formatnum, ##__VA_ARGS__)
 #  define printformat_dest(dest, formatnum, ...) \
-	printformat_module_dest(MODULE_NAME, dest, formatnum, __VA_ARGS__)
+	printformat_module_dest(MODULE_NAME, dest, formatnum, ##__VA_ARGS__)
 #  define printformat_gui(formatnum, ...) \
-	printformat_module_gui(MODULE_NAME, formatnum, __VA_ARGS__)
+	printformat_module_gui(MODULE_NAME, formatnum, ##__VA_ARGS__)
 #else
 /* inline/static */
 #ifdef G_CAN_INLINE

From ca1ec21dc21563e63a91d4e307dc5ad0490e6cc4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 1 Oct 2018 09:13:15 +0200
Subject: [PATCH 0891/1650] fix and document window width on screen width
 dependency

---
 src/fe-text/mainwindows.c | 4 ++--
 src/fe-text/mainwindows.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index d1495965..b01f3d04 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -252,9 +252,9 @@ MAIN_WINDOW_REC *mainwindow_create(int right)
 			}
 			g_slist_free(line);
 		} else {
-			if (MAIN_WINDOW_TEXT_WIDTH(parent) <
-			    2* NEW_WINDOW_WIDTH)
+			if (MAIN_WINDOW_TEXT_WIDTH(parent) < 2 * NEW_WINDOW_WIDTH) {
 				parent = find_window_with_room_right();
+			}
 			if (parent == NULL)
 				return NULL; /* not enough space */
 
diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h
index 414275bf..4810c1e3 100644
--- a/src/fe-text/mainwindows.h
+++ b/src/fe-text/mainwindows.h
@@ -5,7 +5,7 @@
 #include "term.h"
 
 #define WINDOW_MIN_SIZE 2
-#define NEW_WINDOW_WIDTH 10
+#define NEW_WINDOW_WIDTH 20 /* must be >= MIN_SCREEN_WIDTH defined in term.c */
 
 #define MAIN_WINDOW_TEXT_HEIGHT(window) \
         ((window)->height-(window)->statusbar_lines)

From ff7f4a2207c19c2d5e67edc61c24b1f9781fe1c5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 2 Oct 2018 16:27:28 +0200
Subject: [PATCH 0892/1650] Remove cubes from irssi.conf

This is long and ugly and better done externally (script)
---
 irssi.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/irssi.conf b/irssi.conf
index 61d2e81f..b0ceb8ff 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -115,7 +115,6 @@ aliases = {
   C           = "CLEAR";
   CALC        = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi";
   CHAT        = "DCC CHAT";
-  CUBES       = "SCRIPT EXEC Irssi::active_win->print(\"%_bases\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x0\\${_}0\\$_\" } '0'..'9','A'..'F' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_cubes\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { my \\$y = \\$_*6 \\; join '', map { my \\$x = \\$_ \\; map { \"%x\\$x\\$_\\$x\\$_\" } @{['0'..'9','A'..'Z']}[\\$y .. \\$y+5] } 1..6 }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) for 0..5 \\; Irssi::active_win->print(\"%_grays\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x7\\${_}7\\$_\" } 'A'..'X' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_mIRC extended colours\", MSGLEVEL_CLIENTCRAP) \\; my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 0..15 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; for my \\$z (0..6) { my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 16+(\\$z*12)..16+(\\$z*12)+11 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) }";
   DATE        = "TIME";
   DEHIGHLIGHT = "DEHILIGHT";
   DESCRIBE    = "ACTION";

From 05fd64dd1611610e2efe596718c657343db839e1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Oct 2018 09:21:46 +0200
Subject: [PATCH 0893/1650] improve rawlog perf

---
 src/core/rawlog.c      | 18 +++++++-----------
 src/core/rawlog.h      |  3 +--
 src/perl/perl-common.c |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index e6bb7017..8f2d7142 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -48,8 +48,8 @@ void rawlog_destroy(RAWLOG_REC *rawlog)
 {
 	g_return_if_fail(rawlog != NULL);
 
-	g_slist_foreach(rawlog->lines, (GFunc) g_free, NULL);
-	g_slist_free(rawlog->lines);
+	g_queue_foreach(rawlog->lines, (GFunc) g_free, NULL);
+	g_queue_free(rawlog->lines);
 
 	if (rawlog->logging) {
 		write_buffer_flush();
@@ -61,12 +61,8 @@ void rawlog_destroy(RAWLOG_REC *rawlog)
 /* NOTE! str must be dynamically allocated and must not be freed after! */
 static void rawlog_add(RAWLOG_REC *rawlog, char *str)
 {
-	if (rawlog->nlines < rawlog_lines || rawlog_lines <= 2)
-		rawlog->nlines++;
-	else {
-		void *tmp = rawlog->lines->data;
-		rawlog->lines = g_slist_remove(rawlog->lines,
-					       rawlog->lines->data);
+	if (rawlog->lines->length >= rawlog_lines && rawlog_lines > 0) {
+		void *tmp = g_queue_pop_tail(rawlog->lines);
 		g_free(tmp);
 	}
 
@@ -75,7 +71,7 @@ static void rawlog_add(RAWLOG_REC *rawlog, char *str)
 		write_buffer(rawlog->handle, "\n", 1);
 	}
 
-	rawlog->lines = g_slist_append(rawlog->lines, str);
+	g_queue_push_head(rawlog->lines, str);
 	signal_emit_id(signal_rawlog, 2, rawlog, str);
 }
 
@@ -105,10 +101,10 @@ void rawlog_redirect(RAWLOG_REC *rawlog, const char *str)
 
 static void rawlog_dump(RAWLOG_REC *rawlog, int f)
 {
-	GSList *tmp;
+	GList *tmp;
 	ssize_t ret = 0;
 
-	for (tmp = rawlog->lines; ret != -1 && tmp != NULL; tmp = tmp->next) {
+	for (tmp = rawlog->lines->tail; ret != -1 && tmp != NULL; tmp = tmp->prev) {
 		ret = write(f, tmp->data, strlen((char *) tmp->data));
                 if (ret != -1)
                         ret = write(f, "\n", 1);
diff --git a/src/core/rawlog.h b/src/core/rawlog.h
index 9e460a83..01175e67 100644
--- a/src/core/rawlog.h
+++ b/src/core/rawlog.h
@@ -5,8 +5,7 @@ struct _RAWLOG_REC {
 	int logging;
 	int handle;
 
-        int nlines;
-	GSList *lines;
+	GQueue *lines;
 };
 
 RAWLOG_REC *rawlog_create(void);
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 1d08319f..802a771e 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -501,7 +501,7 @@ static void perl_log_item_fill_hash(HV *hv, LOG_ITEM_REC *item)
 static void perl_rawlog_fill_hash(HV *hv, RAWLOG_REC *rawlog)
 {
 	(void) hv_store(hv, "logging", 7, newSViv(rawlog->logging), 0);
-	(void) hv_store(hv, "nlines", 6, newSViv(rawlog->nlines), 0);
+	(void) hv_store(hv, "nlines", 6, newSViv(rawlog->lines->length), 0);
 }
 
 static void perl_reconnect_fill_hash(HV *hv, RECONNECT_REC *reconnect)

From 95692d4d86c4a39697d16e937a452a662e6ba448 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Oct 2018 09:21:54 +0200
Subject: [PATCH 0894/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 8d4da02f..c8fb54df 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 17
+#define IRSSI_ABI_VERSION 18
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From ff0daf5870909b250e377ffa438c4fe0ebc2f8ce Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Oct 2018 09:31:08 +0200
Subject: [PATCH 0895/1650] actually create the queue, too

---
 src/core/rawlog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index 8f2d7142..dafad057 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -41,7 +41,8 @@ RAWLOG_REC *rawlog_create(void)
 	RAWLOG_REC *rec;
 
 	rec = g_new0(RAWLOG_REC, 1);
-        return rec;
+	rec->lines = g_queue_new();
+	return rec;
 }
 
 void rawlog_destroy(RAWLOG_REC *rawlog)

From 1e2547eb92e8a681540925a0da3867a879afd696 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 4 Oct 2018 09:33:07 +0200
Subject: [PATCH 0896/1650] fixup perl side

---
 src/perl/common/Rawlog.xs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/perl/common/Rawlog.xs b/src/perl/common/Rawlog.xs
index c405bc37..73845287 100644
--- a/src/perl/common/Rawlog.xs
+++ b/src/perl/common/Rawlog.xs
@@ -19,9 +19,9 @@ void
 rawlog_get_lines(rawlog)
 	Irssi::Rawlog rawlog
 PREINIT:
-	GSList *tmp;
+	GList *tmp;
 PPCODE:
-	for (tmp = rawlog->lines; tmp != NULL; tmp = tmp->next) {
+	for (tmp = rawlog->lines->tail; tmp != NULL; tmp = tmp->prev) {
 		XPUSHs(sv_2mortal(new_pv(tmp->data)));
 	}
 

From 2200bd3656f0790554bf3c949cce5224ec588a44 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 Oct 2018 13:46:39 +0200
Subject: [PATCH 0897/1650] Make /1/2/3/... a setting

---
 irssi.conf                            | 99 ---------------------------
 src/fe-common/core/fe-core-commands.c |  3 +-
 src/fe-common/core/window-commands.c  | 15 ++++
 3 files changed, 17 insertions(+), 100 deletions(-)

diff --git a/irssi.conf b/irssi.conf
index 61d2e81f..eb182046 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -160,105 +160,6 @@ aliases = {
   WN          = "WINDOW NEW HIDDEN";
   WQUERY      = "QUERY -window";
   WW          = "WHOWAS";
-  1           = "WINDOW GOTO 1";
-  2           = "WINDOW GOTO 2";
-  3           = "WINDOW GOTO 3";
-  4           = "WINDOW GOTO 4";
-  5           = "WINDOW GOTO 5";
-  6           = "WINDOW GOTO 6";
-  7           = "WINDOW GOTO 7";
-  8           = "WINDOW GOTO 8";
-  9           = "WINDOW GOTO 9";
-  10          = "WINDOW GOTO 10";
-  11          = "WINDOW GOTO 11";
-  12          = "WINDOW GOTO 12";
-  13          = "WINDOW GOTO 13";
-  14          = "WINDOW GOTO 14";
-  15          = "WINDOW GOTO 15";
-  16          = "WINDOW GOTO 16";
-  17          = "WINDOW GOTO 17";
-  18          = "WINDOW GOTO 18";
-  19          = "WINDOW GOTO 19";
-  20          = "WINDOW GOTO 20";
-  21          = "WINDOW GOTO 21";
-  22          = "WINDOW GOTO 22";
-  23          = "WINDOW GOTO 23";
-  24          = "WINDOW GOTO 24";
-  25          = "WINDOW GOTO 25";
-  26          = "WINDOW GOTO 26";
-  27          = "WINDOW GOTO 27";
-  28          = "WINDOW GOTO 28";
-  29          = "WINDOW GOTO 29";
-  30          = "WINDOW GOTO 30";
-  31          = "WINDOW GOTO 31";
-  32          = "WINDOW GOTO 32";
-  33          = "WINDOW GOTO 33";
-  34          = "WINDOW GOTO 34";
-  35          = "WINDOW GOTO 35";
-  36          = "WINDOW GOTO 36";
-  37          = "WINDOW GOTO 37";
-  38          = "WINDOW GOTO 38";
-  39          = "WINDOW GOTO 39";
-  40          = "WINDOW GOTO 40";
-  41          = "WINDOW GOTO 41";
-  42          = "WINDOW GOTO 42";
-  43          = "WINDOW GOTO 43";
-  44          = "WINDOW GOTO 44";
-  45          = "WINDOW GOTO 45";
-  46          = "WINDOW GOTO 46";
-  47          = "WINDOW GOTO 47";
-  48          = "WINDOW GOTO 48";
-  49          = "WINDOW GOTO 49";
-  50          = "WINDOW GOTO 50";
-  51          = "WINDOW GOTO 51";
-  52          = "WINDOW GOTO 52";
-  53          = "WINDOW GOTO 53";
-  54          = "WINDOW GOTO 54";
-  55          = "WINDOW GOTO 55";
-  56          = "WINDOW GOTO 56";
-  57          = "WINDOW GOTO 57";
-  58          = "WINDOW GOTO 58";
-  59          = "WINDOW GOTO 59";
-  60          = "WINDOW GOTO 60";
-  61          = "WINDOW GOTO 61";
-  62          = "WINDOW GOTO 62";
-  63          = "WINDOW GOTO 63";
-  64          = "WINDOW GOTO 64";
-  65          = "WINDOW GOTO 65";
-  66          = "WINDOW GOTO 66";
-  67          = "WINDOW GOTO 67";
-  68          = "WINDOW GOTO 68";
-  69          = "WINDOW GOTO 69";
-  70          = "WINDOW GOTO 70";
-  71          = "WINDOW GOTO 71";
-  72          = "WINDOW GOTO 72";
-  73          = "WINDOW GOTO 73";
-  74          = "WINDOW GOTO 74";
-  75          = "WINDOW GOTO 75";
-  76          = "WINDOW GOTO 76";
-  77          = "WINDOW GOTO 77";
-  78          = "WINDOW GOTO 78";
-  79          = "WINDOW GOTO 79";
-  80          = "WINDOW GOTO 80";
-  81          = "WINDOW GOTO 81";
-  82          = "WINDOW GOTO 82";
-  83          = "WINDOW GOTO 83";
-  84          = "WINDOW GOTO 84";
-  85          = "WINDOW GOTO 85";
-  86          = "WINDOW GOTO 86";
-  87          = "WINDOW GOTO 87";
-  88          = "WINDOW GOTO 88";
-  89          = "WINDOW GOTO 89";
-  90          = "WINDOW GOTO 90";
-  91          = "WINDOW GOTO 91";
-  92          = "WINDOW GOTO 92";
-  93          = "WINDOW GOTO 93";
-  94          = "WINDOW GOTO 94";
-  95          = "WINDOW GOTO 95";
-  96          = "WINDOW GOTO 96";
-  97          = "WINDOW GOTO 97";
-  98          = "WINDOW GOTO 98";
-  99          = "WINDOW GOTO 99";
 };
 
 statusbar = {
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 222543d5..b223db05 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -249,6 +249,7 @@ static void event_default_command(const char *data, void *server,
 	long diff;
 
 	cmdchars = settings_get_str("cmdchars");
+	signal_stop();
 
 	ptr = data;
 	while (*ptr != '\0' && *ptr != ' ') {
@@ -338,7 +339,7 @@ void fe_core_commands_init(void)
 
 	signal_add("send command", (SIGNAL_FUNC) event_command);
 	signal_add_last("send command", (SIGNAL_FUNC) event_command_last);
-	signal_add("default command", (SIGNAL_FUNC) event_default_command);
+	signal_add_last("default command", (SIGNAL_FUNC) event_default_command);
 	signal_add("error command", (SIGNAL_FUNC) event_cmderror);
 	signal_add("list subcommands", (SIGNAL_FUNC) event_list_subcommands);
 
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index a81c0180..5e53957d 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -867,9 +867,22 @@ static void cmd_foreach_window(const char *data)
 	g_free(str);
 }
 
+static void cmd_window_default_command(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
+{
+	if (!is_numeric(data, 0) ||
+	    !settings_get_bool("window_number_commands")) {
+		return;
+	}
+	signal_emit("command window refnum", 3, data, server, item);
+	signal_stop();
+}
+
 void window_commands_init(void)
 {
 	settings_add_bool("lookandfeel", "active_window_ignore_refnum", TRUE);
+	settings_add_bool("misc", "window_number_commands", TRUE);
+
+	signal_add("default command", (SIGNAL_FUNC) cmd_window_default_command);
 
 	command_bind("window", NULL, (SIGNAL_FUNC) cmd_window);
 	command_bind("window new", NULL, (SIGNAL_FUNC) cmd_window_new);
@@ -944,4 +957,6 @@ void window_commands_deinit(void)
 	command_unbind("layout save", (SIGNAL_FUNC) windows_layout_save);
 	command_unbind("layout reset", (SIGNAL_FUNC) windows_layout_reset);
 	command_unbind("foreach window", (SIGNAL_FUNC) cmd_foreach_window);
+
+	signal_remove("default command", (SIGNAL_FUNC) cmd_window_default_command);
 }

From d2dbcc19993a8cf33258d0989b05305be34336a4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 Oct 2018 15:37:27 +0200
Subject: [PATCH 0898/1650] Route notices intended for channels into the
 channel

---
 src/fe-common/irc/fe-irc-messages.c | 36 ++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 89c501a8..56e479ab 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -202,6 +202,23 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
 				   const char *target)
 {
+	if (*msg == '[') {
+		/* check if this is a cnotice */
+		char *end, *channel;
+		end = strpbrk(msg, " ,]");
+		if (end != NULL && *end == ']') {
+			channel = g_strndup(msg + 1, end - msg - 1);
+			if (server_ischannel(SERVER(server), channel)) {
+				printformat(server, channel,
+				            MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
+				            IRCTXT_OWN_NOTICE, target, msg);
+				g_free(channel);
+				return;
+			}
+			g_free(channel);
+			/* fall through. */
+		}
+	}
 	printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_NOTICES |
 		    MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
 		    IRCTXT_OWN_NOTICE, target, msg);
@@ -233,11 +250,28 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 			      msg, &level, TRUE))
 		return;
 
-        if (server_ischannel(SERVER(server), target)) {
+	if (server_ischannel(SERVER(server), target)) {
 		/* notice in some channel */
 		printformat(server, target, level,
 			    IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
 	} else {
+		if (*msg == '[') {
+			/* check if this is a cnotice */
+			char *end, *channel;
+			end = strpbrk(msg, " ,]");
+			if (end != NULL && *end == ']') {
+				channel = g_strndup(msg + 1, end - msg - 1);
+				if (server_ischannel(SERVER(server), channel)) {
+					printformat(server, channel, level, IRCTXT_NOTICE_PRIVATE,
+					            nick, address, msg);
+					g_free(channel);
+					return;
+				}
+				g_free(channel);
+				/* fall through. */
+			}
+		}
+
 		/* private notice */
 		privmsg_get_query(SERVER(server), nick, FALSE,
 				  MSGLEVEL_NOTICES);

From 08ac2ee5beebdfd374caccf76a7e63da67b40798 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 5 Oct 2018 16:13:47 +0200
Subject: [PATCH 0899/1650] refactor cnotice test into function

---
 src/fe-common/irc/fe-irc-messages.c | 58 +++++++++++++----------------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 56e479ab..21b98e6c 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -199,29 +199,31 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 	g_free_not_null(freemsg);
 }
 
-static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
-				   const char *target)
+static char *notice_channel_context(SERVER_REC *server, const char *msg)
 {
 	if (*msg == '[') {
-		/* check if this is a cnotice */
 		char *end, *channel;
 		end = strpbrk(msg, " ,]");
 		if (end != NULL && *end == ']') {
 			channel = g_strndup(msg + 1, end - msg - 1);
 			if (server_ischannel(SERVER(server), channel)) {
-				printformat(server, channel,
-				            MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
-				            IRCTXT_OWN_NOTICE, target, msg);
-				g_free(channel);
-				return;
+				return channel;
 			}
 			g_free(channel);
-			/* fall through. */
 		}
 	}
-	printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_NOTICES |
-		    MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
-		    IRCTXT_OWN_NOTICE, target, msg);
+	return NULL;
+}
+
+static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, const char *target)
+{
+	char *channel;
+	/* check if this is a cnotice */
+	channel = notice_channel_context((SERVER_REC *) server, msg);
+	printformat(server, channel != NULL ? channel : fe_channel_skip_prefix(server, target),
+	            MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, IRCTXT_OWN_NOTICE,
+	            target, msg);
+	g_free(channel);
 }
 
 static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
@@ -255,28 +257,18 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 		printformat(server, target, level,
 			    IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
 	} else {
-		if (*msg == '[') {
-			/* check if this is a cnotice */
-			char *end, *channel;
-			end = strpbrk(msg, " ,]");
-			if (end != NULL && *end == ']') {
-				channel = g_strndup(msg + 1, end - msg - 1);
-				if (server_ischannel(SERVER(server), channel)) {
-					printformat(server, channel, level, IRCTXT_NOTICE_PRIVATE,
-					            nick, address, msg);
-					g_free(channel);
-					return;
-				}
-				g_free(channel);
-				/* fall through. */
-			}
-		}
+		char *channel;
+		/* check if this is a cnotice */
+		channel = notice_channel_context(server, msg);
 
-		/* private notice */
-		privmsg_get_query(SERVER(server), nick, FALSE,
-				  MSGLEVEL_NOTICES);
-		printformat(server, nick, level,
-			    IRCTXT_NOTICE_PRIVATE, nick, address, msg);
+		if (channel == NULL) {
+			/* private notice */
+			privmsg_get_query(SERVER(server), nick, FALSE, MSGLEVEL_NOTICES);
+		}
+		printformat(server, channel == NULL ? nick : channel, level, IRCTXT_NOTICE_PRIVATE,
+		            nick, address, msg);
+
+		g_free(channel);
 	}
 }
 

From 8b1afbd3557e605f35cf4dab16d49cb4c89ca496 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 6 Oct 2018 19:26:36 +0200
Subject: [PATCH 0900/1650] revert core changes

---
 src/core/core.c                      | 10 ------
 src/core/core.h                      |  3 --
 src/irc/core/channel-events.c        | 53 +++++++---------------------
 tests/irc/core/test-channel-events.c |  6 ++--
 4 files changed, 17 insertions(+), 55 deletions(-)

diff --git a/src/core/core.c b/src/core/core.c
index d87e86e2..506d6a13 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -73,22 +73,12 @@ const char *get_irssi_dir(void)
         return irssi_dir;
 }
 
-void set_irssi_dir(char *const s)
-{
-	irssi_dir = s;
-}
-
 /* return full path for ~/.irssi/config */
 const char *get_irssi_config(void)
 {
         return irssi_config_file;
 }
 
-void set_irssi_config(char *const s)
-{
-	irssi_config_file = s;
-}
-
 static void sig_reload_config(int signo)
 {
         reload_config = TRUE;
diff --git a/src/core/core.h b/src/core/core.h
index 395e5c83..982dbaad 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -16,9 +16,6 @@ extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is se
 extern int reload_config; /* TRUE after received SIGHUP. */
 extern time_t client_start_time;
 
-void set_irssi_dir(char *const);
-void set_irssi_config(char *const);
-
 void core_preinit(const char *path);
 
 void core_register_options(void);
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 85d985ea..6ffe7364 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -29,9 +29,6 @@
 #include "irc-servers.h"
 #include "irc-channels.h"
 
-static void set_topic_info(CHANNEL_REC *const, char const *const,
-		time_t const);
-
 static void check_join_failure(IRC_SERVER_REC *server, const char *channel)
 {
 	CHANNEL_REC *chanrec;
@@ -130,51 +127,27 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
 
 	chanrec = channel_find(SERVER(server), channel);
 	if (chanrec == NULL) return;
-
-	g_free_and_null(chanrec->topic);
-	g_free_and_null(chanrec->topic_by);
-	chanrec->topic_time = 0;
-
-	/* the topic may be sent out encoded, so we need to
+	/* the topic may be send out encoded, so we need to
 	   recode it back or /topic <tab> will not work properly */
 	recoded = recode_in(SERVER(server), topic, channel);
-	if (recoded == NULL || *recoded == '\0') {
-		signal_emit("channel topic changed", 1, chanrec);
-		g_free(recoded);
-		return;
+	if (topic != NULL) {
+		g_free_not_null(chanrec->topic);
+		chanrec->topic = recoded == NULL ? NULL : g_strdup(recoded);
 	}
+	g_free(recoded);
 
-	chanrec->topic = recoded;
-	set_topic_info(chanrec, setby, settime);
-
-	signal_emit("channel topic changed", 1, chanrec);
-}
-
-static void channel_change_topic_info(IRC_SERVER_REC *server,
-				 const char *channel, const char *setby, time_t settime)
-{
-	CHANNEL_REC *chanrec;
-
-	chanrec = channel_find(SERVER(server), channel);
-	if (chanrec == NULL) return;
-
-	g_free_and_null(chanrec->topic_by);
-	chanrec->topic_time = 0;
-
-	set_topic_info(chanrec, setby, settime);
-
-	signal_emit("channel topic changed", 1, chanrec);
-}
-
-static void set_topic_info(CHANNEL_REC *const chanrec, char const *const setby,
-		time_t const settime)
-{
+	g_free_not_null(chanrec->topic_by);
 	chanrec->topic_by = g_strdup(setby);
-	if (chanrec->topic_by != NULL) {
+
+	if (chanrec->topic_by == NULL) {
 		/* ensure invariant topic_time > 0 <=> topic_by != NULL.
 		   this could be triggered by a topic command without sender */
+		chanrec->topic_time = 0;
+	} else {
 		chanrec->topic_time = settime;
 	}
+
+	signal_emit("channel topic changed", 1, chanrec);
 }
 
 static void event_topic_get(IRC_SERVER_REC *server, const char *data)
@@ -214,7 +187,7 @@ static void event_topic_info(IRC_SERVER_REC *server, const char *data)
 				  &topicby, &topictime);
 
 	t = (time_t) atol(topictime);
-	channel_change_topic_info(server, channel, topicby, t);
+	channel_change_topic(server, channel, NULL, topicby, t);
 	g_free(params);
 }
 
diff --git a/tests/irc/core/test-channel-events.c b/tests/irc/core/test-channel-events.c
index 98c70ce8..9f52c98d 100644
--- a/tests/irc/core/test-channel-events.c
+++ b/tests/irc/core/test-channel-events.c
@@ -31,6 +31,7 @@
 #include <settings.h>
 #include <signals.h>
 #include <time.h>
+#include <args.h>
 
 #define MODULE_NAME "test-channel-events"
 
@@ -87,10 +88,11 @@ int main(int argc, char **argv)
 
 	g_test_init(&argc, &argv, NULL);
 
+	core_preinit(*argv);
+	irssi_gui = IRSSI_GUI_NONE;
+
 	modules_init();
 	signals_init();
-	set_irssi_dir("/tmp/irssi");
-	set_irssi_config("/tmp/irssi/config");
 	settings_init();
 	recode_init();
 	channel_events_init();

From 80f9f16939b65536c5fc3ae1fedb885b84c82855 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 6 Oct 2018 20:14:49 +0200
Subject: [PATCH 0901/1650] Show the proper TXT when topic was unset

---
 src/fe-common/irc/fe-irc-commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index 7a6b17a6..668367e4 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -305,7 +305,7 @@ static void cmd_topic(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	if (channel == NULL) return;
 
 	printformat(server, channel->visible_name, MSGLEVEL_CRAP,
-		    channel->topic == NULL ? IRCTXT_NO_TOPIC : IRCTXT_TOPIC,
+		    (channel->topic == NULL || *channel->topic == '\0') ? IRCTXT_NO_TOPIC : IRCTXT_TOPIC,
 		    channel->visible_name, channel->topic);
 
 	if (channel->topic_time > 0) {

From cdcb50f413537177ff50478b766b570fb7bae057 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 8 Oct 2018 17:41:46 +0200
Subject: [PATCH 0902/1650] add a setting

---
 src/fe-common/irc/fe-irc-messages.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 21b98e6c..27aee5e2 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -201,12 +201,15 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 
 static char *notice_channel_context(SERVER_REC *server, const char *msg)
 {
+	if (!settings_get_bool("notice_channel_context"))
+		return NULL;
+
 	if (*msg == '[') {
 		char *end, *channel;
 		end = strpbrk(msg, " ,]");
 		if (end != NULL && *end == ']') {
 			channel = g_strndup(msg + 1, end - msg - 1);
-			if (server_ischannel(SERVER(server), channel)) {
+			if (server_ischannel(server, channel)) {
 				return channel;
 			}
 			g_free(channel);
@@ -294,6 +297,8 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
 
 void fe_irc_messages_init(void)
 {
+	settings_add_bool("misc", "notice_channel_context", TRUE);
+
         signal_add_last("message own_public", (SIGNAL_FUNC) sig_message_own_public);
         signal_add_last("message irc op_public", (SIGNAL_FUNC) sig_message_irc_op_public);
         signal_add_last("message irc own_wall", (SIGNAL_FUNC) sig_message_own_wall);

From 08b4d6c031fbc816f35e2cd1d57adfbb6ba4e3db Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 8 Oct 2018 20:23:22 -0700
Subject: [PATCH 0903/1650] Fix some space indentation

---
 src/fe-common/core/hilight-text.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index b9912457..3d853a90 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -45,7 +45,7 @@ static void reset_level_cache(void)
 {
 	GSList *tmp;
 
-        never_hilight_level = MSGLEVEL_ALL & ~default_hilight_level;
+	never_hilight_level = MSGLEVEL_ALL & ~default_hilight_level;
 	for (tmp = hilights; tmp != NULL; tmp = tmp->next) {
 		HILIGHT_REC *rec = tmp->data;
 
@@ -180,7 +180,7 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
 		/* check that channels match */
 		for (chan = channels; *chan != NULL; chan++) {
 			if (strarray_find(rec->channels, *chan) == -1)
-                                break;
+				break;
 		}
 
 		if (*chan == NULL)
@@ -239,10 +239,10 @@ static gboolean hilight_match_text(HILIGHT_REC *rec, const char *text,
 HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 			   const char *nick, const char *address,
 			   int level, const char *str,
-                           int *match_beg, int *match_end)
+			   int *match_beg, int *match_end)
 {
 	GSList *tmp;
-        CHANNEL_REC *chanrec;
+	CHANNEL_REC *chanrec;
 	NICK_REC *nickrec;
 
 	g_return_val_if_fail(str != NULL, NULL);
@@ -251,12 +251,12 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 		return NULL;
 
 	if (nick != NULL) {
-                /* check nick mask hilights */
+		/* check nick mask hilights */
 		chanrec = channel_find(server, channel);
 		nickrec = chanrec == NULL ? NULL :
 			nicklist_find(chanrec, nick);
 		if (nickrec != NULL) {
-                        HILIGHT_REC *rec;
+			HILIGHT_REC *rec;
 
 			if (nickrec->host == NULL)
 				nicklist_set_host(chanrec, nickrec, address);
@@ -388,10 +388,10 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 		/* end of the line */
 		pos = strip_real_length(text, hilight_end,
 					&color_pos, &color_len);
-		if (color_pos > 0)
+		if (color_pos > 0) {
 			g_string_append_len(tmp, text + color_pos, color_len);
-                else {
-                        /* no colors in line, change back to default */
+		} else {
+			/* no colors in line, change back to default */
 			g_string_append_c(tmp, 4);
 			g_string_append_c(tmp, FORMAT_STYLE_DEFAULTS);
 		}
@@ -413,7 +413,7 @@ HILIGHT_REC *hilight_match_nick(SERVER_REC *server, const char *channel,
 			 const char *nick, const char *address,
 			 int level, const char *msg)
 {
-        HILIGHT_REC *rec;
+	HILIGHT_REC *rec;
 
 	rec = hilight_match(server, channel, nick, address,
 				level, msg, NULL, NULL);
@@ -431,7 +431,7 @@ static void read_hilight_config(void)
 
 	node = iconfig_node_traverse("hilights", FALSE);
 	if (node == NULL) {
-                reset_cache();
+		reset_cache();
 		return;
 	}
 
@@ -545,8 +545,8 @@ static void cmd_hilight_show(void)
 }
 
 /* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -matchcase | -regexp]
-                   [-color <color>] [-actcolor <color>] [-level <level>]
-		   [-network <network>] [-channels <channels>] <text> */
+   [-color <color>] [-actcolor <color>] [-level <level>]
+   [-network <network>] [-channels <channels>] <text> */
 static void cmd_hilight(const char *data)
 {
 	GHashTable *optlist;

From 81f3d6dbc1133bc72ec1f3211e7eef7027bae157 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 8 Oct 2018 20:23:36 -0700
Subject: [PATCH 0904/1650] Comment colour code meaning

---
 src/fe-common/core/formats.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index f7466337..c8d56fd0 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1121,7 +1121,7 @@ int strip_real_length(const char *str, int len,
 		*last_color_len = -1;
 
 	while (*str != '\0') {
-		if (*str == 3) {
+		if (*str == 3) { /* mIRC color */
 			const char *mircstart = str;
 
 			if (last_color_pos != NULL)
@@ -1132,6 +1132,9 @@ int strip_real_length(const char *str, int len,
 				*last_color_len = (int) (str-mircstart);
 
 		} else if (*str == 4 && str[1] != '\0') {
+			/* We expect 4 to indicate an internal Irssi color code. However 4
+			 * also means hex color, an alternative to mIRC color codes. We
+			 * don't support those. */
 #ifdef TERM_TRUECOLOR
 			if (str[1] == FORMAT_COLOR_24 && str[2] != '\0') {
 				if (str[3] == '\0') str++;

From da15279fa3ce8a965f6d77e4483811ce94a8f9ea Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 17 Oct 2018 00:58:39 +0200
Subject: [PATCH 0905/1650] fix flood test libs

---
 tests/irc/flood/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
index 85b52eab..58c0d98d 100644
--- a/tests/irc/flood/Makefile.am
+++ b/tests/irc/flood/Makefile.am
@@ -33,8 +33,7 @@ test_796_LDADD = \
 	../../../src/fe-common/core/libfe_common_core.a \
 	../../../src/core/libcore.a \
 	../../../src/lib-config/libirssi_config.a \
-	@GLIB_LIBS@ \
-	@OPENSSL_LIBS@
+	@PROG_LIBS@
 
 test_796_SOURCES = \
 	test-796.c

From cbc27062e7f7d501623ee52614bc8012f1d5a97a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 17 Oct 2018 00:58:49 +0200
Subject: [PATCH 0906/1650] fix duplicate include guard

---
 src/fe-common/core/fe-settings.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-settings.h b/src/fe-common/core/fe-settings.h
index dd33f223..cc628790 100644
--- a/src/fe-common/core/fe-settings.h
+++ b/src/fe-common/core/fe-settings.h
@@ -1,5 +1,5 @@
-#ifndef __FE_CHANNELS_H
-#define __FE_CHANNELS_H
+#ifndef __FE_SETTINGS_H
+#define __FE_SETTINGS_H
 
 void fe_settings_set_print(const char *key);
 

From f11b629b2fa65ce355ce122c7c1482e8cba229db Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sun, 30 Sep 2018 05:54:22 +0000
Subject: [PATCH 0907/1650] Fix issues pointed out by e38774cc

---
 src/core/commands.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/commands.c b/src/core/commands.c
index 8e21a88a..2eebf0a3 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -305,7 +305,7 @@ void command_runsub(const char *cmd, const char *data,
 
 	if (*data == '\0') {
                 /* no subcommand given - list the subcommands */
-		signal_emit("list subcommands", 2, cmd);
+		signal_emit("list subcommands", 1, cmd);
 		return;
 	}
 
@@ -891,7 +891,7 @@ static void parse_command(const char *command, int expand_aliases,
 	if (rec != NULL && !cmd_protocol_match(rec, server)) {
 		g_free(orig);
 
-		signal_emit("error command", 2,
+		signal_emit("error command", 1,
 			    GINT_TO_POINTER(server == NULL ?
 					    CMDERR_NOT_CONNECTED :
 					    CMDERR_ILLEGAL_PROTO));

From 2093530e7590f91608d43f4617d8faf76ebf56ee Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Sat, 27 Oct 2018 16:08:36 +0200
Subject: [PATCH 0908/1650] Make it possible to only autolog saved channels

---
 src/fe-common/core/fe-log.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 0fed8642..7823d727 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -41,6 +41,8 @@
 #include "printtext.h"
 #include "fe-common-core.h"
 
+#include "channels-setup.h"
+
 /* close autologs after 5 minutes of inactivity */
 #define AUTOLOG_INACTIVITY_CLOSE (60*5)
 
@@ -486,6 +488,10 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 
 	deftarget = server ? server->nick : "unknown";
 
+	/* log only channels that have been saved to the config */
+	if (settings_get_bool("autolog_only_saved_channels") && channel_setup_find(target, server_tag) == NULL)
+		return;
+
 	if (autolog_ignore_targets != NULL &&
 	    strarray_find_dest(autolog_ignore_targets, dest))
 		return;
@@ -722,6 +728,7 @@ void fe_log_init(void)
 	settings_add_bool("log", "awaylog_colors", TRUE);
         settings_add_bool("log", "autolog", FALSE);
 	settings_add_bool("log", "autolog_colors", FALSE);
+	settings_add_bool("log", "autolog_only_saved_channels", FALSE);
         settings_add_str("log", "autolog_path", "~/irclogs/$tag/$0.log");
 	settings_add_level("log", "autolog_level", "all -crap -clientcrap -ctcps");
         settings_add_str("log", "log_theme", "");

From 3061f5d848f6f487e8c73a5d5846b7a860ca5466 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Sat, 27 Oct 2018 20:00:15 +0200
Subject: [PATCH 0909/1650] make sure only channels are checked

---
 src/fe-common/core/fe-log.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 7823d727..d71c62a9 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -24,6 +24,7 @@
 #include "commands.h"
 #include "chat-protocols.h"
 #include "servers.h"
+#include "channels.h"
 #include "levels.h"
 #include "misc.h"
 #include "log.h"
@@ -489,7 +490,8 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 	deftarget = server ? server->nick : "unknown";
 
 	/* log only channels that have been saved to the config */
-	if (settings_get_bool("autolog_only_saved_channels") && channel_setup_find(target, server_tag) == NULL)
+	if (settings_get_bool("autolog_only_saved_channels") && IS_CHANNEL(window_item_find(server, target))
+		&& channel_setup_find(target, server_tag) == NULL)
 		return;
 
 	if (autolog_ignore_targets != NULL &&

From f7966d9c081641ff5b1adca2bd8c217a331bcaa6 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Sat, 27 Oct 2018 20:51:29 +0200
Subject: [PATCH 0910/1650] allow activity_hide_targets to hide activity in
 itemless windows

---
 src/fe-common/core/fe-common-core.c  | 4 +++-
 src/fe-common/core/window-activity.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index ef5d2113..0e654e4d 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -480,7 +480,9 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 	g_return_val_if_fail(array != NULL, FALSE);
 	g_return_val_if_fail(dest != NULL, FALSE);
 	g_return_val_if_fail(dest->window != NULL, FALSE);
-	g_return_val_if_fail(dest->target != NULL, FALSE);
+
+	if (dest->target == NULL) {
+		return strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE;
 
 	item = window_item_find_window(dest->window, dest->server, dest->target);
 	if (item == NULL) {
diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 48e909a4..06c24a2f 100644
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@@ -86,7 +86,7 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg)
 			DATA_LEVEL_MSG : DATA_LEVEL_TEXT;
 	}
 
-	if (hide_targets != NULL && (dest->level & MSGLEVEL_HILIGHT) == 0 && dest->target != NULL) {
+	if (hide_targets != NULL && (dest->level & MSGLEVEL_HILIGHT) == 0) {
 		/* check for both target and tag/target */
 		if (strarray_find_dest(hide_targets, dest))
 			return;

From ec577f9265fff6b36b0e25c3e1a04ef8f0aee9d6 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Sat, 27 Oct 2018 20:52:14 +0200
Subject: [PATCH 0911/1650] typo

---
 src/fe-common/core/fe-common-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 0e654e4d..dc3a6f6d 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -481,7 +481,7 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 	g_return_val_if_fail(dest != NULL, FALSE);
 	g_return_val_if_fail(dest->window != NULL, FALSE);
 
-	if (dest->target == NULL) {
+	if (dest->target == NULL)
 		return strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE;
 
 	item = window_item_find_window(dest->window, dest->server, dest->target);

From 2847b751e359bde8eb5dc3d89f57575c3b5f0948 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 29 Oct 2018 17:51:48 +0100
Subject: [PATCH 0912/1650] design.txt is now sourced from website

also run syncdocs, fixes missing placeholder in startup-HOWTO
---
 docs/Makefile.am        |   1 +
 docs/design.html        | 166 ++++++++++++++++++++++++++++++++++++++++
 docs/startup-HOWTO.html |   2 +-
 docs/startup-HOWTO.txt  |   3 +-
 utils/syncdocs.sh       |   5 ++
 5 files changed, 175 insertions(+), 2 deletions(-)
 create mode 100644 docs/design.html

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8998ffb4..23d61648 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -3,6 +3,7 @@ man_MANS = \
 
 doc_DATA = \
 	capsicum.txt \
+	design.html \
 	design.txt \
 	formats.txt \
 	manual.txt \
diff --git a/docs/design.html b/docs/design.html
new file mode 100644
index 00000000..4be231ee
--- /dev/null
+++ b/docs/design.html
@@ -0,0 +1,166 @@
+<base href='https://irssi.org/documentation/design/'>
+<h1>Design</h1>
+
+<p>Irssi’s hierarchy is something like this:</p>
+
+<pre class="repl" id="fig1"><code class="language-ascidia">
+        sub1 sub2
+           \ /
+      xxx  IRC       COMMON ICQ  yyy
+       |    |           |    |    |
+       '----+-----:-----+----+----'
+                  |
+                 GUI (gtk/gnome, qt/kde, text, none)
+                  |
+        sub1 sub2 |
+           \ /    |
+      xxx  IRC    |  COMMON ICQ  yyy
+       '----+-----+-----+----+----'
+                  |
+              COMMON UI
+                  |
+        sub1 sub2 |
+           \ /    |
+      xxx  IRC    |    ICQ  yyy
+       |    |     |     |    |
+       '----+-----+-----+----'
+                  |
+                CORE
+                /
+       lib-config
+
+</code></pre>
+
+<p>(IRC, ICQ, xxx and yyy are chat protocols ..)</p>
+
+<p>(sub1 and sub2 are submodules of IRC module, like DCC and flood protect)</p>
+
+<p>Chat protocols and frontends are kept in separate modules. Common UI
+and GUI modules also have the common parts which don’t know anything
+about the chat protocols. This should allow implementing modules to
+whatever chat protocols and with whatever frontends easily.</p>
+
+<h2 id="signals">Signals</h2>
+
+<p>Communication between different modules are done with “signals”. They are
+not related to UNIX signals in any way, you could more like think of them
+as “events” - which might be a better name for them, but I don’t really
+want to change it anymore :)</p>
+
+<p>So, you send signal with <code>signal_emit()</code> and it’s sent to all modules that
+have grabbed it by calling <code>signal_add()</code> in their init function. For
+example:</p>
+
+<div><div><pre><code>signal_emit("mysignal", 1, "hello");
+</code></pre></div></div>
+
+<p>Sends a “mysignal” function with one argument “hello” - before that, you
+should have grabbed the signal somewhere else with:</p>
+
+<div><div><pre><code>static void sig_mysignal(const char *arg1)
+{
+  /* arg1 contains "hello" */
+}
+
+signal_add("mysignal", (SIGNAL_FUNC) sig_mysignal);
+</code></pre></div></div>
+
+<p>There are three different <code>signal_add()</code> functions which you can use to
+specify if you want to grab the signal first, “normally” or last. You can
+also stop the signal from going any further.</p>
+
+<p>Emitting signal with it’s name creates a small overhead since it has to
+look up the signal’s numeric ID first, after which it looks up the signal
+structure. This is done because if you call a signal <em>really</em> often,
+it’s faster to find it with it’s numeric ID instead of the string. You
+can use <code>signal_get_uniq_id()</code> macro to convert the signal name into ID -
+you’ll have to do this only once! - and use <code>signal_emit_id()</code> to emit the
+signal. Don’t bother to do this unless your signal is sent (or could be
+sent) several times in a second.</p>
+
+<p>See <code>src/core/signals.h</code> for definition of the signal function, and
+signals.txt for a list of signals.</p>
+
+<h2 id="lib-config">lib-config</h2>
+
+<p>Irssi depends on this for reading and saving configuration.
+(created by me for irssi)</p>
+
+<h2 id="core-module">CORE module</h2>
+
+<p>Provides some functionality that all other modules can use:</p>
+<ul>
+  <li>signal handling</li>
+  <li>keeping list of settings</li>
+  <li>keeping list of /commands</li>
+  <li>keeping track of loaded modules</li>
+  <li>networking functions (with nonblocking connects, IPv6 support)</li>
+  <li>handles connecting to servers</li>
+  <li>raw logging of server’s input/output data</li>
+  <li>/EVAL support</li>
+  <li>fgets() like function line_split() without any maximum line limits</li>
+  <li>command line parameter handling</li>
+  <li>miscellaneous useful little functions</li>
+  <li>handles logging</li>
+</ul>
+
+<h2 id="common-ui-module">COMMON UI module</h2>
+
+<ul>
+  <li>knows basics about windows and window items (=channels, queries, ..)</li>
+  <li>printtext() - parsing texts and feeding it for GUI to print.</li>
+  <li>themes</li>
+  <li>translation tables</li>
+  <li>text hilighting</li>
+  <li>command history</li>
+  <li>user interface (/commands) for CORE’s functionality</li>
+</ul>
+
+<h2 id="gui-modules">GUI modules</h2>
+
+<ul>
+  <li>all the rest of the functionality needed for a working client.</li>
+</ul>
+
+<h2 id="irc-module">IRC module</h2>
+
+<ul>
+  <li>CORE
+    <ul>
+      <li>IRC specific /commands</li>
+      <li>flood protecting commands sent to server</li>
+      <li>creating IRC masks based on nick/address for bans, ignores, etc.</li>
+      <li>keeps list of channels, nicks, channel modes, bans, etc.</li>
+      <li>keeps list of servers, server settings, irc networks,
+server reconnections and irc network splits</li>
+      <li>redirection of commands’ replies</li>
+      <li>lag detection</li>
+      <li>ctcp support and flood protection</li>
+      <li>Handles ignoring people</li>
+    </ul>
+  </li>
+  <li>DCC
+    <ul>
+      <li>DCC chat, send and get</li>
+    </ul>
+  </li>
+  <li>FLOOD
+    <ul>
+      <li>detects private or channel flooding and sends “flood” signal</li>
+      <li>automatic ignoring when flooding</li>
+    </ul>
+  </li>
+  <li>NOTIFYLIST
+    <ul>
+      <li>handles notifylist</li>
+    </ul>
+  </li>
+</ul>
+
+<h2 id="irc-ui-module">IRC UI module</h2>
+
+<ul>
+  <li>placing channels and queries in windows</li>
+  <li>nick completion</li>
+  <li>printing infomation of some events</li>
+</ul>
\ No newline at end of file
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 8cd7a010..36d8edbf 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -378,7 +378,7 @@ Ctrl-X                - set the next server in list active
 <div><div><pre><code>/SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
 </code></pre></div></div>
 
-<p>By default irssi logs to ~/irclogs/<servertag>/<target>.log. You can change this with</target></servertag></p>
+<p>By default irssi logs to ~/irclogs/&lt;servertag&gt;/&lt;target&gt;.log. You can change this with</p>
 
 <div><div><pre><code>/SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
 </code></pre></div></div>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 88912ef3..ecfe7ad8 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -416,7 +416,8 @@ requests, etc). You can specify the logging level yourself with
 
 /SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
 
-By default irssi logs to ~/irclogs//.log. You can change this with
+By default irssi logs to ~/irclogs/<servertag>/<target>.log. You can change
+this with
 
 /SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
 
diff --git a/utils/syncdocs.sh b/utils/syncdocs.sh
index ed76bf85..bd92ffab 100755
--- a/utils/syncdocs.sh
+++ b/utils/syncdocs.sh
@@ -7,6 +7,7 @@ site=https://irssi.org
 
 faq=$site/documentation/faq/
 howto=$site/documentation/startup/
+design=$site/documentation/design/
 
 # remove everything until H1 and optionally 2 DIVs before the
 # FOOTER. May need to be adjusted as the source pages change
@@ -84,6 +85,7 @@ download_it() {
 
 download_it "FAQ" "$faq" "$srcdir"/docs/faq.html
 download_it "Startup How-To" "$howto" "$srcdir"/docs/startup-HOWTO.html
+download_it "Design" "$design" "$srcdir"/docs/design.html
 
 # .html -> .txt with lynx or elinks
 echo "Documentation: html -> txt..."
@@ -100,3 +102,6 @@ cat "$srcdir"/docs/faq.html \
 cat "$srcdir"/docs/startup-HOWTO.html \
     | perl -pe "s/\\bhref=([\"\'])#.*?\\1//" \
     | LC_ALL=en_IE.utf8 $converter > "$srcdir"/docs/startup-HOWTO.txt
+
+cat "$srcdir"/docs/design.html \
+    | LC_ALL=en_IE.utf8 $converter > "$srcdir"/docs/design.txt

From 9d2429c027770a711aa6ea6be86545e7966ec1ba Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 9 Nov 2018 10:57:37 +0100
Subject: [PATCH 0913/1650] test line joining

---
 configure.ac                              |  1 +
 tests/Makefile.am                         |  6 ++-
 tests/fe-text/Makefile.am                 | 38 ++++++++++++++++
 tests/fe-text/mock-irssi.c                |  9 ++++
 tests/fe-text/test-paste-join-multiline.c | 55 +++++++++++++++++++++++
 5 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 tests/fe-text/Makefile.am
 create mode 100644 tests/fe-text/mock-irssi.c
 create mode 100644 tests/fe-text/test-paste-join-multiline.c

diff --git a/configure.ac b/configure.ac
index 03e05847..49436bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -732,6 +732,7 @@ scripts/examples/Makefile
 tests/Makefile
 tests/fe-common/Makefile
 tests/fe-common/core/Makefile
+tests/fe-text/Makefile
 tests/irc/Makefile
 tests/irc/core/Makefile
 tests/irc/flood/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e16d190e..8713b38f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = fe-common irc
+if BUILD_TEXTUI
+TEXTUI=fe-text
+endif
+
+SUBDIRS = fe-common irc $(TEXTUI)
diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am
new file mode 100644
index 00000000..38979e14
--- /dev/null
+++ b/tests/fe-text/Makefile.am
@@ -0,0 +1,38 @@
+include $(top_srcdir)/utils/glib-tap.mk
+
+PACKAGE_STRING=fe-text
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core \
+	-I$(top_srcdir)/src/fe-common/core \
+	-I$(top_srcdir)/src/fe-text \
+	$(GLIB_CFLAGS)
+
+test_programs = test-paste-join-multiline
+
+test_paste_join_multiline_CPPFLAGS = \
+	$(AM_CPPFLAGS)
+
+# test_paste_join_multiline_DEPENDENCIES =
+
+test_paste_join_multiline_LDADD = \
+        ../../src/fe-common/core/libfe_common_core.a \
+        ../../src/core/libcore.a \
+        ../../src/lib-config/libirssi_config.a \
+	@PROG_LIBS@ \
+	@TEXTUI_LIBS@
+
+
+test_paste_join_multiline_SOURCES = \
+	../../src/fe-text/gui-entry.c \
+	../../src/fe-text/mainwindows.c \
+	../../src/fe-text/term-terminfo.c \
+	../../src/fe-text/terminfo-core.c \
+	../../src/fe-text/term.c \
+	../../src/fe-text/textbuffer-view.c \
+	../../src/fe-text/textbuffer.c \
+	../../src/fe-text/gui-windows.c \
+	../../src/fe-text/gui-printtext.c \
+	mock-irssi.c \
+	test-paste-join-multiline.c
diff --git a/tests/fe-text/mock-irssi.c b/tests/fe-text/mock-irssi.c
new file mode 100644
index 00000000..d03c371d
--- /dev/null
+++ b/tests/fe-text/mock-irssi.c
@@ -0,0 +1,9 @@
+void irssi_set_dirty(void)
+{
+}
+
+void irssi_redraw(void)
+{
+}
+
+int quitting = 0;
diff --git a/tests/fe-text/test-paste-join-multiline.c b/tests/fe-text/test-paste-join-multiline.c
new file mode 100644
index 00000000..53fd3708
--- /dev/null
+++ b/tests/fe-text/test-paste-join-multiline.c
@@ -0,0 +1,55 @@
+#include "common.h"
+#include "gui-readline.c"
+
+typedef struct {
+	char const *const description;
+	char const *const input;
+	char const *const result;
+} paste_join_multiline_test_case;
+
+static void test_paste_join_multiline(const paste_join_multiline_test_case *test);
+
+paste_join_multiline_test_case const paste_join_multiline_fixture[] = {
+	{
+		.description = "Lines should be joined, separator NL",
+		.input = "<User> hello world\n       how are you\n       screen is narrow",
+		.result = "<User> hello world how are you screen is narrow",
+	},
+};
+
+int main(int argc, char **argv)
+{
+	int i;
+
+	g_test_init(&argc, &argv, NULL);
+
+	for (i = 0; i < G_N_ELEMENTS(paste_join_multiline_fixture); i++) {
+		char *name = g_strdup_printf("/test/paste_join_multiline/%d", i);
+		g_test_add_data_func(name, &paste_join_multiline_fixture[i], (GTestDataFunc)test_paste_join_multiline);
+		g_free(name);
+	}
+
+#if GLIB_CHECK_VERSION(2,38,0)
+	g_test_set_nonfatal_assertions();
+#endif
+	return g_test_run();
+}
+
+static void test_paste_join_multiline(const paste_join_multiline_test_case *test)
+{
+	char *resultstr;
+	GArray *buffer = g_array_new(FALSE, FALSE, sizeof(unichar));
+
+	g_test_message("Testing: %s", test->description);
+
+	buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, (glong *) &buffer->len);
+	paste_buffer_join_lines(buffer);
+	resultstr = g_ucs4_to_utf8((unichar *) buffer->data, buffer->len, NULL, NULL, NULL);
+
+	g_assert_cmpstr(resultstr, ==, test->result);
+
+	g_free(resultstr);
+	g_array_free(buffer, TRUE);
+
+	return;
+}

From 83e98da2ffa295723b10f63ec41211f70ea87153 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 9 Nov 2018 11:05:52 +0100
Subject: [PATCH 0914/1650] add test for paste_join_multiline

---
 tests/fe-text/test-paste-join-multiline.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/fe-text/test-paste-join-multiline.c b/tests/fe-text/test-paste-join-multiline.c
index 53fd3708..778e19e9 100644
--- a/tests/fe-text/test-paste-join-multiline.c
+++ b/tests/fe-text/test-paste-join-multiline.c
@@ -12,8 +12,18 @@ static void test_paste_join_multiline(const paste_join_multiline_test_case *test
 paste_join_multiline_test_case const paste_join_multiline_fixture[] = {
 	{
 		.description = "Lines should be joined, separator NL",
-		.input = "<User> hello world\n       how are you\n       screen is narrow",
-		.result = "<User> hello world how are you screen is narrow",
+		.input = "<User> A1\n       B22\n       C33",
+		.result = "<User> A1 B22 C33",
+	},
+	{
+		.description = "Lines should be joined, separator LF",
+		.input = "<User> A1\r       B22\r       C33",
+		.result = "<User> A1 B22 C33",
+	},
+	{
+		.description = "Lines should be joined, white space should be skipped",
+		.input = "<User> A1 \n       B22 \n       C33 ",
+		.result = "<User> A1 B22 C33 ",
 	},
 };
 
@@ -37,10 +47,12 @@ int main(int argc, char **argv)
 
 static void test_paste_join_multiline(const paste_join_multiline_test_case *test)
 {
-	char *resultstr;
+	char *resultstr, *t1;
 	GArray *buffer = g_array_new(FALSE, FALSE, sizeof(unichar));
 
 	g_test_message("Testing: %s", test->description);
+	g_test_message("INPUT: \"%s\"", (t1 = g_strescape(test->input, NULL)));
+	g_free(t1);
 
 	buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, (glong *) &buffer->len);
 	paste_buffer_join_lines(buffer);

From c1fb9a840201131982f2c2e1ff8737436f495841 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 9 Nov 2018 11:06:13 +0100
Subject: [PATCH 0915/1650] fix paste_join_multiline

---
 src/fe-text/gui-readline.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 88e827a7..1033339e 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -160,6 +160,7 @@ static void window_next_page(void)
 	gui_window_scroll(active_win, get_scroll_count());
 }
 
+#define isnewline(x) ((x) == '\n' || (x) == '\r')
 static void paste_buffer_join_lines(GArray *buf)
 {
 	unsigned int i, count, indent, line_len;
@@ -199,7 +200,7 @@ static void paste_buffer_join_lines(GArray *buf)
 
 	/* find the first beginning of indented line */
 	for (i = 1; i < buf->len; i++) {
-		if (arr[i-1] == '\n' && isblank(arr[i]))
+		if (isnewline(arr[i-1]) && isblank(arr[i]))
 			break;
 	}
 	if (i == buf->len)
@@ -226,7 +227,7 @@ static void paste_buffer_join_lines(GArray *buf)
 				count = 0;
 			}
 		}
-		if (arr[i] == '\n')
+		if (isnewline(arr[i]))
 			last_lf = TRUE;
 	}
 
@@ -236,11 +237,12 @@ static void paste_buffer_join_lines(GArray *buf)
 	for (i = 0; i < buf->len; i++) {
 		if (last_lf && isblank(arr[i])) {
 			/* whitespace, ignore */
-		} else if (arr[i] == '\n') {
+		} else if (isnewline(arr[i])) {
 			if (!last_lf && i+1 != buf->len &&
 			    isblank(arr[i+1])) {
 				last_lf_pos = dest;
-				*dest++ = ' ';
+				if (i != 0 && !isblank(arr[i-1]))
+					*dest++ = ' ';
 			} else {
 				*dest++ = '\n'; /* double-LF */
 				line_len = 0;
@@ -287,7 +289,7 @@ static void paste_send(void)
 		/* first line has to be kludged kind of to get pasting in the
 		   middle of line right.. */
 		for (i = 0; i < paste_buffer->len; i++) {
-			if (arr[i] == '\r' || arr[i] == '\n') {
+			if (isnewline(arr[i])) {
 				i++;
 				break;
 			}
@@ -303,7 +305,7 @@ static void paste_send(void)
 	/* rest of the lines */
 	str = g_string_new(NULL);
 	for (; i < paste_buffer->len; i++) {
-		if (arr[i] == '\r' || arr[i] == '\n') {
+		if (isnewline(arr[i])) {
 			paste_send_line(str->str);
 			g_string_truncate(str, 0);
 		} else if (active_entry->utf8) {
@@ -769,7 +771,7 @@ static void paste_bracketed_end(int i, gboolean rest)
 
 	last_char = g_array_index(paste_buffer, unichar, i - 1);
 
-	if (paste_line_count > 0 && last_char != '\n' && last_char != '\r') {
+	if (paste_line_count > 0 && !isnewline(last_char)) {
 		/* there are newlines, but there's also stuff after the newline
 		 * adjust line count to reflect this */
 		paste_line_count++;

From 60d2364989b50ed8b76076022dde39690dc95416 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 9 Nov 2018 11:11:10 +0100
Subject: [PATCH 0916/1650] run syncscripts.sh

sync buf.pl to version 3.00
sync usercount.pl to version 1.20
---
 scripts/buf.pl       | 119 +++++++++++++++++++++----------------------
 scripts/usercount.pl |   4 +-
 2 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/scripts/buf.pl b/scripts/buf.pl
index 6d907f12..0b37e9de 100644
--- a/scripts/buf.pl
+++ b/scripts/buf.pl
@@ -1,22 +1,24 @@
 use strict;
 use vars qw($VERSION %IRSSI);
+use Storable;
+use 5.014000;
 
 use Irssi qw(command signal_add signal_add_first active_win
              settings_get_str settings_get_bool channels windows
-	     settings_add_str settings_add_bool get_irssi_dir
-	     window_find_refnum signal_stop);
-$VERSION = '2.20';
+             settings_add_str settings_add_bool get_irssi_dir
+             window_find_refnum signal_stop);
+$VERSION = '3.00';
 %IRSSI = (
-    authors	=> 'Juerd',
-    contact	=> 'juerd@juerd.nl',
-    name	=> 'Scroll buffer restorer',
-    description	=> 'Saves the buffer for /upgrade, so that no information is lost',
-    license	=> 'Public Domain',
-    url		=> 'http://juerd.nl/irssi/',
-    changed	=> 'Thu Sep 22 01:37 CEST 2016',
-    changes	=> 'Fixed file permissions (leaked everything via filesystem)',
-    note1	=> 'This script HAS TO BE in your scripts/autorun!',
-    note2	=> 'Perl support must be static or in startup',
+    authors     => 'Juerd',
+    contact     => 'juerd@juerd.nl',
+    name        => 'Scroll buffer restorer',
+    description => 'Saves the buffer for /upgrade, so that no information is lost',
+    license     => 'Public Domain',
+    url         => 'http://juerd.nl/irssi/',
+    changed     => 'Thu Mar 29 10:00 CEST 2018',
+    changes     => 'Fixed file permissions (leaked everything via filesystem), rewritten to use Storable and print to correct levels',
+    note1       => 'This script HAS TO BE in your scripts/autorun!',
+    note2       => 'Perl support must be static or in startup',
 );
 
 # Q: How can I get a very smooth and clean upgrade?
@@ -40,30 +42,28 @@ my %suppress;
 sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir }
 
 sub upgrade {
-    my $fn = _filename;
-    my $old_umask = umask 0077;
-    open my $fh, q{>}, $fn or die "open $fn: $!";
-    umask $old_umask;
-
-    print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
+    my $out = { suppress => [ map $_->{server}->{address} . $_->{name}, channels ] };
     for my $window (windows) {
-	next unless defined $window;
-	next if $window->{name} eq 'status';
-	my $view = $window->view;
-	my $line = $view->get_lines;
-	my $lines  = 0;
-	my $buf = '';
-	if (defined $line){
-	    {
-		$buf .= $line->get_text(1) . "\n";
-		$line = $line->next;
-		$lines++;
-		redo if defined $line;
-	    }
-	}
-	printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf;
+        next unless defined $window;
+        next if $window->{name} eq 'status';
+        my $view = $window->view;
+        my $line = $view->get_lines;
+        my $lines  = 0;
+        my $buf = '';
+        my $output;
+        if (defined $line) {
+            {
+              push @$output, { level => $line->{info}{level}, data => $line->get_text(1) };
+              $line = $line->next;
+              redo if defined $line;
+            }
+        }
+        push @{$out->{windows}}, { refnum => $window->{refnum}, lines => $output };
     }
-    close $fh;
+    my $old_umask = umask 0077;
+    my $fn = _filename;
+    store($out, $fn) or die "Could not store data to $fn";
+    umask $old_umask;
     unlink sprintf("%s/sessionconfig", get_irssi_dir);
     command 'layout save';
     command 'save';
@@ -71,33 +71,30 @@ sub upgrade {
 
 sub restore {
     my $fn = _filename;
-    open my $fh, q{<}, $fn or die "open $fn: $!";
+    my $in = retrieve($fn) or die "Could not retrieve data from $fn";
     unlink $fn or warn "unlink $fn: $!";
-
-    my @suppress = split /\0/, readline $fh;
-    if (settings_get_bool 'upgrade_suppress_join') {
-	chomp $suppress[-1];
-	@suppress{@suppress} = (2) x @suppress;
-    }
+  
+    my @suppress = @{$in->{suppress}};
+    @suppress{@suppress} = (2) x @suppress if (settings_get_bool 'upgrade_suppress_join');
+  
     active_win->command('^window scroll off');
-    while (my $bla = readline $fh){
-	chomp $bla;
-	my ($refnum, $lines) = split /:/, $bla;
-	next unless $lines;
-	my $window = window_find_refnum $refnum;
-	unless (defined $window){
-	    readline $fh for 1..$lines;
-	    next;
-	}
-	my $view = $window->view;
-	$view->remove_all_lines();
-	$view->redraw();
-	my $buf = '';
-	$buf .= readline $fh for 1..$lines;
-	my $sep = settings_get_str 'upgrade_separator';
-	$sep .= "\n" if $sep ne '';
-	$window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep");
-	$view->redraw();
+    for my $win (@{$in->{windows}}) {
+        my $window = window_find_refnum $win->{refnum};
+        next unless $window;
+        my @lines  = @{ $win->{lines} || [] };
+        next unless @lines;
+    
+        my $view = $window->view;
+        $view->remove_all_lines();
+        $view->redraw();
+        for my $line (@lines) {
+            my $level = $line->{level};
+            my $data  = $line->{data};
+            $window->gui_printtext_after($window->last_line_insert, $level, "$data\n");
+        }
+        my $sep = settings_get_str 'upgrade_separator';
+        $window->gui_printtext_after($window->last_line_insert, MSGLEVEL_CLIENTNOTICE, "\cO$sep\n") if $sep ne '';
+        $view->redraw();
     }
     active_win->command('^window scroll on');
     active_win->command('^scrollback end');
@@ -110,7 +107,7 @@ sub suppress {
     $key_part =~ s/^://;
     my $key = $first->{address} . $key_part;
     if (exists $suppress{$key} and $suppress{$key}--) {
-    	signal_stop();
+        signal_stop();
         delete $suppress{$key} unless $suppress{$key};
     }
 }
diff --git a/scripts/usercount.pl b/scripts/usercount.pl
index 650f9f36..7e765c96 100644
--- a/scripts/usercount.pl
+++ b/scripts/usercount.pl
@@ -1,7 +1,7 @@
 use strict;
 use Irssi 20040119.2359 ();
 use vars qw($VERSION %IRSSI);
-$VERSION = "1.19";
+$VERSION = "1.20";
 %IRSSI = (
     authors     => 'David Leadbeater, Timo Sirainen, Georg Lukas',
     contact     => 'dgl@dgl.cx, tss@iki.fi, georg@boerde.de',
@@ -128,7 +128,7 @@ sub calc_users() {
   }
 
   # Server doesn't support halfops? 
-  if($server->isupport("PREFIX") !~ /\%/) {
+  if($server->can('isupport') && $server->isupport("PREFIX") !~ /\%/) {
      $halfops = undef;
   } else {
      $halfops = undef unless Irssi::settings_get_bool('usercount_show_halfops');

From 4537d85b0b1e3bbd5240e379d015752423381e9a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 9 Nov 2018 11:32:00 +0100
Subject: [PATCH 0917/1650] reverse queue

---
 src/core/rawlog.c         | 6 +++---
 src/perl/common/Rawlog.xs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index dafad057..e0c4dd3d 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -63,7 +63,7 @@ void rawlog_destroy(RAWLOG_REC *rawlog)
 static void rawlog_add(RAWLOG_REC *rawlog, char *str)
 {
 	if (rawlog->lines->length >= rawlog_lines && rawlog_lines > 0) {
-		void *tmp = g_queue_pop_tail(rawlog->lines);
+		void *tmp = g_queue_pop_head(rawlog->lines);
 		g_free(tmp);
 	}
 
@@ -72,7 +72,7 @@ static void rawlog_add(RAWLOG_REC *rawlog, char *str)
 		write_buffer(rawlog->handle, "\n", 1);
 	}
 
-	g_queue_push_head(rawlog->lines, str);
+	g_queue_push_tail(rawlog->lines, str);
 	signal_emit_id(signal_rawlog, 2, rawlog, str);
 }
 
@@ -105,7 +105,7 @@ static void rawlog_dump(RAWLOG_REC *rawlog, int f)
 	GList *tmp;
 	ssize_t ret = 0;
 
-	for (tmp = rawlog->lines->tail; ret != -1 && tmp != NULL; tmp = tmp->prev) {
+	for (tmp = rawlog->lines->head; ret != -1 && tmp != NULL; tmp = tmp->next) {
 		ret = write(f, tmp->data, strlen((char *) tmp->data));
                 if (ret != -1)
                         ret = write(f, "\n", 1);
diff --git a/src/perl/common/Rawlog.xs b/src/perl/common/Rawlog.xs
index 73845287..3c946c7e 100644
--- a/src/perl/common/Rawlog.xs
+++ b/src/perl/common/Rawlog.xs
@@ -21,7 +21,7 @@ rawlog_get_lines(rawlog)
 PREINIT:
 	GList *tmp;
 PPCODE:
-	for (tmp = rawlog->lines->tail; tmp != NULL; tmp = tmp->prev) {
+	for (tmp = rawlog->lines->head; tmp != NULL; tmp = tmp->next) {
 		XPUSHs(sv_2mortal(new_pv(tmp->data)));
 	}
 

From 9e5e5d8625714c58546fad00b9d95bce7f3a1afb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 12 Nov 2018 13:14:02 +0100
Subject: [PATCH 0918/1650] expose wcwidth and related to perl

---
 src/perl/common/Core.xs   | 21 +++++++++++++++++++++
 src/perl/textui/TextUI.xs | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index 5d2f7bca..7c72f646 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -2,6 +2,8 @@
 #include "module.h"
 #include "irssi-version.h"
 #include "core.h"
+#include "utf8.h"
+#include "recode.h"
 
 #include "pidwait.h"
 #include "session.h"
@@ -687,6 +689,25 @@ CODE:
 OUTPUT:
 	RETVAL
 
+int
+string_width(str)
+	char *str
+C_ARGS:
+	str, is_utf8() ? TREAT_STRING_AS_UTF8 : TREAT_STRING_AS_BYTES
+
+void
+string_chars_for_width(str, width)
+	char *str
+	unsigned int width
+PREINIT:
+	int retval;
+	unsigned int bytes;
+PPCODE:
+	retval = string_chars_for_width(str, is_utf8() ? TREAT_STRING_AS_UTF8 : TREAT_STRING_AS_BYTES, width, &bytes);
+	mXPUSHi(retval);
+	mXPUSHu(bytes);
+
+
 #*******************************
 MODULE = Irssi::Core	PACKAGE = Irssi::Server
 #*******************************
diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index e2f162a0..71545d14 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -205,6 +205,27 @@ gui_input_set_pos(pos)
 CODE:
 	gui_entry_set_pos(active_entry, pos);
 
+int
+wcwidth(c)
+	char *c
+CODE:
+	if (term_type == TERM_TYPE_UTF8) {
+		unichar chr = g_utf8_get_char_validated((const char *) c, -1);
+
+		if (chr & 0x80000000) {
+			RETVAL = 1;
+		} else {
+			RETVAL = i_wcwidth(chr);
+		}
+	} else if (term_type != TERM_TYPE_BIG5 ||
+	    c[1] == '\0' || !is_big5(c[0], c[1])) {
+		RETVAL = 1;
+	} else {
+		RETVAL = 2;
+	}
+OUTPUT:
+	RETVAL
+
 MODULE = Irssi::TextUI PACKAGE = Irssi::UI::Window
 
 void

From deaa1da55e3250badbdb3a769989cf5525b301e2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 12 Nov 2018 14:11:27 +0100
Subject: [PATCH 0919/1650] cast to unsigned char

---
 src/perl/textui/TextUI.xs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index 71545d14..35ea5759 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -218,7 +218,8 @@ CODE:
 			RETVAL = i_wcwidth(chr);
 		}
 	} else if (term_type != TERM_TYPE_BIG5 ||
-	    c[1] == '\0' || !is_big5(c[0], c[1])) {
+		   c[1] == '\0' ||
+		   !is_big5((unsigned char) c[0], (unsigned char) c[1])) {
 		RETVAL = 1;
 	} else {
 		RETVAL = 2;

From 288f220f875d4e4f00e86dd809c04aa805b49991 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Nov 2018 00:14:15 +0100
Subject: [PATCH 0920/1650] fix width of byte codepoints

---
 src/perl/textui/TextUI.xs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index 35ea5759..9f4fd0b0 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -220,7 +220,7 @@ CODE:
 	} else if (term_type != TERM_TYPE_BIG5 ||
 		   c[1] == '\0' ||
 		   !is_big5((unsigned char) c[0], (unsigned char) c[1])) {
-		RETVAL = 1;
+		RETVAL = i_wcwidth((unsigned char) *c);
 	} else {
 		RETVAL = 2;
 	}

From 4380f3820e5504b039d4a1ed0853c4442fa251b1 Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Mon, 19 Nov 2018 13:58:51 +0000
Subject: [PATCH 0921/1650] Fix compilation of irc/core on AIX and IBM i

There's a function in the standard library of these OSes that conflict
with this function. Prefix it with `irc_`.
---
 src/irc/core/irc-cap.c  | 2 +-
 src/irc/core/irc-cap.h  | 3 ++-
 src/irc/core/irc-core.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 5ab8d94f..898a4a20 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -296,7 +296,7 @@ static void event_invalid_cap (IRC_SERVER_REC *server, const char *data, const c
 	irc_send_cmd_now(server, "CAP END");
 }
 
-void cap_init (void)
+void irc_cap_init (void)
 {
 	signal_add_first("event cap", (SIGNAL_FUNC) event_cap);
 	signal_add_first("event 410", (SIGNAL_FUNC) event_invalid_cap);
diff --git a/src/irc/core/irc-cap.h b/src/irc/core/irc-cap.h
index df957cd2..cbfeae62 100644
--- a/src/irc/core/irc-cap.h
+++ b/src/irc/core/irc-cap.h
@@ -1,7 +1,8 @@
 #ifndef __IRC_CAP_H
 #define __IRC_CAP_H
 
-void cap_init(void);
+/* this is prefixed as to not conflict with an AIX/i function in their stdlib */
+void irc_cap_init(void);
 void cap_deinit(void);
 int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable);
 void cap_finish_negotiation (IRC_SERVER_REC *server);
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index a9221e02..ccd84027 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -119,7 +119,7 @@ void irc_core_init(void)
 	lag_init();
 	netsplit_init();
 	irc_expandos_init();
-	cap_init();
+	irc_cap_init();
 	sasl_init();
 
 	settings_check();

From 795e7ec16240613dd13e8378128bb5fa66b6dc93 Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Mon, 19 Nov 2018 14:18:34 +0000
Subject: [PATCH 0922/1650] Fix build on IBM i

	* Lots of warnings about subdirectories. Set an automake
	  option to deal with this.

	* Set an ar flag for explicit 64-bit when on IBM i, due to
	  it defaulting to 64-bit output with official gcc by default.
---
 configure.ac | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 03e05847..82af3a20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.50)
 
 AC_CONFIG_HEADERS([irssi-config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 no-define foreign])
+AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects])
 
 AM_SILENT_RULES([yes])
 
@@ -199,6 +199,12 @@ case "$host_os" in
   hpux*)
     CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
     ;;
+  os400*)
+    dnl IBM i uses ppc64 gcc by default, but binutils defaults to 32-bit. Force
+    dnl IBM binutils, and force it into ppc64 mode. This isn't set for AIX
+    dnl because gcc there defaults to ppc32.
+    AR="/usr/bin/ar -X64"
+    ;;
   *)
     ;;
 esac

From 88b16491956f0a882cc61fffa6a76d469006a87d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 25 Nov 2018 14:16:08 +0100
Subject: [PATCH 0923/1650] add keep_word setting to completion

---
 src/fe-common/core/completion.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index fd452e5c..2bc65d42 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -240,6 +240,10 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 			/* Remove all nulls (from the signal) before doing further processing */
 			complist = g_list_remove_all(g_list_first(complist), NULL);
 		}
+
+		if (settings_get_bool("completion_keep_word") && complist != NULL) {
+			complist = g_list_append(complist, g_strdup(word));
+		}
 	}
 
 	g_free(linestart);
@@ -897,6 +901,7 @@ void completion_init(void)
 
 	chat_completion_init();
 
+	settings_add_bool("completion", "completion_keep_word", TRUE);
 	command_bind("completion", NULL, (SIGNAL_FUNC) cmd_completion);
 
 	signal_add_first("complete word", (SIGNAL_FUNC) sig_complete_word);

From 10f41e067eef33e30a211279d69160b5c7721f96 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 25 Nov 2018 14:19:57 +0100
Subject: [PATCH 0924/1650] fix backward completion

---
 src/fe-common/core/completion.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 2bc65d42..29a052b3 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -229,6 +229,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 				g_list_first(complist);
 		want_space = last_want_space;
 	} else {
+		int keep_word = settings_get_bool("completion_keep_word");
 		/* get new completion list */
 		free_completions();
 
@@ -239,10 +240,17 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 		if (complist != NULL) {
 			/* Remove all nulls (from the signal) before doing further processing */
 			complist = g_list_remove_all(g_list_first(complist), NULL);
-		}
 
-		if (settings_get_bool("completion_keep_word") && complist != NULL) {
-			complist = g_list_append(complist, g_strdup(word));
+			if (keep_word) {
+				complist = g_list_append(complist, g_strdup(word));
+			}
+
+			if (backward) {
+				complist = g_list_last(complist);
+				if (keep_word) {
+					complist = complist->prev;
+				}
+			}
 		}
 	}
 

From a634b34ba48d7e050bb125d86205e58a5dc00c3d Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Sun, 25 Nov 2018 14:50:47 +0000
Subject: [PATCH 0925/1650] Rename cap_* funcs to irc_cap_*

Some systems often "namespace" cap_ for themselves, and so irssi's
usage can conflict with their own. Bump ABI for this.
---
 src/common.h               |  2 +-
 src/irc/core/irc-cap.c     | 14 +++++++-------
 src/irc/core/irc-cap.h     |  6 +++---
 src/irc/core/irc-core.c    |  2 +-
 src/irc/core/irc-servers.c |  4 ++--
 src/irc/core/sasl.c        | 10 +++++-----
 src/perl/irc/Server.xs     |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/common.h b/src/common.h
index c8fb54df..14bfe42b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 18
+#define IRSSI_ABI_VERSION 19
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 898a4a20..2d740c59 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -24,7 +24,7 @@
 #include "irc-cap.h"
 #include "irc-servers.h"
 
-int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
+int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 {
 	if (cap == NULL || *cap == '\0')
 		return FALSE;
@@ -65,7 +65,7 @@ int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 	return FALSE;
 }
 
-void cap_finish_negotiation (IRC_SERVER_REC *server)
+void irc_cap_finish_negotiation (IRC_SERVER_REC *server)
 {
 	if (server->cap_complete)
 		return;
@@ -130,7 +130,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 	}
 	/* Malformed request, terminate the negotiation */
 	else {
-		cap_finish_negotiation(server);
+		irc_cap_finish_negotiation(server);
 		g_warn_if_reached();
 		return;
 	}
@@ -177,7 +177,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		if (multiline == FALSE) {
 			/* No CAP has been requested */
 			if (server->cap_queue == NULL) {
-				cap_finish_negotiation(server);
+				irc_cap_finish_negotiation(server);
 			}
 			else {
 				cmd = g_string_new("CAP REQ :");
@@ -204,7 +204,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 					signal_emit("server cap req", 2, server, cmd->str + sizeof("CAP REQ :") - 1);
 					irc_send_cmd_now(server, cmd->str);
 				} else {
-					cap_finish_negotiation(server);
+					irc_cap_finish_negotiation(server);
 				}
 
 				g_string_free(cmd, TRUE);
@@ -233,7 +233,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		 * negotiation, unless sasl was requested. In this case we must not terminate the negotiation
 		 * until the sasl handshake is over. */
 		if (got_sasl == FALSE)
-			cap_finish_negotiation(server);
+			irc_cap_finish_negotiation(server);
 	}
 	else if (!g_ascii_strcasecmp(evt, "NAK")) {
 		g_warning("The server answered with a NAK to our CAP request, this should not happen");
@@ -302,7 +302,7 @@ void irc_cap_init (void)
 	signal_add_first("event 410", (SIGNAL_FUNC) event_invalid_cap);
 }
 
-void cap_deinit (void)
+void irc_cap_deinit (void)
 {
 	signal_remove("event cap", (SIGNAL_FUNC) event_cap);
 	signal_remove("event 410", (SIGNAL_FUNC) event_invalid_cap);
diff --git a/src/irc/core/irc-cap.h b/src/irc/core/irc-cap.h
index cbfeae62..716239e2 100644
--- a/src/irc/core/irc-cap.h
+++ b/src/irc/core/irc-cap.h
@@ -3,8 +3,8 @@
 
 /* this is prefixed as to not conflict with an AIX/i function in their stdlib */
 void irc_cap_init(void);
-void cap_deinit(void);
-int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable);
-void cap_finish_negotiation (IRC_SERVER_REC *server);
+void irc_cap_deinit(void);
+int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable);
+void irc_cap_finish_negotiation (IRC_SERVER_REC *server);
 
 #endif
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index ccd84027..950e5029 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -131,7 +131,7 @@ void irc_core_deinit(void)
 	signal_emit("chat protocol deinit", 1, chat_protocol_find("IRC"));
 
 	sasl_deinit();
-	cap_deinit();
+	irc_cap_deinit();
 	irc_expandos_deinit();
 	netsplit_deinit();
 	lag_deinit();
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 02d971dc..03c73312 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -236,9 +236,9 @@ static void server_init(IRC_SERVER_REC *server)
 	}
 
 	if (conn->sasl_mechanism != SASL_MECHANISM_NONE)
-		cap_toggle(server, "sasl", TRUE);
+		irc_cap_toggle(server, "sasl", TRUE);
 
-	cap_toggle(server, "multi-prefix", TRUE);
+	irc_cap_toggle(server, "multi-prefix", TRUE);
 
 	irc_send_cmd_now(server, "CAP LS");
 
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index b7abe748..92eb6244 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -45,7 +45,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
 {
 	/* The authentication timed out, we can't do much beside terminating it */
 	irc_send_cmd_now(server, "AUTHENTICATE *");
-	cap_finish_negotiation(server);
+	irc_cap_finish_negotiation(server);
 
 	server->sasl_timeout = 0;
 	server->sasl_success = FALSE;
@@ -96,7 +96,7 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
 	signal_emit("server sasl failure", 2, server, error);
 
 	/* Terminate the negotiation */
-	cap_finish_negotiation(server);
+	irc_cap_finish_negotiation(server);
 
 	g_free(params);
 }
@@ -110,7 +110,7 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
 	signal_emit("server sasl success", 1, server);
 
 	/* We're already authenticated, do nothing */
-	cap_finish_negotiation(server);
+	irc_cap_finish_negotiation(server);
 }
 
 static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
@@ -122,7 +122,7 @@ static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *f
 	signal_emit("server sasl success", 1, server);
 
 	/* The authentication succeeded, time to finish the CAP negotiation */
-	cap_finish_negotiation(server);
+	irc_cap_finish_negotiation(server);
 }
 
 /*
@@ -263,7 +263,7 @@ static void sasl_step_complete(IRC_SERVER_REC *server, GString *data)
 static void sasl_step_fail(IRC_SERVER_REC *server)
 {
 	irc_send_cmd_now(server, "AUTHENTICATE *");
-	cap_finish_negotiation(server);
+	irc_cap_finish_negotiation(server);
 
 	sasl_timeout_stop(server);
 
diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs
index 33417bf5..a42f5c82 100644
--- a/src/perl/irc/Server.xs
+++ b/src/perl/irc/Server.xs
@@ -155,6 +155,6 @@ irc_server_cap_toggle(server, cap, enable)
 	char *cap
 	int enable
 CODE:
-	RETVAL = cap_toggle(server, cap, enable);
+	RETVAL = irc_cap_toggle(server, cap, enable);
 OUTPUT:
 	RETVAL

From bed0a3309f4f452f5ebf6d5d5becf869da190d7a Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Sun, 25 Nov 2018 15:00:34 +0000
Subject: [PATCH 0926/1650] Revert back to using original version of the
 configure script

	* IBM i rpmbuild environments set the magic variables for
	  building w/ 64-bit binutils automatically, and one can
	  set this for themselves with `OBJECT_MODE=64` when
	  buildings. Remove this.

	* The subdir-objects change will need to be made due to
	  upstream autotools making it mandatory in the future, but
	  that isn't my decision to make.
---
 configure.ac | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 82af3a20..03e05847 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.50)
 
 AC_CONFIG_HEADERS([irssi-config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects])
+AM_INIT_AUTOMAKE([1.9 no-define foreign])
 
 AM_SILENT_RULES([yes])
 
@@ -199,12 +199,6 @@ case "$host_os" in
   hpux*)
     CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
     ;;
-  os400*)
-    dnl IBM i uses ppc64 gcc by default, but binutils defaults to 32-bit. Force
-    dnl IBM binutils, and force it into ppc64 mode. This isn't set for AIX
-    dnl because gcc there defaults to ppc32.
-    AR="/usr/bin/ar -X64"
-    ;;
   *)
     ;;
 esac

From 482a3a5bdd7bf3755c67d678b7e74f72cfbaaecb Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Mon, 26 Nov 2018 09:56:04 -0400
Subject: [PATCH 0927/1650] Remove unneeded comment

---
 src/irc/core/irc-cap.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/irc/core/irc-cap.h b/src/irc/core/irc-cap.h
index 716239e2..96efbbee 100644
--- a/src/irc/core/irc-cap.h
+++ b/src/irc/core/irc-cap.h
@@ -1,7 +1,6 @@
 #ifndef __IRC_CAP_H
 #define __IRC_CAP_H
 
-/* this is prefixed as to not conflict with an AIX/i function in their stdlib */
 void irc_cap_init(void);
 void irc_cap_deinit(void);
 int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable);

From 4f26ad74f50b6d68bee0b75d69507cb8a9c413aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 4 Dec 2018 16:03:04 +0100
Subject: [PATCH 0928/1650] Fixed problem found by Coverity Scan
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #981

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
---
 src/irc/dcc/dcc-send.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c
index 912129b7..50009287 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -425,6 +425,7 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname,
 	g_free(str);
 	if (dcc == NULL) {
 		g_warn_if_reached();
+		close(hfile);
 		return FALSE;
 	}
 

From 821e8af9fecdda2f25f18d5cc0be965b06e05362 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 7 Dec 2018 09:52:23 +0100
Subject: [PATCH 0929/1650] automake warns that subdir-objects will be enabled
 in 2.0

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 49436bf1..50c5520f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.50)
 
 AC_CONFIG_HEADERS([irssi-config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 no-define foreign])
+AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects])
 
 AM_SILENT_RULES([yes])
 

From 7e6e3cd503b3619a22709db66234cd4aeefa866f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 25 Nov 2018 13:41:46 +0100
Subject: [PATCH 0930/1650] Add escape_string_escape function for
 expand_escapes

To avoid expanding, tab completion escapes the completion list. But the
escape_string function escapes too much for the expand_escapes code. Add
a function that only escapes the backslashes.
---
 src/core/misc.c                 | 16 ++++++++++++++++
 src/core/misc.h                 |  3 +++
 src/fe-common/core/completion.c |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 27741220..bcad890d 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -757,6 +757,22 @@ char *escape_string(const char *str)
 	return ret;
 }
 
+/* Escape all '\' chars with '\' */
+char *escape_string_escape(const char *str)
+{
+	char *ret, *p;
+
+	p = ret = g_malloc(strlen(str)*2+1);
+	while (*str != '\0') {
+		if (*str == '\\')
+			*p++ = '\\';
+		*p++ = *str++;
+	}
+	*p = '\0';
+
+	return ret;
+}
+
 int nearest_power(int num)
 {
 	int n = 1;
diff --git a/src/core/misc.h b/src/core/misc.h
index a46a1432..9694819f 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -93,6 +93,9 @@ char *ascii_strdown(char *str);
 /* Escape all '"', "'" and '\' chars with '\' */
 char *escape_string(const char *str);
 
+/* Escape all '\' chars with '\' */
+char *escape_string_escape(const char *str);
+
 /* convert all low-ascii (<32) to ^<A..> combinations */
 char *show_lowascii(const char *str);
 
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index fd452e5c..02d832b0 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -256,7 +256,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 
 	/* escape if the word doesn't begin with '/' and expand_escapes are turned on */
 	data = strchr(cmdchars, *line) == NULL && expand_escapes ?
-		escape_string(complist->data) : g_strdup(complist->data);
+		escape_string_escape(complist->data) : g_strdup(complist->data);
 
 	/* word completed */
 	*pos = startpos + strlen(data);

From 35f5e5f278444ecbbd3610292d9569d3a2f51ce1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 25 Nov 2018 13:57:17 +0100
Subject: [PATCH 0931/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index c8fb54df..14bfe42b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 18
+#define IRSSI_ABI_VERSION 19
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 8c30367452dd592027917ce92bcebe9301d2c87a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 8 Jan 2019 15:48:12 +0100
Subject: [PATCH 0932/1650] rename function

---
 src/core/misc.c                 | 2 +-
 src/core/misc.h                 | 2 +-
 src/fe-common/core/completion.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index bcad890d..e1f199b2 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -758,7 +758,7 @@ char *escape_string(const char *str)
 }
 
 /* Escape all '\' chars with '\' */
-char *escape_string_escape(const char *str)
+char *escape_string_backslashes(const char *str)
 {
 	char *ret, *p;
 
diff --git a/src/core/misc.h b/src/core/misc.h
index 9694819f..1545f7a2 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -94,7 +94,7 @@ char *ascii_strdown(char *str);
 char *escape_string(const char *str);
 
 /* Escape all '\' chars with '\' */
-char *escape_string_escape(const char *str);
+char *escape_string_backslashes(const char *str);
 
 /* convert all low-ascii (<32) to ^<A..> combinations */
 char *show_lowascii(const char *str);
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 02d832b0..8a986a28 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -256,7 +256,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 
 	/* escape if the word doesn't begin with '/' and expand_escapes are turned on */
 	data = strchr(cmdchars, *line) == NULL && expand_escapes ?
-		escape_string_escape(complist->data) : g_strdup(complist->data);
+		escape_string_backslashes(complist->data) : g_strdup(complist->data);
 
 	/* word completed */
 	*pos = startpos + strlen(data);

From 3d1980599a9115c095713f1a82edf67afda64e4f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 9 Jan 2019 15:20:45 +0100
Subject: [PATCH 0933/1650] Merge tag '1.1.2' into integrate/1.1.2

---
 NEWS | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 72388af8..d6748a12 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,23 @@
-v1.2-head 2018-xx-xx  The Irssi team <staff@irssi.org>
+v1.2-head 2019-xx-xx  The Irssi team <staff@irssi.org>
+
+v1.1.2 2019-01-09 The Irssi team <staff@irssi.org>
+	- Fix the resetting of window hiddenlevel (#861)
+	- Fix clearing of hidelevel in layout (#951)
+	- Fix accessing unallocated text when checking entry position
+          (#930)
+	- Fix uninitialised memory on empty lines (#873, GL#31, #878,
+          #877, #907, #914)
+	- Fix use-after-free on expiration of hidden lines (#948)
+	- Fix use-after-frees. By Maya Rashish (#919)
+	- Fix out of bounds access in help display when window width
+          is small (#949)
+	- Fix paste_join_multiline (#971)
+	- Correctly check for errno when displaying SSL errors. By
+          Janik Rabe (#895)
+	- Fix wrong signal emission argument count (#965)
+	- Documentation (#920). Sync NEWS, scripts (#849)
+	- Fix Perl detection on MacOS. By Dominyk Tiller (#927)
+	- Misc fixes. By Jaroslav Škarvada (#982)
 
 v1.1.1 2018-02-15 The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.0.7
@@ -41,8 +60,8 @@ v1.1.0 2018-01-15 The Irssi team <staff@irssi.org>
 	* /server does not connect to servers anymore, use /server
 	  connect to change servers (#559, #649).
 	* The net_ip_compare API function is now deprecated, and the
-          previously deprecated net_connect has been removed
-          (#770). By Will Storey (#770)
+          previously deprecated net_connect has been removed. By Will
+          Storey (#770).
 	+ Add an option to ignore all channels or ignore all queries
 	  using /set activity_hide_targets. By Jari Matilainen (#612,
 	  #779)

From dfe3c31283df810b4bcdbe2d746a0b3da516689f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 9 Jan 2019 15:33:22 +0100
Subject: [PATCH 0934/1650] update issue references

---
 NEWS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index d6748a12..9da96be3 100644
--- a/NEWS
+++ b/NEWS
@@ -4,20 +4,20 @@ v1.1.2 2019-01-09 The Irssi team <staff@irssi.org>
 	- Fix the resetting of window hiddenlevel (#861)
 	- Fix clearing of hidelevel in layout (#951)
 	- Fix accessing unallocated text when checking entry position
-          (#930)
+          (#928, #930)
 	- Fix uninitialised memory on empty lines (#873, GL#31, #878,
           #877, #907, #914)
 	- Fix use-after-free on expiration of hidden lines (#948)
 	- Fix use-after-frees. By Maya Rashish (#919)
 	- Fix out of bounds access in help display when window width
           is small (#949)
-	- Fix paste_join_multiline (#971)
+	- Fix paste_join_multiline (#970, #971)
 	- Correctly check for errno when displaying SSL errors. By
           Janik Rabe (#895)
 	- Fix wrong signal emission argument count (#965)
 	- Documentation (#920). Sync NEWS, scripts (#849)
 	- Fix Perl detection on MacOS. By Dominyk Tiller (#927)
-	- Misc fixes. By Jaroslav Škarvada (#982)
+	- Misc fixes. By Jaroslav Škarvada (#981, #982)
 
 v1.1.1 2018-02-15 The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.0.7

From b8cfd9d6affc0f72a82e75a8be5207bb357c76bc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 9 Jan 2019 21:11:01 +0100
Subject: [PATCH 0935/1650] show output of git describe as PACKAGE_VERSION

also fixes GNUism in sed call
---
 utils/irssi-version.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 1fc6a558..6b3a46e4 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -18,11 +18,7 @@ if echo "${VERSION}" | grep -q -- -head; then
   # -head version, get extra details from git if we can
   git_version=$(GIT_DIR=$1/.git git describe --dirty --long --always --tags)
   if [ $? = 0 ]; then
-    new_version="$(echo "${VERSION}" | sed 's/-head//')"
-    # Because the git tag won't yet include the next release we modify the git
-    # describe output using the version defined from configure.ac.
-    version="${new_version}-$(echo "${git_version}" | sed 's/^.*-[0-9]\+-//')"
     echo "#undef PACKAGE_VERSION"
-    echo "#define PACKAGE_VERSION \"${version}\""
+    echo "#define PACKAGE_VERSION \"${git_version}\""
   fi
 fi

From b080405c6ae2e469c8718f77cf6c3e7fd17a6ac5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 9 Jan 2019 23:46:57 +0100
Subject: [PATCH 0936/1650] update sidewayssplit syntax

---
 docs/help/in/window.in               |  20 +-
 src/fe-common/core/window-commands.c |   4 +-
 src/fe-text/mainwindows.c            | 513 ++++++++++++++++-----------
 3 files changed, 306 insertions(+), 231 deletions(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index 0e7ed637..aa133766 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -35,28 +35,20 @@
     SHRINK:       %|Decrease the size of the active split window by the specified number of lines.
     SIZE:         %|Set the current split window size to the specified numer of lines.
     BALANCE:      %|Balance the heights of all split windows.
-    RGROW:        %|Increase the width of the active split window by the specified number of columns.
-    RSHRINK:      %|Decrease the wodth of the active split window by the specified number of columns.
-    RSIZE:        %|Set the current split window width to the specified numer of columns.
-    RBALANCE:     %|Balance the widths of all split windows in this line.
     HIDE:         %|Hides the current split window, or the split window specified by number or item name.
     SHOW:         %|Show the window specified by number or item name as a new split windows. It is made sticky when autostick_split_windows is turned on.
-    RSHOW:        %|Show the window specified by number or item name as a new windows split to the right of the current window. It is made sticky when autostick_split_windows is turned on.
     UP:           %|Set the split window left or above the current one active. At the top, wraps to the bottom.
-    DOWN:         %|Set the split window right or below the current one active. At the bottom, wraps to the top.
-    DUP:          %|Set the split window above the current one active. At the top, wraps to the bottom.
-    DDOWN:        %|Set the split window below the current one active. At the bottom, wraps to the top.
-    DLEFT:        %|Set the split window left to the current one active. At the left, wraps to the right.
-    DRIGHT:       %|Set the split window right to the current one active. At the right, wraps to the left.
+    DOWN:         %|Set the split window right or below the current one active. At the bottom, wraps teft.
     LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
     RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
     STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.
     MOVE LEFT:    %|Move the window to the numerically previous location inside the current sticky group.
     MOVE RIGHT:   %|Move the window to the numerically next location inside the current sticky group.
-    MOVE UP:      %|Move the current window to the sticky group of the split window above. If no sticky group remains, the split window collapses.
-    MOVE DOWN:    %|Move the current window to the sticky group of the split window below. If no sticky group remains, the split window collapses.
-    MOVE DLEFT:   %|Move the current window to the sticky group of the split window to the left. If no sticky group remains, the split window collapses.
-    MOVE DRIGHT:  %|Move the current window to the sticky group of the split window to the right. If no sticky group remains, the split window collapses.
+    MOVE UP:      %|Move the current window to the sticky group of the previous split window. If no sticky group remains, the split window collapses.
+    MOVE DOWN:    %|Move the current window to the sticky group of the next split window. If no sticky group remains, the split window collapses.
+
+    -right:       %|Makes the command work on the width instead of height, or create the split window to the right instead of top.
+    -directional: %|Set the split window in the given direction to the current one active, or move the current window to the sticky group of the split window in the given direction. (If no sticky group remains, the split window collapses.)
 
    %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 5e53957d..d9956324 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -169,7 +169,7 @@ static void cmd_window(const char *data, void *server, WI_ITEM_REC *item)
 		command_runsub("window", data, server, item);
 }
 
-/* SYNTAX: WINDOW NEW [HIDDEN|SPLIT|RSPLIT] */
+/* SYNTAX: WINDOW NEW [HIDDEN|SPLIT|-right SPLIT] */
 static void cmd_window_new(const char *data, void *server, WI_ITEM_REC *item)
 {
 	WINDOW_REC *window;
@@ -179,7 +179,7 @@ static void cmd_window_new(const char *data, void *server, WI_ITEM_REC *item)
 
 	type = (g_ascii_strncasecmp(data, "hid", 3) == 0 || g_ascii_strcasecmp(data, "tab") == 0) ? MAIN_WINDOW_TYPE_HIDDEN :
 		g_ascii_strcasecmp(data, "split") == 0 ? MAIN_WINDOW_TYPE_SPLIT :
-		g_ascii_strncasecmp(data, "rs", 2) == 0 ? MAIN_WINDOW_TYPE_RSPLIT : MAIN_WINDOW_TYPE_DEFAULT;
+		g_ascii_strncasecmp(data, "-r", 2) == 0 ? MAIN_WINDOW_TYPE_RSPLIT : MAIN_WINDOW_TYPE_DEFAULT;
 	signal_emit("gui window create override", 1, GINT_TO_POINTER(type));
 
 	window = window_create(NULL, FALSE);
diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index b01f3d04..997cdd22 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1106,7 +1106,7 @@ static void mainwindows_rresize_two(MAIN_WINDOW_REC *grow_win,
 	shrink_win->dirty = TRUE;
 }
 
-static int try_rshrink_right(MAIN_WINDOW_REC *window, int count)
+static int try_shrink_right(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
@@ -1128,7 +1128,7 @@ static int try_rshrink_right(MAIN_WINDOW_REC *window, int count)
 	return FALSE;
 }
 
-static int try_rshrink_left(MAIN_WINDOW_REC *window, int count)
+static int try_shrink_left(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *shrink_win;
 
@@ -1149,17 +1149,17 @@ static int try_rshrink_left(MAIN_WINDOW_REC *window, int count)
 	return FALSE;
 }
 
-static int mainwindow_rgrow(MAIN_WINDOW_REC *window, int count)
+static int mainwindow_grow_right(MAIN_WINDOW_REC *window, int count)
 {
-	if (!try_rshrink_right(window, count)) {
-		if (!try_rshrink_left(window, count))
+	if (!try_shrink_right(window, count)) {
+		if (!try_shrink_left(window, count))
 			return FALSE;
 	}
 
 	return TRUE;
 }
 
-static int try_rgrow_right(MAIN_WINDOW_REC *window, int count)
+static int try_grow_right(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *grow_win;
 
@@ -1174,7 +1174,7 @@ static int try_rgrow_right(MAIN_WINDOW_REC *window, int count)
 	return FALSE;
 }
 
-static int try_rgrow_left(MAIN_WINDOW_REC *window, int count)
+static int try_grow_left(MAIN_WINDOW_REC *window, int count)
 {
 	MAIN_WINDOW_REC *grow_win;
 
@@ -1189,15 +1189,15 @@ static int try_rgrow_left(MAIN_WINDOW_REC *window, int count)
 	return FALSE;
 }
 
-static int mainwindow_rshrink(MAIN_WINDOW_REC *window, int count)
+static int mainwindow_shrink_right(MAIN_WINDOW_REC *window, int count)
 {
 	g_return_val_if_fail(count >= 0, FALSE);
 
 	if (MAIN_WINDOW_TEXT_WIDTH(window)-count < NEW_WINDOW_WIDTH)
 		return FALSE;
 
-	if (!try_rgrow_right(window, count)) {
-		if (!try_rgrow_left(window, count))
+	if (!try_grow_right(window, count)) {
+		if (!try_grow_left(window, count))
 			return FALSE;
 	}
 
@@ -1220,9 +1220,9 @@ void mainwindow_set_rsize(MAIN_WINDOW_REC *window, int width)
 {
 	width -= window->width;
 	if (width < 0)
-		mainwindow_rshrink(window, -width);
+		mainwindow_shrink_right(window, -width);
 	else
-		mainwindow_rgrow(window, width);
+		mainwindow_grow_right(window, width);
 }
 
 void mainwindows_redraw_dirty(void)
@@ -1260,44 +1260,7 @@ static void mainwindow_grow_int(int count)
 	}
 }
 
-/* SYNTAX: WINDOW GROW [<lines>] */
-static void cmd_window_grow(const char *data)
-{
-	int count;
-
-	count = *data == '\0' ? 1 : atoi(data);
-
-	mainwindow_grow_int(count);
-}
-
-/* SYNTAX: WINDOW SHRINK [<lines>] */
-static void cmd_window_shrink(const char *data)
-{
-	int count;
-
-	count = *data == '\0' ? 1 : atoi(data);
-	if (count < -INT_MAX) count = -INT_MAX;
-
-	mainwindow_grow_int(-count);
-}
-
-/* SYNTAX: WINDOW SIZE <lines> */
-static void cmd_window_size(const char *data)
-{
-	int size;
-
-	if (!is_numeric(data, 0)) return;
-	size = atoi(data);
-
-	size -= WINDOW_MAIN(active_win)->height -
-		WINDOW_MAIN(active_win)->statusbar_lines;
-	if (size < -INT_MAX) size = -INT_MAX;
-
-	mainwindow_grow_int(size);
-}
-
-/* SYNTAX: WINDOW BALANCE */
-static void cmd_window_balance(void)
+static void window_balance_vertical(void)
 {
 	GSList *sorted, *stmp, *line, *ltmp;
 	int avail_size, unit_size, bigger_units;
@@ -1393,23 +1356,39 @@ static void cmd_window_hide(const char *data)
 	}
 }
 
-static void _cmd_window_show_opt(const char *data, int right)
+/* SYNTAX: WINDOW SHOW [-right] <number>|<name> */
+static void cmd_window_show(const char *data)
 {
+	GHashTable *optlist;
 	MAIN_WINDOW_REC *parent;
 	WINDOW_REC *window;
+	char *args;
+	void *free_arg;
+	int right;
 
-	if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window show", &optlist, &args))
+		return;
 
-	if (is_numeric(data, '\0')) {
-		window = window_find_refnum(atoi(data));
+	right = g_hash_table_lookup(optlist, "right") != NULL;
+
+	if (*args == '\0') {
+		cmd_params_free(free_arg);
+		cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
+
+	if (is_numeric(args, '\0')) {
+		window = window_find_refnum(atoi(args));
 		if (window == NULL) {
 			printformat_window(active_win, MSGLEVEL_CLIENTERROR,
-					   TXT_REFNUM_NOT_FOUND, data);
+					   TXT_REFNUM_NOT_FOUND, args);
 		}
 	} else {
-		window = window_find_item(active_win->active_server, data);
+		window = window_find_item(active_win->active_server, args);
 	}
 
+	cmd_params_free(free_arg);
+
 	if (window == NULL || is_window_visible(window))
 		return;
 
@@ -1437,69 +1416,103 @@ static void _cmd_window_show_opt(const char *data, int right)
 	window_set_active(window);
 }
 
-/* SYNTAX: WINDOW SHOW <number>|<name> */
-static void cmd_window_show(const char *data)
-{
-	_cmd_window_show_opt(data, FALSE);
-}
-
-/* SYNTAX: WINDOW RSHOW <number>|<name> */
-static void cmd_window_rshow(const char *data)
-{
-	_cmd_window_show_opt(data, TRUE);
-}
-
-static void window_rgrow_int(int count)
+static void mainwindow_grow_right_int(int count)
 {
 	if (count == 0) {
 		return;
 	} else if (count < 0) {
-		if (!mainwindow_rshrink(WINDOW_MAIN(active_win), -count)) {
+		if (!mainwindow_shrink_right(WINDOW_MAIN(active_win), -count)) {
 			printformat_window(active_win, MSGLEVEL_CLIENTNOTICE, TXT_WINDOW_TOO_SMALL);
 		}
 	} else {
-		if (!mainwindow_rgrow(WINDOW_MAIN(active_win), count)) {
+		if (!mainwindow_grow_right(WINDOW_MAIN(active_win), count)) {
 			printformat_window(active_win, MSGLEVEL_CLIENTNOTICE, TXT_WINDOW_TOO_SMALL);
 		}
 	}
 }
 
-/* SYNTAX: WINDOW RGROW [<columns>] */
-static void cmd_window_rgrow(const char *data)
+
+/* SYNTAX: WINDOW GROW [-right] [<lines>|<columns>] */
+static void cmd_window_grow(const char *data)
 {
+	GHashTable *optlist;
+	char *args;
+	void *free_arg;
 	int count;
 
-	count = *data == '\0' ? 1 : atoi(data);
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window grow", &optlist, &args))
+		return;
 
-	window_rgrow_int(count);
+	count = *data == '\0' ? 1 : atoi(args);
+
+	if (g_hash_table_lookup(optlist, "right") != NULL) {
+		mainwindow_grow_right_int(count);
+	} else {
+		mainwindow_grow_int(count);
+	}
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW RSHRINK [<lines>] */
-static void cmd_window_rshrink(const char *data)
+/* SYNTAX: WINDOW SHRINK [-right] [<lines>|<columns>] */
+static void cmd_window_shrink(const char *data)
 {
+	GHashTable *optlist;
+	char *args;
+	void *free_arg;
 	int count;
 
-	count = *data == '\0' ? 1 : atoi(data);
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window shrink", &optlist, &args))
+		return;
+
+	count = *data == '\0' ? 1 : atoi(args);
 	if (count < -INT_MAX) count = -INT_MAX;
 
-	window_rgrow_int(-count);
+	if (g_hash_table_lookup(optlist, "right") != NULL) {
+		mainwindow_grow_right_int(-count);
+	} else {
+		mainwindow_grow_int(-count);
+	}
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW RSIZE <columns> */
-static void cmd_window_rsize(const char *data)
+/* SYNTAX: WINDOW SIZE [-right] <lines>|<columns> */
+static void cmd_window_size(const char *data)
 {
-	int rsize;
+	GHashTable *optlist;
+	char *args;
+	void *free_arg;
+	int size;
 
-	if (!is_numeric(data, 0)) return;
-	rsize = atoi(data);
+	if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window size", &optlist, &args))
+		return;
 
-	rsize -= MAIN_WINDOW_TEXT_WIDTH(WINDOW_MAIN(active_win));
+	if (!is_numeric(args, 0)) {
+		cmd_params_free(free_arg);
+		return;
+	}
+	size = atoi(data);
 
-	window_rgrow_int(rsize);
+	if (g_hash_table_lookup(optlist, "right") != NULL) {
+		size -= MAIN_WINDOW_TEXT_WIDTH(WINDOW_MAIN(active_win));
+
+		mainwindow_grow_right_int(size);
+	} else {
+		size -= WINDOW_MAIN(active_win)->height -
+			WINDOW_MAIN(active_win)->statusbar_lines;
+		if (size < -INT_MAX) size = -INT_MAX;
+
+		mainwindow_grow_int(size);
+	}
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW RBALANCE */
-static void cmd_window_rbalance(void)
+static void window_balance_horizontal(void)
 {
 	GSList *line, *ltmp;
 	int avail_width, unit_width, bigger_units;
@@ -1537,76 +1550,76 @@ static void cmd_window_rbalance(void)
 	mainwindows_redraw();
 }
 
-/* SYNTAX: WINDOW UP */
-static void cmd_window_up(void)
+/* SYNTAX: WINDOW BALANCE [-right] */
+static void cmd_window_balance(const char *data)
 {
-	MAIN_WINDOW_REC *rec;
+	GHashTable *optlist;
+	void *free_arg;
 
-	rec = mainwindows_find_left_upper(active_mainwin);
-	if (rec == NULL)
-		rec = mainwindows_find_left_upper(NULL);
-	if (rec != NULL)
-		window_set_active(rec->active);
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window balance", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "right") != NULL) {
+		window_balance_horizontal();
+	} else {
+		window_balance_vertical();
+	}
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW DUP */
-static void cmd_window_dup(void)
+/* SYNTAX: WINDOW UP [-directional] */
+static void cmd_window_up(const char *data)
 {
 	MAIN_WINDOW_REC *rec;
+	GHashTable *optlist;
+	void *free_arg;
 
-	rec = mainwindows_find_upper(active_mainwin);
-	if (rec == NULL)
-		rec = mainwindows_find_upper(NULL);
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window up", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		rec = mainwindows_find_upper(active_mainwin);
+		if (rec == NULL)
+			rec = mainwindows_find_upper(NULL);
+	} else {
+		rec = mainwindows_find_left_upper(active_mainwin);
+		if (rec == NULL)
+			rec = mainwindows_find_left_upper(NULL);
+	}
 	if (rec != NULL)
 		window_set_active(rec->active);
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW DLEFT */
-static void cmd_window_dleft(void)
+/* SYNTAX: WINDOW DOWN [-directional] */
+static void cmd_window_down(const char *data)
 {
 	MAIN_WINDOW_REC *rec;
+	GHashTable *optlist;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window down", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		rec = mainwindows_find_lower(active_mainwin);
+		if (rec == NULL)
+			rec = mainwindows_find_lower(NULL);
+	} else {
+		rec = mainwindows_find_lower_right(active_mainwin);
+		if (rec == NULL)
+			rec = mainwindows_find_lower_right(NULL);
+	}
 
-	rec = mainwindows_find_left(active_mainwin, FALSE);
-	if (rec == NULL)
-		rec = mainwindows_find_left(active_mainwin, TRUE);
 	if (rec != NULL)
 		window_set_active(rec->active);
-}
 
-/* SYNTAX: WINDOW DOWN */
-static void cmd_window_down(void)
-{
-	MAIN_WINDOW_REC *rec;
-
-	rec = mainwindows_find_lower_right(active_mainwin);
-	if (rec == NULL)
-		rec = mainwindows_find_lower_right(NULL);
-	if (rec != NULL)
-		window_set_active(rec->active);
-}
-
-/* SYNTAX: WINDOW DDOWN */
-static void cmd_window_ddown(void)
-{
-	MAIN_WINDOW_REC *rec;
-
-	rec = mainwindows_find_lower(active_mainwin);
-	if (rec == NULL)
-		rec = mainwindows_find_lower(NULL);
-	if (rec != NULL)
-		window_set_active(rec->active);
-}
-
-/* SYNTAX: WINDOW DRIGHT */
-static void cmd_window_dright(void)
-{
-	MAIN_WINDOW_REC *rec;
-
-	rec = mainwindows_find_right(active_mainwin, FALSE);
-	if (rec == NULL)
-		rec = mainwindows_find_right(active_mainwin, TRUE);
-	if (rec != NULL)
-		window_set_active(rec->active);
+	cmd_params_free(free_arg);
 }
 
 #define WINDOW_STICKY_MATCH(window, sticky_parent) \
@@ -1658,24 +1671,62 @@ static int window_refnum_right(int refnum, int wrap)
         return refnum;
 }
 
-/* SYNTAX: WINDOW LEFT */
+/* SYNTAX: WINDOW LEFT [-directional] */
 static void cmd_window_left(const char *data, SERVER_REC *server, void *item)
 {
-	int refnum;
+	GHashTable *optlist;
+	void *free_arg;
 
-	refnum = window_refnum_left(active_win->refnum, TRUE);
-	if (refnum != -1)
-		window_set_active(window_find_refnum(refnum));
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window left", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		MAIN_WINDOW_REC *rec;
+
+		rec = mainwindows_find_left(active_mainwin, FALSE);
+		if (rec == NULL)
+			rec = mainwindows_find_left(active_mainwin, TRUE);
+		if (rec != NULL)
+			window_set_active(rec->active);
+	} else {
+		int refnum;
+
+		refnum = window_refnum_left(active_win->refnum, TRUE);
+		if (refnum != -1)
+			window_set_active(window_find_refnum(refnum));
+	}
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW RIGHT */
-static void cmd_window_right(void)
+/* SYNTAX: WINDOW RIGHT [-directional] */
+static void cmd_window_right(const char *data)
 {
-	int refnum;
+	GHashTable *optlist;
+	void *free_arg;
 
-	refnum = window_refnum_right(active_win->refnum, TRUE);
-	if (refnum != -1)
-		window_set_active(window_find_refnum(refnum));
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window right", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		MAIN_WINDOW_REC *rec;
+
+		rec = mainwindows_find_right(active_mainwin, FALSE);
+		if (rec == NULL)
+			rec = mainwindows_find_right(active_mainwin, TRUE);
+		if (rec != NULL)
+			window_set_active(rec->active);
+	} else {
+		int refnum;
+
+		refnum = window_refnum_right(active_win->refnum, TRUE);
+		if (refnum != -1)
+			window_set_active(window_find_refnum(refnum));
+	}
+
+	cmd_params_free(free_arg);
 }
 
 static void window_reparent(WINDOW_REC *win, MAIN_WINDOW_REC *mainwin)
@@ -1742,68 +1793,108 @@ static void cmd_window_stick(const char *data)
 	}
 }
 
-/* SYNTAX: WINDOW MOVE LEFT */
-static void cmd_window_move_left(void)
+/* SYNTAX: WINDOW MOVE LEFT [-directional] */
+static void cmd_window_move_left(const char *data)
 {
-	int refnum;
+	GHashTable *optlist;
+	void *free_arg;
 
-	refnum = window_refnum_left(active_win->refnum, TRUE);
-	if (refnum != -1)
-		window_set_refnum(active_win, refnum);
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window move left", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		MAIN_WINDOW_REC *rec;
+
+		rec = mainwindows_find_left(active_mainwin, FALSE);
+		if (rec == NULL)
+			rec = mainwindows_find_left(active_mainwin, TRUE);
+		if (rec != NULL)
+			window_reparent(active_win, rec);
+	} else {
+		int refnum;
+
+		refnum = window_refnum_left(active_win->refnum, TRUE);
+		if (refnum != -1)
+			window_set_refnum(active_win, refnum);
+	}
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW MOVE RIGHT */
-static void cmd_window_move_right(void)
+/* SYNTAX: WINDOW MOVE RIGHT [-directional] */
+static void cmd_window_move_right(const char *data)
 {
-	int refnum;
+	GHashTable *optlist;
+	void *free_arg;
 
-	refnum = window_refnum_right(active_win->refnum, TRUE);
-	if (refnum != -1)
-		window_set_refnum(active_win, refnum);
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window move right", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		MAIN_WINDOW_REC *rec;
+
+		rec = mainwindows_find_right(active_mainwin, FALSE);
+		if (rec == NULL)
+			rec = mainwindows_find_right(active_mainwin, TRUE);
+		if (rec != NULL)
+			window_reparent(active_win, rec);
+	} else {
+		int refnum;
+
+		refnum = window_refnum_right(active_win->refnum, TRUE);
+		if (refnum != -1)
+			window_set_refnum(active_win, refnum);
+	}
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW MOVE DLEFT */
-static void cmd_window_move_dleft(void)
+/* SYNTAX: WINDOW MOVE UP [-directional] */
+static void cmd_window_move_up(const char *data)
 {
 	MAIN_WINDOW_REC *rec;
+	GHashTable *optlist;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window move up", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		rec = mainwindows_find_upper(active_mainwin);
+	} else {
+		rec = mainwindows_find_upper_left(active_mainwin);
+	}
 
-	rec = mainwindows_find_left(active_mainwin, FALSE);
-	if (rec == NULL)
-		rec = mainwindows_find_left(active_mainwin, TRUE);
 	if (rec != NULL)
 		window_reparent(active_win, rec);
+
+	cmd_params_free(free_arg);
 }
 
-/* SYNTAX: WINDOW MOVE DRIGHT */
-static void cmd_window_move_dright(void)
+/* SYNTAX: WINDOW MOVE DOWN [-directional] */
+static void cmd_window_move_down(const char *data)
 {
 	MAIN_WINDOW_REC *rec;
+	GHashTable *optlist;
+	void *free_arg;
+
+	if (!cmd_get_params(data, &free_arg, PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
+			    "window move down", &optlist))
+		return;
+
+	if (g_hash_table_lookup(optlist, "directional") != NULL) {
+		rec = mainwindows_find_lower(active_mainwin);
+	} else {
+		rec = mainwindows_find_lower_right(active_mainwin);
+	}
 
-	rec = mainwindows_find_right(active_mainwin, FALSE);
-	if (rec == NULL)
-		rec = mainwindows_find_right(active_mainwin, TRUE);
 	if (rec != NULL)
 		window_reparent(active_win, rec);
-}
 
-/* SYNTAX: WINDOW MOVE UP */
-static void cmd_window_move_up(void)
-{
-	MAIN_WINDOW_REC *rec;
-
-	rec = mainwindows_find_upper_left(active_mainwin);
-	if (rec != NULL)
-		window_reparent(active_win, rec);
-}
-
-/* SYNTAX: WINDOW MOVE DOWN */
-static void cmd_window_move_down(void)
-{
-	MAIN_WINDOW_REC *rec;
-
-	rec = mainwindows_find_lower_right(active_mainwin);
-	if (rec != NULL)
-		window_reparent(active_win, rec);
+	cmd_params_free(free_arg);
 }
 
 static void windows_print_sticky(WINDOW_REC *win)
@@ -1866,23 +1957,26 @@ void mainwindows_init(void)
 	command_bind("window down", NULL, (SIGNAL_FUNC) cmd_window_down);
 	command_bind("window left", NULL, (SIGNAL_FUNC) cmd_window_left);
 	command_bind("window right", NULL, (SIGNAL_FUNC) cmd_window_right);
-	command_bind("window dup", NULL, (SIGNAL_FUNC) cmd_window_dup);
-	command_bind("window ddown", NULL, (SIGNAL_FUNC) cmd_window_ddown);
-	command_bind("window dleft", NULL, (SIGNAL_FUNC) cmd_window_dleft);
-	command_bind("window dright", NULL, (SIGNAL_FUNC) cmd_window_dright);
 	command_bind("window stick", NULL, (SIGNAL_FUNC) cmd_window_stick);
 	command_bind("window move left", NULL, (SIGNAL_FUNC) cmd_window_move_left);
 	command_bind("window move right", NULL, (SIGNAL_FUNC) cmd_window_move_right);
 	command_bind("window move up", NULL, (SIGNAL_FUNC) cmd_window_move_up);
 	command_bind("window move down", NULL, (SIGNAL_FUNC) cmd_window_move_down);
-	command_bind("window move dleft", NULL, (SIGNAL_FUNC) cmd_window_move_dleft);
-	command_bind("window move dright", NULL, (SIGNAL_FUNC) cmd_window_move_dright);
-	command_bind("window rgrow", NULL, (SIGNAL_FUNC) cmd_window_rgrow);
-	command_bind("window rshrink", NULL, (SIGNAL_FUNC) cmd_window_rshrink);
-	command_bind("window rsize", NULL, (SIGNAL_FUNC) cmd_window_rsize);
-	command_bind("window rbalance", NULL, (SIGNAL_FUNC) cmd_window_rbalance);
-	command_bind("window rshow", NULL, (SIGNAL_FUNC) cmd_window_rshow);
 	signal_add("window print info", (SIGNAL_FUNC) sig_window_print_info);
+
+	command_set_options("window show", "right");
+	command_set_options("window grow", "right");
+	command_set_options("window shrink", "right");
+	command_set_options("window size", "right");
+	command_set_options("window balance", "right");
+	command_set_options("window up", "directional");
+	command_set_options("window down", "directional");
+	command_set_options("window left", "directional");
+	command_set_options("window right", "directional");
+	command_set_options("window move left", "directional");
+	command_set_options("window move right", "directional");
+	command_set_options("window move up", "directional");
+	command_set_options("window move down", "directional");
 }
 
 void mainwindows_deinit(void)
@@ -1901,21 +1995,10 @@ void mainwindows_deinit(void)
 	command_unbind("window down", (SIGNAL_FUNC) cmd_window_down);
 	command_unbind("window left", (SIGNAL_FUNC) cmd_window_left);
 	command_unbind("window right", (SIGNAL_FUNC) cmd_window_right);
-	command_unbind("window dup", (SIGNAL_FUNC) cmd_window_dup);
-	command_unbind("window ddown", (SIGNAL_FUNC) cmd_window_ddown);
-	command_unbind("window dleft", (SIGNAL_FUNC) cmd_window_dleft);
-	command_unbind("window dright", (SIGNAL_FUNC) cmd_window_dright);
 	command_unbind("window stick", (SIGNAL_FUNC) cmd_window_stick);
 	command_unbind("window move left", (SIGNAL_FUNC) cmd_window_move_left);
 	command_unbind("window move right", (SIGNAL_FUNC) cmd_window_move_right);
 	command_unbind("window move up", (SIGNAL_FUNC) cmd_window_move_up);
 	command_unbind("window move down", (SIGNAL_FUNC) cmd_window_move_down);
-	command_unbind("window move dleft", (SIGNAL_FUNC) cmd_window_move_dleft);
-	command_unbind("window move dright", (SIGNAL_FUNC) cmd_window_move_dright);
-	command_unbind("window rgrow", (SIGNAL_FUNC) cmd_window_rgrow);
-	command_unbind("window rshrink", (SIGNAL_FUNC) cmd_window_rshrink);
-	command_unbind("window rsize", (SIGNAL_FUNC) cmd_window_rsize);
-	command_unbind("window rbalance", (SIGNAL_FUNC) cmd_window_rbalance);
-	command_unbind("window rshow", (SIGNAL_FUNC) cmd_window_rshow);
 	signal_remove("window print info", (SIGNAL_FUNC) sig_window_print_info);
 }

From 3af2ce8731b721616c5c112434a810bca32a62e1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 15 Jan 2019 21:00:43 +0100
Subject: [PATCH 0937/1650] add activity_hide_visible setting

---
 src/fe-text/mainwindow-activity.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fe-text/mainwindow-activity.c b/src/fe-text/mainwindow-activity.c
index 3a084110..7f7a0528 100644
--- a/src/fe-text/mainwindow-activity.c
+++ b/src/fe-text/mainwindow-activity.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include "signals.h"
+#include "settings.h"
 
 #include "gui-windows.h"
 
@@ -32,6 +33,9 @@ static void sig_activity(WINDOW_REC *window)
 	if (!is_window_visible(window) || window->data_level == 0)
 		return;
 
+	if (!settings_get_bool("activity_hide_visible"))
+		return;
+
 	window->data_level = 0;
 	g_free_and_null(window->hilight_color);
 
@@ -46,6 +50,7 @@ static void sig_activity(WINDOW_REC *window)
 
 void mainwindow_activity_init(void)
 {
+	settings_add_bool("lookandfeel", "activity_hide_visible", TRUE);
 	signal_add_first("window hilight", (SIGNAL_FUNC) sig_activity);
 	signal_add_first("window activity", (SIGNAL_FUNC) sig_activity);
 }

From f9beedd2d03b7a622e9686c71910e380fab88511 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 22 Jan 2019 15:24:52 +0100
Subject: [PATCH 0938/1650] add more config checks and assertions

---
 src/fe-text/irssi.c            |  5 +++++
 src/fe-text/statusbar-config.c | 40 +++++++++++++++++++++++++++-------
 src/lib-config/get.c           | 15 +++++++------
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 728f456e..c979e917 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -161,6 +161,7 @@ static void textui_init(void)
 
 static void textui_finish_init(void)
 {
+	int loglev;
 	quitting = FALSE;
 
 	term_refresh_freeze();
@@ -176,7 +177,10 @@ static void textui_finish_init(void)
 	mainwindow_activity_init();
 	mainwindows_layout_init();
 	gui_windows_init();
+	/* Temporarily raise the fatal level to abort on config errors. */
+	loglev = g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
 	statusbar_init();
+	g_log_set_always_fatal(loglev);
 	term_refresh_thaw();
 
 	settings_check();
@@ -319,6 +323,7 @@ int main(int argc, char **argv)
 	   you have to call setlocale(LC_ALL, "") */
 	setlocale(LC_ALL, "");
 
+	/* Temporarily raise the fatal level to abort on config errors. */
 	loglev = g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
 	textui_init();
 
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 314befaa..38372725 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -150,6 +150,9 @@ static void statusbar_read(STATUSBAR_GROUP_REC *group, CONFIG_NODE *node)
         GSList *tmp;
         const char *visible_str;
 
+	g_return_if_fail(is_node_list(node));
+	g_return_if_fail(node->key != NULL);
+
 	bar = statusbar_config_find(group, node->key);
 	if (config_node_get_bool(node, "disabled", FALSE)) {
 		/* disabled, destroy it if it already exists */
@@ -191,10 +194,26 @@ static void statusbar_read(STATUSBAR_GROUP_REC *group, CONFIG_NODE *node)
 	}
 }
 
+#define skip_corrupt_config(parent, node, index, format, ...)	\
+	if ((node)->type != NODE_TYPE_BLOCK) {			\
+		if ((node)->key == NULL) {				\
+			g_critical("Expected %s node at `.." format "/%s[%d]' was of %s type. Corrupt config?", \
+				   "block", ##__VA_ARGS__, (parent)->key, (index), \
+				   (node)->type == NODE_TYPE_LIST ? "list" : "scalar"); \
+		} else {						\
+			g_critical("Expected %s node at `.." format "/%s/%s' was of %s type. Corrupt config?", \
+				   "block", ##__VA_ARGS__, (parent)->key, (node)->key, \
+				   (node)->type == NODE_TYPE_LIST ? "list" : "scalar"); \
+		}							\
+		continue;						\
+	}								\
+
+
 static void statusbar_read_group(CONFIG_NODE *node)
 {
 	STATUSBAR_GROUP_REC *group;
 	GSList *tmp;
+	int i;
 
 	g_return_if_fail(is_node_list(node));
 
@@ -205,9 +224,11 @@ static void statusbar_read_group(CONFIG_NODE *node)
 			active_statusbar_group = group;
 	}
 
-        tmp = config_node_first(node->value);
-	for (; tmp != NULL; tmp = config_node_next(tmp))
-		statusbar_read(group, tmp->data);
+	for (tmp = config_node_first(node->value), i = 0; tmp != NULL; tmp = config_node_next(tmp), i++) {
+		CONFIG_NODE *value = tmp->data;
+		skip_corrupt_config(node, value, i, "statusbar");
+		statusbar_read(group, value);
+	}
 }
 
 static void create_root_statusbars(void)
@@ -228,17 +249,20 @@ static void create_root_statusbars(void)
 
 static void read_statusbar_config_from_node(CONFIG_NODE *node)
 {
-	CONFIG_NODE *items;
+	CONFIG_NODE *items, *group;
 	GSList *tmp;
+	int i;
 
 	items = iconfig_node_section(node, "items", -1);
 	if (items != NULL)
 		statusbar_read_items(items);
 
-        tmp = config_node_first(node->value);
-	for (; tmp != NULL; tmp = config_node_next(tmp)) {
-		if (tmp->data != items)
-			statusbar_read_group(tmp->data);
+	for (tmp = config_node_first(node->value), i = 0; tmp != NULL; tmp = config_node_next(tmp), i++) {
+		group = tmp->data;
+		if (group != items) {
+			skip_corrupt_config(node, group, i, "");
+			statusbar_read_group(group);
+		}
 	}
 }
 
diff --git a/src/lib-config/get.c b/src/lib-config/get.c
index a83686fd..ac0d0d23 100644
--- a/src/lib-config/get.c
+++ b/src/lib-config/get.c
@@ -62,20 +62,21 @@ CONFIG_NODE *config_node_section_index(CONFIG_REC *rec, CONFIG_NODE *parent, con
 			parent->value = g_slist_insert(parent->value, node, index);
 		}
 		if (!is_node_list(node)) {
-			int show_error = 0;
+			int error = 0;
 
 			if (new_type != -1) {
 				config_node_remove(rec, parent, node);
 				node = NULL;
-				show_error = 1;
+				error = 1;
 			} else if (!g_hash_table_lookup_extended(rec->cache_nodes, node, NULL, NULL)) {
 				g_hash_table_insert(rec->cache_nodes, node, NULL);
-				show_error = 1;
+				error = 1;
 			}
-			if (show_error)
-				g_critical("Expected %s node at `..%s/%s' was of scalar type. Corrupt config?",
-						   new_type == NODE_TYPE_LIST ? "list" : new_type == NODE_TYPE_BLOCK ? "block" : "section",
-						   parent->key, key);
+			if (error)
+				g_critical("Expected %s node at `%s%s/%s' was of scalar type. Corrupt config?",
+					   new_type == NODE_TYPE_LIST ? "list" : new_type == NODE_TYPE_BLOCK ? "block" : "section",
+					   parent == rec->mainnode ? "" : "..",
+					   parent->key == NULL ? "" : parent->key, key);
 		} else {
 			g_return_val_if_fail(new_type == -1 || new_type == node->type, NULL);
 			return node;

From 9f9aada83bc3baabdfe70befb78eaf02544a0c7b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 29 Jan 2019 21:33:39 +0100
Subject: [PATCH 0939/1650] do not touch uninitialised protocols on item
 restore

---
 src/fe-common/core/windows-layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index ce6b9910..77eb26f1 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -70,7 +70,7 @@ static void sig_layout_restore_item(WINDOW_REC *window, const char *type,
                 restore_win = window;
 
 		protocol = chat_protocol_find(chat_type);
-		if (protocol == NULL)
+		if (protocol == NULL || protocol->not_initialized)
 			window_bind_add(window, tag, name);
 		else if (protocol->query_create != NULL)
 			protocol->query_create(tag, name, TRUE);

From b1d6cb7f26c521d3d5f9e7da214bc91b89453a93 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 1 Feb 2019 13:18:50 +0100
Subject: [PATCH 0940/1650] add missing NULL check

---
 src/fe-common/core/fe-common-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index dc3a6f6d..d6dbf1f7 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -481,7 +481,7 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 	g_return_val_if_fail(dest != NULL, FALSE);
 	g_return_val_if_fail(dest->window != NULL, FALSE);
 
-	if (dest->target == NULL)
+	if (dest->target == NULL && dest->window->name != NULL)
 		return strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE;
 
 	item = window_item_find_window(dest->window, dest->server, dest->target);

From 5b530737d480eaac5943bcf270aa82b592e7ed3b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 2 Feb 2019 14:51:09 +0100
Subject: [PATCH 0941/1650] correct fix for #997

---
 src/fe-common/core/fe-common-core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index d6dbf1f7..15d08771 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -481,8 +481,9 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 	g_return_val_if_fail(dest != NULL, FALSE);
 	g_return_val_if_fail(dest->window != NULL, FALSE);
 
-	if (dest->target == NULL && dest->window->name != NULL)
-		return strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE;
+	if (dest->target == NULL)
+		return dest->window->name != NULL &&
+			strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE;
 
 	item = window_item_find_window(dest->window, dest->server, dest->target);
 	if (item == NULL) {

From 034752ade3b9d951c716d50d3f4d1e40fe9e110c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 4 Feb 2019 14:33:41 +0100
Subject: [PATCH 0942/1650] fix gui_input_get_extent

it was causing a free of data with [transfer=none]
---
 src/perl/textui/TextUI.xs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index 9f4fd0b0..af978162 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -158,15 +158,13 @@ gui_input_clear_extents(pos, len = 0)
 CODE:
 	gui_entry_clear_extents(active_entry, pos, len);
 
-void
+char *
 gui_input_get_extent(pos)
 	int pos
-PREINIT:
-	char *ret;
-PPCODE:
-	ret = gui_entry_get_extent(active_entry, pos);
-	XPUSHs(sv_2mortal(new_pv(ret)));
-	g_free(ret);
+CODE:
+	RETVAL = gui_entry_get_extent(active_entry, pos);
+OUTPUT:
+	RETVAL
 
 void
 gui_input_get_text_and_extents()

From 346211eeeb34e73a931b822f1496f696ed3970f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@irssi.org>
Date: Sat, 9 Feb 2019 22:42:13 +0100
Subject: [PATCH 0943/1650] Use memcpy() instead of strncpy() to silence the
 compiler warning.

---
 src/otr/otr.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/otr/otr.c b/src/otr/otr.c
index 765bc048..9f0192e1 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -621,8 +621,10 @@ static enum otr_msg_status enqueue_otr_fragment(const char *msg, struct otr_peer
 			opc->msg_size += msg_len + 1;
 		}
 
-		/* Copy msg to full message since we already have a part pending. */
-		strncpy(opc->full_msg + opc->msg_len, msg, msg_len);
+		/* Copy msg to full message since we already have a part pending. Note
+		 * that we do not copy `msg`'s trailing nul byte because we explicit
+		 * set opc->full_msg[opc->msg_len] to nul afterwards. */
+		memcpy(opc->full_msg + opc->msg_len, msg, msg_len);
 		opc->msg_len += msg_len;
 		opc->full_msg[opc->msg_len] = '\0';
 
@@ -664,7 +666,7 @@ static enum otr_msg_status enqueue_otr_fragment(const char *msg, struct otr_peer
 				return ret;
 			}
 			/* Copy full message with NULL terminated byte. */
-			strncpy(opc->full_msg, msg, msg_len);
+			memcpy(opc->full_msg, msg, msg_len);
 			opc->msg_len += msg_len;
 			opc->msg_size += ((msg_len * 2) + 1);
 			opc->full_msg[opc->msg_len] = '\0';

From 8543b874a25d0caa2c62db155346a24cdf3c2afa Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@devio.us>
Date: Wed, 30 Jan 2019 11:17:36 +0100
Subject: [PATCH 0944/1650] store type of window binds

---
 src/common.h                        | 2 +-
 src/fe-common/core/fe-windows.h     | 1 +
 src/fe-common/core/windows-layout.c | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/common.h b/src/common.h
index 14bfe42b..192e087d 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 19
+#define IRSSI_ABI_VERSION 20
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index aaa773c8..061a999a 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -22,6 +22,7 @@ enum {
 typedef struct {
 	char *servertag;
         char *name;
+	int type;
 	unsigned int sticky:1;
 } WINDOW_BIND_REC;
 
diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 77eb26f1..5aa60916 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -70,11 +70,12 @@ static void sig_layout_restore_item(WINDOW_REC *window, const char *type,
                 restore_win = window;
 
 		protocol = chat_protocol_find(chat_type);
-		if (protocol == NULL || protocol->not_initialized)
-			window_bind_add(window, tag, name);
-		else if (protocol->query_create != NULL)
+		if (protocol == NULL || protocol->not_initialized) {
+			WINDOW_BIND_REC *rec = window_bind_add(window, tag, name);
+			rec->type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY");
+		} else if (protocol->query_create != NULL) {
 			protocol->query_create(tag, name, TRUE);
-		else {
+		} else {
 			QUERY_REC *query;
 
 			query = g_new0(QUERY_REC, 1);

From 48a6d04aded516a8eead31b1e78544efb3b7e367 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 11 Feb 2019 18:04:46 +0100
Subject: [PATCH 0945/1650] run syncdocs.sh

---
 docs/design.txt | 231 +++++++++++++++++++++++-------------------------
 1 file changed, 110 insertions(+), 121 deletions(-)

diff --git a/docs/design.txt b/docs/design.txt
index 3f372829..6888f211 100644
--- a/docs/design.txt
+++ b/docs/design.txt
@@ -1,150 +1,139 @@
+Design
 
- Irssi's hierarchy is something like this:
+Irssi’s hierarchy is something like this:
+
+        sub1 sub2
+           \ /
+      xxx  IRC       COMMON ICQ  yyy
+       |    |           |    |    |
+       '----+-----:-----+----+----'
+                  |
+                 GUI (gtk/gnome, qt/kde, text, none)
+                  |
+        sub1 sub2 |
+           \ /    |
+      xxx  IRC    |  COMMON ICQ  yyy
+       '----+-----+-----+----+----'
+                  |
+              COMMON UI
+                  |
+        sub1 sub2 |
+           \ /    |
+      xxx  IRC    |    ICQ  yyy
+       |    |     |     |    |
+       '----+-----+-----+----'
+                  |
+                CORE
+                /
+       lib-config
 
 
-         sub1 sub2
-            \ /
-       xxx  IRC       COMMON ICQ  yyy
-        |____|___________|____|____|
-                   |
-                  GUI (gtk/gnome, qt/kde, text, none)
-                   |
-         sub1 sub2 |
-            \ /    |
-       xxx  IRC    |  COMMON ICQ  yyy
-        |____|_____|_____|____|____|
-                   |
-               COMMON UI
-                   |
-         sub1 sub2 |
-            \ /    |
-       xxx  IRC    |    ICQ  yyy
-        |____|_____|_____|____|
-                   |
-                 CORE
-                 /
-        lib-config
+(IRC, ICQ, xxx and yyy are chat protocols ..)
 
+(sub1 and sub2 are submodules of IRC module, like DCC and flood protect)
 
- (IRC, ICQ, xxx and yyy are chat protocols ..)
- (sub1 and sub2 are submodules of IRC module, like DCC and flood protect)
+Chat protocols and frontends are kept in separate modules. Common UI and GUI
+modules also have the common parts which don’t know anything about the chat
+protocols. This should allow implementing modules to whatever chat protocols
+and with whatever frontends easily.
 
+Signals
 
- Chat protocols and frontends are kept in separate modules. Common UI
- and GUI modules also have the common parts which don't know anything
- about the chat protocols. This should allow implementing modules to
- whatever chat protocols and with whatever frontends easily.
+Communication between different modules are done with “signals”. They are not
+related to UNIX signals in any way, you could more like think of them as
+“events” - which might be a better name for them, but I don’t really want to
+change it anymore :)
 
- ** Signals
+So, you send signal with signal_emit() and it’s sent to all modules that have
+grabbed it by calling signal_add() in their init function. For example:
 
- Communication between different modules are done with "signals". They are
- not related to UNIX signals in any way, you could more like think of them
- as "events" - which might be a better name for them, but I don't really
- want to change it anymore :)
+signal_emit("mysignal", 1, "hello");
 
- So, you send signal with signal_emit() and it's sent to all modules that
- have grabbed it by calling signal_add() in their init function. For
- example:
+Sends a “mysignal” function with one argument “hello” - before that, you should
+have grabbed the signal somewhere else with:
 
-   signal_emit("mysignal", 1, "hello");
+static void sig_mysignal(const char *arg1)
+{
+  /* arg1 contains "hello" */
+}
 
- Sends a "mysignal" function with one argument "hello" - before that, you
- should have grabbed the signal somewhere else with:
+signal_add("mysignal", (SIGNAL_FUNC) sig_mysignal);
 
-   static void sig_mysignal(const char *arg1)
-   {
-     /* arg1 contains "hello" */
-   }
+There are three different signal_add() functions which you can use to specify
+if you want to grab the signal first, “normally” or last. You can also stop the
+signal from going any further.
 
-   signal_add("mysignal", (SIGNAL_FUNC) sig_mysignal);
+Emitting signal with it’s name creates a small overhead since it has to look up
+the signal’s numeric ID first, after which it looks up the signal structure.
+This is done because if you call a signal really often, it’s faster to find it
+with it’s numeric ID instead of the string. You can use signal_get_uniq_id()
+macro to convert the signal name into ID - you’ll have to do this only once! -
+and use signal_emit_id() to emit the signal. Don’t bother to do this unless
+your signal is sent (or could be sent) several times in a second.
 
- There are three different signal_add() functions which you can use to
- specify if you want to grab the signal first, "normally" or last. You can
- also stop the signal from going any further.
+See src/core/signals.h for definition of the signal function, and signals.txt
+for a list of signals.
 
- Emitting signal with it's name creates a small overhead since it has to
- look up the signal's numeric ID first, after which it looks up the signal
- structure. This is done because if you call a signal _really_ often,
- it's faster to find it with it's numeric ID instead of the string. You
- can use signal_get_uniq_id() macro to convert the signal name into ID -
- you'll have to do this only once! - and use signal_emit_id() to emit the
- signal. Don't bother to do this unless your signal is sent (or could be
- sent) several times in a second.
+lib-config
 
- See src/core/signals.h for definition of the signal function, and
- signals.txt for a list of signals.
+Irssi depends on this for reading and saving configuration. (created by me for
+irssi)
 
+CORE module
 
- ** lib-config
+Provides some functionality that all other modules can use:
 
-   Irssi depends on this for reading and saving configuration.
-   (created by me for irssi)
+  • signal handling
+  • keeping list of settings
+  • keeping list of /commands
+  • keeping track of loaded modules
+  • networking functions (with nonblocking connects, IPv6 support)
+  • handles connecting to servers
+  • raw logging of server’s input/output data
+  • /EVAL support
+  • fgets() like function line_split() without any maximum line limits
+  • command line parameter handling
+  • miscellaneous useful little functions
+  • handles logging
 
+COMMON UI module
 
- ** CORE module
+  • knows basics about windows and window items (=channels, queries, ..)
+  • printtext() - parsing texts and feeding it for GUI to print.
+  • themes
+  • translation tables
+  • text hilighting
+  • command history
+  • user interface (/commands) for CORE’s functionality
 
- Provides some functionality that all other modules can use:
-   - signal handling
-   - keeping list of settings
-   - keeping list of /commands
-   - keeping track of loaded modules
-   - networking functions (with nonblocking connects, IPv6 support)
-   - handles connecting to servers
-   - raw logging of server's input/output data
-   - /EVAL support
-   - fgets() like function line_split() without any maximum line limits
-   - command line parameter handling
-   - miscellaneous useful little functions
-   - handles logging
+GUI modules
 
+  • all the rest of the functionality needed for a working client.
 
- ** COMMON UI module
+IRC module
 
-   - knows basics about windows and window items (=channels, queries, ..)
-   - printtext() - parsing texts and feeding it for GUI to print.
-   - themes
-   - translation tables
-   - text hilighting
-   - command history
-   - user interface (/commands) for CORE's functionality
+  • CORE
+      □ IRC specific /commands
+      □ flood protecting commands sent to server
+      □ creating IRC masks based on nick/address for bans, ignores, etc.
+      □ keeps list of channels, nicks, channel modes, bans, etc.
+      □ keeps list of servers, server settings, irc networks, server
+        reconnections and irc network splits
+      □ redirection of commands’ replies
+      □ lag detection
+      □ ctcp support and flood protection
+      □ Handles ignoring people
+  • DCC
+      □ DCC chat, send and get
+  • FLOOD
+      □ detects private or channel flooding and sends “flood” signal
+      □ automatic ignoring when flooding
+  • NOTIFYLIST
+      □ handles notifylist
 
+IRC UI module
 
- ** GUI modules
+  • placing channels and queries in windows
+  • nick completion
+  • printing infomation of some events
 
-   - all the rest of the functionality needed for a working client.
-
-
- ** IRC module
-
-   * CORE
-
-     - IRC specific /commands
-     - flood protecting commands sent to server
-     - creating IRC masks based on nick/address for bans, ignores, etc.
-     - keeps list of channels, nicks, channel modes, bans, etc.
-     - keeps list of servers, server settings, irc networks,
-       server reconnections and irc network splits
-     - redirection of commands' replies
-     - lag detection
-     - ctcp support and flood protection
-     - Handles ignoring people
-
-   * DCC
-
-     - DCC chat, send and get
-
-   * FLOOD
-
-     - detects private or channel flooding and sends "flood" signal
-     - automatic ignoring when flooding
-
-   * NOTIFYLIST
-
-     - handles notifylist
-
-
- ** IRC UI module
-
-   - placing channels and queries in windows
-   - nick completion
-   - printing infomation of some events

From 22fdb94d1b961545e8e35930512b63cf1ff83e2d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 11 Feb 2019 18:04:59 +0100
Subject: [PATCH 0946/1650] run syncscripts.sh

---
 scripts/dns.pl | 65 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/scripts/dns.pl b/scripts/dns.pl
index 989cdc3e..9e9f4789 100644
--- a/scripts/dns.pl
+++ b/scripts/dns.pl
@@ -1,16 +1,18 @@
 # /DNS <nick>|<host>|<ip> ...
-# version 2.1.1
-# 
-# updated the script to fix a bug where the script would let
-# a trailing whitespace go through (ex: tab completion)
-# - inch <inch@stmpd.net>
+#
+# v2.2
+#   add ipv6 support
+# v2.1.1
+#   updated the script to fix a bug where the script would let
+#   a trailing whitespace go through (ex: tab completion)
+#   - inch <inch@stmpd.net>
 
 use strict;
 use Socket;
 use POSIX;
 
 use vars qw($VERSION %IRSSI); 
-$VERSION = "2.1.1";
+$VERSION = "2.2";
 %IRSSI = (
     authors	=> "Timo \'cras\' Sirainen",
     contact	=> "tss\@iki.fi", 
@@ -18,7 +20,7 @@ $VERSION = "2.1.1";
     description	=> "/DNS <nick>|<host>|<ip> ...",
     license	=> "Public Domain",
     url		=> "http://irssi.org/",
-    changed	=> "2002-03-04T22:47+0100"
+    changed	=> "2019-01-24"
 );
 
 my (%resolve_hosts, %resolve_nicks, %resolve_print); # resolve queues
@@ -102,6 +104,42 @@ sub sig_userhost {
   host_lookup() if (!$lookup_waiting);
 }
 
+sub dns {
+  my ($host) =@_;
+  my %hints = (socktype => SOCK_STREAM);
+  my ($err, @res) = Socket::getaddrinfo($host, "http", \%hints);
+  my @res1;
+  if ($err ==0 ) {
+    foreach(@res) {
+      if ($_->{family}==AF_INET) {
+	my ($proto,$ip)=unpack_sockaddr_in($_->{addr});
+	push @res1, Socket::inet_ntop(AF_INET,$ip);
+      }
+      if ($_->{family}==AF_INET6) {
+	my ($proto,$ip)=unpack_sockaddr_in6($_->{addr});
+	push @res1, Socket::inet_ntop(AF_INET6,$ip);
+      }
+    }
+    return join(' ',@res1);
+  }
+}
+
+sub rdns {
+  my ($host) =@_;
+  my %hints = (socktype => SOCK_STREAM);
+  my ($err, @res) = Socket::getaddrinfo($host, "http", \%hints);
+  my @res1;
+  if ($err ==0 ) {
+    foreach(@res) {
+      my ($err, $hostname, $servicename) = Socket::getnameinfo $_->{addr};
+      if ($err ==0) {
+	push @res1, $hostname;
+      }
+    }
+    return join(' ',@res1);
+  }
+}
+
 sub host_lookup {
   return if (!%resolve_hosts);
 
@@ -145,16 +183,13 @@ sub host_lookup {
   eval {
     # child, do the lookup
     my $name = "";
-    if ($host =~ /^[0-9\.]*$/) {
+    if ($host =~ /^[0-9\.]*$/ || $host =~ m/^[0-9a-f:]*$/) {
       # ip -> host
-      $name = gethostbyaddr(inet_aton($host), AF_INET);
+      #$name = gethostbyaddr(inet_aton($host), AF_INET);
+      $name = rdns($host);
     } else {
       # host -> ip
-      my @addrs = gethostbyname($host);
-      if (@addrs) {
-	@addrs = map { inet_ntoa($_) } @addrs[4 .. $#addrs];
-	$name = join (" ", @addrs);
-      }
+      $name = dns($host);
     }
 
     $print_name = $input_query if !$print_name;
@@ -197,3 +232,5 @@ Irssi::command_bind('dns', 'cmd_dns');
 Irssi::signal_add( {
         'redir dns failure' => \&sig_failure,
         'redir dns host' => \&sig_userhost } );
+
+# vim:set sw=2 ts=8:

From bd2ff8c99c41f35430a945e888db828a9925dce7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 11 Feb 2019 18:05:57 +0100
Subject: [PATCH 0947/1650] tag as 1.2.0

---
 NEWS         | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac |  2 +-
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 9da96be3..1c109748 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,86 @@
-v1.2-head 2019-xx-xx  The Irssi team <staff@irssi.org>
+v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
+	! Contains all changes from 1.1.2
+	* Improved the /STATUSBAR commands (#858)
+	* /SET no longer shows `=' between setting and value (#886)
+	* /CUBES removed from default config (available as script)
+          (#956)
+	* /1 /2 /3 ... removed from default config (available as new
+          setting window_number_commands) (#958)
+	* Always redraw the screen on resize. By David Phillips (#896)
+	* Private notices intended for channels are now displayed on
+	  the channel (new setting notice_channel_context) (#959)
+	+ Imported the "Off-the-record" module into Irssi tree (#854,
+	  #589, #196)
+	+ Initial support for sideways split windows (#697, #431,
+	  #224, #807, FS#310, #947, #955, #989)
+	+ Change the implementation of `wcwidth'. This is used to
+	  calculate the width of emojis on your terminal screen (#917,
+	  #720)
+	+ Make the wcwidth functions available from Perl (#973):
+	      string_width(str)
+	      string_chars_for_width(str, width)
+	      wcwidth(char)
+	+ Added completion_keep_word setting (#979)
+	+ Allow activity_hide_targets to hide activity in itemless
+	  windows (#967, #997, #1001, #1003)
+	+ Added activity_hide_visible setting (#990)
+	+ Allow hiding of lines through the /IGNORE system (#901,
+	  #900, #892, #890, #884, #937)
+	+ Add window_default_hidelevel setting. By Doug Freed (#941)
+	+ Add activity_hide_window_hidelevel setting, defaulting to ON
+	  (#938)
+	+ Add autolog_only_saved_channels setting, to autolog only
+	  channels that are in the config (#968)
+	+ Add format support for the input line. By Ben Paxton,
+	  originally by Jonas Hurrelmann (#764, FS#621, #1004)
+	      use Irssi::TextUI;
+	      gui_input_set_extent(pos, text)
+	      gui_input_set_extents(pos, len, left, right)
+	      gui_input_clear_extents(pos, len)
+	      gui_input_get_extent(pos)
+	      gui_input_get_text_and_extents()
+	      gui_input_set_text_and_extents(...)
+	+ Parsing of IRCv3 CAP 3.2 (#775, #869)
+	+ Show CAP-related events in the user interface (#918, #916,
+	  #870, #704)
+	+ Continue using separators when addressing multiple nicks
+	  with tab completion. By Manish Goregaokar (#822)
+	+ Bind Shift-tab by default. By Niklas Luokkala (#830, #829)
+	+ Fuzzing more things (#913, #780, #813)
+	- Disconnect SASL properly in case the SASL module got
+          unloaded from server (#931, #629, #618, #616)
+	- Fix backward completion jumping to the first instead of last
+          word (#979)
+	- Improve empty topic handling (#961, #905, #911, #897, #888)
+	- Prevent config truncation when no space left. By dequis and
+          Lukas Waymann (#922, #925, #910, #909, #906, #871, #817)
+	- Also time-out servers in lookup phase (#866, #130)
+	- Fix build with LibreSSL 2.7. By Dorian Harmans (#865)
+	- Fix a crash when appending to a textbuffer without
+          line. Reported by Jari Matilainen (#862)
+	- Fix segfault on sending large messages (#803, #796, #802)
+	- Fix segfault on invalid statusbar config (#993, #994)
+	- Fix random memory writes on restoring queries of foreign
+          protocols (#999, #1000)
+	- Make default keybinds deletable (#859, #507)
+	- Fix freeze when resizing Irssi very small (#946)
+	- Compare channels case-insensitively, avoiding confusions
+          with the config file (#857, #856)
+	- Fix DCC GET on Android. By Martin Staron (#844)
+	- Improve rawlog performance (#957)
+	- Fix nick escaping erroneously escaping quotes (#978, #974,
+          #709)
+	- Protect against theme recursion, improve padding
+          performance, limit alignment padding. Credit to Oss-Fuzz
+          (#835, #851, #850, #846, #848)
+	- Fix recursive loop in replaces (#833, GL#23)
+	- Fix headers for compilation of C modules (#939)
+	- Documentation. By Zero King (#814). (#852)
+	- Sync NEWS, docs, scripts (#849, #855)
+	- Build system (#868, #867, #985, #988)
+	- Fix build on IBM i and AIX. By Calvin Buckley (#975)
+	- Misc fixes (#840, #839, #843, #953, #962). Tests (#806,
+          #875, #905, #964, #1011). Fuzzing (#929).
 
 v1.1.2 2019-01-09 The Irssi team <staff@irssi.org>
 	- Fix the resetting of window hiddenlevel (#861)
@@ -30,7 +112,7 @@ v1.0.7 2018-02-15 The Irssi team <staff@irssi.org>
 	- Prevent use after free error during the execution of some
 	  commands. Found by Joseph Bisch (GL#17, GL!24).
 	- Revert netsplit print optimisation due to crashes (#465, #809,
-          #812, #819, #824).
+          #812, #819, #824, #832).
 	- Fix use after free when SASL messages are received in
           unexpected order (GL#26, GL!33).
 	- Fix null pointer dereference in the tab completion when an
diff --git a/configure.ac b/configure.ac
index 50c5520f..1c48a6cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.2-head)
+AC_INIT(irssi, 1.2.0)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 63cc937e67214b1f793bc794a7d6fd9721ae2085 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 11 Feb 2019 21:40:09 +0100
Subject: [PATCH 0948/1650] continue head

---
 NEWS         | 2 ++
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1c109748..7c11b0f7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+v1.3-head 2019-xx-xx  The Irssi team <staff@irssi.org>
+
 v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.1.2
 	* Improved the /STATUSBAR commands (#858)
diff --git a/configure.ac b/configure.ac
index 1c48a6cb..e8290dfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.2.0)
+AC_INIT(irssi, 1.3-head)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

From 3664484bef20ba841c667ae6137678d5cdffa58c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 12 Feb 2019 13:28:05 +0100
Subject: [PATCH 0949/1650] do not stop autolog_ignore_targets from matching
 itemless targets

---
 src/fe-common/core/fe-common-core.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 15d08771..e47eb446 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -486,9 +486,6 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 			strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE;
 
 	item = window_item_find_window(dest->window, dest->server, dest->target);
-	if (item == NULL) {
-		return FALSE;
-	}
 
 	server_tag_len = dest->server_tag != NULL ? strlen(dest->server_tag) : 0;
 	for (tmp = array; *tmp != NULL; tmp++) {
@@ -507,11 +504,11 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 			return TRUE;
 		} else if (g_ascii_strcasecmp(str, dest->target) == 0) {
 			return TRUE;
-		} else if (item->type == query_type &&
+		} else if (item != NULL && item->type == query_type &&
 		           g_strcmp0(str, dest->target[0] == '=' ? "::dccqueries" :
 			             "::queries") == 0) {
 			return TRUE;
-		} else if (item->type == channel_type &&
+		} else if (item != NULL && item->type == channel_type &&
 			   g_strcmp0(str, "::channels") == 0) {
 			return TRUE;
 		}

From c1b604ee6a810d8ac5959b4681c0f6da0f14fde3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 12 Feb 2019 13:49:50 +0100
Subject: [PATCH 0950/1650] add issue reference

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 7c11b0f7..97cb7dbf 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
 	* Private notices intended for channels are now displayed on
 	  the channel (new setting notice_channel_context) (#959)
 	+ Imported the "Off-the-record" module into Irssi tree (#854,
-	  #589, #196)
+	  #589, #196, #881)
 	+ Initial support for sideways split windows (#697, #431,
 	  #224, #807, FS#310, #947, #955, #989)
 	+ Change the implementation of `wcwidth'. This is used to

From 80fe52cb593b1993b25ec5c197555594d5938692 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 13 Feb 2019 13:56:03 +0100
Subject: [PATCH 0951/1650] fix test on Big Endian 64bit, due to pointer size
 mismatch

---
 tests/fe-text/test-paste-join-multiline.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/fe-text/test-paste-join-multiline.c b/tests/fe-text/test-paste-join-multiline.c
index 778e19e9..8a81a9fb 100644
--- a/tests/fe-text/test-paste-join-multiline.c
+++ b/tests/fe-text/test-paste-join-multiline.c
@@ -54,7 +54,12 @@ static void test_paste_join_multiline(const paste_join_multiline_test_case *test
 	g_test_message("INPUT: \"%s\"", (t1 = g_strescape(test->input, NULL)));
 	g_free(t1);
 
-	buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, (glong *) &buffer->len);
+	{
+		glong buf_len;
+		buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, &buf_len);
+		buffer->len = buf_len;
+	}
+
 	paste_buffer_join_lines(buffer);
 	resultstr = g_ucs4_to_utf8((unichar *) buffer->data, buffer->len, NULL, NULL, NULL);
 

From e793d7af9fd45f4e97736c3681d5ba520ce232d5 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 18 Feb 2019 10:47:08 -0800
Subject: [PATCH 0952/1650] Fix indentation

---
 src/core/net-nonblock.c | 8 ++++----
 src/core/net-nonblock.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 94c53e74..40e14605 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -63,7 +63,7 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 	/* child */
 	srand(time(NULL));
 
-        memset(&rec, 0, sizeof(rec));
+	memset(&rec, 0, sizeof(rec));
 	rec.error = net_gethostbyname(addr, &rec.ip4, &rec.ip6);
 	if (rec.error == 0) {
 		errorstr = NULL;
@@ -79,7 +79,7 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 		rec.errlen = errorstr == NULL ? 0 : strlen(errorstr)+1;
 	}
 
-        g_io_channel_write_block(pipe, &rec, sizeof(rec));
+	g_io_channel_write_block(pipe, &rec, sizeof(rec));
 	if (rec.errlen != 0)
 		g_io_channel_write_block(pipe, (void *) errorstr, rec.errlen);
 	else {
@@ -129,7 +129,7 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 		/* read error string, if we can't read everything for some
 		   reason, just ignore it. */
 		rec->errorstr = g_malloc0(rec->errlen+1);
-                g_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
+		g_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
 	} else {
 		if (rec->host4) {
 			g_io_channel_read_block(pipe, &len, sizeof(int));
@@ -170,7 +170,7 @@ static void simple_init(SIMPLE_THREAD_REC *rec, GIOChannel *handle)
 	if (net_geterror(handle) != 0) {
 		/* failed */
 		g_io_channel_shutdown(handle, TRUE, NULL);
-                g_io_channel_unref(handle);
+		g_io_channel_unref(handle);
 		handle = NULL;
 	}
 
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index af5968c8..10caa4d4 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -13,7 +13,7 @@ typedef struct {
 } RESOLVED_IP_REC;
 
 typedef struct {
-        int namelen;
+	int namelen;
 	char *name;
 
 	int error;

From 2db359fbb35b93f079ee695251421efc87951a40 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 18 Feb 2019 10:52:06 -0800
Subject: [PATCH 0953/1650] Recognise non-zero as error rather than only -1

The error flag can be something other than -1 in the event of an error.
Not checking for this could lead to us to try connecting to an unknown
IP.
---
 src/core/net-nonblock.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 40e14605..64ff9c0f 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -197,8 +197,7 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, GIOChannel *pipe)
 	g_io_channel_unref(rec->pipes[1]);
 
 	ip = iprec.ip4.family != 0 ? &iprec.ip4 : &iprec.ip6;
-	handle = iprec.error == -1 ? NULL :
-		net_connect_ip(ip, rec->port, rec->my_ip);
+	handle = iprec.error ? NULL : net_connect_ip(ip, rec->port, rec->my_ip);
 
 	g_free_not_null(rec->my_ip);
 

From c25d24220fdf2763385ea6bf81458522ac5775f3 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Mon, 18 Feb 2019 11:39:45 -0800
Subject: [PATCH 0954/1650] Remove unused functions

---
 src/core/net-nonblock.c | 102 ----------------------------------------
 src/core/net-nonblock.h |  17 -------
 src/core/server-rec.h   |   2 +-
 src/irc/dcc/dcc-chat.c  |   2 +-
 4 files changed, 2 insertions(+), 121 deletions(-)

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 64ff9c0f..2aca616b 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -25,16 +25,6 @@
 #include "pidwait.h"
 #include "net-nonblock.h"
 
-typedef struct {
-	NET_CALLBACK func;
-	void *data;
-
-	GIOChannel *pipes[2];
-	int port;
-	IPADDR *my_ip;
-	int tag;
-} SIMPLE_THREAD_REC;
-
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */
 int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
@@ -146,13 +136,6 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 	return 0;
 }
 
-/* Get host name, call func when finished */
-int net_gethostbyaddr_nonblock(IPADDR *ip, NET_HOST_CALLBACK func, void *data)
-{
-	/* FIXME: not implemented */
-	return FALSE;
-}
-
 /* Kill the resolver child */
 void net_disconnect_nonblock(int pid)
 {
@@ -160,88 +143,3 @@ void net_disconnect_nonblock(int pid)
 
 	kill(pid, SIGKILL);
 }
-
-static void simple_init(SIMPLE_THREAD_REC *rec, GIOChannel *handle)
-{
-	g_return_if_fail(rec != NULL);
-
-	g_source_remove(rec->tag);
-
-	if (net_geterror(handle) != 0) {
-		/* failed */
-		g_io_channel_shutdown(handle, TRUE, NULL);
-		g_io_channel_unref(handle);
-		handle = NULL;
-	}
-
-	rec->func(handle, rec->data);
-	g_free(rec);
-}
-
-static void simple_readpipe(SIMPLE_THREAD_REC *rec, GIOChannel *pipe)
-{
-	RESOLVED_IP_REC iprec;
-	GIOChannel *handle;
-	IPADDR *ip;
-
-	g_return_if_fail(rec != NULL);
-
-	g_source_remove(rec->tag);
-
-	net_gethostbyname_return(pipe, &iprec);
-	g_free_not_null(iprec.errorstr);
-
-	g_io_channel_shutdown(rec->pipes[0], TRUE, NULL);
-	g_io_channel_unref(rec->pipes[0]);
-	g_io_channel_shutdown(rec->pipes[1], TRUE, NULL);
-	g_io_channel_unref(rec->pipes[1]);
-
-	ip = iprec.ip4.family != 0 ? &iprec.ip4 : &iprec.ip6;
-	handle = iprec.error ? NULL : net_connect_ip(ip, rec->port, rec->my_ip);
-
-	g_free_not_null(rec->my_ip);
-
-	if (handle == NULL) {
-		/* failed */
-		rec->func(NULL, rec->data);
-		g_free(rec);
-		return;
-	}
-
-	rec->tag = g_input_add(handle, G_INPUT_READ | G_INPUT_WRITE,
-			       (GInputFunction) simple_init, rec);
-}
-
-/* Connect to server, call func when finished */
-int net_connect_nonblock(const char *server, int port, const IPADDR *my_ip,
-			 NET_CALLBACK func, void *data)
-{
-	SIMPLE_THREAD_REC *rec;
-	int fd[2];
-
-	g_return_val_if_fail(server != NULL, FALSE);
-	g_return_val_if_fail(func != NULL, FALSE);
-
-	if (pipe(fd) != 0) {
-		g_warning("net_connect_nonblock(): pipe() failed.");
-		return FALSE;
-	}
-
-	rec = g_new0(SIMPLE_THREAD_REC, 1);
-	rec->port = port;
-	if (my_ip != NULL) {
-		rec->my_ip = g_malloc(sizeof(IPADDR));
-		memcpy(rec->my_ip, my_ip, sizeof(IPADDR));
-	}
-	rec->func = func;
-	rec->data = data;
-	rec->pipes[0] = g_io_channel_new(fd[0]);
-	rec->pipes[1] = g_io_channel_new(fd[1]);
-
-	/* start nonblocking host name lookup */
-	net_gethostbyname_nonblock(server, rec->pipes[1], 0);
-	rec->tag = g_input_add(rec->pipes[0], G_INPUT_READ,
-			       (GInputFunction) simple_readpipe, rec);
-
-	return TRUE;
-}
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 10caa4d4..853fcaa6 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -12,29 +12,12 @@ typedef struct {
 	char *host4, *host6; /* dito */
 } RESOLVED_IP_REC;
 
-typedef struct {
-	int namelen;
-	char *name;
-
-	int error;
-	int errlen;
-	char *errorstr;
-} RESOLVED_NAME_REC;
-
-typedef void (*NET_CALLBACK) (GIOChannel *, void *);
-typedef void (*NET_HOST_CALLBACK) (RESOLVED_NAME_REC *, void *);
-
 /* nonblocking gethostbyname(), PID of the resolver child is returned. */
 int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 			       int reverse_lookup);
-/* Get host's name, call func when finished */
-int net_gethostbyaddr_nonblock(IPADDR *ip, NET_HOST_CALLBACK func, void *data);
 /* get the resolved IP address. returns -1 if some error occurred with read() */
 int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec);
 
-/* Connect to server, call func when finished */
-int net_connect_nonblock(const char *server, int port, const IPADDR *my_ip,
-			 NET_CALLBACK func, void *data);
 /* Kill the resolver child */
 void net_disconnect_nonblock(int pid);
 
diff --git a/src/core/server-rec.h b/src/core/server-rec.h
index 69e990c6..e2dcf5ce 100644
--- a/src/core/server-rec.h
+++ b/src/core/server-rec.h
@@ -21,7 +21,7 @@ unsigned int no_reconnect:1; /* Don't reconnect to server */
 NET_SENDBUF_REC *handle;
 int readtag; /* input tag */
 
-/* for net_connect_nonblock() */
+/* for net_gethostbyname_return() */
 GIOChannel *connect_pipe[2];
 int connect_tag;
 int connect_pid;
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 88c577f7..5e03042f 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -361,7 +361,7 @@ static void dcc_chat_listen(CHAT_DCC_REC *dcc)
 	signal_emit("dcc connected", 1, dcc);
 }
 
-/* callback: DCC CHAT - net_connect_nonblock() finished */
+/* callback: DCC CHAT - connect finished */
 static void sig_chat_connected(CHAT_DCC_REC *dcc)
 {
 	g_return_if_fail(IS_DCC_CHAT(dcc));

From a37672361a72fbcb27b57cd1edf2c7463c5b1aba Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 20 Feb 2019 16:34:17 +0100
Subject: [PATCH 0955/1650] make utf8proc configurable

---
 configure.ac | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e8290dfd..9987cad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,6 +181,15 @@ AC_ARG_ENABLE(gregex,
 	fi,
 	want_gregex=yes)
 
+AC_ARG_ENABLE(utf8proc,
+[  --disable-utf8proc        Build without Julia's utf8proc],
+	if test x$enableval = xno ; then
+		want_utf8proc=no
+	else
+		want_utf8proc=yes
+	fi,
+	want_utf8proc=yes)
+
 AC_ARG_WITH(capsicum,
 [  --with-capsicum         Build with Capsicum support],
 	if test x$withval = xno; then
@@ -329,7 +338,18 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], [
 dnl **
 dnl ** utf8proc
 dnl **
-AC_CHECK_LIB([utf8proc], [utf8proc_version])
+if test "x$want_utf8proc" != "xno"; then
+	AC_CHECK_HEADER([utf8proc.h], [
+		AC_CHECK_LIB([utf8proc], [utf8proc_version], [
+			want_utf8proc=yes
+			LIBS="$LIBS -lutf8proc"
+		], [
+			want_utf8proc="no, library not found"
+		])
+	], [
+		want_utf8proc="no, library header not found"
+	])
+fi
 
 dnl **
 dnl ** curses checks
@@ -821,7 +841,7 @@ echo "Building with 64bit DCC support .. : $offt_64bit"
 echo "Building with true color support.. : $want_truecolor"
 echo "Building with GRegex ............. : $want_gregex"
 echo "Building with Capsicum ........... : $want_capsicum"
-echo "Building with utf8proc ........... : $ac_cv_lib_utf8proc_utf8proc_version"
+echo "Building with utf8proc ........... : $want_utf8proc"
 if test "x$want_otr" = "xstatic"; then
 	echo "Building with OTR support ........ : static (in irssi binary)"
 elif test "x$want_otr" = "xmodule"; then

From c61a171114e17b770a1a848003ae816156a9673d Mon Sep 17 00:00:00 2001
From: teschi <teschi+github@team23.org>
Date: Sat, 23 Feb 2019 22:19:35 +0100
Subject: [PATCH 0956/1650] allow rawlog-buffer to shrink again after lowering
 "rawlog_lines"

---
 src/core/rawlog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index e0c4dd3d..be1412c8 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -62,7 +62,7 @@ void rawlog_destroy(RAWLOG_REC *rawlog)
 /* NOTE! str must be dynamically allocated and must not be freed after! */
 static void rawlog_add(RAWLOG_REC *rawlog, char *str)
 {
-	if (rawlog->lines->length >= rawlog_lines && rawlog_lines > 0) {
+	while (rawlog->lines->length >= rawlog_lines && rawlog_lines > 0) {
 		void *tmp = g_queue_pop_head(rawlog->lines);
 		g_free(tmp);
 	}

From bc9410011482036f3c551b38087ea0e24f991067 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 8 Mar 2019 11:24:16 +0100
Subject: [PATCH 0957/1650] fix missing AC_DEFINE

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 9987cad5..066f7a07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,6 +342,7 @@ if test "x$want_utf8proc" != "xno"; then
 	AC_CHECK_HEADER([utf8proc.h], [
 		AC_CHECK_LIB([utf8proc], [utf8proc_version], [
 			want_utf8proc=yes
+			AC_DEFINE(HAVE_LIBUTF8PROC,, [Define to 1 if you have the `utf8proc' library (-lutf8proc).])
 			LIBS="$LIBS -lutf8proc"
 		], [
 			want_utf8proc="no, library not found"

From 6a2823ad3e2c79ac43d06a0316ace0d4a6744cb0 Mon Sep 17 00:00:00 2001
From: Heikki Orsila <heikki.orsila@iki.fi>
Date: Mon, 11 Mar 2019 23:06:53 +0200
Subject: [PATCH 0958/1650] Implement a method to delete messages older than
 given time in scrollback history.

The maximum age of messages is controlled by /set scrollback_max_age variable.
E.g. /set scrollback_max_age 7days
---
 src/fe-text/gui-printtext.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index f860dc1c..e47e4594 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -39,6 +39,13 @@ int mirc_colors[] = { 15, 0, 1, 2, 12, 4, 5, 6, 14, 10, 3, 11, 9, 13, 8, 7,
 	 /* 76-87 */ 217, 223, 229, 193, 157, 158, 159, 153, 147, 183, 219, 212,
 	 /* 88-98 */  16, 233, 235, 237, 239, 241, 244, 247, 250, 254, 231, -1 };
 static int scrollback_lines, scrollback_time, scrollback_burst_remove;
+/*
+ * If positive, remove lines older than scrollback_max_age seconds.
+ * Deletion is triggered by the "gui print text finished" signal (i.e. a message
+ * for the window). Note: "Day changed to" message also cause messages to be
+ * deleted within 1 day latency.
+ */
+static int scrollback_max_age;
 
 static int next_xpos, next_ypos;
 
@@ -182,9 +189,10 @@ void gui_printtext_window_border(int x, int y)
 static void remove_old_lines(TEXT_BUFFER_VIEW_REC *view)
 {
 	LINE_REC *line;
+	time_t cur_time = time(NULL);
 	time_t old_time;
 
-	old_time = time(NULL)-scrollback_time+1;
+	old_time = cur_time - scrollback_time + 1;
 	if (view->buffer->lines_count >=
 	    scrollback_lines+scrollback_burst_remove) {
                 /* remove lines by line count */
@@ -200,6 +208,21 @@ static void remove_old_lines(TEXT_BUFFER_VIEW_REC *view)
 			textbuffer_view_remove_line(view, line);
 		}
 	}
+
+	if (scrollback_max_age > 0) {
+		old_time = cur_time - scrollback_max_age;
+		while (view->buffer->lines_count > 0) {
+			line = view->buffer->first_line;
+			if (line->info.time >= old_time) {
+				/*
+				 * The first line is newer than the threshold
+				 * time -> no need to remove more lines.
+				 */
+				break;
+			}
+			textbuffer_view_remove_line(view, line);
+		}
+	}
 }
 
 static void get_colors(int flags, int *fg, int *bg, int *attr)
@@ -337,6 +360,7 @@ static void read_settings(void)
 {
 	scrollback_lines = settings_get_int("scrollback_lines");
 	scrollback_time = settings_get_time("scrollback_time")/1000;
+	scrollback_max_age = settings_get_time("scrollback_max_age")/1000;
         scrollback_burst_remove = settings_get_int("scrollback_burst_remove");
 }
 
@@ -349,6 +373,7 @@ void gui_printtext_init(void)
 
 	settings_add_int("history", "scrollback_lines", 500);
 	settings_add_time("history", "scrollback_time", "1day");
+	settings_add_time("history", "scrollback_max_age", "0");
 	settings_add_int("history", "scrollback_burst_remove", 10);
 
 	signal_add("gui print text", (SIGNAL_FUNC) sig_gui_print_text);

From 8479ff7a2e31889129e54df8e11c861eb600780a Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Fri, 22 Mar 2019 13:11:35 +0100
Subject: [PATCH 0959/1650] Remove unused parameter to /ECHO

---
 docs/help/in/echo.in                  | 3 +--
 src/fe-common/core/fe-core-commands.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/help/in/echo.in b/docs/help/in/echo.in
index 4ff23730..7f080189 100644
--- a/docs/help/in/echo.in
+++ b/docs/help/in/echo.in
@@ -5,7 +5,6 @@
 
 %9Parameters:%9
 
-    -current:    Displays the output in the active window.
     -window:     Displays the output in the target window.
     -level:      Displays the output with a given message level.
 
@@ -18,7 +17,7 @@
 %9Examples:%9
 
     /ECHO 1 + 1 = 2 :D
-    /ECHO -current Testing the ECHO command
+    /ECHO Testing the ECHO command
     /ECHO -window #irssi Special variables such as ${N} will not be expanded.
 
 %9See also:%9 CAT, EVAL, EXEC, LEVELS
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index b223db05..00c07af6 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -68,7 +68,7 @@ static const char *current_cmdline;
 static GTimeVal time_command_last, time_command_now;
 static int last_command_cmd, command_cmd;
 
-/* SYNTAX: ECHO [-current] [-window <name>] [-level <level>] <text> */
+/* SYNTAX: ECHO [-window <name>] [-level <level>] <text> */
 static void cmd_echo(const char *data, void *server, WI_ITEM_REC *item)
 {
         WINDOW_REC *window;
@@ -343,7 +343,7 @@ void fe_core_commands_init(void)
 	signal_add("error command", (SIGNAL_FUNC) event_cmderror);
 	signal_add("list subcommands", (SIGNAL_FUNC) event_list_subcommands);
 
-	command_set_options("echo", "current +level +window");
+	command_set_options("echo", "+level +window");
 }
 
 void fe_core_commands_deinit(void)

From 22502abf2cda44d5311ba2fd8424bdfd99fb04c0 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Fri, 22 Mar 2019 19:10:10 +0100
Subject: [PATCH 0960/1650] Add setting to choose between window name and
 visible name in actlist

---
 src/fe-text/statusbar-items.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 5740a40b..bd715950 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -123,7 +123,9 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 						 window->hilight_color,
 						 window->refnum);
 		if (add_name && window->active != NULL)
-			g_string_append_printf(format, ":%s", window->active->visible_name);
+			g_string_append_printf(format, ":%s",
+				settings_get_bool("actlist_prefer_window_name") &&
+				window->name != NULL ? window->name : window->active->visible_name);
 		g_string_append_c(format, '}');
 
 		value = theme_format_expand(theme, format->str);
@@ -470,6 +472,7 @@ void statusbar_items_init(void)
 	settings_add_time("misc", "lag_min_show", "1sec");
 	settings_add_str("lookandfeel", "actlist_sort", "refnum");
 	settings_add_bool("lookandfeel", "actlist_names", FALSE);
+	settings_add_bool("lookandfeel", "actlist_prefer_window_name", FALSE);
 
 	statusbar_item_register("window", NULL, item_window_active);
 	statusbar_item_register("window_empty", NULL, item_window_empty);

From 40d800637af3636f218e524025824673170f1905 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Fri, 22 Mar 2019 19:24:18 +0100
Subject: [PATCH 0961/1650] add access to set hidden_level from perl

---
 src/perl/textui/TextBufferView.xs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/perl/textui/TextBufferView.xs b/src/perl/textui/TextBufferView.xs
index 6e49e453..dc577f02 100644
--- a/src/perl/textui/TextBufferView.xs
+++ b/src/perl/textui/TextBufferView.xs
@@ -16,6 +16,11 @@ textbuffer_view_set_default_indent(view, default_indent, longword_noindent)
 CODE:
 	textbuffer_view_set_default_indent(view, default_indent, longword_noindent, NULL);
 
+void
+textbuffer_view_set_hidden_level(view, level)
+        Irssi::TextUI::TextBufferView view
+        int level
+
 void
 textbuffer_view_set_scroll(view, scroll)
 	Irssi::TextUI::TextBufferView view

From 1fe6fd8057781b3ad76b94d8dfc9429a4929dca6 Mon Sep 17 00:00:00 2001
From: "Jacob V. Rasmussen" <black@blackthorne.dk>
Date: Mon, 1 Apr 2019 13:14:58 +0200
Subject: [PATCH 0962/1650] Add tls_* options to manual

Add tls_* options to the SERVER section of the manual.
---
 docs/manual.txt | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/manual.txt b/docs/manual.txt
index db40e5d3..0f24ffe3 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -394,10 +394,26 @@
 
  5.4 Server settings
 
-	/SERVER ADD [-auto | -noauto] [-network <network>] [-host <hostname>]
+	/SERVER ADD [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+		    [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
+		    [-tls_capath <capath>] [-tls_ciphers <list>] 
+		    [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] 
+		    [-auto | -noauto] [-network <network>] [-host <hostname>]
 	            [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
 	            <address> [<port> [<password>]]
 
+	    -tls: Connects using TLS encryption.
+	    -tls_cert: The TLS client certificate file.
+	    -tls_pkey: The TLS client private key, if not included in the 
+	               certificate file.
+	    -tls_pass: The password for the TLS client private key or 
+	    	       certificate.
+	    -tls_verify: Verifies the TLS certificate of the server.
+	    -tls_cafile: The file with the list of CA certificates.
+	    -tls_capath: The directory which contains the CA certificates.
+	    -tls_ciphers: TLS cipher suite preference lists.
+	    -tls_pinned_cert: Pinned x509 certificate fingerprint.
+	    -tls_pinned_pubkey: Pinned public key fingerprint.
 	    -auto: Automatically connect to server at startup
 	    -noauto: Don't connect to server at startup (default)
 	    -network: Specify what IRC network this server belongs to

From d0bc5b8cf2361dcefc51cc98261ce1d08f1101df Mon Sep 17 00:00:00 2001
From: Jacob V Rasmussen <jvr@jma.dk>
Date: Mon, 1 Apr 2019 17:52:39 +0200
Subject: [PATCH 0963/1650] Update ssl_* to tls_* in syntax.

---
 src/fe-common/irc/fe-irc-server.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index c4435d8f..c2b9fc0f 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -51,9 +51,9 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 	return target;
 }
 
-/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
-                             [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
-                             [-ssl_ciphers <list>]
+/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>]
+                             [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>]
+                             [-tls_ciphers <list>]
                              [-auto | -noauto] [-network <network>] [-host <hostname>]
                              [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
                              <address> [<port> [<password>]] */

From 9cdeed2894abd3b76eed91a70d02510c0f840060 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Tue, 2 Apr 2019 09:39:03 +0200
Subject: [PATCH 0964/1650] cache bool value

---
 src/fe-text/statusbar-items.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index bd715950..7c86c306 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -76,7 +76,7 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 	GString *format;
 	GList *tmp;
         char *ret, *name, *value;
-        int is_det;
+        int is_det, pref_name;
 	int add_name = settings_get_bool("actlist_names");
 
 	str = g_string_new(NULL);
@@ -122,10 +122,12 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 			g_string_printf(format, "{sb_act_hilight_color %s %d",
 						 window->hilight_color,
 						 window->refnum);
+
+		pref_name = settings_get_bool("actlist_prefer_window_name");
 		if (add_name && window->active != NULL)
 			g_string_append_printf(format, ":%s",
-				settings_get_bool("actlist_prefer_window_name") &&
-				window->name != NULL ? window->name : window->active->visible_name);
+				pref_name == 1 && window->name != NULL ?
+				window->name : window->active->visible_name);
 		g_string_append_c(format, '}');
 
 		value = theme_format_expand(theme, format->str);

From c66fe616e14ac0cc54e99f35dd1fd6b9c68de9b7 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Tue, 2 Apr 2019 09:53:42 +0200
Subject: [PATCH 0965/1650] Bump ABI and add another perl api function

---
 src/common.h                      | 2 +-
 src/perl/textui/TextBufferView.xs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 192e087d..41dc192f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 20
+#define IRSSI_ABI_VERSION 21
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/perl/textui/TextBufferView.xs b/src/perl/textui/TextBufferView.xs
index dc577f02..c0dc762d 100644
--- a/src/perl/textui/TextBufferView.xs
+++ b/src/perl/textui/TextBufferView.xs
@@ -58,6 +58,11 @@ void
 textbuffer_view_remove_all_lines(view)
 	Irssi::TextUI::TextBufferView view
 
+void
+textbuffer_view_remove_lines_by_level(view, level)
+        Irssi::TextUI::TextBufferView view
+        int level
+
 void
 textbuffer_view_set_bookmark(view, name, line)
 	Irssi::TextUI::TextBufferView view

From 2f5f3429771a213d2c2d7a57faf5e62db3869746 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 3 Apr 2019 11:41:12 +0200
Subject: [PATCH 0966/1650] Add special targets to help

---
 docs/help/in/msg.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/msg.in b/docs/help/in/msg.in
index 9e0879e4..6c7dd70f 100644
--- a/docs/help/in/msg.in
+++ b/docs/help/in/msg.in
@@ -11,8 +11,13 @@
 
     The target nickname or channel and the message to send.
 
-    Use the wildcard character '*' if you want to use the active nickname or
-    channel.
+    The target can be a comma delimited list of targets, ie
+    nick1,nick2 or #chan1,#chan2
+
+    Or one of the following special targets:
+      * : Use the active nickname or channel
+      , : Last person who sent you a /msg
+      . : Last person you sent a /msg to
 
 %9Description:%9
 

From 878902761767e865855d304c00823ecea9eb2444 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 6 Apr 2019 21:52:49 +0300
Subject: [PATCH 0967/1650] Add missing NULL check in mask_match()

Fixes #902
---
 src/core/masks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/masks.c b/src/core/masks.c
index cc28b3bf..dc0064a9 100644
--- a/src/core/masks.c
+++ b/src/core/masks.c
@@ -68,7 +68,7 @@ int mask_match(SERVER_REC *server, const char *mask,
 
 	g_return_val_if_fail(server == NULL || IS_SERVER(server), FALSE);
 	g_return_val_if_fail(mask != NULL && nick != NULL &&
-			     nick != NULL && host != NULL, FALSE);
+			     user != NULL && host != NULL, FALSE);
 
 	str = !check_address(mask, &wildcards) ? (char *) nick :
 		g_strdup_printf("%s!%s@%s", nick, user, host);

From 2b48ddd3c95d94f91f7452f9e809b4dc95ac2056 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 6 Apr 2019 23:20:44 +0300
Subject: [PATCH 0968/1650] Move NULL check for cert above pubkey

This patch was originally proposed by Chi Li.

Fixes #944
---
 src/core/network-openssl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 95697135..265d3574 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -854,14 +854,13 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	}
 
 	cert = SSL_get_peer_certificate(chan->ssl);
-	pubkey = X509_get_X509_PUBKEY(cert);
-
 	if (cert == NULL) {
 		g_warning("TLS server supplied no certificate");
 		ret = 0;
 		goto done;
 	}
 
+	pubkey = X509_get_X509_PUBKEY(cert);
 	if (pubkey == NULL) {
 		g_warning("TLS server supplied no certificate public key");
 		ret = 0;

From 530393140a67400de34a7636cfd8c641adb7c44a Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 6 Apr 2019 22:59:17 +0300
Subject: [PATCH 0969/1650] Check return value of BIO_read() in
 set_pubkey_info()

Fixes #943
---
 src/core/network-openssl.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 265d3574..eec725fa 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -601,18 +601,19 @@ static void set_cipher_info(TLS_REC *tls, SSL *ssl)
 	tls_rec_set_cipher_size(tls, SSL_get_cipher_bits(ssl, NULL));
 }
 
-static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_fingerprint, size_t cert_fingerprint_size, unsigned char *public_key_fingerprint, size_t public_key_fingerprint_size)
+static gboolean set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_fingerprint, size_t cert_fingerprint_size, unsigned char *public_key_fingerprint, size_t public_key_fingerprint_size)
 {
+	gboolean ret = TRUE;
 	EVP_PKEY *pubkey = NULL;
 	char *cert_fingerprint_hex = NULL;
 	char *public_key_fingerprint_hex = NULL;
 
 	BIO *bio = NULL;
 	char buffer[128];
-	size_t length;
+	ssize_t length;
 
-	g_return_if_fail(tls != NULL);
-	g_return_if_fail(cert != NULL);
+	g_return_val_if_fail(tls != NULL, FALSE);
+	g_return_val_if_fail(cert != NULL, FALSE);
 
 	pubkey = X509_get_pubkey(cert);
 
@@ -648,6 +649,11 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
 	bio = BIO_new(BIO_s_mem());
 	ASN1_TIME_print(bio, X509_get_notBefore(cert));
 	length = BIO_read(bio, buffer, sizeof(buffer));
+	if (length < 0) {
+		ret = FALSE;
+		BIO_free(bio);
+		goto done;
+	}
 	buffer[length] = '\0';
 	BIO_free(bio);
 	tls_rec_set_not_before(tls, buffer);
@@ -656,13 +662,21 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
 	bio = BIO_new(BIO_s_mem());
 	ASN1_TIME_print(bio, X509_get_notAfter(cert));
 	length = BIO_read(bio, buffer, sizeof(buffer));
+	if (length < 0) {
+		ret = FALSE;
+		BIO_free(bio);
+		goto done;
+	}
 	buffer[length] = '\0';
 	BIO_free(bio);
 	tls_rec_set_not_after(tls, buffer);
 
+done:
 	g_free(cert_fingerprint_hex);
 	g_free(public_key_fingerprint_hex);
 	EVP_PKEY_free(pubkey);
+
+	return ret;
 }
 
 static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
@@ -881,7 +895,11 @@ int irssi_ssl_handshake(GIOChannel *handle)
 
 	tls = tls_create_rec();
 	set_cipher_info(tls, chan->ssl);
-	set_pubkey_info(tls, cert, cert_fingerprint, cert_fingerprint_size, pubkey_fingerprint, pubkey_fingerprint_size);
+	if (! set_pubkey_info(tls, cert, cert_fingerprint, cert_fingerprint_size, pubkey_fingerprint, pubkey_fingerprint_size)) {
+		g_warning("Couldn't set pubkey information");
+		ret = 0;
+		goto done;
+	}
 	set_peer_cert_chain_info(tls, chan->ssl);
 	set_server_temporary_key_info(tls, chan->ssl);
 

From 9d9d99eeb1c07decbe164cc18e02383f35f19689 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 8 Apr 2019 12:32:58 +0200
Subject: [PATCH 0970/1650] move caching to correct place :)

---
 src/fe-text/statusbar-items.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 7c86c306..27efcbd1 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -76,8 +76,9 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 	GString *format;
 	GList *tmp;
         char *ret, *name, *value;
-        int is_det, pref_name;
+        int is_det;
 	int add_name = settings_get_bool("actlist_names");
+	int pref_name = settings_get_bool("actlist_prefer_window_name");
 
 	str = g_string_new(NULL);
 	format = g_string_new(NULL);
@@ -123,7 +124,6 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 						 window->hilight_color,
 						 window->refnum);
 
-		pref_name = settings_get_bool("actlist_prefer_window_name");
 		if (add_name && window->active != NULL)
 			g_string_append_printf(format, ":%s",
 				pref_name == 1 && window->name != NULL ?

From ad3b8df97e10ad38c685a2095fe0c77cc5dee4aa Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 27 Mar 2019 18:29:38 +0100
Subject: [PATCH 0971/1650] Add Github Actions support code

---
 .github/actions.yml   | 43 +++++++++++++++++++++++++++++++++++++++++++
 .github/main.workflow | 27 +++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 .github/actions.yml
 create mode 100644 .github/main.workflow

diff --git a/.github/actions.yml b/.github/actions.yml
new file mode 100644
index 00000000..ae47fbde
--- /dev/null
+++ b/.github/actions.yml
@@ -0,0 +1,43 @@
+before_install:
+    - ./autogen.sh --with-proxy=module --with-bot --with-perl=module --with-otr=module
+    - make dist
+    - CO_DIR=$(pwd)
+    - mkdir -p $HOME/src
+    - cd $HOME/src
+    - tar xaf $CO_DIR/irssi-*.tar.*
+
+install:
+    - cd $HOME/src/irssi-*
+    - ./configure --with-proxy=module --with-bot --with-perl=module --with-otr=module --prefix=$HOME/irssi-build --enable-always-build-tests
+    - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
+    - make install
+
+unit_tests:
+    - cd $HOME/src/irssi-*
+    - make -C tests -sk check
+
+after_unit_tests:
+    - cd $HOME/src/irssi-*
+    - find -name test-suite.log -exec cat {} +
+
+before_script:
+    - cd $HOME
+    - mkdir irssi-test
+    - |
+      echo 'echo automated irssi launch test
+      ^set settings_autosave off
+      ^set -clear log_close_string
+      ^set -clear log_day_changed
+      ^set -clear log_open_string
+      ^set log_timestamp * 
+      ^window log on' > irssi-test/startup
+    - echo load perl >> irssi-test/startup
+    - echo load proxy >> irssi-test/startup
+    - echo ^quit >> irssi-test/startup
+
+script:
+    - cd $HOME
+    - irssi-build/bin/irssi --home irssi-test | /tools/render.pl
+
+after_script:
+    - cat $HOME/irc.log.*
diff --git a/.github/main.workflow b/.github/main.workflow
new file mode 100644
index 00000000..0db7e7a1
--- /dev/null
+++ b/.github/main.workflow
@@ -0,0 +1,27 @@
+workflow "Check Irssi" {
+  on = "push"
+  resolves = [
+    "script",
+    "unit_tests",
+  ]
+}
+
+action "install" {
+  uses = "irssi-import/actions-irssi/check-irssi@master"
+  args = "before_install install"
+}
+
+action "script" {
+  uses = "irssi-import/actions-irssi/check-irssi@master"
+  needs = ["install"]
+  args = "before_script script after_script"
+  env = {
+    TERM = "xterm"
+  }
+}
+
+action "unit_tests" {
+  uses = "irssi-import/actions-irssi/check-irssi@master"
+  needs = ["install"]
+  args = "unit_tests after_unit_tests"
+}

From da266691bb8a3a10c239726b0fa2e4caf98fa0bf Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 24 Apr 2019 13:30:38 +0200
Subject: [PATCH 0972/1650] disable github workflows

---
 .github/main.workflow | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/main.workflow b/.github/main.workflow
index 0db7e7a1..18a6088c 100644
--- a/.github/main.workflow
+++ b/.github/main.workflow
@@ -1,10 +1,10 @@
-workflow "Check Irssi" {
-  on = "push"
-  resolves = [
-    "script",
-    "unit_tests",
-  ]
-}
+# workflow "Check Irssi" {
+#   on = "push"
+#   resolves = [
+#     "script",
+#     "unit_tests",
+#   ]
+# }
 
 action "install" {
   uses = "irssi-import/actions-irssi/check-irssi@master"

From 7e6e1f2e10029d963033a91a54cc19e37d78ac0d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 May 2019 16:33:47 +0200
Subject: [PATCH 0973/1650] Use full paths to includes

---
 configure.ac                                  |  7 +++
 src/common.h                                  |  4 +-
 src/core/Makefile.am                          |  2 -
 src/core/args.c                               |  2 +-
 src/core/capsicum.c                           | 16 +++---
 src/core/channel-rec.h                        |  2 +-
 src/core/channels-setup.c                     | 14 +++---
 src/core/channels-setup.h                     |  4 +-
 src/core/channels.c                           | 14 +++---
 src/core/channels.h                           |  4 +-
 src/core/chat-commands.c                      | 26 +++++-----
 src/core/chat-protocols.c                     | 14 +++---
 src/core/chatnets.c                           | 16 +++---
 src/core/chatnets.h                           |  4 +-
 src/core/commands.c                           | 18 +++----
 src/core/commands.h                           |  2 +-
 src/core/core.c                               | 44 ++++++++--------
 src/core/core.h                               |  2 +-
 src/core/expandos.c                           | 24 ++++-----
 src/core/expandos.h                           |  2 +-
 src/core/ignore.c                             | 24 ++++-----
 src/core/ignore.h                             |  2 +-
 src/core/iregex-gregex.c                      |  2 +-
 src/core/iregex-regexh.c                      |  2 +-
 src/core/iregex.h                             |  2 +-
 src/core/levels.c                             |  2 +-
 src/core/line-split.c                         |  2 +-
 src/core/log-away.c                           | 12 ++---
 src/core/log.c                                | 20 ++++----
 src/core/masks.c                              |  6 +--
 src/core/misc.c                               |  4 +-
 src/core/module.h                             |  2 +-
 src/core/modules-load.c                       | 12 ++---
 src/core/modules-load.h                       |  2 +-
 src/core/modules.c                            |  4 +-
 src/core/net-disconnect.c                     |  2 +-
 src/core/net-nonblock.c                       |  4 +-
 src/core/net-nonblock.h                       |  2 +-
 src/core/net-sendbuffer.c                     |  6 +--
 src/core/network-openssl.c                    | 14 +++---
 src/core/network.c                            |  4 +-
 src/core/nicklist.c                           | 12 ++---
 src/core/nicklist.h                           |  2 +-
 src/core/nickmatch-cache.c                    |  8 +--
 src/core/pidwait.c                            |  4 +-
 src/core/queries.c                            |  8 +--
 src/core/queries.h                            |  4 +-
 src/core/query-rec.h                          |  2 +-
 src/core/rawlog.c                             | 20 ++++----
 src/core/recode.c                             | 10 ++--
 src/core/servers-reconnect.c                  | 16 +++---
 src/core/servers-setup.c                      | 16 +++---
 src/core/servers-setup.h                      |  4 +-
 src/core/servers.c                            | 28 +++++------
 src/core/servers.h                            |  6 +--
 src/core/session.c                            | 24 ++++-----
 src/core/settings.c                           | 14 +++---
 src/core/signals.c                            |  4 +-
 src/core/special-vars.c                       | 14 +++---
 src/core/special-vars.h                       |  2 +-
 src/core/tls.c                                |  2 +-
 src/core/utf8.c                               |  4 +-
 src/core/wcwidth-wrapper.c                    |  6 +--
 src/core/wcwidth.c                            |  2 +-
 src/core/window-item-def.h                    |  2 +-
 src/core/write-buffer.c                       |  8 +--
 src/fe-common/core/Makefile.am                |  1 -
 src/fe-common/core/chat-completion.c          | 32 ++++++------
 src/fe-common/core/command-history.c          | 14 +++---
 src/fe-common/core/command-history.h          |  2 +-
 src/fe-common/core/completion.c               | 18 +++----
 src/fe-common/core/completion.h               |  2 +-
 src/fe-common/core/fe-capsicum.c              | 10 ++--
 src/fe-common/core/fe-channels.c              | 38 +++++++-------
 src/fe-common/core/fe-common-core.c           | 50 +++++++++----------
 src/fe-common/core/fe-core-commands.c         | 24 ++++-----
 src/fe-common/core/fe-exec.c                  | 32 ++++++------
 src/fe-common/core/fe-exec.h                  |  4 +-
 src/fe-common/core/fe-expandos.c              |  4 +-
 src/fe-common/core/fe-help.c                  | 14 +++---
 src/fe-common/core/fe-ignore-messages.c       |  8 +--
 src/fe-common/core/fe-ignore.c                | 16 +++---
 src/fe-common/core/fe-log.c                   | 40 +++++++--------
 src/fe-common/core/fe-messages.c              | 30 +++++------
 src/fe-common/core/fe-modules.c               | 16 +++---
 src/fe-common/core/fe-queries.c               | 26 +++++-----
 src/fe-common/core/fe-queries.h               |  2 +-
 src/fe-common/core/fe-recode.c                | 18 +++----
 src/fe-common/core/fe-server.c                | 24 ++++-----
 src/fe-common/core/fe-settings.c              | 22 ++++----
 src/fe-common/core/fe-tls.c                   | 14 +++---
 src/fe-common/core/fe-windows.c               | 22 ++++----
 src/fe-common/core/fe-windows.h               |  4 +-
 src/fe-common/core/formats.c                  | 26 +++++-----
 src/fe-common/core/formats.h                  |  4 +-
 src/fe-common/core/hilight-text.c             | 30 +++++------
 src/fe-common/core/hilight-text.h             |  4 +-
 src/fe-common/core/keyboard.c                 | 20 ++++----
 src/fe-common/core/keyboard.h                 |  2 +-
 src/fe-common/core/module-formats.c           |  2 +-
 src/fe-common/core/module-formats.h           |  2 +-
 src/fe-common/core/module.h                   |  4 +-
 src/fe-common/core/printtext.c                | 20 ++++----
 src/fe-common/core/printtext.h                |  4 +-
 src/fe-common/core/themes.c                   | 20 ++++----
 src/fe-common/core/window-activity.c          | 24 ++++-----
 src/fe-common/core/window-commands.c          | 26 +++++-----
 src/fe-common/core/window-items.c             | 20 ++++----
 src/fe-common/core/window-items.h             |  2 +-
 src/fe-common/core/windows-layout.c           | 28 +++++------
 src/fe-common/irc/Makefile.am                 |  4 --
 src/fe-common/irc/dcc/Makefile.am             |  5 --
 src/fe-common/irc/dcc/fe-dcc-chat-messages.c  | 16 +++---
 src/fe-common/irc/dcc/fe-dcc-chat.c           | 26 +++++-----
 src/fe-common/irc/dcc/fe-dcc-get.c            | 18 +++----
 src/fe-common/irc/dcc/fe-dcc-send.c           | 22 ++++----
 src/fe-common/irc/dcc/fe-dcc-server.c         | 16 +++---
 src/fe-common/irc/dcc/fe-dcc.c                | 24 ++++-----
 src/fe-common/irc/dcc/module-formats.c        |  2 +-
 src/fe-common/irc/dcc/module-formats.h        |  2 +-
 src/fe-common/irc/dcc/module.h                |  4 +-
 src/fe-common/irc/fe-cap.c                    | 12 ++---
 src/fe-common/irc/fe-common-irc.c             | 18 +++----
 src/fe-common/irc/fe-ctcp.c                   | 22 ++++----
 src/fe-common/irc/fe-events-numeric.c         | 28 +++++------
 src/fe-common/irc/fe-events.c                 | 40 +++++++--------
 src/fe-common/irc/fe-irc-channels.c           | 18 +++----
 src/fe-common/irc/fe-irc-commands.c           | 36 ++++++-------
 src/fe-common/irc/fe-irc-messages.c           | 32 ++++++------
 src/fe-common/irc/fe-irc-queries.c            | 10 ++--
 src/fe-common/irc/fe-irc-server.c             | 26 +++++-----
 src/fe-common/irc/fe-ircnet.c                 | 22 ++++----
 src/fe-common/irc/fe-modes.c                  | 20 ++++----
 src/fe-common/irc/fe-netjoin.c                | 20 ++++----
 src/fe-common/irc/fe-netsplit.c               | 18 +++----
 src/fe-common/irc/fe-sasl.c                   | 16 +++---
 src/fe-common/irc/fe-whois.c                  | 16 +++---
 src/fe-common/irc/irc-completion.c            |  4 +-
 src/fe-common/irc/module-formats.c            |  2 +-
 src/fe-common/irc/module-formats.h            |  2 +-
 src/fe-common/irc/module.h                    |  4 +-
 src/fe-common/irc/notifylist/Makefile.am      |  4 --
 src/fe-common/irc/notifylist/fe-notifylist.c  | 26 +++++-----
 src/fe-common/irc/notifylist/module-formats.c |  2 +-
 src/fe-common/irc/notifylist/module-formats.h |  2 +-
 src/fe-common/irc/notifylist/module.h         |  4 +-
 src/fe-fuzz/Makefile.am                       |  4 --
 src/fe-fuzz/fe-common/core/Makefile.am        |  4 --
 src/fe-fuzz/irc/core/Makefile.am              |  4 --
 src/fe-none/Makefile.am                       |  3 --
 src/fe-none/irssi.c                           | 10 ++--
 src/fe-none/module.h                          |  2 +-
 src/fe-text/Makefile.am                       |  3 --
 src/fe-text/gui-entry.c                       | 14 +++---
 src/fe-text/gui-expandos.c                    |  6 +--
 src/fe-text/gui-printtext.c                   | 16 +++---
 src/fe-text/gui-printtext.h                   |  6 +--
 src/fe-text/gui-readline.c                    | 30 +++++------
 src/fe-text/gui-windows.c                     | 18 +++----
 src/fe-text/gui-windows.h                     |  4 +-
 src/fe-text/irssi.c                           | 42 ++++++++--------
 src/fe-text/lastlog.c                         | 18 +++----
 src/fe-text/mainwindow-activity.c             |  6 +--
 src/fe-text/mainwindows-layout.c              | 16 +++---
 src/fe-text/mainwindows.c                     | 18 +++----
 src/fe-text/mainwindows.h                     |  4 +-
 src/fe-text/module-formats.c                  |  2 +-
 src/fe-text/module-formats.h                  |  2 +-
 src/fe-text/module.h                          |  4 +-
 src/fe-text/statusbar-config.c                | 18 +++----
 src/fe-text/statusbar-config.h                |  2 +-
 src/fe-text/statusbar-items.c                 | 14 +++---
 src/fe-text/statusbar.c                       | 16 +++---
 src/fe-text/statusbar.h                       |  4 +-
 src/fe-text/term-terminfo.c                   | 12 ++---
 src/fe-text/term.c                            | 10 ++--
 src/fe-text/term.h                            |  2 +-
 src/fe-text/terminfo-core.c                   |  4 +-
 src/fe-text/textbuffer-commands.c             | 18 +++----
 src/fe-text/textbuffer-view.c                 |  6 +--
 src/fe-text/textbuffer-view.h                 |  4 +-
 src/fe-text/textbuffer.c                      | 10 ++--
 src/irc/core/Makefile.am                      |  2 -
 src/irc/core/bans.c                           | 20 ++++----
 src/irc/core/channel-events.c                 | 16 +++---
 src/irc/core/channel-events.h                 |  2 +-
 src/irc/core/channel-rejoin.c                 | 14 +++---
 src/irc/core/channels-query.c                 | 18 +++----
 src/irc/core/ctcp.c                           | 18 +++----
 src/irc/core/irc-cap.c                        |  8 +--
 src/irc/core/irc-channels-setup.c             |  4 +-
 src/irc/core/irc-channels.c                   | 22 ++++----
 src/irc/core/irc-channels.h                   |  6 +--
 src/irc/core/irc-chatnets.c                   |  8 +--
 src/irc/core/irc-chatnets.h                   |  6 +--
 src/irc/core/irc-commands.c                   | 28 +++++------
 src/irc/core/irc-commands.h                   |  2 +-
 src/irc/core/irc-core.c                       | 26 +++++-----
 src/irc/core/irc-expandos.c                   | 12 ++---
 src/irc/core/irc-masks.c                      |  4 +-
 src/irc/core/irc-masks.h                      |  2 +-
 src/irc/core/irc-nicklist.c                   | 16 +++---
 src/irc/core/irc-nicklist.h                   |  2 +-
 src/irc/core/irc-queries.c                    | 10 ++--
 src/irc/core/irc-queries.h                    |  4 +-
 src/irc/core/irc-servers-reconnect.c          | 12 ++---
 src/irc/core/irc-servers-setup.c              | 18 +++----
 src/irc/core/irc-servers-setup.h              |  6 +--
 src/irc/core/irc-servers.c                    | 40 +++++++--------
 src/irc/core/irc-servers.h                    | 10 ++--
 src/irc/core/irc-session.c                    | 16 +++---
 src/irc/core/irc.c                            | 16 +++---
 src/irc/core/irc.h                            |  2 +-
 src/irc/core/lag.c                            | 10 ++--
 src/irc/core/massjoin.c                       | 10 ++--
 src/irc/core/mode-lists.c                     | 10 ++--
 src/irc/core/modes.c                          | 18 +++----
 src/irc/core/modes.h                          |  4 +-
 src/irc/core/module.h                         |  4 +-
 src/irc/core/netsplit.c                       | 12 ++---
 src/irc/core/netsplit.h                       |  2 +-
 src/irc/core/sasl.c                           | 10 ++--
 src/irc/core/servers-idle.c                   |  8 +--
 src/irc/core/servers-redirect.c               | 10 ++--
 src/irc/dcc/Makefile.am                       |  3 --
 src/irc/dcc/dcc-autoget.c                     | 12 ++---
 src/irc/dcc/dcc-chat.c                        | 22 ++++----
 src/irc/dcc/dcc-chat.h                        |  4 +-
 src/irc/dcc/dcc-file-rec.h                    |  2 +-
 src/irc/dcc/dcc-file.h                        |  4 +-
 src/irc/dcc/dcc-get.c                         | 18 +++----
 src/irc/dcc/dcc-get.h                         |  4 +-
 src/irc/dcc/dcc-queue.c                       | 16 +++---
 src/irc/dcc/dcc-queue.h                       |  2 +-
 src/irc/dcc/dcc-resume.c                      | 16 +++---
 src/irc/dcc/dcc-send.c                        | 20 ++++----
 src/irc/dcc/dcc-send.h                        |  4 +-
 src/irc/dcc/dcc-server.c                      | 18 +++----
 src/irc/dcc/dcc-server.h                      |  4 +-
 src/irc/dcc/dcc.c                             | 26 +++++-----
 src/irc/dcc/dcc.h                             |  6 +--
 src/irc/dcc/module.h                          |  4 +-
 src/irc/flood/Makefile.am                     |  3 --
 src/irc/flood/autoignore.c                    | 16 +++---
 src/irc/flood/flood.c                         | 16 +++---
 src/irc/flood/module.h                        |  4 +-
 src/irc/notifylist/Makefile.am                |  3 --
 src/irc/notifylist/module.h                   |  6 +--
 src/irc/notifylist/notify-commands.c          | 10 ++--
 src/irc/notifylist/notify-ison.c              | 14 +++---
 src/irc/notifylist/notify-setup.c             |  8 +--
 src/irc/notifylist/notify-whois.c             | 12 ++---
 src/irc/notifylist/notifylist.c               | 20 ++++----
 src/irc/proxy/Makefile.am                     |  3 --
 src/irc/proxy/dump.c                          | 18 +++----
 src/irc/proxy/listen.c                        | 18 +++----
 src/irc/proxy/module.h                        | 10 ++--
 src/irc/proxy/proxy.c                         |  8 +--
 src/irc/proxy/proxy.h                         |  8 +--
 src/lib-config/Makefile.am                    |  1 -
 src/lib-config/module.h                       |  4 +-
 src/otr/Makefile.am                           |  5 --
 src/otr/key.c                                 | 14 +++---
 src/otr/key.h                                 |  6 +--
 src/otr/module.h                              |  4 +-
 src/otr/otr-fe.c                              | 22 ++++----
 src/otr/otr-formats.c                         |  4 +-
 src/otr/otr-formats.h                         |  2 +-
 src/otr/otr-module.c                          | 26 +++++-----
 src/otr/otr-ops.c                             | 16 +++---
 src/otr/otr.c                                 | 16 +++---
 src/otr/otr.h                                 |  4 +-
 src/perl/Makefile.am                          |  3 --
 src/perl/common/Core.xs                       | 12 ++---
 src/perl/common/Expando.xs                    |  2 +-
 src/perl/common/Makefile.PL.in                |  2 +-
 src/perl/common/Settings.xs                   |  2 +-
 src/perl/common/module.h                      | 46 ++++++++---------
 src/perl/irc/Ctcp.xs                          |  2 +-
 src/perl/irc/Makefile.PL.in                   |  2 +-
 src/perl/irc/module.h                         | 40 +++++++--------
 src/perl/module-formats.c                     |  2 +-
 src/perl/module-formats.h                     |  2 +-
 src/perl/module.h                             |  2 +-
 src/perl/perl-common.c                        | 38 +++++++-------
 src/perl/perl-core.c                          | 18 +++----
 src/perl/perl-fe.c                            | 18 +++----
 src/perl/perl-signals.c                       | 14 +++---
 src/perl/perl-sources.c                       | 10 ++--
 src/perl/textui/Makefile.PL.in                |  2 +-
 src/perl/textui/module.h                      | 16 +++---
 src/perl/ui/Makefile.PL.in                    |  2 +-
 src/perl/ui/Window.xs                         |  2 +-
 src/perl/ui/module.h                          | 16 +++---
 tests/fe-common/core/Makefile.am              |  3 --
 tests/fe-common/core/test-formats.c           |  4 +-
 tests/fe-text/Makefile.am                     |  4 --
 tests/fe-text/test-paste-join-multiline.c     |  4 +-
 tests/irc/core/Makefile.am                    |  3 --
 tests/irc/core/test-channel-events.c          | 22 ++++----
 tests/irc/core/test-irc.c                     |  2 +-
 tests/irc/flood/Makefile.am                   |  5 --
 tests/irc/flood/test-796.c                    | 20 ++++----
 303 files changed, 1702 insertions(+), 1769 deletions(-)

diff --git a/configure.ac b/configure.ac
index 066f7a07..a3a60a88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -765,6 +765,13 @@ themes/Makefile
 irssi-config
 ])
 
+dnl ** make the paths like include headers later
+AC_CONFIG_LINKS([
+irssi/irssi-config.h:irssi-config.h
+irssi/irssi-version.h:irssi-version.h
+])
+AC_LINK_FILES([$srcdir/src],[irssi/src])
+
 AC_OUTPUT
 
 dnl ** for building from objdir
diff --git a/src/common.h b/src/common.h
index 41dc192f..313b2c9f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -11,9 +11,7 @@
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
 
-#ifdef HAVE_CONFIG_H
-#include "irssi-config.h"
-#endif
+#include <irssi/irssi-config.h>
 
 #include <stdio.h>
 #include <stddef.h>
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 4cc2226c..c01b8f10 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,8 +1,6 @@
 noinst_LIBRARIES = libcore.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
 	$(GLIB_CFLAGS) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DMODULEDIR=\""$(libdir)/irssi/modules"\"
diff --git a/src/core/args.c b/src/core/args.c
index 9894b6c8..5e2b1412 100644
--- a/src/core/args.c
+++ b/src/core/args.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "args.h"
+#include <irssi/src/core/args.h>
 
 static GOptionContext *context = NULL;
 
diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 568b5542..d73d15fb 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -23,14 +23,14 @@
 */
 
 #include "module.h"
-#include "capsicum.h"
-#include "commands.h"
-#include "log.h"
-#include "misc.h"
-#include "network.h"
-#include "network-openssl.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/capsicum.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/network-openssl.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include <sys/param.h>
 #include <sys/capsicum.h>
diff --git a/src/core/channel-rec.h b/src/core/channel-rec.h
index f3ec5f8d..f1e30fa0 100644
--- a/src/core/channel-rec.h
+++ b/src/core/channel-rec.h
@@ -1,6 +1,6 @@
 /* CHANNEL_REC definition, used for inheritance */
 
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 
 char *topic;
 char *topic_by;
diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index 8002646d..55b4533e 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers-setup.h"
-#include "channels-setup.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
 GSList *setupchannels;
 
diff --git a/src/core/channels-setup.h b/src/core/channels-setup.h
index 3bb7da7f..fcc099c6 100644
--- a/src/core/channels-setup.h
+++ b/src/core/channels-setup.h
@@ -1,7 +1,7 @@
 #ifndef __CHANNELS_SETUP_H
 #define __CHANNELS_SETUP_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 #define CHANNEL_SETUP(server) \
 	MODULE_CHECK_CAST(server, CHANNEL_SETUP_REC, type, "CHANNEL SETUP")
@@ -10,7 +10,7 @@
 	(CHANNEL_SETUP(server) ? TRUE : FALSE)
 
 struct _CHANNEL_SETUP_REC {
-#include "channel-setup-rec.h"
+#include <irssi/src/core/channel-setup-rec.h>
 };
 
 extern GSList *setupchannels;
diff --git a/src/core/channels.c b/src/core/channels.c
index 9c3b92ba..edc30544 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "special-vars.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "nicklist.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/nicklist.h>
 
 GSList *channels; /* List of all channels */
 
diff --git a/src/core/channels.h b/src/core/channels.h
index bd136fe2..276c69fa 100644
--- a/src/core/channels.h
+++ b/src/core/channels.h
@@ -1,7 +1,7 @@
 #ifndef __CHANNELS_H
 #define __CHANNELS_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns CHANNEL_REC if it's channel, NULL if it isn't. */
 #define CHANNEL(channel) \
@@ -13,7 +13,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _CHANNEL_REC {
-#include "channel-rec.h"
+#include <irssi/src/core/channel-rec.h>
 };
 
 extern GSList *channels;
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index d5a133f8..0b4b6591 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "signals.h"
-#include "commands.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "servers-reconnect.h"
-#include "channels.h"
-#include "queries.h"
-#include "window-item-def.h"
-#include "rawlog.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/window-item-def.h>
+#include <irssi/src/core/rawlog.h>
 
 static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 					      char **rawlog_file)
diff --git a/src/core/chat-protocols.c b/src/core/chat-protocols.c
index ee15c087..c53b01b3 100644
--- a/src/core/chat-protocols.c
+++ b/src/core/chat-protocols.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "chat-protocols.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/chat-protocols.h>
 
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "channels-setup.h"
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
 GSList *chat_protocols;
 
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index e0a7a8d9..2d49a6df 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "signals.h"
-#include "special-vars.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
 
 GSList *chatnets; /* list of available chat networks */
 
diff --git a/src/core/chatnets.h b/src/core/chatnets.h
index 2b78f64a..785b487e 100644
--- a/src/core/chatnets.h
+++ b/src/core/chatnets.h
@@ -1,7 +1,7 @@
 #ifndef __CHATNETS_H
 #define __CHATNETS_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns CHATNET_REC if it's chatnet, NULL if it isn't. */
 #define CHATNET(chatnet) \
@@ -11,7 +11,7 @@
 	(CHATNET(chatnet) ? TRUE : FALSE)
 
 struct _CHATNET_REC {
-#include "chatnet-rec.h"
+#include <irssi/src/core/chatnet-rec.h>
 };
 
 extern GSList *chatnets; /* list of available chat networks */
diff --git a/src/core/commands.c b/src/core/commands.c
index 2eebf0a3..4ba1ea1c 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "window-item-def.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/window-item-def.h>
 
-#include "servers.h"
-#include "channels.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
 
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 GSList *commands;
 char *current_command;
diff --git a/src/core/commands.h b/src/core/commands.h
index 93d6276b..b70e77ca 100644
--- a/src/core/commands.h
+++ b/src/core/commands.h
@@ -1,7 +1,7 @@
 #ifndef __COMMANDS_H
 #define __COMMANDS_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 typedef struct {
 	SIGNAL_FUNC func;
diff --git a/src/core/core.c b/src/core/core.c
index 3c335fd2..8562836a 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -21,33 +21,33 @@
 #include "module.h"
 #include <signal.h>
 
-#include "args.h"
-#include "pidwait.h"
-#include "misc.h"
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/misc.h>
 
-#include "net-disconnect.h"
-#include "signals.h"
-#include "settings.h"
-#include "session.h"
+#include <irssi/src/core/net-disconnect.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/session.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "chatnets.h"
-#include "commands.h"
-#include "expandos.h"
-#include "write-buffer.h"
-#include "log.h"
-#include "rawlog.h"
-#include "ignore.h"
-#include "recode.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/write-buffer.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/recode.h>
 
-#include "channels.h"
-#include "queries.h"
-#include "nicklist.h"
-#include "nickmatch-cache.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/nickmatch-cache.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
diff --git a/src/core/core.h b/src/core/core.h
index 982dbaad..406070e0 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -1,7 +1,7 @@
 #ifndef __IRSSI_CORE_H
 #define __IRSSI_CORE_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
 /* for determining what GUI is currently in use: */
 #define IRSSI_GUI_NONE	0
diff --git a/src/core/expandos.c b/src/core/expandos.c
index 2e4265d5..96e2d9f3 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -18,20 +18,20 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "core.h"
+#include <irssi/src/core/core.h>
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "expandos.h"
-#include "settings.h"
-#include "commands.h"
-#include "misc.h"
-#include "irssi-version.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/irssi-version.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "queries.h"
-#include "window-item-def.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/window-item-def.h>
 
 #ifdef HAVE_SYS_UTSNAME_H
 #  include <sys/utsname.h>
diff --git a/src/core/expandos.h b/src/core/expandos.h
index 45608a26..3466a44a 100644
--- a/src/core/expandos.h
+++ b/src/core/expandos.h
@@ -1,7 +1,7 @@
 #ifndef __EXPANDOS_H
 #define __EXPANDOS_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 /* first argument of signal must match to active .. */
 typedef enum {
diff --git a/src/core/ignore.c b/src/core/ignore.c
index 371da83b..14fa585e 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "levels.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "iregex.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/iregex.h>
 
-#include "masks.h"
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "nickmatch-cache.h"
+#include <irssi/src/core/masks.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/nickmatch-cache.h>
 
-#include "ignore.h"
+#include <irssi/src/core/ignore.h>
 
 GSList *ignores;
 
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 20c5475e..fea38205 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -1,7 +1,7 @@
 #ifndef __IGNORE_H
 #define __IGNORE_H
 
-#include "iregex.h"
+#include <irssi/src/core/iregex.h>
 
 typedef struct _IGNORE_REC IGNORE_REC;
 
diff --git a/src/core/iregex-gregex.c b/src/core/iregex-gregex.c
index 36b4faa4..60b4ec58 100644
--- a/src/core/iregex-gregex.c
+++ b/src/core/iregex-gregex.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "iregex.h"
+#include <irssi/src/core/iregex.h>
 
 struct _MatchInfo {
 	const char *valid_string;
diff --git a/src/core/iregex-regexh.c b/src/core/iregex-regexh.c
index 897eb7e2..aae8ecdf 100644
--- a/src/core/iregex-regexh.c
+++ b/src/core/iregex-regexh.c
@@ -1,4 +1,4 @@
-#include "iregex.h"
+#include <irssi/src/core/iregex.h>
 
 Regex *
 i_regex_new (const gchar *pattern,
diff --git a/src/core/iregex.h b/src/core/iregex.h
index e67378d7..d6d6c17f 100644
--- a/src/core/iregex.h
+++ b/src/core/iregex.h
@@ -1,7 +1,7 @@
 #ifndef __REGEX_H
 #define __REGEX_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
 #ifdef USE_GREGEX
 
diff --git a/src/core/levels.c b/src/core/levels.c
index eb7efcf7..9102696e 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 
 /* the order of these levels must match the bits in levels.h */
 static const char *levels[] = {
diff --git a/src/core/line-split.c b/src/core/line-split.c
index 0ee87d23..da84a334 100644
--- a/src/core/line-split.c
+++ b/src/core/line-split.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "misc.h"
+#include <irssi/src/core/misc.h>
 
 /* Maximum line length - split to two lines if it's longer than this.
 
diff --git a/src/core/log-away.c b/src/core/log-away.c
index e2a0120b..d6dac4d9 100644
--- a/src/core/log-away.c
+++ b/src/core/log-away.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "log.h"
-#include "servers.h"
-#include "settings.h"
-#include "write-buffer.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/write-buffer.h>
 
 static LOG_REC *awaylog;
 static int away_filepos;
diff --git a/src/core/log.c b/src/core/log.c
index f7741d3d..3e260fe7 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "servers.h"
-#include "log.h"
-#include "write-buffer.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/write-buffer.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 #define DEFAULT_LOG_FILE_CREATE_MODE 600
 
diff --git a/src/core/masks.c b/src/core/masks.c
index dc0064a9..a84ac44d 100644
--- a/src/core/masks.c
+++ b/src/core/masks.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "misc.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers.h"
+#include <irssi/src/core/servers.h>
 
 /* Returns TRUE if mask contains '!' ie. address should be checked too.
    Also checks if mask contained any wildcards. */
diff --git a/src/core/misc.c b/src/core/misc.c
index e1f199b2..d612f587 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "commands.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/commands.h>
 
 typedef struct {
 	int condition;
diff --git a/src/core/module.h b/src/core/module.h
index 89784389..639e7e29 100644
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -1,3 +1,3 @@
-#include "common.h"
+#include <irssi/src/common.h>
 
 #define MODULE_NAME "core"
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index 9baac1d7..a3598c65 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "modules-load.h"
-#include "signals.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/signals.h>
 
-#include "settings.h"
-#include "commands.h"
-#include "misc.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
 
 #ifdef HAVE_GMODULE
 
diff --git a/src/core/modules-load.h b/src/core/modules-load.h
index 42e14382..683d30e3 100644
--- a/src/core/modules-load.h
+++ b/src/core/modules-load.h
@@ -1,7 +1,7 @@
 #ifndef __MODULES_LOAD_H
 #define __MODULES_LOAD_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Load module - automatically tries to load also the related non-core
    modules given in `prefixes' (like irc, fe, fe_text, ..) */
diff --git a/src/core/modules.c b/src/core/modules.c
index 9b531899..c625071a 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
 
 GSList *modules;
 
diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index 6476e776..889563c5 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "network.h"
+#include <irssi/src/core/network.h>
 
 /* when quitting, wait for max. 5 seconds before forcing to close the socket */
 #define MAX_QUIT_CLOSE_WAIT 5
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 2aca616b..31fbf985 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -22,8 +22,8 @@
 
 #include <signal.h>
 
-#include "pidwait.h"
-#include "net-nonblock.h"
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/net-nonblock.h>
 
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 853fcaa6..649232ae 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -1,7 +1,7 @@
 #ifndef __NET_NONBLOCK_H
 #define __NET_NONBLOCK_H
 
-#include "network.h"
+#include <irssi/src/core/network.h>
 
 typedef struct {
 	IPADDR ip4, ip6; /* resolved ip addresses */
diff --git a/src/core/net-sendbuffer.c b/src/core/net-sendbuffer.c
index 97fb551f..2272de1d 100644
--- a/src/core/net-sendbuffer.c
+++ b/src/core/net-sendbuffer.c
@@ -20,9 +20,9 @@
 
 #include "module.h"
 
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "line-split.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/line-split.h>
 
 /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE
    is used */
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index eec725fa..92507e14 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "network-openssl.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "servers.h"
-#include "signals.h"
-#include "tls.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/network-openssl.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/tls.h>
 
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
diff --git a/src/core/network.c b/src/core/network.c
index 0e326e22..87b91698 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "network.h"
+#include <irssi/src/core/network.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
 #include <sys/un.h>
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 0bc88ab8..bf845c0d 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "masks.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/masks.h>
 
 #define isalnumhigh(a) \
         (i_isalnum(a) || (unsigned char) (a) >= 128)
diff --git a/src/core/nicklist.h b/src/core/nicklist.h
index 5e0f4f75..913cc0d1 100644
--- a/src/core/nicklist.h
+++ b/src/core/nicklist.h
@@ -11,7 +11,7 @@
 #define	MAX_USER_PREFIXES 7 /* Max prefixes kept for any user-in-chan. 7+1 is a memory unit */
 
 struct _NICK_REC {
-#include "nick-rec.h"
+#include <irssi/src/core/nick-rec.h>
 };
 
 /* Add new nick to list */
diff --git a/src/core/nickmatch-cache.c b/src/core/nickmatch-cache.c
index 36a6c241..cae6620d 100644
--- a/src/core/nickmatch-cache.c
+++ b/src/core/nickmatch-cache.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
-#include "channels.h"
-#include "nicklist.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "nickmatch-cache.h"
+#include <irssi/src/core/nickmatch-cache.h>
 
 static GSList *lists;
 
diff --git a/src/core/pidwait.c b/src/core/pidwait.c
index 7fc06195..f421c1d6 100644
--- a/src/core/pidwait.c
+++ b/src/core/pidwait.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "modules.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/modules.h>
 
 static GHashTable *child_pids;
 static GSList *pids;
diff --git a/src/core/queries.c b/src/core/queries.c
index a2fd4b0a..fe86271f 100644
--- a/src/core/queries.c
+++ b/src/core/queries.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers.h"
-#include "queries.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/queries.h>
 
 GSList *queries;
 
diff --git a/src/core/queries.h b/src/core/queries.h
index 77ef9c37..16f92588 100644
--- a/src/core/queries.h
+++ b/src/core/queries.h
@@ -1,7 +1,7 @@
 #ifndef __QUERIES_H
 #define __QUERIES_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns QUERY_REC if it's query, NULL if it isn't. */
 #define QUERY(query) \
@@ -13,7 +13,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _QUERY_REC {
-#include "query-rec.h"
+#include <irssi/src/core/query-rec.h>
 };
 
 extern GSList *queries;
diff --git a/src/core/query-rec.h b/src/core/query-rec.h
index 59519ad4..cc15c9ec 100644
--- a/src/core/query-rec.h
+++ b/src/core/query-rec.h
@@ -1,6 +1,6 @@
 /* QUERY_REC definition, used for inheritance */
 
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 
 char *address;
 char *server_tag;
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index e0c4dd3d..f1938ea6 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "rawlog.h"
-#include "log.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "write-buffer.h"
-#include "settings.h"
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/write-buffer.h>
+#include <irssi/src/core/settings.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "servers.h"
+#include <irssi/src/core/servers.h>
 
 static int rawlog_lines;
 static int signal_rawlog;
diff --git a/src/core/recode.c b/src/core/recode.c
index d3fc91e7..7185dd99 100644
--- a/src/core/recode.c
+++ b/src/core/recode.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "settings.h"
-#include "servers.h"
-#include "signals.h"
-#include "lib-config/iconfig.h"
-#include "misc.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
 static char *translit_charset;
 static gboolean term_is_utf8;
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 5f609cf5..97175f78 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "commands.h"
-#include "network.h"
-#include "signals.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "servers-reconnect.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/servers-reconnect.h>
 
-#include "settings.h"
+#include <irssi/src/core/settings.h>
 
 GSList *reconnects;
 static int last_reconnect_tag;
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 2a92a367..a505df5b 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "network.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
 
 GSList *setupservers;
 
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index e7ff7abf..9bedfe25 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -1,7 +1,7 @@
 #ifndef __SERVERS_SETUP_H
 #define __SERVERS_SETUP_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 #define SERVER_SETUP(server) \
 	MODULE_CHECK_CAST(server, SERVER_SETUP_REC, type, "SERVER SETUP")
@@ -11,7 +11,7 @@
 
 /* servers */
 struct _SERVER_SETUP_REC {
-#include "server-setup-rec.h"
+#include <irssi/src/core/server-setup-rec.h>
 };
 
 extern GSList *setupservers;
diff --git a/src/core/servers.c b/src/core/servers.c
index 81bdb89e..20452f8c 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "net-disconnect.h"
-#include "net-nonblock.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "rawlog.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/net-disconnect.h>
+#include <irssi/src/core/net-nonblock.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "servers-reconnect.h"
-#include "servers-setup.h"
-#include "channels.h"
-#include "queries.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
 GSList *servers, *lookup_servers;
 
diff --git a/src/core/servers.h b/src/core/servers.h
index f39c650b..daf155b3 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -1,7 +1,7 @@
 #ifndef __SERVERS_H
 #define __SERVERS_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns SERVER_REC if it's server, NULL if it isn't. */
 #define SERVER(server) \
@@ -23,12 +23,12 @@
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _SERVER_CONNECT_REC {
-#include "server-connect-rec.h"
+#include <irssi/src/core/server-connect-rec.h>
 };
 
 #define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC
 struct _SERVER_REC {
-#include "server-rec.h"
+#include <irssi/src/core/server-rec.h>
 };
 
 #define SEND_TARGET_CHANNEL	0
diff --git a/src/core/session.c b/src/core/session.c
index 34190c52..0dc36fef 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "args.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "pidwait.h"
-#include "lib-config/iconfig.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/lib-config/iconfig.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "channels.h"
-#include "nicklist.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
 static char *session_file;
 char *irssi_binary = NULL;
diff --git a/src/core/settings.c b/src/core/settings.c
index 5fc37ded..2bd6c06a 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
 
-#include "lib-config/iconfig.h"
-#include "recode.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
 #include "default-config.h"
 
 #include <signal.h>
diff --git a/src/core/signals.c b/src/core/signals.c
index 1f425ba4..e52e6907 100644
--- a/src/core/signals.c
+++ b/src/core/signals.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "modules.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/modules.h>
 
 typedef struct _SignalHook {
 	struct _SignalHook *next;
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index 7081b602..d84912d2 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "special-vars.h"
-#include "expandos.h"
-#include "settings.h"
-#include "servers.h"
-#include "misc.h"
-#include "utf8.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/utf8.h>
 
 #define isvarchar(c) \
         (i_isalnum(c) || (c) == '_')
diff --git a/src/core/special-vars.h b/src/core/special-vars.h
index 300dae0e..caec5ec0 100644
--- a/src/core/special-vars.h
+++ b/src/core/special-vars.h
@@ -1,7 +1,7 @@
 #ifndef __SPECIAL_VARS_H
 #define __SPECIAL_VARS_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #define PARSE_FLAG_GETNAME	0x01 /* return argument name instead of it's value */
 #define PARSE_FLAG_ISSET_ANY	0x02 /* arg_used field specifies that at least one of the $variables was non-empty */
diff --git a/src/core/tls.c b/src/core/tls.c
index 3bddd773..bd5c8329 100644
--- a/src/core/tls.c
+++ b/src/core/tls.c
@@ -18,7 +18,7 @@
 
 #include "module.h"
 
-#include "tls.h"
+#include <irssi/src/core/tls.h>
 
 TLS_REC *tls_create_rec()
 {
diff --git a/src/core/utf8.c b/src/core/utf8.c
index c44fdbd6..5ef030d3 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -22,11 +22,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "utf8.h"
+#include <irssi/src/core/utf8.h>
 #include "module.h"
 
 /* Provide is_utf8(): */
-#include "recode.h"
+#include <irssi/src/core/recode.h>
 
 int string_advance(char const **str, int policy)
 {
diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
index 03d0dc0c..b3881d38 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -22,9 +22,9 @@
 #include <wchar.h>
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "utf8.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/utf8.h>
 
 #ifdef HAVE_LIBUTF8PROC
 #include <utf8proc.h>
diff --git a/src/core/wcwidth.c b/src/core/wcwidth.c
index 711c4646..5226d695 100644
--- a/src/core/wcwidth.c
+++ b/src/core/wcwidth.c
@@ -59,7 +59,7 @@
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
  */
 
-#include "utf8.h"
+#include <irssi/src/core/utf8.h>
 
 struct interval {
   int first;
diff --git a/src/core/window-item-def.h b/src/core/window-item-def.h
index 4364c66e..1309f975 100644
--- a/src/core/window-item-def.h
+++ b/src/core/window-item-def.h
@@ -3,7 +3,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _WI_ITEM_REC {
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 };
 
 #endif
diff --git a/src/core/write-buffer.c b/src/core/write-buffer.c
index ffc3ae63..475e41b8 100644
--- a/src/core/write-buffer.c
+++ b/src/core/write-buffer.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "settings.h"
-#include "write-buffer.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/write-buffer.h>
 
 #define BUFFER_BLOCK_SIZE 2048
 
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index cf4e8ee3..4e8fdcb2 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -1,7 +1,6 @@
 noinst_LIBRARIES = libfe_common_core.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index d610008f..144ed0f4 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -19,24 +19,24 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "levels.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "queries.h"
-#include "nicklist.h"
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "completion.h"
-#include "chat-completion.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/chat-completion.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 enum {
 	COMPLETE_MCASE_NEVER = 0,
diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 32d7adaa..43d86354 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
-#include "command-history.h"
+#include <irssi/src/fe-common/core/command-history.h>
 
 /* command history */
 static GList *history_entries;
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index ed093415..3b9de941 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -1,7 +1,7 @@
 #ifndef __COMMAND_HISTORY_H
 #define __COMMAND_HISTORY_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
 typedef struct {
 	char *name;
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index a6513d58..7778d8a4 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "completion.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static GList *complist; /* list of commands we're currently completing */
 static char *last_line;
diff --git a/src/fe-common/core/completion.h b/src/fe-common/core/completion.h
index 5c1e6958..dce3a2f1 100644
--- a/src/fe-common/core/completion.h
+++ b/src/fe-common/core/completion.h
@@ -1,7 +1,7 @@
 #ifndef __COMPLETION_H
 #define __COMPLETION_H
 
-#include "window-items.h"
+#include <irssi/src/fe-common/core/window-items.h>
 
 /* automatic word completion - called when space/enter is pressed */
 char *auto_word_complete(const char *line, int *pos);
diff --git a/src/fe-common/core/fe-capsicum.c b/src/fe-common/core/fe-capsicum.c
index 54a43d27..d7ea95ee 100644
--- a/src/fe-common/core/fe-capsicum.c
+++ b/src/fe-common/core/fe-capsicum.c
@@ -23,11 +23,11 @@
 */
 
 #include "module.h"
-#include "fe-capsicum.h"
-#include "levels.h"
-#include "module-formats.h"
-#include "printtext.h"
-#include "signals.h"
+#include <irssi/src/fe-common/core/fe-capsicum.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
 
 static void capability_mode_enabled(void)
 {
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 5cad51a7..8c914cb8 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -19,27 +19,27 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
-#include "special-vars.h"
-#include "utf8.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/utf8.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "nicklist.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "fe-windows.h"
-#include "fe-channels.h"
-#include "window-items.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/fe-channels.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
 {
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index e47eb446..c7cdd995 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -19,35 +19,35 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "args.h"
-#include "misc.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "servers-setup.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/servers-setup.h>
 
-#include "special-vars.h"
-#include "fe-core-commands.h"
-#include "fe-queries.h"
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/fe-common/core/fe-core-commands.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
 #ifdef HAVE_CAPSICUM
-#include "fe-capsicum.h"
+#include <irssi/src/fe-common/core/fe-capsicum.h>
 #endif
-#include "hilight-text.h"
-#include "command-history.h"
-#include "completion.h"
-#include "keyboard.h"
-#include "printtext.h"
-#include "formats.h"
-#include "themes.h"
-#include "fe-channels.h"
-#include "fe-windows.h"
-#include "window-activity.h"
-#include "window-items.h"
-#include "windows-layout.h"
-#include "fe-recode.h"
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/fe-common/core/command-history.h>
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-channels.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-activity.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/windows-layout.h>
+#include <irssi/src/fe-common/core/fe-recode.h>
 
 #include <signal.h>
 
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 00c07af6..7e09cded 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -18,22 +18,22 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "core.h"
+#include <irssi/src/core/core.h>
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
-#include "irssi-version.h"
-#include "servers.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/irssi-version.h>
+#include <irssi/src/core/servers.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "fe-windows.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define PASTE_CHECK_SPEED 200 /* 0.2 sec */
 
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index c1739d39..0da4ac89 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -19,24 +19,24 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "pidwait.h"
-#include "line-split.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "levels.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/line-split.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "queries.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
-#include "printtext.h"
-#include "fe-exec.h"
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-exec.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include <signal.h>
 #include <stdlib.h>
diff --git a/src/fe-common/core/fe-exec.h b/src/fe-common/core/fe-exec.h
index 20219d5a..21b1e18b 100644
--- a/src/fe-common/core/fe-exec.h
+++ b/src/fe-common/core/fe-exec.h
@@ -1,7 +1,7 @@
 #ifndef __FE_EXEC_H
 #define __FE_EXEC_H
 
-#include "fe-windows.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 #define EXEC_WI(query) \
 	MODULE_CHECK_CAST_MODULE(query, EXEC_WI_REC, type, \
@@ -14,7 +14,7 @@ typedef struct PROCESS_REC PROCESS_REC;
 
 #define STRUCT_SERVER_REC void
 typedef struct {
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 	PROCESS_REC *process;
 	unsigned int destroying:1;
 } EXEC_WI_REC;
diff --git a/src/fe-common/core/fe-expandos.c b/src/fe-common/core/fe-expandos.c
index d054a633..9a48b4b1 100644
--- a/src/fe-common/core/fe-expandos.c
+++ b/src/fe-common/core/fe-expandos.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "expandos.h"
-#include "fe-windows.h"
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 /* Window ref# */
 static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)
diff --git a/src/fe-common/core/fe-help.c b/src/fe-common/core/fe-help.c
index c7566113..9c428062 100644
--- a/src/fe-common/core/fe-help.c
+++ b/src/fe-common/core/fe-help.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "printtext.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
 {
diff --git a/src/fe-common/core/fe-ignore-messages.c b/src/fe-common/core/fe-ignore-messages.c
index fd889783..73ebd01f 100644
--- a/src/fe-common/core/fe-ignore-messages.c
+++ b/src/fe-common/core/fe-ignore-messages.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "ignore.h"
-#include "servers.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/servers.h>
 
 static void sig_message_public(SERVER_REC *server, const char *msg,
 			       const char *nick, const char *address,
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 39c4dd9f..54ab6a55 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers.h"
-#include "ignore.h"
-#include "printtext.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static char *ignore_get_key(IGNORE_REC *rec)
 {
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index d71c62a9..12b6b643 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -19,30 +19,30 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "chat-protocols.h"
-#include "servers.h"
-#include "channels.h"
-#include "levels.h"
-#include "misc.h"
-#include "log.h"
-#include "special-vars.h"
-#include "settings.h"
-#include "lib-config/iconfig.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/lib-config/iconfig.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "fe-windows.h"
-#include "window-items.h"
-#include "formats.h"
-#include "themes.h"
-#include "printtext.h"
-#include "fe-common-core.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
 
-#include "channels-setup.h"
+#include <irssi/src/core/channels-setup.h>
 
 /* close autologs after 5 minutes of inactivity */
 #define AUTOLOG_INACTIVITY_CLOSE (60*5)
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 12cb1055..5edac26d 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -19,23 +19,23 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "ignore.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/ignore.h>
 
-#include "window-items.h"
-#include "fe-queries.h"
-#include "hilight-text.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c))
 #define isnickchar(a) \
diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index 27b6b4c1..9ad594cb 100644
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "modules-load.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "chat-protocols.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/chat-protocols.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 #ifdef HAVE_GMODULE
 
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 121417e4..77f07474 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "queries.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/queries.h>
 
-#include "fe-core-commands.h"
-#include "fe-windows.h"
-#include "window-items.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-core-commands.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static int queryclose_tag, query_auto_close, querycreate_level;
 
diff --git a/src/fe-common/core/fe-queries.h b/src/fe-common/core/fe-queries.h
index 6db9cb44..1dc7e81a 100644
--- a/src/fe-common/core/fe-queries.h
+++ b/src/fe-common/core/fe-queries.h
@@ -1,7 +1,7 @@
 #ifndef __FE_QUERIES_H
 #define __FE_QUERIES_H
 
-#include "queries.h"
+#include <irssi/src/core/queries.h>
 
 /* Return query where to put the private message. */
 QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick,
diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c
index 829c89e7..5e7c1e47 100644
--- a/src/fe-common/core/fe-recode.c
+++ b/src/fe-common/core/fe-recode.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "module-formats.h"
-#include "commands.h"
-#include "levels.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "printtext.h"
-#include "formats.h"
-#include "recode.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/core/recode.h>
 
 static char *recode_fallback = NULL;
 static char *recode_out_default = NULL;
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 074a83f3..be5ea4ab 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "servers-reconnect.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/servers-reconnect.h>
 
-#include "module-formats.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void print_servers(void)
 {
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index de9f67a1..ad4747e8 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "servers.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "fe-settings.h"
-#include "levels.h"
-#include "printtext.h"
-#include "keyboard.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/fe-settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/keyboard.h>
 
 static void set_print(SETTINGS_REC *rec)
 {
diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c
index ed206d18..d72a13b0 100644
--- a/src/fe-common/core/fe-tls.c
+++ b/src/fe-common/core/fe-tls.c
@@ -17,15 +17,15 @@
  */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "levels.h"
-#include "tls.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/tls.h>
 
-#include "module-formats.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include "fe-tls.h"
+#include <irssi/src/fe-common/core/fe-tls.h>
 
 static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
 {
diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 93f2e3f3..88fc0711 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "servers.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 
-#include "printtext.h"
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 GSList *windows; /* first in the list is the active window,
                     next is the last active, etc. */
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index 061a999a..782b5430 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -1,8 +1,8 @@
 #ifndef __WINDOWS_H
 #define __WINDOWS_H
 
-#include "window-item-def.h"
-#include "command-history.h"
+#include <irssi/src/core/window-item-def.h>
+#include <irssi/src/fe-common/core/command-history.h>
 
 enum {
         DATA_LEVEL_NONE = 0,
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index c8d56fd0..414c6582 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
-#include "servers.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
 
-#include "fe-windows.h"
-#include "window-items.h"
-#include "formats.h"
-#include "themes.h"
-#include "recode.h"
-#include "utf8.h"
-#include "misc.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/utf8.h>
+#include <irssi/src/core/misc.h>
 
 static const char *format_backs = "04261537";
 static const char *format_fores = "kbgcrmyw";
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 8efd204c..a52a3bbd 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -1,8 +1,8 @@
 #ifndef __FORMATS_H
 #define __FORMATS_H
 
-#include "themes.h"
-#include "fe-windows.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 #define GUI_PRINT_FLAG_BOLD          0x0001
 #define GUI_PRINT_FLAG_REVERSE       0x0002
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 3d853a90..2fe6068b 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -19,23 +19,23 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "iregex.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/iregex.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "hilight-text.h"
-#include "nickmatch-cache.h"
-#include "printtext.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/core/nickmatch-cache.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 static NICKMATCH_REC *nickmatch;
 static int never_hilight_level, default_hilight_level;
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 1d942f29..1ffce6b9 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -1,8 +1,8 @@
 #ifndef __HILIGHT_TEXT_H
 #define __HILIGHT_TEXT_H
 
-#include "iregex.h"
-#include "formats.h"
+#include <irssi/src/core/iregex.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 struct _HILIGHT_REC {
 	char *text;
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index c3df5ed7..8f90b1ad 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "keyboard.h"
-#include "fe-windows.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define MAX_EXPAND_RECURSION 100
 
diff --git a/src/fe-common/core/keyboard.h b/src/fe-common/core/keyboard.h
index 970dc7b7..06b11bba 100644
--- a/src/fe-common/core/keyboard.h
+++ b/src/fe-common/core/keyboard.h
@@ -1,7 +1,7 @@
 #ifndef __KEYBOARD_H
 #define __KEYBOARD_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 typedef struct _KEYBOARD_REC KEYBOARD_REC;
 typedef struct _KEYINFO_REC KEYINFO_REC;
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index d3c7251b..0c41e68b 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_core_formats[] = {
 	{ MODULE_NAME, "Core", 0 },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 97ac60bb..181aa4c2 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -1,4 +1,4 @@
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	TXT_MODULE_NAME,
diff --git a/src/fe-common/core/module.h b/src/fe-common/core/module.h
index db712ec7..e629dc51 100644
--- a/src/fe-common/core/module.h
+++ b/src/fe-common/core/module.h
@@ -1,8 +1,8 @@
-#include "common.h"
+#include <irssi/src/common.h>
 
 #define MODULE_NAME "fe-common/core"
 
-#include "utf8.h"
+#include <irssi/src/core/utf8.h>
 typedef struct {
 	time_t time;
 	char *nick;
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 01ef2dcd..3e215d72 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
-#include "servers.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
 
-#include "themes.h"
-#include "fe-windows.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static int beep_msg_level, beep_when_away, beep_when_window_active;
 
diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h
index db53c611..ff52b374 100644
--- a/src/fe-common/core/printtext.h
+++ b/src/fe-common/core/printtext.h
@@ -1,8 +1,8 @@
 #ifndef __PRINTTEXT_H
 #define __PRINTTEXT_H
 
-#include "fe-windows.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 void printformat_module(const char *module, void *server, const char *target, int level, int formatnum, ...);
 void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...);
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index a95f6180..ff737c41 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "themes.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #include "default-theme.h"
 
diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 06c24a2f..7a2903fd 100644
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "servers.h"
-#include "channels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "fe-windows.h"
-#include "window-items.h"
-#include "nicklist.h"
-#include "hilight-text.h"
-#include "formats.h"
-#include "fe-common-core.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
 
 static char **hide_targets;
 static int hide_level, msg_level, hilight_level, signal_window_hilight_check;
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index d9956324..7c542d37 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "servers.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 
-#include "themes.h"
-#include "fe-windows.h"
-#include "window-items.h"
-#include "windows-layout.h"
-#include "printtext.h"
-#include "command-history.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/windows-layout.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/command-history.h>
 
 static void window_print_binds(WINDOW_REC *win)
 {
diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c
index 8eab7124..c60c796c 100644
--- a/src/fe-common/core/window-items.c
+++ b/src/fe-common/core/window-items.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "servers.h"
-#include "channels.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 
-#include "fe-windows.h"
-#include "window-items.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void window_item_add_signal(WINDOW_REC *window, WI_ITEM_REC *item, int automatic, int send_signal)
 {
diff --git a/src/fe-common/core/window-items.h b/src/fe-common/core/window-items.h
index f8db3c39..77ffe680 100644
--- a/src/fe-common/core/window-items.h
+++ b/src/fe-common/core/window-items.h
@@ -1,7 +1,7 @@
 #ifndef __WINDOW_ITEMS_H
 #define __WINDOW_ITEMS_H
 
-#include "fe-windows.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 /* Add/remove/destroy window item from `window' */
 void window_item_add(WINDOW_REC *window, WI_ITEM_REC *item, int automatic);
diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 5aa60916..745453d5 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "levels.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "channels.h"
-#include "queries.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
-#include "module-formats.h"
-#include "printtext.h"
-#include "themes.h"
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 static WINDOW_REC *restore_win;
 
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index a5e95885..704de297 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -3,10 +3,6 @@ SUBDIRS = dcc notifylist
 noinst_LIBRARIES = libfe_common_irc.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index e0ad6296..c6a5d79d 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -1,11 +1,6 @@
 noinst_LIBRARIES = libfe_irc_dcc.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
-	-I$(top_srcdir)/src/irc/dcc/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
index 41cea64c..8dd67f7b 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
 
-#include "irc-servers.h"
-#include "irc-queries.h"
-#include "dcc-chat.h"
-#include "ignore.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/src/core/ignore.h>
 
-#include "module-formats.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/irc/dcc/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void sig_message_dcc_own(CHAT_DCC_REC *dcc, const char *msg)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat.c b/src/fe-common/irc/dcc/fe-dcc-chat.c
index 5bcb3475..4099e2f1 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "settings.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "irc-queries.h"
-#include "dcc-chat.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/irc/dcc/dcc-chat.h>
 
-#include "module-formats.h"
-#include "printtext.h"
-#include "fe-messages.h"
+#include <irssi/src/fe-common/irc/dcc/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-messages.h>
 
-#include "chat-completion.h"
+#include <irssi/src/fe-common/core/chat-completion.h>
 
 void fe_dcc_chat_messages_init(void);
 void fe_dcc_chat_messages_deinit(void);
diff --git a/src/fe-common/irc/dcc/fe-dcc-get.c b/src/fe-common/irc/dcc/fe-dcc-get.c
index 99b6b963..e75640bc 100644
--- a/src/fe-common/irc/dcc/fe-dcc-get.c
+++ b/src/fe-common/irc/dcc/fe-dcc-get.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "servers.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
 
-#include "irc.h"
-#include "dcc-file.h"
-#include "dcc-get.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/dcc/dcc-file.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
 
-#include "module-formats.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/irc/dcc/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include "fe-dcc.h"
+#include <irssi/src/fe-common/irc/dcc/fe-dcc.h>
 
 static void dcc_request(GET_DCC_REC *dcc)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc-send.c b/src/fe-common/irc/dcc/fe-dcc-send.c
index 7920bedc..cf9b634e 100644
--- a/src/fe-common/irc/dcc/fe-dcc-send.c
+++ b/src/fe-common/irc/dcc/fe-dcc-send.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "dcc-file.h"
-#include "dcc-send.h"
-#include "dcc-queue.h"
+#include <irssi/src/irc/dcc/dcc-file.h>
+#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/dcc/dcc-queue.h>
 
-#include "module-formats.h"
-#include "printtext.h"
-#include "completion.h"
+#include <irssi/src/fe-common/irc/dcc/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/completion.h>
 
-#include "fe-dcc.h"
+#include <irssi/src/fe-common/irc/dcc/fe-dcc.h>
 
 static void dcc_connected(SEND_DCC_REC *dcc)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc-server.c b/src/fe-common/irc/dcc/fe-dcc-server.c
index 919d8665..eaab9637 100644
--- a/src/fe-common/irc/dcc/fe-dcc-server.c
+++ b/src/fe-common/irc/dcc/fe-dcc-server.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "levels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/levels.h>
 
-#include "dcc-server.h"
+#include <irssi/src/irc/dcc/dcc-server.h>
 
-#include "module-formats.h"
-#include "printtext.h"
-#include "themes.h"
+#include <irssi/src/fe-common/irc/dcc/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
 
 static void dcc_server_started(SERVER_DCC_REC *dcc)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c
index 0a46a595..51fb5eea 100644
--- a/src/fe-common/irc/dcc/fe-dcc.c
+++ b/src/fe-common/irc/dcc/fe-dcc.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "dcc-chat.h"
-#include "dcc-file.h"
-#include "dcc-get.h"
-#include "dcc-send.h"
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/src/irc/dcc/dcc-file.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/src/irc/dcc/dcc-send.h>
 
-#include "module-formats.h"
-#include "printtext.h"
-#include "themes.h"
+#include <irssi/src/fe-common/irc/dcc/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
 
 void fe_dcc_chat_init(void);
 void fe_dcc_chat_deinit(void);
diff --git a/src/fe-common/irc/dcc/module-formats.c b/src/fe-common/irc/dcc/module-formats.c
index 225c5429..f973cd9e 100644
--- a/src/fe-common/irc/dcc/module-formats.c
+++ b/src/fe-common/irc/dcc/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_irc_dcc_formats[] = {
 	{ MODULE_NAME, "IRC", 0 },
diff --git a/src/fe-common/irc/dcc/module-formats.h b/src/fe-common/irc/dcc/module-formats.h
index d1bcc3ba..204c7dd5 100644
--- a/src/fe-common/irc/dcc/module-formats.h
+++ b/src/fe-common/irc/dcc/module-formats.h
@@ -1,4 +1,4 @@
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/dcc/module.h b/src/fe-common/irc/dcc/module.h
index 58e65b25..54934469 100644
--- a/src/fe-common/irc/dcc/module.h
+++ b/src/fe-common/irc/dcc/module.h
@@ -1,4 +1,4 @@
-#include "common.h"
-#include "irc.h"
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 #define MODULE_NAME "fe-common/irc/dcc"
diff --git a/src/fe-common/irc/fe-cap.c b/src/fe-common/irc/fe-cap.c
index 4f9d8ea9..a75f2bb3 100644
--- a/src/fe-common/irc/fe-cap.c
+++ b/src/fe-common/irc/fe-cap.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-servers.h"
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 static const struct {
 	const char *command;
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index b1bfb525..0db2d98e 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "themes.h"
-#include "fe-irc-server.h"
-#include "fe-irc-channels.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/irc/fe-irc-server.h>
+#include <irssi/src/fe-common/irc/fe-irc-channels.h>
 
 void fe_irc_modules_init(void);
 void fe_irc_modules_deinit(void);
diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index cbb591ba..63d7ecd3 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
-#include "servers.h"
-#include "channels.h"
-#include "queries.h"
-#include "ignore.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/ignore.h>
 
-#include "fe-windows.h"
-#include "window-items.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void ctcp_default_msg(IRC_SERVER_REC *server, const char *data,
 			     const char *nick, const char *addr,
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 3eb124fc..b4525db5 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
-#include "levels.h"
-#include "recode.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/recode.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "nicklist.h"
-#include "mode-lists.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/irc/core/mode-lists.h>
 
-#include "../core/module-formats.h"
-#include "printtext.h"
-#include "fe-channels.h"
-#include "fe-irc-server.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-channels.h>
+#include <irssi/src/fe-common/irc/fe-irc-server.h>
 
 static void print_event_received(IRC_SERVER_REC *server, const char *data,
 				 const char *nick, int target_param);
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 850174c5..30f00efc 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -19,29 +19,29 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
-#include "servers.h"
-#include "servers-redirect.h"
-#include "servers-reconnect.h"
-#include "queries.h"
-#include "ignore.h"
-#include "recode.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/recode.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-nicklist.h"
-#include "irc-masks.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/irc-masks.h>
 
-#include "printtext.h"
-#include "fe-queries.h"
-#include "fe-windows.h"
-#include "fe-irc-server.h"
-#include "fe-irc-channels.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/irc/fe-irc-server.h>
+#include <irssi/src/fe-common/irc/fe-irc-channels.h>
 
 static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 			  const char *nick, const char *addr)
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index 0ec30003..93ff3603 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "levels.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "channel-rejoin.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/channel-rejoin.h>
 
-#include "printtext.h"
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
 {
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index 668367e4..40ad36e0 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -19,26 +19,26 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
-#include "servers.h"
-#include "mode-lists.h"
-#include "nicklist.h"
-#include "irc-commands.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-queries.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/irc/core/mode-lists.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-queries.h>
 
-#include "fe-queries.h"
-#include "fe-windows.h"
-#include "window-items.h"
-#include "printtext.h"
-#include "keyboard.h"
+#include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/keyboard.h>
 
 /* SYNTAX: ME <message> */
 static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 27aee5e2..ddd4311e 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -19,25 +19,25 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "channels.h"
-#include "ignore.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-queries.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-queries.h>
 
-#include "../core/module-formats.h"
-#include "module-formats.h"
-#include "printtext.h"
-#include "fe-messages.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-messages.h>
 
-#include "fe-queries.h"
-#include "window-items.h"
-#include "fe-irc-channels.h"
-#include "fe-irc-server.h"
+#include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/irc/fe-irc-channels.h>
+#include <irssi/src/fe-common/irc/fe-irc-server.h>
 
 static void sig_message_own_public(SERVER_REC *server, const char *msg,
 				   const char *target, const char *origtarget)
diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c
index c928a94a..7a13542a 100644
--- a/src/fe-common/irc/fe-irc-queries.c
+++ b/src/fe-common/irc/fe-irc-queries.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "servers.h"
-#include "queries.h"
-#include "nicklist.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
 
 static QUERY_REC *query_find_address(SERVER_REC *server, const char *address)
 {
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index c2b9fc0f..7e3a6300 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers-setup.h"
+#include <irssi/src/core/servers-setup.h>
 
-#include "levels.h"
-#include "irc-chatnets.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "servers-reconnect.h"
-#include "irc-servers-setup.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/irc/core/irc-chatnets.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/irc/core/irc-servers-setup.h>
 
-#include "fe-windows.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 {
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 5ae5ac05..3484d923 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "chatnets.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/chatnets.h>
 
-#include "irc-servers.h"
-#include "irc-chatnets.h"
-#include "printtext.h"
-#include "servers-setup.h"
-#include "channels-setup.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-chatnets.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
 static void cmd_network_list(void)
 {
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index dfe65c2d..61ea6c38 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "modes.h"
-#include "ignore.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/core/ignore.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define MODE_WAIT_TIME 3 /* how many seconds to wait for identical modes */
 
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 9ea633b4..602eaf20 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "modes.h"
-#include "ignore.h"
-#include "netsplit.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/irc/core/netsplit.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define NETJOIN_WAIT_TIME 5 /* how many seconds to wait for the netsplitted JOIN messages to stop */
 #define NETJOIN_MAX_WAIT 30 /* how many seconds to wait for nick to join to the rest of the channels she was before the netsplit */
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index 258d0d57..4b7850da 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-commands.h"
-#include "ignore.h"
-#include "netsplit.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/irc/core/netsplit.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define SPLIT_WAIT_TIME 5 /* how many seconds to wait for the QUIT split messages to stop */
 
diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
index ed11f047..72fec58e 100644
--- a/src/fe-common/irc/fe-sasl.c
+++ b/src/fe-common/irc/fe-sasl.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "sasl.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/irc/core/sasl.h>
 
-#include "irc-servers.h"
-#include "settings.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/settings.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void sig_sasl_success(IRC_SERVER_REC *server)
 {
diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c
index 117df120..9a31cd9e 100644
--- a/src/fe-common/irc/fe-whois.c
+++ b/src/fe-common/irc/fe-whois.c
@@ -1,16 +1,16 @@
 /* Copyright (C) 1999-2004 Timo Sirainen */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
-#include "recode.h"
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/recode.h>
 
-#include "irc-servers.h"
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void event_whois(IRC_SERVER_REC *server, const char *data)
 {
diff --git a/src/fe-common/irc/irc-completion.c b/src/fe-common/irc/irc-completion.c
index 1593ff3d..71e2e0c8 100644
--- a/src/fe-common/irc/irc-completion.c
+++ b/src/fe-common/irc/irc-completion.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "chat-completion.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/chat-completion.h>
 
 static void sig_complete_stats(GList **list, WINDOW_REC *window,
 			       const char *word, const char *line,
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 722aed73..a0f6bd29 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_irc_formats[] = {
 	{ MODULE_NAME, "IRC", 0 },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 7969b5ac..66a9804f 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -1,4 +1,4 @@
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/module.h b/src/fe-common/irc/module.h
index 9583b81b..ad63c95e 100644
--- a/src/fe-common/irc/module.h
+++ b/src/fe-common/irc/module.h
@@ -1,4 +1,4 @@
-#include "common.h"
-#include "irc.h"
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 #define MODULE_NAME "fe-common/irc"
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index b990dcd2..b0f35fdf 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -1,10 +1,6 @@
 noinst_LIBRARIES = libfe_irc_notifylist.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c
index 1cfe9ed4..1f136a97 100644
--- a/src/fe-common/irc/notifylist/fe-notifylist.c
+++ b/src/fe-common/irc/notifylist/fe-notifylist.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "chatnets.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/fe-common/irc/notifylist/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
-#include "irc-servers.h"
-#include "irc-chatnets.h"
-#include "irc/notifylist/notifylist.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-chatnets.h>
+#include <irssi/src/irc/notifylist/notifylist.h>
 
-#include "themes.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 /* add the nick of a hostmask to list if it isn't there already */
 static GSList *mask_add_once(GSList *list, const char *mask)
diff --git a/src/fe-common/irc/notifylist/module-formats.c b/src/fe-common/irc/notifylist/module-formats.c
index 700a846f..12f41fb5 100644
--- a/src/fe-common/irc/notifylist/module-formats.c
+++ b/src/fe-common/irc/notifylist/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_irc_notifylist_formats[] =
 {
diff --git a/src/fe-common/irc/notifylist/module-formats.h b/src/fe-common/irc/notifylist/module-formats.h
index 042b54ae..ff3085e1 100644
--- a/src/fe-common/irc/notifylist/module-formats.h
+++ b/src/fe-common/irc/notifylist/module-formats.h
@@ -1,4 +1,4 @@
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/notifylist/module.h b/src/fe-common/irc/notifylist/module.h
index 3c74a998..0e5ca451 100644
--- a/src/fe-common/irc/notifylist/module.h
+++ b/src/fe-common/irc/notifylist/module.h
@@ -1,4 +1,4 @@
-#include "common.h"
-#include "irc.h"
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 #define MODULE_NAME "fe-common/irc/notifylist"
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index f52d9c47..e72b8723 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -6,10 +6,6 @@ bin_PROGRAMS = irssi-fuzz server-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS)
 
 irssi_fuzz_DEPENDENCIES = @COMMON_LIBS@
diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
index 9aa39a84..692e95cf 100644
--- a/src/fe-fuzz/fe-common/core/Makefile.am
+++ b/src/fe-fuzz/fe-common/core/Makefile.am
@@ -4,10 +4,6 @@ bin_PROGRAMS = theme-load-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS)
 
 LDADD = \
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
index cb8b7e31..b2e1ea97 100644
--- a/src/fe-fuzz/irc/core/Makefile.am
+++ b/src/fe-fuzz/irc/core/Makefile.am
@@ -4,10 +4,6 @@ bin_PROGRAMS = event-get-params-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS)
 
 LDADD = \
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
index 1233fc91..570d6261 100644
--- a/src/fe-none/Makefile.am
+++ b/src/fe-none/Makefile.am
@@ -1,9 +1,6 @@
 bin_PROGRAMS = botti
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
 	$(GLIB_CFLAGS)
 
 botti_DEPENDENCIES = @COMMON_NOUI_LIBS@
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index 6c601627..c61d74f7 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "modules-load.h"
-#include "args.h"
-#include "signals.h"
-#include "core.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/core.h>
 
 #ifdef HAVE_STATIC_PERL
 void perl_core_init(void);
diff --git a/src/fe-none/module.h b/src/fe-none/module.h
index 1bb9e252..cf956eaa 100644
--- a/src/fe-none/module.h
+++ b/src/fe-none/module.h
@@ -1,3 +1,3 @@
-#include "common.h"
+#include <irssi/src/common.h>
 
 #define MODULE_NAME "fe-none"
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 448a9389..94ce1a3c 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -1,9 +1,6 @@
 bin_PROGRAMS = irssi
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
 	$(GLIB_CFLAGS)
 
 irssi_DEPENDENCIES = \
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index ee3de77d..1a721397 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "utf8.h"
-#include "formats.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/utf8.h>
+#include <irssi/src/fe-common/core/formats.h>
 
-#include "gui-entry.h"
-#include "gui-printtext.h"
-#include "term.h"
-#include "recode.h"
+#include <irssi/src/fe-text/gui-entry.h>
+#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/core/recode.h>
 
 #undef i_toupper
 #undef i_tolower
diff --git a/src/fe-text/gui-expandos.c b/src/fe-text/gui-expandos.c
index 064a0955..a6b11418 100644
--- a/src/fe-text/gui-expandos.c
+++ b/src/fe-text/gui-expandos.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "expandos.h"
+#include <irssi/src/core/expandos.h>
 
-#include "gui-entry.h"
-#include "gui-readline.h"
+#include <irssi/src/fe-text/gui-entry.h>
+#include <irssi/src/fe-text/gui-readline.h>
 
 /* idle time */
 static char *expando_idletime(SERVER_REC *server, void *item, int *free_ret)
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index e47e4594..9b472bff 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
-#include "formats.h"
-#include "printtext.h"
-#include "themes.h"
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
 
-#include "term.h"
-#include "gui-printtext.h"
-#include "gui-windows.h"
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssi/src/fe-text/gui-windows.h>
 
 int mirc_colors[] = { 15, 0, 1, 2, 12, 4, 5, 6, 14, 10, 3, 11, 9, 13, 8, 7,
 	 /* 16-27 */  52,  94, 100,  58,  22,  29,  23,  24,  17,  54,  53,  89,
diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h
index 64595bbe..90f82220 100644
--- a/src/fe-text/gui-printtext.h
+++ b/src/fe-text/gui-printtext.h
@@ -1,9 +1,9 @@
 #ifndef __GUI_PRINTTEXT_H
 #define __GUI_PRINTTEXT_H
 
-#include "gui-windows.h"
-#include "textbuffer-view.h"
-#include "formats.h"
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 extern int mirc_colors[];
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 1033339e..8f5594cb 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -19,23 +19,23 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
-#include "special-vars.h"
-#include "levels.h"
-#include "servers.h"
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
 
-#include "completion.h"
-#include "command-history.h"
-#include "keyboard.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/command-history.h>
+#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include "term.h"
-#include "gui-entry.h"
-#include "gui-windows.h"
-#include "utf8.h"
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/gui-entry.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/core/utf8.h>
 
 #include <string.h>
 #include <signal.h>
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 0890fe6f..9ca2dfdb 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
-#include "special-vars.h"
-#include "levels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/levels.h>
 
-#include "term.h"
-#include "gui-entry.h"
-#include "gui-windows.h"
-#include "gui-printtext.h"
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/gui-entry.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/gui-printtext.h>
 
 static int window_create_override;
 static int wcwidth_impl;
diff --git a/src/fe-text/gui-windows.h b/src/fe-text/gui-windows.h
index 94c0d28b..9fc3fbd5 100644
--- a/src/fe-text/gui-windows.h
+++ b/src/fe-text/gui-windows.h
@@ -1,8 +1,8 @@
 #ifndef __GUI_WINDOWS_H
 #define __GUI_WINDOWS_H
 
-#include "mainwindows.h"
-#include "textbuffer-view.h"
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/src/fe-text/textbuffer-view.h>
 
 #define WINDOW_GUI(a) ((GUI_WINDOW_REC *) ((a)->gui_data))
 #define WINDOW_MAIN(a) (WINDOW_GUI(a)->parent)
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index c979e917..8b466905 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -19,29 +19,29 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules-load.h"
-#include "args.h"
-#include "signals.h"
-#include "levels.h"
-#include "core.h"
-#include "settings.h"
-#include "session.h"
-#include "servers.h"
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/session.h>
+#include <irssi/src/core/servers.h>
 
-#include "printtext.h"
-#include "fe-common-core.h"
-#include "fe-settings.h"
-#include "themes.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
+#include <irssi/src/fe-common/core/fe-settings.h>
+#include <irssi/src/fe-common/core/themes.h>
 
-#include "term.h"
-#include "gui-entry.h"
-#include "mainwindows.h"
-#include "gui-printtext.h"
-#include "gui-readline.h"
-#include "statusbar.h"
-#include "gui-windows.h"
-#include "irssi-version.h"
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/gui-entry.h>
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssi/src/fe-text/gui-readline.h>
+#include <irssi/src/fe-text/statusbar.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/irssi-version.h>
 
 #include <signal.h>
 #include <locale.h>
diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index c0b1dde8..d5aa298a 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "module-formats.h"
-#include "printtext.h"
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include "gui-windows.h"
-#include "gui-printtext.h"
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/gui-printtext.h>
 
 #define DEFAULT_LASTLOG_BEFORE 3
 #define DEFAULT_LASTLOG_AFTER 3
diff --git a/src/fe-text/mainwindow-activity.c b/src/fe-text/mainwindow-activity.c
index 7f7a0528..d3759ace 100644
--- a/src/fe-text/mainwindow-activity.c
+++ b/src/fe-text/mainwindow-activity.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
-#include "gui-windows.h"
+#include <irssi/src/fe-text/gui-windows.h>
 
 /* Don't send window activity if window is already visible in
    another mainwindow */
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index bb53fdab..ef13892f 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "levels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
 
-#include "mainwindows.h"
-#include "gui-windows.h"
-#include "textbuffer-view.h"
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/textbuffer-view.h>
 
 static void sig_layout_window_save(WINDOW_REC *window, CONFIG_NODE *node)
 {
diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 997cdd22..677e0e14 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
-#include "printtext.h"
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include "term.h"
-#include "gui-windows.h"
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/gui-windows.h>
 
 #define NEW_WINDOW_SIZE (WINDOW_MIN_SIZE + 1)
 
diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h
index 4810c1e3..3a7fb1ed 100644
--- a/src/fe-text/mainwindows.h
+++ b/src/fe-text/mainwindows.h
@@ -1,8 +1,8 @@
 #ifndef __MAINWINDOWS_H
 #define __MAINWINDOWS_H
 
-#include "fe-windows.h"
-#include "term.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-text/term.h>
 
 #define WINDOW_MIN_SIZE 2
 #define NEW_WINDOW_WIDTH 20 /* must be >= MIN_SCREEN_WIDTH defined in term.c */
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index 277872c6..7cdc5654 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC gui_text_formats[] =
 {
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index ac60fdb7..59c877b8 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -1,4 +1,4 @@
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	TXT_MODULE_NAME,
diff --git a/src/fe-text/module.h b/src/fe-text/module.h
index 0ca9f703..b1eeeb0e 100644
--- a/src/fe-text/module.h
+++ b/src/fe-text/module.h
@@ -1,5 +1,5 @@
-#include "common.h"
-#include "term.h"
+#include <irssi/src/common.h>
+#include <irssi/src/fe-text/term.h>
 
 #define MODULE_NAME "fe-text"
 
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 38372725..3cfa5379 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "settings.h"
-#include "levels.h"
-#include "lib-config/iconfig.h"
-#include "misc.h"
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
-#include "statusbar.h"
-#include "printtext.h"
+#include <irssi/src/fe-text/statusbar.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void read_statusbar_config_from_node(CONFIG_NODE *node);
 
diff --git a/src/fe-text/statusbar-config.h b/src/fe-text/statusbar-config.h
index a2a0b049..ebba7da1 100644
--- a/src/fe-text/statusbar-config.h
+++ b/src/fe-text/statusbar-config.h
@@ -1,7 +1,7 @@
 #ifndef __STATUSBAR_CONFIG_H
 #define __STATUSBAR_CONFIG_H
 
-#include "statusbar.h"
+#include <irssi/src/fe-text/statusbar.h>
 
 void statusbar_config_destroy(STATUSBAR_GROUP_REC *group,
 			      STATUSBAR_CONFIG_REC *config);
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 27efcbd1..c6770e32 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "servers.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
 
-#include "themes.h"
-#include "statusbar.h"
-#include "gui-entry.h"
-#include "gui-windows.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-text/statusbar.h>
+#include <irssi/src/fe-text/gui-entry.h>
+#include <irssi/src/fe-text/gui-windows.h>
 
 /* how often to redraw lagging time (seconds) */
 #define LAG_REFRESH_TIME 10
diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c
index 40837eea..2439d101 100644
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "expandos.h"
-#include "special-vars.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/special-vars.h>
 
-#include "themes.h"
+#include <irssi/src/fe-common/core/themes.h>
 
-#include "statusbar.h"
-#include "statusbar-config.h"
-#include "gui-windows.h"
-#include "gui-printtext.h"
+#include <irssi/src/fe-text/statusbar.h>
+#include <irssi/src/fe-text/statusbar-config.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/gui-printtext.h>
 
 void statusbar_items_init(void);
 void statusbar_items_deinit(void);
diff --git a/src/fe-text/statusbar.h b/src/fe-text/statusbar.h
index b0048cc4..eae29900 100644
--- a/src/fe-text/statusbar.h
+++ b/src/fe-text/statusbar.h
@@ -1,8 +1,8 @@
 #ifndef __STATUSBAR_H
 #define __STATUSBAR_H
 
-#include "mainwindows.h"
-#include "statusbar-item.h"
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/src/fe-text/statusbar-item.h>
 
 #define STATUSBAR_PRIORITY_HIGH		100
 #define STATUSBAR_PRIORITY_NORMAL	0
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 6e031ebf..5235f72d 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "term.h"
-#include "terminfo-core.h"
-#include "fe-windows.h"
-#include "gui-printtext.h"
-#include "utf8.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/terminfo-core.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssi/src/core/utf8.h>
 
 #include <signal.h>
 #include <termios.h>
diff --git a/src/fe-text/term.c b/src/fe-text/term.c
index 408dc7ef..1d5c2bef 100644
--- a/src/fe-text/term.c
+++ b/src/fe-text/term.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
 
-#include "term.h"
-#include "mainwindows.h"
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/mainwindows.h>
 
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index f25154c2..af866bea 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -27,7 +27,7 @@ typedef struct _TERM_WINDOW TERM_WINDOW;
 #define TERM_TYPE_UTF8		1
 #define TERM_TYPE_BIG5		2
 
-#include "utf8.h"
+#include <irssi/src/core/utf8.h>
 
 extern TERM_WINDOW *root_window;
 extern int term_width, term_height;
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 9c9179a5..d2273d71 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -1,6 +1,6 @@
 #include "module.h"
-#include "signals.h"
-#include "terminfo-core.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-text/terminfo-core.h>
 
 #ifndef _POSIX_VDISABLE
 #  define _POSIX_VDISABLE 0
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 7278772c..318ee077 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "levels.h"
-#include "settings.h"
-#include "servers.h"
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
 
-#include "printtext.h"
-#include "gui-windows.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-text/gui-windows.h>
 
 static int activity_hide_window_hidelevel;
 
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index e5141430..ec518cbf 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -21,9 +21,9 @@
 #define	G_LOG_DOMAIN "TextBufferView"
 
 #include "module.h"
-#include "textbuffer-view.h"
-#include "signals.h"
-#include "utf8.h"
+#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/utf8.h>
 
 typedef struct {
 	char *name;
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index 1ae7c163..54775783 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -1,8 +1,8 @@
 #ifndef __TEXTBUFFER_VIEW_H
 #define __TEXTBUFFER_VIEW_H
 
-#include "textbuffer.h"
-#include "term.h"
+#include <irssi/src/fe-text/textbuffer.h>
+#include <irssi/src/fe-text/term.h>
 
 typedef struct _TEXT_BUFFER_VIEW_REC TEXT_BUFFER_VIEW_REC;
 
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 5f9e68ad..470c0b00 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -21,12 +21,12 @@
 #define	G_LOG_DOMAIN "TextBuffer"
 
 #include "module.h"
-#include "misc.h"
-#include "formats.h"
-#include "utf8.h"
-#include "iregex.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/core/utf8.h>
+#include <irssi/src/core/iregex.h>
 
-#include "textbuffer.h"
+#include <irssi/src/fe-text/textbuffer.h>
 
 #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*))
 
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index c668faea..63b41113 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -1,8 +1,6 @@
 noinst_LIBRARIES = libirc_core.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index 198fdc4a..a61742f3 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-masks.h"
-#include "irc-commands.h"
-#include "modes.h"
-#include "mode-lists.h"
-#include "nicklist.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-masks.h>
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/mode-lists.h>
+#include <irssi/src/core/nicklist.h>
 
 #define BAN_TYPE_NORMAL (IRC_MASK_USER | IRC_MASK_DOMAIN)
 #define BAN_TYPE_USER (IRC_MASK_USER)
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 6ffe7364..7603a14f 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "channel-events.h"
-#include "channels-setup.h"
-#include "settings.h"
-#include "recode.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/irc/core/channel-events.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/recode.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
 
 static void check_join_failure(IRC_SERVER_REC *server, const char *channel)
 {
diff --git a/src/irc/core/channel-events.h b/src/irc/core/channel-events.h
index 6d01c48e..d13c9760 100644
--- a/src/irc/core/channel-events.h
+++ b/src/irc/core/channel-events.h
@@ -1,7 +1,7 @@
 #ifndef __CHANNEL_EVENTS_H
 #define __CHANNEL_EVENTS_H
 
-#include "irc.h"
+#include <irssi/src/irc/core/irc.h>
 
 void channel_events_init(void);
 void channel_events_deinit(void);
diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c
index 154035ae..f49c69b6 100644
--- a/src/irc/core/channel-rejoin.c
+++ b/src/irc/core/channel-rejoin.c
@@ -20,14 +20,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-commands.h"
-#include "channel-rejoin.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/src/irc/core/channel-rejoin.h>
 
 #define REJOIN_TIMEOUT (1000*60*5) /* try to rejoin every 5 minutes */
 
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index d7dadf04..8f90af64 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -39,16 +39,16 @@ loop:
 */
 
 #include "module.h"
-#include "misc.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
-#include "modes.h"
-#include "mode-lists.h"
-#include "nicklist.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "servers-redirect.h"
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/mode-lists.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
 enum {
 	CHANNEL_QUERY_MODE,
diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c
index accbb57f..42b93411 100644
--- a/src/irc/core/ctcp.c
+++ b/src/irc/core/ctcp.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "servers-idle.h"
-#include "ignore.h"
-#include "ctcp.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/servers-idle.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/irc/core/ctcp.h>
 
 typedef struct {
 	char *name;
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 2d740c59..21a27324 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -18,11 +18,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-cap.h"
-#include "irc-servers.h"
+#include <irssi/src/irc/core/irc-cap.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
 int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 {
diff --git a/src/irc/core/irc-channels-setup.c b/src/irc/core/irc-channels-setup.c
index bbbc095c..93874d35 100644
--- a/src/irc/core/irc-channels-setup.c
+++ b/src/irc/core/irc-channels-setup.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "channels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/channels.h>
 
 void irc_channels_setup_init(void)
 {
diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index e775f530..b2ee3772 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "levels.h"
-#include "channels-setup.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/channels-setup.h>
 
-#include "bans.h"
-#include "modes.h"
-#include "mode-lists.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-nicklist.h"
-#include "channel-rejoin.h"
+#include <irssi/src/irc/core/bans.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/mode-lists.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/channel-rejoin.h>
 
 void channels_query_init(void);
 void channels_query_deinit(void);
diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h
index 8cfc4992..2262b484 100644
--- a/src/irc/core/irc-channels.h
+++ b/src/irc/core/irc-channels.h
@@ -1,8 +1,8 @@
 #ifndef __IRC_CHANNELS_H
 #define __IRC_CHANNELS_H
 
-#include "chat-protocols.h"
-#include "channels.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/channels.h>
 
 /* Returns IRC_CHANNEL_REC if it's IRC channel, NULL if it isn't. */
 #define IRC_CHANNEL(channel) \
@@ -13,7 +13,7 @@
 
 #define STRUCT_SERVER_REC IRC_SERVER_REC
 struct _IRC_CHANNEL_REC {
-#include "channel-rec.h"
+#include <irssi/src/core/channel-rec.h>
 
 	GSList *banlist; /* list of bans */
 
diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index 98ce89c3..c3b24a11 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-chatnets.h"
+#include <irssi/src/irc/core/irc-chatnets.h>
 
 void ircnet_create(IRC_CHATNET_REC *rec)
 {
diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h
index 3fd44472..00aea848 100644
--- a/src/irc/core/irc-chatnets.h
+++ b/src/irc/core/irc-chatnets.h
@@ -1,8 +1,8 @@
 #ifndef __IRC_CHATNETS_H
 #define __IRC_CHATNETS_H
 
-#include "chat-protocols.h"
-#include "chatnets.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
 
 /* returns IRC_CHATNET_REC if it's IRC network, NULL if it isn't */
 #define IRC_CHATNET(chatnet) \
@@ -15,7 +15,7 @@
 #define IRCNET(ircnet) IRC_CHATNET(ircnet)
 
 struct _IRC_CHATNET_REC {
-#include "chatnet-rec.h"
+#include <irssi/src/core/chatnet-rec.h>
 
 	char *usermode;
 	char *alternate_nick;
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 32ee8845..4062b1da 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "recode.h"
-#include "special-vars.h"
-#include "settings.h"
-#include "window-item-def.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/window-item-def.h>
 
-#include "servers-reconnect.h"
-#include "servers-redirect.h"
-#include "servers-setup.h"
-#include "nicklist.h"
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "bans.h"
-#include "irc-commands.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-queries.h"
+#include <irssi/src/irc/core/bans.h>
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-queries.h>
 
 /* How often to check if there's anyone to be unbanned in knockout list */
 #define KNOCKOUT_TIMECHECK 10000
diff --git a/src/irc/core/irc-commands.h b/src/irc/core/irc-commands.h
index 739bd443..3e24c5a8 100644
--- a/src/irc/core/irc-commands.h
+++ b/src/irc/core/irc-commands.h
@@ -1,7 +1,7 @@
 #ifndef __IRC_COMMANDS_H
 #define __IRC_COMMANDS_H
 
-#include "commands.h"
+#include <irssi/src/core/commands.h>
 
 #define command_bind_irc(cmd, section, signal) \
         command_bind_proto(cmd, IRC_PROTOCOL, section, signal)
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index 950e5029..e65abe25 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include "chat-protocols.h"
-#include "settings.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-chatnets.h"
-#include "irc-channels.h"
-#include "irc-queries.h"
-#include "irc-cap.h"
-#include "sasl.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-chatnets.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/irc/core/irc-cap.h>
+#include <irssi/src/irc/core/sasl.h>
 
-#include "irc-servers-setup.h"
-#include "channels-setup.h"
+#include <irssi/src/irc/core/irc-servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
-#include "ctcp.h"
-#include "irc-commands.h"
-#include "netsplit.h"
+#include <irssi/src/irc/core/ctcp.h>
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/src/irc/core/netsplit.h>
 
 void irc_expandos_init(void);
 void irc_expandos_deinit(void);
diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 62ef577a..625e6e8b 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "expandos.h"
-#include "settings.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "nicklist.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/core/nicklist.h>
 
 #ifndef HOST_NAME_MAX
 #define HOST_NAME_MAX 255
diff --git a/src/irc/core/irc-masks.c b/src/irc/core/irc-masks.c
index d93a083d..e2c5aea6 100644
--- a/src/irc/core/irc-masks.c
+++ b/src/irc/core/irc-masks.c
@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "network.h"
+#include <irssi/src/core/network.h>
 
-#include "irc-masks.h"
+#include <irssi/src/irc/core/irc-masks.h>
 
 static char *get_domain_mask(char *host)
 {
diff --git a/src/irc/core/irc-masks.h b/src/irc/core/irc-masks.h
index 680877c9..e152c52a 100644
--- a/src/irc/core/irc-masks.h
+++ b/src/irc/core/irc-masks.h
@@ -1,7 +1,7 @@
 #ifndef __IRC_MASKS_H
 #define __IRC_MASKS_H
 
-#include "masks.h"
+#include <irssi/src/core/masks.h>
 
 #define IRC_MASK_NICK   0x01
 #define IRC_MASK_USER   0x02
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 3e16db80..54a9bd3b 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-masks.h"
-#include "irc-nicklist.h"
-#include "modes.h"
-#include "servers.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-masks.h>
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/core/servers.h>
 
 /* Add new nick to list */
 NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
diff --git a/src/irc/core/irc-nicklist.h b/src/irc/core/irc-nicklist.h
index 2ae17d2c..e9b30f30 100644
--- a/src/irc/core/irc-nicklist.h
+++ b/src/irc/core/irc-nicklist.h
@@ -1,7 +1,7 @@
 #ifndef __IRC_NICKLIST_H
 #define __IRC_NICKLIST_H
 
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 
 /* Add new nick to list */
 NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 64995ead..9c7eb6a9 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-nicklist.h"
-#include "irc-servers.h"
-#include "irc-queries.h"
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-queries.h>
 
 QUERY_REC *irc_query_create(const char *server_tag,
 			    const char *nick, int automatic)
diff --git a/src/irc/core/irc-queries.h b/src/irc/core/irc-queries.h
index 0a3cc7a5..323006ad 100644
--- a/src/irc/core/irc-queries.h
+++ b/src/irc/core/irc-queries.h
@@ -1,8 +1,8 @@
 #ifndef __IRC_QUERIES_H
 #define __IRC_QUERIES_H
 
-#include "chat-protocols.h"
-#include "queries.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/queries.h>
 
 /* Returns IRC_QUERY_REC if it's IRC query, NULL if it isn't. */
 #define IRC_QUERY(query) \
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index ca61492d..3d2933f4 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "commands.h"
-#include "network.h"
-#include "signals.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
 
-#include "modes.h"
-#include "irc-servers.h"
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "settings.h"
+#include <irssi/src/core/settings.h>
 
 static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 				    IRC_SERVER_CONNECT_REC *src)
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 0af93902..56e52edd 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "network.h"
-#include "servers-setup.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-chatnets.h"
-#include "irc-servers-setup.h"
-#include "irc-servers.h"
-#include "sasl.h"
+#include <irssi/src/irc/core/irc-chatnets.h>
+#include <irssi/src/irc/core/irc-servers-setup.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/sasl.h>
 
 /* Fill information to connection from server setup record */
 static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index 92629c2b..ac2ca2fc 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -1,8 +1,8 @@
 #ifndef __IRC_SERVERS_SETUP_H
 #define __IRC_SERVERS_SETUP_H
 
-#include "chat-protocols.h"
-#include "servers-setup.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers-setup.h>
 
 #define IRC_SERVER_SETUP(server) \
 	PROTO_CHECK_CAST(SERVER_SETUP(server), IRC_SERVER_SETUP_REC, \
@@ -12,7 +12,7 @@
 	(IRC_SERVER_SETUP(server) ? TRUE : FALSE)
 
 typedef struct {
-#include "server-setup-rec.h"
+#include <irssi/src/core/server-setup-rec.h>
 
         /* override the default if > 0 */
 	int max_cmds_at_once;
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 03c73312..7057c02a 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -20,30 +20,30 @@
 
 #include "module.h"
 
-#include "net-sendbuffer.h"
-#include "signals.h"
-#include "rawlog.h"
-#include "misc.h"
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/misc.h>
 
-#include "channels.h"
-#include "queries.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
-#include "irc-nicklist.h"
-#include "irc-queries.h"
-#include "irc-servers-setup.h"
-#include "irc-servers.h"
-#include "irc-cap.h"
-#include "sasl.h"
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/irc/core/irc-servers-setup.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-cap.h>
+#include <irssi/src/irc/core/sasl.h>
 
-#include "channels-setup.h"
-#include "channel-rejoin.h"
-#include "servers-idle.h"
-#include "servers-reconnect.h"
-#include "servers-redirect.h"
-#include "modes.h"
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/irc/core/channel-rejoin.h>
+#include <irssi/src/irc/core/servers-idle.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssi/src/irc/core/modes.h>
 
-#include "settings.h"
-#include "recode.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/recode.h>
 
 #define DEFAULT_MAX_KICKS 1
 #define DEFAULT_MAX_MODES 3
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 1374e846..c798a03b 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -1,9 +1,9 @@
 #ifndef __IRC_SERVERS_H
 #define __IRC_SERVERS_H
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "modes.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/irc/core/modes.h>
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \
@@ -22,7 +22,7 @@
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _IRC_SERVER_CONNECT_REC {
-#include "server-connect-rec.h"
+#include <irssi/src/core/server-connect-rec.h>
 
 	char *usermode;
 	char *alternate_nick;
@@ -40,7 +40,7 @@ struct _IRC_SERVER_CONNECT_REC {
 
 #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC
 struct _IRC_SERVER_REC {
-#include "server-rec.h"
+#include <irssi/src/core/server-rec.h>
 
 	/* For deciding if event should be redirected */
 	GSList *redirects;
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index 18e8e5c7..ec2c86ee 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "net-sendbuffer.h"
-#include "lib-config/iconfig.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-nicklist.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-nicklist.h>
 
-#include "sasl.h"
+#include <irssi/src/irc/core/sasl.h>
 
 struct _isupport_data { CONFIG_REC *config; CONFIG_NODE *node; };
 
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index a740b0da..4940fcb4 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "rawlog.h"
-#include "misc.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "servers-redirect.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
 char *current_server_event;
 static int signal_default_event;
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index b5bd833a..d018b90c 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -49,7 +49,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 		       int send_now, int immediate, int raw);
 
 /* Get count parameters from data */
-#include "commands.h"
+#include <irssi/src/core/commands.h>
 char *event_get_param(char **data);
 char *event_get_params(const char *data, int count, ...);
 
diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index 787505f0..d3d6118d 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "servers-redirect.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
 static int timeout_tag;
 
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 6cc2b7c7..ec63a0b3 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-nicklist.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-nicklist.h>
 
 static int massjoin_tag;
 static int massjoin_max_joins;
diff --git a/src/irc/core/mode-lists.c b/src/irc/core/mode-lists.c
index 73b7a6b2..d2d7234f 100644
--- a/src/irc/core/mode-lists.c
+++ b/src/irc/core/mode-lists.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "signals.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/signals.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "mode-lists.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/mode-lists.h>
 
 static void ban_free(GSList **list, BAN_REC *rec)
 {
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index cc3d0faf..b0de2f18 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-commands.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "servers-redirect.h"
-#include "modes.h"
-#include "mode-lists.h"
-#include "nicklist.h"
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/mode-lists.h>
+#include <irssi/src/core/nicklist.h>
 
 /* Change nick's mode in channel */
 static void nick_mode_change(IRC_CHANNEL_REC *channel, const char *nick,
diff --git a/src/irc/core/modes.h b/src/irc/core/modes.h
index bef017ba..9442dd5e 100644
--- a/src/irc/core/modes.h
+++ b/src/irc/core/modes.h
@@ -1,8 +1,8 @@
 #ifndef __MODES_H
 #define __MODES_H
 
-#include "irc-channels.h"
-#include "nicklist.h" /* MAX_USER_PREFIXES */
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/core/nicklist.h> /* MAX_USER_PREFIXES */
 
 typedef void mode_func_t(IRC_CHANNEL_REC *, const char *, char, char,
 			 char *, GString *);
diff --git a/src/irc/core/module.h b/src/irc/core/module.h
index 19c0b3cc..41800038 100644
--- a/src/irc/core/module.h
+++ b/src/irc/core/module.h
@@ -1,4 +1,4 @@
-#include "common.h"
-#include "irc.h"
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 #define MODULE_NAME "irc/core"
diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 0642846f..1463f962 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "netsplit.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/netsplit.h>
 
 /* How long to keep netsplits in memory (seconds) */
 #define NETSPLIT_MAX_REMEMBER (60*60)
diff --git a/src/irc/core/netsplit.h b/src/irc/core/netsplit.h
index cbe3f26f..7cdee694 100644
--- a/src/irc/core/netsplit.h
+++ b/src/irc/core/netsplit.h
@@ -1,7 +1,7 @@
 #ifndef __NETSPLIT_H
 #define __NETSPLIT_H
 
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 
 typedef struct {
 	char *server;
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 92eb6244..22a10ec7 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-cap.h"
-#include "irc-servers.h"
-#include "sasl.h"
+#include <irssi/src/irc/core/irc-cap.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/sasl.h>
 
 /*
  * Based on IRCv3 SASL Extension Specification:
diff --git a/src/irc/core/servers-idle.c b/src/irc/core/servers-idle.c
index 2b1851af..93c8f05a 100644
--- a/src/irc/core/servers-idle.c
+++ b/src/irc/core/servers-idle.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
-#include "irc-servers.h"
-#include "servers-idle.h"
-#include "servers-redirect.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/servers-idle.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
 typedef struct {
 	char *cmd;
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index aeb9c010..770aa4c2 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "rawlog.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/rawlog.h>
 
-#include "irc-servers.h"
-#include "servers-redirect.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
 #define DEFAULT_REDIRECT_TIMEOUT 60
 
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index cf1e2ff5..a81bf84d 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -1,9 +1,6 @@
 noinst_LIBRARIES = libirc_dcc.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
 	$(GLIB_CFLAGS)
 
 libirc_dcc_a_SOURCES = \
diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index dd12f438..ba0bed0b 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "masks.h"
-#include "settings.h"
-#include "servers.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/masks.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
 
-#include "dcc-get.h"
+#include <irssi/src/irc/dcc/dcc-get.h>
 
 static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 {
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 5e03042f..987a5ba9 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "recode.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "irc-queries.h"
-#include "masks.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/core/masks.h>
 
-#include "dcc-chat.h"
+#include <irssi/src/irc/dcc/dcc-chat.h>
 
 static char *dcc_chat_get_new_id(const char *nick)
 {
diff --git a/src/irc/dcc/dcc-chat.h b/src/irc/dcc/dcc-chat.h
index c8f2cea9..a22fe75d 100644
--- a/src/irc/dcc/dcc-chat.h
+++ b/src/irc/dcc/dcc-chat.h
@@ -1,7 +1,7 @@
 #ifndef __DCC_CHAT_H
 #define __DCC_CHAT_H
 
-#include "dcc.h"
+#include <irssi/src/irc/dcc/dcc.h>
 
 #define DCC_CHAT(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, CHAT_DCC_REC, type, "DCC", "CHAT")
@@ -10,7 +10,7 @@
 	(DCC_CHAT(dcc) ? TRUE : FALSE)
 
 struct CHAT_DCC_REC {
-#include "dcc-rec.h"
+#include <irssi/src/irc/dcc/dcc-rec.h>
 
 	char *id; /* unique identifier - usually same as nick. */
 	NET_SENDBUF_REC *sendbuf;
diff --git a/src/irc/dcc/dcc-file-rec.h b/src/irc/dcc/dcc-file-rec.h
index fe66a985..28a488e4 100644
--- a/src/irc/dcc/dcc-file-rec.h
+++ b/src/irc/dcc/dcc-file-rec.h
@@ -1,4 +1,4 @@
-#include "dcc-rec.h"
+#include <irssi/src/irc/dcc/dcc-rec.h>
 
 uoff_t size, skipped; /* file size / skipped at start */
 int fhandle; /* file handle */
diff --git a/src/irc/dcc/dcc-file.h b/src/irc/dcc/dcc-file.h
index 4ff4a2e9..ef32f07c 100644
--- a/src/irc/dcc/dcc-file.h
+++ b/src/irc/dcc/dcc-file.h
@@ -1,10 +1,10 @@
 #ifndef __DCC_FILE_H
 #define __DCC_FILE_H
 
-#include "dcc.h"
+#include <irssi/src/irc/dcc/dcc.h>
 
 typedef struct {
-#include "dcc-file-rec.h"
+#include <irssi/src/irc/dcc/dcc-file-rec.h>
 } FILE_DCC_REC;
 
 #endif
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index ee8b9a49..0191c679 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "misc.h"
-#include "settings.h"
-#include "net-sendbuffer.h"
-#include "irc-servers.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "dcc-get.h"
-#include "dcc-send.h"
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/src/irc/dcc/dcc-send.h>
 
 static char *dcc_get_recv_buffer;
 
diff --git a/src/irc/dcc/dcc-get.h b/src/irc/dcc/dcc-get.h
index 7ac7b3c1..b6ee385c 100644
--- a/src/irc/dcc/dcc-get.h
+++ b/src/irc/dcc/dcc-get.h
@@ -1,7 +1,7 @@
 #ifndef __DCC_GET_H
 #define __DCC_GET_H
 
-#include "dcc.h"
+#include <irssi/src/irc/dcc/dcc.h>
 
 #define DCC_GET(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, GET_DCC_REC, type, "DCC", "GET")
@@ -18,7 +18,7 @@ enum {
 };
 
 typedef struct {
-#include "dcc-file-rec.h"
+#include <irssi/src/irc/dcc/dcc-file-rec.h>
 
 	int get_type; /* what to do if file exists? */
 	char *file; /* file name we're really moving, arg is just the reference */
diff --git a/src/irc/dcc/dcc-queue.c b/src/irc/dcc/dcc-queue.c
index 895f9e44..0253be4f 100644
--- a/src/irc/dcc/dcc-queue.c
+++ b/src/irc/dcc/dcc-queue.c
@@ -21,15 +21,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "settings.h"
-#include "irc-servers.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "dcc-queue.h"
+#include <irssi/src/irc/dcc/dcc-queue.h>
 
 static GPtrArray *queuelist;
 
diff --git a/src/irc/dcc/dcc-queue.h b/src/irc/dcc/dcc-queue.h
index b05beb47..8c1a9b46 100644
--- a/src/irc/dcc/dcc-queue.h
+++ b/src/irc/dcc/dcc-queue.h
@@ -1,7 +1,7 @@
 #ifndef __DCC_QUEUE_H_
 #define __DCC_QUEUE_H_
 
-#include "dcc-chat.h"
+#include <irssi/src/irc/dcc/dcc-chat.h>
 
 enum {
 	DCC_QUEUE_NORMAL,
diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c
index ce0ac925..b0438e79 100644
--- a/src/irc/dcc/dcc-resume.c
+++ b/src/irc/dcc/dcc-resume.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
 
-#include "dcc-file.h"
-#include "dcc-get.h"
-#include "dcc-send.h"
-#include "dcc-chat.h"
+#include <irssi/src/irc/dcc/dcc-file.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/dcc/dcc-chat.h>
 
 static FILE_DCC_REC *dcc_resume_find(int type, const char *nick, int port)
 {
diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c
index 50009287..6eabd25f 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "dcc-send.h"
-#include "dcc-chat.h"
-#include "dcc-queue.h"
+#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/src/irc/dcc/dcc-queue.h>
 
 #include <glob.h>
 
diff --git a/src/irc/dcc/dcc-send.h b/src/irc/dcc/dcc-send.h
index 378f1c54..a0ee1ade 100644
--- a/src/irc/dcc/dcc-send.h
+++ b/src/irc/dcc/dcc-send.h
@@ -1,7 +1,7 @@
 #ifndef __DCC_SEND_H
 #define __DCC_SEND_H
 
-#include "dcc.h"
+#include <irssi/src/irc/dcc/dcc.h>
 
 #define DCC_SEND(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, SEND_DCC_REC, type, "DCC", "SEND")
@@ -10,7 +10,7 @@
 	(DCC_SEND(dcc) ? TRUE : FALSE)
 
 typedef struct {
-#include "dcc-file-rec.h"
+#include <irssi/src/irc/dcc/dcc-file-rec.h>
 
 	unsigned int file_quoted:1; /* file name was received quoted ("file name") */
 
diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c
index 7ae572cd..0a6c0acf 100644
--- a/src/irc/dcc/dcc-server.c
+++ b/src/irc/dcc/dcc-server.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc-servers.h"
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "dcc-chat.h"
-#include "dcc-get.h"
-#include "dcc-server.h"
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/src/irc/dcc/dcc-server.h>
 
 void sig_dccget_connected(GET_DCC_REC *dcc);
 GET_DCC_REC *dcc_get_create(IRC_SERVER_REC *server, CHAT_DCC_REC *chat,
diff --git a/src/irc/dcc/dcc-server.h b/src/irc/dcc/dcc-server.h
index 72435cbf..a1973b5f 100644
--- a/src/irc/dcc/dcc-server.h
+++ b/src/irc/dcc/dcc-server.h
@@ -1,7 +1,7 @@
 #ifndef __DCC_SERVER_H
 #define __DCC_SERVER_H
 
-#include "dcc.h"
+#include <irssi/src/irc/dcc/dcc.h>
 
 #define DCC_SERVER(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, SERVER_DCC_REC, type, "DCC", "SERVER")
@@ -10,7 +10,7 @@
 	(DCC_SERVER(dcc) ? TRUE : FALSE)
 
 struct SERVER_DCC_REC {
-#include "dcc-rec.h"
+#include <irssi/src/irc/dcc/dcc-rec.h>
 	NET_SENDBUF_REC *sendbuf;
 
 	unsigned int accept_send:1;   /* Accept SEND connections */
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 01ab0e59..006a2b77 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "misc.h"
-#include "settings.h"
-#include "ignore.h"
-#include "levels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/levels.h>
 
-#include "irc-servers.h"
-#include "servers-setup.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/servers-setup.h>
 
-#include "dcc-chat.h"
-#include "dcc-get.h"
-#include "dcc-send.h"
-#include "dcc-server.h"
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/dcc/dcc-server.h>
 
 void dcc_resume_init(void);
 void dcc_resume_deinit(void);
diff --git a/src/irc/dcc/dcc.h b/src/irc/dcc/dcc.h
index 144cc89b..5f54ee18 100644
--- a/src/irc/dcc/dcc.h
+++ b/src/irc/dcc/dcc.h
@@ -1,15 +1,15 @@
 #ifndef __DCC_H
 #define __DCC_H
 
-#include "modules.h"
-#include "network.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/network.h>
 
 #define DCC(dcc) ((DCC_REC *) (dcc))
 
 typedef struct CHAT_DCC_REC CHAT_DCC_REC;
 
 typedef struct {
-#include "dcc-rec.h"
+#include <irssi/src/irc/dcc/dcc-rec.h>
 } DCC_REC;
 
 /* fully connected? */
diff --git a/src/irc/dcc/module.h b/src/irc/dcc/module.h
index 8436945d..4330d0a3 100644
--- a/src/irc/dcc/module.h
+++ b/src/irc/dcc/module.h
@@ -1,4 +1,4 @@
-#include "common.h"
-#include "irc.h"
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 #define MODULE_NAME "irc/dcc"
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index 1c4d786a..b582ffe4 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -1,9 +1,6 @@
 noinst_LIBRARIES = libirc_flood.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
 	$(GLIB_CFLAGS)
 
 libirc_flood_a_SOURCES = \
diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c
index 86ff3ec5..33bd91f4 100644
--- a/src/irc/flood/autoignore.c
+++ b/src/irc/flood/autoignore.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "ignore.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/ignore.h>
 
 void autoignore_update(IGNORE_REC *rec, int level)
 {
diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c
index b528f707..886a266c 100644
--- a/src/irc/flood/flood.c
+++ b/src/irc/flood/flood.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "ignore.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/ignore.h>
 
 void autoignore_init(void);
 void autoignore_deinit(void);
diff --git a/src/irc/flood/module.h b/src/irc/flood/module.h
index fc7eceeb..a80c46f7 100644
--- a/src/irc/flood/module.h
+++ b/src/irc/flood/module.h
@@ -1,5 +1,5 @@
-#include "common.h"
-#include "irc.h"
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 typedef struct {
 	/* Flood protection */
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index abd9d18d..421bc7d4 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -1,9 +1,6 @@
 noinst_LIBRARIES = libirc_notifylist.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
 	$(GLIB_CFLAGS)
 
 libirc_notifylist_a_SOURCES = \
diff --git a/src/irc/notifylist/module.h b/src/irc/notifylist/module.h
index c7239a88..f109afff 100644
--- a/src/irc/notifylist/module.h
+++ b/src/irc/notifylist/module.h
@@ -1,5 +1,5 @@
-#include "common.h"
-#include "irc.h"
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 #define MODULE_NAME "irc/notifylist"
 
@@ -23,7 +23,7 @@ typedef struct {
 	GSList *ison_tempusers; /* Temporary list for saving /ISON events.. */
 } MODULE_SERVER_REC;
 
-#include "irc-servers.h"
+#include <irssi/src/irc/core/irc-servers.h>
 
 NOTIFY_NICK_REC *notify_nick_create(IRC_SERVER_REC *server, const char *nick);
 void notify_nick_destroy(NOTIFY_NICK_REC *rec);
diff --git a/src/irc/notifylist/notify-commands.c b/src/irc/notifylist/notify-commands.c
index 0d4fd4f2..e7bceaac 100644
--- a/src/irc/notifylist/notify-commands.c
+++ b/src/irc/notifylist/notify-commands.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "notifylist.h"
+#include <irssi/src/irc/notifylist/notifylist.h>
 
 /* SYNTAX: NOTIFY [-away] <mask> [<ircnets>] */
 static void cmd_notify(gchar *data)
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index 8a8865cc..39292896 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "servers-redirect.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
-#include "notifylist.h"
+#include <irssi/src/irc/notifylist/notifylist.h>
 
 #define DEFAULT_NOTIFY_CHECK_TIME "1min"
 #define DEFAULT_NOTIFY_WHOIS_TIME "5min"
diff --git a/src/irc/notifylist/notify-setup.c b/src/irc/notifylist/notify-setup.c
index 9ea481ca..62f983e2 100644
--- a/src/irc/notifylist/notify-setup.c
+++ b/src/irc/notifylist/notify-setup.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc-servers.h"
-#include "notifylist.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/notifylist/notifylist.h>
 
 void notifylist_add_config(NOTIFYLIST_REC *rec)
 {
diff --git a/src/irc/notifylist/notify-whois.c b/src/irc/notifylist/notify-whois.c
index 2d0736b5..bdfd72b4 100644
--- a/src/irc/notifylist/notify-whois.c
+++ b/src/irc/notifylist/notify-whois.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "expandos.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/expandos.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "masks.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/masks.h>
 
-#include "notifylist.h"
+#include <irssi/src/irc/notifylist/notifylist.h>
 
 static char *last_notify_nick;
 
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index 4fd5ef1a..475e92c8 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
-#include "irc.h"
-#include "irc-channels.h"
-#include "servers-redirect.h"
-#include "masks.h"
-#include "nicklist.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssi/src/core/masks.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "notifylist.h"
-#include "notify-setup.h"
+#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssi/src/irc/notifylist/notify-setup.h>
 
 GSList *notifies;
 
diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am
index 4eb73bb8..6411f49d 100644
--- a/src/irc/proxy/Makefile.am
+++ b/src/irc/proxy/Makefile.am
@@ -2,9 +2,6 @@ moduledir = $(libdir)/irssi/modules
 module_LTLIBRARIES = libirc_proxy.la
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
 	$(GLIB_CFLAGS)
 
 libirc_proxy.a:
diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index e39c21a6..82dc1fe5 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "settings.h"
-#include "irssi-version.h"
-#include "recode.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/irssi-version.h>
+#include <irssi/src/core/recode.h>
 
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-nicklist.h"
-#include "modes.h"
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/modes.h>
 
 void proxy_outdata(CLIENT_REC *client, const char *data, ...)
 {
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index cde4c0be..37e2a939 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "net-sendbuffer.h"
-#include "servers-redirect.h"
-#include "levels.h"
-#include "settings.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.h>
 
-#include "irc.h"
-#include "irc-channels.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-channels.h>
 
-#include "fe-common/core/printtext.h" /* FIXME: evil. need to do fe-proxy */
+#include <irssi/src/fe-common/core/printtext.h> /* FIXME: evil. need to do fe-proxy */
 
 #include <sys/un.h>
 
diff --git a/src/irc/proxy/module.h b/src/irc/proxy/module.h
index ff95227f..b6ad3a4c 100644
--- a/src/irc/proxy/module.h
+++ b/src/irc/proxy/module.h
@@ -1,12 +1,12 @@
-#include "common.h"
+#include <irssi/src/common.h>
 
 #define MODULE_NAME "proxy"
 
-#include "network.h"
-#include "irc.h"
-#include "irc-servers.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include "proxy.h"
+#include <irssi/src/irc/proxy/proxy.h>
 
 extern GSList *proxy_listens;
 extern GSList *proxy_clients;
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index 2875d2c2..d32b6009 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "levels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
 
-#include "fe-common/core/printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 /* SYNTAX: IRSSIPROXY STATUS */
 static void cmd_irssiproxy_status(const char *data, IRC_SERVER_REC *server)
diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h
index 620ea605..2cbaf69d 100644
--- a/src/irc/proxy/proxy.h
+++ b/src/irc/proxy/proxy.h
@@ -1,11 +1,11 @@
 #ifndef PROXY_H
 #define PROXY_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
-#include "network.h"
-#include "irc.h"
-#include "irc-servers.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
 typedef struct {
 	int port;
diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am
index 06c7787c..d644eae5 100644
--- a/src/lib-config/Makefile.am
+++ b/src/lib-config/Makefile.am
@@ -1,7 +1,6 @@
 noinst_LIBRARIES = libirssi_config.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
 	$(GLIB_CFLAGS)
 
 libirssi_config_a_SOURCES = \
diff --git a/src/lib-config/module.h b/src/lib-config/module.h
index 22e0e7c7..eb09d70e 100644
--- a/src/lib-config/module.h
+++ b/src/lib-config/module.h
@@ -1,5 +1,5 @@
-#include "common.h"
-#include "iconfig.h"
+#include <irssi/src/common.h>
+#include <irssi/src/lib-config/iconfig.h>
 
 /* private */
 int config_error(CONFIG_REC *rec, const char *msg);
diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am
index 7cc02d6d..ac40cbac 100644
--- a/src/otr/Makefile.am
+++ b/src/otr/Makefile.am
@@ -8,11 +8,6 @@ EXTRA_LTLIBRARIES = \
 	libotr_core_static.la
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core/ \
-	-I$(top_srcdir)/src/irc/core/ \
-	-I$(top_srcdir)/src/fe-common/core/ \
-	-I$(top_srcdir)/src/fe-text/ \
 	$(GLIB_CFLAGS) \
 	$(OTR_CFLAGS)
 
diff --git a/src/otr/key.c b/src/otr/key.c
index 7fee4084..27de0226 100644
--- a/src/otr/key.c
+++ b/src/otr/key.c
@@ -28,15 +28,15 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "key.h"
+#include <irssi/src/otr/key.h>
 
-#include "levels.h"
-#include "network.h"
-#include "pidwait.h"
-#include "printtext.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include "irssi-otr.h"
-#include "otr-formats.h"
+#include <irssi/src/otr/irssi-otr.h>
+#include <irssi/src/otr/otr-formats.h>
 
 /*
  * Status of key generation.
diff --git a/src/otr/key.h b/src/otr/key.h
index 259a8e67..e9476953 100644
--- a/src/otr/key.h
+++ b/src/otr/key.h
@@ -21,10 +21,10 @@
 #ifndef IRSSI_OTR_KEY_H
 #define IRSSI_OTR_KEY_H
 
-#include "common.h"
-#include "servers.h"
+#include <irssi/src/common.h>
+#include <irssi/src/core/servers.h>
 
-#include "otr.h"
+#include <irssi/src/otr/otr.h>
 
 void key_gen_run(struct otr_user_state *ustate, const char *account_name);
 void key_load(struct otr_user_state *ustate);
diff --git a/src/otr/module.h b/src/otr/module.h
index 513ee03b..dab26345 100644
--- a/src/otr/module.h
+++ b/src/otr/module.h
@@ -21,8 +21,8 @@
 #ifndef IRSSI_OTR_MODULE
 #define IRSSI_OTR_MODULE
 
-#include "common.h"
-#include "servers.h"
+#include <irssi/src/common.h>
+#include <irssi/src/core/servers.h>
 
 void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target);
 
diff --git a/src/otr/otr-fe.c b/src/otr/otr-fe.c
index 13e37576..80b50ae5 100644
--- a/src/otr/otr-fe.c
+++ b/src/otr/otr-fe.c
@@ -20,18 +20,18 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#include "common.h"
-#include "levels.h"
-#include "printtext.h"
-#include "commands.h"
-#include "irc.h"
-#include "irc-servers.h"
-#include "irc-queries.h"
-#include "statusbar-item.h"
+#include <irssi/src/common.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/fe-text/statusbar-item.h>
 
-#include "otr.h"
-#include "otr-formats.h"
-#include "key.h"
+#include <irssi/src/otr/otr.h>
+#include <irssi/src/otr/otr-formats.h>
+#include <irssi/src/otr/key.h>
 
 static void cmd_otr(const char *data, SERVER_REC *server, void *item)
 {
diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c
index e430b6b5..d26edbba 100644
--- a/src/otr/otr-formats.c
+++ b/src/otr/otr-formats.c
@@ -19,8 +19,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#include "otr.h"
-#include "otr-formats.h"
+#include <irssi/src/otr/otr.h>
+#include <irssi/src/otr/otr-formats.h>
 
 FORMAT_REC fe_otr_formats[] = {
 	{ MODULE_NAME, "Core", 0 },
diff --git a/src/otr/otr-formats.h b/src/otr/otr-formats.h
index 454b2f6c..cf895dcb 100644
--- a/src/otr/otr-formats.h
+++ b/src/otr/otr-formats.h
@@ -22,7 +22,7 @@
 #ifndef IRSSI_OTR_FORMATS_H
 #define IRSSI_OTR_FORMATS_H
 
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 /*
  * Must be in sync with the fe_otr_formats array.
diff --git a/src/otr/otr-module.c b/src/otr/otr-module.c
index f561b91c..6fe4c9f2 100644
--- a/src/otr/otr-module.c
+++ b/src/otr/otr-module.c
@@ -24,21 +24,21 @@
 
 #include "module.h"
 
-#include "common.h"
-#include "signals.h"
-#include "queries.h"
-#include "commands.h"
+#include <irssi/src/common.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/commands.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "irc-queries.h"
-#include "irc-commands.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/irc/core/irc-commands.h>
 
-#include "key.h"
-#include "otr.h"
-#include "otr-formats.h"
-#include "otr-fe.h"
-#include "misc.h"
+#include <irssi/src/otr/key.h>
+#include <irssi/src/otr/otr.h>
+#include <irssi/src/otr/otr-formats.h>
+#include <irssi/src/otr/otr-fe.h>
+#include <irssi/src/core/misc.h>
 
 /*
  * Global state for the user. Init when the module loads.
diff --git a/src/otr/otr-ops.c b/src/otr/otr-ops.c
index 4e8c4e81..f87e6e94 100644
--- a/src/otr/otr-ops.c
+++ b/src/otr/otr-ops.c
@@ -17,17 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#include "common.h"
+#include <irssi/src/common.h>
 
-#include "signals.h"
-#include "levels.h"
-#include "printtext.h"
-#include "fe-windows.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
 
-#include "key.h"
+#include <irssi/src/otr/key.h>
 #include "module.h"
-#include "otr-formats.h"
-#include "irssi-otr.h"
+#include <irssi/src/otr/otr-formats.h>
+#include <irssi/src/otr/irssi-otr.h>
 
 static OtrlPolicy OTR_DEFAULT_POLICY = OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE;
 
diff --git a/src/otr/otr.c b/src/otr/otr.c
index 9f0192e1..80604513 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -24,15 +24,15 @@
 #include <gcrypt.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "levels.h"
-#include "signals.h"
-#include "printtext.h"
-#include "statusbar-item.h"
+#include <irssi/src/common.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-text/statusbar-item.h>
 
-#include "irssi-otr.h"
-#include "otr-formats.h"
-#include "key.h"
+#include <irssi/src/otr/irssi-otr.h>
+#include <irssi/src/otr/otr-formats.h>
+#include <irssi/src/otr/key.h>
 
 static int otr_debug = 0;
 
diff --git a/src/otr/otr.h b/src/otr/otr.h
index 60a08184..e0324a13 100644
--- a/src/otr/otr.h
+++ b/src/otr/otr.h
@@ -28,8 +28,8 @@
 #include <libotr/context.h>
 #include <libotr/privkey.h>
 
-#include "common.h"
-#include "servers.h"
+#include <irssi/src/common.h>
+#include <irssi/src/core/servers.h>
 
 /* irssi module name */
 #define MODULE_NAME                   "otr/core"
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index db52744e..0e56d7a3 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -15,9 +15,6 @@ perl-core.lo: irssi-core.pl.h
 perl-signals.lo: perl-signals-list.h
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
-	-I$(top_srcdir)/src/fe-common/core \
 	$(GLIB_CFLAGS) \
 	-DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \
 	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index 7c72f646..75b851d6 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -1,12 +1,12 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "irssi-version.h"
-#include "core.h"
-#include "utf8.h"
-#include "recode.h"
+#include <irssi/irssi-version.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/core/utf8.h>
+#include <irssi/src/core/recode.h>
 
-#include "pidwait.h"
-#include "session.h"
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/session.h>
 
 #define DEFAULT_COMMAND_CATEGORY "Perl scripts' commands"
 
diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs
index 84853a02..1dc36d27 100644
--- a/src/perl/common/Expando.xs
+++ b/src/perl/common/Expando.xs
@@ -1,6 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "expandos.h"
+#include <irssi/src/core/expandos.h>
 
 typedef struct {
 	PERL_SCRIPT_REC *script;
diff --git a/src/perl/common/Makefile.PL.in b/src/perl/common/Makefile.PL.in
index 70b1d258..2b087d08 100644
--- a/src/perl/common/Makefile.PL.in
+++ b/src/perl/common/Makefile.PL.in
@@ -3,5 +3,5 @@ use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';requi
 WriteMakefile('NAME' => 'Irssi',
               'LIBS' => '',
 	      'OBJECT' => '$(O_FILES)',
-              'INC' => '-I../../.. -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/src/core @GLIB_CFLAGS@',
+              'INC' => '-I../../.. @GLIB_CFLAGS@',
 	      'VERSION_FROM' => '@srcdir@/Irssi.pm');
diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs
index eb81b627..d1bce856 100644
--- a/src/perl/common/Settings.xs
+++ b/src/perl/common/Settings.xs
@@ -1,6 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "misc.h"
+#include <irssi/src/core/misc.h>
 
 static GHashTable *perl_settings;
 
diff --git a/src/perl/common/module.h b/src/perl/common/module.h
index 07ecc56f..92a712f8 100644
--- a/src/perl/common/module.h
+++ b/src/perl/common/module.h
@@ -1,32 +1,32 @@
 #define NEED_PERL_H
 #define HAVE_CONFIG_H
-#include "../module.h"
+#include <irssi/src/perl/module.h>
 #include <XSUB.h>
 
-#include "network.h"
-#include "levels.h"
-#include "commands.h"
-#include "log.h"
-#include "rawlog.h"
-#include "ignore.h"
-#include "settings.h"
-#include "masks.h"
-#include "special-vars.h"
-#include "window-item-def.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/masks.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/window-item-def.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-reconnect.h"
-#include "servers-setup.h"
-#include "channels.h"
-#include "queries.h"
-#include "nicklist.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "perl/perl-core.h"
-#include "perl/perl-common.h"
-#include "perl/perl-signals.h"
-#include "perl/perl-sources.h"
+#include <irssi/src/perl/perl-core.h>
+#include <irssi/src/perl/perl-common.h>
+#include <irssi/src/perl/perl-signals.h>
+#include <irssi/src/perl/perl-sources.h>
 
 typedef COMMAND_REC *Irssi__Command;
 typedef LOG_REC *Irssi__Log;
diff --git a/src/perl/irc/Ctcp.xs b/src/perl/irc/Ctcp.xs
index d1bf8ba4..34978870 100644
--- a/src/perl/irc/Ctcp.xs
+++ b/src/perl/irc/Ctcp.xs
@@ -1,6 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "ctcp.h"
+#include <irssi/src/irc/core/ctcp.h>
 
 MODULE = Irssi::Irc::Ctcp	PACKAGE = Irssi
 PROTOTYPES: ENABLE
diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in
index 582160a0..561308c7 100644
--- a/src/perl/irc/Makefile.PL.in
+++ b/src/perl/irc/Makefile.PL.in
@@ -4,5 +4,5 @@ WriteMakefile('NAME' => 'Irssi::Irc',
               'LIBS' => '',
 	      'OBJECT' => '$(O_FILES)',
               'TYPEMAPS' => ['../common/typemap'],
-              'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/irc/core -I@top_srcdir@/src/irc @GLIB_CFLAGS@',
+              'INC' => '-I../../.. @GLIB_CFLAGS@',
 	      'VERSION_FROM' => '@srcdir@/Irc.pm');
diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h
index a2454545..71801419 100644
--- a/src/perl/irc/module.h
+++ b/src/perl/irc/module.h
@@ -1,27 +1,27 @@
-#include "../common/module.h"
+#include <irssi/src/perl/common/module.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
-#include "irc-queries.h"
-#include "irc-nicklist.h"
-#include "irc-masks.h"
-#include "irc-cap.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/irc-masks.h>
+#include <irssi/src/irc/core/irc-cap.h>
 
-#include "bans.h"
-#include "modes.h"
-#include "mode-lists.h"
-#include "netsplit.h"
-#include "servers-redirect.h"
+#include <irssi/src/irc/core/bans.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/mode-lists.h>
+#include <irssi/src/irc/core/netsplit.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
-#include "dcc/dcc.h"
-#include "dcc/dcc-file.h"
-#include "dcc/dcc-chat.h"
-#include "dcc/dcc-get.h"
-#include "dcc/dcc-send.h"
-#include "notifylist/notifylist.h"
+#include <irssi/src/irc/dcc/dcc.h>
+#include <irssi/src/irc/dcc/dcc-file.h>
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/notifylist/notifylist.h>
 
-#include "proxy/proxy.h"
+#include <irssi/src/irc/proxy/proxy.h>
 
 typedef IRC_SERVER_REC *Irssi__Irc__Server;
 typedef IRC_SERVER_CONNECT_REC *Irssi__Irc__Connect;
diff --git a/src/perl/module-formats.c b/src/perl/module-formats.c
index e1a7aa74..0b8b7b4c 100644
--- a/src/perl/module-formats.c
+++ b/src/perl/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC feperl_formats[] = {
 	{ MODULE_NAME, "Core", 0 },
diff --git a/src/perl/module-formats.h b/src/perl/module-formats.h
index 74d2e13b..43b2f4ae 100644
--- a/src/perl/module-formats.h
+++ b/src/perl/module-formats.h
@@ -1,4 +1,4 @@
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/perl/module.h b/src/perl/module.h
index 3cbdf3d5..0a4d78f6 100644
--- a/src/perl/module.h
+++ b/src/perl/module.h
@@ -1,4 +1,4 @@
-#include "common.h"
+#include <irssi/src/common.h>
 
 #ifdef NEED_PERL_H
 #  include <EXTERN.h>
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 802a771e..6fd1705b 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -21,28 +21,28 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "core.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "commands.h"
-#include "ignore.h"
-#include "log.h"
-#include "rawlog.h"
-#include "servers-reconnect.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/servers-reconnect.h>
 
-#include "window-item-def.h"
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "channels.h"
-#include "queries.h"
-#include "nicklist.h"
+#include <irssi/src/core/window-item-def.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "perl-core.h"
-#include "perl-common.h"
+#include <irssi/src/perl/perl-core.h>
+#include <irssi/src/perl/perl-common.h>
 
 typedef struct {
 	char *stash;
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 39389157..866b86e8 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -21,16 +21,16 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "modules.h"
-#include "core.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "perl-core.h"
-#include "perl-common.h"
-#include "perl-signals.h"
-#include "perl-sources.h"
+#include <irssi/src/perl/perl-core.h>
+#include <irssi/src/perl/perl-common.h>
+#include <irssi/src/perl/perl-signals.h>
+#include <irssi/src/perl/perl-sources.h>
 
 #include "XSUB.h"
 #include "irssi-core.pl.h"
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index 396c80b7..ac84d67a 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -18,17 +18,17 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "module-fe.h"
-#include "modules.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
+#include <irssi/src/perl/module-fe.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/perl/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
 
-#include "printtext.h"
-#include "completion.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/completion.h>
 
-#include "perl-core.h"
+#include <irssi/src/perl/perl-core.h>
 
 static void cmd_script(const char *data, SERVER_REC *server, void *item)
 {
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 8f993660..59289588 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -21,14 +21,14 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "servers.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/servers.h>
 
-#include "perl-core.h"
-#include "perl-common.h"
-#include "perl-signals.h"
+#include <irssi/src/perl/perl-core.h>
+#include <irssi/src/perl/perl-common.h>
+#include <irssi/src/perl/perl-signals.h>
 
 typedef struct {
         PERL_SCRIPT_REC *script;
diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c
index 0b49a608..3c72be22 100644
--- a/src/perl/perl-sources.c
+++ b/src/perl/perl-sources.c
@@ -21,12 +21,12 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
-#include "perl-core.h"
-#include "perl-common.h"
-#include "perl-sources.h"
-#include "misc.h"
+#include <irssi/src/perl/perl-core.h>
+#include <irssi/src/perl/perl-common.h>
+#include <irssi/src/perl/perl-sources.h>
+#include <irssi/src/core/misc.h>
 
 typedef struct {
         PERL_SCRIPT_REC *script;
diff --git a/src/perl/textui/Makefile.PL.in b/src/perl/textui/Makefile.PL.in
index ffdda21a..2b0a148a 100644
--- a/src/perl/textui/Makefile.PL.in
+++ b/src/perl/textui/Makefile.PL.in
@@ -4,5 +4,5 @@ WriteMakefile('NAME' => 'Irssi::TextUI',
               'LIBS' => '',
 	      'OBJECT' => '$(O_FILES)',
               'TYPEMAPS' => ['../common/typemap', '../ui/typemap'],
-              'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/fe-common/core -I@top_srcdir@/src/fe-text @GLIB_CFLAGS@',
+              'INC' => '-I../../.. @GLIB_CFLAGS@',
 	      'VERSION_FROM' => '@srcdir@/TextUI.pm');
diff --git a/src/perl/textui/module.h b/src/perl/textui/module.h
index d8af5b48..394c2839 100644
--- a/src/perl/textui/module.h
+++ b/src/perl/textui/module.h
@@ -1,12 +1,12 @@
-#include "../ui/module.h"
+#include <irssi/src/perl/ui/module.h>
 
-#include "mainwindows.h"
-#include "gui-windows.h"
-#include "gui-printtext.h"
-#include "statusbar.h"
-#include "textbuffer.h"
-#include "textbuffer-view.h"
-#include "gui-entry.h"
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssi/src/fe-text/statusbar.h>
+#include <irssi/src/fe-text/textbuffer.h>
+#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssi/src/fe-text/gui-entry.h>
 
 typedef MAIN_WINDOW_REC *Irssi__TextUI__MainWindow;
 typedef TEXT_BUFFER_REC *Irssi__TextUI__TextBuffer;
diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in
index ceed51c3..9507e74d 100644
--- a/src/perl/ui/Makefile.PL.in
+++ b/src/perl/ui/Makefile.PL.in
@@ -4,5 +4,5 @@ WriteMakefile('NAME' => 'Irssi::UI',
               'LIBS' => '',
 	      'OBJECT' => '$(O_FILES)',
               'TYPEMAPS' => ['../common/typemap'],
-              'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/fe-common/core @GLIB_CFLAGS@',
+              'INC' => '-I../../.. @GLIB_CFLAGS@',
 	      'VERSION_FROM' => '@srcdir@/UI.pm');
diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs
index 85e284bb..d001f382 100644
--- a/src/perl/ui/Window.xs
+++ b/src/perl/ui/Window.xs
@@ -1,7 +1,7 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
 
-#include "window-activity.h"
+#include <irssi/src/fe-common/core/window-activity.h>
 
 MODULE = Irssi::UI::Window  PACKAGE = Irssi
 PROTOTYPES: ENABLE
diff --git a/src/perl/ui/module.h b/src/perl/ui/module.h
index 31775039..4e19d4c0 100644
--- a/src/perl/ui/module.h
+++ b/src/perl/ui/module.h
@@ -1,12 +1,12 @@
-#include "../common/module.h"
+#include <irssi/src/perl/common/module.h>
 
-#include "fe-windows.h"
-#include "fe-exec.h"
-#include "formats.h"
-#include "printtext.h"
-#include "window-items.h"
-#include "themes.h"
-#include "keyboard.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/fe-exec.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/keyboard.h>
 
 typedef WINDOW_REC *Irssi__UI__Window;
 typedef TEXT_DEST_REC *Irssi__UI__TextDest;
diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am
index f048e95c..ddd619a0 100644
--- a/tests/fe-common/core/Makefile.am
+++ b/tests/fe-common/core/Makefile.am
@@ -3,14 +3,11 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=fe-common/core
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
 	$(GLIB_CFLAGS)
 
 test_programs = test-formats
 
 test_formats_CPPFLAGS = \
-	-I$(top_srcdir)/src/fe-common/core \
 	$(AM_CPPFLAGS)
 
 test_formats_DEPENDENCIES = \
diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c
index aee5a219..d1164f91 100644
--- a/tests/fe-common/core/test-formats.c
+++ b/tests/fe-common/core/test-formats.c
@@ -1,5 +1,5 @@
-#include "common.h"
-#include "formats.h"
+#include <irssi/src/common.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 #define MAX_LENGTH 5
 
diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am
index 38979e14..b1762c7d 100644
--- a/tests/fe-text/Makefile.am
+++ b/tests/fe-text/Makefile.am
@@ -3,10 +3,6 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=fe-text
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
-	-I$(top_srcdir)/src/fe-common/core \
-	-I$(top_srcdir)/src/fe-text \
 	$(GLIB_CFLAGS)
 
 test_programs = test-paste-join-multiline
diff --git a/tests/fe-text/test-paste-join-multiline.c b/tests/fe-text/test-paste-join-multiline.c
index 8a81a9fb..87669598 100644
--- a/tests/fe-text/test-paste-join-multiline.c
+++ b/tests/fe-text/test-paste-join-multiline.c
@@ -1,5 +1,5 @@
-#include "common.h"
-#include "gui-readline.c"
+#include <irssi/src/common.h>
+#include <irssi/src/fe-text/gui-readline.c>
 
 typedef struct {
 	char const *const description;
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index f60da03f..23c1ef2c 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -3,15 +3,12 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=irc/core
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
 test_programs = test-channel-events test-irc
 
 CPPFLAGS = \
-	-I$(top_srcdir)/src/irc/core \
 	$(AM_CPPFLAGS)
 
 DEPENDENCIES = \
diff --git a/tests/irc/core/test-channel-events.c b/tests/irc/core/test-channel-events.c
index 9f52c98d..c6490e6b 100644
--- a/tests/irc/core/test-channel-events.c
+++ b/tests/irc/core/test-channel-events.c
@@ -20,18 +20,18 @@
 
 #include <glib.h>
 
-#include <channel-events.h>
-#include <common.h>
-#include <core.h>
-#include <irc.h>
-#include <irc-channels.h>
-#include <irc-servers.h>
-#include <modules.h>
-#include <recode.h>
-#include <settings.h>
-#include <signals.h>
+#include <irssi/src/irc/core/channel-events.h>
+#include <irssi/src/common.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 #include <time.h>
-#include <args.h>
+#include <irssi/src/core/args.h>
 
 #define MODULE_NAME "test-channel-events"
 
diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c
index 3eaf7020..4845d54c 100644
--- a/tests/irc/core/test-irc.c
+++ b/tests/irc/core/test-irc.c
@@ -19,7 +19,7 @@
 */
 
 #include <glib.h>
-#include <irc.h>
+#include <irssi/src/irc/core/irc.h>
 #include <string.h>
 
 typedef struct {
diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
index 58c0d98d..17885d53 100644
--- a/tests/irc/flood/Makefile.am
+++ b/tests/irc/flood/Makefile.am
@@ -3,8 +3,6 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=irc/flood
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
@@ -12,9 +10,6 @@ test_programs = \
 	test-796
 
 test_796_CPPFLAGS = \
-	-I$(top_srcdir)/src/fe-common/core \
-	-I$(top_srcdir)/src/irc/core \
-	-I$(top_srcdir)/src/irc/flood \
 	$(AM_CPPFLAGS)
 
 test_796_DEPENDENCIES = \
diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index 0c98509b..6f0f3ac8 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -18,18 +18,18 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "common.h"
-#include "args.h"
-#include "core.h"
-#include "misc.h"
-#include "servers-setup.h"
+#include <irssi/src/common.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers-setup.h>
 
-#include "formats.h"
-#include "fe-common-core.h"
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
 
 /* irc.c */
 void irc_init(void);

From 03ca37c12e6cc06bc6df728d44efef7efd391b4d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 May 2019 22:04:04 +0200
Subject: [PATCH 0974/1650] Use full paths to includes in fe-fuzz

---
 src/fe-fuzz/fe-common/core/theme-load.c | 22 +++++++++----------
 src/fe-fuzz/irc/core/event-get-params.c | 20 +++++++++---------
 src/fe-fuzz/irssi.c                     | 18 ++++++++--------
 src/fe-fuzz/server.c                    | 28 ++++++++++++-------------
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/fe-fuzz/fe-common/core/theme-load.c b/src/fe-fuzz/fe-common/core/theme-load.c
index 14df74c6..87429ac4 100644
--- a/src/fe-fuzz/fe-common/core/theme-load.c
+++ b/src/fe-fuzz/fe-common/core/theme-load.c
@@ -18,17 +18,17 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "module.h"
-#include "modules-load.h"
-#include "levels.h"
-#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text
-#include "themes.h"
-#include "core.h"
-#include "fe-common-core.h"
-#include "args.h"
-#include "printtext.h"
-#include "irc.h"
-#include "themes.h"
+#include <irssi/src/fe-text/module.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-text/module-formats.h> // need to explicitly grab from fe-text
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/fe-common/core/themes.h>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index c50b6205..36aeacf7 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -18,16 +18,16 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "module.h"
-#include "modules-load.h"
-#include "levels.h"
-#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text
-#include "themes.h"
-#include "core.h"
-#include "fe-common-core.h"
-#include "args.h"
-#include "printtext.h"
-#include "irc.h"
+#include <irssi/src/fe-text/module.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-text/module-formats.h> // need to explicitly grab from fe-text
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/irc/core/irc.h>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index c1b2ca9b..1c9f6c5f 100644
--- a/src/fe-fuzz/irssi.c
+++ b/src/fe-fuzz/irssi.c
@@ -18,15 +18,15 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "module.h"
-#include "modules-load.h"
-#include "levels.h"
-#include "../fe-text/module-formats.h" /* need to explicitly grab from fe-text */
-#include "themes.h"
-#include "core.h"
-#include "fe-common-core.h"
-#include "args.h"
-#include "printtext.h"
+#include <irssi/src/fe-text/module.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-text/module-formats.h> /* need to explicitly grab from fe-text */
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index 76eeb17e..2e8cd3d2 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -18,17 +18,17 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "module.h"
-#include "modules-load.h"
-#include "module-formats.h"
-#include "levels.h"
-#include "themes.h"
-#include "core.h"
-#include "fe-common-core.h"
-#include "args.h"
-#include "printtext.h"
-#include "misc.h"
-#include "servers-setup.h"
+#include <irssi/src/irc/core/module.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/core/core.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers-setup.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -36,9 +36,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "irc.h"
-#include "irc-servers.h"
-#include "irc-channels.h"
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
 
 /* irc.c */
 void irc_init(void);

From 37f7c7f37489122e6ec4f870af428f7675042dfd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 May 2019 22:22:22 +0200
Subject: [PATCH 0975/1650] update include guard names

---
 src/common.h                          | 4 ++--
 src/core/args.h                       | 4 ++--
 src/core/capsicum.h                   | 6 +++---
 src/core/channels-setup.h             | 4 ++--
 src/core/channels.h                   | 4 ++--
 src/core/chat-protocols.h             | 4 ++--
 src/core/chatnets.h                   | 4 ++--
 src/core/commands.h                   | 4 ++--
 src/core/core.h                       | 4 ++--
 src/core/expandos.h                   | 4 ++--
 src/core/ignore.h                     | 4 ++--
 src/core/iregex.h                     | 4 ++--
 src/core/levels.h                     | 4 ++--
 src/core/line-split.h                 | 4 ++--
 src/core/log.h                        | 4 ++--
 src/core/masks.h                      | 4 ++--
 src/core/misc.h                       | 4 ++--
 src/core/modules-load.h               | 4 ++--
 src/core/modules.h                    | 4 ++--
 src/core/net-disconnect.h             | 4 ++--
 src/core/net-nonblock.h               | 4 ++--
 src/core/net-sendbuffer.h             | 4 ++--
 src/core/network-openssl.h            | 6 +++---
 src/core/network.h                    | 4 ++--
 src/core/nicklist.h                   | 4 ++--
 src/core/nickmatch-cache.h            | 4 ++--
 src/core/pidwait.h                    | 4 ++--
 src/core/queries.h                    | 4 ++--
 src/core/rawlog.h                     | 4 ++--
 src/core/recode.h                     | 6 +++---
 src/core/servers-reconnect.h          | 4 ++--
 src/core/servers-setup.h              | 4 ++--
 src/core/servers.h                    | 4 ++--
 src/core/session.h                    | 4 ++--
 src/core/settings.h                   | 4 ++--
 src/core/signals.h                    | 4 ++--
 src/core/special-vars.h               | 4 ++--
 src/core/tls.h                        | 4 ++--
 src/core/utf8.h                       | 4 ++--
 src/core/window-item-def.h            | 4 ++--
 src/core/write-buffer.h               | 4 ++--
 src/fe-common/core/chat-completion.h  | 4 ++--
 src/fe-common/core/command-history.h  | 4 ++--
 src/fe-common/core/completion.h       | 4 ++--
 src/fe-common/core/fe-capsicum.h      | 4 ++--
 src/fe-common/core/fe-channels.h      | 4 ++--
 src/fe-common/core/fe-common-core.h   | 4 ++--
 src/fe-common/core/fe-core-commands.h | 4 ++--
 src/fe-common/core/fe-exec.h          | 4 ++--
 src/fe-common/core/fe-messages.h      | 4 ++--
 src/fe-common/core/fe-queries.h       | 4 ++--
 src/fe-common/core/fe-recode.h        | 6 +++---
 src/fe-common/core/fe-settings.h      | 4 ++--
 src/fe-common/core/fe-tls.h           | 4 ++--
 src/fe-common/core/fe-windows.h       | 4 ++--
 src/fe-common/core/formats.h          | 4 ++--
 src/fe-common/core/hilight-text.h     | 4 ++--
 src/fe-common/core/keyboard.h         | 4 ++--
 src/fe-common/core/printtext.h        | 4 ++--
 src/fe-common/core/themes.h           | 4 ++--
 src/fe-common/core/window-activity.h  | 4 ++--
 src/fe-common/core/window-items.h     | 4 ++--
 src/fe-common/core/windows-layout.h   | 4 ++--
 src/fe-common/irc/dcc/fe-dcc.h        | 4 ++--
 src/fe-common/irc/fe-irc-channels.h   | 4 ++--
 src/fe-common/irc/fe-irc-server.h     | 4 ++--
 src/fe-text/gui-entry.h               | 4 ++--
 src/fe-text/gui-printtext.h           | 4 ++--
 src/fe-text/gui-readline.h            | 4 ++--
 src/fe-text/gui-windows.h             | 4 ++--
 src/fe-text/mainwindows.h             | 4 ++--
 src/fe-text/statusbar-config.h        | 4 ++--
 src/fe-text/statusbar.h               | 4 ++--
 src/fe-text/term.h                    | 4 ++--
 src/fe-text/terminfo-core.h           | 4 ++--
 src/fe-text/textbuffer-view.h         | 4 ++--
 src/fe-text/textbuffer.h              | 4 ++--
 src/irc/core/bans.h                   | 4 ++--
 src/irc/core/channel-events.h         | 4 ++--
 src/irc/core/channel-rejoin.h         | 4 ++--
 src/irc/core/ctcp.h                   | 4 ++--
 src/irc/core/irc-cap.h                | 4 ++--
 src/irc/core/irc-channels.h           | 4 ++--
 src/irc/core/irc-chatnets.h           | 4 ++--
 src/irc/core/irc-commands.h           | 4 ++--
 src/irc/core/irc-masks.h              | 4 ++--
 src/irc/core/irc-nicklist.h           | 4 ++--
 src/irc/core/irc-queries.h            | 4 ++--
 src/irc/core/irc-servers-setup.h      | 4 ++--
 src/irc/core/irc-servers.h            | 4 ++--
 src/irc/core/irc.h                    | 4 ++--
 src/irc/core/mode-lists.h             | 4 ++--
 src/irc/core/modes.h                  | 4 ++--
 src/irc/core/netsplit.h               | 4 ++--
 src/irc/core/sasl.h                   | 4 ++--
 src/irc/core/servers-idle.h           | 4 ++--
 src/irc/core/servers-redirect.h       | 4 ++--
 src/irc/dcc/dcc-chat.h                | 4 ++--
 src/irc/dcc/dcc-file.h                | 4 ++--
 src/irc/dcc/dcc-get.h                 | 4 ++--
 src/irc/dcc/dcc-queue.h               | 4 ++--
 src/irc/dcc/dcc-send.h                | 4 ++--
 src/irc/dcc/dcc-server.h              | 4 ++--
 src/irc/dcc/dcc.h                     | 4 ++--
 src/irc/flood/autoignore.h            | 4 ++--
 src/irc/flood/flood.h                 | 4 ++--
 src/irc/notifylist/notify-setup.h     | 4 ++--
 src/irc/notifylist/notifylist.h       | 4 ++--
 src/irc/proxy/proxy.h                 | 4 ++--
 src/lib-config/iconfig.h              | 4 ++--
 src/perl/perl-common.h                | 4 ++--
 src/perl/perl-core.h                  | 4 ++--
 src/perl/perl-signals.h               | 4 ++--
 src/perl/perl-sources.h               | 4 ++--
 114 files changed, 232 insertions(+), 232 deletions(-)

diff --git a/src/common.h b/src/common.h
index 313b2c9f..ef4b0c15 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef IRSSI_COMMON_H
+#define IRSSI_COMMON_H
 
 #define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */
 
diff --git a/src/core/args.h b/src/core/args.h
index bbe16b5f..aeaf5714 100644
--- a/src/core/args.h
+++ b/src/core/args.h
@@ -1,5 +1,5 @@
-#ifndef __ARGS_H
-#define __ARGS_H
+#ifndef IRSSI_CORE_ARGS_H
+#define IRSSI_CORE_ARGS_H
 
 void args_register(GOptionEntry *options);
 void args_execute(int argc, char *argv[]);
diff --git a/src/core/capsicum.h b/src/core/capsicum.h
index 7d89f2aa..ab980a43 100644
--- a/src/core/capsicum.h
+++ b/src/core/capsicum.h
@@ -1,5 +1,5 @@
-#ifndef __CAPSICUM_H
-#define __CAPSICUM_H
+#ifndef IRSSI_CORE_CAPSICUM_H
+#define IRSSI_CORE_CAPSICUM_H
 
 gboolean capsicum_enabled(void);
 int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
@@ -12,4 +12,4 @@ void capsicum_mkdir_with_parents_wrapper(const char *path, int mode);
 void capsicum_init(void);
 void capsicum_deinit(void);
 
-#endif /* !__CAPSICUM_H */
+#endif /* !IRSSI_CORE_CAPSICUM_H */
diff --git a/src/core/channels-setup.h b/src/core/channels-setup.h
index fcc099c6..c0297aec 100644
--- a/src/core/channels-setup.h
+++ b/src/core/channels-setup.h
@@ -1,5 +1,5 @@
-#ifndef __CHANNELS_SETUP_H
-#define __CHANNELS_SETUP_H
+#ifndef IRSSI_CORE_CHANNELS_SETUP_H
+#define IRSSI_CORE_CHANNELS_SETUP_H
 
 #include <irssi/src/core/modules.h>
 
diff --git a/src/core/channels.h b/src/core/channels.h
index 276c69fa..197d2254 100644
--- a/src/core/channels.h
+++ b/src/core/channels.h
@@ -1,5 +1,5 @@
-#ifndef __CHANNELS_H
-#define __CHANNELS_H
+#ifndef IRSSI_CORE_CHANNELS_H
+#define IRSSI_CORE_CHANNELS_H
 
 #include <irssi/src/core/modules.h>
 
diff --git a/src/core/chat-protocols.h b/src/core/chat-protocols.h
index 8b7dc170..ab7327bd 100644
--- a/src/core/chat-protocols.h
+++ b/src/core/chat-protocols.h
@@ -1,5 +1,5 @@
-#ifndef __CHAT_PROTOCOLS_H
-#define __CHAT_PROTOCOLS_H
+#ifndef IRSSI_CORE_CHAT_PROTOCOLS_H
+#define IRSSI_CORE_CHAT_PROTOCOLS_H
 
 struct _CHAT_PROTOCOL_REC {
 	int id;
diff --git a/src/core/chatnets.h b/src/core/chatnets.h
index 785b487e..6f36fe33 100644
--- a/src/core/chatnets.h
+++ b/src/core/chatnets.h
@@ -1,5 +1,5 @@
-#ifndef __CHATNETS_H
-#define __CHATNETS_H
+#ifndef IRSSI_CORE_CHATNETS_H
+#define IRSSI_CORE_CHATNETS_H
 
 #include <irssi/src/core/modules.h>
 
diff --git a/src/core/commands.h b/src/core/commands.h
index b70e77ca..7c6bd87b 100644
--- a/src/core/commands.h
+++ b/src/core/commands.h
@@ -1,5 +1,5 @@
-#ifndef __COMMANDS_H
-#define __COMMANDS_H
+#ifndef IRSSI_CORE_COMMANDS_H
+#define IRSSI_CORE_COMMANDS_H
 
 #include <irssi/src/core/signals.h>
 
diff --git a/src/core/core.h b/src/core/core.h
index 406070e0..6c6c7b61 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -1,5 +1,5 @@
-#ifndef __IRSSI_CORE_H
-#define __IRSSI_CORE_H
+#ifndef IRSSI_CORE_CORE_H
+#define IRSSI_CORE_CORE_H
 
 #include <irssi/src/common.h>
 
diff --git a/src/core/expandos.h b/src/core/expandos.h
index 3466a44a..05dfcf11 100644
--- a/src/core/expandos.h
+++ b/src/core/expandos.h
@@ -1,5 +1,5 @@
-#ifndef __EXPANDOS_H
-#define __EXPANDOS_H
+#ifndef IRSSI_CORE_EXPANDOS_H
+#define IRSSI_CORE_EXPANDOS_H
 
 #include <irssi/src/core/signals.h>
 
diff --git a/src/core/ignore.h b/src/core/ignore.h
index fea38205..bf55a76b 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -1,5 +1,5 @@
-#ifndef __IGNORE_H
-#define __IGNORE_H
+#ifndef IRSSI_CORE_IGNORE_H
+#define IRSSI_CORE_IGNORE_H
 
 #include <irssi/src/core/iregex.h>
 
diff --git a/src/core/iregex.h b/src/core/iregex.h
index d6d6c17f..53263944 100644
--- a/src/core/iregex.h
+++ b/src/core/iregex.h
@@ -1,5 +1,5 @@
-#ifndef __REGEX_H
-#define __REGEX_H
+#ifndef IRSSI_CORE_IREGEX_H
+#define IRSSI_CORE_IREGEX_H
 
 #include <irssi/src/common.h>
 
diff --git a/src/core/levels.h b/src/core/levels.h
index b0ebafba..385ecd0c 100644
--- a/src/core/levels.h
+++ b/src/core/levels.h
@@ -1,5 +1,5 @@
-#ifndef __LEVELS_H
-#define __LEVELS_H
+#ifndef IRSSI_CORE_LEVELS_H
+#define IRSSI_CORE_LEVELS_H
 
 /* This is pretty much IRC specific, but I think it would be easier for
    other chats to try to use these same levels instead of implementing too
diff --git a/src/core/line-split.h b/src/core/line-split.h
index 7c101ddd..cf957423 100644
--- a/src/core/line-split.h
+++ b/src/core/line-split.h
@@ -1,5 +1,5 @@
-#ifndef __LINE_SPLIT_H
-#define __LINE_SPLIT_H
+#ifndef IRSSI_CORE_LINE_SPLIT_H
+#define IRSSI_CORE_LINE_SPLIT_H
 
 /* line-split `data'. Initially `*buffer' should contain NULL. */
 int line_split(const char *data, int len, char **output, LINEBUF_REC **buffer);
diff --git a/src/core/log.h b/src/core/log.h
index 5a07859b..1c529670 100644
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -1,5 +1,5 @@
-#ifndef __LOG_H
-#define __LOG_H
+#ifndef IRSSI_CORE_LOG_H
+#define IRSSI_CORE_LOG_H
 
 enum {
 	LOG_ITEM_TARGET, /* channel, query, .. */
diff --git a/src/core/masks.h b/src/core/masks.h
index b6ce20d8..e3a0437a 100644
--- a/src/core/masks.h
+++ b/src/core/masks.h
@@ -1,5 +1,5 @@
-#ifndef __MASKS_H
-#define __MASKS_H
+#ifndef IRSSI_CORE_MASKS_H
+#define IRSSI_CORE_MASKS_H
 
 int mask_match(SERVER_REC *server, const char *mask,
 	       const char *nick, const char *user, const char *host);
diff --git a/src/core/misc.h b/src/core/misc.h
index 1545f7a2..9e06c707 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -1,5 +1,5 @@
-#ifndef __MISC_H
-#define __MISC_H
+#ifndef IRSSI_CORE_MISC_H
+#define IRSSI_CORE_MISC_H
 
 int g_input_add_poll(int fd, int priority, int condition,
 		     GInputFunction function, void *data);
diff --git a/src/core/modules-load.h b/src/core/modules-load.h
index 683d30e3..a99bcdfe 100644
--- a/src/core/modules-load.h
+++ b/src/core/modules-load.h
@@ -1,5 +1,5 @@
-#ifndef __MODULES_LOAD_H
-#define __MODULES_LOAD_H
+#ifndef IRSSI_CORE_MODULES_LOAD_H
+#define IRSSI_CORE_MODULES_LOAD_H
 
 #include <irssi/src/core/modules.h>
 
diff --git a/src/core/modules.h b/src/core/modules.h
index b2fa2fa4..e3deaee2 100644
--- a/src/core/modules.h
+++ b/src/core/modules.h
@@ -1,5 +1,5 @@
-#ifndef __MODULES_H
-#define __MODULES_H
+#ifndef IRSSI_CORE_MODULES_H
+#define IRSSI_CORE_MODULES_H
 
 #define MODULE_DATA_INIT(rec) \
         (rec)->module_data = g_hash_table_new(g_str_hash, g_str_equal)
diff --git a/src/core/net-disconnect.h b/src/core/net-disconnect.h
index 37a46846..78b03c16 100644
--- a/src/core/net-disconnect.h
+++ b/src/core/net-disconnect.h
@@ -1,5 +1,5 @@
-#ifndef __NET_DISCONNECT_H
-#define __NET_DISCONNECT_H
+#ifndef IRSSI_CORE_NET_DISCONNECT_H
+#define IRSSI_CORE_NET_DISCONNECT_H
 
 /* Try to let the other side close the connection, if it still isn't
    disconnected after certain amount of time, close it ourself */
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 649232ae..086c9dab 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -1,5 +1,5 @@
-#ifndef __NET_NONBLOCK_H
-#define __NET_NONBLOCK_H
+#ifndef IRSSI_CORE_NET_NONBLOCK_H
+#define IRSSI_CORE_NET_NONBLOCK_H
 
 #include <irssi/src/core/network.h>
 
diff --git a/src/core/net-sendbuffer.h b/src/core/net-sendbuffer.h
index bdeb7156..7cf1ef6d 100644
--- a/src/core/net-sendbuffer.h
+++ b/src/core/net-sendbuffer.h
@@ -1,5 +1,5 @@
-#ifndef __NET_SENDBUFFER_H
-#define __NET_SENDBUFFER_H
+#ifndef IRSSI_CORE_NET_SENDBUFFER_H
+#define IRSSI_CORE_NET_SENDBUFFER_H
 
 #define DEFAULT_BUFFER_SIZE 8192
 #define MAX_BUFFER_SIZE 1048576
diff --git a/src/core/network-openssl.h b/src/core/network-openssl.h
index 4cd6d711..2c204fb8 100644
--- a/src/core/network-openssl.h
+++ b/src/core/network-openssl.h
@@ -1,6 +1,6 @@
-#ifndef __NETWORK_OPENSSL_H
-#define __NETWORK_OPENSSL_H
+#ifndef IRSSI_CORE_NETWORK_OPENSSL_H
+#define IRSSI_CORE_NETWORK_OPENSSL_H
 
 gboolean irssi_ssl_init(void);
 
-#endif /* !__NETWORK_OPENSSL_H */
+#endif /* !IRSSI_CORE_NETWORK_OPENSSL_H */
diff --git a/src/core/network.h b/src/core/network.h
index 30fd6aab..1776005d 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -1,5 +1,5 @@
-#ifndef __NETWORK_H
-#define __NETWORK_H
+#ifndef IRSSI_CORE_NETWORK_H
+#define IRSSI_CORE_NETWORK_H
 
 #ifdef HAVE_SOCKS_H
 #include <socks.h>
diff --git a/src/core/nicklist.h b/src/core/nicklist.h
index 913cc0d1..62afa5ff 100644
--- a/src/core/nicklist.h
+++ b/src/core/nicklist.h
@@ -1,5 +1,5 @@
-#ifndef __NICKLIST_H
-#define __NICKLIST_H
+#ifndef IRSSI_CORE_NICKLIST_H
+#define IRSSI_CORE_NICKLIST_H
 
 /* Returns NICK_REC if it's nick, NULL if it isn't. */
 #define NICK(server) \
diff --git a/src/core/nickmatch-cache.h b/src/core/nickmatch-cache.h
index c4140a49..ff58d853 100644
--- a/src/core/nickmatch-cache.h
+++ b/src/core/nickmatch-cache.h
@@ -1,5 +1,5 @@
-#ifndef __NICKMATCH_CACHE_H
-#define __NICKMATCH_CACHE_H
+#ifndef IRSSI_CORE_NICKMATCH_CACHE_H
+#define IRSSI_CORE_NICKMATCH_CACHE_H
 
 typedef void (*NICKMATCH_REBUILD_FUNC) (GHashTable *list,
 					CHANNEL_REC *channel, NICK_REC *nick);
diff --git a/src/core/pidwait.h b/src/core/pidwait.h
index ae1ba01e..148c65d7 100644
--- a/src/core/pidwait.h
+++ b/src/core/pidwait.h
@@ -1,5 +1,5 @@
-#ifndef __PIDWAIT_H
-#define __PIDWAIT_H
+#ifndef IRSSI_CORE_PIDWAIT_H
+#define IRSSI_CORE_PIDWAIT_H
 
 void pidwait_init(void);
 void pidwait_deinit(void);
diff --git a/src/core/queries.h b/src/core/queries.h
index 16f92588..c6170361 100644
--- a/src/core/queries.h
+++ b/src/core/queries.h
@@ -1,5 +1,5 @@
-#ifndef __QUERIES_H
-#define __QUERIES_H
+#ifndef IRSSI_CORE_QUERIES_H
+#define IRSSI_CORE_QUERIES_H
 
 #include <irssi/src/core/modules.h>
 
diff --git a/src/core/rawlog.h b/src/core/rawlog.h
index 01175e67..53c0d3c3 100644
--- a/src/core/rawlog.h
+++ b/src/core/rawlog.h
@@ -1,5 +1,5 @@
-#ifndef __RAWLOG_H
-#define __RAWLOG_H
+#ifndef IRSSI_CORE_RAWLOG_H
+#define IRSSI_CORE_RAWLOG_H
 
 struct _RAWLOG_REC {
 	int logging;
diff --git a/src/core/recode.h b/src/core/recode.h
index 719e8f54..ce1b9daf 100644
--- a/src/core/recode.h
+++ b/src/core/recode.h
@@ -1,5 +1,5 @@
-#ifndef __RECODE_H
-#define __RECODE_H
+#ifndef IRSSI_CORE_RECODE_H
+#define IRSSI_CORE_RECODE_H
 
 char *recode_in (const SERVER_REC *server, const char *str, const char *target);
 char *recode_out (const SERVER_REC *server, const char *str, const char *target);
@@ -12,4 +12,4 @@ void recode_update_charset(void);
 void recode_init (void);
 void recode_deinit (void);
 
-#endif /* __RECODE_H */
+#endif /* IRSSI_CORE_RECODE_H */
diff --git a/src/core/servers-reconnect.h b/src/core/servers-reconnect.h
index 835d58d5..b98f5176 100644
--- a/src/core/servers-reconnect.h
+++ b/src/core/servers-reconnect.h
@@ -1,5 +1,5 @@
-#ifndef __SERVER_RECONNECT_H
-#define __SERVER_RECONNECT_H
+#ifndef IRSSI_CORE_SERVERS_RECONNECT_H
+#define IRSSI_CORE_SERVERS_RECONNECT_H
 
 /* wait for half an hour before trying to reconnect to host where last
    connection failed */
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index 9bedfe25..296a94fa 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -1,5 +1,5 @@
-#ifndef __SERVERS_SETUP_H
-#define __SERVERS_SETUP_H
+#ifndef IRSSI_CORE_SERVERS_SETUP_H
+#define IRSSI_CORE_SERVERS_SETUP_H
 
 #include <irssi/src/core/modules.h>
 
diff --git a/src/core/servers.h b/src/core/servers.h
index daf155b3..7b998c8d 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -1,5 +1,5 @@
-#ifndef __SERVERS_H
-#define __SERVERS_H
+#ifndef IRSSI_CORE_SERVERS_H
+#define IRSSI_CORE_SERVERS_H
 
 #include <irssi/src/core/modules.h>
 
diff --git a/src/core/session.h b/src/core/session.h
index a3c8d67c..28c5cec8 100644
--- a/src/core/session.h
+++ b/src/core/session.h
@@ -1,5 +1,5 @@
-#ifndef __SESSION_H
-#define __SESSION_H
+#ifndef IRSSI_CORE_SESSION_H
+#define IRSSI_CORE_SESSION_H
 
 extern char *irssi_binary;
 
diff --git a/src/core/settings.h b/src/core/settings.h
index b67a9e44..3a8a4646 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -1,5 +1,5 @@
-#ifndef __SETTINGS_H
-#define __SETTINGS_H
+#ifndef IRSSI_CORE_SETTINGS_H
+#define IRSSI_CORE_SETTINGS_H
 
 typedef enum {
 	SETTING_TYPE_STRING,
diff --git a/src/core/signals.h b/src/core/signals.h
index 384af66f..0fa005a1 100644
--- a/src/core/signals.h
+++ b/src/core/signals.h
@@ -1,5 +1,5 @@
-#ifndef __SIGNAL_H
-#define __SIGNAL_H
+#ifndef IRSSI_CORE_SIGNALS_H
+#define IRSSI_CORE_SIGNALS_H
 
 #define SIGNAL_PRIORITY_LOW    	100
 #define SIGNAL_PRIORITY_DEFAULT	0
diff --git a/src/core/special-vars.h b/src/core/special-vars.h
index caec5ec0..f4bd926d 100644
--- a/src/core/special-vars.h
+++ b/src/core/special-vars.h
@@ -1,5 +1,5 @@
-#ifndef __SPECIAL_VARS_H
-#define __SPECIAL_VARS_H
+#ifndef IRSSI_CORE_SPECIAL_VARS_H
+#define IRSSI_CORE_SPECIAL_VARS_H
 
 #include <irssi/src/core/signals.h>
 
diff --git a/src/core/tls.h b/src/core/tls.h
index 9ba4ac47..791bde86 100644
--- a/src/core/tls.h
+++ b/src/core/tls.h
@@ -16,8 +16,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#ifndef __TLS_H
-#define __TLS_H
+#ifndef IRSSI_CORE_TLS_H
+#define IRSSI_CORE_TLS_H
 
 #include <openssl/ssl.h>
 
diff --git a/src/core/utf8.h b/src/core/utf8.h
index 9f7d1aaa..372c5d27 100644
--- a/src/core/utf8.h
+++ b/src/core/utf8.h
@@ -1,5 +1,5 @@
-#ifndef __UTF8_H
-#define __UTF8_H
+#ifndef IRSSI_CORE_UTF8_H
+#define IRSSI_CORE_UTF8_H
 
 /* XXX I didn't check the encoding range of big5+. This is standard big5. */
 #define is_big5_los(lo) (0x40 <= (lo) && (lo) <= 0x7E) /* standard */
diff --git a/src/core/window-item-def.h b/src/core/window-item-def.h
index 1309f975..6944c921 100644
--- a/src/core/window-item-def.h
+++ b/src/core/window-item-def.h
@@ -1,5 +1,5 @@
-#ifndef __WINDOW_ITEM_DEF_H
-#define __WINDOW_ITEM_DEF_H
+#ifndef IRSSI_CORE_WINDOW_ITEM_DEF_H
+#define IRSSI_CORE_WINDOW_ITEM_DEF_H
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _WI_ITEM_REC {
diff --git a/src/core/write-buffer.h b/src/core/write-buffer.h
index ef527440..8c60dc77 100644
--- a/src/core/write-buffer.h
+++ b/src/core/write-buffer.h
@@ -1,5 +1,5 @@
-#ifndef __WRITE_BUFFER_H
-#define __WRITE_BUFFER_H
+#ifndef IRSSI_CORE_WRITE_BUFFER_H
+#define IRSSI_CORE_WRITE_BUFFER_H
 
 int write_buffer(int handle, const void *data, int size);
 void write_buffer_flush(void);
diff --git a/src/fe-common/core/chat-completion.h b/src/fe-common/core/chat-completion.h
index 17c1408d..2976b962 100644
--- a/src/fe-common/core/chat-completion.h
+++ b/src/fe-common/core/chat-completion.h
@@ -1,5 +1,5 @@
-#ifndef __CHAT_COMPLETION_H
-#define __CHAT_COMPLETION_H
+#ifndef IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H
+#define IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H
 
 GList *completion_get_chatnets(const char *word);
 GList *completion_get_servers(const char *word);
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index 3b9de941..04922d2d 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -1,5 +1,5 @@
-#ifndef __COMMAND_HISTORY_H
-#define __COMMAND_HISTORY_H
+#ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
+#define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
 
 #include <irssi/src/common.h>
 
diff --git a/src/fe-common/core/completion.h b/src/fe-common/core/completion.h
index dce3a2f1..d505aa84 100644
--- a/src/fe-common/core/completion.h
+++ b/src/fe-common/core/completion.h
@@ -1,5 +1,5 @@
-#ifndef __COMPLETION_H
-#define __COMPLETION_H
+#ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H
+#define IRSSI_FE_COMMON_CORE_COMPLETION_H
 
 #include <irssi/src/fe-common/core/window-items.h>
 
diff --git a/src/fe-common/core/fe-capsicum.h b/src/fe-common/core/fe-capsicum.h
index a7cb743b..c0471296 100644
--- a/src/fe-common/core/fe-capsicum.h
+++ b/src/fe-common/core/fe-capsicum.h
@@ -1,5 +1,5 @@
-#ifndef __FE_CAPSICUM_H
-#define __FE_CAPSICUM_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_CAPSICUM_H
+#define IRSSI_FE_COMMON_CORE_FE_CAPSICUM_H
 
 void fe_capsicum_init(void);
 void fe_capsicum_deinit(void);
diff --git a/src/fe-common/core/fe-channels.h b/src/fe-common/core/fe-channels.h
index e9a03a12..34b24ac6 100644
--- a/src/fe-common/core/fe-channels.h
+++ b/src/fe-common/core/fe-channels.h
@@ -1,5 +1,5 @@
-#ifndef __FE_CHANNELS_H
-#define __FE_CHANNELS_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_CHANNELS_H
+#define IRSSI_FE_COMMON_CORE_FE_CHANNELS_H
 
 #define CHANNEL_NICKLIST_FLAG_OPS       0x01
 #define CHANNEL_NICKLIST_FLAG_HALFOPS   0x02
diff --git a/src/fe-common/core/fe-common-core.h b/src/fe-common/core/fe-common-core.h
index 88b2e94b..a9a74b0f 100644
--- a/src/fe-common/core/fe-common-core.h
+++ b/src/fe-common/core/fe-common-core.h
@@ -1,5 +1,5 @@
-#ifndef __FE_COMMON_CORE_H
-#define __FE_COMMON_CORE_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_COMMON_CORE_H
+#define IRSSI_FE_COMMON_CORE_FE_COMMON_CORE_H
 
 void fe_common_core_register_options(void);
 void fe_common_core_init(void);
diff --git a/src/fe-common/core/fe-core-commands.h b/src/fe-common/core/fe-core-commands.h
index 261303de..d711b5d6 100644
--- a/src/fe-common/core/fe-core-commands.h
+++ b/src/fe-common/core/fe-core-commands.h
@@ -1,5 +1,5 @@
-#ifndef __FE_CORE_COMMANDS_H
-#define __FE_CORE_COMMANDS_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_CORE_COMMANDS_H
+#define IRSSI_FE_COMMON_CORE_FE_CORE_COMMANDS_H
 
 extern int command_hide_output;
 
diff --git a/src/fe-common/core/fe-exec.h b/src/fe-common/core/fe-exec.h
index 21b1e18b..824d3d8a 100644
--- a/src/fe-common/core/fe-exec.h
+++ b/src/fe-common/core/fe-exec.h
@@ -1,5 +1,5 @@
-#ifndef __FE_EXEC_H
-#define __FE_EXEC_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H
+#define IRSSI_FE_COMMON_CORE_FE_EXEC_H
 
 #include <irssi/src/fe-common/core/fe-windows.h>
 
diff --git a/src/fe-common/core/fe-messages.h b/src/fe-common/core/fe-messages.h
index 07ecef80..03f7da7b 100644
--- a/src/fe-common/core/fe-messages.h
+++ b/src/fe-common/core/fe-messages.h
@@ -1,5 +1,5 @@
-#ifndef __FE_MESSAGES_H
-#define __FE_MESSAGES_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_MESSAGES_H
+#define IRSSI_FE_COMMON_CORE_FE_MESSAGES_H
 
 /* convert _underlined_ and *bold* words (and phrases) to use real
    underlining or bolding */
diff --git a/src/fe-common/core/fe-queries.h b/src/fe-common/core/fe-queries.h
index 1dc7e81a..30c45e4e 100644
--- a/src/fe-common/core/fe-queries.h
+++ b/src/fe-common/core/fe-queries.h
@@ -1,5 +1,5 @@
-#ifndef __FE_QUERIES_H
-#define __FE_QUERIES_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H
+#define IRSSI_FE_COMMON_CORE_FE_QUERIES_H
 
 #include <irssi/src/core/queries.h>
 
diff --git a/src/fe-common/core/fe-recode.h b/src/fe-common/core/fe-recode.h
index 9fc73289..50775f2c 100644
--- a/src/fe-common/core/fe-recode.h
+++ b/src/fe-common/core/fe-recode.h
@@ -1,7 +1,7 @@
-#ifndef __FE_RECODE_H
-#define __FE_RECODE_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_RECODE_H
+#define IRSSI_FE_COMMON_CORE_FE_RECODE_H
 
 void fe_recode_init (void);
 void fe_recode_deinit (void);
 
-#endif /* __FE_RECODE_H */
+#endif /* IRSSI_FE_COMMON_CORE_FE_RECODE_H */
diff --git a/src/fe-common/core/fe-settings.h b/src/fe-common/core/fe-settings.h
index cc628790..61797bcd 100644
--- a/src/fe-common/core/fe-settings.h
+++ b/src/fe-common/core/fe-settings.h
@@ -1,5 +1,5 @@
-#ifndef __FE_SETTINGS_H
-#define __FE_SETTINGS_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_SETTINGS_H
+#define IRSSI_FE_COMMON_CORE_FE_SETTINGS_H
 
 void fe_settings_set_print(const char *key);
 
diff --git a/src/fe-common/core/fe-tls.h b/src/fe-common/core/fe-tls.h
index f0082477..b0a3ea99 100644
--- a/src/fe-common/core/fe-tls.h
+++ b/src/fe-common/core/fe-tls.h
@@ -16,8 +16,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#ifndef __FE_TLS_H
-#define __FE_TLS_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_TLS_H
+#define IRSSI_FE_COMMON_CORE_FE_TLS_H
 
 void fe_tls_init(void);
 void fe_tls_deinit(void);
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index 782b5430..d5c60c81 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -1,5 +1,5 @@
-#ifndef __WINDOWS_H
-#define __WINDOWS_H
+#ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
+#define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
 
 #include <irssi/src/core/window-item-def.h>
 #include <irssi/src/fe-common/core/command-history.h>
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index a52a3bbd..2e6133be 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -1,5 +1,5 @@
-#ifndef __FORMATS_H
-#define __FORMATS_H
+#ifndef IRSSI_FE_COMMON_CORE_FORMATS_H
+#define IRSSI_FE_COMMON_CORE_FORMATS_H
 
 #include <irssi/src/fe-common/core/themes.h>
 #include <irssi/src/fe-common/core/fe-windows.h>
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 1ffce6b9..0dfe78f3 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -1,5 +1,5 @@
-#ifndef __HILIGHT_TEXT_H
-#define __HILIGHT_TEXT_H
+#ifndef IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
+#define IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
 
 #include <irssi/src/core/iregex.h>
 #include <irssi/src/fe-common/core/formats.h>
diff --git a/src/fe-common/core/keyboard.h b/src/fe-common/core/keyboard.h
index 06b11bba..b19536a0 100644
--- a/src/fe-common/core/keyboard.h
+++ b/src/fe-common/core/keyboard.h
@@ -1,5 +1,5 @@
-#ifndef __KEYBOARD_H
-#define __KEYBOARD_H
+#ifndef IRSSI_FE_COMMON_CORE_KEYBOARD_H
+#define IRSSI_FE_COMMON_CORE_KEYBOARD_H
 
 #include <irssi/src/core/signals.h>
 
diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h
index ff52b374..845bfc6c 100644
--- a/src/fe-common/core/printtext.h
+++ b/src/fe-common/core/printtext.h
@@ -1,5 +1,5 @@
-#ifndef __PRINTTEXT_H
-#define __PRINTTEXT_H
+#ifndef IRSSI_FE_COMMON_CORE_PRINTTEXT_H
+#define IRSSI_FE_COMMON_CORE_PRINTTEXT_H
 
 #include <irssi/src/fe-common/core/fe-windows.h>
 #include <irssi/src/fe-common/core/formats.h>
diff --git a/src/fe-common/core/themes.h b/src/fe-common/core/themes.h
index 31cfe943..53426f3b 100644
--- a/src/fe-common/core/themes.h
+++ b/src/fe-common/core/themes.h
@@ -1,5 +1,5 @@
-#ifndef __THEMES_H
-#define __THEMES_H
+#ifndef IRSSI_FE_COMMON_CORE_THEMES_H
+#define IRSSI_FE_COMMON_CORE_THEMES_H
 
 typedef struct {
 	char *name;
diff --git a/src/fe-common/core/window-activity.h b/src/fe-common/core/window-activity.h
index b904872f..42a4cda5 100644
--- a/src/fe-common/core/window-activity.h
+++ b/src/fe-common/core/window-activity.h
@@ -1,5 +1,5 @@
-#ifndef __WINDOW_ACTIVITY_H
-#define __WINDOW_ACTIVITY_H
+#ifndef IRSSI_FE_COMMON_CORE_WINDOW_ACTIVITY_H
+#define IRSSI_FE_COMMON_CORE_WINDOW_ACTIVITY_H
 
 void window_activity(WINDOW_REC *window, int data_level,
 		     const char *hilight_color);
diff --git a/src/fe-common/core/window-items.h b/src/fe-common/core/window-items.h
index 77ffe680..5bfa92fa 100644
--- a/src/fe-common/core/window-items.h
+++ b/src/fe-common/core/window-items.h
@@ -1,5 +1,5 @@
-#ifndef __WINDOW_ITEMS_H
-#define __WINDOW_ITEMS_H
+#ifndef IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H
+#define IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H
 
 #include <irssi/src/fe-common/core/fe-windows.h>
 
diff --git a/src/fe-common/core/windows-layout.h b/src/fe-common/core/windows-layout.h
index d33fda52..706fb781 100644
--- a/src/fe-common/core/windows-layout.h
+++ b/src/fe-common/core/windows-layout.h
@@ -1,5 +1,5 @@
-#ifndef __WINDOWS_LAYOUT_H
-#define __WINDOWS_LAYOUT_H
+#ifndef IRSSI_FE_COMMON_CORE_WINDOWS_LAYOUT_H
+#define IRSSI_FE_COMMON_CORE_WINDOWS_LAYOUT_H
 
 void windows_layout_restore(void);
 void windows_layout_save(void);
diff --git a/src/fe-common/irc/dcc/fe-dcc.h b/src/fe-common/irc/dcc/fe-dcc.h
index f18b4a80..4d792966 100644
--- a/src/fe-common/irc/dcc/fe-dcc.h
+++ b/src/fe-common/irc/dcc/fe-dcc.h
@@ -1,5 +1,5 @@
-#ifndef __FE_DCC_H
-#define __FE_DCC_H
+#ifndef IRSSI_FE_COMMON_IRC_DCC_FE_DCC_H
+#define IRSSI_FE_COMMON_IRC_DCC_FE_DCC_H
 
 char *dcc_get_size_str(uoff_t size);
 void dcc_list_print_file(FILE_DCC_REC *dcc);
diff --git a/src/fe-common/irc/fe-irc-channels.h b/src/fe-common/irc/fe-irc-channels.h
index d05c91a5..a5770107 100644
--- a/src/fe-common/irc/fe-irc-channels.h
+++ b/src/fe-common/irc/fe-irc-channels.h
@@ -1,5 +1,5 @@
-#ifndef __FE_IRC_CHANNELS_H
-#define __FE_IRC_CHANNELS_H
+#ifndef IRSSI_FE_COMMON_IRC_FE_IRC_CHANNELS_H
+#define IRSSI_FE_COMMON_IRC_FE_IRC_CHANNELS_H
 
 int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target);
 const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target);
diff --git a/src/fe-common/irc/fe-irc-server.h b/src/fe-common/irc/fe-irc-server.h
index 7d9425be..28a709e3 100644
--- a/src/fe-common/irc/fe-irc-server.h
+++ b/src/fe-common/irc/fe-irc-server.h
@@ -1,5 +1,5 @@
-#ifndef __FE_IRC_SERVER_H
-#define __FE_IRC_SERVER_H
+#ifndef IRSSI_FE_COMMON_IRC_FE_IRC_SERVER_H
+#define IRSSI_FE_COMMON_IRC_FE_IRC_SERVER_H
 
 const char *get_visible_target(IRC_SERVER_REC *server, const char *target);
 
diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h
index dff860d3..97dcee22 100644
--- a/src/fe-text/gui-entry.h
+++ b/src/fe-text/gui-entry.h
@@ -1,5 +1,5 @@
-#ifndef __GUI_ENTRY_H
-#define __GUI_ENTRY_H
+#ifndef IRSSI_FE_TEXT_GUI_ENTRY_H
+#define IRSSI_FE_TEXT_GUI_ENTRY_H
 
 typedef struct {
         int cutbuffer_len;
diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h
index 90f82220..ba5d6f8f 100644
--- a/src/fe-text/gui-printtext.h
+++ b/src/fe-text/gui-printtext.h
@@ -1,5 +1,5 @@
-#ifndef __GUI_PRINTTEXT_H
-#define __GUI_PRINTTEXT_H
+#ifndef IRSSI_FE_TEXT_GUI_PRINTTEXT_H
+#define IRSSI_FE_TEXT_GUI_PRINTTEXT_H
 
 #include <irssi/src/fe-text/gui-windows.h>
 #include <irssi/src/fe-text/textbuffer-view.h>
diff --git a/src/fe-text/gui-readline.h b/src/fe-text/gui-readline.h
index 9ce3a742..dc497b8f 100644
--- a/src/fe-text/gui-readline.h
+++ b/src/fe-text/gui-readline.h
@@ -1,5 +1,5 @@
-#ifndef __GUI_READLINE_H
-#define __GUI_READLINE_H
+#ifndef IRSSI_FE_TEXT_GUI_READLINE_H
+#define IRSSI_FE_TEXT_GUI_READLINE_H
 
 extern char *cutbuffer;
 
diff --git a/src/fe-text/gui-windows.h b/src/fe-text/gui-windows.h
index 9fc3fbd5..52a64cea 100644
--- a/src/fe-text/gui-windows.h
+++ b/src/fe-text/gui-windows.h
@@ -1,5 +1,5 @@
-#ifndef __GUI_WINDOWS_H
-#define __GUI_WINDOWS_H
+#ifndef IRSSI_FE_TEXT_GUI_WINDOWS_H
+#define IRSSI_FE_TEXT_GUI_WINDOWS_H
 
 #include <irssi/src/fe-text/mainwindows.h>
 #include <irssi/src/fe-text/textbuffer-view.h>
diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h
index 3a7fb1ed..52cf2df3 100644
--- a/src/fe-text/mainwindows.h
+++ b/src/fe-text/mainwindows.h
@@ -1,5 +1,5 @@
-#ifndef __MAINWINDOWS_H
-#define __MAINWINDOWS_H
+#ifndef IRSSI_FE_TEXT_MAINWINDOWS_H
+#define IRSSI_FE_TEXT_MAINWINDOWS_H
 
 #include <irssi/src/fe-common/core/fe-windows.h>
 #include <irssi/src/fe-text/term.h>
diff --git a/src/fe-text/statusbar-config.h b/src/fe-text/statusbar-config.h
index ebba7da1..239918db 100644
--- a/src/fe-text/statusbar-config.h
+++ b/src/fe-text/statusbar-config.h
@@ -1,5 +1,5 @@
-#ifndef __STATUSBAR_CONFIG_H
-#define __STATUSBAR_CONFIG_H
+#ifndef IRSSI_FE_TEXT_STATUSBAR_CONFIG_H
+#define IRSSI_FE_TEXT_STATUSBAR_CONFIG_H
 
 #include <irssi/src/fe-text/statusbar.h>
 
diff --git a/src/fe-text/statusbar.h b/src/fe-text/statusbar.h
index eae29900..140d355d 100644
--- a/src/fe-text/statusbar.h
+++ b/src/fe-text/statusbar.h
@@ -1,5 +1,5 @@
-#ifndef __STATUSBAR_H
-#define __STATUSBAR_H
+#ifndef IRSSI_FE_TEXT_STATUSBAR_H
+#define IRSSI_FE_TEXT_STATUSBAR_H
 
 #include <irssi/src/fe-text/mainwindows.h>
 #include <irssi/src/fe-text/statusbar-item.h>
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index af866bea..7758fea3 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -1,5 +1,5 @@
-#ifndef __TERM_H
-#define __TERM_H
+#ifndef IRSSI_FE_TEXT_TERM_H
+#define IRSSI_FE_TEXT_TERM_H
 
 typedef struct _TERM_WINDOW TERM_WINDOW;
 
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index 1253fd9d..a077d0bf 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -1,5 +1,5 @@
-#ifndef __TERMINFO_CORE_H
-#define __TERMINFO_CORE_H
+#ifndef IRSSI_FE_TEXT_TERMINFO_CORE_H
+#define IRSSI_FE_TEXT_TERMINFO_CORE_H
 
 #include <termios.h>
 
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index 54775783..607016ac 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -1,5 +1,5 @@
-#ifndef __TEXTBUFFER_VIEW_H
-#define __TEXTBUFFER_VIEW_H
+#ifndef IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H
+#define IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H
 
 #include <irssi/src/fe-text/textbuffer.h>
 #include <irssi/src/fe-text/term.h>
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index 2aa22f1a..cbe4fbf0 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -1,5 +1,5 @@
-#ifndef __TEXTBUFFER_H
-#define __TEXTBUFFER_H
+#ifndef IRSSI_FE_TEXT_TEXTBUFFER_H
+#define IRSSI_FE_TEXT_TEXTBUFFER_H
 
 /* Make sure TEXT_CHUNK_REC is not slightly more than a page, as that
    wastes a lot of memory. */
diff --git a/src/irc/core/bans.h b/src/irc/core/bans.h
index 0b00f19d..5f052667 100644
--- a/src/irc/core/bans.h
+++ b/src/irc/core/bans.h
@@ -1,5 +1,5 @@
-#ifndef __BANS_H
-#define __BANS_H
+#ifndef IRSSI_IRC_CORE_BANS_H
+#define IRSSI_IRC_CORE_BANS_H
 
 void bans_init(void);
 void bans_deinit(void);
diff --git a/src/irc/core/channel-events.h b/src/irc/core/channel-events.h
index d13c9760..ada3e3a1 100644
--- a/src/irc/core/channel-events.h
+++ b/src/irc/core/channel-events.h
@@ -1,5 +1,5 @@
-#ifndef __CHANNEL_EVENTS_H
-#define __CHANNEL_EVENTS_H
+#ifndef IRSSI_IRC_CORE_CHANNEL_EVENTS_H
+#define IRSSI_IRC_CORE_CHANNEL_EVENTS_H
 
 #include <irssi/src/irc/core/irc.h>
 
diff --git a/src/irc/core/channel-rejoin.h b/src/irc/core/channel-rejoin.h
index 0b9cd151..3c465799 100644
--- a/src/irc/core/channel-rejoin.h
+++ b/src/irc/core/channel-rejoin.h
@@ -1,5 +1,5 @@
-#ifndef __CHANNEL_REJOIN_H
-#define __CHANNEL_REJOIN_H
+#ifndef IRSSI_IRC_CORE_CHANNEL_REJOIN_H
+#define IRSSI_IRC_CORE_CHANNEL_REJOIN_H
 
 typedef struct {
 	char *channel;
diff --git a/src/irc/core/ctcp.h b/src/irc/core/ctcp.h
index a146b15f..c8a8a84e 100644
--- a/src/irc/core/ctcp.h
+++ b/src/irc/core/ctcp.h
@@ -1,5 +1,5 @@
-#ifndef __CTCP_H
-#define __CTCP_H
+#ifndef IRSSI_IRC_CORE_CTCP_H
+#define IRSSI_IRC_CORE_CTCP_H
 
 /* Register/unregister CTCP command, so it shows in CTCP CLIENTINFO */
 void ctcp_register(const char *name);
diff --git a/src/irc/core/irc-cap.h b/src/irc/core/irc-cap.h
index 96efbbee..aa13023a 100644
--- a/src/irc/core/irc-cap.h
+++ b/src/irc/core/irc-cap.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_CAP_H
-#define __IRC_CAP_H
+#ifndef IRSSI_IRC_CORE_IRC_CAP_H
+#define IRSSI_IRC_CORE_IRC_CAP_H
 
 void irc_cap_init(void);
 void irc_cap_deinit(void);
diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h
index 2262b484..4ed7fd73 100644
--- a/src/irc/core/irc-channels.h
+++ b/src/irc/core/irc-channels.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_CHANNELS_H
-#define __IRC_CHANNELS_H
+#ifndef IRSSI_IRC_CORE_IRC_CHANNELS_H
+#define IRSSI_IRC_CORE_IRC_CHANNELS_H
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/channels.h>
diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h
index 00aea848..10e98921 100644
--- a/src/irc/core/irc-chatnets.h
+++ b/src/irc/core/irc-chatnets.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_CHATNETS_H
-#define __IRC_CHATNETS_H
+#ifndef IRSSI_IRC_CORE_IRC_CHATNETS_H
+#define IRSSI_IRC_CORE_IRC_CHATNETS_H
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/chatnets.h>
diff --git a/src/irc/core/irc-commands.h b/src/irc/core/irc-commands.h
index 3e24c5a8..6f689313 100644
--- a/src/irc/core/irc-commands.h
+++ b/src/irc/core/irc-commands.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_COMMANDS_H
-#define __IRC_COMMANDS_H
+#ifndef IRSSI_IRC_CORE_IRC_COMMANDS_H
+#define IRSSI_IRC_CORE_IRC_COMMANDS_H
 
 #include <irssi/src/core/commands.h>
 
diff --git a/src/irc/core/irc-masks.h b/src/irc/core/irc-masks.h
index e152c52a..5696bbb5 100644
--- a/src/irc/core/irc-masks.h
+++ b/src/irc/core/irc-masks.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_MASKS_H
-#define __IRC_MASKS_H
+#ifndef IRSSI_IRC_CORE_IRC_MASKS_H
+#define IRSSI_IRC_CORE_IRC_MASKS_H
 
 #include <irssi/src/core/masks.h>
 
diff --git a/src/irc/core/irc-nicklist.h b/src/irc/core/irc-nicklist.h
index e9b30f30..7ac3176d 100644
--- a/src/irc/core/irc-nicklist.h
+++ b/src/irc/core/irc-nicklist.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_NICKLIST_H
-#define __IRC_NICKLIST_H
+#ifndef IRSSI_IRC_CORE_IRC_NICKLIST_H
+#define IRSSI_IRC_CORE_IRC_NICKLIST_H
 
 #include <irssi/src/core/nicklist.h>
 
diff --git a/src/irc/core/irc-queries.h b/src/irc/core/irc-queries.h
index 323006ad..f6680ed2 100644
--- a/src/irc/core/irc-queries.h
+++ b/src/irc/core/irc-queries.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_QUERIES_H
-#define __IRC_QUERIES_H
+#ifndef IRSSI_IRC_CORE_IRC_QUERIES_H
+#define IRSSI_IRC_CORE_IRC_QUERIES_H
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/queries.h>
diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index ac2ca2fc..d3bafdef 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_SERVERS_SETUP_H
-#define __IRC_SERVERS_SETUP_H
+#ifndef IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H
+#define IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers-setup.h>
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index c798a03b..57b65527 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_SERVERS_H
-#define __IRC_SERVERS_H
+#ifndef IRSSI_IRC_CORE_IRC_SERVERS_H
+#define IRSSI_IRC_CORE_IRC_SERVERS_H
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers.h>
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index d018b90c..3f1a9887 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -1,5 +1,5 @@
-#ifndef __IRC_H
-#define __IRC_H
+#ifndef IRSSI_IRC_CORE_IRC_H
+#define IRSSI_IRC_CORE_IRC_H
 
 typedef struct _IRC_CHATNET_REC IRC_CHATNET_REC;
 typedef struct _IRC_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC;
diff --git a/src/irc/core/mode-lists.h b/src/irc/core/mode-lists.h
index cd3bc0bf..2c9f20b1 100644
--- a/src/irc/core/mode-lists.h
+++ b/src/irc/core/mode-lists.h
@@ -1,5 +1,5 @@
-#ifndef __MODE_LISTS_H
-#define __MODE_LISTS_H
+#ifndef IRSSI_IRC_CORE_MODE_LISTS_H
+#define IRSSI_IRC_CORE_MODE_LISTS_H
 
 typedef struct {
 	char *ban;
diff --git a/src/irc/core/modes.h b/src/irc/core/modes.h
index 9442dd5e..f899a06d 100644
--- a/src/irc/core/modes.h
+++ b/src/irc/core/modes.h
@@ -1,5 +1,5 @@
-#ifndef __MODES_H
-#define __MODES_H
+#ifndef IRSSI_IRC_CORE_MODES_H
+#define IRSSI_IRC_CORE_MODES_H
 
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/core/nicklist.h> /* MAX_USER_PREFIXES */
diff --git a/src/irc/core/netsplit.h b/src/irc/core/netsplit.h
index 7cdee694..50edf63b 100644
--- a/src/irc/core/netsplit.h
+++ b/src/irc/core/netsplit.h
@@ -1,5 +1,5 @@
-#ifndef __NETSPLIT_H
-#define __NETSPLIT_H
+#ifndef IRSSI_IRC_CORE_NETSPLIT_H
+#define IRSSI_IRC_CORE_NETSPLIT_H
 
 #include <irssi/src/core/nicklist.h>
 
diff --git a/src/irc/core/sasl.h b/src/irc/core/sasl.h
index 0693989d..04d0cd9d 100644
--- a/src/irc/core/sasl.h
+++ b/src/irc/core/sasl.h
@@ -18,8 +18,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __SASL_H
-#define __SASL_H
+#ifndef IRSSI_IRC_CORE_SASL_H
+#define IRSSI_IRC_CORE_SASL_H
 
 enum {
 	SASL_MECHANISM_NONE = 0,
diff --git a/src/irc/core/servers-idle.h b/src/irc/core/servers-idle.h
index 9d2eacec..b0aed721 100644
--- a/src/irc/core/servers-idle.h
+++ b/src/irc/core/servers-idle.h
@@ -1,5 +1,5 @@
-#ifndef __SERVERS_IDLE_H
-#define __SERVERS_IDLE_H
+#ifndef IRSSI_IRC_CORE_SERVERS_IDLE_H
+#define IRSSI_IRC_CORE_SERVERS_IDLE_H
 
 /* Add new idle command to queue */
 int server_idle_add_redir(IRC_SERVER_REC *server, const char *cmd,
diff --git a/src/irc/core/servers-redirect.h b/src/irc/core/servers-redirect.h
index 6182e3ab..f8ca605f 100644
--- a/src/irc/core/servers-redirect.h
+++ b/src/irc/core/servers-redirect.h
@@ -1,5 +1,5 @@
-#ifndef __SERVERS_REDIRECT_H
-#define __SERVERS_REDIRECT_H
+#ifndef IRSSI_IRC_CORE_SERVERS_REDIRECT_H
+#define IRSSI_IRC_CORE_SERVERS_REDIRECT_H
 
 /* Register new redirection command.
 
diff --git a/src/irc/dcc/dcc-chat.h b/src/irc/dcc/dcc-chat.h
index a22fe75d..ef992bb8 100644
--- a/src/irc/dcc/dcc-chat.h
+++ b/src/irc/dcc/dcc-chat.h
@@ -1,5 +1,5 @@
-#ifndef __DCC_CHAT_H
-#define __DCC_CHAT_H
+#ifndef IRSSI_IRC_DCC_DCC_CHAT_H
+#define IRSSI_IRC_DCC_DCC_CHAT_H
 
 #include <irssi/src/irc/dcc/dcc.h>
 
diff --git a/src/irc/dcc/dcc-file.h b/src/irc/dcc/dcc-file.h
index ef32f07c..38986354 100644
--- a/src/irc/dcc/dcc-file.h
+++ b/src/irc/dcc/dcc-file.h
@@ -1,5 +1,5 @@
-#ifndef __DCC_FILE_H
-#define __DCC_FILE_H
+#ifndef IRSSI_IRC_DCC_DCC_FILE_H
+#define IRSSI_IRC_DCC_DCC_FILE_H
 
 #include <irssi/src/irc/dcc/dcc.h>
 
diff --git a/src/irc/dcc/dcc-get.h b/src/irc/dcc/dcc-get.h
index b6ee385c..3624f2c8 100644
--- a/src/irc/dcc/dcc-get.h
+++ b/src/irc/dcc/dcc-get.h
@@ -1,5 +1,5 @@
-#ifndef __DCC_GET_H
-#define __DCC_GET_H
+#ifndef IRSSI_IRC_DCC_DCC_GET_H
+#define IRSSI_IRC_DCC_DCC_GET_H
 
 #include <irssi/src/irc/dcc/dcc.h>
 
diff --git a/src/irc/dcc/dcc-queue.h b/src/irc/dcc/dcc-queue.h
index 8c1a9b46..1ab4ecbf 100644
--- a/src/irc/dcc/dcc-queue.h
+++ b/src/irc/dcc/dcc-queue.h
@@ -1,5 +1,5 @@
-#ifndef __DCC_QUEUE_H_
-#define __DCC_QUEUE_H_
+#ifndef IRSSI_IRC_DCC_DCC_QUEUE_H_
+#define IRSSI_IRC_DCC_DCC_QUEUE_H_
 
 #include <irssi/src/irc/dcc/dcc-chat.h>
 
diff --git a/src/irc/dcc/dcc-send.h b/src/irc/dcc/dcc-send.h
index a0ee1ade..881ef64e 100644
--- a/src/irc/dcc/dcc-send.h
+++ b/src/irc/dcc/dcc-send.h
@@ -1,5 +1,5 @@
-#ifndef __DCC_SEND_H
-#define __DCC_SEND_H
+#ifndef IRSSI_IRC_DCC_DCC_SEND_H
+#define IRSSI_IRC_DCC_DCC_SEND_H
 
 #include <irssi/src/irc/dcc/dcc.h>
 
diff --git a/src/irc/dcc/dcc-server.h b/src/irc/dcc/dcc-server.h
index a1973b5f..1a4449d4 100644
--- a/src/irc/dcc/dcc-server.h
+++ b/src/irc/dcc/dcc-server.h
@@ -1,5 +1,5 @@
-#ifndef __DCC_SERVER_H
-#define __DCC_SERVER_H
+#ifndef IRSSI_IRC_DCC_DCC_SERVER_H
+#define IRSSI_IRC_DCC_DCC_SERVER_H
 
 #include <irssi/src/irc/dcc/dcc.h>
 
diff --git a/src/irc/dcc/dcc.h b/src/irc/dcc/dcc.h
index 5f54ee18..258d3395 100644
--- a/src/irc/dcc/dcc.h
+++ b/src/irc/dcc/dcc.h
@@ -1,5 +1,5 @@
-#ifndef __DCC_H
-#define __DCC_H
+#ifndef IRSSI_IRC_DCC_DCC_H
+#define IRSSI_IRC_DCC_DCC_H
 
 #include <irssi/src/core/modules.h>
 #include <irssi/src/core/network.h>
diff --git a/src/irc/flood/autoignore.h b/src/irc/flood/autoignore.h
index b00829a1..6c7a86e8 100644
--- a/src/irc/flood/autoignore.h
+++ b/src/irc/flood/autoignore.h
@@ -1,5 +1,5 @@
-#ifndef __AUTOIGNORE_H
-#define __AUTOIGNORE_H
+#ifndef IRSSI_IRC_FLOOD_AUTOIGNORE_H
+#define IRSSI_IRC_FLOOD_AUTOIGNORE_H
 
 void autoignore_add(IRC_SERVER_REC *server, char *nick, int level);
 
diff --git a/src/irc/flood/flood.h b/src/irc/flood/flood.h
index e6454729..6bfc7850 100644
--- a/src/irc/flood/flood.h
+++ b/src/irc/flood/flood.h
@@ -1,5 +1,5 @@
-#ifndef __FLOOD_H
-#define __FLOOD_H
+#ifndef IRSSI_IRC_FLOOD_FLOOD_H
+#define IRSSI_IRC_FLOOD_FLOOD_H
 
 void flood_init(void);
 void flood_deinit(void);
diff --git a/src/irc/notifylist/notify-setup.h b/src/irc/notifylist/notify-setup.h
index bfaef0c8..8540d1c2 100644
--- a/src/irc/notifylist/notify-setup.h
+++ b/src/irc/notifylist/notify-setup.h
@@ -1,5 +1,5 @@
-#ifndef __NOTIFY_SETUP_H
-#define __NOTIFY_SETUP_H
+#ifndef IRSSI_IRC_NOTIFYLIST_NOTIFY_SETUP_H
+#define IRSSI_IRC_NOTIFYLIST_NOTIFY_SETUP_H
 
 void notifylist_add_config(NOTIFYLIST_REC *rec);
 void notifylist_remove_config(NOTIFYLIST_REC *rec);
diff --git a/src/irc/notifylist/notifylist.h b/src/irc/notifylist/notifylist.h
index 1094a105..fe2a1aac 100644
--- a/src/irc/notifylist/notifylist.h
+++ b/src/irc/notifylist/notifylist.h
@@ -1,5 +1,5 @@
-#ifndef __NOTIFYLIST_H
-#define __NOTIFYLIST_H
+#ifndef IRSSI_IRC_NOTIFYLIST_NOTIFYLIST_H
+#define IRSSI_IRC_NOTIFYLIST_NOTIFYLIST_H
 
 typedef struct {
 	char *mask; /* nick part must not contain wildcards */
diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h
index 2cbaf69d..5b3d25f5 100644
--- a/src/irc/proxy/proxy.h
+++ b/src/irc/proxy/proxy.h
@@ -1,5 +1,5 @@
-#ifndef PROXY_H
-#define PROXY_H
+#ifndef IRSSI_IRC_PROXY_PROXY_H
+#define IRSSI_IRC_PROXY_PROXY_H
 
 #include <irssi/src/common.h>
 
diff --git a/src/lib-config/iconfig.h b/src/lib-config/iconfig.h
index 91583e40..92662d8d 100644
--- a/src/lib-config/iconfig.h
+++ b/src/lib-config/iconfig.h
@@ -1,5 +1,5 @@
-#ifndef __ICONFIG_H
-#define __ICONFIG_H
+#ifndef IRSSI_LIB_CONFIG_ICONFIG_H
+#define IRSSI_LIB_CONFIG_ICONFIG_H
 
 enum {
         NODE_TYPE_KEY,
diff --git a/src/perl/perl-common.h b/src/perl/perl-common.h
index e2992ee9..88adaa7e 100644
--- a/src/perl/perl-common.h
+++ b/src/perl/perl-common.h
@@ -1,5 +1,5 @@
-#ifndef __PERL_COMMON_H
-#define __PERL_COMMON_H
+#ifndef IRSSI_PERL_PERL_COMMON_H
+#define IRSSI_PERL_PERL_COMMON_H
 
 /* helper defines */
 #define new_pv(a) \
diff --git a/src/perl/perl-core.h b/src/perl/perl-core.h
index 7390a6fd..0d3a1a2f 100644
--- a/src/perl/perl-core.h
+++ b/src/perl/perl-core.h
@@ -1,5 +1,5 @@
-#ifndef __PERL_CORE_H
-#define __PERL_CORE_H
+#ifndef IRSSI_PERL_PERL_CORE_H
+#define IRSSI_PERL_PERL_CORE_H
 
 typedef struct {
 	char *name; /* unique name */
diff --git a/src/perl/perl-signals.h b/src/perl/perl-signals.h
index 78a95bed..8191a917 100644
--- a/src/perl/perl-signals.h
+++ b/src/perl/perl-signals.h
@@ -1,5 +1,5 @@
-#ifndef __PERL_SIGNALS_H
-#define __PERL_SIGNALS_H
+#ifndef IRSSI_PERL_PERL_SIGNALS_H
+#define IRSSI_PERL_PERL_SIGNALS_H
 
 void perl_signal_args_to_c(void (*callback)(void *, void **), void *cb_arg,
                            int signal_id, SV **args, size_t n_args);
diff --git a/src/perl/perl-sources.h b/src/perl/perl-sources.h
index a83a65a6..0addb35d 100644
--- a/src/perl/perl-sources.h
+++ b/src/perl/perl-sources.h
@@ -1,5 +1,5 @@
-#ifndef __PERL_SOURCES_H
-#define __PERL_SOURCES_H
+#ifndef IRSSI_PERL_PERL_SOURCES_H
+#define IRSSI_PERL_PERL_SOURCES_H
 
 int perl_timeout_add(int msecs, SV *func, SV *data, int once);
 int perl_input_add(int source, int condition, SV *func, SV *data, int once);

From 9bbacf861b9ade8ae41536c9068557b0a43a0cda Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Wed, 1 May 2019 22:35:08 +0200
Subject: [PATCH 0976/1650] fix irssi-version link

---
 configure.ac | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3a60a88..e1671e0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -766,13 +766,11 @@ irssi-config
 ])
 
 dnl ** make the paths like include headers later
-AC_CONFIG_LINKS([
-irssi/irssi-config.h:irssi-config.h
-irssi/irssi-version.h:irssi-version.h
-])
+AC_CONFIG_LINKS([irssi/irssi-config.h:irssi-config.h])
 AC_LINK_FILES([$srcdir/src],[irssi/src])
 
 AC_OUTPUT
+$LN_S ../irssi-version.h irssi/irssi-version.h
 
 dnl ** for building from objdir
 old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir

From 845431aa31b622ce524898d27f30aa9c33f08a6f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 2 May 2019 17:14:23 +0200
Subject: [PATCH 0977/1650] Install pkg-config file

add a copy of pkg-config-0.29.2 pkg.m4
---
 Makefile.am     |   3 +-
 configure.ac    |   4 +-
 irssi-1.pc.in   |  20 ++++
 irssi-config.in |   9 --
 m4/pkg.m4       | 275 ++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 300 insertions(+), 11 deletions(-)
 create mode 100644 irssi-1.pc.in
 delete mode 100644 irssi-config.in
 create mode 100644 m4/pkg.m4

diff --git a/Makefile.am b/Makefile.am
index ba45d8ac..8bfa362e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,8 @@ SUBDIRS = src tests docs scripts themes utils
 confdir = $(sysconfdir)
 conf_DATA = irssi.conf
 
+pkgconfig_DATA = irssi-1.pc
+
 pkginclude_HEADERS = irssi-config.h irssi-version.h
 
 EXTRA_DIST = \
@@ -28,5 +30,4 @@ EXTRA_DIST = \
 	autogen.sh \
 	README.md \
 	$(conf_DATA) \
-	irssi-config.in \
 	irssi-icon.png
diff --git a/configure.ac b/configure.ac
index e1671e0c..9c0243f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,8 @@ AM_PROG_LIBTOOL
 AC_PATH_PROG(sedpath, sed)
 AC_PATH_PROG(perlpath, perl)
 
+PKG_INSTALLDIR
+
 AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h)
 
 # check posix headers..
@@ -762,7 +764,7 @@ docs/help/Makefile
 docs/help/in/Makefile
 utils/Makefile
 themes/Makefile
-irssi-config
+irssi-1.pc
 ])
 
 dnl ** make the paths like include headers later
diff --git a/irssi-1.pc.in b/irssi-1.pc.in
new file mode 100644
index 00000000..a1c00f5c
--- /dev/null
+++ b/irssi-1.pc.in
@@ -0,0 +1,20 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+prog_libs="@PROG_LIBS@"
+common_libs="@COMMON_LIBS@"
+
+perl_link_libs="@PERL_LINK_LIBS@"
+perl_fe_link_libs="@PERL_FE_LINK_LIBS@"
+perl_link_flags="@PERL_LINK_FLAGS@"
+
+chat_modules="@CHAT_MODULES@"
+irc_modules="@irc_MODULES@"
+
+Name: Irssi
+Description: Irssi chat client
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir} @OPENSSL_CFLAGS@
+Requires: glib-2.0
\ No newline at end of file
diff --git a/irssi-config.in b/irssi-config.in
deleted file mode 100644
index cd529ed0..00000000
--- a/irssi-config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-PROG_LIBS="@PROG_LIBS@"
-COMMON_LIBS="@COMMON_LIBS@"
-
-PERL_LINK_LIBS="@PERL_LINK_LIBS@"
-PERL_FE_LINK_LIBS="@PERL_FE_LINK_LIBS@"
-PERL_LINK_FLAGS="@PERL_LINK_FLAGS@"
-
-CHAT_MODULES="@CHAT_MODULES@"
-irc_MODULES="@irc_MODULES@"
diff --git a/m4/pkg.m4 b/m4/pkg.m4
new file mode 100644
index 00000000..13a88901
--- /dev/null
+++ b/m4/pkg.m4
@@ -0,0 +1,275 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $2])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+        AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR

From 4a3a064d55e9136fa5ad31f89f74dbe8752fe7e0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 7 May 2019 13:37:31 +0200
Subject: [PATCH 0978/1650] fix reconnect of multiplexed proxy

---
 src/irc/proxy/listen.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 37e2a939..1c53369c 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -27,6 +27,7 @@
 #include <irssi/src/core/misc.h>
 
 #include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-chatnets.h>
 #include <irssi/src/irc/core/irc-channels.h>
 
 #include <irssi/src/fe-common/core/printtext.h> /* FIXME: evil. need to do fe-proxy */
@@ -176,7 +177,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 		if (!client->multiplex) {
 			args_pass = args;
 		} else {
-			IRC_SERVER_REC *server;
+			IRC_CHATNET_REC *chatnet;
 			char *tag;
 			const char *tag_end;
 
@@ -188,18 +189,19 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
 			}
 
 			tag = g_strndup(args, tag_end - args);
-			server = IRC_SERVER(server_find_chatnet(tag));
-			g_free(tag);
+			chatnet = IRC_CHATNET(chatnet_find(tag));
 
-			if (!server) {
+			if (!chatnet) {
 				/* an invalid network was specified */
 				remove_client(client);
+				g_free(tag);
 				return;
 			}
 
-			client->server = server;
+			client->server = IRC_SERVER(server_find_chatnet(tag));
 			g_free(client->proxy_address);
-			client->proxy_address = g_strdup_printf("%.*s.proxy", (int)(tag_end - args), args);
+			client->proxy_address = g_strdup_printf("%s.proxy", tag);
+			g_free(tag);
 		}
 
 		if (g_strcmp0(password, args_pass) != 0) {
@@ -578,7 +580,8 @@ static void event_connected(IRC_SERVER_REC *server)
 		if (rec->connected && rec->server == NULL &&
 		    (g_strcmp0(rec->listen->ircnet, "*") == 0 ||
 		     (chatnet != NULL &&
-		      g_ascii_strcasecmp(chatnet, rec->listen->ircnet) == 0))) {
+		      strstr(rec->proxy_address, chatnet) == rec->proxy_address &&
+		      rec->proxy_address[strlen(chatnet)] == '.'))) {
 			proxy_outdata(rec, ":%s NOTICE %s :Connected to server\r\n",
 			                    rec->proxy_address, rec->nick);
 			rec->server = server;

From d45993dba438fe52d21aca365ea3dceb40d9beb7 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Fri, 22 Mar 2019 12:30:46 +0100
Subject: [PATCH 0979/1650] Add -out parameter to /CAT

Change flag to -window

Updated help

Typo

call printtext with server

Only use server when target is not NULL
---
 docs/help/in/cat.in                   |  7 +++++--
 src/fe-common/core/fe-core-commands.c | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/help/in/cat.in b/docs/help/in/cat.in
index 9f9f242f..370c1796 100644
--- a/docs/help/in/cat.in
+++ b/docs/help/in/cat.in
@@ -5,19 +5,22 @@
 
 %9Parameters:%9
 
+    -window:            Displays the output in the active window.
+
     The file to display and optionally a position to seek in the file,
     in bytes.
 
 %9Description:%9
 
-    Displays the contents of the specified file into the active window.
+    Displays the contents of the specified file in the active window if -window
+    is specified, otherwise to the closest matching window depending on levels.
 
     The seek position parameter is used internally to display away logs, if
     omitted the whole file is shown.
 
 %9Examples:%9
 
-    /CAT /etc/network/interfaces
+    /CAT -window /etc/network/interfaces
     /CAT /home/mike/resume.txt
     /CAT contact_details.txt
 
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 7e09cded..3da998bf 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -114,10 +114,11 @@ static void cmd_version(char *data)
 	}
 }
 
-/* SYNTAX: CAT <file> [<seek position>] */
-static void cmd_cat(const char *data)
+/* SYNTAX: CAT [-window] <file> [<seek position>] */
+static void cmd_cat(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 {
-	char *fname, *fposstr;
+	char *fname, *fposstr, *target;
+	GHashTable *optlist;
 	void *free_arg;
 	int fpos;
 	GIOChannel *handle;
@@ -127,12 +128,14 @@ static void cmd_cat(const char *data)
 	int fd;
 #endif
 
-	if (!cmd_get_params(data, &free_arg, 2, &fname, &fposstr))
+	g_return_if_fail(data != NULL);
+
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS,
+				"cat", &optlist, &fname, &fposstr))
 		return;
 
 	fname = convert_home(fname);
 	fpos = atoi(fposstr);
-        cmd_params_free(free_arg);
 
 #ifdef HAVE_CAPSICUM
 	fd = capsicum_open_wrapper(fname, O_RDONLY, 0);
@@ -152,15 +155,18 @@ static void cmd_cat(const char *data)
 		return;
 	}
 
+	target = g_hash_table_lookup(optlist, "window") != NULL ? item->name : NULL;
+
 	g_io_channel_set_encoding(handle, NULL, NULL);
 	g_io_channel_seek_position(handle, fpos, G_SEEK_SET, NULL);
 	buf = g_string_sized_new(512);
 	while (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) {
 		buf->str[tpos] = '\0';
-		printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP |
+		printtext(target != NULL ? server : NULL, target, MSGLEVEL_CLIENTCRAP |
 			  MSGLEVEL_NEVER, "%s", buf->str);
 	}
 	g_string_free(buf, TRUE);
+	cmd_params_free(free_arg);
 
 	g_io_channel_unref(handle);
 }
@@ -344,6 +350,7 @@ void fe_core_commands_init(void)
 	signal_add("list subcommands", (SIGNAL_FUNC) event_list_subcommands);
 
 	command_set_options("echo", "+level +window");
+	command_set_options("cat", "window");
 }
 
 void fe_core_commands_deinit(void)

From 9e13892e280cf848abf022430f2cbc1f8e214298 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 13 May 2019 15:15:46 +0200
Subject: [PATCH 0980/1650] fix realpath on old solaris

POSIX.1-2001 did not implement realpath(..., NULL) yet.
Fixes #1042
---
 src/lib-config/write.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index b8ef6156..5dbbd1ed 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -315,6 +315,15 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	/* expand all symlinks; else we may replace a symlink with a regular file */
 	dest_name = realpath(base_name, NULL);
 
+	if (errno == EINVAL) {
+		/* variable path length not supported by glibc < 2.3, Solaris < 11 */
+		char resolved_path[PATH_MAX] = { 0 };
+		errno = 0;
+		if ((dest_name = realpath(base_name, resolved_path)) != NULL) {
+			dest_name = g_strdup(dest_name);
+		}
+	}
+
 	if (dest_name == NULL) {
 		if (errno == ENOENT) {
 			dest_name = g_strdup(base_name);

From 78ae00910e0c10090ba0120ae5e74d88c120f499 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 15 May 2019 14:24:10 +0200
Subject: [PATCH 0981/1650] Make MSGLEVEL_HIDDEN accessible from scripts

Empty line in wrong place

Expose MSGLEVEL_HIDDEN to scripts
---
 src/perl/common/Core.xs  | 7 +++++++
 src/perl/common/Irssi.pm | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index 75b851d6..8e26f105 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -303,6 +303,13 @@ CODE:
 	perl_source_remove(tag);
 
 # maybe there's some easier way than this..? :)
+int
+MSGLEVEL_HIDDEN()
+CODE:
+	RETVAL = MSGLEVEL_HIDDEN;
+OUTPUT:
+	RETVAL
+
 int
 MSGLEVEL_CRAP()
 CODE:
diff --git a/src/perl/common/Irssi.pm b/src/perl/common/Irssi.pm
index 1d7ed2f3..786d0e52 100644
--- a/src/perl/common/Irssi.pm
+++ b/src/perl/common/Irssi.pm
@@ -142,7 +142,7 @@ require DynaLoader;
 	MSGLEVEL_TOPICS MSGLEVEL_WALLOPS MSGLEVEL_INVITES MSGLEVEL_NICKS
 	MSGLEVEL_DCC MSGLEVEL_DCCMSGS MSGLEVEL_CLIENTNOTICE MSGLEVEL_CLIENTCRAP
 	MSGLEVEL_CLIENTERROR MSGLEVEL_HILIGHT MSGLEVEL_ALL MSGLEVEL_NOHILIGHT
-	MSGLEVEL_NO_ACT MSGLEVEL_NEVER MSGLEVEL_LASTLOG
+	MSGLEVEL_NO_ACT MSGLEVEL_NEVER MSGLEVEL_LASTLOG MSGLEVEL_HIDDEN
 );
 
 my $static = 0;

From 38a81026b9fe09f22d41acefcfb2412d828bf4ff Mon Sep 17 00:00:00 2001
From: David Gall <mrdgall@gmail.com>
Date: Sun, 26 May 2019 18:59:21 +0200
Subject: [PATCH 0982/1650] Syntax Issue

"was is" changed to "was" for otr_msg_not_in_private
---
 src/otr/otr-formats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c
index d26edbba..d4d273d1 100644
--- a/src/otr/otr-formats.c
+++ b/src/otr/otr-formats.c
@@ -78,7 +78,7 @@ FORMAT_REC fe_otr_formats[] = {
 	{ "otr_msg_error", "Error in private conversation: {error $0}", 1, { 0 }},
 	{ "otr_msg_general_error", "General Error: {error $0}", 1, { 0 }},
 	{ "otr_msg_malformed", "Malformed message from {hilight $0}", 1, { 0 }},
-	{ "otr_msg_not_in_private", "The encrypted message from {hilight $0} was is unreadable because you're not communicating privately", 1, { 0 }},
+	{ "otr_msg_not_in_private", "The encrypted message from {hilight $0} was unreadable because you're not communicating privately", 1, { 0 }},
 	{ "otr_msg_reflected", "Received reflected message from {hilight $0}", 0, { 0 }},
 	{ "otr_msg_resent", "The last message to {hilight $0} was resent: $1", 2, { 0, 0 }},
 	{ "otr_msg_unencrypted", "The following message from {hilight $0} was {error not} encrypted", 1, { 0 }},

From cd5958079ccdbe5e5bc34474dddc0bb14f9c2c8f Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Tue, 28 May 2019 14:00:04 +0200
Subject: [PATCH 0983/1650] Make it possible to list specific section with /set

update help

Allow partial matching
---
 docs/help/in/set.in              |  2 ++
 src/fe-common/core/fe-settings.c | 36 +++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/docs/help/in/set.in b/docs/help/in/set.in
index b2a4551b..097ace7e 100644
--- a/docs/help/in/set.in
+++ b/docs/help/in/set.in
@@ -7,6 +7,7 @@
 
     -clear:      Removes the setting's value from the configuration.
     -default:    Restore the setting to its default value.
+    -section:    Print settings under the specified section
 
     The setting and the value; if no value is given, the list of settings that
     matched will be returned. If no arguments are given, all the settings will
@@ -27,6 +28,7 @@
     /SET -clear nick
     /SET log_timestamp %%H:%%H:%%S
     /SET -default log_timestamp
+    /SET -section lookandfeel
     /SET close
 
 %9See also:%9 SAVE, TOGGLE
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index ad4747e8..f686916f 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -69,6 +69,29 @@ static void set_print_pattern(const char *pattern)
 	g_slist_free(sets);
 }
 
+static void set_print_section(const char *pattern)
+{
+	GSList *sets, *tmp;
+	const char *last_section;
+
+	last_section = "";
+	sets = settings_get_sorted();
+	for (tmp = sets; tmp != NULL; tmp = tmp->next) {
+		SETTINGS_REC *rec = tmp->data;
+
+		if (stristr(rec->section, pattern) != NULL) {
+			if (g_strcmp0(last_section, rec->section) != 0) {
+				/* print section */
+				printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP,
+						TXT_SET_TITLE, rec->section);
+				last_section = rec->section;
+			}
+			set_print(rec);
+		}
+	}
+	g_slist_free(sets);
+}
+
 static void set_boolean(const char *key, const char *value)
 {
 	char *stripped_value;
@@ -123,13 +146,13 @@ static void set_choice(const char *key, const char *value)
 	g_free(stripped_value);
 }
 
-/* SYNTAX: SET [-clear | -default] [<key> [<value>]] */
+/* SYNTAX: SET [-clear | -default | -section] [<key> [<value>]] */
 static void cmd_set(char *data)
 {
         GHashTable *optlist;
 	char *key, *value;
 	void *free_arg;
-	int clear, set_default;
+	int clear, set_default, list_section;
 	SETTINGS_REC *rec;
 
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
@@ -139,11 +162,14 @@ static void cmd_set(char *data)
 
 	clear = g_hash_table_lookup(optlist, "clear") != NULL;
 	set_default = g_hash_table_lookup(optlist, "default") != NULL;
+	list_section = g_hash_table_lookup(optlist, "section") != NULL;
 
 	if (*key == '\0')
-		clear = set_default = FALSE;
+		clear = set_default = list_section = FALSE;
 
-	if (!(clear || set_default || *value != '\0'))
+	if (list_section)
+		set_print_section(key);
+	else if (!(clear || set_default || *value != '\0'))
 		set_print_pattern(key);
 	else {
 		rec = settings_get_record(key);
@@ -408,7 +434,7 @@ void fe_settings_init(void)
 	command_bind("unalias", NULL, (SIGNAL_FUNC) cmd_unalias);
 	command_bind("reload", NULL, (SIGNAL_FUNC) cmd_reload);
 	command_bind("save", NULL, (SIGNAL_FUNC) cmd_save);
-	command_set_options("set", "clear default");
+	command_set_options("set", "clear default section");
 
         signal_add("settings errors", (SIGNAL_FUNC) sig_settings_errors);
 }

From 1910b67b979d2b66b6bc7bb9d2e847a8539063cf Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Thu, 30 May 2019 17:24:02 +0300
Subject: [PATCH 0984/1650] Clarify statusbar priorities

I was misled by the documentation a little bit and thought that status bar items of lower priority will be removed rather than truncated if they didn't fit.

Also, I had a hard time lowering priority below 0 because I didn't realize negative numbers have to be quoted so they won't be interpreted as option flags.
---
 docs/help/in/statusbar.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index 9d68d1c9..fd764537 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -30,7 +30,9 @@
     -before:      This item is added before the other item.
     -after:       This item is added after the other item.
     -priority:    When the statusbar items overflow, the item with the
-                  lowest priority is removed first
+                  lowest priority is removed or truncated first.
+                  Priority can be negative, in which case it'll have to be
+                  quoted (e.g. -priority "-1")
     -alignment:   Display the item on the right side.
 
     Where statusbar refers to the name of the statusbar; if no argument is

From d9fef37131df945b0e6086152553f1921aae3dcf Mon Sep 17 00:00:00 2001
From: Alex Shafer <ashafer01@gmail.com>
Date: Mon, 3 Jun 2019 20:58:18 -0600
Subject: [PATCH 0985/1650] Fix #1051 - Document Irssi::get_irssi_dir()

---
 docs/perl.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/perl.txt b/docs/perl.txt
index 4f875c97..761b2f4d 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -178,6 +178,9 @@ listed after the generic ones.
 Window active_win() - return active window
 Server active_server() - return server in active window
 
+get_irssi_dir() - returns the absolute path to the user configuration
+  directory - either the value passed to --home at startup, or ~/.irssi
+
 windows() - return list of all windows
 servers() - return list of all servers
 reconnects() - return list of all server reconnections

From 1d6aeb08fd8b732a7403ff0b53fe40e7f679caf7 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sun, 9 Jun 2019 23:03:31 +0000
Subject: [PATCH 0986/1650] fe-text/mainwindows: fix /window balance warning

mainwindow_resize() expects that the mainwindow's height has not yet
been updated, as it updates it itself, and throws a warning otherwise.
---
 src/fe-text/mainwindows.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 677e0e14..051c63ae 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1298,9 +1298,7 @@ static void window_balance_vertical(void)
 				rec->last_line++;
 			}
 
-			rec->height = rec->last_line-rec->first_line+1;
-
-			mainwindow_resize(rec, 0, rec->height-old_size);
+			mainwindow_resize(rec, 0, rec->last_line - rec->first_line + 1 - old_size);
 		}
 		if (line != NULL && bigger_units > 0) {
 			bigger_units--;

From 38b6284535e228c9dd7296a4ec2a4a9da64e230a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 17 Jun 2019 14:53:42 +0200
Subject: [PATCH 0987/1650] restore 8bit support in input entry

---
 src/fe-text/gui-entry.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 1a721397..095c48a1 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -379,11 +379,19 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 		if (new_xpos > end_xpos)
 			break;
 
-		if (entry->hidden)
+		if (entry->hidden) {
                         g_string_append_c(str, ' ');
-		else if (unichar_isprint(c))
-			g_string_append_unichar(str, c);
-		else {
+		} else if (unichar_isprint(c)) {
+			if (entry->utf8) {
+				g_string_append_unichar(str, c);
+			} else if (term_type == TERM_TYPE_BIG5) {
+				if(c > 0xff)
+					g_string_append_c(str, (c >> 8) & 0xff);
+				g_string_append_c(str, c & 0xff);
+			} else {
+				g_string_append_c(str, c);
+			}
+		} else {
 			g_string_append_c(str, 4);
 			g_string_append_c(str, FORMAT_STYLE_REVERSE);
 			g_string_append_c(str, (c & 127)+'A'-1);

From 5a67b983dc97caeb5df1139aabd0bc4f260a47d8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 17 Jun 2019 15:22:27 +0200
Subject: [PATCH 0988/1650] copy sasl username and password values

---
 src/irc/core/irc-core.c              | 2 ++
 src/irc/core/irc-servers-reconnect.c | 4 ++--
 src/irc/core/irc-servers-setup.c     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index e65abe25..b5e80f2a 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -75,6 +75,8 @@ static void destroy_server_connect(SERVER_CONNECT_REC *conn)
 
 	g_free_not_null(ircconn->usermode);
 	g_free_not_null(ircconn->alternate_nick);
+	g_free_not_null(ircconn->sasl_username);
+	g_free_not_null(ircconn->sasl_password);
 }
 
 void irc_core_init(void)
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index 3d2933f4..cfe28a1a 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -49,8 +49,8 @@ static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 	rec->usermode = g_strdup(src->usermode);
 	rec->alternate_nick = g_strdup(src->alternate_nick);
 	rec->sasl_mechanism = src->sasl_mechanism;
-	rec->sasl_username = src->sasl_username;
-	rec->sasl_password = src->sasl_password;
+	rec->sasl_username = g_strdup(src->sasl_username);
+	rec->sasl_password = g_strdup(src->sasl_password);
 	*dest = (SERVER_CONNECT_REC *) rec;
 }
 
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 56e52edd..5f1290a2 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -101,8 +101,8 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 			conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
 			if (ircnet->sasl_username != NULL && *ircnet->sasl_username &&
 			    ircnet->sasl_password != NULL && *ircnet->sasl_password) {
-				conn->sasl_username = ircnet->sasl_username;
-				conn->sasl_password = ircnet->sasl_password;
+				conn->sasl_username = g_strdup(ircnet->sasl_username);
+				conn->sasl_password = g_strdup(ircnet->sasl_password);
 			} else
 				g_warning("The fields sasl_username and sasl_password are either missing or empty");
 		}

From 8d11060fbc698e843148b6b07fe2ef60ddca71c8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 18 Jun 2019 14:55:47 +0200
Subject: [PATCH 0989/1650] Use the 24bit mIRC colour mappings if
 colors_ansi_24bit is enabled

---
 src/fe-text/gui-printtext.c | 66 ++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 9b472bff..24e91624 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -30,6 +30,7 @@
 #include <irssi/src/fe-text/gui-printtext.h>
 #include <irssi/src/fe-text/gui-windows.h>
 
+/* Terminal indexed colour map */
 int mirc_colors[] = { 15, 0, 1, 2, 12, 4, 5, 6, 14, 10, 3, 11, 9, 13, 8, 7,
 	 /* 16-27 */  52,  94, 100,  58,  22,  29,  23,  24,  17,  54,  53,  89,
 	 /* 28-39 */  88, 130, 142,  64,  28,  35,  30,  25,  18,  91,  90, 125,
@@ -38,6 +39,17 @@ int mirc_colors[] = { 15, 0, 1, 2, 12, 4, 5, 6, 14, 10, 3, 11, 9, 13, 8, 7,
 	 /* 64-75 */ 203, 215, 227, 191,  83, 122,  87, 111,  63, 177, 207, 205,
 	 /* 76-87 */ 217, 223, 229, 193, 157, 158, 159, 153, 147, 183, 219, 212,
 	 /* 88-98 */  16, 233, 235, 237, 239, 241, 244, 247, 250, 254, 231, -1 };
+
+/* RGB colour map */
+int mirc_colors24[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	 /* 16-27 */ 0x470000, 0x472100, 0x474700, 0x324700, 0x004700, 0x00472c, 0x004747, 0x002747, 0x000047, 0x2e0047, 0x470047, 0x47002a,
+	 /* 28-39 */ 0x740000, 0x743a00, 0x747400, 0x517400, 0x007400, 0x007449, 0x007474, 0x004074, 0x000074, 0x4b0074, 0x740074, 0x740045,
+	 /* 40-51 */ 0xb50000, 0xb56300, 0xb5b500, 0x7db500, 0x00b500, 0x00b571, 0x00b5b5, 0x0063b5, 0x0000b5, 0x7500b5, 0xb500b5, 0xb5006b,
+	 /* 52-63 */ 0xff0000, 0xff8c00, 0xffff00, 0xb2ff00, 0x00ff00, 0x00ffa0, 0x00ffff, 0x008cff, 0x0000ff, 0xa500ff, 0xff00ff, 0xff0098,
+	 /* 64-75 */ 0xff5959, 0xffb459, 0xffff71, 0xcfff60, 0x6fff6f, 0x65ffc9, 0x6dffff, 0x59b4ff, 0x5959ff, 0xc459ff, 0xff66ff, 0xff59bc,
+	 /* 76-87 */ 0xff9c9c, 0xffd39c, 0xffff9c, 0xe2ff9c, 0x9cff9c, 0x9cffdb, 0x9cffff, 0x9cd3ff, 0x9c9cff, 0xdc9cff, 0xff9cff, 0xff94d3,
+	 /* 88-98 */ 0x000000, 0x131313, 0x282828, 0x363636, 0x4d4d4d, 0x656565, 0x818181, 0x9f9f9f, 0xbcbcbc, 0xe2e2e2, 0xffffff, -1 };
+
 static int scrollback_lines, scrollback_time, scrollback_burst_remove;
 /*
  * If positive, remove lines older than scrollback_max_age seconds.
@@ -225,28 +237,42 @@ static void remove_old_lines(TEXT_BUFFER_VIEW_REC *view)
 	}
 }
 
-static void get_colors(int flags, int *fg, int *bg, int *attr)
+static void get_colors(int *flags, int *fg, int *bg, int *attr)
 {
 	*attr = 0;
-	if (flags & GUI_PRINT_FLAG_MIRC_COLOR) {
+	if (*flags & GUI_PRINT_FLAG_MIRC_COLOR) {
 		/* mirc colors - extended colours proposal */
-                if (*bg >= 0) {
-			*bg = mirc_colors[*bg % 100];
-			flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
-			/* ignore mirc color 99 = -1 (reset) */
-			if (*bg != -1 && settings_get_bool("mirc_blink_fix")) {
-				if (*bg < 16) /* ansi bit flip :-( */
-					*bg = (*bg&8) | (*bg&4)>>2 | (*bg&2) | (*bg&1)<<2;
-				*bg = term_color256map[*bg&0xff] & 7;
+		gboolean use_24_map = FALSE;
+#ifdef TERM_TRUECOLOR
+		use_24_map = settings_get_bool("colors_ansi_24bit");
+#endif
+		if (*bg >= 0) {
+			if (use_24_map && mirc_colors24[*bg % 100] != -1) {
+				*bg = mirc_colors24[*bg % 100];
+				*flags |= GUI_PRINT_FLAG_COLOR_24_BG;
+			} else {
+				*bg = mirc_colors[*bg % 100];
+				*flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
+				/* ignore mirc color 99 = -1 (reset) */
+				if (*bg != -1 && settings_get_bool("mirc_blink_fix")) {
+					if (*bg < 16) /* ansi bit flip :-( */
+						*bg = (*bg&8) | (*bg&4)>>2 | (*bg&2) | (*bg&1)<<2;
+					*bg = term_color256map[*bg&0xff] & 7;
+				}
 			}
 		}
 		if (*fg >= 0) {
-			*fg = mirc_colors[*fg % 100];
-			flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
+			if (use_24_map && mirc_colors24[*fg % 100] != -1) {
+				*fg = mirc_colors24[*fg % 100];
+				*flags |= GUI_PRINT_FLAG_COLOR_24_FG;
+			} else {
+				*fg = mirc_colors[*fg % 100];
+				*flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
+			}
 		}
 	}
 
-	if (flags & GUI_PRINT_FLAG_COLOR_24_FG)
+	if (*flags & GUI_PRINT_FLAG_COLOR_24_FG)
 		*attr |= ATTR_FGCOLOR24;
 	else if (*fg < 0 || *fg > 255) {
 		*fg = -1;
@@ -255,7 +281,7 @@ static void get_colors(int flags, int *fg, int *bg, int *attr)
 	else
 		*attr |= *fg;
 
-	if (flags & GUI_PRINT_FLAG_COLOR_24_BG)
+	if (*flags & GUI_PRINT_FLAG_COLOR_24_BG)
 		*attr |= ATTR_BGCOLOR24;
 	else if (*bg < 0 || *bg > 255) {
                 *bg = -1;
@@ -264,11 +290,11 @@ static void get_colors(int flags, int *fg, int *bg, int *attr)
 	else
 		*attr |= (*bg << BG_SHIFT);
 
-	if (flags & GUI_PRINT_FLAG_REVERSE) *attr |= ATTR_REVERSE;
-	if (flags & GUI_PRINT_FLAG_ITALIC) *attr |= ATTR_ITALIC;
-	if (flags & GUI_PRINT_FLAG_BOLD) *attr |= ATTR_BOLD;
-	if (flags & GUI_PRINT_FLAG_UNDERLINE) *attr |= ATTR_UNDERLINE;
-	if (flags & GUI_PRINT_FLAG_BLINK) *attr |= ATTR_BLINK;
+	if (*flags & GUI_PRINT_FLAG_REVERSE) *attr |= ATTR_REVERSE;
+	if (*flags & GUI_PRINT_FLAG_ITALIC) *attr |= ATTR_ITALIC;
+	if (*flags & GUI_PRINT_FLAG_BOLD) *attr |= ATTR_BOLD;
+	if (*flags & GUI_PRINT_FLAG_UNDERLINE) *attr |= ATTR_UNDERLINE;
+	if (*flags & GUI_PRINT_FLAG_BLINK) *attr |= ATTR_BLINK;
 }
 
 static void view_add_eol(TEXT_BUFFER_VIEW_REC *view, LINE_REC **line)
@@ -309,7 +335,7 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 	flags = GPOINTER_TO_INT(pflags);
 	fg = GPOINTER_TO_INT(fgcolor);
 	bg = GPOINTER_TO_INT(bgcolor);
-	get_colors(flags, &fg, &bg, &attr);
+	get_colors(&flags, &fg, &bg, &attr);
 
 	if (window == NULL) {
 		print_text_no_window(flags, fg, bg, attr, str);

From beea28bbbc9d8a67e157e70cd9d9dbd1fa98decd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 28 Jun 2019 11:31:19 +0200
Subject: [PATCH 0990/1650] fix code block NEWS formatting

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 97cb7dbf..f8d1a50e 100644
--- a/NEWS
+++ b/NEWS
@@ -19,9 +19,11 @@ v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
 	  calculate the width of emojis on your terminal screen (#917,
 	  #720)
 	+ Make the wcwidth functions available from Perl (#973):
+
 	      string_width(str)
 	      string_chars_for_width(str, width)
 	      wcwidth(char)
+
 	+ Added completion_keep_word setting (#979)
 	+ Allow activity_hide_targets to hide activity in itemless
 	  windows (#967, #997, #1001, #1003)
@@ -35,6 +37,7 @@ v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
 	  channels that are in the config (#968)
 	+ Add format support for the input line. By Ben Paxton,
 	  originally by Jonas Hurrelmann (#764, FS#621, #1004)
+
 	      use Irssi::TextUI;
 	      gui_input_set_extent(pos, text)
 	      gui_input_set_extents(pos, len, left, right)
@@ -42,6 +45,7 @@ v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
 	      gui_input_get_extent(pos)
 	      gui_input_get_text_and_extents()
 	      gui_input_set_text_and_extents(...)
+
 	+ Parsing of IRCv3 CAP 3.2 (#775, #869)
 	+ Show CAP-related events in the user interface (#918, #916,
 	  #870, #704)

From 87a2ceb27d2f20eb0f38858aad5614406a648f44 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Fri, 28 Jun 2019 23:14:15 +0200
Subject: [PATCH 0991/1650] Merge tag '1.0.8' into integrate/1.0.8

---
 NEWS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index f8d1a50e..5f35309d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 v1.3-head 2019-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.0.8 2019-06-29 The Irssi team <staff@irssi.org>
+	- Fix a use after free issue when sending the SASL login on
+          (automatic and manual) reconnects (#1055, #1058). Reported
+          by ilbelkyr
+
 v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.1.2
 	* Improved the /STATUSBAR commands (#858)

From 7286da0f9e52d36a8359134c8bcacd4d6a1ecb79 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Fri, 28 Jun 2019 23:12:45 +0200
Subject: [PATCH 0992/1650] Merge tag '1.1.3' into integrate/1.1.3

---
 NEWS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index 5f35309d..c0835b93 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 v1.3-head 2019-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.1.3 2019-06-29 The Irssi team <staff@irssi.org>
+	! Contains all changes from 1.0.8
+	- Fix regression of #779 where autolog_ignore_targets would
+          not matching itemless windows anymore (#1012, #1013)
+
 v1.0.8 2019-06-29 The Irssi team <staff@irssi.org>
 	- Fix a use after free issue when sending the SASL login on
           (automatic and manual) reconnects (#1055, #1058). Reported

From fb85fdec5ca48a9a24d8dc9482ac7c5490c5dffc Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Fri, 28 Jun 2019 23:04:45 +0200
Subject: [PATCH 0993/1650] Merge tag '1.2.1' into integrate/1.2.1

---
 NEWS | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/NEWS b/NEWS
index c0835b93..2df16223 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
 v1.3-head 2019-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.2.1 2019-06-29 The Irssi team <staff@irssi.org>
+	! Contains all changes from 1.1.3
+	- Fix a test on big endian machines (#1014)
+	- Fix the compile time conditionality of wcwidth
+          implementation (#1019, gentoo#677804, #720)
+	- Fix /save no longer working on old Solaris (pre
+          POSIX.1-2008) (#1042, #1043)
+	- Fix regression of #764 where display of 8-bit (legacy
+          encoding) in the input prompt was broken (#1018,
+          #1057). Initial patch by Артём Курашов
+
 v1.1.3 2019-06-29 The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.0.8
 	- Fix regression of #779 where autolog_ignore_targets would

From db16a0a8536f5583a0f22f4e5cf6308aa1df2ba1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Mon, 8 Jul 2019 00:02:53 +0200
Subject: [PATCH 0994/1650] meson build support

---
 .gitignore                               |   4 +-
 configure.ac                             |  16 -
 docs/help/in/meson.build                 |   1 +
 docs/help/meson.build                    | 121 ++++++
 docs/meson.build                         |  18 +
 meson.build                              | 454 +++++++++++++++++++++++
 meson_options.txt                        |  14 +
 scripts/meson.build                      |  14 +
 src/common.h                             |  11 +-
 src/core/meson.build                     | 129 +++++++
 src/fe-common/core/meson.build           |  99 +++++
 src/fe-common/core/printtext.c           |   2 +-
 src/fe-common/irc/dcc/meson.build        |  27 ++
 src/fe-common/irc/irc-modules.c          |   4 +
 src/fe-common/irc/meson.build            |  44 +++
 src/fe-common/irc/notifylist/meson.build |  21 ++
 src/fe-common/meson.build                |   6 +
 src/fe-fuzz/fe-common/core/meson.build   |  21 ++
 src/fe-fuzz/fe-common/core/theme-load.c  |   7 +-
 src/fe-fuzz/fe-common/meson.build        |   3 +
 src/fe-fuzz/irc/core/event-get-params.c  |  12 +-
 src/fe-fuzz/irc/core/meson.build         |  23 ++
 src/fe-fuzz/irc/meson.build              |   3 +
 src/fe-fuzz/meson.build                  |  46 +++
 src/fe-fuzz/server.c                     |  13 +-
 src/fe-none/meson.build                  |  21 ++
 src/fe-text/meson.build                  |  68 ++++
 src/irc/core/meson.build                 |  66 ++++
 src/irc/dcc/meson.build                  |  31 ++
 src/irc/flood/meson.build                |  14 +
 src/irc/irc.c                            |   5 +
 src/irc/meson.build                      |  24 ++
 src/irc/notifylist/meson.build           |  21 ++
 src/irc/proxy/meson.build                |  20 +
 src/lib-config/meson.build               |  19 +
 src/meson.build                          |  29 ++
 src/otr/meson.build                      |  26 ++
 src/perl/common/meson.build              |  37 ++
 src/perl/get-signals.pl                  |   2 +-
 src/perl/irc/meson.build                 |  39 ++
 src/perl/meson.build                     |  73 ++++
 src/perl/textui/meson.build              |  35 ++
 src/perl/ui/meson.build                  |  33 ++
 subprojects/glib.wrap                    |   4 +
 subprojects/libffi.wrap                  |   1 +
 subprojects/proxy-libintl.wrap           |   1 +
 subprojects/zlib.wrap                    |   1 +
 tests/fe-common/core/meson.build         |  19 +
 tests/fe-common/meson.build              |   1 +
 tests/fe-text/meson.build                |  30 ++
 tests/irc/core/meson.build               |  45 +++
 tests/irc/flood/meson.build              |  25 ++
 tests/irc/meson.build                    |   2 +
 tests/meson.build                        |   5 +
 themes/meson.build                       |   6 +
 utils/irssi-version.sh                   |  16 +-
 utils/syntax.pl                          |   1 +
 57 files changed, 1787 insertions(+), 46 deletions(-)
 create mode 100644 docs/help/in/meson.build
 create mode 100644 docs/help/meson.build
 create mode 100644 docs/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 scripts/meson.build
 create mode 100644 src/core/meson.build
 create mode 100644 src/fe-common/core/meson.build
 create mode 100644 src/fe-common/irc/dcc/meson.build
 create mode 100644 src/fe-common/irc/irc-modules.c
 create mode 100644 src/fe-common/irc/meson.build
 create mode 100644 src/fe-common/irc/notifylist/meson.build
 create mode 100644 src/fe-common/meson.build
 create mode 100644 src/fe-fuzz/fe-common/core/meson.build
 create mode 100644 src/fe-fuzz/fe-common/meson.build
 create mode 100644 src/fe-fuzz/irc/core/meson.build
 create mode 100644 src/fe-fuzz/irc/meson.build
 create mode 100644 src/fe-fuzz/meson.build
 create mode 100644 src/fe-none/meson.build
 create mode 100644 src/fe-text/meson.build
 create mode 100644 src/irc/core/meson.build
 create mode 100644 src/irc/dcc/meson.build
 create mode 100644 src/irc/flood/meson.build
 create mode 100644 src/irc/irc.c
 create mode 100644 src/irc/meson.build
 create mode 100644 src/irc/notifylist/meson.build
 create mode 100644 src/irc/proxy/meson.build
 create mode 100644 src/lib-config/meson.build
 create mode 100644 src/meson.build
 create mode 100644 src/otr/meson.build
 create mode 100644 src/perl/common/meson.build
 create mode 100644 src/perl/irc/meson.build
 create mode 100644 src/perl/meson.build
 create mode 100644 src/perl/textui/meson.build
 create mode 100644 src/perl/ui/meson.build
 create mode 100644 subprojects/glib.wrap
 create mode 120000 subprojects/libffi.wrap
 create mode 120000 subprojects/proxy-libintl.wrap
 create mode 120000 subprojects/zlib.wrap
 create mode 100644 tests/fe-common/core/meson.build
 create mode 100644 tests/fe-common/meson.build
 create mode 100644 tests/fe-text/meson.build
 create mode 100644 tests/irc/core/meson.build
 create mode 100644 tests/irc/flood/meson.build
 create mode 100644 tests/irc/meson.build
 create mode 100644 tests/meson.build
 create mode 100644 themes/meson.build

diff --git a/.gitignore b/.gitignore
index ee1480cb..f42839eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ MYMETA.*
 
 docs/help/Makefile.am
 docs/help/[a-z]*
+!docs/help/meson.build
 !docs/help/in
 docs/help/in/Makefile.am
 
@@ -35,9 +36,6 @@ src/fe-fuzz/irssi-fuzz
 src/fe-fuzz/irc/core/event-get-params-fuzz
 src/fe-fuzz/fe-common/core/theme-load-fuzz
 
-src/fe-common/irc/irc-modules.c
-src/irc/irc.c
-
 src/perl/perl-signals-list.h
 src/perl/irssi-core.pl.h
 
diff --git a/configure.ac b/configure.ac
index 9c0243f7..7d35aefa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,22 +243,6 @@ else
   offt_64bit=no
 fi
 
-if test x$ac_cv_sizeof_off_t = x$ac_cv_sizeof_long; then
-  # try to use unsigned long always first
-  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "lu")
-  AC_DEFINE(UOFF_T_LONG)
-elif test x$ac_cv_sizeof_off_t = x$ac_cv_sizeof_int; then
-  # next try int
-  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "u")
-  AC_DEFINE(UOFF_T_INT)
-elif test x$ac_cv_sizeof_off_t = x$ac_cv_sizeof_long_long; then
-  # and finally long long
-  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "llu")
-  AC_DEFINE(UOFF_T_LONG_LONG)
-else
-  AC_ERROR([Couldn't find integer type for off_t])
-fi
-
 dnl **
 dnl ** check for socks
 dnl **
diff --git a/docs/help/in/meson.build b/docs/help/in/meson.build
new file mode 100644
index 00000000..aa459b7d
--- /dev/null
+++ b/docs/help/in/meson.build
@@ -0,0 +1 @@
+# don't forget to add new help files to ../meson.build
diff --git a/docs/help/meson.build b/docs/help/meson.build
new file mode 100644
index 00000000..7fe95d43
--- /dev/null
+++ b/docs/help/meson.build
@@ -0,0 +1,121 @@
+install_data(
+  files(
+    'accept',
+    'action',
+    'admin',
+    'alias',
+    'away',
+    'ban',
+    'beep',
+    'bind',
+    'cat',
+    'cd',
+    'channel',
+    'clear',
+    'completion',
+    'connect',
+    'ctcp',
+    'cycle',
+    'dcc',
+    'dehilight',
+    'deop',
+    'devoice',
+    'die',
+    'disconnect',
+    'echo',
+    'eval',
+    'exec',
+    'flushbuffer',
+    'format',
+    'hash',
+    'help',
+    'hilight',
+    'ignore',
+    'info',
+    'invite',
+    'irssiproxy',
+    'ison',
+    'join',
+    'kick',
+    'kickban',
+    'kill',
+    'knock',
+    'knockout',
+    'lastlog',
+    'layout',
+    'levels',
+    'links',
+    'list',
+    'load',
+    'log',
+    'lusers',
+    'map',
+    'me',
+    'mircdcc',
+    'mode',
+    'motd',
+    'msg',
+    'names',
+    'nctcp',
+    'netsplit',
+    'network',
+    'nick',
+    'notice',
+    'notify',
+    'op',
+    'oper',
+    'otr',
+    'part',
+    'ping',
+    'query',
+    'quit',
+    'quote',
+    'rawlog',
+    'recode',
+    'reconnect',
+    'rehash',
+    'reload',
+    'restart',
+    'rmreconns',
+    'rmrejoins',
+    'save',
+    'sconnect',
+    'script',
+    'scrollback',
+    'server',
+    'servlist',
+    'set',
+    'silence',
+    'squery',
+    'squit',
+    'stats',
+    'statusbar',
+    'time',
+    'toggle',
+    'topic',
+    'trace',
+    'ts',
+    'unalias',
+    'unban',
+    'unignore',
+    'unload',
+    'unnotify',
+    'unquery',
+    'unsilence',
+    'upgrade',
+    'uptime',
+    'userhost',
+    'ver',
+    'version',
+    'voice',
+    'wait',
+    'wall',
+    'wallops',
+    'who',
+    'whois',
+    'whowas',
+    'window',
+  ),
+  install_dir : helpdir)
+
+# subdir('in')
diff --git a/docs/meson.build b/docs/meson.build
new file mode 100644
index 00000000..a58faed3
--- /dev/null
+++ b/docs/meson.build
@@ -0,0 +1,18 @@
+install_data(
+  files(
+    'capsicum.txt',
+    'design.html',
+    'design.txt',
+    'faq.html',
+    'faq.txt',
+    'formats.txt',
+    'manual.txt',
+    'perl.txt',
+    'signals.txt',
+    'special_vars.txt',
+    'startup-HOWTO.html',
+    'startup-HOWTO.txt',
+  ),
+  install_dir : docdir)
+
+subdir('help')
diff --git a/meson.build b/meson.build
new file mode 100644
index 00000000..95a0f874
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,454 @@
+project('irssi', 'c',
+  version : '1.3-head',
+  meson_version : '>=0.49',
+  default_options : ['warning_level=1'])
+
+############################
+############################
+
+cc = meson.get_compiler('c')
+rootinc = include_directories('.')
+dep = []
+textui_dep = []
+
+includedir          = get_option('includedir')
+incdir              = 'irssi'
+moduledir           = get_option('libdir') / incdir / 'modules'
+helpdir             = get_option('datadir') / incdir / 'help'
+themedir            = get_option('datadir') / incdir / 'themes'
+scriptdir           = get_option('datadir') / incdir / 'scripts'
+docdir              = get_option('docdir') != '' ? get_option('docdir') : (get_option('datadir') / 'doc' / incdir)
+
+want_textui         = get_option('without-textui') != 'yes'
+want_bot            = get_option('with-bot') == 'yes'
+want_fuzzer         = get_option('with-fuzzer') == 'yes'
+fuzzer_lib          = get_option('with-fuzzer-lib')
+want_proxy          = get_option('with-proxy') == 'yes'
+want_truecolor      = get_option('enable-true-color') == 'yes'
+want_gregex         = get_option('disable-gregex') != 'yes'
+
+require_capsicum    = get_option('with-capsicum') == 'yes'
+want_capsicum       = get_option('with-capsicum') != 'no'
+
+require_libutf8proc = get_option('disable-utf8proc') == 'no'
+want_libutf8proc    = get_option('disable-utf8proc') != 'yes'
+
+require_perl        = get_option('with-perl') == 'yes'
+want_perl           = get_option('with-perl') != 'no'
+with_perl_lib       = get_option('with-perl-lib')
+
+require_otr         = get_option('with-otr') == 'yes'
+want_otr            = get_option('with-otr') != 'no'
+
+want_glib_internal  = get_option('install-glib') == 'yes'
+
+chat_modules = ['irc']
+
+run_command('mkdir', meson.current_build_dir() / incdir)
+run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir)
+run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir)
+run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir)
+
+def_moduledir  = '-D' + 'MODULEDIR'  + '="' + (get_option('prefix') / moduledir) + '"'
+def_sysconfdir = '-D' + 'SYSCONFDIR' + '="' + (get_option('prefix') / get_option('sysconfdir')) + '"'
+def_helpdir    = '-D' + 'HELPDIR'    + '="' + (get_option('prefix') / helpdir) + '"'
+def_themesdir  = '-D' + 'THEMESDIR'  + '="' + (get_option('prefix') / themedir) + '"'
+def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir) + '"'
+
+def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
+
+##############
+# Help files #
+##############
+
+perl = find_program('perl')
+run_command(perl, files('utils/syntax.pl'))
+
+###################
+# irssi-version.h #
+###################
+
+env = find_program('env')
+irssi_version_sh = find_program('utils/irssi-version.sh')
+irssi_version_h = custom_target('irssi-version.h',
+  build_by_default : true,
+  build_always_stale : true,
+  capture : true,
+  command : [env, 'VERSION=' + meson.project_version(),
+    irssi_version_sh, meson.current_source_dir()],
+  output : 'irssi-version.h',
+  install : true,
+  install_dir : includedir / incdir,
+)
+
+####################
+# default-config.h #
+####################
+
+file2header = find_program('utils/file2header.sh')
+default_config_h = custom_target('default-config.h',
+  input : files('irssi.conf'),
+  output : 'default-config.h',
+  capture : true,
+  command : [file2header, '@INPUT@', 'default_config'],
+)
+
+###################
+# default-theme.h #
+###################
+
+default_theme_h = custom_target('default-theme.h',
+  input : files('themes/default.theme'),
+  output : 'default-theme.h',
+  capture : true,
+  command : [file2header, '@INPUT@', 'default_theme'],
+)
+
+################
+# Dependencies #
+################
+
+#### inet_addr ####
+inet_addr_found = false
+foreach inet_addr_provider : ['', 'nsl']
+  prov_lib = inet_addr_provider != '' ? [cc.find_library(inet_addr_provider, required : false)] : []
+  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('inet_addr', dependencies : prov_lib)
+    dep += prov_lib
+    inet_addr_found = true
+    break
+  endif
+endforeach
+if not inet_addr_found
+  error('inet_addr not found')
+endif
+
+#### socket ####
+socket_found = false
+foreach socket_provider : ['', 'socket', 'network']
+  prov_lib = socket_provider != '' ? [cc.find_library(socket_provider, required : false)] : []
+  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('socket', dependencies : prov_lib)
+    dep += prov_lib
+    socket_found = true
+    break
+  endif
+endforeach
+if not socket_found
+  error('socket not found')
+endif
+
+glib_internal = false
+message('*** If you don\'t have GLib, you can run meson ... -Dinstall-glib=yes')
+message('*** to download and build it automatically')
+message('*** Or alternatively install your distribution\'s package')
+message('*** On Debian: sudo apt-get install libglib2.0-dev')
+message('*** On Redhat: dnf install glib2-devel')
+glib_dep = dependency('glib-2.0', version : '>=2.58', required : not want_glib_internal)
+if not glib_dep.found()
+  glib_internal = true
+  glib_proj = subproject('glib', default_options : [
+    'libmount=false',
+  ])
+  glib_dep = glib_proj.get_variable('libglib_dep')
+  gmodule_dep = glib_proj.get_variable('libgmodule_dep')
+else
+  gmodule_dep = dependency('gmodule-2.0')
+endif
+dep += glib_dep
+dep += gmodule_dep
+
+openssl_dep = dependency('openssl')
+dep += openssl_dep
+
+############
+# utf8proc #
+############
+
+have_libutf8proc = false
+libutf8proc = []
+if want_libutf8proc
+  libutf8proc = cc.find_library('utf8proc', required : require_libutf8proc)
+  have_libutf8proc = cc.has_function('utf8proc_version', dependencies : libutf8proc)
+  if have_libutf8proc
+    dep += libutf8proc
+  endif
+endif
+
+############################
+############################
+
+############
+# terminfo #
+############
+
+if want_textui
+  setupterm_found = false
+  foreach setupterm_provider : ['tinfo', 'ncursesw', 'ncurses', 'terminfo']
+    prov_lib = cc.find_library(setupterm_provider, required : false)
+    if prov_lib.found() and cc.has_function('setupterm', dependencies : prov_lib)
+      textui_dep += prov_lib
+      setupterm_found = true
+      break
+    endif
+  endforeach
+  if not setupterm_found
+    error('Terminfo not found')
+  endif
+endif
+
+########
+# perl #
+########
+
+have_perl = false
+if want_perl
+  perl_cflags = []
+  perl_ldflags = []
+  perl_rpath = ''
+
+  #### ccopts ####
+  res = run_command(perl, '-MExtUtils::Embed', '-e', 'ccopts')
+  foreach fl : res.stdout().strip().split()
+   if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m')
+     perl_cflags += fl
+   endif
+  endforeach
+
+  perl_cflags += cc.get_supported_arguments('-fPIC')
+
+  #### ldopts ####
+  res = run_command(perl, '-MExtUtils::Embed', '-e', 'ldopts')
+  skip_libs = ['-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic']
+  foreach fl : res.stdout().strip().split()
+   if not fl.startswith('-A') and not skip_libs.contains(fl)
+     if fl.startswith('-Wl,-rpath,')
+       perl_rpath = fl.split(',')[2]
+     else
+       perl_ldflags += fl
+     endif
+   endif
+  endforeach
+
+  perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
+    version : run_command(perl, '-V::version:').stdout().split('\'')[1])
+
+  ####
+  if not cc.run('''
+#include <EXTERN.h>
+#include <perl.h>
+int main()
+{
+  perl_alloc();
+  return 0;
+}
+''', args : perl_cflags + perl_ldflags, name : 'working Perl support').compiled()
+    if require_perl
+      error('error linking with perl libraries')
+    else
+      warning('error linking with perl libraries')
+    endif
+  else
+    xsubpp_file_c = run_command(perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
+    xsubpp = generator(perl,
+      output : '@BASENAME@.c',
+      capture : true,
+      arguments : [ xsubpp_file_c, '@EXTRA_ARGS@', '@INPUT@' ],
+    )
+    xsubpp_file = files(xsubpp_file_c)
+
+    if with_perl_lib == 'module'
+      perl_install_base = run_command(perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}').stdout()
+      if perl_install_base == ''
+        with_perl_lib = ''
+      endif
+    endif
+    if with_perl_lib == ''
+      if get_option('prefix') in ['/usr/local', 'C:/']
+        with_perl_lib = 'site'
+      elif get_option('prefix') in ['/usr']
+        with_perl_lib = 'vendor'
+      endif
+    endif
+    if with_perl_lib in ['site', 'vendor', 'module']
+      set_perl_use_lib = false
+      perl_library_dir = with_perl_lib + ' default'
+      if with_perl_lib in ['site', 'vendor']
+        perlmoddir = run_command(perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1]
+      elif with_perl_lib == 'module'
+        perlmoddir = perl_install_base / 'lib' / 'perl5' / run_command(perl, '-V::archname:').stdout().split('\'')[1]
+      endif
+    elif with_perl_lib == ''
+      set_perl_use_lib = true
+      perl_library_dir = 'in prefix'
+      perlmoddir = get_option('libdir') / incdir / 'perl'
+    elif with_perl_lib.startswith('/')
+      set_perl_use_lib = true
+      perl_library_dir = 'custom'
+      perlmoddir = with_perl_lib
+    else
+      error('Unrecognised with-perl-lib value: ' + with_perl_lib)
+    endif
+
+    perl_use_lib = get_option('prefix') / perlmoddir
+    if set_perl_use_lib
+      set_perl_use_lib = run_command(perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0
+      if not set_perl_use_lib
+        perl_library_dir += ' - other path in @INC'
+      else
+        perl_library_dir += ' - prepends to @INC with /set perl_use_lib'
+      endif
+    endif
+
+    have_perl = true
+  endif
+endif
+
+#######
+# OTR #
+#######
+
+have_otr = false
+if want_otr
+  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr)
+  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr)
+  if libgcrypt.found() and libotr.found()
+    dep += libgcrypt
+    dep += libotr
+    have_otr = true
+  endif
+endif
+
+############
+# capsicum #
+############
+
+have_capsicum = false
+if want_capsicum
+  if cc.has_function('cap_enter', dependencies : cc.find_library('c'))
+    libnv = cc.find_library('nv', required : require_capsicum)
+    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create_found', dependencies : libnv)
+    if nvlist_create_found
+      dep += libnv
+      have_capsicum = true
+    else
+      if require_capsicum
+        error('nvlist_create not found')
+      endif
+    endif
+  else
+    if require_capsicum
+      error('cap_enter not found')
+    endif
+  endif
+endif
+
+##################
+# irssi-config.h #
+##################
+
+conf = configuration_data()
+
+conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support')
+conf.set('HAVE_GMODULE', true)
+conf.set('HAVE_SOCKS', false, description : 'Build with socks support')
+conf.set('TERM_TRUECOLOR', want_truecolor, description : 'true color support in terminal')
+conf.set('USE_GREGEX', want_gregex, description : 'use GRegex for regular expressions')
+conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.')
+
+headers = [
+  'sys/ioctl.h',
+  'sys/resource.h',
+  'sys/time.h',
+  'sys/utsname.h',
+  'dirent.h',
+  'unistd.h',
+]
+foreach h : headers
+  if cc.has_header(h)
+    conf.set('HAVE_' + h.underscorify().to_upper(), 1, description : 'Define to 1 if you have the <' + h + '> header file.')
+  endif
+endforeach
+
+conf.set('HAVE_LIBUTF8PROC', have_libutf8proc)
+conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
+
+configure_file(output : 'irssi-config.h',
+  configuration : conf,
+  install_dir : includedir / incdir)
+
+##########
+# CFLAGS #
+##########
+
+#### warnings ####
+add_project_arguments('-Wall', language : 'c')
+add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c')
+
+#### personality ####
+add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c')
+
+if want_fuzzer
+  if not cc.has_argument('-fsanitize=fuzzer-no-link')
+    error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
+  endif
+  add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
+  add_project_link_arguments('-fsanitize=fuzzer-no-link', language : 'c')
+endif
+
+##############
+# irssi-1.pc #
+##############
+
+pc = import('pkgconfig')
+pc.generate(filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', requires : glib_internal ? [] : glib_dep)
+
+###########
+# irssi.1 #
+###########
+
+install_man('docs/irssi.1')
+
+###########
+# subdirs #
+###########
+
+subdir('src')
+subdir('tests')
+subdir('docs')
+subdir('scripts')
+subdir('themes')
+# subdir('utils')
+
+############################
+############################
+
+message('*** Irssi configured ***')
+message('')
+message('Building text frontend ........... : ' + want_textui.to_string('yes', 'no'))
+message('Building irssi bot ............... : ' + want_bot.to_string('yes', 'no'))
+message('Building irssi proxy ............. : ' + want_proxy.to_string('yes', 'no'))
+if want_perl and not have_perl
+  message('Building with Perl support ....... : NO!')
+  message(' - Try: sudo apt-get install libperl-dev')
+  message(' -  Or: dnf install perl-devel')
+else
+  message('Building with Perl support ....... : ' + have_perl.to_string('yes', 'no'))
+endif
+if have_perl
+  message('Perl library directory ........... : ' + perl_use_lib)
+  message('                                     ' + perl_library_dir)
+endif
+message('Install prefix ................... : ' + get_option('prefix'))
+message('')
+message('Building with true color support.. : ' + want_truecolor.to_string('yes', 'no'))
+message('Building with GRegex ............. : ' + want_gregex.to_string('yes', 'no'))
+message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no'))
+message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no'))
+message('Building with OTR support ........ : ' + have_otr.to_string('yes', 'no'))
+message('')
+message('If there are any problems, read the INSTALL file.')
+message('Now type ninja -C ' + meson.current_build_dir() + ' to build Irssi')
+message('')
+
+############################
+############################
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 00000000..579b9cda
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,14 @@
+option('without-textui',    type : 'combo',  description : 'Build without text frontend',             	  choices : ['no', 'yes'])
+option('with-bot',          type : 'combo',  description : 'Build irssi-bot',                         	  choices : ['no', 'yes'])
+option('with-fuzzer',       type : 'combo',  description : 'Build irssi-fuzzer',                      	  choices : ['no', 'yes'])
+option('with-fuzzer-lib',   type : 'string', description : 'Specify path to fuzzer library', value : '-fsanitize=fuzzer')
+option('with-proxy',        type : 'combo',  description : 'Build irssi-proxy',                       	  choices : ['no', 'yes'])
+option('with-perl-lib',     type : 'string', description : 'Specify where to install the Perl libraries for Irssi')
+option('with-perl',         type : 'combo',  description : 'Build with Perl support',                     choices : ['auto', 'yes', 'no'])
+option('with-otr',          type : 'combo',  description : 'Build with OTR support',                      choices : ['auto', 'yes', 'no'])
+option('enable-true-color', type : 'combo',  description : 'Build with true color support in terminal',   choices : ['no', 'yes'])
+option('disable-gregex',    type : 'combo',  description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes'])
+option('disable-utf8proc',  type : 'combo',  description : 'Build without Julia\'s utf8proc',             choices : ['auto', 'yes', 'no'])
+option('with-capsicum',     type : 'combo',  description : 'Build with Capsicum support',                 choices : ['auto', 'yes', 'no'])
+option('install-glib',      type : 'combo',  description : 'Download and install GLib for you',           choices : ['no', 'yes'])
+option('docdir',            type : 'string', description : 'Documentation directory')
diff --git a/scripts/meson.build b/scripts/meson.build
new file mode 100644
index 00000000..072ac3ea
--- /dev/null
+++ b/scripts/meson.build
@@ -0,0 +1,14 @@
+install_data(
+  files(
+    'autoop.pl',
+    'autorejoin.pl',
+    'buf.pl',
+    'dns.pl',
+    'kills.pl',
+    'mail.pl',
+    'mlock.pl',
+    'quitmsg.pl',
+    'scriptassist.pl',
+    'usercount.pl',
+  ),
+  install_dir : scriptdir)
diff --git a/src/common.h b/src/common.h
index ef4b0c15..d7eaac45 100644
--- a/src/common.h
+++ b/src/common.h
@@ -41,15 +41,8 @@
 #  include <gmodule.h>
 #endif
 
-#if defined (UOFF_T_INT)
-typedef unsigned int uoff_t;
-#elif defined (UOFF_T_LONG)
-typedef unsigned long uoff_t;
-#elif defined (UOFF_T_LONG_LONG)
-typedef unsigned long long uoff_t;
-#else
-#  error uoff_t size not set
-#endif
+typedef guint64 uoff_t;
+#define PRIuUOFF_T G_GUINT64_FORMAT
 
 /* input functions */
 #define G_INPUT_READ	(1 << 0)
diff --git a/src/core/meson.build b/src/core/meson.build
new file mode 100644
index 00000000..dd5a4d49
--- /dev/null
+++ b/src/core/meson.build
@@ -0,0 +1,129 @@
+# this file is part of irssi
+
+if want_gregex
+  regex_impl = files('iregex-gregex.c')
+else
+  regex_impl = files('iregex-regexh.c')
+endif
+
+if have_capsicum
+  core_capsicum_source = files('fe-capsicum.c')
+else
+  core_capsicum_source = []
+endif
+
+libcore_a = static_library('core',
+  files(
+    'args.c',
+    'channels-setup.c',
+    'channels.c',
+    'chat-commands.c',
+    'chat-protocols.c',
+    'chatnets.c',
+    'commands.c',
+    'core.c',
+    'expandos.c',
+    'ignore.c',
+    'levels.c',
+    'line-split.c',
+    'log-away.c',
+    'log.c',
+    'masks.c',
+    'misc.c',
+    'modules-load.c',
+    'modules.c',
+    'net-disconnect.c',
+    'net-nonblock.c',
+    'net-sendbuffer.c',
+    'network-openssl.c',
+    'network.c',
+    'nicklist.c',
+    'nickmatch-cache.c',
+    'pidwait.c',
+    'queries.c',
+    'rawlog.c',
+    'recode.c',
+    'servers-reconnect.c',
+    'servers-setup.c',
+    'servers.c',
+    'session.c',
+    'settings.c',
+    'signals.c',
+    'special-vars.c',
+    'tls.c',
+    'utf8.c',
+    'wcwidth-wrapper.c',
+    'wcwidth.c',
+    'write-buffer.c',
+  )
+  + core_capsicum_source
+  + regex_impl
+  + [
+    default_config_h,
+    irssi_version_h,
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  c_args : [
+    def_moduledir,
+    def_sysconfdir,
+  ],
+  dependencies : dep)
+
+install_headers(
+  files(
+    #### structure_headers ####
+    'channel-rec.h',
+    'channel-setup-rec.h',
+    'chatnet-rec.h',
+    'query-rec.h',
+    'server-connect-rec.h',
+    'server-rec.h',
+    'server-setup-rec.h',
+    'window-item-rec.h',
+
+    ####
+    'args.h',
+    'capsicum.h',
+    'channels-setup.h',
+    'channels.h',
+    'chat-protocols.h',
+    'chatnets.h',
+    'commands.h',
+    'core.h',
+    'expandos.h',
+    'ignore.h',
+    'iregex.h',
+    'levels.h',
+    'line-split.h',
+    'log.h',
+    'masks.h',
+    'misc.h',
+    'module.h',
+    'modules-load.h',
+    'modules.h',
+    'net-disconnect.h',
+    'net-nonblock.h',
+    'net-sendbuffer.h',
+    'network-openssl.h',
+    'network.h',
+    'nick-rec.h',
+    'nicklist.h',
+    'nickmatch-cache.h',
+    'pidwait.h',
+    'queries.h',
+    'rawlog.h',
+    'recode.h',
+    'servers-reconnect.h',
+    'servers-setup.h',
+    'servers.h',
+    'session.h',
+    'settings.h',
+    'signals.h',
+    'special-vars.h',
+    'tls.h',
+    'utf8.h',
+    'window-item-def.h',
+    'write-buffer.h',
+  ),
+  subdir : incdir / 'src' / 'core')
diff --git a/src/fe-common/core/meson.build b/src/fe-common/core/meson.build
new file mode 100644
index 00000000..73cb156a
--- /dev/null
+++ b/src/fe-common/core/meson.build
@@ -0,0 +1,99 @@
+# this file is part of irssi
+
+if have_capsicum
+  fe_common_core_capsicum_source = files('fe-capsicum.c')
+else
+  fe_common_core_capsicum_source = []
+endif
+
+fe_common_core_sources = [
+  files(
+    'chat-completion.c',
+    'command-history.c',
+    'completion.c',
+    'fe-channels.c',
+    'fe-common-core.c',
+    'fe-core-commands.c',
+    'fe-exec.c',
+    'fe-expandos.c',
+    'fe-help.c',
+    'fe-ignore-messages.c',
+    'fe-ignore.c',
+    'fe-log.c',
+    'fe-messages.c',
+    'fe-modules.c',
+    'fe-queries.c',
+    'fe-recode.c',
+    'fe-server.c',
+    'fe-settings.c',
+    'fe-tls.c',
+    'fe-windows.c',
+    'formats.c',
+    'hilight-text.c',
+    'keyboard.c',
+    'module-formats.c',
+    'printtext.c',
+    'themes.c',
+    'window-activity.c',
+    'window-commands.c',
+    'window-items.c',
+    'windows-layout.c',
+  )
+  + fe_common_core_capsicum_source
+  + [
+    default_theme_h,
+    irssi_version_h,
+  ]
+]
+
+libfe_common_core_a = static_library('fe_common_core',
+  fe_common_core_sources,
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  c_args : [
+    def_helpdir,
+    def_themesdir,
+  ],
+  dependencies : dep)
+
+if want_fuzzer
+  libfuzzer_fe_common_core_a = static_library('fuzzer_fe_common_core',
+    fe_common_core_sources,
+    include_directories : rootinc,
+    implicit_include_directories : false,
+    c_args : [
+      def_helpdir,
+      def_themesdir,
+      def_suppress_printf_fallback,
+    ],
+    dependencies : dep)
+endif
+
+install_headers(
+  files(
+    'chat-completion.h',
+    'command-history.h',
+    'completion.h',
+    'fe-capsicum.h',
+    'fe-channels.h',
+    'fe-common-core.h',
+    'fe-core-commands.h',
+    'fe-exec.h',
+    'fe-messages.h',
+    'fe-queries.h',
+    'fe-recode.h',
+    'fe-settings.h',
+    'fe-tls.h',
+    'fe-windows.h',
+    'formats.h',
+    'hilight-text.h',
+    'keyboard.h',
+    'module-formats.h',
+    'module.h',
+    'printtext.h',
+    'themes.h',
+    'window-activity.h',
+    'window-items.h',
+    'windows-layout.h',
+  ),
+  subdir : incdir / 'src' / 'fe-common' / 'core')
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 3e215d72..1826c754 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -447,7 +447,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text)
 	if (dest->window == NULL) {
                 str = strip_codes(text);
 #ifndef SUPPRESS_PRINTF_FALLBACK
-		printf("NO WINDOWS: %s\n", str);
+		printf("## NO WINDOWS: %s\n", str);
 #endif
                 g_free(str);
                 return;
diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
new file mode 100644
index 00000000..296b1d61
--- /dev/null
+++ b/src/fe-common/irc/dcc/meson.build
@@ -0,0 +1,27 @@
+# this file is part of irssi
+
+libfe_irc_dcc_a = static_library('fe_irc_dcc',
+  files(
+    'fe-dcc-chat-messages.c',
+    'fe-dcc-chat.c',
+    'fe-dcc-get.c',
+    'fe-dcc-send.c',
+    'fe-dcc-server.c',
+    'fe-dcc.c',
+    'module-formats.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  c_args : [
+    def_helpdir,
+    def_sysconfdir,
+  ],
+  dependencies : dep)
+
+install_headers(
+  files(
+    'fe-dcc.h',
+    'module-formats.h',
+    'module.h',
+  ),
+  subdir : incdir / 'src' / 'fe-common' / 'irc' / 'dcc')
diff --git a/src/fe-common/irc/irc-modules.c b/src/fe-common/irc/irc-modules.c
new file mode 100644
index 00000000..3bf1f327
--- /dev/null
+++ b/src/fe-common/irc/irc-modules.c
@@ -0,0 +1,4 @@
+void fe_irc_dcc_init(void);void fe_irc_notifylist_init(void);
+void fe_irc_notifylist_deinit(void);void fe_irc_dcc_deinit(void);
+void fe_irc_modules_init(void) {  fe_irc_dcc_init(); fe_irc_notifylist_init(); }
+void fe_irc_modules_deinit(void) { fe_irc_notifylist_deinit(); fe_irc_dcc_deinit();  }
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
new file mode 100644
index 00000000..1789133c
--- /dev/null
+++ b/src/fe-common/irc/meson.build
@@ -0,0 +1,44 @@
+# this file is part of irssi
+
+libfe_common_irc_a = static_library('fe_common_irc',
+  files(
+    'fe-cap.c',
+    'fe-common-irc.c',
+    'fe-ctcp.c',
+    'fe-events-numeric.c',
+    'fe-events.c',
+    'fe-irc-channels.c',
+    'fe-irc-commands.c',
+    'fe-irc-messages.c',
+    'fe-irc-queries.c',
+    'fe-irc-server.c',
+    'fe-ircnet.c',
+    'fe-modes.c',
+    'fe-netjoin.c',
+    'fe-netsplit.c',
+    'fe-sasl.c',
+    'fe-whois.c',
+    'irc-completion.c',
+    'module-formats.c',
+
+    'irc-modules.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  c_args : [
+    def_helpdir,
+    def_themesdir,
+  ],
+  dependencies : dep)
+
+install_headers(
+  files(
+    'fe-irc-channels.h',
+    'fe-irc-server.h',
+    'module-formats.h',
+    'module.h',
+  ),
+  subdir : incdir / 'src' / 'fe-common' / 'irc')
+
+subdir('dcc')
+subdir('notifylist')
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
new file mode 100644
index 00000000..2e66c786
--- /dev/null
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -0,0 +1,21 @@
+# this file is part of irssi
+
+libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
+  files(
+    'fe-notifylist.c',
+    'module-formats.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  c_args : [
+    def_helpdir,
+    def_sysconfdir,
+  ],
+  dependencies : dep)
+
+install_headers(
+  files(
+    'module-formats.h',
+    'module.h',
+  ),
+  subdir : incdir / 'src' / 'fe-common' / 'irc' / 'notifylist')
diff --git a/src/fe-common/meson.build b/src/fe-common/meson.build
new file mode 100644
index 00000000..05ab38a1
--- /dev/null
+++ b/src/fe-common/meson.build
@@ -0,0 +1,6 @@
+# this file is part of irssi
+
+subdir('core')
+foreach s : chat_modules
+  subdir(s)
+endforeach
diff --git a/src/fe-fuzz/fe-common/core/meson.build b/src/fe-fuzz/fe-common/core/meson.build
new file mode 100644
index 00000000..679c19ce
--- /dev/null
+++ b/src/fe-fuzz/fe-common/core/meson.build
@@ -0,0 +1,21 @@
+# this file is part of irssi
+executable('theme-load-fuzz',
+  files(
+    'theme-load.c',
+    '../../../fe-text/module-formats.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfuzzer_fe_common_core_a,
+  ],
+  link_args : [fuzzer_lib],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  dependencies : dep
+)
+
+# noinst_headers = files(
+#   '../../../fe-text/module-formats.h',
+# )
diff --git a/src/fe-fuzz/fe-common/core/theme-load.c b/src/fe-fuzz/fe-common/core/theme-load.c
index 87429ac4..fbb35684 100644
--- a/src/fe-fuzz/fe-common/core/theme-load.c
+++ b/src/fe-fuzz/fe-common/core/theme-load.c
@@ -36,10 +36,10 @@
 #include <string.h>
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
-	core_register_options();
-	fe_common_core_register_options();
 	char *irssi_argv[] = {*argv[0], "--home", "/tmp/irssi", NULL};
 	int irssi_argc = sizeof(irssi_argv) / sizeof(char *) - 1;
+	core_register_options();
+	fe_common_core_register_options();
 	args_execute(irssi_argc, irssi_argv);
 	core_preinit((*argv)[0]);
 	core_init();
@@ -50,6 +50,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 }
 
 int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+	THEME_REC *theme;
 	gchar *copy = g_strndup((const gchar *)data, size);
 
 	FILE *fp = fopen("/tmp/irssi/fuzz.theme", "wb");
@@ -58,7 +59,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 		fclose(fp);
 	}
 
-	THEME_REC *theme = theme_load("fuzz");
+	theme = theme_load("fuzz");
 	theme_destroy(theme);
 
 	g_free(copy);
diff --git a/src/fe-fuzz/fe-common/meson.build b/src/fe-fuzz/fe-common/meson.build
new file mode 100644
index 00000000..da02f2cf
--- /dev/null
+++ b/src/fe-fuzz/fe-common/meson.build
@@ -0,0 +1,3 @@
+# this file is part of irssi
+
+subdir('core')
diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index 36aeacf7..740602d1 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -48,17 +48,21 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 }
 
 int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-	if (size < 1) {
-		return 0;
-	}
 	uint8_t count = *data;
-	gchar *copy = g_strndup((const gchar *)data+1, size-1);
+	gchar *copy;
 
 	char *output0;
 	char *output1;
 	char *output2;
 	char *output3;
 	char *params;
+
+	if (size < 1) {
+		return 0;
+	}
+
+	copy = g_strndup((const gchar *)data+1, size-1);
+
 	if (count % 8 == 0) {
 		params = event_get_params(copy, 1 | PARAM_FLAG_GETREST, &output0);
 	} else if (count % 8 == 1) {
diff --git a/src/fe-fuzz/irc/core/meson.build b/src/fe-fuzz/irc/core/meson.build
new file mode 100644
index 00000000..23d1271f
--- /dev/null
+++ b/src/fe-fuzz/irc/core/meson.build
@@ -0,0 +1,23 @@
+# this file is part of irssi
+
+executable('event-get-params-fuzz',
+  files(
+    'event-get-params.c',
+    '../../../fe-text/module-formats.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libirc_a,
+    libfuzzer_fe_common_core_a,
+  ],
+  link_args : [fuzzer_lib],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  dependencies : dep
+)
+
+# noinst_headers = files(
+#   '../../../fe-text/module-formats.h',
+# )
diff --git a/src/fe-fuzz/irc/meson.build b/src/fe-fuzz/irc/meson.build
new file mode 100644
index 00000000..da02f2cf
--- /dev/null
+++ b/src/fe-fuzz/irc/meson.build
@@ -0,0 +1,3 @@
+# this file is part of irssi
+
+subdir('core')
diff --git a/src/fe-fuzz/meson.build b/src/fe-fuzz/meson.build
new file mode 100644
index 00000000..5dccd38d
--- /dev/null
+++ b/src/fe-fuzz/meson.build
@@ -0,0 +1,46 @@
+# this file is part of irssi
+
+subdir('irc')
+subdir('fe-common')
+
+executable('irssi-fuzz',
+  files(
+    'irssi.c',
+    '../fe-text/module-formats.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfuzzer_fe_common_core_a,
+  ],
+  link_args : [fuzzer_lib],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  dependencies : dep
+)
+
+executable('server-fuzz',
+  files(
+    'server.c',
+    '../fe-text/module-formats.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfuzzer_fe_common_core_a,
+    libirc_a,
+    libfe_common_irc_a,
+    libfe_irc_dcc_a,
+    libfe_irc_notifylist_a,
+  ],
+  link_args : [fuzzer_lib],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  dependencies : dep
+)
+
+# noinst_headers = files(
+#   '../fe-text/module-formats.h',
+# )
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index 2e8cd3d2..cde03b89 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -150,13 +150,18 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 }
 
 int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+	gboolean prefixedChoice = (gboolean)*data;
+	gchar *copy;
+	gchar **lines;
+	gchar **head;
+
 	if (size < 1) return 0;
 
 	test_server();
-	gboolean prefixedChoice = (gboolean)*data;
-	gchar *copy = g_strndup((const gchar *)data+1, size-1);
-	gchar **lines = g_strsplit(copy, "\r\n", -1);
-	gchar **head = lines;
+
+	copy = g_strndup((const gchar *)data+1, size-1);
+	lines = g_strsplit(copy, "\r\n", -1);
+	head = lines;
 
 	for (; *lines != NULL; lines++) {
 		gchar *prefixedLine;
diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build
new file mode 100644
index 00000000..58df15f6
--- /dev/null
+++ b/src/fe-none/meson.build
@@ -0,0 +1,21 @@
+# this file is part of irssi
+
+executable('botti',
+  files(
+    'irssi.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  export_dynamic : true,
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libirc_a,
+  ],
+  install : true,
+  dependencies : dep
+)
+
+# noinst_headers = files(
+#   'module.h',
+# )
diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
new file mode 100644
index 00000000..9070011e
--- /dev/null
+++ b/src/fe-text/meson.build
@@ -0,0 +1,68 @@
+# this file is part of irssi
+
+executable('irssi',
+  files(
+    #### terminfo_sources ####
+    'term-terminfo.c',
+    'terminfo-core.c',
+
+    #### irssi sources ####
+    'gui-entry.c',
+    'gui-expandos.c',
+    'gui-printtext.c',
+    'gui-readline.c',
+    'gui-windows.c',
+    'irssi.c',
+    'lastlog.c',
+    'mainwindow-activity.c',
+    'mainwindows-layout.c',
+    'mainwindows.c',
+    'module-formats.c',
+    'statusbar-config.c',
+    'statusbar-items.c',
+    'statusbar.c',
+    'term.c',
+    'textbuffer-commands.c',
+    'textbuffer-view.c',
+    'textbuffer.c',
+  )
+  + [ irssi_version_h ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  export_dynamic : true,
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfe_common_core_a,
+    libirc_a,
+    libfe_common_irc_a,
+    libfe_irc_dcc_a,
+    libfe_irc_notifylist_a,
+    ],
+  install : true,
+  install_rpath : get_option('prefix') / get_option('libdir'),
+  dependencies : dep
+  + textui_dep
+)
+
+install_headers(
+  files(
+    'gui-printtext.h',
+    'gui-windows.h',
+    'mainwindows.h',
+    'statusbar-item.h',
+    'statusbar.h',
+    'term.h',
+    'textbuffer-view.h',
+    'textbuffer.h',
+  ),
+  subdir : incdir / 'src' / 'fe-text')
+
+# noinst_headers = files(
+#   'gui-entry.h',
+#   'gui-readline.h',
+#   'module-formats.h'
+#   'module.h',
+#   'statusbar-config.h',
+#   'terminfo-core.h',
+# )
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
new file mode 100644
index 00000000..e6cc89c7
--- /dev/null
+++ b/src/irc/core/meson.build
@@ -0,0 +1,66 @@
+# this file is part of irssi
+
+libirc_core_a = static_library('irc_core',
+  files(
+    'bans.c',
+    'channel-events.c',
+    'channel-rejoin.c',
+    'channels-query.c',
+    'ctcp.c',
+    'irc-cap.c',
+    'irc-channels-setup.c',
+    'irc-channels.c',
+    'irc-chatnets.c',
+    'irc-commands.c',
+    'irc-core.c',
+    'irc-expandos.c',
+    'irc-masks.c',
+    'irc-nicklist.c',
+    'irc-queries.c',
+    'irc-servers-reconnect.c',
+    'irc-servers-setup.c',
+    'irc-servers.c',
+    'irc-session.c',
+    'irc.c',
+    'lag.c',
+    'massjoin.c',
+    'mode-lists.c',
+    'modes.c',
+    'netsplit.c',
+    'sasl.c',
+    'servers-idle.c',
+    'servers-redirect.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  c_args : [
+    def_moduledir,
+    def_sysconfdir,
+  ],
+  dependencies : dep)
+
+install_headers(
+  files(
+    'bans.h',
+    'channel-events.h',
+    'channel-rejoin.h',
+    'ctcp.h',
+    'irc-cap.h',
+    'irc-channels.h',
+    'irc-chatnets.h',
+    'irc-commands.h',
+    'irc-masks.h',
+    'irc-nicklist.h',
+    'irc-queries.h',
+    'irc-servers-setup.h',
+    'irc-servers.h',
+    'irc.h',
+    'mode-lists.h',
+    'modes.h',
+    'module.h',
+    'netsplit.h',
+    'sasl.h',
+    'servers-idle.h',
+    'servers-redirect.h',
+  ),
+  subdir : incdir / 'src' / 'irc' / 'core')
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
new file mode 100644
index 00000000..0c3d706a
--- /dev/null
+++ b/src/irc/dcc/meson.build
@@ -0,0 +1,31 @@
+# this file is part of irssi
+
+libirc_dcc_a = static_library('irc_dcc',
+  files(
+    'dcc-autoget.c',
+    'dcc-chat.c',
+    'dcc-get.c',
+    'dcc-queue.c',
+    'dcc-resume.c',
+    'dcc-send.c',
+    'dcc-server.c',
+    'dcc.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep)
+
+install_headers(
+  files(
+    'dcc-chat.h',
+    'dcc-file-rec.h',
+    'dcc-file.h',
+    'dcc-get.h',
+    'dcc-queue.h',
+    'dcc-rec.h',
+    'dcc-send.h',
+    'dcc-server.h',
+    'dcc.h',
+    'module.h',
+  ),
+  subdir : incdir / 'src' / 'irc' / 'dcc')
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
new file mode 100644
index 00000000..75107db1
--- /dev/null
+++ b/src/irc/flood/meson.build
@@ -0,0 +1,14 @@
+# this file is part of irssi
+
+libirc_flood_a = static_library('irc_flood',
+  files(
+    'autoignore.c',
+    'flood.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep)
+
+install_headers(
+  files('module.h'),
+  subdir : incdir / 'src' / 'irc' / 'flood')
diff --git a/src/irc/irc.c b/src/irc/irc.c
new file mode 100644
index 00000000..250a6fb4
--- /dev/null
+++ b/src/irc/irc.c
@@ -0,0 +1,5 @@
+void irc_core_init(void); void irc_core_deinit(void);
+void irc_dcc_init(void);void irc_flood_init(void);void irc_notifylist_init(void);
+void irc_notifylist_deinit(void);void irc_flood_deinit(void);void irc_dcc_deinit(void);
+void irc_init(void) { irc_core_init();  irc_dcc_init(); irc_flood_init(); irc_notifylist_init(); }
+void irc_deinit(void) { irc_notifylist_deinit(); irc_flood_deinit(); irc_dcc_deinit();  irc_core_deinit(); }
diff --git a/src/irc/meson.build b/src/irc/meson.build
new file mode 100644
index 00000000..72abc3ce
--- /dev/null
+++ b/src/irc/meson.build
@@ -0,0 +1,24 @@
+# this file is part of irssi
+
+subdir('core')
+subdir('dcc')
+subdir('flood')
+subdir('notifylist')
+
+libirc_a = static_library('irc',
+  files(
+    'irc.c',
+  ),
+  link_with : [
+    libirc_core_a,
+    libirc_dcc_a,
+    libirc_flood_a,
+    libirc_notifylist_a,
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+)
+
+if want_proxy
+  subdir('proxy')
+endif
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
new file mode 100644
index 00000000..f00ea321
--- /dev/null
+++ b/src/irc/notifylist/meson.build
@@ -0,0 +1,21 @@
+# this file is part of irssi
+
+libirc_notifylist_a = static_library('irc_notifylist',
+  files(
+    'notify-commands.c',
+    'notify-ison.c',
+    'notify-setup.c',
+    'notify-whois.c',
+    'notifylist.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep)
+
+install_headers(
+  files(
+    'module.h',
+    'notify-setup.h',
+    'notifylist.h',
+  ),
+  subdir : incdir / 'src' / 'irc' / 'notifylist')
diff --git a/src/irc/proxy/meson.build b/src/irc/proxy/meson.build
new file mode 100644
index 00000000..be91c7d5
--- /dev/null
+++ b/src/irc/proxy/meson.build
@@ -0,0 +1,20 @@
+# this file is part of irssi
+
+shared_module('irc_proxy',
+  files(
+    'dump.c',
+    'listen.c',
+    'proxy.c',
+  )
+  + [ irssi_version_h ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
+  dependencies : dep,
+)
+
+# noinst_headers = files(
+#   'module.h',
+#   'proxy.h',
+# )
diff --git a/src/lib-config/meson.build b/src/lib-config/meson.build
new file mode 100644
index 00000000..2bc094dd
--- /dev/null
+++ b/src/lib-config/meson.build
@@ -0,0 +1,19 @@
+# this file is part of irssi
+
+libconfig_a = static_library('irssi_config',
+  files(
+    'get.c',
+    'parse.c',
+    'set.c',
+    'write.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep)
+
+install_headers(
+  files(
+    'iconfig.h',
+    'module.h',
+  ),
+  subdir : incdir / 'src' / 'lib-config')
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 00000000..dee8dc3c
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,29 @@
+# this file is part of irssi
+
+subdir('lib-config')
+subdir('core')
+foreach s : chat_modules
+  subdir(s)
+endforeach
+subdir('fe-common')
+if have_perl
+  subdir('perl')
+endif
+if have_otr
+  subdir('otr')
+endif
+if want_bot
+  subdir('fe-none')
+endif
+if want_textui
+  subdir('fe-text')
+endif
+if want_fuzzer
+  subdir('fe-fuzz')
+endif
+
+install_headers(
+  files(
+    'common.h'
+  ),
+  subdir : incdir / 'src')
diff --git a/src/otr/meson.build b/src/otr/meson.build
new file mode 100644
index 00000000..10b9fa55
--- /dev/null
+++ b/src/otr/meson.build
@@ -0,0 +1,26 @@
+# this file is part of irssi
+
+shared_module('otr_core',
+  files(
+    'key.c',
+    'otr-fe.c',
+    'otr-formats.c',
+    'otr-module.c',
+    'otr-ops.c',
+    'otr.c',
+  ),
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
+  dependencies : dep,
+)
+
+# noinst_headers = files(
+#   'irssi-otr.h',
+#   'key.h',
+#   'module.h',
+#   'otr-fe.h',
+#   'otr-formats.h',
+#   'otr.h',
+# )
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
new file mode 100644
index 00000000..2cbf7f4c
--- /dev/null
+++ b/src/perl/common/meson.build
@@ -0,0 +1,37 @@
+libperl_common_a = shared_module('Irssi',
+  [ xsubpp.process(
+    files(
+      'Channel.xs',
+      'Core.xs',
+      'Expando.xs',
+      'Ignore.xs',
+      'Irssi.xs',
+      'Log.xs',
+      'Masks.xs',
+      'Query.xs',
+      'Rawlog.xs',
+      'Server.xs',
+      'Settings.xs',
+    )
+  ) ]
+  + files(
+    'module.h',
+  )
+  + [ irssi_version_h ],
+  name_prefix : '',
+  install : true,
+  install_dir : perlmoddir / 'auto' / 'Irssi',
+  include_directories : rootinc,
+  implicit_include_directories : true,
+  dependencies : dep + [ perl_dep ],
+)
+
+install_headers(
+  files(
+    'Irssi.pm',
+  ),
+  install_dir : perlmoddir,
+)
+  
+# 'Makefile.PL.in',
+# 'typemap',
diff --git a/src/perl/get-signals.pl b/src/perl/get-signals.pl
index 806bcafa..275be157 100755
--- a/src/perl/get-signals.pl
+++ b/src/perl/get-signals.pl
@@ -6,7 +6,7 @@ print " * do not edit.\n";
 print " */\n\n";
 print "static PERL_SIGNAL_ARGS_REC perl_signal_args[] =\n{\n";
 
-while (<STDIN>) {
+while (<>) {
 	chomp;
 
 	next if (!/^ "([^"]*)"(<.*>)?(?:,\s*(.*))?/);
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
new file mode 100644
index 00000000..7d77e0c1
--- /dev/null
+++ b/src/perl/irc/meson.build
@@ -0,0 +1,39 @@
+libperl_irc_a = shared_module('Irc',
+  [ xsubpp.process(
+    files(
+      'Channel.xs',
+      'Client.xs',
+      'Ctcp.xs',
+      'Dcc.xs',
+      'Irc.xs',
+      'Modes.xs',
+      'Netsplit.xs',
+      'Notifylist.xs',
+      'Query.xs',
+      'Server.xs',
+    ),
+    extra_args : [
+      '-typemap',
+      '../common/typemap',
+    ],
+  ) ]
+  + files(
+    'module.h',
+  ),
+  name_prefix : '',
+  install : true,
+  install_dir : perlmoddir / 'auto' / 'Irssi' / 'Irc',
+  include_directories : rootinc,
+  implicit_include_directories : true,
+  dependencies : dep + [ perl_dep ],
+)
+
+install_headers(
+  files(
+    'Irc.pm',
+  ),
+  install_dir : perlmoddir / 'Irssi',
+)
+  
+# 'Makefile.PL.in',
+# 'typemap',
diff --git a/src/perl/meson.build b/src/perl/meson.build
new file mode 100644
index 00000000..e3935814
--- /dev/null
+++ b/src/perl/meson.build
@@ -0,0 +1,73 @@
+
+perl_signals_list_h = custom_target('perl-signals-list.h',
+  input : files('../../docs/signals.txt'),
+  output : 'perl-signals-list.h',
+  capture : true,
+  depend_files : files('get-signals.pl'),
+  command : [perl, files('get-signals.pl'), '@INPUT@'],
+)
+
+irssi_core_pl_h = custom_target('irssi-core.pl.h',
+  input : files('irssi-core.pl'),
+  output : 'irssi-core.pl.h',
+  capture : true,
+  command : [file2header, '@INPUT@', 'irssi_core_code'],
+)
+
+shared_module('perl_core',
+  files(
+    'perl-common.c',
+    'perl-core.c',
+    'perl-signals.c',
+    'perl-sources.c',
+  ) + [
+    irssi_core_pl_h,
+    perl_signals_list_h,
+  ],
+  c_args : [
+    def_scriptdir,
+    '-D' + 'PERL_USE_LIB' + '="' + (set_perl_use_lib ? perl_use_lib : '') + '"',
+    '-D' + 'PERL_STATIC_LIBS' + '=' + 0.to_string(),
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
+  install_rpath : perl_rpath,
+  build_rpath : perl_rpath,
+  dependencies : dep + [ perl_dep ],
+)
+
+shared_module('fe_perl',
+  files(
+    'module-formats.c',
+    'perl-fe.c',
+  ),
+  c_args : [
+    def_scriptdir,
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
+  dependencies : dep,
+)
+
+subdir('common')
+foreach s : chat_modules
+  subdir(s)
+endforeach
+subdir('ui')
+if want_textui
+  subdir('textui')
+endif
+
+# noinst_headers = files(
+#   'module-fe.h',
+#   'module-formats.h',
+#   'module.h',
+#   'perl-common.h',
+#   'perl-core.h',
+#   'perl-signals.h',
+#   'perl-sources.h',
+# )
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
new file mode 100644
index 00000000..61362d52
--- /dev/null
+++ b/src/perl/textui/meson.build
@@ -0,0 +1,35 @@
+libperl_textui_a = shared_module('TextUI',
+  [ xsubpp.process(
+    files(
+      'Statusbar.xs',
+      'TextBufferView.xs',
+      'TextBuffer.xs',
+      'TextUI.xs',
+    ),
+    extra_args : [
+      '-typemap',
+      '../common/typemap',
+      '-typemap',
+      '../ui/typemap',
+    ],
+  ) ]
+  + files(
+    'module.h',
+  ),
+  name_prefix : '',
+  install : true,
+  install_dir : perlmoddir / 'auto' / 'Irssi' / 'TextUI',
+  include_directories : rootinc,
+  implicit_include_directories : true,
+  dependencies : dep + [ perl_dep ],
+)
+
+install_headers(
+  files(
+    'TextUI.pm',
+  ),
+  install_dir : perlmoddir / 'Irssi',
+)
+  
+# 'Makefile.PL.in',
+# 'typemap',
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
new file mode 100644
index 00000000..eca864dd
--- /dev/null
+++ b/src/perl/ui/meson.build
@@ -0,0 +1,33 @@
+libperl_ui_a = shared_module('UI',
+  [ xsubpp.process(
+    files(
+      'Formats.xs',
+      'Themes.xs',
+      'UI.xs',
+      'Window.xs',
+    ),
+    extra_args : [
+      '-typemap',
+      '../common/typemap',
+    ],
+  ) ]
+  + files(
+    'module.h',
+  ),
+  name_prefix : '',
+  install : true,
+  install_dir : perlmoddir / 'auto' / 'Irssi' / 'UI',
+  include_directories : rootinc,
+  implicit_include_directories : true,
+  dependencies : dep + [ perl_dep ],
+)
+
+install_headers(
+  files(
+    'UI.pm',
+  ),
+  install_dir : perlmoddir / 'Irssi',
+)
+  
+# 'Makefile.PL.in',
+# 'typemap',
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
new file mode 100644
index 00000000..4def08b1
--- /dev/null
+++ b/subprojects/glib.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = glib
+url = https://github.com/GNOME/glib
+revision = glib-2-60
diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap
new file mode 120000
index 00000000..4c62fa2c
--- /dev/null
+++ b/subprojects/libffi.wrap
@@ -0,0 +1 @@
+glib/subprojects/libffi.wrap
\ No newline at end of file
diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
new file mode 120000
index 00000000..b74eca77
--- /dev/null
+++ b/subprojects/proxy-libintl.wrap
@@ -0,0 +1 @@
+glib/subprojects/proxy-libintl.wrap
\ No newline at end of file
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
new file mode 120000
index 00000000..b944dda2
--- /dev/null
+++ b/subprojects/zlib.wrap
@@ -0,0 +1 @@
+glib/subprojects/zlib.wrap
\ No newline at end of file
diff --git a/tests/fe-common/core/meson.build b/tests/fe-common/core/meson.build
new file mode 100644
index 00000000..44b11222
--- /dev/null
+++ b/tests/fe-common/core/meson.build
@@ -0,0 +1,19 @@
+test_test_formats = executable('test-formats',
+  files(
+    'test-formats.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfe_common_core_a,
+  ],
+  c_args : [
+    '-D' + 'PACKAGE_STRING' + '="' + 'fe-common/core' + '"',
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep
+)
+test('test-formats test', test_test_formats,
+  args : ['--tap'],
+  protocol : 'tap')
diff --git a/tests/fe-common/meson.build b/tests/fe-common/meson.build
new file mode 100644
index 00000000..dd52d8a4
--- /dev/null
+++ b/tests/fe-common/meson.build
@@ -0,0 +1 @@
+subdir('core')
diff --git a/tests/fe-text/meson.build b/tests/fe-text/meson.build
new file mode 100644
index 00000000..ea6ec620
--- /dev/null
+++ b/tests/fe-text/meson.build
@@ -0,0 +1,30 @@
+test_test_paste_join_multiline = executable('test-paste-join-multiline',
+  files(
+    '../../src/fe-text/gui-entry.c',
+    '../../src/fe-text/gui-printtext.c',
+    '../../src/fe-text/gui-windows.c',
+    '../../src/fe-text/mainwindows.c',
+    '../../src/fe-text/term-terminfo.c',
+    '../../src/fe-text/term.c',
+    '../../src/fe-text/terminfo-core.c',
+    '../../src/fe-text/textbuffer-view.c',
+    '../../src/fe-text/textbuffer.c',
+    'mock-irssi.c',
+    'test-paste-join-multiline.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfe_common_core_a,
+  ],
+  c_args : [
+    '-D' + 'PACKAGE_STRING' + '="' + 'fe-text' + '"',
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep + textui_dep,
+)
+test('test-paste-join-multiline test', test_test_paste_join_multiline,
+  args : ['--tap'],
+  protocol : 'tap')
+
diff --git a/tests/irc/core/meson.build b/tests/irc/core/meson.build
new file mode 100644
index 00000000..f63f4fa8
--- /dev/null
+++ b/tests/irc/core/meson.build
@@ -0,0 +1,45 @@
+test_test_irc = executable('test-irc',
+  files(
+    'test-irc.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfe_common_core_a,
+    libirc_core_a,
+  ],
+  c_args : [
+    '-D' + 'PACKAGE_STRING' + '="' + 'irc/core' + '"',
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep
+)
+test('test-irc test', test_test_irc,
+  args : [
+    '--tap',
+  ],
+  protocol : 'tap')
+
+test_test_channel_events = executable('test-channel-events',
+  files(
+    'test-channel-events.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfe_common_core_a,
+    libirc_core_a,
+  ],
+  c_args : [
+    '-D' + 'PACKAGE_STRING' + '="' + 'irc/core' + '"',
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep
+)
+test('test-channel-events test', test_test_channel_events,
+  args : [
+    '--tap',
+  ],
+  protocol : 'tap')
diff --git a/tests/irc/flood/meson.build b/tests/irc/flood/meson.build
new file mode 100644
index 00000000..e9d0a2bc
--- /dev/null
+++ b/tests/irc/flood/meson.build
@@ -0,0 +1,25 @@
+test_test_796 = executable('test-796',
+  files(
+    'test-796.c',
+  ),
+  link_with : [
+    libconfig_a,
+    libcore_a,
+    libfe_common_core_a,
+    libirc_a,
+    libfe_common_irc_a,
+    libfe_irc_dcc_a,
+    libfe_irc_notifylist_a,
+  ],
+  c_args : [
+    '-D' + 'PACKAGE_STRING' + '="' + 'irc/flood' + '"',
+  ],
+  include_directories : rootinc,
+  implicit_include_directories : false,
+  dependencies : dep
+)
+test('test-796 test', test_test_796,
+  args : [
+    '--tap',
+  ],
+  protocol : 'tap')
diff --git a/tests/irc/meson.build b/tests/irc/meson.build
new file mode 100644
index 00000000..1a10ce0a
--- /dev/null
+++ b/tests/irc/meson.build
@@ -0,0 +1,2 @@
+subdir('core')
+subdir('flood')
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 00000000..6cfb3706
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,5 @@
+subdir('fe-common')
+subdir('irc')
+if want_textui
+  subdir('fe-text')
+endif
diff --git a/themes/meson.build b/themes/meson.build
new file mode 100644
index 00000000..d58dddf4
--- /dev/null
+++ b/themes/meson.build
@@ -0,0 +1,6 @@
+install_data(
+  files(
+    'default.theme',
+    'colorless.theme',
+  ),
+  install_dir : themedir)
diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 6b3a46e4..466a29fd 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -1,14 +1,20 @@
 #!/bin/sh
 
-DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD`
+DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD 2>/dev/null`
 
 VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
 VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`
 
 if test -z "$VERSION_DATE"; then
-    exec>&2
-    echo "**Error**: `basename "$0"` must be run in a git clone, cannot proceed."
-    exit 1
+    DATE=`grep '^v' $1/NEWS | head -1`
+    VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
+    case $VERSION_DATE in
+	*xx)
+	    VERSION_DATE=`date +%Y%m%d`
+	;;
+    esac
+    VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '`
+    VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null`
 fi
 
 echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
@@ -16,7 +22,7 @@ echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
 
 if echo "${VERSION}" | grep -q -- -head; then
   # -head version, get extra details from git if we can
-  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --always --tags)
+  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --always --tags 2>/dev/null)
   if [ $? = 0 ]; then
     echo "#undef PACKAGE_VERSION"
     echo "#define PACKAGE_VERSION \"${git_version}\""
diff --git a/utils/syntax.pl b/utils/syntax.pl
index 33bd12b4..42a4accb 100755
--- a/utils/syntax.pl
+++ b/utils/syntax.pl
@@ -39,6 +39,7 @@ foreach $file (@files) {
 }
 while (<docs/help/in/*.in>) {
    next if (/Makefile/);
+   next if (/meson\.build/);
 
    open (FILE, "$_");
    @data = <FILE>;

From 9a93e714749eceeb7860a675b07349809883f22b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Tue, 9 Jul 2019 13:41:11 +0200
Subject: [PATCH 0995/1650] try test travis

---
 .travis.yml | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 30f9cc35..a09b7271 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,9 @@
 sudo: false
-dist: trusty
+dist: xenial
 language: perl
 perl:
     # ~stretch
     - "5.24-shrplib"
-    # ~xenial
-    # - "5.22-shrplib"
-    # ~jessie
-    # - "5.20-shrplib"
-    # ~trusty
-    # - "5.18-shrplib"
     - "system-perl"
 env:
     - CC=clang UNITTESTS=false
@@ -28,22 +22,23 @@ addons:
             - libperl-dev
             - elinks
             - libgcrypt11-dev
+            - libotr5-dev
 
 before_install:
     - perl -V
-    - wget https://github.com/irssi-import/libotr/releases/download/4.1.1/travis-trusty-libotr-4.1.1.tar.gz
-    - tar zxf travis-trusty-libotr*.tar.gz -C $HOME
-    - ./autogen.sh --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-build/lib --with-libotr-inc-prefix=$HOME/otr-build/include
-    - make dist
-    - cd ..
-    - tar xaf */irssi-*.tar.*
-    - cd irssi-*
+    - pushd ~
+    - curl -sSLf https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip | funzip > bin/ninja
+    - chmod +x bin/ninja
+    - curl -sSLf https://github.com/mesonbuild/meson/releases/download/0.51.1/meson-0.51.1.tar.gz | tar xz
+    - ( cd bin ; ln -s ../meson-*/meson.py meson )
+    - curl -sSLf https://github.com/irssi-import/glib-travis-build/releases/download/2.58.3/travis-xenial-glib-2.58.3.tar.xz | tar xJ
+    - export PKG_CONFIG_PATH=$HOME/glib-build/lib/x86_64-linux-gnu/pkgconfig
+    - popd
 
 install:
-    - ./configure --with-proxy --with-bot --with-perl=module --with-otr=yes --with-libotr-prefix=$HOME/otr-build/lib --with-libotr-inc-prefix=$HOME/otr-build/include --prefix=$HOME/irssi-build
-      $( $UNITTESTS && echo --enable-always-build-tests )
-    - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
-    - make install
+    - meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes --prefix=$HOME/irssi-build
+    - ninja -C Build
+    - ninja -C Build install
 
 before_script:
     - pushd ~
@@ -62,8 +57,8 @@ before_script:
 script:
     - irssi-build/bin/irssi --home irssi-test
     - popd
-    - if $UNITTESTS; then make -C tests -sk check; fi
+    - if $UNITTESTS; then ninja -C Build test; fi
 
 after_script:
     - cat ~/irc.log.*
-    - find -name test-suite.log -exec cat {} +
+    - find -name testlog.txt -exec sed -i -e '/Inherited environment:.* TRAVIS/d' {} + -exec cat {} +

From 905bf86921d893d89d3ca453071c1b697174df20 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Wed, 10 Jul 2019 14:00:37 +0200
Subject: [PATCH 0996/1650] refactor glib install

---
 meson.build                    | 53 ++++++++++++++++++++++++++++++----
 subprojects/glib.wrap          | 10 ++++---
 subprojects/libffi.wrap        |  1 -
 subprojects/proxy-libintl.wrap |  1 -
 subprojects/zlib.wrap          |  1 -
 5 files changed, 54 insertions(+), 12 deletions(-)
 delete mode 120000 subprojects/libffi.wrap
 delete mode 120000 subprojects/proxy-libintl.wrap
 delete mode 120000 subprojects/zlib.wrap

diff --git a/meson.build b/meson.build
index 95a0f874..f1e23169 100644
--- a/meson.build
+++ b/meson.build
@@ -6,6 +6,7 @@ project('irssi', 'c',
 ############################
 ############################
 
+glib_internal_version = 'glib-2.58.3' # keep this in sync with subprojects/glib.wrap
 cc = meson.get_compiler('c')
 rootinc = include_directories('.')
 dep = []
@@ -145,11 +146,53 @@ message('*** On Redhat: dnf install glib2-devel')
 glib_dep = dependency('glib-2.0', version : '>=2.58', required : not want_glib_internal)
 if not glib_dep.found()
   glib_internal = true
-  glib_proj = subproject('glib', default_options : [
-    'libmount=false',
-  ])
-  glib_dep = glib_proj.get_variable('libglib_dep')
-  gmodule_dep = glib_proj.get_variable('libgmodule_dep')
+  meson_cmd = find_program('meson')
+  ninja = find_program('ninja')
+  glib_internal_download_t = custom_target('glib-internal-download',
+    command : [ meson_cmd, 'subprojects', 'download', 'glib', '--sourcedir', meson.current_source_dir() ],
+    console : true,
+    output : ['glib-internal-download'],
+  )
+  glib_internal_configure_t = custom_target('glib-internal-configure',
+    command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
+      '--buildtype=' + get_option('buildtype'),
+      '-Dlibmount=false', '-Dselinux=false', '-Ddefault_library=static', '-Dinternal_pcre=true',
+      (meson.current_build_dir() / 'build-subprojects' / 'glib'),
+      (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
+    console : true,
+    output : ['glib-internal-configure'],
+    depends : glib_internal_download_t,)
+  glib_internal_build_t = custom_target('glib-internal-build',
+    command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
+      'glib' / 'libglib-2.0.a',
+      'gmodule' / 'libgmodule-2.0.a'],
+    console : true,
+    output : ['glib-internal-build'],
+    depends : glib_internal_configure_t,)
+  glib_dep = declare_dependency(
+    dependencies : [
+      dependency('threads'),
+    ],
+    sources : glib_internal_build_t,
+    compile_args : [
+      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
+      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
+      '-I' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
+    ],
+    link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
+  )
+  libdl_dep = []
+  prov_lib = cc.find_library('dl', required : false)
+  if prov_lib.found() and cc.has_function('dlopen', dependencies : prov_lib)
+    libdl_dep += prov_lib
+  endif
+  gmodule_dep = declare_dependency(sources : glib_internal_build_t,
+    dependencies : libdl_dep,
+    compile_args : [
+      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
+    ],
+    link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
+  )
 else
   gmodule_dep = dependency('gmodule-2.0')
 endif
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index 4def08b1..5cb40b0e 100644
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -1,4 +1,6 @@
-[wrap-git]
-directory = glib
-url = https://github.com/GNOME/glib
-revision = glib-2-60
+[wrap-file]
+# make sure to update the glib_internal_version in meson.build
+directory = glib-2.58.3
+source_url = https://download.gnome.org/sources/glib/2.58/glib-2.58.3.tar.xz
+source_filename = glib-2.58.3.tar.xz
+source_hash = 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap
deleted file mode 120000
index 4c62fa2c..00000000
--- a/subprojects/libffi.wrap
+++ /dev/null
@@ -1 +0,0 @@
-glib/subprojects/libffi.wrap
\ No newline at end of file
diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
deleted file mode 120000
index b74eca77..00000000
--- a/subprojects/proxy-libintl.wrap
+++ /dev/null
@@ -1 +0,0 @@
-glib/subprojects/proxy-libintl.wrap
\ No newline at end of file
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
deleted file mode 120000
index b944dda2..00000000
--- a/subprojects/zlib.wrap
+++ /dev/null
@@ -1 +0,0 @@
-glib/subprojects/zlib.wrap
\ No newline at end of file

From 2599124bc8e581b5c9a48a6c0d1902b9de6230a6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 16 Jul 2019 14:23:12 +0000
Subject: [PATCH 0997/1650] Show meson commands in README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3550b640..9ea92940 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ available.
 ```
 git clone https://github.com/irssi/irssi
 cd irssi
-./autogen.sh
-make && sudo make install
+meson Build
+ninja -C Build && sudo ninja -C Build install
 ```
 
 #### Release source installation

From ddb9d5c15f428b23ab6af60188c5375415bc03cb Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Tue, 16 Jul 2019 17:25:12 +0200
Subject: [PATCH 0998/1650] update gitignore for meson stuff

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index f42839eb..79e4d4bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,7 @@ src/fe-fuzz/oom-*
 
 .deps
 .libs
+
+Build
+subprojects/*
+!subprojects/*.wrap

From c3bd917cf2d93d95724e98aa5cfaaa5b5052c7be Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 17 Jul 2019 11:38:11 +0200
Subject: [PATCH 0999/1650] use correct libraries in travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a09b7271..896048d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ before_install:
     - ( cd bin ; ln -s ../meson-*/meson.py meson )
     - curl -sSLf https://github.com/irssi-import/glib-travis-build/releases/download/2.58.3/travis-xenial-glib-2.58.3.tar.xz | tar xJ
     - export PKG_CONFIG_PATH=$HOME/glib-build/lib/x86_64-linux-gnu/pkgconfig
+    - export LD_LIBRARY_PATH=$HOME/glib-build/lib/x86_64-linux-gnu
     - popd
 
 install:

From 00a7efc69f8cfc14fcfdf123421015e99ac07926 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Wed, 17 Jul 2019 13:37:19 +0200
Subject: [PATCH 1000/1650] modularise irc component

---
 src/core/modules.c                           | 12 +++++++++++-
 src/core/modules.h                           |  6 ++++++
 src/fe-common/irc/dcc/fe-dcc.c               |  2 ++
 src/fe-common/irc/fe-common-irc.c            |  4 +++-
 src/fe-common/irc/notifylist/fe-notifylist.c |  2 ++
 src/irc/core/irc-core.c                      |  4 +++-
 src/irc/dcc/dcc.c                            |  1 +
 src/irc/flood/flood.c                        |  2 ++
 src/irc/notifylist/notifylist.c              |  2 ++
 src/perl/perl-common.c                       |  3 +++
 tests/irc/flood/test-796.c                   | 16 +++++++++++-----
 11 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/core/modules.c b/src/core/modules.c
index c625071a..119a8e67 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -247,14 +247,24 @@ MODULE_REC *module_find(const char *name)
 MODULE_FILE_REC *module_file_find(MODULE_REC *module, const char *name)
 {
 	GSList *tmp;
+	char *tmpname, *p;
+	tmpname = g_strdup(name);
+	for (p = tmpname; *p != '\0'; p++) {
+		if (*p == '_')
+			*p = '-';
+	}
 
 	for (tmp = module->files; tmp != NULL; tmp = tmp->next) {
 		MODULE_FILE_REC *rec = tmp->data;
 
-		if (g_strcmp0(rec->name, name) == 0)
+		if (g_strcmp0(rec->name, name) == 0 ||
+		    g_strcmp0(rec->name, tmpname) == 0) {
+			g_free(tmpname);
                         return rec;
+		}
 	}
 
+	g_free(tmpname);
         return NULL;
 }
 
diff --git a/src/core/modules.h b/src/core/modules.h
index e3deaee2..1e707c0c 100644
--- a/src/core/modules.h
+++ b/src/core/modules.h
@@ -24,6 +24,12 @@
 #  define MODULE_IS_STATIC(rec) TRUE
 #endif
 
+#define MODULE_ABICHECK(fn_modulename) \
+void fn_modulename ## _abicheck(int *version)	\
+{						\
+	*version = IRSSI_ABI_VERSION;		\
+}
+
 enum {
 	MODULE_ERROR_ALREADY_LOADED,
 	MODULE_ERROR_LOAD,
diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c
index 51fb5eea..f5fb3b22 100644
--- a/src/fe-common/irc/dcc/fe-dcc.c
+++ b/src/fe-common/irc/dcc/fe-dcc.c
@@ -191,3 +191,5 @@ void fe_irc_dcc_deinit(void)
 	command_unbind("dcc", (SIGNAL_FUNC) cmd_dcc);
 	command_unbind("dcc list", (SIGNAL_FUNC) cmd_dcc_list);
 }
+
+MODULE_ABICHECK(fe_irc_dcc)
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index 0db2d98e..a36d3caa 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -102,7 +102,7 @@ void fe_common_irc_init(void)
         irc_completion_init();
 
 	settings_check();
-	module_register("core", "fe-irc");
+	module_register("irc", "fe-common");
 
 	fe_irc_modules_init();
 }
@@ -130,3 +130,5 @@ void fe_common_irc_deinit(void)
 
 	theme_unregister();
 }
+
+MODULE_ABICHECK(fe_common_irc)
diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c
index 1f136a97..579b1824 100644
--- a/src/fe-common/irc/notifylist/fe-notifylist.c
+++ b/src/fe-common/irc/notifylist/fe-notifylist.c
@@ -246,3 +246,5 @@ void fe_irc_notifylist_deinit(void)
 	signal_remove("notifylist left", (SIGNAL_FUNC) notifylist_left);
 	signal_remove("notifylist away changed", (SIGNAL_FUNC) notifylist_away);
 }
+
+MODULE_ABICHECK(fe_irc_notifylist)
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index b5e80f2a..d1a0f72e 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -125,7 +125,7 @@ void irc_core_init(void)
 	sasl_init();
 
 	settings_check();
-	module_register("core", "irc");
+	module_register("irc", "core");
 }
 
 void irc_core_deinit(void)
@@ -149,3 +149,5 @@ void irc_core_deinit(void)
 
 	chat_protocol_unregister("IRC");
 }
+
+MODULE_ABICHECK(irc_core)
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 006a2b77..4c276ac6 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -597,3 +597,4 @@ void irc_dcc_deinit(void)
 	g_source_remove(dcc_timeouttag);
 }
 
+MODULE_ABICHECK(irc_dcc)
diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c
index 886a266c..a7425b90 100644
--- a/src/irc/flood/flood.c
+++ b/src/irc/flood/flood.c
@@ -346,3 +346,5 @@ void irc_flood_deinit(void)
 	signal_remove("server connected", (SIGNAL_FUNC) flood_init_server);
 	signal_remove("server destroyed", (SIGNAL_FUNC) flood_deinit_server);
 }
+
+MODULE_ABICHECK(irc_flood)
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index 475e92c8..158b4dea 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -358,3 +358,5 @@ void irc_notifylist_deinit(void)
 
 	notifylist_destroy_all();
 }
+
+MODULE_ABICHECK(irc_notifylist)
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 6fd1705b..a2c7ffe4 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -584,6 +584,9 @@ static void perl_register_protocol(CHAT_PROTOCOL_REC *rec)
 	chat_type = chat_protocol_lookup(rec->name);
 	g_return_if_fail(chat_type >= 0);
 
+	if (rec->not_initialized)
+		return;
+
 	name = g_ascii_strdown(rec->name,-1);
 	*name = *(rec->name);
 
diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index 6f0f3ac8..9e8aeee7 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -31,9 +31,13 @@
 #include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/irc-channels.h>
 
-/* irc.c */
-void irc_init(void);
-void irc_deinit(void);
+/* flood.c */
+void irc_flood_init(void);
+void irc_flood_deinit(void);
+
+/* irc-core.c */
+void irc_core_init(void);
+void irc_core_deinit(void);
 
 /* irc-session.c */
 void irc_session_init(void);
@@ -72,7 +76,8 @@ static void server_destroy_flood_set_up(ServerDestroyFloodData *fixture, const v
 {
 	args_execute(0, NULL);
 	core_init();
-	irc_init();
+	irc_core_init();
+	irc_flood_init();
 	fe_common_core_init();
 	fe_common_irc_init();
 	signal_emit("irssi init finished", 0);
@@ -90,7 +95,8 @@ static void server_destroy_flood_tear_down(ServerDestroyFloodData *fixture, cons
 	command_unbind("echo", (SIGNAL_FUNC) cmd_echo);
 	fe_common_irc_deinit();
 	fe_common_core_deinit();
-	irc_deinit();
+	irc_flood_deinit();
+	irc_core_deinit();
 	core_deinit();
 }
 

From d55a74587c37942c7e4a0cf84e8a090e6adb5d01 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 17 Jul 2019 11:52:20 +0000
Subject: [PATCH 1001/1650] Add Meson ver requirement to readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 9ea92940..febe01b3 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ available.
 
 #### Development source installation
 
+[Ninja](http://mesonbuild.com/) 1.5 and [Meson](http://mesonbuild.com/) 0.49
+
 ```
 git clone https://github.com/irssi/irssi
 cd irssi

From 73f6964d4f00a408f2e0caf1a68e61ecc61353ca Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 17 Jul 2019 12:09:39 +0000
Subject: [PATCH 1002/1650] Explain Meson in INSTALL

---
 INSTALL | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index d2a0acc2..3476211f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,14 +4,21 @@
 
 To compile irssi you need:
 
-- glib-2.6 or greater
-- pkg-config
+- meson-0.49 build system with ninja-1.5 or greater
+- glib-2.28 or greater
 - openssl (for ssl support)
 - perl-5.6 or greater (for perl support)
 - terminfo or ncurses (for text frontend)
 
 For most people, this should work just fine:
 
+ meson Build
+ ninja -C Build
+ su
+ ninja -C Build install
+ 
+For the moment, autotools is also supported:
+
  ./autogen.sh     (for people who just cloned the repository)
  ./configure      (if this script already exists, skip ./autogen.sh)
  make
@@ -20,39 +27,45 @@ For most people, this should work just fine:
 
 configure options
 
+  These options can be given to meson or ./configure.
+  The first syntax is for meson, the 2nd for ./configure
+  
+  For a complete list of options, run
+   meson configure   /   ./configure --help
+
   --prefix
 
   Specifies the path where irssi will be installed.
   YES, you can install irssi WITHOUT ROOT permissions
   by using --prefix=/home/dir
 
-  --with-proxy
+  -Dwith-proxy=yes   /   --with-proxy
 
   Build the irssi proxy (see startup-HOWTO).
 
-  --with-perl=[yes|no|module]
+  -Dwith-perl=[yes|no]   /   --with-perl=[yes|no|module]
 
   Enable Perl support
   yes    enable builtin (default)
   no     disable
   module enable as module
 
-  --with-perl-lib=[site|vendor|DIR]
+  -Dwith-perl-lib=[site|vendor|DIR]   /   --with-perl-lib=[site|vendor|DIR]
 
   Specify installation dir for Perl libraries
   site   install in dir for site-specific modules (default)
   vendor install in dir for vendor-specific modules
   DIR    install in DIR
 
-  --with-socks
+  [N/A]   /   --with-socks
 
   Build with socks library
 
-  --with-bot
+  -Dwith-bot=yes   /   --with-bot
 
   Build irssi-bot
 
-  --without-textui
+  -Dwithout-textui=yes   /   --without-textui
 
   Build without text frontend
 

From 99b2c0b04a20cc1f374b0b7483b3113aa97e996d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Thu, 18 Jul 2019 10:29:30 +0200
Subject: [PATCH 1003/1650] fix small overflow

---
 src/fe-common/core/command-history.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index 04922d2d..f4042640 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -10,7 +10,7 @@ typedef struct {
 	int lines;
 
 	int refcount;
-	int redo:1;
+	unsigned int redo:1;
 } HISTORY_REC;
 
 typedef struct {

From 12c8cb1f37e1fc30ab3b45d7e11c7d45d08ae280 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Thu, 18 Jul 2019 11:37:11 +0200
Subject: [PATCH 1004/1650] carry rpath to working perl test

---
 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index f1e23169..15725f6d 100644
--- a/meson.build
+++ b/meson.build
@@ -246,6 +246,7 @@ have_perl = false
 if want_perl
   perl_cflags = []
   perl_ldflags = []
+  perl_rpath_flags = []
   perl_rpath = ''
 
   #### ccopts ####
@@ -265,6 +266,7 @@ if want_perl
    if not fl.startswith('-A') and not skip_libs.contains(fl)
      if fl.startswith('-Wl,-rpath,')
        perl_rpath = fl.split(',')[2]
+       perl_rpath_flags += fl
      else
        perl_ldflags += fl
      endif
@@ -283,7 +285,8 @@ int main()
   perl_alloc();
   return 0;
 }
-''', args : perl_cflags + perl_ldflags, name : 'working Perl support').compiled()
+''', args : perl_cflags + perl_ldflags + perl_rpath_flags,
+     name : 'working Perl support').compiled()
     if require_perl
       error('error linking with perl libraries')
     else

From 6277ccf67fb6cee50565318e458ebedbb75b4873 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 18 Jul 2019 18:04:42 +0200
Subject: [PATCH 1005/1650] manually maintain irc loader

---
 configure.ac                  | 31 -------------------------------
 src/fe-common/irc/Makefile.am |  3 ---
 src/irc/Makefile.am           |  3 ---
 3 files changed, 37 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7d35aefa..9198fd67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,47 +633,16 @@ FE_COMMON_LIBS=""
 
 CHAT_LIBS=""
 for c in $CHAT_MODULES; do
-	module_inits=""
-	module_deinits=""
-	fe_module_inits=""
-	fe_module_deinits=""
 	CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a"
 	if test -f $srcdir/src/fe-common/$c/module.h; then
 		FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a "
 	fi
 	for s in `eval echo \\$${c}_MODULES`; do
 		CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a"
-		module_inits="$module_inits ${c}_${s}_init();"
-		module_deinits="${c}_${s}_deinit(); $module_deinits"
 		if test -f $srcdir/src/fe-common/$c/$s/module.h; then
 			FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a "
-			fe_module_inits="$fe_module_inits fe_${c}_${s}_init();"
-			fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits"
 		fi
 	done
-
-	mkdir -p src/$c
-	file="src/$c/$c.c"
-	echo "/* this file is automatically generated by configure - don't change */" > $file
-	echo "void ${c}_core_init(void); void ${c}_core_deinit(void);" >> $file
-	if test -n "$module_inits"; then
-		echo "$module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file
-		echo "$module_deinits" | $sedpath -e 's/ *$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file
-	fi
-	echo "void ${c}_init(void) { ${c}_core_init(); $module_inits }" >> $file
-	echo "void ${c}_deinit(void) { $module_deinits ${c}_core_deinit(); }" >> $file
-
-	if test -f $srcdir/src/fe-common/$c/module.h; then
-		mkdir -p src/fe-common/$c
-		file="src/fe-common/$c/${c}-modules.c"
-		echo "/* this file is automatically generated by configure - don't change */" > $file
-		if test -n "$fe_module_inits"; then
-			echo "$fe_module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file
-			echo "$fe_module_deinits" | $sedpath -e 's/ *$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file
-		fi
-		echo "void fe_${c}_modules_init(void) { $fe_module_inits }" >> $file
-		echo "void fe_${c}_modules_deinit(void) { $fe_module_deinits }" >> $file
-	fi
 done
 
 FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index 704de297..f14d6942 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -39,6 +39,3 @@ pkginc_fe_common_irc_HEADERS = \
 	module-formats.h
 
 DISTFILES = $(DIST_COMMON) $(real_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-distclean-generic:
-	rm -f irc-modules.c
diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
index f9d3eb40..9eda2a2f 100644
--- a/src/irc/Makefile.am
+++ b/src/irc/Makefile.am
@@ -9,6 +9,3 @@ noinst_LIBRARIES = libirc.a
 libirc_a_SOURCES = irc.c
 
 DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-distclean-generic:
-	rm -f irc.c

From 7f99bbfd001e3ede856a298d041e174b51de627c Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 20 Jul 2019 14:29:23 -0700
Subject: [PATCH 1006/1650] Link to Ninja site and use HTTPS for Meson site

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index febe01b3..f73b58a0 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ available.
 
 #### Development source installation
 
-[Ninja](http://mesonbuild.com/) 1.5 and [Meson](http://mesonbuild.com/) 0.49
+[Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49
 
 ```
 git clone https://github.com/irssi/irssi

From 9a90213ba97a8419e56ef8d6af4a1d22e5dea8a9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 21 Jul 2019 00:05:07 +0200
Subject: [PATCH 1007/1650] do not use ?: to stay compatible with meson 0.49

---
 meson.build          | 21 ++++++++++++++++++---
 src/perl/meson.build |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 15725f6d..4223cc08 100644
--- a/meson.build
+++ b/meson.build
@@ -112,7 +112,10 @@ default_theme_h = custom_target('default-theme.h',
 #### inet_addr ####
 inet_addr_found = false
 foreach inet_addr_provider : ['', 'nsl']
-  prov_lib = inet_addr_provider != '' ? [cc.find_library(inet_addr_provider, required : false)] : []
+  prov_lib = []
+  if inet_addr_provider != ''
+    prov_lib += cc.find_library(inet_addr_provider, required : false)
+  endif
   if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('inet_addr', dependencies : prov_lib)
     dep += prov_lib
     inet_addr_found = true
@@ -126,7 +129,10 @@ endif
 #### socket ####
 socket_found = false
 foreach socket_provider : ['', 'socket', 'network']
-  prov_lib = socket_provider != '' ? [cc.find_library(socket_provider, required : false)] : []
+  prov_lib = []
+  if socket_provider != ''
+    prov_lib += cc.find_library(socket_provider, required : false)
+  endif
   if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('socket', dependencies : prov_lib)
     dep += prov_lib
     socket_found = true
@@ -343,6 +349,11 @@ int main()
         perl_library_dir += ' - prepends to @INC with /set perl_use_lib'
       endif
     endif
+    def_perl_use_lib = '-D' + 'PERL_USE_LIB' + '="'
+    if set_perl_use_lib
+      def_perl_use_lib += perl_use_lib
+    endif
+    def_perl_use_lib += '"'
 
     have_perl = true
   endif
@@ -446,7 +457,11 @@ endif
 ##############
 
 pc = import('pkgconfig')
-pc.generate(filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', requires : glib_internal ? [] : glib_dep)
+pc_requires = []
+if not glib_internal
+  pc_requires += glib_dep
+endif
+pc.generate(filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', requires : pc_requires)
 
 ###########
 # irssi.1 #
diff --git a/src/perl/meson.build b/src/perl/meson.build
index e3935814..dd8f2f8c 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -26,7 +26,7 @@ shared_module('perl_core',
   ],
   c_args : [
     def_scriptdir,
-    '-D' + 'PERL_USE_LIB' + '="' + (set_perl_use_lib ? perl_use_lib : '') + '"',
+    def_perl_use_lib,
     '-D' + 'PERL_STATIC_LIBS' + '=' + 0.to_string(),
   ],
   include_directories : rootinc,

From 6c7fa15417c90deeb319b2d67c9e3b58d55104d7 Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@icloud.com>
Date: Sat, 27 Jul 2019 18:23:51 +0000
Subject: [PATCH 1008/1650] Free g_strdup() allocated memory with g_free()

Memory allocated with g_malloc() must be freed with g_free(). The
allocators may use different memory pools.
---
 src/core/network-openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 92507e14..9956f217 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -226,7 +226,7 @@ static gboolean irssi_ssl_verify_hostname(X509 *cert, const char *hostname)
 		} else {
 			g_warning("No subjectAltNames and no valid common name in certificate");
 		}
-		free(cert_subject_cn);
+		g_free(cert_subject_cn);
 	}
 
 	return matched;

From dde5fff4a533695f1d2559ef60f22caf66801e03 Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@icloud.com>
Date: Sat, 27 Jul 2019 18:34:03 +0000
Subject: [PATCH 1009/1650] Fix memory leaks

---
 src/core/settings.c      | 1 +
 src/irc/dcc/dcc-resume.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 2bd6c06a..9b50f6f4 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -229,6 +229,7 @@ static void settings_add(const char *module, const char *section,
 		if (rec->type != type) {
 			g_warning("Trying to add already existing "
 				  "setting '%s' with different type.", key);
+			g_strfreev(choices_vec);
 			return;
 		}
 		rec->refcount++;
diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c
index b0438e79..dd62ff9d 100644
--- a/src/irc/dcc/dcc-resume.c
+++ b/src/irc/dcc/dcc-resume.c
@@ -92,8 +92,10 @@ static int dcc_ctcp_resume_parse(int type, const char *data, const char *nick,
 	params = g_strsplit(data, " ", -1);
 	paramcount = g_strv_length(params);
 
-	if (paramcount < 3)
+	if (paramcount < 3) {
+		g_strfreev(params);
 		return 0;
+	}
 
 	fileparams = get_file_params_count_resume(params, paramcount);
 

From c92ff1701fc413b9f993bfe442894af60d61b5ad Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 28 Jul 2019 00:54:08 +0200
Subject: [PATCH 1010/1650] fix cut off text with theme-indent and /set
 indent_always off

---
 src/fe-text/textbuffer-view.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index ec518cbf..a031439d 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -281,6 +281,7 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
                         /* long word, remove the indentation from this line */
 			xpos -= sub->indent;
                         sub->indent = 0;
+			sub->indent_func = NULL;
 		}
 
 		if (xpos + char_width > view->width) {
@@ -434,7 +435,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 			if (subline > 0) {
 				/* continuing previous line - indent it */
 				indent_func = cache->lines[subline-1].indent_func;
-				if (indent_func == NULL)
+				if (indent_func == NULL || cache->lines[subline-1].continues)
 					xpos = cache->lines[subline-1].indent;
 				color = cache->lines[subline-1].color;
 #ifdef TERM_TRUECOLOR
@@ -445,7 +446,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 				indent_func = NULL;
 			}
 
-			if (xpos == 0 && indent_func == NULL)
+			if (xpos == 0 && (indent_func == NULL || cache->lines[subline-1].continues))
 				need_clrtoeol = TRUE;
 			else {
 				/* line was indented - need to clear the

From ec32e39ae7007a2b39bd022888ea95f5160841e3 Mon Sep 17 00:00:00 2001
From: Frost <flaunlmail-github@yahoo.co.uk>
Date: Wed, 7 Aug 2019 20:51:59 +0000
Subject: [PATCH 1011/1650] hilight.in: fix typo the->to

---
 docs/help/in/hilight.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/hilight.in b/docs/help/in/hilight.in
index 0726e5e7..49a73a7b 100644
--- a/docs/help/in/hilight.in
+++ b/docs/help/in/hilight.in
@@ -12,7 +12,7 @@
     -full:        The text must match the full word.
     -matchcase:   The text must match case.
     -regexp:      The text is a regular expression.
-    -color:       The color the display the highlight in.
+    -color:       The color to display the highlight in.
     -actcolor:    The color to mark the highlight activity in the statusbar.
     -level:       Matches only on the given message level.
     -network:     Matches only on the given network.

From 89686681c12419db16543a789f4b4ee0d296317f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 15:00:41 +0200
Subject: [PATCH 1012/1650] fix build system debug config to include
 -fno-omit-frame-pointer

---
 meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meson.build b/meson.build
index 4223cc08..2dcae29d 100644
--- a/meson.build
+++ b/meson.build
@@ -443,6 +443,9 @@ add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-stat
 
 #### personality ####
 add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c')
+if get_option('buildtype').contains('debug')
+  add_project_arguments(cc.get_supported_arguments('-fno-omit-frame-pointer'), language : 'c')
+endif
 
 if want_fuzzer
   if not cc.has_argument('-fsanitize=fuzzer-no-link')

From 0495c67d9fe147254a954f38c57dec8882629430 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 11:36:56 +0200
Subject: [PATCH 1013/1650] fix glib version dependency

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 4223cc08..bcf9ad6e 100644
--- a/meson.build
+++ b/meson.build
@@ -149,7 +149,7 @@ message('*** to download and build it automatically')
 message('*** Or alternatively install your distribution\'s package')
 message('*** On Debian: sudo apt-get install libglib2.0-dev')
 message('*** On Redhat: dnf install glib2-devel')
-glib_dep = dependency('glib-2.0', version : '>=2.58', required : not want_glib_internal)
+glib_dep = dependency('glib-2.0', version : '>=2.28', required : not want_glib_internal)
 if not glib_dep.found()
   glib_internal = true
   meson_cmd = find_program('meson')

From a865b07a673ea4e8ea13d00f436058861d3d9ff0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 19 Jul 2019 08:40:16 +0200
Subject: [PATCH 1014/1650] make the $Z time overridable

---
 src/core/expandos.c | 3 ++-
 src/core/expandos.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/expandos.c b/src/core/expandos.c
index 96e2d9f3..9280b6f3 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -48,6 +48,7 @@ typedef struct {
 } EXPANDO_REC;
 
 const char *current_expando = NULL;
+time_t current_time = (time_t)-1;
 
 static int timer_tag;
 
@@ -441,7 +442,7 @@ static char *expando_time(SERVER_REC *server, void *item, int *free_ret)
 	struct tm *tm;
         char str[256];
 
-        now = time(NULL);
+        now = current_time != (time_t)-1 ? current_time : time(NULL);
 	tm = localtime(&now);
 
 	if (strftime(str, sizeof(str), timestamp_format, tm) == 0)
diff --git a/src/core/expandos.h b/src/core/expandos.h
index 05dfcf11..c03333a7 100644
--- a/src/core/expandos.h
+++ b/src/core/expandos.h
@@ -17,6 +17,7 @@ typedef char* (*EXPANDO_FUNC)
 	(SERVER_REC *server, void *item, int *free_ret);
 
 extern const char *current_expando;
+extern time_t current_time;
 
 /* Create expando - overrides any existing ones.
    ... = signal, type, ..., NULL - list of signals that might change the

From e0ff13f6c17acd61a2123737688042703a2f7a42 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 12 Aug 2019 17:07:17 +0200
Subject: [PATCH 1015/1650] enable irc cap ls 302

---
 src/irc/core/irc-servers.c | 2 +-
 src/irc/core/irc-servers.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 7057c02a..8a7137eb 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -240,7 +240,7 @@ static void server_init(IRC_SERVER_REC *server)
 
 	irc_cap_toggle(server, "multi-prefix", TRUE);
 
-	irc_send_cmd_now(server, "CAP LS");
+	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
 	if (conn->password != NULL && *conn->password != '\0') {
                 /* send password */
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 57b65527..162d845f 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -5,6 +5,8 @@
 #include <irssi/src/core/servers.h>
 #include <irssi/src/irc/core/modes.h>
 
+#define CAP_LS_VERSION "302"
+
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \
 	PROTO_CHECK_CAST(SERVER(server), IRC_SERVER_REC, chat_type, "IRC")

From d512647b3f4b769305e3515d616833988d918943 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 17:36:20 +0200
Subject: [PATCH 1016/1650] use symbolic defines for capability strings

---
 src/irc/core/irc-servers.c | 4 ++--
 src/irc/core/irc-servers.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 8a7137eb..118f7242 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -236,9 +236,9 @@ static void server_init(IRC_SERVER_REC *server)
 	}
 
 	if (conn->sasl_mechanism != SASL_MECHANISM_NONE)
-		irc_cap_toggle(server, "sasl", TRUE);
+		irc_cap_toggle(server, CAP_SASL, TRUE);
 
-	irc_cap_toggle(server, "multi-prefix", TRUE);
+	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 162d845f..df0446cb 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -6,6 +6,8 @@
 #include <irssi/src/irc/core/modes.h>
 
 #define CAP_LS_VERSION "302"
+#define CAP_SASL "sasl"
+#define CAP_MULTI_PREFIX "multi-prefix"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \

From 27546354ca029997500f81bb64d2df1b9cd226c6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 11 Aug 2019 20:41:57 +0200
Subject: [PATCH 1017/1650] increase disconnect buffer and get rid of some
 magic 510 values

---
 src/core/net-disconnect.c        |  4 ++--
 src/irc/core/irc-channels.c      |  2 +-
 src/irc/core/irc-servers.c       | 10 ++--------
 src/irc/core/irc-servers.h       |  9 +++++++++
 src/irc/notifylist/notify-ison.c |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index 889563c5..27540767 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -51,7 +51,7 @@ static void sig_disconnect(NET_DISCONNECT_REC *rec)
 	char buf[512];
 	int count, ret;
 
-	/* check if there's any data waiting in socket. read max. 5kB so
+	/* check if there's any data waiting in socket. read max. 9kB so
 	   if server just keeps sending us stuff we won't get stuck */
 	count = 0;
 	do {
@@ -61,7 +61,7 @@ static void sig_disconnect(NET_DISCONNECT_REC *rec)
 			net_disconnect_remove(rec);
 		}
                 count++;
-	} while (ret == sizeof(buf) && count < 10);
+	} while (ret == sizeof(buf) && count < 18);
 }
 
 static int sig_timeout_disconnect(void)
diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index b2ee3772..27f8f4b2 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -142,7 +142,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 			/* don't try to send too long lines
 			   make sure it's not longer than 510
 			   so 510 - strlen("JOIN ") = 505 */
-			if (cmdlen < 505)
+			if (cmdlen < MAX_IRC_MESSAGE_LEN - 5 /* strlen("JOIN ") */)
 				continue;
 		}
 		if (outchans->len > 0) {
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 118f7242..5698b9a0 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -55,12 +55,6 @@
 #define DEFAULT_CMDS_MAX_AT_ONCE 5
 #define DEFAULT_MAX_QUERY_CHANS 1 /* more and more IRC networks are using stupid ircds.. */
 
-/*
- * 63 is the maximum hostname length defined by the protocol.  10 is a common
- * username limit on many networks.  1 is for the `@'.
- */
-#define MAX_USERHOST_LEN (63 + 10 + 1)
-
 void irc_servers_reconnect_init(void);
 void irc_servers_reconnect_deinit(void);
 
@@ -208,7 +202,7 @@ static char **split_message(SERVER_REC *server, const char *target,
 
 	/* length calculation shamelessly stolen from splitlong_safe.pl */
 	return split_line(SERVER(server), msg, target,
-			  510 - strlen(":! PRIVMSG  :") -
+			  MAX_IRC_MESSAGE_LEN - strlen(":! PRIVMSG  :") -
 			  strlen(ircserver->nick) - MAX_USERHOST_LEN -
 			  strlen(target));
 }
@@ -498,7 +492,7 @@ char **irc_server_split_action(IRC_SERVER_REC *server, const char *target,
 	g_return_val_if_fail(data != NULL, NULL);
 
 	return split_line(SERVER(server), data, target,
-			  510 - strlen(":! PRIVMSG  :\001ACTION \001") -
+			  MAX_IRC_MESSAGE_LEN - strlen(":! PRIVMSG  :\001ACTION \001") -
 			  strlen(server->nick) - MAX_USERHOST_LEN -
 			  strlen(target));
 }
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index df0446cb..f1697c60 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -5,6 +5,15 @@
 #include <irssi/src/core/servers.h>
 #include <irssi/src/irc/core/modes.h>
 
+/*
+ * 63 is the maximum hostname length defined by the protocol.  10 is a common
+ * username limit on many networks.  1 is for the `@'.
+ */
+#define MAX_USERHOST_LEN (63 + 10 + 1)
+#define MAX_IRC_MESSAGE_LEN (512 - 2) /* (2 bytes for CR+LF) */
+#define MAX_IRC_TAGS_LEN (8191 - 2) /* (2 bytes for `@' and SPACE) */
+#define MAX_IRC_USER_TAGS_LEN 4094
+
 #define CAP_LS_VERSION "302"
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index 39292896..4fb9315a 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -131,7 +131,7 @@ static void notifylist_timeout_server(IRC_SERVER_REC *server)
 
 		len = strlen(nick);
 
-		if (cmd->len+len+1 > 510)
+		if (cmd->len+len+1 > MAX_IRC_MESSAGE_LEN)
                         ison_send(server, cmd);
 
 		g_string_append_printf(cmd, "%s ", nick);

From ed4297c41bf5b1ee00a945b5ea52360b357464c4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 19 Jul 2019 08:41:49 +0200
Subject: [PATCH 1018/1650] add a new "print noformat" signal to be emitted on
 printtext

---
 src/fe-common/core/printtext.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 1826c754..692a3bc2 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -38,6 +38,7 @@ static int signal_gui_print_text_finished;
 static int signal_print_starting;
 static int signal_print_text;
 static int signal_print_format;
+static int signal_print_noformat;
 
 static int sending_print_starting;
 
@@ -313,6 +314,8 @@ static void printtext_dest_args(TEXT_DEST_REC *dest, const char *text, va_list v
 	}
 
 	str = printtext_get_args(dest, text, va);
+	signal_emit_id(signal_print_noformat, 2,
+		       dest, str);
 	print_line(dest, str);
 	g_free(str);
 }
@@ -515,6 +518,7 @@ void printtext_init(void)
 	signal_print_starting = signal_get_uniq_id("print starting");
 	signal_print_text = signal_get_uniq_id("print text");
 	signal_print_format = signal_get_uniq_id("print format");
+	signal_print_noformat = signal_get_uniq_id("print noformat");
 
 	read_settings();
 	signal_add("print text", (SIGNAL_FUNC) sig_print_text);

From 25270e046599b0aa2c84420bfb19660d255603c8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 02:16:22 +0200
Subject: [PATCH 1019/1650] use extended-join capability

---
 src/core/nick-rec.h                 |  1 +
 src/fe-common/core/fe-messages.c    |  5 +++--
 src/fe-common/core/module-formats.c |  2 +-
 src/fe-common/irc/fe-events.c       |  8 ++++----
 src/irc/core/irc-servers.c          |  1 +
 src/irc/core/irc-servers.h          |  1 +
 src/irc/core/massjoin.c             | 15 +++++++++++++--
 src/perl/perl-common.c              |  1 +
 8 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/core/nick-rec.h b/src/core/nick-rec.h
index 1463f9f3..53bc7098 100644
--- a/src/core/nick-rec.h
+++ b/src/core/nick-rec.h
@@ -8,6 +8,7 @@ time_t last_check; /* last time gone was checked */
 char *nick;
 char *host;
 char *realname;
+char *account;
 int hops;
 
 /* status in server */
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 5edac26d..4e1c2596 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -349,14 +349,15 @@ static void sig_message_own_private(SERVER_REC *server, const char *msg,
 }
 
 static void sig_message_join(SERVER_REC *server, const char *channel,
-			     const char *nick, const char *address)
+			     const char *nick, const char *address,
+			     const char *account, const char *realname)
 {
 	int level = MSGLEVEL_JOINS;
 
 	ignore_check_plus(server, nick, address, channel, NULL, &level, FALSE);
 
 	printformat(server, channel, level,
-		    TXT_JOIN, nick, address, channel);
+		    TXT_JOIN, nick, address, channel, account, realname);
 }
 
 static void sig_message_part(SERVER_REC *server, const char *channel,
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 0c41e68b..50d8d7cc 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -94,7 +94,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	/* ---- */
 	{ NULL, "Channels", 0 },
 
-	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 3, { 0, 0, 0 } },
+	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 5, { 0, 0, 0, 0, 0 } },
 	{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
 	{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 5, { 0, 0, 0, 0, 0 } },
 	{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 30f00efc..8b3fe3ec 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -113,16 +113,16 @@ static void event_notice(IRC_SERVER_REC *server, const char *data,
 static void event_join(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
-	char *params, *channel, *tmp;
+	char *params, *channel, *tmp, *account, *realname;
 
 	g_return_if_fail(data != NULL);
 
-	params = event_get_params(data, 1, &channel);
+	params = event_get_params(data, 3, &channel, &account, &realname);
 	tmp = strchr(channel, 7); /* ^G does something weird.. */
 	if (tmp != NULL) *tmp = '\0';
 
-	signal_emit("message join", 4, server,
-		    get_visible_target(server, channel), nick, addr);
+	signal_emit("message join", 6, server,
+		    get_visible_target(server, channel), nick, addr, account, realname);
 	g_free(params);
 }
 
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 118f7242..16bc9922 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -239,6 +239,7 @@ static void server_init(IRC_SERVER_REC *server)
 		irc_cap_toggle(server, CAP_SASL, TRUE);
 
 	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
+	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index df0446cb..7539a1fa 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -8,6 +8,7 @@
 #define CAP_LS_VERSION "302"
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"
+#define CAP_EXTENDED_JOIN "extended-join"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index ec63a0b3..4a3f085d 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -35,7 +35,7 @@ static int massjoin_max_joins;
 static void event_join(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *address)
 {
-	char *params, *channel, *ptr;
+	char *params, *channel, *account, *realname, *ptr;
 	IRC_CHANNEL_REC *chanrec;
 	NICK_REC *nickrec;
 	GSList *nicks, *tmp;
@@ -47,7 +47,8 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 		return;
 	}
 
-	params = event_get_params(data, 1, &channel);
+	params = event_get_params(data, 3, &channel, &account, &realname);
+
 	ptr = strchr(channel, 7); /* ^G does something weird.. */
 	if (ptr != NULL) *ptr = '\0';
 
@@ -66,6 +67,11 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 
 	/* add user to nicklist */
 	nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, FALSE, TRUE, NULL);
+	if (*account != '\0' && g_strcmp0(nickrec->account, account) != 0) {
+		g_free(nickrec->account);
+		nickrec->account = g_strdup(account);
+	}
+
         nicklist_set_host(CHANNEL(chanrec), nickrec, address);
 
 	if (chanrec->massjoins == 0) {
@@ -92,6 +98,11 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 		g_slist_free(nicks);
 	}
 
+	if (*realname != '\0' && g_strcmp0(nickrec->realname, realname) != 0) {
+		g_free(nickrec->realname);
+		nickrec->realname = g_strdup(realname);
+	}
+
 	chanrec->massjoins++;
 }
 
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index a2c7ffe4..31650cc4 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -426,6 +426,7 @@ void perl_nick_fill_hash(HV *hv, NICK_REC *nick)
 	(void) hv_store(hv, "nick", 4, new_pv(nick->nick), 0);
 	(void) hv_store(hv, "host", 4, new_pv(nick->host), 0);
 	(void) hv_store(hv, "realname", 8, new_pv(nick->realname), 0);
+	(void) hv_store(hv, "account", 7, new_pv(nick->account), 0);
 	(void) hv_store(hv, "hops", 4, newSViv(nick->hops), 0);
 
 	(void) hv_store(hv, "gone", 4, newSViv(nick->gone), 0);

From 4ae1dbbd0086c976599a22eb9083164839d9ad1c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 15:52:00 +0200
Subject: [PATCH 1020/1650] fix cap queue order

---
 src/irc/core/irc-cap.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 21a27324..31b57094 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -184,6 +184,9 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 
 				avail_caps = 0;
 
+				/* To process the queue in order, we need to reverse the stack once */
+				server->cap_queue = g_slist_reverse(server->cap_queue);
+
 				/* Check whether the cap is supported by the server */
 				for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
 					if (g_hash_table_lookup_extended(server->cap_supported, tmp->data, NULL, NULL)) {

From ad7ad063caee99a800b54ca16ee34dd32147df66 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 15:29:55 +0200
Subject: [PATCH 1021/1650] implement reference counted strings

- on glib >=2.58, use the implementation provided by glib
- otherwise, a hash table will contain the strings
---
 src/core/Makefile.am              |  2 +
 src/core/core.c                   |  3 +
 src/core/meson.build              |  2 +
 src/core/refstrings.c             | 94 +++++++++++++++++++++++++++++++
 src/core/refstrings.h             | 24 ++++++++
 src/fe-text/textbuffer-commands.c |  8 +++
 6 files changed, 133 insertions(+)
 create mode 100644 src/core/refstrings.c
 create mode 100644 src/core/refstrings.h

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index c01b8f10..7cf172ef 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -41,6 +41,7 @@ libcore_a_SOURCES = \
 	queries.c \
 	rawlog.c \
 	recode.c \
+	refstrings.c \
 	servers.c \
 	servers-reconnect.c \
 	servers-setup.c \
@@ -102,6 +103,7 @@ pkginc_core_HEADERS = \
 	queries.h \
 	rawlog.h \
 	recode.h \
+	refstrings.h \
 	servers.h \
 	servers-reconnect.h \
 	servers-setup.h \
diff --git a/src/core/core.c b/src/core/core.c
index 8562836a..878d9eb6 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -43,6 +43,7 @@
 #include <irssi/src/core/rawlog.h>
 #include <irssi/src/core/ignore.h>
 #include <irssi/src/core/recode.h>
+#include <irssi/src/core/refstrings.h>
 
 #include <irssi/src/core/channels.h>
 #include <irssi/src/core/queries.h>
@@ -261,6 +262,7 @@ void core_init(void)
 	nicklist_init();
 
 	chat_commands_init();
+	i_refstr_init();
 	wcwidth_wrapper_init();
 
 	settings_add_str("misc", "ignore_signals", "");
@@ -286,6 +288,7 @@ void core_deinit(void)
 	signal_remove("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);
 
 	wcwidth_wrapper_deinit();
+	i_refstr_deinit();
 	chat_commands_deinit();
 
 	nicklist_deinit();
diff --git a/src/core/meson.build b/src/core/meson.build
index dd5a4d49..b22a16de 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -43,6 +43,7 @@ libcore_a = static_library('core',
     'queries.c',
     'rawlog.c',
     'recode.c',
+    'refstrings.c',
     'servers-reconnect.c',
     'servers-setup.c',
     'servers.c',
@@ -114,6 +115,7 @@ install_headers(
     'queries.h',
     'rawlog.h',
     'recode.h',
+    'refstrings.h',
     'servers-reconnect.h',
     'servers-setup.h',
     'servers.h',
diff --git a/src/core/refstrings.c b/src/core/refstrings.c
new file mode 100644
index 00000000..4b675fa5
--- /dev/null
+++ b/src/core/refstrings.c
@@ -0,0 +1,94 @@
+#include <string.h>
+
+#include <irssi/src/core/refstrings.h>
+
+#if GLIB_CHECK_VERSION(2, 58, 0)
+/* nothing */
+#else
+
+GHashTable *i_refstr_table;
+
+void i_refstr_init(void)
+{
+	i_refstr_table = g_hash_table_new(g_str_hash, g_str_equal);
+}
+
+char *i_refstr_intern(const char *str)
+{
+	char *ret;
+	gpointer rc_p, ret_p;
+	size_t rc;
+
+	if (str == NULL)
+		return NULL;
+
+	if (g_hash_table_lookup_extended(i_refstr_table, str, &ret_p, &rc_p)) {
+		rc = GPOINTER_TO_SIZE(rc_p);
+		ret = ret_p;
+	} else {
+		rc = 0;
+		ret = g_strdup(str);
+	}
+
+	if (rc + 1 <= G_MAXSIZE) {
+		g_hash_table_insert(i_refstr_table, ret, GSIZE_TO_POINTER(rc + 1));
+		return ret;
+	} else {
+		return g_strdup(str);
+	}
+}
+
+void i_refstr_release(char *str)
+{
+	char *ret;
+	gpointer rc_p, ret_p;
+	size_t rc;
+
+	if (str == NULL)
+		return;
+
+	if (g_hash_table_lookup_extended(i_refstr_table, str, &ret_p, &rc_p)) {
+		rc = GPOINTER_TO_SIZE(rc_p);
+		ret = ret_p;
+	} else {
+		rc = 0;
+		ret = NULL;
+	}
+
+	if (ret == str) {
+		if (rc > 1) {
+			g_hash_table_insert(i_refstr_table, ret, GSIZE_TO_POINTER(rc - 1));
+		} else {
+			g_hash_table_remove(i_refstr_table, ret);
+			g_free(ret);
+		}
+	} else {
+		g_free(str);
+	}
+}
+
+void i_refstr_deinit(void)
+{
+	g_hash_table_foreach(i_refstr_table, (GHFunc) g_free, NULL);
+	g_hash_table_destroy(i_refstr_table);
+}
+
+char *i_refstr_table_size_info(void)
+{
+	GHashTableIter iter;
+	void *k_p, *v_p;
+	size_t count, mem;
+	count = 0;
+	mem = 0;
+	g_hash_table_iter_init(&iter, i_refstr_table);
+	while (g_hash_table_iter_next(&iter, &k_p, &v_p)) {
+		char *key = k_p;
+		count++;
+		mem += sizeof(char) * (strlen(key) + 1) + 2 * sizeof(void *);
+	}
+
+	return g_strdup_printf("Shared strings: %ld, %dkB of data", count,
+	          (int) (mem / 1024));
+}
+
+#endif
diff --git a/src/core/refstrings.h b/src/core/refstrings.h
new file mode 100644
index 00000000..79036a20
--- /dev/null
+++ b/src/core/refstrings.h
@@ -0,0 +1,24 @@
+#ifndef IRSSI_CORE_REFSTRINGS_H
+#define IRSSI_CORE_REFSTRINGS_H
+
+#include <glib.h>
+
+#if GLIB_CHECK_VERSION(2, 58, 0)
+
+#define i_refstr_init() /* nothing */
+#define i_refstr_release(str) ((str) == NULL ? NULL : g_ref_string_release(str))
+#define i_refstr_intern(str) ((str) == NULL ? NULL : g_ref_string_new_intern(str))
+#define i_refstr_deinit() /* nothing */
+#define i_refstr_table_size_info() NULL
+
+#else
+
+void i_refstr_init(void);
+char *i_refstr_intern(const char *str);
+void i_refstr_release(char *str);
+void i_refstr_deinit(void);
+char *i_refstr_table_size_info(void);
+
+#endif
+
+#endif
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 318ee077..11c0f123 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -26,6 +26,7 @@
 #include <irssi/src/core/levels.h>
 #include <irssi/src/core/settings.h>
 #include <irssi/src/core/servers.h>
+#include <irssi/src/core/refstrings.h>
 
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/fe-text/gui-windows.h>
@@ -358,6 +359,13 @@ static void cmd_scrollback_status(void)
 	printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP,
 		  "Total: %d lines, %dkB of data",
 		  total_lines, (int)(total_mem / 1024));
+	{
+		char *tmp = i_refstr_table_size_info();
+		if (tmp != NULL)
+			printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP,
+				  "%s", tmp);
+		g_free(tmp);
+	}
 }
 
 static void sig_away_changed(SERVER_REC *server)

From 76bcd01da065ce97acad6d5430218d5f04581e93 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Aug 2019 21:07:27 +0200
Subject: [PATCH 1022/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index d7eaac45..672e5e6c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 21
+#define IRSSI_ABI_VERSION 22
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 47518b4b751fa1fc50798dc28a57bdf8e9e420e9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 00:31:43 +0200
Subject: [PATCH 1023/1650] request the setname capability

---
 src/irc/core/irc-commands.c |  2 ++
 src/irc/core/irc-nicklist.c | 23 +++++++++++++++++++++++
 src/irc/core/irc-servers.c  |  4 +++-
 src/irc/core/irc-servers.h  |  1 +
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 4062b1da..6737748f 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -1045,6 +1045,7 @@ void irc_commands_init(void)
 	command_bind_irc("wallops", NULL, (SIGNAL_FUNC) command_1self);
 	command_bind_irc("kickban", NULL, (SIGNAL_FUNC) cmd_kickban);
 	command_bind_irc("knockout", NULL, (SIGNAL_FUNC) cmd_knockout);
+	command_bind_irc("setname", NULL, (SIGNAL_FUNC) command_1self);
 	command_bind_irc("server purge", NULL, (SIGNAL_FUNC) cmd_server_purge);
 
 	signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
@@ -1111,6 +1112,7 @@ void irc_commands_deinit(void)
 	command_unbind("wait", (SIGNAL_FUNC) cmd_wait);
 	command_unbind("wallops", (SIGNAL_FUNC) command_1self);
 	command_unbind("kickban", (SIGNAL_FUNC) cmd_kickban);
+	command_unbind("setname", (SIGNAL_FUNC) command_1self);
 	command_unbind("knockout", (SIGNAL_FUNC) cmd_knockout);
 	command_unbind("server purge", (SIGNAL_FUNC) cmd_server_purge);
 
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 54a9bd3b..9073ddaa 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -446,6 +446,27 @@ static void event_userhost(SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
+static void event_setname(SERVER_REC *server, const char *data, const char *nick, const char *address)
+{
+	GSList *nicks, *tmp;
+	NICK_REC *rec;
+
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	g_return_if_fail(data != NULL);
+	if (*data == ':') data++;
+
+	nicks = nicklist_get_same(server, nick);
+	for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
+		rec = tmp->next->data;
+
+		g_free(rec->realname);
+		rec->realname = g_strdup(data);
+	}
+	g_slist_free(nicks);
+}
+
 static void sig_usermode(SERVER_REC *server)
 {
 	g_return_if_fail(IS_SERVER(server));
@@ -487,6 +508,7 @@ void irc_nicklist_init(void)
 	signal_add_first("event 437", (SIGNAL_FUNC) event_target_unavailable);
 	signal_add_first("event 302", (SIGNAL_FUNC) event_userhost);
 	signal_add("userhost event", (SIGNAL_FUNC) event_userhost);
+	signal_add("event setname", (SIGNAL_FUNC) event_setname);
 	signal_add("user mode changed", (SIGNAL_FUNC) sig_usermode);
 	signal_add("server connected", (SIGNAL_FUNC) sig_connected);
 }
@@ -509,6 +531,7 @@ void irc_nicklist_deinit(void)
 	signal_remove("event 437", (SIGNAL_FUNC) event_target_unavailable);
 	signal_remove("event 302", (SIGNAL_FUNC) event_userhost);
 	signal_remove("userhost event", (SIGNAL_FUNC) event_userhost);
+	signal_remove("event setname", (SIGNAL_FUNC) event_setname);
 	signal_remove("user mode changed", (SIGNAL_FUNC) sig_usermode);
 	signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
 }
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index e2d96bdb..195ced02 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -229,11 +229,13 @@ static void server_init(IRC_SERVER_REC *server)
 		g_free(cmd);
 	}
 
-	if (conn->sasl_mechanism != SASL_MECHANISM_NONE)
+	if (conn->sasl_mechanism != SASL_MECHANISM_NONE) {
 		irc_cap_toggle(server, CAP_SASL, TRUE);
+	}
 
 	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
 	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
+	irc_cap_toggle(server, CAP_SETNAME, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index cd5a63ff..15ca7452 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -18,6 +18,7 @@
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"
 #define CAP_EXTENDED_JOIN "extended-join"
+#define CAP_SETNAME "draft/setname"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \

From e62e55c0ab83cc643ee7c221dc0610ffecc18537 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 01:05:57 +0200
Subject: [PATCH 1024/1650] show invites of other users when provided

---
 src/fe-common/core/fe-ignore-messages.c | 10 ++++++++++
 src/fe-common/core/fe-messages.c        | 16 ++++++++++++++++
 src/fe-common/core/module-formats.c     |  1 +
 src/fe-common/core/module-formats.h     |  1 +
 src/fe-common/irc/fe-events.c           | 13 +++++++++----
 src/irc/core/channel-events.c           | 10 ++++++++--
 src/irc/core/irc-servers.c              |  1 +
 src/irc/core/irc-servers.h              |  1 +
 8 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/fe-ignore-messages.c b/src/fe-common/core/fe-ignore-messages.c
index 73ebd01f..6bcfb6da 100644
--- a/src/fe-common/core/fe-ignore-messages.c
+++ b/src/fe-common/core/fe-ignore-messages.c
@@ -98,6 +98,14 @@ static void sig_message_invite(SERVER_REC *server, const char *channel,
 		signal_stop();
 }
 
+static void sig_message_invite_other(SERVER_REC *server, const char *channel,
+			      const char *invited, const char *nick, const char *address)
+{
+	if (ignore_check(server, nick, address,
+			 channel, invited, MSGLEVEL_INVITES))
+		signal_stop();
+}
+
 static void sig_message_topic(SERVER_REC *server, const char *channel,
 			      const char *topic,
 			      const char *nick, const char *address)
@@ -118,6 +126,7 @@ void fe_ignore_messages_init(void)
 	signal_add_first("message nick", (SIGNAL_FUNC) sig_message_nick);
 	signal_add_first("message own_nick", (SIGNAL_FUNC) sig_message_own_nick);
 	signal_add_first("message invite", (SIGNAL_FUNC) sig_message_invite);
+	signal_add_first("message invite_other", (SIGNAL_FUNC) sig_message_invite_other);
 	signal_add_first("message topic", (SIGNAL_FUNC) sig_message_topic);
 }
 
@@ -132,5 +141,6 @@ void fe_ignore_messages_deinit(void)
 	signal_remove("message nick", (SIGNAL_FUNC) sig_message_nick);
 	signal_remove("message own_nick", (SIGNAL_FUNC) sig_message_own_nick);
 	signal_remove("message invite", (SIGNAL_FUNC) sig_message_invite);
+	signal_remove("message invite_other", (SIGNAL_FUNC) sig_message_invite_other);
 	signal_remove("message topic", (SIGNAL_FUNC) sig_message_topic);
 }
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 4e1c2596..37c0ef39 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -538,6 +538,20 @@ static void sig_message_invite(SERVER_REC *server, const char *channel,
 	g_free(str);
 }
 
+static void sig_message_invite_other(SERVER_REC *server, const char *channel,
+				     const char *invited, const char *nick, const char *address)
+{
+	char *str;
+	int level = MSGLEVEL_INVITES;
+
+	ignore_check_plus(server, nick, address, channel, invited, &level, FALSE);
+
+	str = show_lowascii(channel);
+	printformat(server, channel, level,
+		    TXT_INVITE_OTHER, invited, nick, str, address);
+	g_free(str);
+}
+
 static void sig_message_topic(SERVER_REC *server, const char *channel,
 			      const char *topic,
 			      const char *nick, const char *address)
@@ -706,6 +720,7 @@ void fe_messages_init(void)
 	signal_add_last("message nick", (SIGNAL_FUNC) sig_message_nick);
 	signal_add_last("message own_nick", (SIGNAL_FUNC) sig_message_own_nick);
 	signal_add_last("message invite", (SIGNAL_FUNC) sig_message_invite);
+	signal_add_last("message invite_other", (SIGNAL_FUNC) sig_message_invite_other);
 	signal_add_last("message topic", (SIGNAL_FUNC) sig_message_topic);
 
 	signal_add("nicklist new", (SIGNAL_FUNC) sig_nicklist_new);
@@ -730,6 +745,7 @@ void fe_messages_deinit(void)
 	signal_remove("message kick", (SIGNAL_FUNC) sig_message_kick);
 	signal_remove("message nick", (SIGNAL_FUNC) sig_message_nick);
 	signal_remove("message own_nick", (SIGNAL_FUNC) sig_message_own_nick);
+	signal_remove("message invite_other", (SIGNAL_FUNC) sig_message_invite_other);
 	signal_remove("message invite", (SIGNAL_FUNC) sig_message_invite);
 	signal_remove("message topic", (SIGNAL_FUNC) sig_message_topic);
 
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 50d8d7cc..2532d82f 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -101,6 +101,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "quit_once", "{channel $3} {channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
 	{ "invite", "{nick $0} invites you to {channel $1}", 3, { 0, 0, 0 } },
 	{ "not_invited", "You have not been invited to a channel!", 0 },
+	{ "invite_other", "{nick $0} has been invited to {channel $2} by {channick_hilight $1}", 4, { 0, 0, 0, 0 } },
 	{ "new_topic", "{nick $0} changed the topic of {channel $1} to: $2", 4, { 0, 0, 0, 0 } },
 	{ "topic_unset", "Topic unset by {nick $0} on {channel $1}", 4, { 0, 0, 0, 0 } },
 	{ "your_nick_changed", "You're now known as {nick $1}", 4, { 0, 0, 0, 0 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 181aa4c2..c5e2c4d1 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -77,6 +77,7 @@ enum {
 	TXT_QUIT_ONCE,
 	TXT_INVITE,
 	TXT_NOT_INVITED,
+	TXT_INVITE_OTHER,
 	TXT_NEW_TOPIC,
 	TXT_TOPIC_UNSET,
 	TXT_YOUR_NICK_CHANGED,
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 8b3fe3ec..c26f2e88 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -252,13 +252,18 @@ static void event_pong(IRC_SERVER_REC *server, const char *data, const char *nic
 static void event_invite(IRC_SERVER_REC *server, const char *data,
 			 const char *nick, const char *addr)
 {
-	char *params, *channel;
+	char *params, *invited, *channel;
 
 	g_return_if_fail(data != NULL);
 
-	params = event_get_params(data, 2, NULL, &channel);
-	signal_emit("message invite", 4,
-		    server, get_visible_target(server, channel), nick, addr);
+	params = event_get_params(data, 2, &invited, &channel);
+	if (server->nick_comp_func(invited, server->nick) == 0) {
+		signal_emit("message invite", 4,
+			    server, get_visible_target(server, channel), nick, addr);
+	} else {
+		signal_emit("message invite_other", 5,
+			    server, get_visible_target(server, channel), invited, nick, addr);
+	}
 	g_free(params);
 }
 
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 7603a14f..3cdfe964 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -336,11 +336,17 @@ static void event_kick(IRC_SERVER_REC *server, const char *data)
 
 static void event_invite(IRC_SERVER_REC *server, const char *data)
 {
-	char *params, *channel, *shortchan;
+	char *params, *nick, *channel, *shortchan;
 
 	g_return_if_fail(data != NULL);
 
-	params = event_get_params(data, 2, NULL, &channel);
+	params = event_get_params(data, 2, &nick, &channel);
+
+	if (server->nick_comp_func(nick, server->nick) != 0) {
+		/* someone else was invited, no need to do anything */
+		g_free(params);
+		return;
+	}
 
 	if (irc_channel_find(server, channel) == NULL) {
                 /* check if we're supposed to autojoin this channel */
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 195ced02..5e98e724 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -236,6 +236,7 @@ static void server_init(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
 	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
 	irc_cap_toggle(server, CAP_SETNAME, TRUE);
+	irc_cap_toggle(server, CAP_INVITE_NOTIFY, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 15ca7452..5313c1d0 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -19,6 +19,7 @@
 #define CAP_MULTI_PREFIX "multi-prefix"
 #define CAP_EXTENDED_JOIN "extended-join"
 #define CAP_SETNAME "draft/setname"
+#define CAP_INVITE_NOTIFY "invite-notify"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \

From 24154ced0db81d0f8db28c9f62ab7ae37bc4b419 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 11 Aug 2019 19:25:53 +0200
Subject: [PATCH 1025/1650] irc message tags support

---
 docs/signals.txt   |  1 +
 src/irc/core/irc.c | 40 +++++++++++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 959387b2..358973db 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -144,6 +144,7 @@ sasl.c
 irc.c:
 
  "server event", SERVER_REC, char *data, char *sender_nick, char *sender_address
+ "server event tags", SERVER_REC, char *data, char *sender_nick, char *sender_address, char *tags
  "event "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
  "default event", SERVER_REC, char *data, char *sender_nick, char *sender_address
  "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 4940fcb4..4adbfcc9 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -32,6 +32,7 @@
 char *current_server_event;
 static int signal_default_event;
 static int signal_server_event;
+static int signal_server_event_tags;
 static int signal_server_incoming;
 
 #ifdef BLOCKING_SOCKETS
@@ -158,6 +159,11 @@ static char *split_nicks(const char *cmd, char **pre, char **nicks, char **post,
 
 	*pre = g_strdup(cmd);
 	*post = *nicks = NULL;
+
+	if (**pre == '@') { /* message-tags */
+		arg++;
+	}
+
 	for (p = *pre; *p != '\0'; p++) {
 		if (*p != ' ')
 			continue;
@@ -342,13 +348,31 @@ static void irc_server_event(IRC_SERVER_REC *server, const char *line,
 	g_free(event);
 }
 
-static char *irc_parse_prefix(char *line, char **nick, char **address)
+static void irc_server_event_tags(IRC_SERVER_REC *server, const char *line,
+				  const char *nick, const char *address, const char *tags)
+{
+	if (*line != '\0')
+		signal_emit_id(signal_server_event, 4, server, line, nick, address);
+}
+
+static char *irc_parse_prefix(char *line, char **nick, char **address, char **tags)
 {
 	char *p;
 
-	*nick = *address = NULL;
+	*nick = *address = *tags = NULL;
 
-	/* :<nick> [["!" <user>] "@" <host>] SPACE */
+	/* ["@" <tags> SPACE] :<nick> [["!" <user>] "@" <host>] SPACE */
+
+	if (*line == '@') {
+		*tags = ++line;
+		while (*line != '\0' && *line != ' ') {
+			line++;
+		}
+		if (*line == ' ') {
+			*line++ = '\0';
+			while (*line == ' ') line++;
+		}
+	}
 
 	if (*line != ':')
 		return line;
@@ -382,14 +406,14 @@ static char *irc_parse_prefix(char *line, char **nick, char **address)
 /* Parse command line sent by server */
 static void irc_parse_incoming_line(IRC_SERVER_REC *server, char *line)
 {
-	char *nick, *address;
+	char *nick, *address, *tags;
 
 	g_return_if_fail(server != NULL);
 	g_return_if_fail(line != NULL);
 
-	line = irc_parse_prefix(line, &nick, &address);
-	if (*line != '\0')
-		signal_emit_id(signal_server_event, 4, server, line, nick, address);
+	line = irc_parse_prefix(line, &nick, &address, &tags);
+	if (*line != '\0' || tags != NULL)
+		signal_emit_id(signal_server_event_tags, 5, server, line, nick, address, tags);
 }
 
 /* input function: handle incoming server messages */
@@ -441,12 +465,14 @@ static void irc_init_server(IRC_SERVER_REC *server)
 void irc_irc_init(void)
 {
 	signal_add("server event", (SIGNAL_FUNC) irc_server_event);
+	signal_add("server event tags", (SIGNAL_FUNC) irc_server_event_tags);
 	signal_add("server connected", (SIGNAL_FUNC) irc_init_server);
 	signal_add("server incoming", (SIGNAL_FUNC) irc_parse_incoming_line);
 
 	current_server_event = NULL;
 	signal_default_event = signal_get_uniq_id("default event");
 	signal_server_event = signal_get_uniq_id("server event");
+	signal_server_event_tags = signal_get_uniq_id("server event tags");
 	signal_server_incoming = signal_get_uniq_id("server incoming");
 }
 

From eb3a44a71328fd600450782a042fd075434eec55 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Aug 2019 10:55:48 +0200
Subject: [PATCH 1026/1650] clarifying comment

---
 src/irc/core/irc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 4adbfcc9..3c7e30c0 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -160,7 +160,10 @@ static char *split_nicks(const char *cmd, char **pre, char **nicks, char **post,
 	*pre = g_strdup(cmd);
 	*post = *nicks = NULL;
 
-	if (**pre == '@') { /* message-tags */
+	if (**pre == '@') {
+		/* the message-tags "add" one space separated argument
+		   in front of the non message-tagged IRC commands. So
+		   the nicks are now off-set by one to the right. */
 		arg++;
 	}
 

From 2576064982d2090f868e89e5315ee8ebfd8ed207 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Aug 2019 10:57:54 +0200
Subject: [PATCH 1027/1650] add missing signal_remove

---
 src/irc/core/irc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 3c7e30c0..2f520328 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -482,6 +482,7 @@ void irc_irc_init(void)
 void irc_irc_deinit(void)
 {
 	signal_remove("server event", (SIGNAL_FUNC) irc_server_event);
+	signal_remove("server event tags", (SIGNAL_FUNC) irc_server_event_tags);
 	signal_remove("server connected", (SIGNAL_FUNC) irc_init_server);
 	signal_remove("server incoming", (SIGNAL_FUNC) irc_parse_incoming_line);
 }

From 0f361d26733b13bb57acc3817995abe5985e36c3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Aug 2019 15:37:20 +0200
Subject: [PATCH 1028/1650] refactor quit message into a separate function

---
 src/fe-common/core/fe-messages.c | 62 +++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 4e1c2596..85200419 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -372,50 +372,57 @@ static void sig_message_part(SERVER_REC *server, const char *channel,
 		    TXT_PART, nick, address, channel, reason);
 }
 
-static void sig_message_quit(SERVER_REC *server, const char *nick,
-			     const char *address, const char *reason)
+static void spread_server_message_to_windows(SERVER_REC *server, gboolean once,
+					     gboolean in_query,
+					     int base_level,
+					     int txt, int txt_once,
+					     const char *nick, const char *address,
+					     const char *data,
+					     const char *ignore_data
+					    )
 {
 	WINDOW_REC *window;
 	GString *chans;
 	GSList *tmp, *windows;
 	char *print_channel;
-	int once, count, level = MSGLEVEL_QUITS;
+	int count, level = base_level;
 
-	if (ignore_check_plus(server, nick, address, NULL, reason, &level, TRUE))
+	if (ignore_check_plus(server, nick, address, NULL, ignore_data, &level, TRUE))
 		return;
 
 	print_channel = NULL;
-	once = settings_get_bool("show_quit_once");
 
 	count = 0; windows = NULL;
 	chans = g_string_new(NULL);
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *rec;
-		level = MSGLEVEL_QUITS;
+		level = base_level;
 		rec = tmp->data;
 
-		if (!nicklist_find(rec, nick))
+		if (!nicklist_find(rec, nick)) {
 			continue;
+		}
 
 		if (ignore_check_plus(server, nick, address, rec->visible_name,
-				      reason, &level, TRUE)) {
+				      ignore_data, &level, TRUE)) {
 			count++;
 			continue;
 		}
 
 		if (print_channel == NULL ||
-		    active_win->active == (WI_ITEM_REC *) rec)
+		    active_win->active == (WI_ITEM_REC *) rec) {
 			print_channel = rec->visible_name;
+		}
 
-		if (once)
+		if (once) {
 			g_string_append_printf(chans, "%s,", rec->visible_name);
-		else {
+		} else {
 			window = window_item_window((WI_ITEM_REC *) rec);
 			if (g_slist_find(windows, window) == NULL) {
-				windows = g_slist_append(windows, window);
+				windows = g_slist_prepend(windows, window);
 				printformat(server, rec->visible_name,
 					    level,
-					    TXT_QUIT, nick, address, reason,
+					    txt, nick, address, data,
 					    rec->visible_name);
 			}
 		}
@@ -423,26 +430,41 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 	}
 	g_slist_free(windows);
 
-	if (!once) {
+	if (!once && in_query) {
 		/* check if you had query with the nick and
-		   display the quit there too */
+		   display the change there too */
 		QUERY_REC *query = query_find(server, nick);
 		if (query != NULL) {
 			printformat(server, nick, level,
-				    TXT_QUIT, nick, address, reason, "");
+				    txt, nick, address, data, "");
 		}
 	}
 
 	if (once || count == 0) {
-		if (chans->len > 0)
+		if (chans->len > 0) {
 			g_string_truncate(chans, chans->len-1);
-		printformat(server, print_channel, MSGLEVEL_QUITS,
-			    count <= 1 ? TXT_QUIT : TXT_QUIT_ONCE,
-			    nick, address, reason, chans->str);
+		}
+		printformat(server, print_channel, base_level,
+			    count <= 1 ? txt : txt_once,
+			    nick, address, data, chans->str);
 	}
 	g_string_free(chans, TRUE);
 }
 
+static void sig_message_quit(SERVER_REC *server, const char *nick,
+			     const char *address, const char *reason)
+{
+	spread_server_message_to_windows(
+		server,
+		settings_get_bool("show_quit_once"),
+		TRUE,
+		MSGLEVEL_QUITS,
+		TXT_QUIT, TXT_QUIT_ONCE,
+		nick, address, reason,
+		reason
+	);
+}
+
 static void sig_message_kick(SERVER_REC *server, const char *channel,
 			     const char *nick, const char *kicker,
 			     const char *address, const char *reason)

From da9adec47fc3a11f27f0221232c46f9f6b0d0b11 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 12 Aug 2019 23:41:18 +0200
Subject: [PATCH 1029/1650] sending of tag messages and customisable maximum
 irc message length

---
 src/irc/core/irc-channels.c      |  2 +-
 src/irc/core/irc-servers.c       | 17 +++++++--
 src/irc/core/irc-servers.h       |  4 +++
 src/irc/core/irc.c               | 60 ++++++++++++++++++++++++--------
 src/irc/notifylist/notify-ison.c |  2 +-
 src/perl/irc/Irc.xs              |  2 ++
 6 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index 27f8f4b2..6d38c560 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -142,7 +142,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 			/* don't try to send too long lines
 			   make sure it's not longer than 510
 			   so 510 - strlen("JOIN ") = 505 */
-			if (cmdlen < MAX_IRC_MESSAGE_LEN - 5 /* strlen("JOIN ") */)
+			if (cmdlen < server->max_message_len - 5 /* strlen("JOIN ") */)
 				continue;
 		}
 		if (outchans->len > 0) {
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 5e98e724..38afb749 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -202,7 +202,7 @@ static char **split_message(SERVER_REC *server, const char *target,
 
 	/* length calculation shamelessly stolen from splitlong_safe.pl */
 	return split_line(SERVER(server), msg, target,
-			  MAX_IRC_MESSAGE_LEN - strlen(":! PRIVMSG  :") -
+			  ircserver->max_message_len - strlen(":! PRIVMSG  :") -
 			  strlen(ircserver->nick) - MAX_USERHOST_LEN -
 			  strlen(target));
 }
@@ -233,6 +233,7 @@ static void server_init(IRC_SERVER_REC *server)
 		irc_cap_toggle(server, CAP_SASL, TRUE);
 	}
 
+	irc_cap_toggle(server, CAP_MAXLINE, TRUE);
 	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
 	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
 	irc_cap_toggle(server, CAP_SETNAME, TRUE);
@@ -314,6 +315,8 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 			server->connrec->use_tls ? 6697 : 6667;
 	}
 
+	server->max_message_len = MAX_IRC_MESSAGE_LEN;
+
 	server->cmd_queue_speed = ircconn->cmd_queue_speed > 0 ?
 		ircconn->cmd_queue_speed : settings_get_time("cmd_queue_speed");
 	server->max_cmds_at_once = ircconn->max_cmds_at_once > 0 ?
@@ -479,6 +482,14 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
 	g_free(recoded);
 }
 
+static void cap_maxline(IRC_SERVER_REC *server)
+{
+	int maxline = atoi(g_hash_table_lookup(server->cap_supported, CAP_MAXLINE));
+	if (maxline >= MAX_IRC_MESSAGE_LEN + 2 /* 2 bytes for CR+LF */) {
+		server->max_message_len = maxline - 2;
+	}
+}
+
 void irc_server_send_action(IRC_SERVER_REC *server, const char *target, const char *data)
 {
 	char *recoded;
@@ -496,7 +507,7 @@ char **irc_server_split_action(IRC_SERVER_REC *server, const char *target,
 	g_return_val_if_fail(data != NULL, NULL);
 
 	return split_line(SERVER(server), data, target,
-			  MAX_IRC_MESSAGE_LEN - strlen(":! PRIVMSG  :\001ACTION \001") -
+			  server->max_message_len - strlen(":! PRIVMSG  :\001ACTION \001") -
 			  strlen(server->nick) - MAX_USERHOST_LEN -
 			  strlen(target));
 }
@@ -1033,6 +1044,7 @@ void irc_servers_init(void)
 	signal_add_first("server connected", (SIGNAL_FUNC) sig_connected);
 	signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
 	signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit);
+	signal_add("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_add("event 001", (SIGNAL_FUNC) event_connected);
 	signal_add("event 004", (SIGNAL_FUNC) event_server_info);
 	signal_add("event 005", (SIGNAL_FUNC) event_isupport);
@@ -1060,6 +1072,7 @@ void irc_servers_deinit(void)
 	signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
 	signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
+	signal_remove("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_remove("event 001", (SIGNAL_FUNC) event_connected);
 	signal_remove("event 004", (SIGNAL_FUNC) event_server_info);
 	signal_remove("event 005", (SIGNAL_FUNC) event_isupport);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 5313c1d0..09936e91 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -15,6 +15,8 @@
 #define MAX_IRC_USER_TAGS_LEN 4094
 
 #define CAP_LS_VERSION "302"
+#define CAP_MAXLINE "oragono.io/maxline-2"
+#define CAP_MESSAGE_TAGS "message-tags"
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"
 #define CAP_EXTENDED_JOIN "extended-join"
@@ -58,6 +60,8 @@ struct _IRC_SERVER_CONNECT_REC {
 struct _IRC_SERVER_REC {
 #include <irssi/src/core/server-rec.h>
 
+	int max_message_len; /* Maximum message length, default = 510 = 512 - 2 (for CR+LF) */
+
 	/* For deciding if event should be redirected */
 	GSList *redirects;
         GSList *redirect_queue; /* should be updated from redirect_next each time cmdqueue is updated */
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 2f520328..51770aaf 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -49,8 +49,9 @@ static void strip_params_colon(char *const);
 void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 		       int send_now, int immediate, int raw)
 {
-	char str[513];
+	GString *str;
 	int len;
+	gboolean server_supports_tag;
 
 	g_return_if_fail(server != NULL);
 	g_return_if_fail(cmd != NULL);
@@ -58,35 +59,66 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 	if (server->connection_lost)
 		return;
 
-	len = strlen(cmd);
+	str = g_string_sized_new(MAX_IRC_USER_TAGS_LEN + 2 /* `@'+SPACE */ +
+				 server->max_message_len + 2 /* CR+LF */ + 1 /* `\0' */);
+
 	if (server->cmdcount == 0)
 		irc_servers_start_cmd_timeout();
 	server->cmdcount++;
 
 	if (!raw) {
+		const char *tmp = cmd;
+
+		server_supports_tag = server->cap_supported != NULL &&
+			g_hash_table_lookup_extended(server->cap_supported, CAP_MESSAGE_TAGS, NULL, NULL);
+
+		if (*cmd == '@' && server_supports_tag) {
+			const char *end;
+
+			while (*tmp != ' ' && *tmp != '\0')
+				tmp++;
+
+			end = tmp;
+
+			if (tmp - cmd > MAX_IRC_USER_TAGS_LEN) {
+				g_warning("irc_send_cmd_full(); tags too long(%ld)", tmp - cmd);
+				while (tmp - cmd > MAX_IRC_USER_TAGS_LEN && cmd != tmp - 1) tmp--;
+				while (*tmp != ',' && cmd != tmp - 1) tmp--;
+			}
+			if (cmd != tmp)
+				g_string_append_len(str, cmd, tmp - cmd);
+
+			tmp = end;
+			while (*tmp == ' ') tmp++;
+
+			if (*tmp != '\0' && str->len > 0)
+				g_string_append_c(str, ' ');
+		}
+		len = strlen(tmp);
+
 		/* check that we don't send any longer commands
 		   than 510 bytes (2 bytes for CR+LF) */
-		strncpy(str, cmd, 510);
-		if (len > 510) len = 510;
-		str[len] = '\0';
-                cmd = str;
+		g_string_append_len(str, tmp, len > server->max_message_len ?
+				    server->max_message_len : len);
+	} else {
+		g_string_append(str, cmd);
 	}
 
 	if (send_now) {
-		rawlog_output(server->rawlog, cmd);
-		server_redirect_command(server, cmd, server->redirect_next);
+		rawlog_output(server->rawlog, str->str);
+		server_redirect_command(server, str->str, server->redirect_next);
                 server->redirect_next = NULL;
 	}
 
 	if (!raw) {
                 /* Add CR+LF to command */
-		str[len++] = 13;
-		str[len++] = 10;
-		str[len] = '\0';
+		g_string_append_c(str, 13);
+		g_string_append_c(str, 10);
 	}
 
 	if (send_now) {
-                irc_server_send_data(server, cmd, len);
+                irc_server_send_data(server, str->str, str->len);
+		g_string_free(str, TRUE);
 	} else {
 
 		/* add to queue */
@@ -94,10 +126,10 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 			server->cmdqueue = g_slist_prepend(server->cmdqueue,
 							   server->redirect_next);
 			server->cmdqueue = g_slist_prepend(server->cmdqueue,
-							   g_strdup(cmd));
+							   g_string_free(str, FALSE));
 		} else {
 			server->cmdqueue = g_slist_append(server->cmdqueue,
-							  g_strdup(cmd));
+							  g_string_free(str, FALSE));
 			server->cmdqueue = g_slist_append(server->cmdqueue,
 							  server->redirect_next);
 		}
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index 4fb9315a..910c0b73 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -131,7 +131,7 @@ static void notifylist_timeout_server(IRC_SERVER_REC *server)
 
 		len = strlen(nick);
 
-		if (cmd->len+len+1 > MAX_IRC_MESSAGE_LEN)
+		if (cmd->len+len+1 > server->max_message_len)
                         ison_send(server, cmd);
 
 		g_string_append_printf(cmd, "%s ", nick);
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 3bf81f9a..f64d9728 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -24,6 +24,8 @@ static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 	(void) hv_store(hv, "usermode", 8, new_pv(server->usermode), 0);
 	(void) hv_store(hv, "userhost", 8, new_pv(server->userhost), 0);
 
+	(void) hv_store(hv, "max_message_len", 15, newSViv(server->max_message_len), 0);
+
 	(void) hv_store(hv, "max_cmds_at_once", 16, newSViv(server->max_cmds_at_once), 0);
 	(void) hv_store(hv, "cmd_queue_speed", 15, newSViv(server->cmd_queue_speed), 0);
 	(void) hv_store(hv, "max_query_chans", 15, newSViv(server->max_query_chans), 0);

From 200020da93830dc9cfd254b7984a84d25687e008 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Aug 2019 21:17:53 +0200
Subject: [PATCH 1030/1650] use better number parsing

---
 src/irc/core/irc-servers.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 38afb749..044d676e 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -484,8 +484,10 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
 
 static void cap_maxline(IRC_SERVER_REC *server)
 {
-	int maxline = atoi(g_hash_table_lookup(server->cap_supported, CAP_MAXLINE));
-	if (maxline >= MAX_IRC_MESSAGE_LEN + 2 /* 2 bytes for CR+LF */) {
+	unsigned int maxline = 0;
+	if (parse_uint(g_hash_table_lookup(server->cap_supported, CAP_MAXLINE),
+		       NULL, 10, &maxline) &&
+	    maxline >= MAX_IRC_MESSAGE_LEN + 2 /* 2 bytes for CR+LF */) {
 		server->max_message_len = maxline - 2;
 	}
 }

From 6c370994078969225185bc38e1075b999b9f6bbc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Aug 2019 16:39:26 +0200
Subject: [PATCH 1031/1650] more variables

---
 src/irc/core/irc-servers.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 044d676e..2d26c271 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -485,8 +485,16 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
 static void cap_maxline(IRC_SERVER_REC *server)
 {
 	unsigned int maxline = 0;
-	if (parse_uint(g_hash_table_lookup(server->cap_supported, CAP_MAXLINE),
-		       NULL, 10, &maxline) &&
+	gboolean parse_successful = FALSE;
+	const char *maxline_str;
+
+	maxline_str = g_hash_table_lookup(server->cap_supported, CAP_MAXLINE);
+	if (maxline_str != NULL) {
+		parse_successful = parse_uint(maxline_str, NULL, 10, &maxline);
+
+	}
+
+	if (parse_successful &&
 	    maxline >= MAX_IRC_MESSAGE_LEN + 2 /* 2 bytes for CR+LF */) {
 		server->max_message_len = maxline - 2;
 	}

From 61d215acdd66379d8126bdd982bbfd64a7c71023 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Aug 2019 17:45:13 +0200
Subject: [PATCH 1032/1650] support cap away-notify

---
 src/fe-common/irc/fe-events.c       | 17 ++++++++++++++
 src/fe-common/irc/fe-irc-messages.c | 36 +++++++++++++++++++++++++++++
 src/fe-common/irc/module-formats.c  |  2 ++
 src/fe-common/irc/module-formats.h  |  2 ++
 src/irc/core/irc-nicklist.c         | 16 +++++++++++++
 src/irc/core/irc-servers.c          |  1 +
 src/irc/core/irc-servers.h          |  1 +
 7 files changed, 75 insertions(+)

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index c26f2e88..aa8eaf81 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -237,6 +237,21 @@ static void event_mode(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
+static void event_away_notify(IRC_SERVER_REC *server, const char *data,
+			      const char *nick, const char *addr)
+{
+	char *params, *awaymsg;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 1 | PARAM_FLAG_GETREST,
+				  &awaymsg);
+
+	signal_emit("message irc away", 4,
+		    server, nick, addr, awaymsg);
+	g_free(params);
+}
+
 static void event_pong(IRC_SERVER_REC *server, const char *data, const char *nick)
 {
 	char *params, *host, *reply;
@@ -458,6 +473,7 @@ void fe_events_init(void)
 	signal_add("event error", (SIGNAL_FUNC) event_error);
 	signal_add("event wallops", (SIGNAL_FUNC) event_wallops);
 	signal_add("event silence", (SIGNAL_FUNC) event_silence);
+	signal_add("event away", (SIGNAL_FUNC) event_away_notify);
 
 	signal_add("default event", (SIGNAL_FUNC) event_received);
 
@@ -487,6 +503,7 @@ void fe_events_deinit(void)
 	signal_remove("event error", (SIGNAL_FUNC) event_error);
 	signal_remove("event wallops", (SIGNAL_FUNC) event_wallops);
 	signal_remove("event silence", (SIGNAL_FUNC) event_silence);
+	signal_remove("event away", (SIGNAL_FUNC) event_away_notify);
 
 	signal_remove("default event", (SIGNAL_FUNC) event_received);
 
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index ddd4311e..6218f6ac 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -295,9 +295,43 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
 		    IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, oldtarget);
 }
 
+static void sig_message_irc_away(IRC_SERVER_REC *server, const char *nick,
+				 const char *addr, const char *awaymsg)
+{
+	GSList *tmp, *windows;
+
+	if (!settings_get_bool("away_notify_public"))
+		return;
+
+	windows = NULL;
+	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
+		int level = MSGLEVEL_CRAP;
+		CHANNEL_REC *channel = tmp->data;
+		WINDOW_REC *window =
+			window_item_window((WI_ITEM_REC *) channel);
+
+		if (nicklist_find(channel, nick) == NULL ||
+		    g_slist_find(windows, window) != NULL)
+			continue;
+
+		if (ignore_check_plus(SERVER(server), nick, addr,
+				      channel->visible_name, awaymsg, &level, TRUE))
+			continue;
+
+		windows = g_slist_prepend(windows, window);
+
+		printformat(server, channel->visible_name, level,
+			    *awaymsg == '\0' ? IRCTXT_NOTIFY_UNAWAY_CHANNEL :
+			    IRCTXT_NOTIFY_AWAY_CHANNEL,
+			    nick, addr, channel->visible_name, awaymsg);
+	}
+	g_slist_free(windows);
+}
+
 void fe_irc_messages_init(void)
 {
 	settings_add_bool("misc", "notice_channel_context", TRUE);
+	settings_add_bool("lookandfeel", "away_notify_public", FALSE);
 
         signal_add_last("message own_public", (SIGNAL_FUNC) sig_message_own_public);
         signal_add_last("message irc op_public", (SIGNAL_FUNC) sig_message_irc_op_public);
@@ -308,6 +342,7 @@ void fe_irc_messages_init(void)
         signal_add_last("message irc notice", (SIGNAL_FUNC) sig_message_irc_notice);
         signal_add_last("message irc own_ctcp", (SIGNAL_FUNC) sig_message_own_ctcp);
         signal_add_last("message irc ctcp", (SIGNAL_FUNC) sig_message_irc_ctcp);
+        signal_add_last("message irc away", (SIGNAL_FUNC) sig_message_irc_away);
 }
 
 void fe_irc_messages_deinit(void)
@@ -321,4 +356,5 @@ void fe_irc_messages_deinit(void)
         signal_remove("message irc notice", (SIGNAL_FUNC) sig_message_irc_notice);
         signal_remove("message irc own_ctcp", (SIGNAL_FUNC) sig_message_own_ctcp);
         signal_remove("message irc ctcp", (SIGNAL_FUNC) sig_message_irc_ctcp);
+        signal_remove("message irc away", (SIGNAL_FUNC) sig_message_irc_away);
 }
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index a0f6bd29..50f39d8e 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -95,6 +95,8 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "away", "You have been marked as being away", 0 },
 	{ "unaway", "You are no longer marked as being away", 0 },
 	{ "nick_away", "{nick $0} is away: $1", 2, { 0, 0 } },
+	{ "notify_away_channel", "{channick $0} {chanhost $1} is now away: {reason $3}", 4, { 0, 0, 0, 0 } },
+	{ "notify_unaway_channel", "{channick_hilight $0} {chanhost $1} is no longer away", 3, { 0, 0, 0 } },
 	{ "no_such_nick", "{nick $0}: No such nick/channel", 1, { 0 } },
 	{ "nick_in_use", "Nick {nick $0} is already in use", 1, { 0 } },
 	{ "nick_unavailable", "Nick {nick $0} is temporarily unavailable", 1, { 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 66a9804f..b9a89bc0 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -71,6 +71,8 @@ enum {
 	IRCTXT_AWAY,
 	IRCTXT_UNAWAY,
 	IRCTXT_NICK_AWAY,
+	IRCTXT_NOTIFY_AWAY_CHANNEL,
+	IRCTXT_NOTIFY_UNAWAY_CHANNEL,
 	IRCTXT_NO_SUCH_NICK,
 	IRCTXT_NICK_IN_USE,
 	IRCTXT_NICK_UNAVAILABLE,
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 9073ddaa..28ac6368 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -467,6 +467,20 @@ static void event_setname(SERVER_REC *server, const char *data, const char *nick
 	g_slist_free(nicks);
 }
 
+static void event_away_notify(IRC_SERVER_REC *server, const char *data, const char *nick, const char *add)
+{
+	char *params, *awaymsg;
+
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 1 | PARAM_FLAG_GETREST, &awaymsg);
+	nicklist_update_flags(SERVER(server), nick, *awaymsg != '\0', -1);
+	g_free(params);
+}
+
 static void sig_usermode(SERVER_REC *server)
 {
 	g_return_if_fail(IS_SERVER(server));
@@ -507,6 +521,7 @@ void irc_nicklist_init(void)
 	signal_add_first("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_add_first("event 437", (SIGNAL_FUNC) event_target_unavailable);
 	signal_add_first("event 302", (SIGNAL_FUNC) event_userhost);
+	signal_add_first("event away", (SIGNAL_FUNC) event_away_notify);
 	signal_add("userhost event", (SIGNAL_FUNC) event_userhost);
 	signal_add("event setname", (SIGNAL_FUNC) event_setname);
 	signal_add("user mode changed", (SIGNAL_FUNC) sig_usermode);
@@ -530,6 +545,7 @@ void irc_nicklist_deinit(void)
 	signal_remove("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_remove("event 437", (SIGNAL_FUNC) event_target_unavailable);
 	signal_remove("event 302", (SIGNAL_FUNC) event_userhost);
+	signal_remove("event away", (SIGNAL_FUNC) event_away_notify);
 	signal_remove("userhost event", (SIGNAL_FUNC) event_userhost);
 	signal_remove("event setname", (SIGNAL_FUNC) event_setname);
 	signal_remove("user mode changed", (SIGNAL_FUNC) sig_usermode);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 5e98e724..16095ed3 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -237,6 +237,7 @@ static void server_init(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
 	irc_cap_toggle(server, CAP_SETNAME, TRUE);
 	irc_cap_toggle(server, CAP_INVITE_NOTIFY, TRUE);
+	irc_cap_toggle(server, CAP_AWAY_NOTIFY, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 5313c1d0..3fccfe9e 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -20,6 +20,7 @@
 #define CAP_EXTENDED_JOIN "extended-join"
 #define CAP_SETNAME "draft/setname"
 #define CAP_INVITE_NOTIFY "invite-notify"
+#define CAP_AWAY_NOTIFY "away-notify"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \

From 5f13614d47198dd7013502ef5c4ead0cffa87978 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Aug 2019 22:52:38 +0200
Subject: [PATCH 1033/1650] move away message to fe-common/core

---
 src/fe-common/core/fe-messages.c    | 22 ++++++++++++++++++
 src/fe-common/core/module-formats.c |  2 ++
 src/fe-common/core/module-formats.h |  2 ++
 src/fe-common/irc/fe-events.c       |  2 +-
 src/fe-common/irc/fe-irc-messages.c | 36 -----------------------------
 src/fe-common/irc/module-formats.c  |  2 --
 src/fe-common/irc/module-formats.h  |  2 --
 7 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 308680d6..9545af73 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -587,6 +587,25 @@ static void sig_message_topic(SERVER_REC *server, const char *channel,
 		    nick, channel, topic, address);
 }
 
+static void sig_message_away_notify(SERVER_REC *server, const char *nick,
+				    const char *addr, const char *awaymsg)
+{
+	int txt = *awaymsg == '\0' ? TXT_NOTIFY_UNAWAY_CHANNEL :
+		TXT_NOTIFY_AWAY_CHANNEL;
+
+	if (!settings_get_bool("away_notify_public"))
+		return;
+
+	spread_server_message_to_windows(server, FALSE,
+					 FALSE,
+					 MSGLEVEL_CRAP,
+					 txt, txt,
+					 nick, addr,
+					 awaymsg,
+					 awaymsg
+					);
+}
+
 static int printnick_exists(NICK_REC *first, NICK_REC *ignore,
 			    const char *nick)
 {
@@ -730,6 +749,7 @@ void fe_messages_init(void)
 	settings_add_bool("lookandfeel", "print_active_channel", FALSE);
 	settings_add_bool("lookandfeel", "show_quit_once", FALSE);
 	settings_add_bool("lookandfeel", "show_own_nickchange_once", FALSE);
+	settings_add_bool("lookandfeel", "away_notify_public", FALSE);
 
 	signal_add_last("message public", (SIGNAL_FUNC) sig_message_public);
 	signal_add_last("message private", (SIGNAL_FUNC) sig_message_private);
@@ -744,6 +764,7 @@ void fe_messages_init(void)
 	signal_add_last("message invite", (SIGNAL_FUNC) sig_message_invite);
 	signal_add_last("message invite_other", (SIGNAL_FUNC) sig_message_invite_other);
 	signal_add_last("message topic", (SIGNAL_FUNC) sig_message_topic);
+	signal_add_last("message away_notify", (SIGNAL_FUNC) sig_message_away_notify);
 
 	signal_add("nicklist new", (SIGNAL_FUNC) sig_nicklist_new);
 	signal_add("nicklist remove", (SIGNAL_FUNC) sig_nicklist_remove);
@@ -770,6 +791,7 @@ void fe_messages_deinit(void)
 	signal_remove("message invite_other", (SIGNAL_FUNC) sig_message_invite_other);
 	signal_remove("message invite", (SIGNAL_FUNC) sig_message_invite);
 	signal_remove("message topic", (SIGNAL_FUNC) sig_message_topic);
+	signal_remove("message away_notify", (SIGNAL_FUNC) sig_message_away_notify);
 
 	signal_remove("nicklist new", (SIGNAL_FUNC) sig_nicklist_new);
 	signal_remove("nicklist remove", (SIGNAL_FUNC) sig_nicklist_remove);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 2532d82f..83eae589 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -106,6 +106,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "topic_unset", "Topic unset by {nick $0} on {channel $1}", 4, { 0, 0, 0, 0 } },
 	{ "your_nick_changed", "You're now known as {nick $1}", 4, { 0, 0, 0, 0 } },
 	{ "nick_changed", "{channick $0} is now known as {channick_hilight $1}", 4, { 0, 0, 0, 0 } },
+	{ "notify_away_channel", "{channick $0} {chanhost $1} is now away: {reason $2}", 4, { 0, 0, 0, 0 } },
+	{ "notify_unaway_channel", "{channick_hilight $0} {chanhost $1} is no longer away", 4, { 0, 0, 0, 0 } },
 	{ "talking_in", "You are now talking in {channel $0}", 1, { 0 } },
 	{ "not_in_channels", "You are not on any channels", 0 },
 	{ "current_channel", "Current channel {channel $0}", 1, { 0 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index c5e2c4d1..74a4dfd9 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -82,6 +82,8 @@ enum {
 	TXT_TOPIC_UNSET,
 	TXT_YOUR_NICK_CHANGED,
 	TXT_NICK_CHANGED,
+	TXT_NOTIFY_AWAY_CHANNEL,
+	TXT_NOTIFY_UNAWAY_CHANNEL,
 	TXT_TALKING_IN,
 	TXT_NOT_IN_CHANNELS,
 	TXT_CURRENT_CHANNEL,
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index aa8eaf81..4608b949 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -247,7 +247,7 @@ static void event_away_notify(IRC_SERVER_REC *server, const char *data,
 	params = event_get_params(data, 1 | PARAM_FLAG_GETREST,
 				  &awaymsg);
 
-	signal_emit("message irc away", 4,
+	signal_emit("message away_notify", 4,
 		    server, nick, addr, awaymsg);
 	g_free(params);
 }
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 6218f6ac..ddd4311e 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -295,43 +295,9 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
 		    IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, oldtarget);
 }
 
-static void sig_message_irc_away(IRC_SERVER_REC *server, const char *nick,
-				 const char *addr, const char *awaymsg)
-{
-	GSList *tmp, *windows;
-
-	if (!settings_get_bool("away_notify_public"))
-		return;
-
-	windows = NULL;
-	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
-		int level = MSGLEVEL_CRAP;
-		CHANNEL_REC *channel = tmp->data;
-		WINDOW_REC *window =
-			window_item_window((WI_ITEM_REC *) channel);
-
-		if (nicklist_find(channel, nick) == NULL ||
-		    g_slist_find(windows, window) != NULL)
-			continue;
-
-		if (ignore_check_plus(SERVER(server), nick, addr,
-				      channel->visible_name, awaymsg, &level, TRUE))
-			continue;
-
-		windows = g_slist_prepend(windows, window);
-
-		printformat(server, channel->visible_name, level,
-			    *awaymsg == '\0' ? IRCTXT_NOTIFY_UNAWAY_CHANNEL :
-			    IRCTXT_NOTIFY_AWAY_CHANNEL,
-			    nick, addr, channel->visible_name, awaymsg);
-	}
-	g_slist_free(windows);
-}
-
 void fe_irc_messages_init(void)
 {
 	settings_add_bool("misc", "notice_channel_context", TRUE);
-	settings_add_bool("lookandfeel", "away_notify_public", FALSE);
 
         signal_add_last("message own_public", (SIGNAL_FUNC) sig_message_own_public);
         signal_add_last("message irc op_public", (SIGNAL_FUNC) sig_message_irc_op_public);
@@ -342,7 +308,6 @@ void fe_irc_messages_init(void)
         signal_add_last("message irc notice", (SIGNAL_FUNC) sig_message_irc_notice);
         signal_add_last("message irc own_ctcp", (SIGNAL_FUNC) sig_message_own_ctcp);
         signal_add_last("message irc ctcp", (SIGNAL_FUNC) sig_message_irc_ctcp);
-        signal_add_last("message irc away", (SIGNAL_FUNC) sig_message_irc_away);
 }
 
 void fe_irc_messages_deinit(void)
@@ -356,5 +321,4 @@ void fe_irc_messages_deinit(void)
         signal_remove("message irc notice", (SIGNAL_FUNC) sig_message_irc_notice);
         signal_remove("message irc own_ctcp", (SIGNAL_FUNC) sig_message_own_ctcp);
         signal_remove("message irc ctcp", (SIGNAL_FUNC) sig_message_irc_ctcp);
-        signal_remove("message irc away", (SIGNAL_FUNC) sig_message_irc_away);
 }
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 50f39d8e..a0f6bd29 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -95,8 +95,6 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "away", "You have been marked as being away", 0 },
 	{ "unaway", "You are no longer marked as being away", 0 },
 	{ "nick_away", "{nick $0} is away: $1", 2, { 0, 0 } },
-	{ "notify_away_channel", "{channick $0} {chanhost $1} is now away: {reason $3}", 4, { 0, 0, 0, 0 } },
-	{ "notify_unaway_channel", "{channick_hilight $0} {chanhost $1} is no longer away", 3, { 0, 0, 0 } },
 	{ "no_such_nick", "{nick $0}: No such nick/channel", 1, { 0 } },
 	{ "nick_in_use", "Nick {nick $0} is already in use", 1, { 0 } },
 	{ "nick_unavailable", "Nick {nick $0} is temporarily unavailable", 1, { 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index b9a89bc0..66a9804f 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -71,8 +71,6 @@ enum {
 	IRCTXT_AWAY,
 	IRCTXT_UNAWAY,
 	IRCTXT_NICK_AWAY,
-	IRCTXT_NOTIFY_AWAY_CHANNEL,
-	IRCTXT_NOTIFY_UNAWAY_CHANNEL,
 	IRCTXT_NO_SUCH_NICK,
 	IRCTXT_NICK_IN_USE,
 	IRCTXT_NICK_UNAVAILABLE,

From 4dbbbf47a4b9e867fd63d8e4b5acc0e489a84bdc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 02:52:26 +0200
Subject: [PATCH 1034/1650] add chghost capability support

---
 src/fe-common/core/fe-ignore-messages.c |  9 +++++++++
 src/fe-common/core/fe-messages.c        | 16 +++++++++++++++
 src/fe-common/core/module-formats.c     |  1 +
 src/fe-common/core/module-formats.h     |  1 +
 src/fe-common/irc/fe-events.c           | 19 ++++++++++++++++++
 src/irc/core/irc-servers.c              |  1 +
 src/irc/core/irc-servers.h              |  1 +
 src/irc/core/massjoin.c                 | 26 +++++++++++++++++++++++++
 8 files changed, 74 insertions(+)

diff --git a/src/fe-common/core/fe-ignore-messages.c b/src/fe-common/core/fe-ignore-messages.c
index 6bcfb6da..4f625dec 100644
--- a/src/fe-common/core/fe-ignore-messages.c
+++ b/src/fe-common/core/fe-ignore-messages.c
@@ -46,6 +46,13 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
 		signal_stop();
 }
 
+static void sig_message_host_changed(SERVER_REC *server, const char *nick,
+				     const char *address, const char *old_address)
+{
+	if (ignore_check(server, nick, address, NULL, NULL, MSGLEVEL_JOINS))
+		signal_stop();
+}
+
 static void sig_message_part(SERVER_REC *server, const char *channel,
 			     const char *nick, const char *address,
 			     const char *reason)
@@ -120,6 +127,7 @@ void fe_ignore_messages_init(void)
 	signal_add_first("message public", (SIGNAL_FUNC) sig_message_public);
 	signal_add_first("message private", (SIGNAL_FUNC) sig_message_private);
 	signal_add_first("message join", (SIGNAL_FUNC) sig_message_join);
+	signal_add_first("message host_changed", (SIGNAL_FUNC) sig_message_host_changed);
 	signal_add_first("message part", (SIGNAL_FUNC) sig_message_part);
 	signal_add_first("message quit", (SIGNAL_FUNC) sig_message_quit);
 	signal_add_first("message kick", (SIGNAL_FUNC) sig_message_kick);
@@ -135,6 +143,7 @@ void fe_ignore_messages_deinit(void)
 	signal_remove("message public", (SIGNAL_FUNC) sig_message_public);
 	signal_remove("message private", (SIGNAL_FUNC) sig_message_private);
 	signal_remove("message join", (SIGNAL_FUNC) sig_message_join);
+	signal_remove("message host_changed", (SIGNAL_FUNC) sig_message_host_changed);
 	signal_remove("message part", (SIGNAL_FUNC) sig_message_part);
 	signal_remove("message quit", (SIGNAL_FUNC) sig_message_quit);
 	signal_remove("message kick", (SIGNAL_FUNC) sig_message_kick);
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 9545af73..17a81e56 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -451,6 +451,20 @@ static void spread_server_message_to_windows(SERVER_REC *server, gboolean once,
 	g_string_free(chans, TRUE);
 }
 
+static void sig_message_host_changed(SERVER_REC *server, const char *nick,
+				     const char *address, const char *old_address)
+{
+	spread_server_message_to_windows(
+		server,
+		settings_get_bool("show_quit_once"),
+		TRUE,
+		MSGLEVEL_JOINS,
+		TXT_HOST_CHANGED, TXT_HOST_CHANGED,
+		nick, address, old_address,
+		NULL
+	);
+}
+
 static void sig_message_quit(SERVER_REC *server, const char *nick,
 			     const char *address, const char *reason)
 {
@@ -756,6 +770,7 @@ void fe_messages_init(void)
 	signal_add_last("message own_public", (SIGNAL_FUNC) sig_message_own_public);
 	signal_add_last("message own_private", (SIGNAL_FUNC) sig_message_own_private);
 	signal_add_last("message join", (SIGNAL_FUNC) sig_message_join);
+	signal_add_last("message host_changed", (SIGNAL_FUNC) sig_message_host_changed);
 	signal_add_last("message part", (SIGNAL_FUNC) sig_message_part);
 	signal_add_last("message quit", (SIGNAL_FUNC) sig_message_quit);
 	signal_add_last("message kick", (SIGNAL_FUNC) sig_message_kick);
@@ -783,6 +798,7 @@ void fe_messages_deinit(void)
 	signal_remove("message own_public", (SIGNAL_FUNC) sig_message_own_public);
 	signal_remove("message own_private", (SIGNAL_FUNC) sig_message_own_private);
 	signal_remove("message join", (SIGNAL_FUNC) sig_message_join);
+	signal_remove("message host_changed", (SIGNAL_FUNC) sig_message_host_changed);
 	signal_remove("message part", (SIGNAL_FUNC) sig_message_part);
 	signal_remove("message quit", (SIGNAL_FUNC) sig_message_quit);
 	signal_remove("message kick", (SIGNAL_FUNC) sig_message_kick);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 83eae589..69507c21 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -95,6 +95,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ NULL, "Channels", 0 },
 
 	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 5, { 0, 0, 0, 0, 0 } },
+	{ "host_changed", "{channick_hilight $0} {chanhost_hilight $1} host changed", 4, { 0, 0, 0, 0 } },
 	{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
 	{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 5, { 0, 0, 0, 0, 0 } },
 	{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 74a4dfd9..dc51e638 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -71,6 +71,7 @@ enum {
 	TXT_FILL_3,
 
 	TXT_JOIN,
+	TXT_HOST_CHANGED,
 	TXT_PART,
 	TXT_KICK,
 	TXT_QUIT,
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 4608b949..a8aea027 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -126,6 +126,23 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
+
+static void event_chghost(IRC_SERVER_REC *server, const char *data,
+			  const char *nick, const char *addr)
+{
+	char *params, *user, *host, *new_addr;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 2, &user, &host);
+	new_addr = g_strconcat(user, "@", host, NULL);
+
+	signal_emit("message host_changed", 4, server, nick, new_addr, addr);
+
+	g_free(new_addr);
+	g_free(params);
+}
+
 static void event_part(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
@@ -461,6 +478,7 @@ void fe_events_init(void)
 	signal_add("ctcp action", (SIGNAL_FUNC) ctcp_action);
 	signal_add("event notice", (SIGNAL_FUNC) event_notice);
 	signal_add("event join", (SIGNAL_FUNC) event_join);
+	signal_add("event chghost", (SIGNAL_FUNC) event_chghost);
 	signal_add("event part", (SIGNAL_FUNC) event_part);
 	signal_add("event quit", (SIGNAL_FUNC) event_quit);
 	signal_add("event kick", (SIGNAL_FUNC) event_kick);
@@ -491,6 +509,7 @@ void fe_events_deinit(void)
 	signal_remove("ctcp action", (SIGNAL_FUNC) ctcp_action);
 	signal_remove("event notice", (SIGNAL_FUNC) event_notice);
 	signal_remove("event join", (SIGNAL_FUNC) event_join);
+	signal_remove("event chghost", (SIGNAL_FUNC) event_chghost);
 	signal_remove("event part", (SIGNAL_FUNC) event_part);
 	signal_remove("event quit", (SIGNAL_FUNC) event_quit);
 	signal_remove("event kick", (SIGNAL_FUNC) event_kick);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 16095ed3..799b4441 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -238,6 +238,7 @@ static void server_init(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_SETNAME, TRUE);
 	irc_cap_toggle(server, CAP_INVITE_NOTIFY, TRUE);
 	irc_cap_toggle(server, CAP_AWAY_NOTIFY, TRUE);
+	irc_cap_toggle(server, CAP_CHGHOST, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 3fccfe9e..b709edab 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -21,6 +21,7 @@
 #define CAP_SETNAME "draft/setname"
 #define CAP_INVITE_NOTIFY "invite-notify"
 #define CAP_AWAY_NOTIFY "away-notify"
+#define CAP_CHGHOST "chghost"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 4a3f085d..271ecddc 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -106,6 +106,30 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 	chanrec->massjoins++;
 }
 
+static void event_chghost(IRC_SERVER_REC *server, const char *data,
+			  const char *nick, const char *old_address)
+{
+	char *params, *user, *host, *address;
+	GSList *nicks, *tmp;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 2, &user, &host);
+
+	/* check that the nick isn't already in nicklist. seems to happen
+	   sometimes (server desyncs or something?) */
+	nicks = nicklist_get_same(SERVER(server), nick);
+	address = nicks != NULL ? g_strconcat(user, "@", host, NULL) : NULL;
+	for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
+		NICK_REC *rec = tmp->next->data;
+
+		nicklist_set_host(CHANNEL(tmp->data), rec, address);
+	}
+	g_free(address);
+	g_slist_free(nicks);
+	g_free(params);
+}
+
 static void event_part(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
@@ -291,6 +315,7 @@ void massjoin_init(void)
 
 	read_settings();
 	signal_add_first("event join", (SIGNAL_FUNC) event_join);
+	signal_add("event chghost", (SIGNAL_FUNC) event_chghost);
 	signal_add("event part", (SIGNAL_FUNC) event_part);
 	signal_add("event kick", (SIGNAL_FUNC) event_kick);
 	signal_add("event quit", (SIGNAL_FUNC) event_quit);
@@ -302,6 +327,7 @@ void massjoin_deinit(void)
 	g_source_remove(massjoin_tag);
 
 	signal_remove("event join", (SIGNAL_FUNC) event_join);
+	signal_remove("event chghost", (SIGNAL_FUNC) event_chghost);
 	signal_remove("event part", (SIGNAL_FUNC) event_part);
 	signal_remove("event kick", (SIGNAL_FUNC) event_kick);
 	signal_remove("event quit", (SIGNAL_FUNC) event_quit);

From 8f65f58a4a7edb0016117d005b5a6c4b04b156e6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Aug 2019 21:21:17 +0200
Subject: [PATCH 1035/1650] improve message wording

---
 src/fe-common/core/module-formats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 69507c21..094246a1 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -95,7 +95,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ NULL, "Channels", 0 },
 
 	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 5, { 0, 0, 0, 0, 0 } },
-	{ "host_changed", "{channick_hilight $0} {chanhost_hilight $1} host changed", 4, { 0, 0, 0, 0 } },
+	{ "host_changed", "{channick_hilight $0} {chanhost_hilight $1} has changed host", 4, { 0, 0, 0, 0 } },
 	{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
 	{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 5, { 0, 0, 0, 0, 0 } },
 	{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },

From 44d480ca991a7906fd8b09944dd3307c941522a8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 03:36:40 +0200
Subject: [PATCH 1036/1650] use account-notify capability

---
 src/core/nicklist.c                 |  8 ++++++++
 src/core/nicklist.h                 |  1 +
 src/fe-common/core/fe-messages.c    | 22 ++++++++++++++++++++++
 src/fe-common/core/module-formats.c |  2 ++
 src/fe-common/core/module-formats.h |  2 ++
 src/fe-common/irc/fe-events.c       | 17 ++++++++++++++++-
 src/irc/core/irc-servers.c          |  1 +
 src/irc/core/irc-servers.h          |  1 +
 src/irc/core/massjoin.c             | 24 ++++++++++++++++++++++--
 9 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index bf845c0d..528f2286 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -101,6 +101,14 @@ void nicklist_set_host(CHANNEL_REC *channel, NICK_REC *nick, const char *host)
         signal_emit("nicklist host changed", 2, channel, nick);
 }
 
+void nicklist_set_account(CHANNEL_REC *channel, NICK_REC *nick, const char *account)
+{
+	g_free(nick->account);
+	nick->account = g_strdup(account);
+
+	signal_emit("nicklist account changed", 2, channel, nick);
+}
+
 static void nicklist_destroy(CHANNEL_REC *channel, NICK_REC *nick)
 {
 	signal_emit("nicklist remove", 2, channel, nick);
diff --git a/src/core/nicklist.h b/src/core/nicklist.h
index 62afa5ff..7999be0a 100644
--- a/src/core/nicklist.h
+++ b/src/core/nicklist.h
@@ -18,6 +18,7 @@ struct _NICK_REC {
 void nicklist_insert(CHANNEL_REC *channel, NICK_REC *nick);
 /* Set host address for nick */
 void nicklist_set_host(CHANNEL_REC *channel, NICK_REC *nick, const char *host);
+void nicklist_set_account(CHANNEL_REC *channel, NICK_REC *nick, const char *account);
 /* Remove nick from list */
 void nicklist_remove(CHANNEL_REC *channel, NICK_REC *nick);
 /* Change nick */
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 17a81e56..af724a1b 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -465,6 +465,26 @@ static void sig_message_host_changed(SERVER_REC *server, const char *nick,
 	);
 }
 
+static void sig_message_account_changed(SERVER_REC *server, const char *nick,
+					const char *address, const char *account)
+{
+	gboolean logged_in;
+	int txt;
+
+	logged_in = g_strcmp0("*", account) != 0;
+	txt = logged_in ? TXT_LOGGED_IN : TXT_LOGGED_OUT;
+
+	spread_server_message_to_windows(
+		server,
+		settings_get_bool("show_quit_once"),
+		TRUE,
+		MSGLEVEL_MODES,
+		txt, txt,
+		nick, address, account,
+		"account"
+	);
+}
+
 static void sig_message_quit(SERVER_REC *server, const char *nick,
 			     const char *address, const char *reason)
 {
@@ -771,6 +791,7 @@ void fe_messages_init(void)
 	signal_add_last("message own_private", (SIGNAL_FUNC) sig_message_own_private);
 	signal_add_last("message join", (SIGNAL_FUNC) sig_message_join);
 	signal_add_last("message host_changed", (SIGNAL_FUNC) sig_message_host_changed);
+	signal_add_last("message account_changed", (SIGNAL_FUNC) sig_message_account_changed);
 	signal_add_last("message part", (SIGNAL_FUNC) sig_message_part);
 	signal_add_last("message quit", (SIGNAL_FUNC) sig_message_quit);
 	signal_add_last("message kick", (SIGNAL_FUNC) sig_message_kick);
@@ -799,6 +820,7 @@ void fe_messages_deinit(void)
 	signal_remove("message own_private", (SIGNAL_FUNC) sig_message_own_private);
 	signal_remove("message join", (SIGNAL_FUNC) sig_message_join);
 	signal_remove("message host_changed", (SIGNAL_FUNC) sig_message_host_changed);
+	signal_remove("message account_changed", (SIGNAL_FUNC) sig_message_account_changed);
 	signal_remove("message part", (SIGNAL_FUNC) sig_message_part);
 	signal_remove("message quit", (SIGNAL_FUNC) sig_message_quit);
 	signal_remove("message kick", (SIGNAL_FUNC) sig_message_kick);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 094246a1..a5e99619 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -96,6 +96,8 @@ FORMAT_REC fecommon_core_formats[] = {
 
 	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 5, { 0, 0, 0, 0, 0 } },
 	{ "host_changed", "{channick_hilight $0} {chanhost_hilight $1} has changed host", 4, { 0, 0, 0, 0 } },
+	{ "logged_out", "{channick $0} {chanhost $1} has logged out of their account", 4, { 0, 0, 0, 0 } },
+	{ "logged_in", "{channick_hilight $0} {chanhost_hilight $1} has logged in to account {hilight $2}", 4, { 0, 0, 0, 0 } },
 	{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
 	{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 5, { 0, 0, 0, 0, 0 } },
 	{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index dc51e638..b1cf1578 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -72,6 +72,8 @@ enum {
 
 	TXT_JOIN,
 	TXT_HOST_CHANGED,
+	TXT_LOGGED_OUT,
+	TXT_LOGGED_IN,
 	TXT_PART,
 	TXT_KICK,
 	TXT_QUIT,
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index a8aea027..b6b3e75a 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -126,7 +126,6 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
-
 static void event_chghost(IRC_SERVER_REC *server, const char *data,
 			  const char *nick, const char *addr)
 {
@@ -143,6 +142,20 @@ static void event_chghost(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
+static void event_account(IRC_SERVER_REC *server, const char *data,
+			  const char *nick, const char *addr)
+{
+	char *params, *account;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 1, &account);
+
+	signal_emit("message account_changed", 4, server, nick, addr, account);
+
+	g_free(params);
+}
+
 static void event_part(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
@@ -479,6 +492,7 @@ void fe_events_init(void)
 	signal_add("event notice", (SIGNAL_FUNC) event_notice);
 	signal_add("event join", (SIGNAL_FUNC) event_join);
 	signal_add("event chghost", (SIGNAL_FUNC) event_chghost);
+	signal_add("event account", (SIGNAL_FUNC) event_account);
 	signal_add("event part", (SIGNAL_FUNC) event_part);
 	signal_add("event quit", (SIGNAL_FUNC) event_quit);
 	signal_add("event kick", (SIGNAL_FUNC) event_kick);
@@ -510,6 +524,7 @@ void fe_events_deinit(void)
 	signal_remove("event notice", (SIGNAL_FUNC) event_notice);
 	signal_remove("event join", (SIGNAL_FUNC) event_join);
 	signal_remove("event chghost", (SIGNAL_FUNC) event_chghost);
+	signal_remove("event account", (SIGNAL_FUNC) event_account);
 	signal_remove("event part", (SIGNAL_FUNC) event_part);
 	signal_remove("event quit", (SIGNAL_FUNC) event_quit);
 	signal_remove("event kick", (SIGNAL_FUNC) event_kick);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 799b4441..a066113f 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -239,6 +239,7 @@ static void server_init(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_INVITE_NOTIFY, TRUE);
 	irc_cap_toggle(server, CAP_AWAY_NOTIFY, TRUE);
 	irc_cap_toggle(server, CAP_CHGHOST, TRUE);
+	irc_cap_toggle(server, CAP_ACCOUNT_NOTIFY, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index b709edab..1a6f9595 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -22,6 +22,7 @@
 #define CAP_INVITE_NOTIFY "invite-notify"
 #define CAP_AWAY_NOTIFY "away-notify"
 #define CAP_CHGHOST "chghost"
+#define CAP_ACCOUNT_NOTIFY "account-notify"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 271ecddc..52b0e86a 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -68,8 +68,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 	/* add user to nicklist */
 	nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, FALSE, TRUE, NULL);
 	if (*account != '\0' && g_strcmp0(nickrec->account, account) != 0) {
-		g_free(nickrec->account);
-		nickrec->account = g_strdup(account);
+		nicklist_set_account(CHANNEL(chanrec), nickrec, account);
 	}
 
         nicklist_set_host(CHANNEL(chanrec), nickrec, address);
@@ -130,6 +129,25 @@ static void event_chghost(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
+static void event_account(IRC_SERVER_REC *server, const char *data,
+			  const char *nick, const char *address)
+{
+	char *params, *account;
+	GSList *nicks, *tmp;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 1, &account);
+	nicks = nicklist_get_same(SERVER(server), nick);
+	for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
+		NICK_REC *rec = tmp->next->data;
+
+		nicklist_set_account(CHANNEL(tmp->data), rec, account);
+	}
+	g_slist_free(nicks);
+	g_free(params);
+}
+
 static void event_part(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
@@ -316,6 +334,7 @@ void massjoin_init(void)
 	read_settings();
 	signal_add_first("event join", (SIGNAL_FUNC) event_join);
 	signal_add("event chghost", (SIGNAL_FUNC) event_chghost);
+	signal_add("event account", (SIGNAL_FUNC) event_account);
 	signal_add("event part", (SIGNAL_FUNC) event_part);
 	signal_add("event kick", (SIGNAL_FUNC) event_kick);
 	signal_add("event quit", (SIGNAL_FUNC) event_quit);
@@ -328,6 +347,7 @@ void massjoin_deinit(void)
 
 	signal_remove("event join", (SIGNAL_FUNC) event_join);
 	signal_remove("event chghost", (SIGNAL_FUNC) event_chghost);
+	signal_remove("event account", (SIGNAL_FUNC) event_account);
 	signal_remove("event part", (SIGNAL_FUNC) event_part);
 	signal_remove("event kick", (SIGNAL_FUNC) event_kick);
 	signal_remove("event quit", (SIGNAL_FUNC) event_quit);

From e20900a7cacafb05494f7179caf32868f7918c2e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Aug 2019 17:23:58 +0200
Subject: [PATCH 1037/1650] make a setting to disable account-notify

---
 src/fe-common/core/fe-messages.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index af724a1b..3d8651f9 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -471,6 +471,9 @@ static void sig_message_account_changed(SERVER_REC *server, const char *nick,
 	gboolean logged_in;
 	int txt;
 
+	if (!settings_get_bool("show_account_notify"))
+		return;
+
 	logged_in = g_strcmp0("*", account) != 0;
 	txt = logged_in ? TXT_LOGGED_IN : TXT_LOGGED_OUT;
 
@@ -784,6 +787,7 @@ void fe_messages_init(void)
 	settings_add_bool("lookandfeel", "show_quit_once", FALSE);
 	settings_add_bool("lookandfeel", "show_own_nickchange_once", FALSE);
 	settings_add_bool("lookandfeel", "away_notify_public", FALSE);
+	settings_add_bool("lookandfeel", "show_account_notify", FALSE);
 
 	signal_add_last("message public", (SIGNAL_FUNC) sig_message_public);
 	signal_add_last("message private", (SIGNAL_FUNC) sig_message_private);

From b6f1bf8fcddc67415fc6c74acad7f12faab1e3e5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Aug 2019 21:32:57 +0200
Subject: [PATCH 1038/1650] fix autotools build

---
 src/fe-common/irc/Makefile.am | 2 --
 src/irc/Makefile.am           | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index f14d6942..9efb71d3 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -37,5 +37,3 @@ pkginc_fe_common_irc_HEADERS = \
 	fe-irc-channels.h \
 	module.h \
 	module-formats.h
-
-DISTFILES = $(DIST_COMMON) $(real_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
index 9eda2a2f..78a38643 100644
--- a/src/irc/Makefile.am
+++ b/src/irc/Makefile.am
@@ -7,5 +7,3 @@ SUBDIRS = core dcc flood notifylist $(PROXY)
 noinst_LIBRARIES = libirc.a
 
 libirc_a_SOURCES = irc.c
-
-DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

From 587098199efc05a98b05ca2660a12ed16fc42cbb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 15 Aug 2019 22:42:48 +0200
Subject: [PATCH 1039/1650] fix wrong version

---
 utils/irssi-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 466a29fd..41970cb2 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD 2>/dev/null`
+DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null`
 
 VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
 VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`

From 255d850c4df7d6c681c0f45443c19718ef55410c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 16 Aug 2019 21:19:20 +0200
Subject: [PATCH 1040/1650] fix crash in setname

---
 src/irc/core/irc-nicklist.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 28ac6368..2e210382 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -454,6 +454,7 @@ static void event_setname(SERVER_REC *server, const char *data, const char *nick
 	if (!IS_IRC_SERVER(server))
 		return;
 
+	g_return_if_fail(nick != NULL);
 	g_return_if_fail(data != NULL);
 	if (*data == ':') data++;
 

From d5329bc811d077eabe3e4bda397be17faba5ab0e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 16 Aug 2019 21:37:53 +0200
Subject: [PATCH 1041/1650] fix crashes when nick is missing

---
 src/irc/core/irc-nicklist.c | 1 +
 src/irc/core/massjoin.c     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 2e210382..cc630a58 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -475,6 +475,7 @@ static void event_away_notify(IRC_SERVER_REC *server, const char *data, const ch
 	if (!IS_IRC_SERVER(server))
 		return;
 
+	g_return_if_fail(nick != NULL);
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 1 | PARAM_FLAG_GETREST, &awaymsg);
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 52b0e86a..be406d3d 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -111,6 +111,7 @@ static void event_chghost(IRC_SERVER_REC *server, const char *data,
 	char *params, *user, *host, *address;
 	GSList *nicks, *tmp;
 
+	g_return_if_fail(nick != NULL);
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 2, &user, &host);
@@ -135,6 +136,7 @@ static void event_account(IRC_SERVER_REC *server, const char *data,
 	char *params, *account;
 	GSList *nicks, *tmp;
 
+	g_return_if_fail(nick != NULL);
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 1, &account);

From 504d50c9a3aad5a45def3177d65946f637eae452 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 16 Aug 2019 22:40:49 +0200
Subject: [PATCH 1042/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 672e5e6c..8a9713ce 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 22
+#define IRSSI_ABI_VERSION 23
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 38df7bfd29cb6aefa149bb7a48cb469782d9eab0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 18 Aug 2019 11:24:48 +0200
Subject: [PATCH 1043/1650] make extended account info visible and formattable

---
 src/fe-common/core/fe-messages.c    | 14 ++++++++++++--
 src/fe-common/core/module-formats.c |  2 ++
 src/fe-common/core/module-formats.h |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 3d8651f9..c1d87b2b 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -356,8 +356,17 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
 
 	ignore_check_plus(server, nick, address, channel, NULL, &level, FALSE);
 
-	printformat(server, channel, level,
-		    TXT_JOIN, nick, address, channel, account, realname);
+	if (settings_get_bool("show_extended_join")) {
+		int txt;
+		if (*account == '\0') txt = TXT_JOIN;
+		else if (g_strcmp0("*", account) == 0) txt = TXT_JOIN_EXTENDED;
+		else txt = TXT_JOIN_EXTENDED_ACCOUNT;
+		printformat(server, channel, level,
+			    txt, nick, address, channel, account, realname);
+	} else {
+		printformat(server, channel, level,
+			    TXT_JOIN, nick, address, channel, account, realname);
+	}
 }
 
 static void sig_message_part(SERVER_REC *server, const char *channel,
@@ -787,6 +796,7 @@ void fe_messages_init(void)
 	settings_add_bool("lookandfeel", "show_quit_once", FALSE);
 	settings_add_bool("lookandfeel", "show_own_nickchange_once", FALSE);
 	settings_add_bool("lookandfeel", "away_notify_public", FALSE);
+	settings_add_bool("lookandfeel", "show_extended_join", FALSE);
 	settings_add_bool("lookandfeel", "show_account_notify", FALSE);
 
 	signal_add_last("message public", (SIGNAL_FUNC) sig_message_public);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index a5e99619..0319ee11 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -95,6 +95,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ NULL, "Channels", 0 },
 
 	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 5, { 0, 0, 0, 0, 0 } },
+	{ "join_extended", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2} {comment realname {reason $4}}", 5, { 0, 0, 0, 0, 0 } },
+	{ "join_extended_account", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2} {reason account {hilight $3}} {comment realname {reason $4}}", 5, { 0, 0, 0, 0, 0 } },
 	{ "host_changed", "{channick_hilight $0} {chanhost_hilight $1} has changed host", 4, { 0, 0, 0, 0 } },
 	{ "logged_out", "{channick $0} {chanhost $1} has logged out of their account", 4, { 0, 0, 0, 0 } },
 	{ "logged_in", "{channick_hilight $0} {chanhost_hilight $1} has logged in to account {hilight $2}", 4, { 0, 0, 0, 0 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index b1cf1578..1b1927b1 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -71,6 +71,8 @@ enum {
 	TXT_FILL_3,
 
 	TXT_JOIN,
+	TXT_JOIN_EXTENDED,
+	TXT_JOIN_EXTENDED_ACCOUNT,
 	TXT_HOST_CHANGED,
 	TXT_LOGGED_OUT,
 	TXT_LOGGED_IN,

From e18708243bbb26c130ef7984103427604bd215c1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 16 Aug 2019 15:29:29 +0000
Subject: [PATCH 1044/1650] Migrate push workflow to yaml

---
 .github/workflows/push.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/push.yml

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
new file mode 100644
index 00000000..71b388a2
--- /dev/null
+++ b/.github/workflows/push.yml
@@ -0,0 +1,21 @@
+on: [push]
+name: Check Irssi
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: install
+      uses: irssi-import/actions-irssi/check-irssi@master
+      with:
+        args: before_install install
+    - name: unit_tests
+      uses: irssi-import/actions-irssi/check-irssi@master
+      with:
+        args: unit_tests after_unit_tests
+    - name: script
+      uses: irssi-import/actions-irssi/check-irssi@master
+      env:
+        TERM: xterm
+      with:
+        args: before_script script after_script

From 7abec34668b8b34d0f0437e910cbae74abbf6da3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 16 Aug 2019 15:31:18 +0000
Subject: [PATCH 1045/1650] delete old workflow file

---
 .github/main.workflow | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 .github/main.workflow

diff --git a/.github/main.workflow b/.github/main.workflow
deleted file mode 100644
index 18a6088c..00000000
--- a/.github/main.workflow
+++ /dev/null
@@ -1,27 +0,0 @@
-# workflow "Check Irssi" {
-#   on = "push"
-#   resolves = [
-#     "script",
-#     "unit_tests",
-#   ]
-# }
-
-action "install" {
-  uses = "irssi-import/actions-irssi/check-irssi@master"
-  args = "before_install install"
-}
-
-action "script" {
-  uses = "irssi-import/actions-irssi/check-irssi@master"
-  needs = ["install"]
-  args = "before_script script after_script"
-  env = {
-    TERM = "xterm"
-  }
-}
-
-action "unit_tests" {
-  uses = "irssi-import/actions-irssi/check-irssi@master"
-  needs = ["install"]
-  args = "unit_tests after_unit_tests"
-}

From 3a654a9e01082c63faa6e51f0c15bbce413d139e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 22 Aug 2019 23:33:32 +0200
Subject: [PATCH 1046/1650] add various new message events to signals.txt

---
 docs/signals.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 358973db..d7d42f5d 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -63,6 +63,7 @@ nicklist.c:
  "nicklist remove", CHANNEL_REC, NICK_REC
  "nicklist changed", CHANNEL_REC, NICK_REC, char *old_nick
  "nicklist host changed", CHANNEL_REC, NICK_REC
+ "nicklist account changed", CHANNEL_REC, NICK_REC, char *account
  "nicklist gone changed", CHANNEL_REC, NICK_REC
  "nicklist serverop changed", CHANNEL_REC, NICK_REC
 
@@ -265,14 +266,18 @@ fe-messages.c:
  "message private", SERVER_REC, char *msg, char *nick, char *address, char *target
  "message own_public", SERVER_REC, char *msg, char *target
  "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
- "message join", SERVER_REC, char *channel, char *nick, char *address
+ "message join", SERVER_REC, char *channel, char *nick, char *address, char *account, char *realname
  "message part", SERVER_REC, char *channel, char *nick, char *address, char *reason
  "message quit", SERVER_REC, char *nick, char *address, char *reason
  "message kick", SERVER_REC, char *channel, char *nick, char *kicker, char *address, char *reason
  "message nick", SERVER_REC, char *newnick, char *oldnick, char *address
  "message own_nick", SERVER_REC, char *newnick, char *oldnick, char *address
  "message invite", SERVER_REC, char *channel, char *nick, char *address
+ "message invite_other", SERVER_REC, char *channel, char *invited, char *nick, char *address
  "message topic", SERVER_REC, char *channel, char *topic, char *nick, char *address
+ "message host_changed", SERVER_REC, char *nick, char *newaddress, char *oldaddress
+ "message account_changed", SERVER_REC, char *nick, char *address, char *account
+ "message away_notify", SERVER_REC, char *nick, char *address, char *awaymsg
 
 keyboard.c:
  "keyinfo created", KEYINFO_REC

From 487d9434bd8b0403eaafe1963a96ad09abc32e8e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 23 Aug 2019 22:26:27 +0200
Subject: [PATCH 1047/1650] revert the change to perl-common that would stop it
 from creating ghost chatnets

see 00a7efc69f8cfc14fcfdf123421015e99ac07926
---
 src/perl/perl-common.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 31650cc4..0c2b90e7 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -585,9 +585,6 @@ static void perl_register_protocol(CHAT_PROTOCOL_REC *rec)
 	chat_type = chat_protocol_lookup(rec->name);
 	g_return_if_fail(chat_type >= 0);
 
-	if (rec->not_initialized)
-		return;
-
 	name = g_ascii_strdown(rec->name,-1);
 	*name = *(rec->name);
 

From 44b060ce171111fe3433f13728663bac642a19d3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 27 Aug 2019 12:42:20 +0200
Subject: [PATCH 1048/1650] fix crash on startup when resizing before
 active_win

---
 src/fe-text/mainwindows.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 051c63ae..711daf0a 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -829,7 +829,7 @@ void mainwindows_resize(int width, int height)
 	}
 
 	/* if we lost our active mainwin, get a new one */
-	if (active_mainwin == NULL && !quitting) {
+	if (active_mainwin == NULL && active_win != NULL && !quitting) {
 		active_mainwin = WINDOW_MAIN(active_win);
 		window_set_active(active_mainwin->active);
 	}

From 5a4e7ab659aba2855895c9f43e9a7a131f4e89b3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 27 Aug 2019 23:33:51 +0200
Subject: [PATCH 1049/1650] fix use after free receiving caps

fixes GL#34
---
 src/irc/core/irc-cap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 31b57094..639aace1 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -169,7 +169,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 				 * duplicated values, let's just warn the user */
 				g_warning("The server sent the %s capability twice", key);
 			}
-			g_hash_table_insert(server->cap_supported, key, val);
+			g_hash_table_replace(server->cap_supported, key, val);
 		}
 
 		/* A multiline response is always terminated by a normal one,
@@ -255,7 +255,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 				continue;
 			}
 
-			g_hash_table_insert(server->cap_supported, key, val);
+			g_hash_table_replace(server->cap_supported, key, val);
 			cap_emit_signal(server, "new", key);
 		}
 	}

From 991e24fb27233543e22430126e3da1eaedd16092 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 29 Aug 2019 17:26:35 +0200
Subject: [PATCH 1050/1650] Merge tag '1.2.2' into integrate/1.2.2

---
 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index 2df16223..2e6e5025 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 v1.3-head 2019-xx-xx  The Irssi team <staff@irssi.org>
 
+v1.2.2 2019-08-29 The Irssi team <staff@irssi.org>
+	- Fix a use after free issue when receiving IRCv3 CAP
+          information from the server (GL#34)
+	- Fix a crash during startup when windows weren't fully
+          initialised yet (#1114, bdo#935813)
+
 v1.2.1 2019-06-29 The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.1.3
 	- Fix a test on big endian machines (#1014)

From 3447904a5c4b11ea301ab7504ae768016fa45405 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 30 Aug 2019 20:29:03 +0200
Subject: [PATCH 1051/1650] fix warning in fe-fuzz/server-fuzz

---
 src/fe-fuzz/server.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index cde03b89..6026cb4b 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -115,6 +115,7 @@ void test_server() {
 	conn = server_create_conn(proto->id, "localhost", 0, "", "", "user");
 	server = proto->server_init_connect(conn);
 	server->session_reconnect = TRUE;
+	g_free(server->tag);
 	server->tag = g_strdup("testserver");
 
 	/* we skip some initialisations that would try to send data */
@@ -176,6 +177,6 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 
 	g_strfreev(head);
 	g_free(copy);
-	server_unref(server);
+	server_disconnect(server);
 	return 0;
 }

From 887950db0f728f1bec9d4a7aea03b7c0fce7b8ad Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 30 Aug 2019 20:30:02 +0200
Subject: [PATCH 1052/1650] limit special-vars alignment memory to not exhaust
 fuzzer

---
 src/core/special-vars.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index d84912d2..ef56e2e1 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -33,7 +33,11 @@
 #define isarg(c) \
 	(i_isdigit(c) || (c) == '*' || (c) == '~' || (c) == '-')
 
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION /* fuzzer should not exhaust memory here */
+#define ALIGN_MAX 512
+#else
 #define ALIGN_MAX 222488
+#endif
 
 static SPECIAL_HISTORY_FUNC history_func = NULL;
 

From 7aa67b142b0f5b0062e9766eb8bf881023af5e8b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 30 Aug 2019 20:58:28 +0200
Subject: [PATCH 1053/1650] Add a new meson option : -Dstatic-dependency=yes to
 use static dependencies

---
 meson.build       | 19 +++++++++++++------
 meson_options.txt |  3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index 3386737a..63f6c125 100644
--- a/meson.build
+++ b/meson.build
@@ -41,7 +41,10 @@ with_perl_lib       = get_option('with-perl-lib')
 require_otr         = get_option('with-otr') == 'yes'
 want_otr            = get_option('with-otr') != 'no'
 
-want_glib_internal  = get_option('install-glib') == 'yes'
+want_glib_internal  = get_option('install-glib') != 'no'
+require_glib_internal = get_option('install-glib') == 'force'
+
+want_static_dependency = get_option('static-dependency') == 'yes'
 
 chat_modules = ['irc']
 
@@ -149,7 +152,11 @@ message('*** to download and build it automatically')
 message('*** Or alternatively install your distribution\'s package')
 message('*** On Debian: sudo apt-get install libglib2.0-dev')
 message('*** On Redhat: dnf install glib2-devel')
-glib_dep = dependency('glib-2.0', version : '>=2.28', required : not want_glib_internal)
+if not require_glib_internal
+  glib_dep = dependency('glib-2.0', version : '>=2.28', required : not want_glib_internal, static : want_static_dependency)
+else
+  glib_dep = dependency('', required : false)
+endif
 if not glib_dep.found()
   glib_internal = true
   meson_cmd = find_program('meson')
@@ -200,12 +207,12 @@ if not glib_dep.found()
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
   )
 else
-  gmodule_dep = dependency('gmodule-2.0')
+  gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency)
 endif
 dep += glib_dep
 dep += gmodule_dep
 
-openssl_dep = dependency('openssl')
+openssl_dep = dependency('openssl', static : want_static_dependency)
 dep += openssl_dep
 
 ############
@@ -365,8 +372,8 @@ endif
 
 have_otr = false
 if want_otr
-  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr)
-  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr)
+  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency)
+  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency)
   if libgcrypt.found() and libotr.found()
     dep += libgcrypt
     dep += libotr
diff --git a/meson_options.txt b/meson_options.txt
index 579b9cda..141e3fba 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,5 +10,6 @@ option('enable-true-color', type : 'combo',  description : 'Build with true colo
 option('disable-gregex',    type : 'combo',  description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes'])
 option('disable-utf8proc',  type : 'combo',  description : 'Build without Julia\'s utf8proc',             choices : ['auto', 'yes', 'no'])
 option('with-capsicum',     type : 'combo',  description : 'Build with Capsicum support',                 choices : ['auto', 'yes', 'no'])
-option('install-glib',      type : 'combo',  description : 'Download and install GLib for you',           choices : ['no', 'yes'])
+option('static-dependency', type : 'combo',  description : 'Request static dependencies',                 choices : ['no', 'yes'])
+option('install-glib',      type : 'combo',  description : 'Download and install GLib for you',           choices : ['no', 'yes', 'force'])
 option('docdir',            type : 'string', description : 'Documentation directory')

From c271609a494a9ac7f23b3a2fd8fefc109cd7e46f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 30 Aug 2019 22:11:27 +0200
Subject: [PATCH 1054/1650] add some dummy objects to server-fuzz

---
 src/fe-fuzz/server.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index 6026cb4b..8e2b651c 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -29,6 +29,8 @@
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/core/misc.h>
 #include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/net-sendbuffer.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -98,6 +100,7 @@ void event_connected(IRC_SERVER_REC *server, const char *data, const char *from)
 }
 
 void irc_server_init_bare_minimum(IRC_SERVER_REC *server) {
+	server->rawlog = rawlog_create();
 	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
 					    (GCompareFunc) g_istr_equal);
 
@@ -110,6 +113,9 @@ void test_server() {
 	//SERVER_REC *server; /* = g_new0(IRC_SERVER_REC, 1); */
 	CHAT_PROTOCOL_REC *proto;
 	SERVER_CONNECT_REC *conn;
+	GIOChannel *handle = g_io_channel_unix_new(open("/dev/null", O_RDWR));
+	g_io_channel_set_encoding(handle, NULL, NULL);
+	g_io_channel_set_close_on_unref(handle, TRUE);
 
 	proto = chat_protocol_find("IRC");
 	conn = server_create_conn(proto->id, "localhost", 0, "", "", "user");
@@ -117,6 +123,7 @@ void test_server() {
 	server->session_reconnect = TRUE;
 	g_free(server->tag);
 	server->tag = g_strdup("testserver");
+	server->handle = net_sendbuffer_create(handle, 0);
 
 	/* we skip some initialisations that would try to send data */
 	/* irc_servers_deinit(); */
@@ -147,6 +154,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 	fe_common_irc_init();
 	signal_add("event 001", (SIGNAL_FUNC) event_connected);
 	module_register("core", "fe-fuzz");
+	rawlog_set_size(1);
 	return 0;
 }
 

From 948e7bb31787213e888b52df4968de4436dcd978 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 30 Aug 2019 22:14:26 +0200
Subject: [PATCH 1055/1650] free params

---
 src/irc/core/irc-cap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 639aace1..4dd9ceca 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -131,6 +131,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 	/* Malformed request, terminate the negotiation */
 	else {
 		irc_cap_finish_negotiation(server);
+		g_free(params);
 		g_warn_if_reached();
 		return;
 	}

From 6d58052c4ab3cf6b72aa66e3212a48b3f493c577 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 4 Sep 2019 14:27:06 +0200
Subject: [PATCH 1056/1650] enable self-message support

---
 src/irc/core/irc-servers.c | 1 +
 src/irc/core/irc-servers.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 0fca78a0..8251c882 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -241,6 +241,7 @@ static void server_init(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_AWAY_NOTIFY, TRUE);
 	irc_cap_toggle(server, CAP_CHGHOST, TRUE);
 	irc_cap_toggle(server, CAP_ACCOUNT_NOTIFY, TRUE);
+	irc_cap_toggle(server, CAP_SELF_MESSAGE, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index f74b8210..2757db0d 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -25,6 +25,7 @@
 #define CAP_AWAY_NOTIFY "away-notify"
 #define CAP_CHGHOST "chghost"
 #define CAP_ACCOUNT_NOTIFY "account-notify"
+#define CAP_SELF_MESSAGE "znc.in/self-message"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \

From f875d252d2637bb850f8c4d5d0153c1f29ede3aa Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 4 Sep 2019 14:57:56 +0200
Subject: [PATCH 1057/1650] fix crash in join due to incorrect free

---
 src/irc/core/massjoin.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index be406d3d..2405f947 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -54,8 +54,10 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 
 	/* find channel */
 	chanrec = irc_channel_find(server, channel);
-	g_free(params);
-	if (chanrec == NULL) return;
+	if (chanrec == NULL) {
+		g_free(params);
+		return;
+	}
 
 	/* check that the nick isn't already in nicklist. seems to happen
 	   sometimes (server desyncs or something?) */
@@ -103,6 +105,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 	}
 
 	chanrec->massjoins++;
+	g_free(params);
 }
 
 static void event_chghost(IRC_SERVER_REC *server, const char *data,

From 69dec1de33272bb94b7a81fe39b9c152aba3560f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 4 Sep 2019 22:48:03 +0200
Subject: [PATCH 1058/1650] add new meson build option
 -Dfuzzer-link-language=cpp for oss-fuzz

---
 meson.build                            | 6 +++++-
 meson_options.txt                      | 1 +
 src/fe-fuzz/fe-common/core/meson.build | 1 +
 src/fe-fuzz/irc/core/meson.build       | 1 +
 src/fe-fuzz/meson.build                | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 63f6c125..d19e5735 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,7 @@ want_textui         = get_option('without-textui') != 'yes'
 want_bot            = get_option('with-bot') == 'yes'
 want_fuzzer         = get_option('with-fuzzer') == 'yes'
 fuzzer_lib          = get_option('with-fuzzer-lib')
+fuzzer_link_language = get_option('fuzzer-link-language')
 want_proxy          = get_option('with-proxy') == 'yes'
 want_truecolor      = get_option('enable-true-color') == 'yes'
 want_gregex         = get_option('disable-gregex') != 'yes'
@@ -459,7 +460,10 @@ if want_fuzzer
     error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
   endif
   add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
-  add_project_link_arguments('-fsanitize=fuzzer-no-link', language : 'c')
+  if (fuzzer_link_language != 'c')
+    add_languages(fuzzer_link_language)
+  endif
+  add_project_link_arguments('-fsanitize=fuzzer-no-link', language : fuzzer_link_language)
 endif
 
 ##############
diff --git a/meson_options.txt b/meson_options.txt
index 141e3fba..c975db3a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,6 +2,7 @@ option('without-textui',    type : 'combo',  description : 'Build without text f
 option('with-bot',          type : 'combo',  description : 'Build irssi-bot',                         	  choices : ['no', 'yes'])
 option('with-fuzzer',       type : 'combo',  description : 'Build irssi-fuzzer',                      	  choices : ['no', 'yes'])
 option('with-fuzzer-lib',   type : 'string', description : 'Specify path to fuzzer library', value : '-fsanitize=fuzzer')
+option('fuzzer-link-language', type : 'string', description : 'The linker to use for the fuzz targets [c, cpp]', value : 'c')
 option('with-proxy',        type : 'combo',  description : 'Build irssi-proxy',                       	  choices : ['no', 'yes'])
 option('with-perl-lib',     type : 'string', description : 'Specify where to install the Perl libraries for Irssi')
 option('with-perl',         type : 'combo',  description : 'Build with Perl support',                     choices : ['auto', 'yes', 'no'])
diff --git a/src/fe-fuzz/fe-common/core/meson.build b/src/fe-fuzz/fe-common/core/meson.build
index 679c19ce..8e321e8b 100644
--- a/src/fe-fuzz/fe-common/core/meson.build
+++ b/src/fe-fuzz/fe-common/core/meson.build
@@ -10,6 +10,7 @@ executable('theme-load-fuzz',
     libfuzzer_fe_common_core_a,
   ],
   link_args : [fuzzer_lib],
+  link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,
diff --git a/src/fe-fuzz/irc/core/meson.build b/src/fe-fuzz/irc/core/meson.build
index 23d1271f..1656523c 100644
--- a/src/fe-fuzz/irc/core/meson.build
+++ b/src/fe-fuzz/irc/core/meson.build
@@ -12,6 +12,7 @@ executable('event-get-params-fuzz',
     libfuzzer_fe_common_core_a,
   ],
   link_args : [fuzzer_lib],
+  link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,
diff --git a/src/fe-fuzz/meson.build b/src/fe-fuzz/meson.build
index 5dccd38d..1f6427db 100644
--- a/src/fe-fuzz/meson.build
+++ b/src/fe-fuzz/meson.build
@@ -14,6 +14,7 @@ executable('irssi-fuzz',
     libfuzzer_fe_common_core_a,
   ],
   link_args : [fuzzer_lib],
+  link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,
@@ -35,6 +36,7 @@ executable('server-fuzz',
     libfe_irc_notifylist_a,
   ],
   link_args : [fuzzer_lib],
+  link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,

From 9ff224d05d544a7fbd8f377d4f6f9eabc29e268f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 10 Sep 2019 13:08:35 +0200
Subject: [PATCH 1059/1650] silence glib log output during fuzzing on oss-fuzz

---
 src/fe-fuzz/Makefile.am                 |  3 +++
 src/fe-fuzz/fe-common/core/Makefile.am  |  1 +
 src/fe-fuzz/fe-common/core/meson.build  |  1 +
 src/fe-fuzz/fe-common/core/theme-load.c |  4 ++++
 src/fe-fuzz/irc/core/Makefile.am        |  1 +
 src/fe-fuzz/irc/core/event-get-params.c |  4 ++++
 src/fe-fuzz/irc/core/meson.build        |  1 +
 src/fe-fuzz/irssi.c                     |  4 ++++
 src/fe-fuzz/meson.build                 |  3 +++
 src/fe-fuzz/null-logger.c               | 16 ++++++++++++++++
 src/fe-fuzz/null-logger.h               |  6 ++++++
 src/fe-fuzz/server.c                    |  4 ++++
 12 files changed, 48 insertions(+)
 create mode 100644 src/fe-fuzz/null-logger.c
 create mode 100644 src/fe-fuzz/null-logger.h

diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index e72b8723..7ce2fcdd 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -17,6 +17,7 @@ irssi_fuzz_LDADD = \
 
 irssi_fuzz_SOURCES = \
         irssi.c \
+        null-logger.c \
 	../fe-text/module-formats.c
 
 server_fuzz_DEPENDENCIES = @COMMON_LIBS@
@@ -28,7 +29,9 @@ server_fuzz_LDADD = \
 
 server_fuzz_SOURCES = \
 	server.c \
+        null-logger.c \
 	../fe-text/module-formats.c
 
 noinst_HEADERS = \
+        null-logger.h \
 	../fe-text/module-formats.h
diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
index 692e95cf..da8731b9 100644
--- a/src/fe-fuzz/fe-common/core/Makefile.am
+++ b/src/fe-fuzz/fe-common/core/Makefile.am
@@ -22,6 +22,7 @@ LDADD = \
 	$(FUZZER_LIBS)
 
 theme_load_fuzz_SOURCES = \
+        ../../null-logger.c \
         theme-load.c \
 	$(top_srcdir)/src/fe-text/module-formats.c
 
diff --git a/src/fe-fuzz/fe-common/core/meson.build b/src/fe-fuzz/fe-common/core/meson.build
index 8e321e8b..893f5937 100644
--- a/src/fe-fuzz/fe-common/core/meson.build
+++ b/src/fe-fuzz/fe-common/core/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 executable('theme-load-fuzz',
   files(
+    '../../null-logger.c',
     'theme-load.c',
     '../../../fe-text/module-formats.c',
   ),
diff --git a/src/fe-fuzz/fe-common/core/theme-load.c b/src/fe-fuzz/fe-common/core/theme-load.c
index fbb35684..faa063bb 100644
--- a/src/fe-fuzz/fe-common/core/theme-load.c
+++ b/src/fe-fuzz/fe-common/core/theme-load.c
@@ -29,6 +29,7 @@
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/irc/core/irc.h>
 #include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -38,6 +39,9 @@
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
 	char *irssi_argv[] = {*argv[0], "--home", "/tmp/irssi", NULL};
 	int irssi_argc = sizeof(irssi_argv) / sizeof(char *) - 1;
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	args_execute(irssi_argc, irssi_argv);
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
index b2e1ea97..d66c2479 100644
--- a/src/fe-fuzz/irc/core/Makefile.am
+++ b/src/fe-fuzz/irc/core/Makefile.am
@@ -22,6 +22,7 @@ LDADD = \
 	$(FUZZER_LIBS)
 
 event_get_params_fuzz_SOURCES = \
+        ../../null-logger.c \
         event-get-params.c \
 	$(top_srcdir)/src/fe-text/module-formats.c
 
diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index 740602d1..3cdb789f 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -28,6 +28,7 @@
 #include <irssi/src/core/args.h>
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/irc/core/irc.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -35,6 +36,9 @@
 #include <string.h>
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	/* no args */
diff --git a/src/fe-fuzz/irc/core/meson.build b/src/fe-fuzz/irc/core/meson.build
index 1656523c..6a47e07d 100644
--- a/src/fe-fuzz/irc/core/meson.build
+++ b/src/fe-fuzz/irc/core/meson.build
@@ -2,6 +2,7 @@
 
 executable('event-get-params-fuzz',
   files(
+    '../../null-logger.c',
     'event-get-params.c',
     '../../../fe-text/module-formats.c',
   ),
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index 1c9f6c5f..6f79223a 100644
--- a/src/fe-fuzz/irssi.c
+++ b/src/fe-fuzz/irssi.c
@@ -27,6 +27,7 @@
 #include <irssi/src/fe-common/core/fe-common-core.h>
 #include <irssi/src/core/args.h>
 #include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -34,6 +35,9 @@
 #include <string.h>
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	/* no args */
diff --git a/src/fe-fuzz/meson.build b/src/fe-fuzz/meson.build
index 1f6427db..7fac025d 100644
--- a/src/fe-fuzz/meson.build
+++ b/src/fe-fuzz/meson.build
@@ -5,6 +5,7 @@ subdir('fe-common')
 
 executable('irssi-fuzz',
   files(
+    'null-logger.c',
     'irssi.c',
     '../fe-text/module-formats.c',
   ),
@@ -23,6 +24,7 @@ executable('irssi-fuzz',
 
 executable('server-fuzz',
   files(
+    'null-logger.c',
     'server.c',
     '../fe-text/module-formats.c',
   ),
@@ -44,5 +46,6 @@ executable('server-fuzz',
 )
 
 # noinst_headers = files(
+#   'null-logger.h',
 #   '../fe-text/module-formats.h',
 # )
diff --git a/src/fe-fuzz/null-logger.c b/src/fe-fuzz/null-logger.c
new file mode 100644
index 00000000..dd88b84a
--- /dev/null
+++ b/src/fe-fuzz/null-logger.c
@@ -0,0 +1,16 @@
+#include <irssi/src/fe-fuzz/null-logger.h>
+
+#include <glib.h>
+
+static void null_logger(const gchar *log_domain,
+			GLogLevelFlags log_level,
+			const gchar *message,
+			gpointer user_data)
+{
+	return;
+}
+
+void g_log_set_null_logger(void)
+{
+	g_log_set_default_handler(null_logger, NULL);
+}
diff --git a/src/fe-fuzz/null-logger.h b/src/fe-fuzz/null-logger.h
new file mode 100644
index 00000000..d27eeffa
--- /dev/null
+++ b/src/fe-fuzz/null-logger.h
@@ -0,0 +1,6 @@
+#ifndef IRSSI_FE_FUZZ_NULL_LOGGER_H
+#define IRSSI_FE_FUZZ_NULL_LOGGER_H
+
+void g_log_set_null_logger(void);
+
+#endif
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index 8e2b651c..e8caafa0 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -41,6 +41,7 @@
 #include <irssi/src/irc/core/irc.h>
 #include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 /* irc.c */
 void irc_init(void);
@@ -143,6 +144,9 @@ void test_server() {
 }
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	/* no args */

From 51190f69b284a393c74cd51475d710228ee89ded Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 10 Sep 2019 14:22:31 +0200
Subject: [PATCH 1060/1650] update fuzzer flags

---
 meson.build | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index d19e5735..2ea7bcc7 100644
--- a/meson.build
+++ b/meson.build
@@ -456,14 +456,15 @@ if get_option('buildtype').contains('debug')
 endif
 
 if want_fuzzer
-  if not cc.has_argument('-fsanitize=fuzzer-no-link')
-    error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
+  if fuzzer_lib.startswith('-fsanitize=fuzzer')
+    if not cc.has_argument('-fsanitize=fuzzer-no-link')
+      error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
+    endif
+    add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
   endif
-  add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
-  if (fuzzer_link_language != 'c')
+  if fuzzer_link_language != 'c'
     add_languages(fuzzer_link_language)
   endif
-  add_project_link_arguments('-fsanitize=fuzzer-no-link', language : fuzzer_link_language)
 endif
 
 ##############

From f6cca3de4e7e2480b3e6a4845ff5211b9b24296d Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Tue, 24 Sep 2019 21:35:40 -0400
Subject: [PATCH 1061/1650] Properly free sasl_buffer GString

---
 src/irc/core/irc-servers.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 8251c882..e3c856af 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -456,7 +456,9 @@ static void sig_destroyed(IRC_SERVER_REC *server)
 	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
 	server->cap_queue = NULL;
 
-	g_free_and_null(server->sasl_buffer);
+	/* was g_free_and_null, but can't use on a GString */
+	g_string_free(server->sasl_buffer);
+	server->sasl_buffer = NULL;
 
 	/* these are dynamically allocated only if isupport was sent */
 	g_hash_table_foreach(server->isupport,

From ed65499d76daac352d76ae0f30e36f3feb623174 Mon Sep 17 00:00:00 2001
From: Joseph Bisch <joseph.bisch@gmail.com>
Date: Thu, 26 Sep 2019 21:51:36 -0400
Subject: [PATCH 1062/1650] Add missing g_string_free param

---
 src/irc/core/irc-servers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index e3c856af..fcd9346e 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -457,7 +457,7 @@ static void sig_destroyed(IRC_SERVER_REC *server)
 	server->cap_queue = NULL;
 
 	/* was g_free_and_null, but can't use on a GString */
-	g_string_free(server->sasl_buffer);
+	g_string_free(server->sasl_buffer, TRUE);
 	server->sasl_buffer = NULL;
 
 	/* these are dynamically allocated only if isupport was sent */

From 7e694fd223c71dda83ae45f3923bff2d62997f40 Mon Sep 17 00:00:00 2001
From: Dan Collins <dcollinsn@gmail.com>
Date: Sat, 28 Sep 2019 20:00:06 -0400
Subject: [PATCH 1063/1650] Fix hilight behavior for STATUSMSG

This patch allows irc_op_public messages to properly trigger
hilights when the message mentions the current nick or one of our
hilights. This is done by copying the required code from
sig_message_public. This is important because Freenode has begun
using this message type for messages that can only be seen by ops
due to the +z channel mode, and ops will want to be notified of
watchwords even in that type of message.

To test, make two connections to Freenode, join a new channel. The
first client to join that channel will be an op. To establish a
baseline, use the non-opped client to attempt to "ping" the opped
client by addressing it by name and using terms in /hilight. Then,
set channel mode to +mz and use the non-opped client to send the
messages again. Without this patch, no message will "ping" the opped
client with +mz set. With this patch, "pings" should operate
normally, causing a bell, hilighting the window number, and so on.

What I don't know is whether there is any other code from
sig_message_public that should be copied over too. In particular,
the lines related to "ignore_check_plus", "emphasis", and
"printnick", I don't know if they are needed here. I also don't know
if there are any other message types that these changes should be
    applied to.
---
 src/fe-common/irc/fe-irc-messages.c | 39 +++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index ddd4311e..7eb2fff1 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -35,6 +35,7 @@
 #include <irssi/src/fe-common/core/fe-messages.h>
 
 #include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/hilight-text.h>
 #include <irssi/src/fe-common/core/window-items.h>
 #include <irssi/src/fe-common/irc/fe-irc-channels.h>
 #include <irssi/src/fe-common/irc/fe-irc-server.h>
@@ -71,8 +72,12 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 				      const char *nick, const char *address,
 				      const char *target)
 {
-	char *nickmode, *optarget, *prefix;
+	CHANNEL_REC *chanrec;
+	char *nickmode, *optarget, *prefix, *color;
 	const char *cleantarget;
+	int for_me, level;
+	HILIGHT_REC *hilight;
+	TEXT_DEST_REC dest;
 
 	/* only skip here so the difference can be stored in prefix */
 	cleantarget = fe_channel_skip_prefix(IRC_SERVER(server), target);
@@ -86,10 +91,34 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 
 	optarget = g_strconcat(prefix, cleantarget, NULL);
 
-	printformat_module("fe-common/core", server, cleantarget,
-			   MSGLEVEL_PUBLIC,
-			   TXT_PUBMSG_CHANNEL,
-			   nick, optarget, msg, nickmode);
+	chanrec = channel_find(server, target);
+
+	/* Check for hilights */
+	for_me = !settings_get_bool("hilight_nick_matches") ? FALSE :
+		!settings_get_bool("hilight_nick_matches_everywhere") ?
+		nick_match_msg(chanrec, msg, server->nick) :
+		nick_match_msg_everywhere(chanrec, msg, server->nick);
+	hilight = for_me ? NULL :
+		hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
+	color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
+
+	level = MSGLEVEL_PUBLIC;
+	if (for_me)
+		level |= MSGLEVEL_HILIGHT;
+
+	if (color != NULL) {
+		format_create_dest(&dest, server, cleantarget, level, NULL);
+		dest.address = address;
+		dest.nick = nick;
+		hilight_update_text_dest(&dest,hilight);
+		printformat_module_dest("fe-common/core", &dest,
+			TXT_PUBMSG_HILIGHT_CHANNEL,
+			color, nick, optarget, msg, nickmode);
+	} else {
+		printformat_module("fe-common/core", server, cleantarget, level,
+			for_me ? TXT_PUBMSG_ME_CHANNEL : TXT_PUBMSG_CHANNEL,
+			nick, optarget, msg, nickmode);
+	}
 	g_free(nickmode);
 	g_free(optarget);
 	g_free(prefix);

From 03eb8d032a1b7e09230ed3ff777fa99831172b17 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 1 Oct 2019 11:09:25 +0200
Subject: [PATCH 1064/1650] fix the fix

---
 src/irc/core/irc-servers.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index fcd9346e..3ec0bba5 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -457,8 +457,10 @@ static void sig_destroyed(IRC_SERVER_REC *server)
 	server->cap_queue = NULL;
 
 	/* was g_free_and_null, but can't use on a GString */
-	g_string_free(server->sasl_buffer, TRUE);
-	server->sasl_buffer = NULL;
+	if (server->sasl_buffer != NULL) {
+		g_string_free(server->sasl_buffer, TRUE);
+		server->sasl_buffer = NULL;
+	}
 
 	/* these are dynamically allocated only if isupport was sent */
 	g_hash_table_foreach(server->isupport,

From a68be4dccad651a69b8330bfc73f4f5dc548fea2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 5 Oct 2019 23:30:25 +0200
Subject: [PATCH 1065/1650] missing free

---
 src/core/nicklist.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 528f2286..f2aa1315 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -120,6 +120,7 @@ static void nicklist_destroy(CHANNEL_REC *channel, NICK_REC *nick)
 	g_free(nick->nick);
 	g_free_not_null(nick->realname);
 	g_free_not_null(nick->host);
+	g_free(nick->account);
 	g_free(nick);
 }
 

From 2af7db2dfa9a685e9a93a99adb69f7bea4568907 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 14 Sep 2019 11:00:35 -0700
Subject: [PATCH 1066/1650] Remove unused function

---
 src/core/misc.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index d612f587..c959ad91 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -270,11 +270,6 @@ char *gslist_to_string(GSList *list, const char *delimiter)
 	return ret;
 }
 
-void hash_save_key(char *key, void *value, GSList **list)
-{
-        *list = g_slist_append(*list, key);
-}
-
 /* remove all the options from the optlist hash table that are valid for the
  * command cmd */
 GList *optlist_remove_known(const char *cmd, GHashTable *optlist)

From e4d34380e50013b3b209720be14c0761d449bc4d Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 14 Sep 2019 11:03:36 -0700
Subject: [PATCH 1067/1650] Mark unused function deprecated

---
 src/core/misc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/misc.h b/src/core/misc.h
index 9e06c707..65534cdc 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -50,7 +50,7 @@ int match_wildcards(const char *mask, const char *data);
 
 /* octal <-> decimal conversions */
 int octal2dec(int octal);
-int dec2octal(int decimal);
+int dec2octal(int decimal) G_GNUC_DEPRECATED;
 
 /* Get time in human readable form with localtime() + asctime() */
 char *my_asctime(time_t t);

From 145d1040ac255b3e16b6ba363bd7113d6291a3bb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 11 Oct 2019 22:37:09 +0200
Subject: [PATCH 1068/1650] add ignore check, emphasis and fix a memory leak

---
 src/fe-common/irc/fe-irc-messages.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 7eb2fff1..d287bf1f 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -67,13 +67,14 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
 
 }
 
-/* received msg to all ops in channel */
+/* received msg to all ops in channel.
+   TODO: this code is a duplication of sig_message_public */
 static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 				      const char *nick, const char *address,
 				      const char *target)
 {
 	CHANNEL_REC *chanrec;
-	char *nickmode, *optarget, *prefix, *color;
+	char *nickmode, *optarget, *prefix, *color, *freemsg = NULL;
 	const char *cleantarget;
 	int for_me, level;
 	HILIGHT_REC *hilight;
@@ -86,26 +87,33 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 	/* and clean the rest here */
 	cleantarget = get_visible_target(IRC_SERVER(server), cleantarget);
 
-	nickmode = channel_get_nickmode(channel_find(server, cleantarget),
-					nick);
+	if (ignore_check_plus(server, nick, address, cleantarget, msg, &level, TRUE)) {
+		g_free(prefix);
+		return;
+	}
+
+	chanrec = channel_find(server, cleantarget);
+
+	nickmode = channel_get_nickmode(chanrec, nick);
 
 	optarget = g_strconcat(prefix, cleantarget, NULL);
 
-	chanrec = channel_find(server, target);
-
 	/* Check for hilights */
 	for_me = !settings_get_bool("hilight_nick_matches") ? FALSE :
 		!settings_get_bool("hilight_nick_matches_everywhere") ?
 		nick_match_msg(chanrec, msg, server->nick) :
 		nick_match_msg_everywhere(chanrec, msg, server->nick);
 	hilight = for_me ? NULL :
-		hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
+		hilight_match_nick(server, cleantarget, nick, address, MSGLEVEL_PUBLIC, msg);
 	color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
 
 	level = MSGLEVEL_PUBLIC;
 	if (for_me)
 		level |= MSGLEVEL_HILIGHT;
 
+	if (settings_get_bool("emphasis"))
+		msg = freemsg = expand_emphasis((WI_ITEM_REC *) chanrec, msg);
+
 	if (color != NULL) {
 		format_create_dest(&dest, server, cleantarget, level, NULL);
 		dest.address = address;
@@ -119,7 +127,10 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 			for_me ? TXT_PUBMSG_ME_CHANNEL : TXT_PUBMSG_CHANNEL,
 			nick, optarget, msg, nickmode);
 	}
+
 	g_free(nickmode);
+	g_free(freemsg);
+	g_free(color);
 	g_free(optarget);
 	g_free(prefix);
 }

From 4476fbbad9e66421dbaf4fa9a1a47566d7b0bdc6 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 12 Oct 2019 15:37:49 -0700
Subject: [PATCH 1069/1650] Fix indentation

---
 src/core/servers-reconnect.c | 4 ++--
 src/core/servers-setup.c     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 97175f78..dd949ead 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -181,7 +181,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->tag = g_strdup(src->tag);
 
 	if (connect_info) {
-                dest->family = src->family;
+		dest->family = src->family;
 		dest->address = g_strdup(src->address);
 		dest->port = src->port;
 		dest->password = g_strdup(src->password);
@@ -293,7 +293,7 @@ static void sig_reconnect(SERVER_REC *server)
 		    (!rec->last_connect || !rec->last_failed ||
 		     rec->last_connect < now-FAILED_RECONNECT_WAIT)) {
 			if (rec == sserver)
-                                conn->port = server->connrec->port;
+				conn->port = server->connrec->port;
 			sserver_connect(rec, conn);
 			return;
 		}
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index a505df5b..e1313791 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -159,11 +159,11 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
 
 	sserver->last_connect = time(NULL);
 
-        if (sserver->no_proxy)
+	if (sserver->no_proxy)
 		g_free_and_null(conn->proxy);
 
 	if (sserver->family != 0 && conn->family == 0)
-                conn->family = sserver->family;
+		conn->family = sserver->family;
 	if (sserver->port > 0 && conn->port <= 0)
 		conn->port = sserver->port;
 

From 163942521718328110152388203ca7494c3416df Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 12 Oct 2019 15:43:14 -0700
Subject: [PATCH 1070/1650] Do not copy TLS settings to reconnection record

This was causing us to use the TLS settings from one server on another
which is not always appropriate. Instead, we now treat it like other
connection information and do not copy it. We get the TLS settings later
as appropriate when connecting.

Note there is still probably more that could be cleaned up here. For
example, the unix socket might be better treated as connection info too.

Fixes #1027.
---
 src/core/servers-reconnect.c | 20 +++++++++----------
 src/core/servers-setup.c     | 38 ++++++++++++++++++------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index dd949ead..2098a6cc 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -185,6 +185,16 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 		dest->address = g_strdup(src->address);
 		dest->port = src->port;
 		dest->password = g_strdup(src->password);
+
+		dest->use_tls = src->use_tls;
+		dest->tls_cert = g_strdup(src->tls_cert);
+		dest->tls_pkey = g_strdup(src->tls_pkey);
+		dest->tls_verify = src->tls_verify;
+		dest->tls_cafile = g_strdup(src->tls_cafile);
+		dest->tls_capath = g_strdup(src->tls_capath);
+		dest->tls_ciphers = g_strdup(src->tls_ciphers);
+		dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
+		dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
 	}
 
 	dest->chatnet = g_strdup(src->chatnet);
@@ -207,16 +217,6 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 	dest->no_autosendcmd = src->no_autosendcmd;
 	dest->unix_socket = src->unix_socket;
 
-	dest->use_tls = src->use_tls;
-	dest->tls_cert = g_strdup(src->tls_cert);
-	dest->tls_pkey = g_strdup(src->tls_pkey);
-	dest->tls_verify = src->tls_verify;
-	dest->tls_cafile = g_strdup(src->tls_cafile);
-	dest->tls_capath = g_strdup(src->tls_capath);
-	dest->tls_ciphers = g_strdup(src->tls_ciphers);
-	dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
-	dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
-
 	return dest;
 }
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index e1313791..fa68c049 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -108,6 +108,25 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn,
 	if (sserver->password != NULL && conn->password == NULL)
 		conn->password = g_strdup(sserver->password);
 
+	conn->use_tls = sserver->use_tls;
+	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
+		conn->tls_cert = g_strdup(sserver->tls_cert);
+	if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
+		conn->tls_pkey = g_strdup(sserver->tls_pkey);
+	if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
+		conn->tls_pass = g_strdup(sserver->tls_pass);
+	conn->tls_verify = sserver->tls_verify;
+	if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
+		conn->tls_cafile = g_strdup(sserver->tls_cafile);
+	if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
+		conn->tls_capath = g_strdup(sserver->tls_capath);
+	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
+		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
+	if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
+		conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
+	if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
+		conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
+
 	signal_emit("server setup fill reconn", 2, conn, sserver);
 }
 
@@ -167,25 +186,6 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
 	if (sserver->port > 0 && conn->port <= 0)
 		conn->port = sserver->port;
 
-	conn->use_tls = sserver->use_tls;
-	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
-		conn->tls_cert = g_strdup(sserver->tls_cert);
-	if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
-		conn->tls_pkey = g_strdup(sserver->tls_pkey);
-	if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
-		conn->tls_pass = g_strdup(sserver->tls_pass);
-	conn->tls_verify = sserver->tls_verify;
-	if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
-		conn->tls_cafile = g_strdup(sserver->tls_cafile);
-	if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
-		conn->tls_capath = g_strdup(sserver->tls_capath);
-	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
-		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
-	if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
-		conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
-	if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
-		conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
-
 	server_setup_fill_reconn(conn, sserver);
 
 	signal_emit("server setup fill server", 2, conn, sserver);

From 34effcec01c01775db7c8575a88e1ae2adbd12de Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 12 Oct 2019 15:46:09 -0700
Subject: [PATCH 1071/1650] Fill more connection information in one spot

---
 src/core/servers-reconnect.c |  4 ----
 src/core/servers-setup.c     | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 2098a6cc..2cbe60b4 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -151,10 +151,6 @@ static int server_reconnect_timeout(void)
 
 static void sserver_connect(SERVER_SETUP_REC *rec, SERVER_CONNECT_REC *conn)
 {
-        conn->family = rec->family;
-	conn->address = g_strdup(rec->address);
-	if (conn->port == 0) conn->port = rec->port;
-
 	server_setup_fill_reconn(conn, rec);
 	server_reconnect_add(conn, rec->last_connect+reconnect_time);
 	server_connect_unref(conn);
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index fa68c049..8662b30c 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -108,6 +108,16 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn,
 	if (sserver->password != NULL && conn->password == NULL)
 		conn->password = g_strdup(sserver->password);
 
+	if (sserver->no_proxy)
+		g_free_and_null(conn->proxy);
+
+	if (sserver->family != 0 && conn->family == 0)
+		conn->family = sserver->family;
+	if (sserver->address && !conn->address)
+		conn->address = g_strdup(sserver->address);
+	if (sserver->port > 0 && conn->port <= 0)
+		conn->port = sserver->port;
+
 	conn->use_tls = sserver->use_tls;
 	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
 		conn->tls_cert = g_strdup(sserver->tls_cert);
@@ -178,14 +188,6 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
 
 	sserver->last_connect = time(NULL);
 
-	if (sserver->no_proxy)
-		g_free_and_null(conn->proxy);
-
-	if (sserver->family != 0 && conn->family == 0)
-		conn->family = sserver->family;
-	if (sserver->port > 0 && conn->port <= 0)
-		conn->port = sserver->port;
-
 	server_setup_fill_reconn(conn, sserver);
 
 	signal_emit("server setup fill server", 2, conn, sserver);

From f9db4019afee3bb5fcc894b2810a640e0f79fed1 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 12 Oct 2019 17:03:40 -0700
Subject: [PATCH 1072/1650] Remove else since prior condition returns

---
 src/core/settings.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 9b50f6f4..18f44257 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -557,7 +557,8 @@ static int backwards_compatibility(const char *module, CONFIG_NODE *node,
 			g_free(new_value);
 			config_changed = TRUE;
 			return new_key != NULL;
-		} else if (g_ascii_strcasecmp(node->key, "actlist_moves") == 0 &&
+		}
+		if (g_ascii_strcasecmp(node->key, "actlist_moves") == 0 &&
 			   node->value != NULL && g_ascii_strcasecmp(node->value, "yes") == 0) {
 			config_node_set_str(mainconfig, parent, "actlist_sort", "recent");
 			config_node_set_str(mainconfig, parent, node->key, NULL);

From 7e6d24420cc5c3e1fb5fcbec999de70e77178093 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sat, 12 Oct 2019 17:09:13 -0700
Subject: [PATCH 1073/1650] Remove resolve_reverse_lookup setting

This setting seems ill advised and breaks TLS verification.

Fixes #1034.
---
 src/core/net-nonblock.c | 42 +----------------------------------------
 src/core/net-nonblock.h |  4 +---
 src/core/servers.c      | 15 +--------------
 src/core/settings.c     |  6 ++++++
 4 files changed, 9 insertions(+), 58 deletions(-)

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 31fbf985..90e4bdab 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -27,13 +27,11 @@
 
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */
-int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
-			       int reverse_lookup)
+int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe)
 {
 	RESOLVED_IP_REC rec;
 	const char *errorstr;
 	int pid;
-	int len;
 
 	g_return_val_if_fail(addr != NULL, FALSE);
 
@@ -57,13 +55,6 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 	rec.error = net_gethostbyname(addr, &rec.ip4, &rec.ip6);
 	if (rec.error == 0) {
 		errorstr = NULL;
-		if (reverse_lookup) {
-			/* reverse lookup the IP, ignore any error */
-			if (rec.ip4.family != 0)
-				net_gethostbyaddr(&rec.ip4, &rec.host4);
-			if (rec.ip6.family != 0)
-				net_gethostbyaddr(&rec.ip6, &rec.host6);
-		}
 	} else {
 		errorstr = net_gethosterror(rec.error);
 		rec.errlen = errorstr == NULL ? 0 : strlen(errorstr)+1;
@@ -72,22 +63,6 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 	g_io_channel_write_block(pipe, &rec, sizeof(rec));
 	if (rec.errlen != 0)
 		g_io_channel_write_block(pipe, (void *) errorstr, rec.errlen);
-	else {
-		if (rec.host4) {
-			len = strlen(rec.host4) + 1;
-			g_io_channel_write_block(pipe, (void *) &len,
-						       sizeof(int));
-			g_io_channel_write_block(pipe, (void *) rec.host4,
-						       len);
-		}
-		if (rec.host6) {
-			len = strlen(rec.host6) + 1;
-			g_io_channel_write_block(pipe, (void *) &len,
-						       sizeof(int));
-			g_io_channel_write_block(pipe, (void *) rec.host6,
-						       len);
-		}
-	}
 
 	if (pid == 0)
 		_exit(99);
@@ -99,12 +74,8 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
 /* get the resolved IP address */
 int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 {
-	int len;
-
 	rec->error = -1;
 	rec->errorstr = NULL;
-	rec->host4 = NULL;
-	rec->host6 = NULL;
 
 	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
 
@@ -120,17 +91,6 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 		   reason, just ignore it. */
 		rec->errorstr = g_malloc0(rec->errlen+1);
 		g_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
-	} else {
-		if (rec->host4) {
-			g_io_channel_read_block(pipe, &len, sizeof(int));
-			rec->host4 = g_malloc0(len);
-			g_io_channel_read_block(pipe, rec->host4, len);
-		}
-		if (rec->host6) {
-			g_io_channel_read_block(pipe, &len, sizeof(int));
-			rec->host6 = g_malloc0(len);
-			g_io_channel_read_block(pipe, rec->host6, len);
-		}
 	}
 
 	return 0;
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 086c9dab..3d2f7354 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -9,12 +9,10 @@ typedef struct {
 	int errlen; /* error text length */
 	char *errorstr; /* error string - dynamically allocated, you'll
 	                   need to free() it yourself unless it's NULL */
-	char *host4, *host6; /* dito */
 } RESOLVED_IP_REC;
 
 /* nonblocking gethostbyname(), PID of the resolver child is returned. */
-int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe,
-			       int reverse_lookup);
+int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe);
 /* get the resolved IP address. returns -1 if some error occurred with read() */
 int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec);
 
diff --git a/src/core/servers.c b/src/core/servers.c
index 20452f8c..50316c7d 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -261,7 +261,6 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 	RESOLVED_IP_REC iprec;
         IPADDR *ip;
 	const char *errormsg;
-	char *servername = NULL;
 
 	g_source_remove(server->connect_tag);
 	server->connect_tag = -1;
@@ -283,11 +282,9 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 	} else if (server->connrec->family == AF_INET) {
 		/* force IPv4 connection */
 		ip = iprec.ip4.family == 0 ? NULL : &iprec.ip4;
-		servername = iprec.host4;
 	} else if (server->connrec->family == AF_INET6) {
 		/* force IPv6 connection */
 		ip = iprec.ip6.family == 0 ? NULL : &iprec.ip6;
-		servername = iprec.host6;
 	} else {
 		/* pick the one that was found, or if both do it like
 		   /SET resolve_prefer_ipv6 says. */
@@ -295,19 +292,13 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 		    (iprec.ip6.family != 0 &&
 		     settings_get_bool("resolve_prefer_ipv6"))) {
 			ip = &iprec.ip6;
-			servername = iprec.host6;
 		} else {
 			ip = &iprec.ip4;
-			servername = iprec.host4;
 		}
 	}
 
 	if (ip != NULL) {
 		/* host lookup ok */
-		if (servername) {
-			g_free(server->connrec->address);
-			server->connrec->address = g_strdup(servername);
-		}
 		server_real_connect(server, ip, NULL);
 		errormsg = NULL;
 	} else {
@@ -333,8 +324,6 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 	}
 
 	g_free(iprec.errorstr);
-	g_free(iprec.host4);
-	g_free(iprec.host6);
 }
 
 SERVER_REC *server_connect(SERVER_CONNECT_REC *conn)
@@ -418,8 +407,7 @@ int server_start_connect(SERVER_REC *server)
 			server->connrec->proxy : server->connrec->address;
 		server->connect_pid =
 			net_gethostbyname_nonblock(connect_address,
-						   server->connect_pipe[1],
-						   settings_get_bool("resolve_reverse_lookup"));
+						   server->connect_pipe[1]);
 		server->connect_tag =
 			g_input_add(server->connect_pipe[0], G_INPUT_READ,
 				    (GInputFunction)
@@ -739,7 +727,6 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto)
 void servers_init(void)
 {
 	settings_add_bool("server", "resolve_prefer_ipv6", FALSE);
-	settings_add_bool("server", "resolve_reverse_lookup", FALSE);
 	lookup_servers = servers = NULL;
 
 	signal_add("chat protocol deinit", (SIGNAL_FUNC) sig_chat_protocol_deinit);
diff --git a/src/core/settings.c b/src/core/settings.c
index 18f44257..f8c0b9df 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -566,6 +566,12 @@ static int backwards_compatibility(const char *module, CONFIG_NODE *node,
 			return TRUE;
 		}
 	}
+	if (g_strcmp0(module, "core") == 0 &&
+			g_strcmp0(node->key, "resolve_reverse_lookup") == 0) {
+		config_node_set_str(mainconfig, parent, node->key, NULL);
+		config_changed = TRUE;
+		return TRUE;
+	}
 	return new_key != NULL;
 }
 

From 5776ca5e0bb36574974f39d52c4c8e19ff686bb1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 13 Oct 2019 21:35:30 +0200
Subject: [PATCH 1074/1650] bottom_startline lost?

---
 src/fe-text/textbuffer-view.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index a031439d..45035fa8 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -1205,14 +1205,14 @@ static void view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 		LINE_REC *prevline;
 
 		prevline = view->buffer->first_line == line ? NULL :
-			textbuffer_line_last(view->buffer);
+			textbuffer_line_last(view->buffer)->prev;
 		view->cache->last_linecount = prevline == NULL ? 0 :
 			view_get_linecount(view, prevline);
 	}
 
+	/* first line in the buffer - this is the most commonly
+	   removed line.. */
 	if (view->buffer->first_line == line) {
-		/* first line in the buffer - this is the most commonly
-		   removed line.. */
 		if (view->bottom_startline == line) {
 			/* very small scrollback.. */
                         view->bottom_startline = view->bottom_startline->next;
@@ -1289,6 +1289,11 @@ void textbuffer_view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 	}
 
 	textbuffer_remove(view->buffer, line);
+	if (view->bottom_startline == NULL) {
+		/* We may have removed the bottom_startline, make sure
+		   that scroll doesn't get stuck */
+		textbuffer_view_init_bottom(view);
+	}
 }
 
 void textbuffer_view_remove_lines_by_level(TEXT_BUFFER_VIEW_REC *view, int level)

From d84f285b91581e21312e44d53cfd8ed5a18e7252 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Tue, 15 Oct 2019 19:07:48 -0700
Subject: [PATCH 1075/1650] Keep unused parameter for API compatibility

---
 src/core/net-nonblock.c | 4 +++-
 src/core/net-nonblock.h | 2 +-
 src/core/servers.c      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 90e4bdab..1ad5f42f 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -27,12 +27,14 @@
 
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */
-int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe)
+int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe, int reverse_lookup)
 {
 	RESOLVED_IP_REC rec;
 	const char *errorstr;
 	int pid;
 
+	(void) reverse_lookup; /* Kept for API backward compatibility */
+
 	g_return_val_if_fail(addr != NULL, FALSE);
 
 	pid = fork();
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 3d2f7354..c93dd9e3 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -12,7 +12,7 @@ typedef struct {
 } RESOLVED_IP_REC;
 
 /* nonblocking gethostbyname(), PID of the resolver child is returned. */
-int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe);
+int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe, int reverse_lookup);
 /* get the resolved IP address. returns -1 if some error occurred with read() */
 int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec);
 
diff --git a/src/core/servers.c b/src/core/servers.c
index 50316c7d..5b850a28 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -407,7 +407,7 @@ int server_start_connect(SERVER_REC *server)
 			server->connrec->proxy : server->connrec->address;
 		server->connect_pid =
 			net_gethostbyname_nonblock(connect_address,
-						   server->connect_pipe[1]);
+						   server->connect_pipe[1], 0);
 		server->connect_tag =
 			g_input_add(server->connect_pipe[0], G_INPUT_READ,
 				    (GInputFunction)

From a827c691836658c9aa5473559a345120ebff4c9d Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Thu, 17 Oct 2019 19:43:29 -0700
Subject: [PATCH 1076/1650] Bump ABI

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 8a9713ce..355a9b14 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 23
+#define IRSSI_ABI_VERSION 24
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From b7f165a6094454b485767ec0dd98d93ded9172d7 Mon Sep 17 00:00:00 2001
From: Mike Quin <mike@elite.uk.com>
Date: Sat, 19 Oct 2019 11:34:15 +0100
Subject: [PATCH 1077/1650] Improve clarity of nick in use message

If irssi's preferred nick is in use irssi will issue a whois command and report some information
on the current user of the nick. As the "is owned by" wording can be confusing to users of networks
with nickname registration, propose rephrasing this to "is in use by".
---
 src/fe-common/irc/module-formats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index a0f6bd29..e36eed92 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -98,7 +98,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "no_such_nick", "{nick $0}: No such nick/channel", 1, { 0 } },
 	{ "nick_in_use", "Nick {nick $0} is already in use", 1, { 0 } },
 	{ "nick_unavailable", "Nick {nick $0} is temporarily unavailable", 1, { 0 } },
-        { "your_nick_owned", "Your nick is owned by {nick $3} {comment $1@$2}", 4, { 0, 0, 0, 0 } },
+        { "your_nick_owned", "Your nick is in use by {nick $3} {comment $1@$2}", 4, { 0, 0, 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Who queries", 0 },

From bdf5d748f2ae93086ab9d047cf6573f999fdad4c Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 31 Oct 2019 21:02:26 +0100
Subject: [PATCH 1078/1650] meson.build: Remove unnecessary -Wall

---
 meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meson.build b/meson.build
index 2ea7bcc7..3ef1de9c 100644
--- a/meson.build
+++ b/meson.build
@@ -446,7 +446,6 @@ configure_file(output : 'irssi-config.h',
 ##########
 
 #### warnings ####
-add_project_arguments('-Wall', language : 'c')
 add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c')
 
 #### personality ####

From 664c38afbaaa0bc4bbb8cb0952e475f11c68f0c0 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 31 Oct 2019 23:49:40 +0100
Subject: [PATCH 1079/1650] Fix some glib deprecation warnings

Most of these have been deprecated since forever (2.2), but they didn't
raise warnings. Now they do, and the warnings are not the most verbose
warnings you could ask for, but, they point in the right direction.

This doesn't handle the GTimeVal deprecation warnings. Those seem
trickier since they cover API, will look into those right after this.
---
 fuzz-support/fuzz.diff                |  6 ++---
 src/core/commands.c                   |  2 +-
 src/core/line-split.c                 |  2 +-
 src/core/net-sendbuffer.c             |  2 +-
 src/fe-common/irc/fe-events-numeric.c |  2 +-
 src/fe-none/irssi.c                   |  6 ++---
 src/fe-text/gui-entry.c               | 32 +++++++++++++--------------
 src/fe-text/irssi.c                   |  6 ++---
 src/irc/core/bans.c                   |  2 +-
 src/irc/dcc/dcc-get.c                 |  4 ++--
 src/irc/dcc/dcc-server.c              |  2 +-
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/fuzz-support/fuzz.diff b/fuzz-support/fuzz.diff
index a3683493..5a3f2176 100644
--- a/fuzz-support/fuzz.diff
+++ b/fuzz-support/fuzz.diff
@@ -150,7 +150,7 @@ index ad79e0c..84d0c5c 100644
 +++ b/src/fe-text/irssi.c
 @@ -314,20 +314,16 @@ int main(int argc, char **argv)
  	textui_finish_init();
- 	main_loop = g_main_new(TRUE);
+ 	main_loop = g_main_loop_new(NULL, TRUE);
  
 +#ifdef __AFL_HAVE_MANUAL_CONTROL
 +	__AFL_INIT();
@@ -162,7 +162,7 @@ index ad79e0c..84d0c5c 100644
  	   can call our dirty-checker after each iteration */
  	while (!quitting) {
 -		term_refresh_freeze();
- 		g_main_iteration(TRUE);
+ 		g_main_context_iteration(NULL, TRUE);
 -                term_refresh_thaw();
 -
 -		if (reload_config) {
@@ -174,7 +174,7 @@ index ad79e0c..84d0c5c 100644
 -		dirty_check();
  	}
  
- 	g_main_destroy(main_loop);
+ 	g_main_loop_unref(main_loop);
 diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
 index b2478c6..cebe260 100644
 --- a/src/fe-text/term-terminfo.c
diff --git a/src/core/commands.c b/src/core/commands.c
index 4ba1ea1c..2805f8c0 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -501,7 +501,7 @@ char *cmd_get_quoted_param(char **data)
 	while (**data != '\0' && (**data != quote ||
 				  ((*data)[1] != ' ' && (*data)[1] != '\0'))) {
 		if (**data == '\\' && (*data)[1] != '\0')
-                        g_memmove(*data, (*data)+1, strlen(*data));
+                        memmove(*data, (*data)+1, strlen(*data));
 		(*data)++;
 	}
 
diff --git a/src/core/line-split.c b/src/core/line-split.c
index da84a334..b1e67914 100644
--- a/src/core/line-split.c
+++ b/src/core/line-split.c
@@ -96,7 +96,7 @@ int line_split(const char *data, int len, char **output, LINEBUF_REC **buffer)
 
 	if (rec->remove > 0) {
 		rec->len -= rec->remove;
-		g_memmove(rec->str, rec->str+rec->remove, rec->len);
+		memmove(rec->str, rec->str+rec->remove, rec->len);
 		rec->remove = 0;
 	}
 
diff --git a/src/core/net-sendbuffer.c b/src/core/net-sendbuffer.c
index 2272de1d..a085fac7 100644
--- a/src/core/net-sendbuffer.c
+++ b/src/core/net-sendbuffer.c
@@ -67,7 +67,7 @@ static int buffer_send(NET_SENDBUF_REC *rec)
 
 	if (ret > 0) {
                 rec->bufpos -= ret;
-		g_memmove(rec->buffer, rec->buffer+ret, rec->bufpos);
+		memmove(rec->buffer, rec->buffer+ret, rec->bufpos);
 	}
 	return FALSE;
 }
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index b4525db5..a6bbaa27 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -600,7 +600,7 @@ static void print_event_received(IRC_SERVER_REC *server, const char *data,
 		args = g_strdup(ptr);
 		ptr = strstr(args, " :");
 		if (ptr != NULL)
-			g_memmove(ptr+1, ptr+2, strlen(ptr+1));
+			memmove(ptr+1, ptr+2, strlen(ptr+1));
 	}
 
 	recoded = recode_in(SERVER(server), args, NULL);
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index c61d74f7..e7b4c427 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -103,9 +103,9 @@ int main(int argc, char **argv)
 	do {
 		reload = FALSE;
 		module_load(autoload_module, NULL);
-		main_loop = g_main_new(TRUE);
-		g_main_run(main_loop);
-		g_main_destroy(main_loop);
+		main_loop = g_main_loop_new(NULL, TRUE);
+		g_main_loop_run(main_loop);
+		g_main_loop_unref(main_loop);
 	}
 	while (reload);
 	noui_deinit();
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 095c48a1..8ff7e485 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -611,13 +611,13 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
         entry_text_grow(entry, len);
 
         /* make space for the string */
-	g_memmove(entry->text + entry->pos + len, entry->text + entry->pos,
-		  (entry->text_len-entry->pos + 1) * sizeof(unichar));
+	memmove(entry->text + entry->pos + len, entry->text + entry->pos,
+	        (entry->text_len-entry->pos + 1) * sizeof(unichar));
 
 	/* make space for the color */
 	if (entry->uses_extents) {
-		g_memmove(entry->extents + entry->pos + len + 1, entry->extents + entry->pos + 1,
-			  (entry->text_len-entry->pos) * sizeof(char *));
+		memmove(entry->extents + entry->pos + len + 1, entry->extents + entry->pos + 1,
+		        (entry->text_len-entry->pos) * sizeof(char *));
 		for (i = 0; i < len; i++) {
 			entry->extents[entry->pos + i + 1] = NULL;
 		}
@@ -662,12 +662,12 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 	entry_text_grow(entry, 1);
 
 	/* make space for the string */
-	g_memmove(entry->text + entry->pos + 1, entry->text + entry->pos,
-		  (entry->text_len-entry->pos + 1) * sizeof(unichar));
+	memmove(entry->text + entry->pos + 1, entry->text + entry->pos,
+	        (entry->text_len-entry->pos + 1) * sizeof(unichar));
 
 	if (entry->uses_extents) {
-		g_memmove(entry->extents + entry->pos + 1 + 1, entry->extents + entry->pos + 1,
-			  (entry->text_len-entry->pos) * sizeof(char *));
+		memmove(entry->extents + entry->pos + 1 + 1, entry->extents + entry->pos + 1,
+		        (entry->text_len-entry->pos) * sizeof(char *));
 		entry->extents[entry->pos + 1] = NULL;
 	}
 
@@ -838,8 +838,8 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 		while (entry->pos-size-w > 0 &&
 		       i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
 
-	g_memmove(entry->text + entry->pos - size, entry->text + entry->pos,
-		  (entry->text_len-entry->pos+1) * sizeof(unichar));
+	memmove(entry->text + entry->pos - size, entry->text + entry->pos,
+	        (entry->text_len-entry->pos+1) * sizeof(unichar));
 
 	if (entry->uses_extents) {
 		for (i = entry->pos - size; i < entry->pos; i++) {
@@ -847,8 +847,8 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 				g_free(entry->extents[i+1]);
 			}
 		}
-		g_memmove(entry->extents + entry->pos - size + 1, entry->extents + entry->pos + 1,
-			  (entry->text_len - entry->pos) * sizeof(void *)); /* no null terminator here */
+		memmove(entry->extents + entry->pos - size + 1, entry->extents + entry->pos + 1,
+		        (entry->text_len - entry->pos) * sizeof(void *)); /* no null terminator here */
 		for (i = 0; i < size; i++) {
 			entry->extents[entry->text_len - i] = NULL;
 		}
@@ -876,16 +876,16 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
 		while (entry->pos+size < entry->text_len &&
 		       i_wcwidth(entry->text[entry->pos+size]) == 0) size++;
 
-	g_memmove(entry->text + entry->pos, entry->text + entry->pos + size,
-	          (entry->text_len-entry->pos-size+1) * sizeof(unichar));
+	memmove(entry->text + entry->pos, entry->text + entry->pos + size,
+	        (entry->text_len-entry->pos-size+1) * sizeof(unichar));
 
 	if (entry->uses_extents) {
 		int i;
 		for (i = 0; i < size; i++) {
 			g_free(entry->extents[entry->pos + i + 1]);
 		}
-		g_memmove(entry->extents + entry->pos + 1, entry->extents + entry->pos + size + 1,
-			  (entry->text_len-entry->pos-size) * sizeof(char *));
+		memmove(entry->extents + entry->pos + 1, entry->extents + entry->pos + size + 1,
+		        (entry->text_len-entry->pos-size) * sizeof(char *));
 		for (i = 0; i < size; i++) {
 			entry->extents[entry->text_len - i] = NULL;
 		}
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 8b466905..ca784bba 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -334,7 +334,7 @@ int main(int argc, char **argv)
 
 	g_log_set_always_fatal(loglev);
 	textui_finish_init();
-	main_loop = g_main_new(TRUE);
+	main_loop = g_main_loop_new(NULL, TRUE);
 
 	/* Does the same as g_main_run(main_loop), except we
 	   can call our dirty-checker after each iteration */
@@ -348,11 +348,11 @@ int main(int argc, char **argv)
 		dirty_check();
 
 		term_refresh_freeze();
-		g_main_iteration(TRUE);
+		g_main_context_iteration(NULL, TRUE);
 		term_refresh_thaw();
 	}
 
-	g_main_destroy(main_loop);
+	g_main_loop_unref(main_loop);
 	textui_deinit();
 
 	session_upgrade(); /* if we /UPGRADEd, start the new process */
diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index a61742f3..8a43d398 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -75,7 +75,7 @@ char *ban_get_mask(IRC_CHANNEL_REC *channel, const char *nick, int ban_type)
         size = (int) (host-user);
 	if (size >= 10) {
 		/* too long user mask */
-		g_memmove(user+1, user+(size-9), strlen(user+(size-9))+1);
+		memmove(user+1, user+(size-9), strlen(user+(size-9))+1);
 	}
 	return str;
 }
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 0191c679..73a06590 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -477,8 +477,8 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 	if (len > 1 && *fname == '"' && fname[len-1] == '"') {
 		/* "file name" - MIRC sends filenames with spaces like this */
 		fname[len-1] = '\0';
-		g_memmove(fname, fname+1, len);
-                quoted = TRUE;
+		memmove(fname, fname+1, len);
+		quoted = TRUE;
 	}
 
 	if (passive && port != 0) {
diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c
index 0a6c0acf..9c20e9bf 100644
--- a/src/irc/dcc/dcc-server.c
+++ b/src/irc/dcc/dcc-server.c
@@ -261,7 +261,7 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg)
 			if (len > 1 && *fname == '"' && fname[len-1] == '"') {
 				/* "file name" - MIRC sends filenames with spaces like this */
 				fname[len-1] = '\0';
-				g_memmove(fname, fname+1, len);
+				memmove(fname, fname+1, len);
 				quoted = TRUE;
 			}
 

From 1cdb4bc311ba0c568c68ae26348bbb1eee273580 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 6 Dec 2019 10:56:25 +0100
Subject: [PATCH 1080/1650] remove GTimeVal following glib 2.61.2 deprecation

---
 src/common.h                          |  2 +-
 src/core/misc.c                       |  6 ++++++
 src/core/misc.h                       |  7 +++++--
 src/core/server-rec.h                 |  2 +-
 src/fe-common/core/fe-core-commands.c |  8 ++++----
 src/fe-common/core/fe-server.c        |  2 +-
 src/fe-common/irc/fe-ctcp.c           | 15 ++++++++-------
 src/fe-text/gui-readline.c            | 14 +++++++-------
 src/fe-text/statusbar-items.c         |  6 +++---
 src/irc/core/irc-commands.c           | 15 +++++----------
 src/irc/core/irc-servers.c            | 26 +++++++++++++-------------
 src/irc/core/irc-servers.h            |  4 ++--
 src/irc/core/irc.c                    | 12 ++++++------
 src/irc/core/lag.c                    | 24 ++++++++++++------------
 14 files changed, 74 insertions(+), 69 deletions(-)

diff --git a/src/common.h b/src/common.h
index 355a9b14..d1f34870 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 24
+#define IRSSI_ABI_VERSION 25
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/core/misc.c b/src/core/misc.c
index c959ad91..25e4f32b 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -94,8 +94,11 @@ int g_input_add_poll(int fd, int priority, int condition,
 	return ret;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2)
 {
+#pragma GCC diagnostic pop
 	if (tv1->tv_sec < tv2->tv_sec)
 		return -1;
 	if (tv1->tv_sec > tv2->tv_sec)
@@ -105,8 +108,11 @@ int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2)
 		tv1->tv_usec > tv2->tv_usec ? 1 : 0;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2)
 {
+#pragma GCC diagnostic pop
 	long secs, usecs;
 
 	secs = tv1->tv_sec - tv2->tv_sec;
diff --git a/src/core/misc.h b/src/core/misc.h
index 65534cdc..cd5cf29c 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -11,11 +11,14 @@ int g_input_add_poll(int fd, int priority, int condition,
 typedef void* (*FOREACH_FIND_FUNC) (void *item, void *data);
 typedef int (*COLUMN_LEN_FUNC)(void *data);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 /* Returns 1 if tv1 > tv2, -1 if tv2 > tv1 or 0 if they're equal. */
-int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2);
+int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
 /* Returns "tv1 - tv2", returns the result in milliseconds. Note that
    if the difference is too large, the result might be invalid. */
-long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2);
+long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
+#pragma GCC diagnostic pop
 
 GSList *gslist_find_string(GSList *list, const char *key);
 GSList *gslist_find_icase_string(GSList *list, const char *key);
diff --git a/src/core/server-rec.h b/src/core/server-rec.h
index e2dcf5ce..c36c8abb 100644
--- a/src/core/server-rec.h
+++ b/src/core/server-rec.h
@@ -37,7 +37,7 @@ unsigned int usermode_away:1;
 unsigned int banned:1; /* not allowed to connect to this server */
 unsigned int dns_error:1; /* DNS said the host doesn't exist */
 
-GTimeVal lag_sent; /* 0 or time when last lag query was sent to server */
+gint64 lag_sent; /* 0 or time when last lag query was sent to server */
 time_t lag_last_check; /* last time we checked lag */
 int lag; /* server lag in milliseconds */
 
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 3da998bf..9a2c547f 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -65,7 +65,7 @@ int command_hide_output;
    the line had one or two command chars, and which one.. */
 static const char *current_cmdline;
 
-static GTimeVal time_command_last, time_command_now;
+static gint64 time_command_last, time_command_now;
 static int last_command_cmd, command_cmd;
 
 /* SYNTAX: ECHO [-window <name>] [-level <level>] <text> */
@@ -222,7 +222,7 @@ static void event_command(const char *data)
 	time_command_last = time_command_now;
 	last_command_cmd = command_cmd;
 
-	g_get_current_time(&time_command_now);
+	time_command_now = g_get_real_time();
 	command_cmd = *data != '\0' &&
 		strchr(settings_get_str("cmdchars"), *data) != NULL;
 
@@ -271,7 +271,7 @@ static void event_default_command(const char *data, void *server,
 
 	/* maybe we're copy+pasting text? check how long it was since the
 	   last line */
-	diff = get_timeval_diff(&time_command_now, &time_command_last);
+	diff = time_command_now - time_command_last;
 	if (item != NULL && !last_command_cmd && diff < PASTE_CHECK_SPEED) {
 		signal_emit("send text", 3, current_cmdline, active_win->active_server, active_win->active);
 		command_cmd = FALSE;
@@ -334,7 +334,7 @@ void fe_core_commands_init(void)
 	command_hide_output = 0;
 
 	command_cmd = FALSE;
-	memset(&time_command_now, 0, sizeof(GTimeVal));
+	time_command_now = 0;
 
 	command_bind("echo", NULL, (SIGNAL_FUNC) cmd_echo);
 	command_bind("version", NULL, (SIGNAL_FUNC) cmd_version);
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index be5ea4ab..f5f96324 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -415,7 +415,7 @@ static void sig_server_lag_disconnected(SERVER_REC *server)
 
 	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE,
 		    TXT_LAG_DISCONNECTED, server->connrec->address,
-		    time(NULL)-server->lag_sent.tv_sec);
+		    time(NULL)-(server->lag_sent / G_TIME_SPAN_SECOND));
 }
 
 static void sig_server_reconnect_removed(RECONNECT_REC *reconnect)
diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index 63d7ecd3..c73399be 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -123,22 +123,23 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
 			    const char *nick, const char *addr,
 			    const char *target)
 {
-	GTimeVal tv, tv2;
+	gint64 tv, tv2;
 	long usecs;
 
 	g_return_if_fail(data != NULL);
 
-	if (sscanf(data, "%ld %ld", &tv2.tv_sec, &tv2.tv_usec) < 1) {
-                char *tmp = g_strconcat("PING ", data, NULL);
+	if (sscanf(data, "%ld %ld", &tv, &tv2) < 1) {
+		char *tmp = g_strconcat("PING ", data, NULL);
 		ctcp_default_reply(server, tmp, nick, addr, target);
 		g_free(tmp);
 		return;
 	}
 
-        g_get_current_time(&tv);
-	usecs = get_timeval_diff(&tv, &tv2);
-        printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
-                    IRCTXT_CTCP_PING_REPLY, nick, usecs/1000, usecs%1000);
+	tv2 += tv * G_TIME_SPAN_SECOND;
+	tv = g_get_real_time();
+	usecs = tv - tv2;
+	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
+		    IRCTXT_CTCP_PING_REPLY, nick, usecs / G_TIME_SPAN_SECOND, usecs % G_TIME_SPAN_SECOND);
 }
 
 void fe_ctcp_init(void)
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 8f5594cb..d56ebfb8 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -58,7 +58,7 @@ static int escape_next_key;
 
 static int readtag;
 static unichar prev_key;
-static GTimeVal last_keypress;
+static gint64 last_keypress;
 
 static int paste_detect_time, paste_verify_line_count;
 static char *paste_entry;
@@ -395,8 +395,8 @@ static void insert_paste_prompt(void)
 
 static void sig_gui_key_pressed(gpointer keyp)
 {
-	GTimeVal now;
-        unichar key;
+	gint64 now;
+	unichar key;
 	char str[20];
 	int ret;
 
@@ -407,7 +407,7 @@ static void sig_gui_key_pressed(gpointer keyp)
 		return;
 	}
 
-        g_get_current_time(&now);
+	now = g_get_real_time();
 
 	if (key < 32) {
 		/* control key */
@@ -875,7 +875,7 @@ static void key_paste_start(void)
 
 time_t get_idle_time(void)
 {
-	return last_keypress.tv_sec;
+	return last_keypress / G_TIME_SPAN_SECOND;
 }
 
 static void key_scroll_backward(void)
@@ -1154,8 +1154,8 @@ void gui_readline_init(void)
         paste_old_prompt = NULL;
 	paste_timeout_id = -1;
 	paste_bracketed_mode = FALSE;
-	g_get_current_time(&last_keypress);
-        input_listen_init(STDIN_FILENO);
+	last_keypress = g_get_real_time();
+	input_listen_init(STDIN_FILENO);
 
 	settings_add_bool("lookandfeel", "term_appkey_mode", TRUE);
 	settings_add_str("history", "scroll_page_count", "/2");
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index c6770e32..4bca9403 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -333,15 +333,15 @@ static int get_lag(SERVER_REC *server, int *unknown)
 		return 0;
 	}
 
-	if (server->lag_sent.tv_sec == 0) {
+	if (server->lag_sent == 0) {
 		/* no lag queries going on currently */
                 return server->lag;
 	}
 
-        /* we're not sure about our current lag.. */
+	/* we're not sure about our current lag.. */
 	*unknown = TRUE;
 
-        lag = (long) (time(NULL)-server->lag_sent.tv_sec);
+	lag = (long) (time(NULL) - (server->lag_sent / G_TIME_SPAN_SECOND));
 	if (server->lag/1000 > lag) {
 		/* we've been waiting the lag reply less time than
 		   what last known lag was -> use the last known lag */
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 6737748f..f6c25641 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -528,7 +528,7 @@ static void cmd_whowas(const char *data, IRC_SERVER_REC *server)
 /* SYNTAX: PING [<nick> | <channel> | *] */
 static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
 {
-	GTimeVal tv;
+	gint64 tv;
 	char *str;
 
 	CMD_IRC_SERVER(server);
@@ -539,9 +539,9 @@ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 		data = window_item_get_target(item);
 	}
 
-	g_get_current_time(&tv);
+	tv = g_get_real_time();
 
-	str = g_strdup_printf("%s PING %ld %ld", data, tv.tv_sec, tv.tv_usec);
+	str = g_strdup_printf("%s PING %ld %ld", data, tv / G_TIME_SPAN_SECOND, tv % G_TIME_SPAN_SECOND);
 	signal_emit("command ctcp", 3, str, server, item);
 	g_free(str);
 }
@@ -616,13 +616,8 @@ static void cmd_wait(const char *data, IRC_SERVER_REC *server)
 
 	n = atoi(msecs);
 	if (server != NULL && n > 0) {
-		g_get_current_time(&server->wait_cmd);
-		server->wait_cmd.tv_sec += n/1000;
-		server->wait_cmd.tv_usec += n%1000;
-		if (server->wait_cmd.tv_usec >= 1000) {
-			server->wait_cmd.tv_sec++;
-			server->wait_cmd.tv_usec -= 1000;
-		}
+		server->wait_cmd = g_get_real_time();
+		server->wait_cmd += n * G_TIME_SPAN_MILLISECOND;
 	}
 	cmd_params_free(free_arg);
 }
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 3ec0bba5..9779ab58 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -294,8 +294,8 @@ static void server_init(IRC_SERVER_REC *server)
 
 	/* prevent the queue from sending too early, we have a max cut off of 120 secs */
 	/* this will reset to 1 sec after we get the 001 event */
-	g_get_current_time(&server->wait_cmd);
-	g_time_val_add(&server->wait_cmd, 120 * G_USEC_PER_SEC);
+	server->wait_cmd = g_get_real_time();
+	server->wait_cmd += 120 * G_USEC_PER_SEC;
 }
 
 SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
@@ -559,21 +559,21 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
 		return;
 	}
 
-	g_get_current_time(&server->last_cmd);
+	server->last_cmd = g_get_real_time();
 
 	/* A bit kludgy way to do the flood protection. In ircnet, there
 	   actually is 1sec / 100 bytes penalty, but we rather want to deal
 	   with the max. 1000 bytes input buffer problem. If we send more
 	   than that with the burst, we'll get excess flooded. */
 	if (len < 100 || server->cmd_queue_speed <= 10)
-		server->wait_cmd.tv_sec = 0;
+		server->wait_cmd = 0;
 	else {
-		memcpy(&server->wait_cmd, &server->last_cmd, sizeof(GTimeVal));
-		g_time_val_add(&server->wait_cmd, (2 + len/100) * G_USEC_PER_SEC);
+		server->wait_cmd = server->last_cmd;
+		server->wait_cmd += (2 + len / 100) * G_USEC_PER_SEC;
 	}
 }
 
-static int server_cmd_timeout(IRC_SERVER_REC *server, GTimeVal *now)
+static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 {
 	REDIRECT_REC *redirect;
         GSList *link;
@@ -587,10 +587,10 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, GTimeVal *now)
 	if (server->cmdcount == 0 && server->cmdqueue == NULL)
 		return 0;
 
-	if (g_timeval_cmp(now, &server->wait_cmd) == -1)
+	if (now < server->wait_cmd)
 		return 1;
 
-	usecs = get_timeval_diff(now, &server->last_cmd);
+	usecs = (now - server->last_cmd) / G_TIME_SPAN_MILLISECOND;
 	if (usecs < server->cmd_queue_speed)
 		return 1;
 
@@ -626,13 +626,13 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, GTimeVal *now)
 /* check every now and then if there's data to be sent in command buffer */
 static int servers_cmd_timeout(void)
 {
-	GTimeVal now;
+	gint64 now;
 	GSList *tmp;
 	int keep = 0;
 
-	g_get_current_time(&now);
+	now = g_get_real_time();
 	for (tmp = servers; tmp != NULL; tmp = tmp->next) {
-		keep |= server_cmd_timeout(tmp->data, &now);
+		keep |= server_cmd_timeout(tmp->data, now);
 	}
 	if (keep)
 		return 1;
@@ -735,7 +735,7 @@ static void event_connected(IRC_SERVER_REC *server, const char *data, const char
 	server->real_connect_time = time(NULL);
 
 	/* let the queue send now that we are identified */
-	g_get_current_time(&server->wait_cmd);
+	server->wait_cmd = g_get_real_time();
 
 	if (server->connrec->usermode != NULL) {
 		/* Send the user mode, before the autosendcmd.
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 2757db0d..b7d31038 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -113,8 +113,8 @@ struct _IRC_SERVER_REC {
 			 how many messages can be sent before starting the
 			 flood control */
 	GSList *cmdqueue; /* command, redirection, ... */
-	GTimeVal wait_cmd; /* don't send anything to server before this */
-	GTimeVal last_cmd; /* last time command was sent to server */
+	gint64 wait_cmd; /* don't send anything to server before this */
+	gint64 last_cmd; /* last time command was sent to server */
 
 	int max_cmds_at_once; /* How many messages can be sent immediately before timeouting starts */
 	int cmd_queue_speed; /* Timeout between sending commands */
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 51770aaf..ef7a3ad1 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -140,15 +140,15 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 /* Send command to IRC server */
 void irc_send_cmd(IRC_SERVER_REC *server, const char *cmd)
 {
-	GTimeVal now;
+	gint64 now;
 	int send_now;
 
-        g_get_current_time(&now);
-	send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 &&
-		(server->cmdcount < server->max_cmds_at_once ||
-		 server->cmd_queue_speed <= 0);
+	now = g_get_real_time();
+	send_now = now >= server->wait_cmd &&
+	           (server->cmdcount < server->max_cmds_at_once ||
+		    server->cmd_queue_speed <= 0);
 
-        irc_send_cmd_full(server, cmd, send_now, FALSE, FALSE);
+	irc_send_cmd_full(server, cmd, send_now, FALSE, FALSE);
 }
 
 /* Send command to IRC server */
diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index d3d6118d..66b0914a 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -30,7 +30,7 @@ static int timeout_tag;
 
 static void lag_get(IRC_SERVER_REC *server)
 {
-	g_get_current_time(&server->lag_sent);
+	server->lag_sent = g_get_real_time();
 	server->lag_last_check = time(NULL);
 
 	server_redirect_event(server, "ping", 1, NULL, FALSE,
@@ -48,18 +48,18 @@ static void lag_ping_error(IRC_SERVER_REC *server)
 static void lag_event_pong(IRC_SERVER_REC *server, const char *data,
 			   const char *nick, const char *addr)
 {
-	GTimeVal now;
+	gint64 now;
 
 	g_return_if_fail(data != NULL);
 
-	if (server->lag_sent.tv_sec == 0) {
+	if (server->lag_sent == 0) {
 		/* not expecting lag reply.. */
 		return;
 	}
 
-	g_get_current_time(&now);
-	server->lag = (int) get_timeval_diff(&now, &server->lag_sent);
-	memset(&server->lag_sent, 0, sizeof(server->lag_sent));
+	now = g_get_real_time();
+	server->lag = now - server->lag_sent;
+	server->lag_sent = 0;
 
 	signal_emit("server lag", 1, server);
 }
@@ -76,8 +76,8 @@ static void sig_unknown_command(IRC_SERVER_REC *server, const char *data)
 		   trying alternative methods to detect lag with these
 		   servers. */
 		server->disable_lag = TRUE;
-		server->lag_sent.tv_sec = 0;
-                server->lag = 0;
+		server->lag_sent = 0;
+		server->lag = 0;
 	}
 	g_free(params);
 }
@@ -102,16 +102,16 @@ static int sig_check_lag(void)
 		if (!IS_IRC_SERVER(rec) || rec->disable_lag)
 			continue;
 
-		if (rec->lag_sent.tv_sec != 0) {
+		if (rec->lag_sent != 0) {
 			/* waiting for lag reply */
-			if (max_lag > 1 && now-rec->lag_sent.tv_sec > max_lag) {
+			if (max_lag > 1 && now - rec->lag_sent > max_lag * G_TIME_SPAN_SECOND) {
 				/* too much lag, disconnect */
 				signal_emit("server lag disconnect", 1, rec);
 				rec->connection_lost = TRUE;
 				server_disconnect((SERVER_REC *) rec);
 			}
-		} else if (rec->lag_last_check+lag_check_time < now &&
-			 rec->cmdcount == 0 && rec->connected) {
+		} else if (rec->lag_last_check + lag_check_time < now && rec->cmdcount == 0 &&
+		           rec->connected) {
 			/* no commands in buffer - get the lag */
 			lag_get(rec);
 		}

From 7d44964dcd37a32ef56fedae49d1631c4418b6ab Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 9 Dec 2019 22:47:59 -0500
Subject: [PATCH 1081/1650] fix #641

Track the address family of the last failed connection attempt
(either immediately or during TLS handshake), then disprefer
that address family during reconnection.
---
 src/core/server-connect-rec.h |  2 ++
 src/core/servers-reconnect.c  |  1 +
 src/core/servers.c            | 15 ++++++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index fa348769..2f68bd04 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -11,6 +11,7 @@ int proxy_port;
 char *proxy_string, *proxy_string_after, *proxy_password;
 
 unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */
+unsigned short chosen_family; /* family actually chosen during name resolution */
 char *tag; /* try to keep this tag when connected to server */
 char *address;
 int port;
@@ -43,5 +44,6 @@ unsigned int unix_socket:1; /* Connect using named unix socket */
 unsigned int use_tls:1; /* this connection uses TLS */
 unsigned int tls_verify:1;
 unsigned int no_connect:1; /* don't connect() at all, it's done by plugin */
+unsigned short last_failed_family; /* #641: if we failed to connect to ipv6, try ipv4 and vice versa */
 char *channels;
 char *away_reason;
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 2cbe60b4..0cfac2ec 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -168,6 +168,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
         server_connect_ref(dest);
 	dest->type = module_get_uniq_id("SERVER CONNECT", 0);
 	dest->reconnection = src->reconnection;
+	dest->last_failed_family = src->last_failed_family;
 	dest->proxy = g_strdup(src->proxy);
         dest->proxy_port = src->proxy_port;
 	dest->proxy_string = g_strdup(src->proxy_string);
diff --git a/src/core/servers.c b/src/core/servers.c
index 20452f8c..27f788bb 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -156,6 +156,7 @@ static void server_connect_callback_init(SERVER_REC *server, GIOChannel *handle)
 	error = net_geterror(handle);
 	if (error != 0) {
 		server->connection_lost = TRUE;
+		server->connrec->last_failed_family = server->connrec->chosen_family;
 		server_connect_failed(server, g_strerror(error));
 		return;
 	}
@@ -176,6 +177,7 @@ static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *han
 	error = irssi_ssl_handshake(handle);
 	if (error == -1) {
 		server->connection_lost = TRUE;
+		server->connrec->last_failed_family = server->connrec->chosen_family;
 		server_connect_failed(server, NULL);
 		return;
 	}
@@ -216,6 +218,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		return;
 
 	if (ip != NULL) {
+		server->connrec->chosen_family = ip->family;
 		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
@@ -241,9 +244,11 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 			server->no_reconnect = TRUE;
 
 		server->connection_lost = TRUE;
+		server->connrec->last_failed_family = ip->family;
 		server_connect_failed(server, errmsg2 ? errmsg2 : errmsg);
 		g_free(errmsg2);
 	} else {
+		server->connrec->last_failed_family = 0;
 		server->handle = net_sendbuffer_create(handle, 0);
 		if (server->connrec->use_tls)
 			server_connect_callback_init_ssl(server, handle);
@@ -289,11 +294,15 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 		ip = iprec.ip6.family == 0 ? NULL : &iprec.ip6;
 		servername = iprec.host6;
 	} else {
-		/* pick the one that was found, or if both do it like
-		   /SET resolve_prefer_ipv6 says. */
+		/* pick the one that was found. if both were found:
+		   1. disprefer the last one that failed
+		   2. prefer ipv4 over ipv6 unless resolve_prefer_ipv6 is set
+		*/
 		if (iprec.ip4.family == 0 ||
 		    (iprec.ip6.family != 0 &&
-		     settings_get_bool("resolve_prefer_ipv6"))) {
+		     (server->connrec->last_failed_family == AF_INET ||
+		      (settings_get_bool("resolve_prefer_ipv6") &&
+		       server->connrec->last_failed_family != AF_INET6)))) {
 			ip = &iprec.ip6;
 			servername = iprec.host6;
 		} else {

From b8be2906401cd9071276b68a81516b4954e31676 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 8 Jan 2020 10:15:47 +0100
Subject: [PATCH 1082/1650] Update src/irc/core/lag.c

Co-Authored-By: dx <dx@dxzone.com.ar>
---
 src/irc/core/lag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index 66b0914a..6af8524c 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -58,7 +58,7 @@ static void lag_event_pong(IRC_SERVER_REC *server, const char *data,
 	}
 
 	now = g_get_real_time();
-	server->lag = now - server->lag_sent;
+	server->lag = (now - server->lag_sent) / G_TIME_SPAN_MILLISECOND;
 	server->lag_sent = 0;
 
 	signal_emit("server lag", 1, server);

From e59c42bcc0a4c1a353d39e7e253adc293a152988 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 7 Feb 2020 16:33:53 +0100
Subject: [PATCH 1083/1650] refine zero width input test in empty line

fixes #1153
---
 src/fe-text/gui-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 8ff7e485..d1cc8811 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -654,7 +654,7 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 	if (chr == 0 || chr == 13 || chr == 10)
 		return; /* never insert NUL, CR or LF characters */
 
-	if (entry->utf8 && entry->pos == 0 && i_wcwidth(chr) == 0)
+	if (entry->utf8 && entry->pos == 0 && unichar_isprint(chr) && i_wcwidth(chr) == 0)
 		return;
 
 	gui_entry_redraw_from(entry, entry->pos);

From 5dba9fd0cc1839f13a0859420fcc9373f9b7a276 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Sun, 9 Feb 2020 12:40:09 +0100
Subject: [PATCH 1084/1650] Search for word anywhere, not only from the
 beginning of string

---
 src/fe-common/core/keyboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index 8f90b1ad..986ee7bd 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -772,7 +772,7 @@ static void cmd_show_keys(const char *searchkey, int full)
 
 			if ((len == 0 ||
 			     (full ? strncmp(rec->key, searchkey, len) == 0 :
-			             g_ascii_strncasecmp(rec->key, searchkey, len) == 0)) &&
+			             g_strrstr(rec->key, searchkey) != NULL)) &&
 			    (!full || rec->key[len] == '\0')) {
 				printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_BIND_LIST,
 					    rec->key, rec->info->id, rec->data == NULL ? "" : rec->data);

From 03295b73b4d524b082b307a4ac3c437f92902c7b Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 17 Feb 2020 19:55:38 +0100
Subject: [PATCH 1085/1650] Improve server help

---
 docs/help/in/server.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 2e757260..593b144d 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -56,6 +56,8 @@
     disconnected unless you prepend the server with the '+' character; the same
     method is applicable to the CONNECT parameter.
 
+    Specify '-' as password to remove a server password
+
 %9Examples:%9
 
     /SERVER

From 43092a5bcc95e75576eb175a4cacddbbd8449a9e Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 19 Feb 2020 16:55:11 +0100
Subject: [PATCH 1086/1650] Improve server help

---
 docs/help/in/server.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 593b144d..d7640beb 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -56,7 +56,7 @@
     disconnected unless you prepend the server with the '+' character; the same
     method is applicable to the CONNECT parameter.
 
-    Specify '-' as password to remove a server password
+    Specify '-' as password to remove a added server password
 
 %9Examples:%9
 
@@ -66,6 +66,7 @@
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
     /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
     /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
+    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
     /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
     /SERVER PURGE orwell.freenode.net

From ca04e0ba5de0f1fc6c93326373e33d0e1587df56 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 9 Mar 2020 14:15:40 +0100
Subject: [PATCH 1087/1650] -time was missing in /ignore output and made it
 human-readable

---
 src/fe-common/core/fe-ignore.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 54ab6a55..e34055bc 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -19,6 +19,7 @@
 */
 
 #include "module.h"
+#include <time.h>
 #include <irssi/src/fe-common/core/module-formats.h>
 #include <irssi/src/core/signals.h>
 #include <irssi/src/core/commands.h>
@@ -48,6 +49,8 @@ static void ignore_print(int index, IGNORE_REC *rec)
 {
 	GString *options;
 	char *key, *levels;
+	struct tm ts;
+	char buf[20];
 
 	key = ignore_get_key(rec);
 	levels = bits2level(rec->level);
@@ -67,6 +70,11 @@ static void ignore_print(int index, IGNORE_REC *rec)
 		g_string_append_printf(options, "-network %s ", rec->servertag);
 	if (rec->pattern != NULL)
 		g_string_append_printf(options, "-pattern %s ", rec->pattern);
+	if (rec->unignore_time != NULL) {
+		ts = *localtime(&rec->unignore_time);
+		strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ts);
+		g_string_append_printf(options, "ignore ends: %s ", buf);
+	}
 
 	if (options->len > 1) g_string_truncate(options, options->len-1);
 

From 7e898fdcf4ab2d89977b2ef8db448986b8b68a37 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Thu, 12 Mar 2020 22:52:12 +0100
Subject: [PATCH 1088/1650] Make sure witem exists

---
 src/fe-common/core/fe-core-commands.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 9a2c547f..ea162e08 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -155,7 +155,9 @@ static void cmd_cat(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		return;
 	}
 
-	target = g_hash_table_lookup(optlist, "window") != NULL ? item->name : NULL;
+	target = item != NULL && g_hash_table_lookup(optlist, "window") != NULL
+			? item->name
+			: NULL;
 
 	g_io_channel_set_encoding(handle, NULL, NULL);
 	g_io_channel_seek_position(handle, fpos, G_SEEK_SET, NULL);

From 1ad1083f84572e26467c27752545ddce5fd353a2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 17 Mar 2020 00:54:23 +0000
Subject: [PATCH 1089/1650] improve wording

---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index d7640beb..beb75114 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -56,7 +56,7 @@
     disconnected unless you prepend the server with the '+' character; the same
     method is applicable to the CONNECT parameter.
 
-    Specify '-' as password to remove a added server password
+    Specify '-' as password to remove a server password
 
 %9Examples:%9
 

From 22851686f5b88ac83ca49e80e743ed50d18c57af Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 17 Mar 2020 00:58:48 +0000
Subject: [PATCH 1090/1650] simplify logic

---
 src/fe-common/core/fe-core-commands.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index ea162e08..c9ca93ce 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -117,7 +117,8 @@ static void cmd_version(char *data)
 /* SYNTAX: CAT [-window] <file> [<seek position>] */
 static void cmd_cat(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 {
-	char *fname, *fposstr, *target;
+	char *fname, *fposstr;
+	gboolean target;
 	GHashTable *optlist;
 	void *free_arg;
 	int fpos;
@@ -155,16 +156,14 @@ static void cmd_cat(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		return;
 	}
 
-	target = item != NULL && g_hash_table_lookup(optlist, "window") != NULL
-			? item->name
-			: NULL;
+	target = g_hash_table_lookup(optlist, "window") != NULL;
 
 	g_io_channel_set_encoding(handle, NULL, NULL);
 	g_io_channel_seek_position(handle, fpos, G_SEEK_SET, NULL);
 	buf = g_string_sized_new(512);
 	while (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) {
 		buf->str[tpos] = '\0';
-		printtext(target != NULL ? server : NULL, target, MSGLEVEL_CLIENTCRAP |
+		printtext(target ? server : NULL, target && item != NULL ? item->name : NULL, MSGLEVEL_CLIENTCRAP |
 			  MSGLEVEL_NEVER, "%s", buf->str);
 	}
 	g_string_free(buf, TRUE);

From d5a55f5e6ed4d2ba64fed2697c4e8a9477477364 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 18 Mar 2020 17:27:18 +0100
Subject: [PATCH 1091/1650] unignore_time can not be NULL, check for 0 instead

---
 src/fe-common/core/fe-ignore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index e34055bc..890d2c19 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -70,7 +70,7 @@ static void ignore_print(int index, IGNORE_REC *rec)
 		g_string_append_printf(options, "-network %s ", rec->servertag);
 	if (rec->pattern != NULL)
 		g_string_append_printf(options, "-pattern %s ", rec->pattern);
-	if (rec->unignore_time != NULL) {
+	if (rec->unignore_time != 0) {
 		ts = *localtime(&rec->unignore_time);
 		strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ts);
 		g_string_append_printf(options, "ignore ends: %s ", buf);

From 597afa404383a62d1a2e03600992db6e2e7c821c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 18 Mar 2020 16:32:49 +0000
Subject: [PATCH 1092/1650] Use github actions to test PRs

---
 .github/workflows/{push.yml => check.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{push.yml => check.yml} (96%)

diff --git a/.github/workflows/push.yml b/.github/workflows/check.yml
similarity index 96%
rename from .github/workflows/push.yml
rename to .github/workflows/check.yml
index 71b388a2..17da255d 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/check.yml
@@ -1,4 +1,4 @@
-on: [push]
+on: [pull_request]
 name: Check Irssi
 jobs:
   install:

From be467111fa891697d92a8afde5dd0e66b8f32937 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 16 Mar 2020 21:39:33 +0100
Subject: [PATCH 1093/1650] update docs

---
 docs/design.html        | 3 +--
 docs/faq.html           | 7 +++----
 docs/faq.txt            | 6 +++---
 docs/startup-HOWTO.html | 9 ++++-----
 docs/startup-HOWTO.txt  | 6 +++---
 utils/syncdocs.sh       | 2 +-
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/docs/design.html b/docs/design.html
index 4be231ee..3865a7fb 100644
--- a/docs/design.html
+++ b/docs/design.html
@@ -1,7 +1,6 @@
 <base href='https://irssi.org/documentation/design/'>
 <h1>Design</h1>
-
-<p>Irssi’s hierarchy is something like this:</p>
+    <p>Irssi’s hierarchy is something like this:</p>
 
 <pre class="repl" id="fig1"><code class="language-ascidia">
         sub1 sub2
diff --git a/docs/faq.html b/docs/faq.html
index 70e90bb5..7c17f45d 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1,7 +1,6 @@
 <base href='https://irssi.org/documentation/faq/'>
 <h1>Frequently Asked Questions</h1>
-
-<h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
+    <h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
 
 <p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
 
@@ -55,7 +54,7 @@
 
 <h3 id="q-will-there-be-detach-like-feature">Q: Will there be /DETACH-like feature?</h3>
 
-<p>A: <a href="http://tmux.github.io/">tmux</a>, <a href="http://www.gnu.org/software/screen/screen.html">screen</a> and <a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
+<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
 
 <h3 id="q-how-do-i-run-scripts-automatically-at-startup">Q: How do I run scripts automatically at startup?</h3>
 
@@ -71,7 +70,7 @@
 
 <h3 id="q-how-can-i-have-whois-replies-to-active-window">Q: How can I have /WHOIS replies to active window?</h3>
 
-<p>A: You can disable the status window, or do <code>/WINDOW LEVEL -CRAP</code> in it which would also make several other messages show up in active window. You can also use a <a href="http://dgl.cx/irssi/hack-whois-in-current-window.pl">script</a>.</p>
+<p>A: You can disable the status window, or do <code>/WINDOW LEVEL -CRAP</code> in it which would also make several other messages show up in active window. You can also use a <a href="https://dgl.cx/irssi/hack-whois-in-current-window.pl">script</a>.</p>
 
 <h3 id="q-how-do-i-add-the-active-network-to-the-statusbar">Q: How do I add the active network to the statusbar</h3>
 
diff --git a/docs/faq.txt b/docs/faq.txt
index 719fbb9a..0d0b5f46 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -117,8 +117,8 @@ A: Check [6]here
    References:
 
    [1] https://github.com/irssi-import/xirssi
-   [2] http://tmux.github.io/
-   [3] http://www.gnu.org/software/screen/screen.html
+   [2] https://tmux.github.io/
+   [3] https://www.gnu.org/software/screen/screen.html
    [4] http://dtach.sf.net/
-   [5] http://dgl.cx/irssi/hack-whois-in-current-window.pl
+   [5] https://dgl.cx/irssi/hack-whois-in-current-window.pl
    [6] https://irssi.org/assets/irssi.wav
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 36d8edbf..48f6e6df 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -1,9 +1,8 @@
 <base href='https://irssi.org/documentation/startup/'>
 <h1>Startup How-To</h1>
+    <h3 id="to-new-irssi-users-not-to-new-irc-users-">To new Irssi users (not to new IRC users ..)</h3>
 
-<h3 id="to-new-irssi-users-not-to-new-irc-users-">To new Irssi users (not to new IRC users ..)</h3>
-
-<p>Copyright (c) 2000-2002 by Timo Sirainen, release under <a href="http://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1 license.</p>
+<p>Copyright (c) 2000-2002 by Timo Sirainen, release under <a href="https://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1 license.</p>
 
 <p>Index with some FAQ questions that are answered in the chapter:</p>
 
@@ -161,7 +160,7 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <h3 id="split-windows-and-window-items">Split windows and window items</h3>
 
-<p><em>Note: <a href="http://quadpoint.org/articles/irssisplit/">this guide</a> might be a better introduction to window splits</em></p>
+<p><em>Note: <a href="https://quadpoint.org/articles/irssisplit/">this guide</a> might be a better introduction to window splits</em></p>
 
 <p>Irssi also supports split windows, they’ve had some problems in past but I think they should work pretty well now :) Here’s some commands related to them:</p>
 
@@ -516,7 +515,7 @@ Ctrl-X                - set the next server in list active
 
 <p><strong>SOCKS</strong></p>
 
-<p>Irssi can be compiled with socks support (<code>\--with-socks</code> option to configure), which requires “dante” and routes all connections through the proxy specified in the system-wide /etc/socks.conf. This method is known to have issues in Mac OS X.</p>
+<p>Irssi can be compiled with socks support (<code>--with-socks</code> option to configure), which requires “dante” and routes all connections through the proxy specified in the system-wide /etc/socks.conf. This method is known to have issues in Mac OS X.</p>
 
 <p>Note that <code>/SET proxy</code> settings don’t have anything to do with socks.</p>
 
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index ecfe7ad8..61de27e3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -578,7 +578,7 @@ Irssi proxy works fine with other IRC clients as well.
 
 SOCKS
 
-Irssi can be compiled with socks support (\--with-socks option to configure),
+Irssi can be compiled with socks support (--with-socks option to configure),
 which requires “dante” and routes all connections through the proxy specified
 in the system-wide /etc/socks.conf. This method is known to have issues in Mac
 OS X.
@@ -792,8 +792,8 @@ ADD -before act mail.
 
 References:
 
-[1] http://www.gnu.org/licenses/fdl.html
+[1] https://www.gnu.org/licenses/fdl.html
 [2] https://www.iterm2.com/
-[3] http://quadpoint.org/articles/irssisplit/
+[3] https://quadpoint.org/articles/irssisplit/
 [4] https://github.com/rofl0r/proxychains-ng
 [5] https://irssi.org/documentation/settings/
diff --git a/utils/syncdocs.sh b/utils/syncdocs.sh
index bd92ffab..fb88393b 100755
--- a/utils/syncdocs.sh
+++ b/utils/syncdocs.sh
@@ -13,7 +13,7 @@ design=$site/documentation/design/
 # FOOTER. May need to be adjusted as the source pages change
 pageclean_regex='s{.*(?=<h1)}{}s;
 s{(\s*<script\s.*?</script>)?\s*(</div>\s*){0,3}<footer.*}{}s;
-s{(<.*?)\sclass="(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;'
+s{(<.*?)\sclass="(?:[^"]*\s+)*(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;'
 
 srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.

From 97670d1dc1b9f0fd2de2b0fe2f08bfdfcb7f0c12 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 30 Mar 2020 14:30:05 +0200
Subject: [PATCH 1094/1650] run syncscripts.sh

sync scriptassist.pl to 2003020807
---
 scripts/scriptassist.pl | 57 ++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 68708945..536ef33a 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,22 +5,22 @@
 
 use strict;
 
-our $VERSION = '2003020806';
+our $VERSION = '2003020807';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
     name        => 'scriptassist',
     description => 'keeps your scripts on the cutting edge',
     license     => 'GPLv2',
-    url         => 'http://irssi.org/scripts/',
-    modules     => 'Data::Dumper LWP::UserAgent (GnuPG)',
+    url         => 'https://scripts.irssi.org/',
+    modules     => 'CPAN::Meta::YAML LWP::Protocol::https (GnuPG)',
     commands	=> "scriptassist"
 );
 
 our ($forked, %remote_db, $have_gpg, @complist);
 
 use Irssi 20020324;
-use Data::Dumper;
+use CPAN::Meta::YAML;
 use LWP::UserAgent;
 use POSIX;
 
@@ -170,14 +170,13 @@ sub bg_do {
 		my $cmd = $items[1];
 		$result{data}{unknown}{$cmd} = get_unknown($cmd, $xml);
 	    }
-	    my $dumper = Data::Dumper->new([\%result]);
-	    $dumper->Purity(1)->Deepcopy(1)->Indent(0);
-	    my $data = $dumper->Dump;
+	    my $yaml = CPAN::Meta::YAML->new(\%result);
+	    my $data = $yaml->write_string();
 	    print($wh $data);
 	};
 	if ($@) {
-	    print($wh Data::Dumper->new([+{data=>+{error=>$@}}])
-		      ->Purity(1)->Deepcopy(1)->Indent(0)->Dump);
+	    print($wh CPAN::Meta::YAML->new(+{data=>+{error=>$@}})
+		      ->write_string());
 	}
 	close($wh);
 	POSIX::_exit(1);
@@ -313,7 +312,7 @@ sub get_new {
     my ($num) = @_;
     my $result;
     my $xml = get_scripts();
-    foreach (sort {$xml->{$b}{last_modified} cmp $xml->{$a}{last_modified}} keys %$xml) {
+    foreach (sort {$xml->{$b}{modified} cmp $xml->{$a}{modified}} keys %$xml) {
 	my %entry = %{ $xml->{$_} };
 	next if $entry{HIDDEN};
 	$result->{$_} = \%entry;
@@ -427,8 +426,8 @@ sub pipe_input {
 	print CLIENTCRAP "%R<<%n Something weird happend (no text)";
 	return();
     }
-    local our $VAR1;
-    my $incoming = eval($text);
+    utf8::decode($text);
+    my $incoming = CPAN::Meta::YAML->read_string($text)->[0];
     if ($incoming->{db} && $incoming->{timestamp}) {
     	$remote_db{db} = $incoming->{db};
     	$remote_db{timestamp} = $incoming->{timestamp};
@@ -628,7 +627,7 @@ sub print_ratings {
 sub print_new {
     my ($list) = @_;
     my @table;
-    foreach (sort {$list->{$b}{last_modified} cmp $list->{$a}{last_modified}} keys %$list) {
+    foreach (sort {$list->{$b}{modified} cmp $list->{$a}{modified}} keys %$list) {
 	my @line;
 	my ($name) = get_names($_);
         if (get_local_version($name)) {
@@ -637,7 +636,7 @@ sub print_new {
             push @line, "%yo%n";
         }
 	push @line, "%9".$name."%9";
-	push @line, $list->{$_}{last_modified};
+	push @line, $list->{$_}{modified};
 	push @table, \@line;
     }
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'new scripts', 1) ;
@@ -822,7 +821,7 @@ sub contact_author {
 
 sub get_scripts {
     my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.2003020803);
+    $ua->agent('ScriptAssist/'.$VERSION);
     $ua->env_proxy();
     my @mirrors = split(/ /, Irssi::settings_get_str('scriptassist_script_sources'));
     my %sites_db;
@@ -852,22 +851,25 @@ sub get_scripts {
 	    $type = $2;
 	}
 	push @sources, $src;
-	#my @header = ('name', 'contact', 'authors', 'description', 'version', 'modules', 'last_modified');
+	#my @header = ('name', 'contact', 'authors', 'description', 'version', 'modules', 'modified');
 	if ($type eq 'dmp') {
-	    no strict 'vars';
-	    my $new_db = eval "$data";
-	    foreach (keys %$new_db) {
-		if (defined $sites_db{script}{$_}) {
-		    my $old = $sites_db{$_}{version};
-		    my $new = $new_db->{$_}{version};
+	    die("Support for $type script database has been removed. Please /set scriptassist_script_sources and change $type -> yml.\n");
+	} elsif ($type eq 'yml') {
+	    utf8::decode($data);
+	    my $new_db = CPAN::Meta::YAML->read_string($data);
+	    foreach (@{$new_db->[0]}) {
+		my $K = $_->{filename};
+		if (defined $sites_db{script}{$K}) {
+		    my $old = $sites_db{$K}{version};
+		    my $new = $_->{version};
 		    next if (compare_versions($old, $new) eq 'newer');
 		}
 		#foreach my $key (@header) {
-		foreach my $key (keys %{ $new_db->{$_} }) {
-		    next unless defined $new_db->{$_}{$key};
-		    $sites_db{$_}{$key} = $new_db->{$_}{$key};
+		foreach my $key (keys %$_) {
+		    next unless defined $_->{$key};
+		    $sites_db{$K}{$key} = $_->{$key};
 		}
-		$sites_db{$_}{source} = $src;
+		$sites_db{$K}{source} = $src;
 	    }
 	} else {
 	    die("Unknown script database type ($type).\n");
@@ -1093,6 +1095,7 @@ sub missing_module {
 
 sub cmd_scripassist {
     my ($arg, $server, $witem) = @_;
+    utf8::decode($arg);
     my @args = split(/ /, $arg);
     if ($args[0] eq 'help' || $args[0] eq '-h') {
 	show_help();
@@ -1176,7 +1179,7 @@ sub sig_complete {
 }
 
 
-Irssi::settings_add_str($IRSSI{name}, 'scriptassist_script_sources', 'https://scripts.irssi.org/scripts.dmp');
+Irssi::settings_add_str($IRSSI{name}, 'scriptassist_script_sources', 'https://scripts.irssi.org/scripts.yml');
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_cache_sources', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_update_verbose', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_check_verbose', 1);

From 4594b0c4cf0ddc449f45b81ddea2180b837a10ac Mon Sep 17 00:00:00 2001
From: ailin <ailin@obsd.virtnet>
Date: Thu, 2 Apr 2020 04:39:24 +0200
Subject: [PATCH 1095/1650] fix perl module build on openbsd

unfortunately, some mangling is needed to create the correct linker
and compiler invocations
---
 meson.build          | 6 ++++++
 src/perl/meson.build | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 2ea7bcc7..dc3a4fc2 100644
--- a/meson.build
+++ b/meson.build
@@ -406,6 +406,12 @@ if want_capsicum
   endif
 endif
 
+# dependency helper sets
+dep_cflagsonly = []
+foreach d : dep
+  dep_cflagsonly += d.partial_dependency(includes : true, compile_args : true)
+endforeach
+
 ##################
 # irssi-config.h #
 ##################
diff --git a/src/perl/meson.build b/src/perl/meson.build
index dd8f2f8c..aa2b609f 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -35,7 +35,8 @@ shared_module('perl_core',
   install_dir : moduledir,
   install_rpath : perl_rpath,
   build_rpath : perl_rpath,
-  dependencies : dep + [ perl_dep ],
+  dependencies : dep_cflagsonly + [ perl_dep ],
+  override_options : ['b_asneeded=false'],
 )
 
 shared_module('fe_perl',

From ae89ba716441261333e340bea8e1b9851fe0f294 Mon Sep 17 00:00:00 2001
From: ailin <ailin@obsd.virtnet>
Date: Thu, 2 Apr 2020 15:39:40 +0200
Subject: [PATCH 1096/1650] fix crash on /quit when unloading modules

this fixes a crash on /quit when the module unloaded is trying
to reference symbols from already-unloaded modules, by reversing
the lists.
---
 src/core/modules.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/modules.c b/src/core/modules.c
index 119a8e67..38c33dea 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -214,7 +214,7 @@ MODULE_FILE_REC *module_register_full(const char *name, const char *submodule,
 		module = g_new0(MODULE_REC, 1);
 		module->name = g_strdup(name);
 
-                modules = g_slist_append(modules, module);
+		modules = g_slist_prepend(modules, module);
 	}
 
 	file = module_file_find(module, submodule);
@@ -226,8 +226,8 @@ MODULE_FILE_REC *module_register_full(const char *name, const char *submodule,
 	file->name = g_strdup(submodule);
         file->defined_module_name = g_strdup(defined_module_name);
 
-	module->files = g_slist_append(module->files, file);
-        return file;
+	module->files = g_slist_prepend(module->files, file);
+	return file;
 }
 
 MODULE_REC *module_find(const char *name)

From 8a446d24de9be3e35a638cd8f6856dea9ddd4b74 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 2 Apr 2020 15:47:15 +0200
Subject: [PATCH 1097/1650] fix /ignore ... MODES NO_ACT not working

reported by letty
---
 src/fe-common/irc/fe-modes.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index 61ea6c38..9ea2414d 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -36,6 +36,7 @@
 
 typedef struct {
 	IRC_CHANNEL_REC *channel;
+	int level;
 	char *mode;
 	GSList *nicks;
 	time_t last_mode;
@@ -84,9 +85,8 @@ static void print_mode(MODE_REC *rec)
 	tmp = modes; modes = NULL;
 
 	nicks = gslist_to_string(rec->nicks, ", ");
-	printformat(rec->channel->server, rec->channel->visible_name,
-		    MSGLEVEL_MODES, IRCTXT_CHANMODE_CHANGE,
-		    rec->channel->visible_name, rec->mode, nicks, "");
+	printformat(rec->channel->server, rec->channel->visible_name, rec->level,
+	            IRCTXT_CHANMODE_CHANGE, rec->channel->visible_name, rec->mode, nicks, "");
 	g_free(nicks);
 
 	modes = tmp;
@@ -126,8 +126,8 @@ static int sig_check_modes(void)
 	return 1;
 }
 
-static void msg_multi_mode(IRC_CHANNEL_REC *channel, const char *sender,
-			   const char *addr, const char *mode)
+static void msg_multi_mode(IRC_CHANNEL_REC *channel, int level, const char *sender,
+                           const char *addr, const char *mode)
 {
 	MODE_REC *rec;
 
@@ -147,10 +147,13 @@ static void msg_multi_mode(IRC_CHANNEL_REC *channel, const char *sender,
 		rec = g_new0(MODE_REC, 1);
 		modes = g_slist_append(modes, rec);
 
+		rec->level = level;
 		rec->channel = channel;
 		rec->mode = g_strdup(mode);
 	}
-
+	/* the levels (everything below MSGLEVEL_ALL) are combined (|)
+	    whereas the flags (anything above) must all match (&) */
+	rec->level = ((rec->level | level) & MSGLEVEL_ALL) | (rec->level & level);
 	rec->nicks = g_slist_append(rec->nicks, g_strdup(sender));
 	rec->last_mode = time(NULL);
 
@@ -187,7 +190,7 @@ static void sig_message_mode(IRC_SERVER_REC *server, const char *channel,
 			irc_channel_find(server, channel);
 
 		if (chanrec != NULL && g_ascii_strcasecmp(nick, server->nick) != 0)
-			msg_multi_mode(chanrec, nick, addr, mode);
+			msg_multi_mode(chanrec, level, nick, addr, mode);
 		else {
 			printformat(server, channel, level,
 				    IRCTXT_CHANMODE_CHANGE,

From 81dc94c406361564d833d33fadd9188f542fb46d Mon Sep 17 00:00:00 2001
From: Pinguin1234 <18099221+Pinguin1234@users.noreply.github.com>
Date: Sat, 4 Apr 2020 00:55:27 +0200
Subject: [PATCH 1098/1650] Added option to quit in SIGHUP

---
 src/core/core.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/core/core.c b/src/core/core.c
index 878d9eb6..08d9cb6e 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -88,6 +88,11 @@ static void sig_reload_config(int signo)
         reload_config = TRUE;
 }
 
+static void sig_quit_on_hup(int signo)
+{
+	signal_emit("gui exit", 0);	
+}
+
 static void read_settings(void)
 {
 	static int signals[] = {
@@ -102,14 +107,16 @@ static void read_settings(void)
 	const char *ignores;
 	struct sigaction act;
         int n;
+	int quit_on_hup;
 
 	ignores = settings_get_str("ignore_signals");
 
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
 
-	/* reload config on SIGHUP */
-        act.sa_handler = sig_reload_config;
+	quit_on_hup = settings_get_bool("quit_on_hup");
+	
+        act.sa_handler = quit_on_hup ?  sig_quit_on_hup : sig_reload_config;
 	sigaction(SIGHUP, &act, NULL);
 
 	for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
@@ -267,6 +274,8 @@ void core_init(void)
 
 	settings_add_str("misc", "ignore_signals", "");
 	settings_add_bool("misc", "override_coredump_limit", FALSE);
+	settings_add_bool("misc", "quit_on_hup", FALSE);
+
 
 #ifdef HAVE_SYS_RESOURCE_H
 	getrlimit(RLIMIT_CORE, &orig_core_rlimit);

From cae37e37ca6b047411f86681255eca322cfd835a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 4 Apr 2020 01:12:03 +0200
Subject: [PATCH 1099/1650] run git-clang-format

---
 src/core/core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/core.c b/src/core/core.c
index 08d9cb6e..5bb7f23e 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -90,7 +90,7 @@ static void sig_reload_config(int signo)
 
 static void sig_quit_on_hup(int signo)
 {
-	signal_emit("gui exit", 0);	
+	signal_emit("gui exit", 0);
 }
 
 static void read_settings(void)
@@ -115,8 +115,8 @@ static void read_settings(void)
 	act.sa_flags = 0;
 
 	quit_on_hup = settings_get_bool("quit_on_hup");
-	
-        act.sa_handler = quit_on_hup ?  sig_quit_on_hup : sig_reload_config;
+
+	act.sa_handler = quit_on_hup ? sig_quit_on_hup : sig_reload_config;
 	sigaction(SIGHUP, &act, NULL);
 
 	for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
@@ -276,7 +276,6 @@ void core_init(void)
 	settings_add_bool("misc", "override_coredump_limit", FALSE);
 	settings_add_bool("misc", "quit_on_hup", FALSE);
 
-
 #ifdef HAVE_SYS_RESOURCE_H
 	getrlimit(RLIMIT_CORE, &orig_core_rlimit);
 #endif

From f9595c03b1392aca8bd2aa2103f183ebedc8ec88 Mon Sep 17 00:00:00 2001
From: Dennis Pentmeier <dennis@ncc-1701-e>
Date: Sat, 4 Apr 2020 17:59:46 +0200
Subject: [PATCH 1100/1650] Changed to async-signal safe method as suggested by
 dequis

---
 src/core/core.c     | 16 ++++------------
 src/core/core.h     |  2 +-
 src/fe-text/irssi.c | 13 +++++++++----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/core/core.c b/src/core/core.c
index 5bb7f23e..0446052b 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -66,7 +66,7 @@ void wcwidth_wrapper_deinit(void);
 
 int irssi_gui;
 int irssi_init_finished;
-int reload_config;
+int sighup_received;
 time_t client_start_time;
 
 static char *irssi_dir, *irssi_config_file;
@@ -83,14 +83,9 @@ const char *get_irssi_config(void)
         return irssi_config_file;
 }
 
-static void sig_reload_config(int signo)
+static void sig_hup(int signo)
 {
-        reload_config = TRUE;
-}
-
-static void sig_quit_on_hup(int signo)
-{
-	signal_emit("gui exit", 0);
+        sighup_received = TRUE;
 }
 
 static void read_settings(void)
@@ -107,16 +102,13 @@ static void read_settings(void)
 	const char *ignores;
 	struct sigaction act;
         int n;
-	int quit_on_hup;
 
 	ignores = settings_get_str("ignore_signals");
 
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
 
-	quit_on_hup = settings_get_bool("quit_on_hup");
-
-	act.sa_handler = quit_on_hup ? sig_quit_on_hup : sig_reload_config;
+        act.sa_handler = sig_hup;
 	sigaction(SIGHUP, &act, NULL);
 
 	for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
diff --git a/src/core/core.h b/src/core/core.h
index 6c6c7b61..3c544753 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -13,7 +13,7 @@
 
 extern int irssi_gui;
 extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is sent */
-extern int reload_config; /* TRUE after received SIGHUP. */
+extern int sighup_received; /* TRUE after received SIGHUP. */
 extern time_t client_start_time;
 
 void core_preinit(const char *path);
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index ca784bba..c3ded0b9 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -339,10 +339,15 @@ int main(int argc, char **argv)
 	/* Does the same as g_main_run(main_loop), except we
 	   can call our dirty-checker after each iteration */
 	while (!quitting) {
-		if (reload_config) {
-			/* SIGHUP received, do /RELOAD */
-			reload_config = FALSE;
-			signal_emit("command reload", 1, "");
+		if (sighup_received) {
+                        sighup_received = FALSE;
+
+                        if (settings_get_bool("quit_on_hup")) {
+                                signal_emit("gui exit", 0);
+                        }
+                        else {
+                                signal_emit("command reload", 1, "");
+                        }
 		}
 
 		dirty_check();

From 485ed2f52bafd9cc1d1c0a4ed87c87f2bde1de09 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 5 Apr 2020 21:22:19 +0200
Subject: [PATCH 1101/1650] hide the deprecated -ssl options from completion

---
 src/core/chat-commands.c        |  7 +++++-
 src/core/commands.c             | 39 +++++++++++++++++++++++----------
 src/fe-common/core/completion.c |  6 ++++-
 src/fe-common/core/fe-server.c  | 15 +++++++++++--
 4 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 0b4b6591..ae44ef63 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -517,7 +517,12 @@ void chat_commands_init(void)
 
 	signal_add("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg);
 
-	command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_pinned_cert +ssl_pinned_pubkey tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey +host noproxy -rawlog noautosendcmd");
+	command_set_options(
+	    "connect",
+	    "4 6 !! -network ~ssl ~+ssl_cert ~+ssl_pkey ~+ssl_pass ~ssl_verify ~+ssl_cafile "
+	    "~+ssl_capath ~+ssl_ciphers ~+ssl_pinned_cert ~+ssl_pinned_pubkey tls +tls_cert "
+	    "+tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert "
+	    "+tls_pinned_pubkey +host noproxy -rawlog noautosendcmd");
 	command_set_options("msg", "channel nick");
 }
 
diff --git a/src/core/commands.c b/src/core/commands.c
index 2805f8c0..198b1327 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -339,11 +339,28 @@ void command_runsub(const char *cmd, const char *data,
 	g_free(orig);
 }
 
+static char *optname(char *option)
+{
+	char *opt = option;
+	if (*opt == '~')
+		opt++;
+	if (iscmdtype(*opt))
+		opt++;
+	return opt;
+}
+
+static gboolean optflag(char *option, char *flag)
+{
+	if (*option == '~')
+		return optflag(option + 1, flag);
+
+	return (strchr(flag, *option) != NULL) || (!iscmdtype(*option) && strchr(flag, ' '));
+}
+
 static GSList *optlist_find(GSList *optlist, const char *option)
 {
 	while (optlist != NULL) {
-		char *name = optlist->data;
-		if (iscmdtype(*name)) name++;
+		char *name = optname(optlist->data);
 
 		if (g_ascii_strcasecmp(name, option) == 0)
 			return optlist;
@@ -369,7 +386,7 @@ int command_have_option(const char *cmd, const char *option)
 		return FALSE;
 
 	for (tmp = rec->options; *tmp != NULL; tmp++) {
-		char *name = iscmdtype(**tmp) ? (*tmp)+1 : *tmp;
+		char *name = optname(*tmp);
 
 		if (g_ascii_strcasecmp(name, option) == 0)
 			return TRUE;
@@ -399,7 +416,7 @@ static void command_calc_options(COMMAND_REC *rec, const char *options)
 
 	/* merge the options */
 	for (tmp = optlist; *tmp != NULL; tmp++) {
-		name = iscmdtype(**tmp) ? (*tmp)+1 : *tmp;
+		name = optname(*tmp);
 
 		oldopt = optlist_find(list, name);
 		if (oldopt != NULL) {
@@ -529,7 +546,7 @@ static int option_find(char **array, const char *option)
 
 	found = -1; index = 0; multiple = FALSE;
 	for (tmp = array; *tmp != NULL; tmp++, index++) {
-		const char *text = *tmp + iscmdtype(**tmp);
+		const char *text = optname(*tmp);
 
 		if (g_ascii_strncasecmp(text, option, len) == 0) {
 			if (text[len] == '\0') {
@@ -568,9 +585,9 @@ static int get_cmd_options(char **data, int ignore_unknown,
 	option = NULL; pos = -1;
 	for (;;) {
 		if (**data == '\0' || **data == '-') {
-			if (option != NULL && *optlist[pos] == '+') {
+			if (option != NULL && optflag(optlist[pos], "+")) {
 				/* required argument missing! */
-                                *data = optlist[pos] + 1;
+				*data = optname(optlist[pos]);
 				return CMDERR_OPTION_ARG_MISSING;
 			}
 		}
@@ -621,14 +638,12 @@ static int get_cmd_options(char **data, int ignore_unknown,
 			if (pos >= 0) {
 				/* if we used a shortcut of parameter, put
 				   the whole parameter name in options table */
-				option = optlist[pos] +
-					iscmdtype(*optlist[pos]);
+				option = optname(optlist[pos]);
 			}
 			if (options != NULL && pos != -3)
 				g_hash_table_insert(options, option, "");
 
-			if (pos < 0 || !iscmdtype(*optlist[pos]) ||
-			    *optlist[pos] == '!')
+			if (pos < 0 || optflag(optlist[pos], " !"))
 				option = NULL;
 
 			while (**data == ' ') (*data)++;
@@ -638,7 +653,7 @@ static int get_cmd_options(char **data, int ignore_unknown,
 		if (option == NULL)
 			break;
 
-		if (*optlist[pos] == '@' && !is_numeric(*data, ' '))
+		if (optflag(optlist[pos], "@") && !is_numeric(*data, ' '))
 			break; /* expected a numeric argument */
 
 		/* save the argument */
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 7778d8a4..0102bd2c 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -544,7 +544,11 @@ static GList *completion_get_options(const char *cmd, const char *option)
 	list = NULL;
 	len = strlen(option);
 	for (tmp = rec->options; *tmp != NULL; tmp++) {
-		const char *optname = *tmp + iscmdtype(**tmp);
+		const char *optname;
+		if (**tmp == '~')
+			continue; /* deprecated or hidden option */
+
+		optname = *tmp + iscmdtype(**tmp);
 
 		if (len == 0 || g_ascii_strncasecmp(optname, option, len) == 0)
                         list = g_list_append(list, g_strconcat("-", optname, NULL));
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index f5f96324..5ed67170 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -453,8 +453,19 @@ void fe_server_init(void)
 	command_bind_first("server", NULL, (SIGNAL_FUNC) server_command);
 	command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command);
 
-	command_set_options("server add", "4 6 !! ssl nossl +ssl_cert +ssl_pkey +ssl_pass ssl_verify nossl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls notls +tls_cert +tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
-	command_set_options("server modify", "4 6 !! ssl nossl +ssl_cert +ssl_pkey +ssl_pass ssl_verify nossl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls notls +tls_cert +tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options(
+	    "server add", "4 6 !! ~ssl ~nossl ~+ssl_cert ~+ssl_pkey ~+ssl_pass ~ssl_verify "
+	                  "~nossl_verify ~+ssl_cafile ~+ssl_capath ~+ssl_ciphers ~+ssl_fingerprint "
+	                  "tls notls +tls_cert +tls_pkey +tls_pass tls_verify notls_verify "
+	                  "+tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert "
+	                  "+tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd");
+	command_set_options(
+	    "server modify",
+	    "4 6 !! ~ssl ~nossl ~+ssl_cert ~+ssl_pkey ~+ssl_pass ~ssl_verify ~nossl_verify "
+	    "~+ssl_cafile ~+ssl_capath ~+ssl_ciphers ~+ssl_fingerprint tls notls +tls_cert "
+	    "+tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers "
+	    "+tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port "
+	    "noautosendcmd");
 
 	signal_add("server looking", (SIGNAL_FUNC) sig_server_looking);
 	signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting);

From 1bfe27c66e5b51ba9eadcc1928b3b6134ec3bb29 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 6 Apr 2020 17:04:35 +0200
Subject: [PATCH 1102/1650] Used Tabs instead of spaces and increased
 ABI_VERSION

---
 src/common.h        |  2 +-
 src/core/core.c     |  4 ++--
 src/fe-text/irssi.c | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/common.h b/src/common.h
index d1f34870..e0da1080 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 25
+#define IRSSI_ABI_VERSION 26
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/core/core.c b/src/core/core.c
index 0446052b..85f3a5d5 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -85,7 +85,7 @@ const char *get_irssi_config(void)
 
 static void sig_hup(int signo)
 {
-        sighup_received = TRUE;
+	sighup_received = TRUE;
 }
 
 static void read_settings(void)
@@ -108,7 +108,7 @@ static void read_settings(void)
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
 
-        act.sa_handler = sig_hup;
+	act.sa_handler = sig_hup;
 	sigaction(SIGHUP, &act, NULL);
 
 	for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index c3ded0b9..c2013155 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -340,14 +340,14 @@ int main(int argc, char **argv)
 	   can call our dirty-checker after each iteration */
 	while (!quitting) {
 		if (sighup_received) {
-                        sighup_received = FALSE;
+			sighup_received = FALSE;
 
-                        if (settings_get_bool("quit_on_hup")) {
-                                signal_emit("gui exit", 0);
-                        }
-                        else {
-                                signal_emit("command reload", 1, "");
-                        }
+			if (settings_get_bool("quit_on_hup")) {
+				signal_emit("gui exit", 0);
+			} 
+			else {
+				signal_emit("command reload", 1, "");
+			}
 		}
 
 		dirty_check();

From 6317db5ccbecc7fa8711867349531a89bb4c2861 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 12 Apr 2020 17:16:57 +0200
Subject: [PATCH 1103/1650] run clang-format as a pull request hook

---
 .github/workflows/clangformat.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/clangformat.yml

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
new file mode 100644
index 00000000..ff8a1cd5
--- /dev/null
+++ b/.github/workflows/clangformat.yml
@@ -0,0 +1,22 @@
+on: [pull_request]
+name: clang-format
+jobs:
+  check-clang-format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: fetch target ref
+        run:
+          |
+            refs=($(git log -1 --format=%s))
+            git fetch --depth=1 origin "${refs[3]}"
+      - name: run git-clang-format and Check if no changes are needed
+        run:
+          |
+            git-clang-format-9 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
+            cmp -s <(echo no modified files to format) git-clang-format.diff
+      - uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: git-clang-format.diff
+          path: git-clang-format.diff
\ No newline at end of file

From 0548bb1a3cbd9a935504aa29dce26167fef8a85e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 14 Apr 2020 09:47:41 +0200
Subject: [PATCH 1104/1650] empty is also good

---
 .github/workflows/clangformat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index ff8a1cd5..b52dad8b 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -14,7 +14,7 @@ jobs:
         run:
           |
             git-clang-format-9 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
-            cmp -s <(echo no modified files to format) git-clang-format.diff
+            cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
       - uses: actions/upload-artifact@v1
         if: failure()
         with:

From 9ec9a9afc8a77c74be6853c080918f64090bc39e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 21 Apr 2020 18:58:30 +0200
Subject: [PATCH 1105/1650] try abipkgdiff

---
 .github/workflows/abicheck.yml | 71 ++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 .github/workflows/abicheck.yml

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
new file mode 100644
index 00000000..8ea6837f
--- /dev/null
+++ b/.github/workflows/abicheck.yml
@@ -0,0 +1,71 @@
+on: [pull_request]
+name: abicheck
+jobs:
+  check-abi-diff:
+    runs-on: ubuntu-latest
+    env:
+      build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes
+      prefix: /usr/local
+    steps:
+      - name: set PATH
+        run: |
+          echo "::add-path::$HOME/.local/bin"
+      - name: prepare required software
+        run: |
+          sudo apt install abigail-tools ninja-build libutf8proc-dev libperl-dev libotr5-dev
+          pip3 install setuptools
+          pip3 install wheel
+          pip3 install meson
+      - name: checkout merge ref
+        uses: actions/checkout@master
+        with:
+          path: merge.src
+      - name: checkout base ref
+        uses: actions/checkout@master
+        with:
+          path: base.src
+          ref: ${{ github.base_ref }}
+      - name: build base ref
+        run: |
+          meson Build.base base.src $build_options
+          ninja -C Build.base
+          DESTDIR=$PWD/base ninja -C Build.base install
+      - name: build merge ref
+        run: |
+          meson Build.merge merge.src $build_options
+          ninja -C Build.merge
+          DESTDIR=$PWD/merge ninja -C Build.merge install
+      - run: |
+          # print versions and abi versions
+          getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
+          base_abi=$(getabidef base$prefix)
+          echo base abi : $base_abi
+          ./base$prefix/bin/irssi --version
+          echo "::set-env name=base_abi::$base_abi"
+          merge_abi=$(getabidef merge$prefix)
+          echo merge abi : $merge_abi
+          ./merge$prefix/bin/irssi --version
+          echo "::set-env name=merge_abi::$merge_abi"
+      - run: |
+          # abipkgdiff
+          abipkgdiff -l base merge && diff_ret=0 || diff_ret=$?
+          echo "::set-env name=diff_ret::$diff_ret"
+      - run: |
+          # Check if no changes are needed
+          if [ "$diff_ret" -ne 0 ]; then
+              if [ "$base_abi" -lt "$merge_abi" ]; then
+                  echo "::warning ::abigail found changes and ABI changed from $base_abi to $merge_abi"
+                  exit 0
+              else
+                  echo "::error ::Looks like the ABI changed but the IRSSI_ABI_VERSION did not"
+                  exit $diff_ret
+              fi
+          else
+              if [ "$base_abi" -ne "$merge_abi" ]; then
+                  echo "::error ::abigail found no changes yet the IRSSI_ABI_VERSION changed. Is this correct?"
+                  exit 1
+              else
+                  : "No changes detected and IRSSI_ABI_VERSION untouched"
+                  exit 0
+              fi
+          fi

From 244ebaaa2e52a270eec2d797d72d193ae37c7482 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@z30a.localdomain>
Date: Thu, 23 Apr 2020 12:13:50 +0200
Subject: [PATCH 1106/1650] build fixes when using install-glib and on openbsd

---
 meson.build          | 55 +++++++++++++++++++++++++++++++++++++++++---
 src/perl/meson.build |  2 +-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 2af611cf..cf982146 100644
--- a/meson.build
+++ b/meson.build
@@ -147,6 +147,7 @@ if not socket_found
   error('socket not found')
 endif
 
+built_src = []
 glib_internal = false
 message('*** If you don\'t have GLib, you can run meson ... -Dinstall-glib=yes')
 message('*** to download and build it automatically')
@@ -162,15 +163,64 @@ if not glib_dep.found()
   glib_internal = true
   meson_cmd = find_program('meson')
   ninja = find_program('ninja')
+
   glib_internal_download_t = custom_target('glib-internal-download',
     command : [ meson_cmd, 'subprojects', 'download', 'glib', '--sourcedir', meson.current_source_dir() ],
     console : true,
     output : ['glib-internal-download'],
   )
+
+  glib_internal_dependencies = [
+    dependency('threads'),
+  ]
+  glib_internal_configure_args = []
+
+  glib_internal_usr_local = false
+  if not cc.has_function('iconv_open')
+    prov_lib = cc.find_library('iconv', required : false)
+    if not prov_lib.found()
+      prov_lib = cc.find_library('iconv', dirs : '/usr/local/lib')
+      glib_internal_usr_local = true
+    endif
+    if cc.has_function('libiconv_open', dependencies : prov_lib)
+      glib_internal_configure_args += '-Diconv=gnu'
+    else
+      glib_internal_configure_args += '-Diconv=native'
+    endif
+    glib_internal_dependencies += prov_lib
+  endif
+
+  if not cc.has_function('ngettext')
+    prov_lib = cc.find_library('intl', required : false)
+    if not prov_lib.found()
+      prov_lib = cc.find_library('intl', dirs : '/usr/local/lib')
+      glib_internal_usr_local = true
+    endif
+    glib_internal_dependencies += prov_lib
+  endif
+
+  if glib_internal_usr_local
+    glib_internal_configure_args += ['-Dc_args=-I/usr/local/include', '-Dc_link_args=-L/usr/local/lib']
+  endif
+
+  if not cc.has_function('getxattr') or not cc.has_header('sys/xattr.h')
+    if cc.has_header_symbol('attr/xattr.h', 'getxattr')
+      prov_lib = cc.find_library('xattr', required : false)
+    else
+      prov_lib = dependency('', required : false)
+    endif
+    if prov_lib.found()
+      glib_internal_dependencies += prov_lib
+    else
+      glib_internal_configure_args += '-Dxattr=false'
+    endif
+  endif
+
   glib_internal_configure_t = custom_target('glib-internal-configure',
     command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
       '--buildtype=' + get_option('buildtype'),
       '-Dlibmount=false', '-Dselinux=false', '-Ddefault_library=static', '-Dinternal_pcre=true',
+      glib_internal_configure_args,
       (meson.current_build_dir() / 'build-subprojects' / 'glib'),
       (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
     console : true,
@@ -184,9 +234,7 @@ if not glib_dep.found()
     output : ['glib-internal-build'],
     depends : glib_internal_configure_t,)
   glib_dep = declare_dependency(
-    dependencies : [
-      dependency('threads'),
-    ],
+    dependencies : glib_internal_dependencies,
     sources : glib_internal_build_t,
     compile_args : [
       '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
@@ -195,6 +243,7 @@ if not glib_dep.found()
     ],
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
   )
+  built_src += glib_internal_build_t
   libdl_dep = []
   prov_lib = cc.find_library('dl', required : false)
   if prov_lib.found() and cc.has_function('dlopen', dependencies : prov_lib)
diff --git a/src/perl/meson.build b/src/perl/meson.build
index aa2b609f..a9f1296a 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -23,7 +23,7 @@ shared_module('perl_core',
   ) + [
     irssi_core_pl_h,
     perl_signals_list_h,
-  ],
+  ] + built_src,
   c_args : [
     def_scriptdir,
     def_perl_use_lib,

From 4b24d0a51d3fac05c9a9b254699b4e9047460b26 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 25 Apr 2020 11:59:04 +0200
Subject: [PATCH 1107/1650] remove some old compat code

we already rely on c99 in other parts of the code
---
 src/fe-common/core/printtext.h | 75 +---------------------------------
 1 file changed, 1 insertion(+), 74 deletions(-)

diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h
index 845bfc6c..c223a3ec 100644
--- a/src/fe-common/core/printtext.h
+++ b/src/fe-common/core/printtext.h
@@ -32,22 +32,7 @@ void printtext_deinit(void);
 
 /* printformat(...) = printformat_format(MODULE_NAME, ...)
 
-   Could this be any harder? :) With GNU C compiler and C99 compilers,
-   use #define. With others use either inline functions if they are
-   supported or static functions if they are not..
- */
-#if defined (__GNUC__) && !defined (__STRICT_ANSI__)
-/* GCC */
-#  define printformat(server, target, level, formatnum...) \
-	printformat_module(MODULE_NAME, server, target, level, ##formatnum)
-#  define printformat_window(window, level, formatnum...) \
-	printformat_module_window(MODULE_NAME, window, level, ##formatnum)
-#  define printformat_dest(dest, formatnum...) \
-	printformat_module_dest(MODULE_NAME, dest, ##formatnum)
-#  define printformat_gui(formatnum...) \
-	printformat_module_gui(MODULE_NAME, ##formatnum)
-#elif __STDC_VERSION__ >= 199901L
-/* C99 */
+   Irssi requires a C99 pre-processor with __VA_ARGS__ support  */
 #  define printformat(server, target, level, formatnum, ...) \
 	printformat_module(MODULE_NAME, server, target, level, formatnum, ##__VA_ARGS__)
 #  define printformat_window(window, level, formatnum, ...) \
@@ -56,63 +41,5 @@ void printtext_deinit(void);
 	printformat_module_dest(MODULE_NAME, dest, formatnum, ##__VA_ARGS__)
 #  define printformat_gui(formatnum, ...) \
 	printformat_module_gui(MODULE_NAME, formatnum, ##__VA_ARGS__)
-#else
-/* inline/static */
-#ifdef G_CAN_INLINE
-G_INLINE_FUNC
-#else
-static
-#endif
-void printformat(void *server, const char *target, int level, int formatnum, ...)
-{
-	va_list va;
-
-	va_start(va, formatnum);
-	printformat_module_args(MODULE_NAME, server, target, level, formatnum, va);
-	va_end(va);
-}
-
-#ifdef G_CAN_INLINE
-G_INLINE_FUNC
-#else
-static
-#endif
-void printformat_window(WINDOW_REC *window, int level, int formatnum, ...)
-{
-	va_list va;
-
-	va_start(va, formatnum);
-	printformat_module_window_args(MODULE_NAME, window, level, formatnum, va);
-	va_end(va);
-}
-
-#ifdef G_CAN_INLINE
-G_INLINE_FUNC
-#else
-static
-#endif
-void printformat_dest(TEXT_DEST_REC *dest, int formatnum, ...)
-{
-	va_list va;
-
-	va_start(va, formatnum);
-	printformat_module_dest_args(MODULE_NAME, dest, formatnum, va);
-	va_end(va);
-}
-
-#ifdef G_CAN_INLINE
-G_INLINE_FUNC
-#else
-static
-#endif
-void printformat_gui(int formatnum, ...)
-{
-	va_list va;
-
-	va_start(va, formatnum);
-	printformat_module_gui_args(MODULE_NAME, formatnum, va);
-	va_end(va);
-}
-#endif
 
 #endif

From f95fc811302eac53d020ef438cd914c564657be5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 14:59:30 +0200
Subject: [PATCH 1108/1650] make lines reformattable

- completely removed the old textbuffer representation (
  https://github.com/shabble/irssi-docs/wiki/Notes-256-Colour#textbuffer-encoding
  )

- textbuffer-formats is an extra module, so if we unhook the signals it
  should go back to the "old way" of storing pre-rendered tex

- design uses cache, original formats and list of arguments
---
 src/core/levels.h                     |   7 +-
 src/fe-common/core/fe-core-commands.c |   2 +
 src/fe-common/core/formats.c          |  97 ++++++-
 src/fe-common/core/formats.h          |   8 +-
 src/fe-common/core/printtext.c        |  94 ++++---
 src/fe-text/Makefile.am               |   4 +-
 src/fe-text/gui-printtext.c           |  14 +-
 src/fe-text/gui-windows.c             |   7 +-
 src/fe-text/irssi.c                   |   5 +
 src/fe-text/lastlog.c                 |   2 +-
 src/fe-text/meson.build               |   2 +
 src/fe-text/textbuffer-commands.c     |  45 ++-
 src/fe-text/textbuffer-formats.c      | 258 +++++++++++++++++
 src/fe-text/textbuffer-formats.h      |  22 ++
 src/fe-text/textbuffer-view.c         | 384 +++++++++++++++-----------
 src/fe-text/textbuffer-view.h         |   1 +
 src/fe-text/textbuffer.c              | 382 +++----------------------
 src/fe-text/textbuffer.h              |  39 +--
 src/perl/textui/TextBuffer.xs         |   5 +-
 tests/fe-text/Makefile.am             |   1 +
 tests/fe-text/meson.build             |   1 +
 21 files changed, 791 insertions(+), 589 deletions(-)
 create mode 100644 src/fe-text/textbuffer-formats.c
 create mode 100644 src/fe-text/textbuffer-formats.h

diff --git a/src/core/levels.h b/src/core/levels.h
index 385ecd0c..04893b34 100644
--- a/src/core/levels.h
+++ b/src/core/levels.h
@@ -6,6 +6,7 @@
    difficult message leveling system (which might be done if really
    needed..). */
 
+/* clang-format off */
 /* Message levels */
 enum {
 	MSGLEVEL_CRAP         = 0x0000001,
@@ -38,8 +39,12 @@ enum {
 	MSGLEVEL_NEVER        = 0x4000000, /* never ignore / never log */
 	MSGLEVEL_LASTLOG      = 0x8000000, /* used for /lastlog */
 
-	MSGLEVEL_HIDDEN       = 0x10000000 /* Hidden from view */
+	MSGLEVEL_HIDDEN       = 0x10000000, /* Hidden from view */
+	MSGLEVEL_RESERVED1    = 0x20000000,
+	MSGLEVEL_RESERVED2    = 0x40000000,
+	MSGLEVEL_FORMAT       = 0x80000000  /* Format data */
 };
+/* clang-format on */
 
 int level_get(const char *level);
 int level2bits(const char *level, int *errorp);
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 9a2c547f..2c79334a 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -233,6 +233,7 @@ static void event_command(const char *data)
 				(data[1] == *cmdchar && data[2] == '^'))
 			    && !command_hide_output++) {
 		signal_add_first("print starting", (SIGNAL_FUNC) sig_stop);
+		signal_add_first("print noformat", (SIGNAL_FUNC) sig_stop);
 		signal_add_first("print format", (SIGNAL_FUNC) sig_stop);
 		signal_add_first("print text", (SIGNAL_FUNC) sig_stop);
 	}
@@ -242,6 +243,7 @@ static void event_command_last(const char *data)
 {
 	if (command_hide_output && !--command_hide_output) {
 		signal_remove("print starting", (SIGNAL_FUNC) sig_stop);
+		signal_remove("print noformat", (SIGNAL_FUNC) sig_stop);
 		signal_remove("print format", (SIGNAL_FUNC) sig_stop);
 		signal_remove("print text", (SIGNAL_FUNC) sig_stop);
 	}
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 414c6582..a6fde7ea 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -850,14 +850,13 @@ char *format_get_line_start(THEME_REC *theme, TEXT_DEST_REC *dest, time_t t)
 	return linestart;
 }
 
-void format_newline(WINDOW_REC *window)
+void format_newline(TEXT_DEST_REC *dest)
 {
-	g_return_if_fail(window != NULL);
+	g_return_if_fail(dest != NULL);
+	g_return_if_fail(dest->window != NULL);
 
-	signal_emit_id(signal_gui_print_text, 6, window,
-		       GINT_TO_POINTER(-1), GINT_TO_POINTER(-1),
-		       GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE),
-		       "", NULL);
+	signal_emit_id(signal_gui_print_text, 6, dest->window, GINT_TO_POINTER(-1),
+	               GINT_TO_POINTER(-1), GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), "", dest);
 }
 
 #ifndef TERM_TRUECOLOR
@@ -1269,7 +1268,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 		}
 
 		if (type == '\n') {
-			format_newline(dest->window);
+			format_newline(dest);
 			fgcolor = theme->default_color;
 			bgcolor = -1;
 			flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE;
@@ -1415,6 +1414,90 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 	g_free(dup);
 }
 
+void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags, int fg, int bg,
+                      int flags)
+{
+	if (fg != *last_fg ||
+	    (flags & GUI_PRINT_FLAG_COLOR_24_FG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_FG)) {
+		*last_fg = fg;
+
+#ifdef TERM_TRUECOLOR
+		if (flags & GUI_PRINT_FLAG_COLOR_24_FG) {
+			*last_flags |= GUI_PRINT_FLAG_COLOR_24_FG;
+			format_24bit_color(out, 0, fg);
+		} else {
+			*last_flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
+#endif
+			if (fg < 0) {
+				g_string_append_c(out, 4);
+				g_string_append_c(out, (char) -1);
+				g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
+			} else {
+				format_ext_color(out, 0, fg);
+			}
+#ifdef TERM_TRUECOLOR
+		}
+#endif
+	}
+	if (bg != *last_bg ||
+	    (flags & GUI_PRINT_FLAG_COLOR_24_BG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_BG)) {
+		*last_bg = bg;
+#ifdef TERM_TRUECOLOR
+		if (flags & GUI_PRINT_FLAG_COLOR_24_BG) {
+			*last_flags |= GUI_PRINT_FLAG_COLOR_24_BG;
+			format_24bit_color(out, 1, bg);
+		} else {
+			*last_flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
+#endif
+			if (bg < 0) {
+				g_string_append_c(out, 4);
+				g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
+				g_string_append_c(out, (char) -1);
+			} else {
+				format_ext_color(out, 1, bg);
+			}
+#ifdef TERM_TRUECOLOR
+		}
+#endif
+	}
+
+	if ((flags & GUI_PRINT_FLAG_UNDERLINE) != (*last_flags & GUI_PRINT_FLAG_UNDERLINE)) {
+		*last_flags ^= GUI_PRINT_FLAG_UNDERLINE;
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_STYLE_UNDERLINE);
+	}
+	if ((flags & GUI_PRINT_FLAG_REVERSE) != (*last_flags & GUI_PRINT_FLAG_REVERSE)) {
+		*last_flags ^= GUI_PRINT_FLAG_REVERSE;
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_STYLE_REVERSE);
+	}
+	if ((flags & GUI_PRINT_FLAG_BLINK) != (*last_flags & GUI_PRINT_FLAG_BLINK)) {
+		*last_flags ^= GUI_PRINT_FLAG_BLINK;
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_STYLE_BLINK);
+	}
+	if ((flags & GUI_PRINT_FLAG_BOLD) != (*last_flags & GUI_PRINT_FLAG_BOLD)) {
+		*last_flags ^= GUI_PRINT_FLAG_BOLD;
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_STYLE_BOLD);
+	}
+	if ((flags & GUI_PRINT_FLAG_ITALIC) != (*last_flags & GUI_PRINT_FLAG_ITALIC)) {
+		*last_flags ^= GUI_PRINT_FLAG_ITALIC;
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_STYLE_ITALIC);
+	}
+	if ((flags & GUI_PRINT_FLAG_MONOSPACE) != (*last_flags & GUI_PRINT_FLAG_MONOSPACE)) {
+		*last_flags ^= GUI_PRINT_FLAG_MONOSPACE;
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_STYLE_MONOSPACE);
+	}
+	if (flags & GUI_PRINT_FLAG_INDENT) {
+		*last_flags ^= GUI_PRINT_FLAG_INDENT;
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_STYLE_INDENT);
+	}
+}
+
 static void read_settings(void)
 {
 	timestamp_level = settings_get_bool("timestamps") ? MSGLEVEL_ALL : 0;
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 2e6133be..e30ac290 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -35,6 +35,7 @@ struct _FORMAT_REC {
 	int paramtypes[MAX_FORMAT_PARAMS];
 };
 
+/* clang-format off */
 #define PRINT_FLAG_SET_LINE_START	0x0001
 #define PRINT_FLAG_SET_LINE_START_IRSSI	0x0002
 #define PRINT_FLAG_UNSET_LINE_START	0x0040
@@ -45,6 +46,9 @@ struct _FORMAT_REC {
 #define PRINT_FLAG_SET_SERVERTAG	0x0010
 #define PRINT_FLAG_UNSET_SERVERTAG	0x0020
 
+#define PRINT_FLAG_FORMAT         	0x0080
+/* clang-format on */
+
 typedef struct _HILIGHT_REC HILIGHT_REC;
 
 typedef struct _TEXT_DEST_REC {
@@ -113,7 +117,7 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
 			    const char *server_tag, const char *target,
 			    int level, WINDOW_REC *window);
 
-void format_newline(WINDOW_REC *window);
+void format_newline(TEXT_DEST_REC *dest);
 
 /* Return how many characters in `str' must be skipped before `len'
    characters of text is skipped. */
@@ -151,6 +155,8 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text);
 int format_expand_styles(GString *out, const char **format, int *flags);
 void format_ext_color(GString *out, int bg, int color);
 void format_24bit_color(GString *out, int bg, unsigned int color);
+void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags, int fg, int bg,
+                      int flags);
 
 void formats_init(void);
 void formats_deinit(void);
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 692a3bc2..06c22a4c 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -42,7 +42,7 @@ static int signal_print_noformat;
 
 static int sending_print_starting;
 
-static void print_line(TEXT_DEST_REC *dest, const char *text);
+static void print_line(TEXT_DEST_REC *dest, const char *text, int formatted);
 
 void printformat_module_dest_args(const char *module, TEXT_DEST_REC *dest,
 				  int formatnum, va_list va)
@@ -63,7 +63,6 @@ void printformat_module_dest_charargs(const char *module, TEXT_DEST_REC *dest,
 				      int formatnum, char **arglist)
 {
 	THEME_REC *theme;
-	char *str;
 
 	theme = window_get_theme(dest->window);
 
@@ -75,11 +74,6 @@ void printformat_module_dest_charargs(const char *module, TEXT_DEST_REC *dest,
 
 	signal_emit_id(signal_print_format, 5, theme, module,
 		       dest, GINT_TO_POINTER(formatnum), arglist);
-
-	str = format_get_text_theme_charargs(theme, module, dest,
-					     formatnum, arglist);
-	if (str != NULL && *str != '\0') print_line(dest, str);
-	g_free(str);
 }
 
 void printformat_module_dest(const char *module, TEXT_DEST_REC *dest,
@@ -164,29 +158,6 @@ void printformat_module_gui(const char *module, int formatnum, ...)
 	va_end(va);
 }
 
-static void print_line(TEXT_DEST_REC *dest, const char *text)
-{
-        THEME_REC *theme;
-	char *str, *tmp, *stripped;
-
-	g_return_if_fail(dest != NULL);
-	g_return_if_fail(text != NULL);
-
-        theme = window_get_theme(dest->window);
-	tmp = format_get_level_tag(theme, dest);
-	str = !theme->info_eol ? format_add_linestart(text, tmp) :
-		format_add_lineend(text, tmp);
-	g_free_not_null(tmp);
-
-	/* send both the formatted + stripped (for logging etc.) */
-	stripped = strip_codes(str);
-	signal_emit_id(signal_print_text, 3, dest, str, stripped);
-        g_free_and_null(dest->hilight_color);
-
-	g_free(str);
-        g_free(stripped);
-}
-
 /* append string to `out', expand newlines. */
 static void printtext_append_str(TEXT_DEST_REC *dest, GString *out,
 				 const char *str)
@@ -195,7 +166,7 @@ static void printtext_append_str(TEXT_DEST_REC *dest, GString *out,
 		if (*str != '\n')
 			g_string_append_c(out, *str);
 		else {
-			print_line(dest, out->str);
+			print_line(dest, out->str, 0);
 			g_string_truncate(out, 0);
 		}
 		str++;
@@ -314,9 +285,7 @@ static void printtext_dest_args(TEXT_DEST_REC *dest, const char *text, va_list v
 	}
 
 	str = printtext_get_args(dest, text, va);
-	signal_emit_id(signal_print_noformat, 2,
-		       dest, str);
-	print_line(dest, str);
+	print_line(dest, str, 0);
 	g_free(str);
 }
 
@@ -361,8 +330,8 @@ void printtext_string(void *server, const char *target, int level, const char *t
 	}
 
         str = printtext_expand_formats(text, &dest.flags);
-	print_line(&dest, str);
-        g_free(str);
+	print_line(&dest, str, 0);
+	g_free(str);
 }
 
 /* Like printtext_window(), but don't handle %s etc. */
@@ -383,8 +352,8 @@ void printtext_string_window(WINDOW_REC *window, int level, const char *text)
 	}
 
         str = printtext_expand_formats(text, &dest.flags);
-	print_line(&dest, str);
-        g_free(str);
+	print_line(&dest, str, 0);
+	g_free(str);
 }
 
 void printtext_window(WINDOW_REC *window, int level, const char *text, ...)
@@ -476,6 +445,51 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text)
 	signal_emit_id(signal_gui_print_text_finished, 1, dest->window);
 }
 
+static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC *dest,
+                             void *formatnump, char **arglist)
+{
+	int formatnum;
+	char *str;
+
+	formatnum = GPOINTER_TO_INT(formatnump);
+	str = format_get_text_theme_charargs(theme, module, dest, formatnum, arglist);
+	if (str != NULL && *str != '\0')
+		print_line(dest, str, 1);
+
+	g_free(str);
+}
+
+static void sig_print_noformat(TEXT_DEST_REC *dest, const char *text)
+{
+	THEME_REC *theme;
+	char *str, *tmp, *stripped;
+
+	theme = window_get_theme(dest->window);
+	tmp = format_get_level_tag(theme, dest);
+	str = !theme->info_eol ? format_add_linestart(text, tmp) : format_add_lineend(text, tmp);
+	g_free_not_null(tmp);
+
+	/* send both the formatted + stripped (for logging etc.) */
+	stripped = strip_codes(str);
+	signal_emit_id(signal_print_text, 3, dest, str, stripped);
+
+	g_free_and_null(dest->hilight_color);
+
+	g_free(str);
+	g_free(stripped);
+}
+
+static void print_line(TEXT_DEST_REC *dest, const char *text, int formatted)
+{
+	g_return_if_fail(dest != NULL);
+	g_return_if_fail(text != NULL);
+
+	if (!formatted)
+		signal_emit_id(signal_print_noformat, 2, dest, text);
+	else
+		sig_print_noformat(dest, text);
+}
+
 void printtext_multiline(void *server, const char *target, int level,
 			 const char *format, const char *text)
 {
@@ -522,6 +536,8 @@ void printtext_init(void)
 
 	read_settings();
 	signal_add("print text", (SIGNAL_FUNC) sig_print_text);
+	signal_add("print format", (SIGNAL_FUNC) sig_print_format);
+	signal_add("print noformat", (SIGNAL_FUNC) sig_print_noformat);
 	signal_add("gui dialog", (SIGNAL_FUNC) sig_gui_dialog);
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 }
@@ -529,6 +545,8 @@ void printtext_init(void)
 void printtext_deinit(void)
 {
 	signal_remove("print text", (SIGNAL_FUNC) sig_print_text);
+	signal_remove("print format", (SIGNAL_FUNC) sig_print_format);
+	signal_remove("print noformat", (SIGNAL_FUNC) sig_print_noformat);
 	signal_remove("gui dialog", (SIGNAL_FUNC) sig_gui_dialog);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 }
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 94ce1a3c..8835f4b9 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -45,6 +45,7 @@ irssi_SOURCES = \
         textbuffer.c \
         textbuffer-commands.c \
         textbuffer-view.c \
+        textbuffer-formats.c \
         irssi.c \
 	module-formats.c
 
@@ -57,7 +58,8 @@ pkginc_fe_text_HEADERS = \
 	statusbar-item.h \
 	term.h \
 	textbuffer.h \
-	textbuffer-view.h
+	textbuffer-view.h \
+	textbuffer-formats.h
 
 noinst_HEADERS = \
 	gui-entry.h \
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 24e91624..fe720264 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -19,8 +19,9 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
 #include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include <irssi/src/fe-common/core/formats.h>
 #include <irssi/src/fe-common/core/printtext.h>
@@ -329,7 +330,7 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
         GUI_WINDOW_REC *gui;
         TEXT_BUFFER_VIEW_REC *view;
 	LINE_REC *insert_after;
-        LINE_INFO_REC lineinfo;
+	LINE_INFO_REC lineinfo = { 0 };
 	int fg, bg, flags, attr;
 
 	flags = GPOINTER_TO_INT(pflags);
@@ -342,10 +343,16 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 		return;
 	}
 
+	if (dest != NULL && dest->flags & PRINT_FLAG_FORMAT) {
+		return;
+	}
+
 	lineinfo.level = dest == NULL ? 0 : dest->level;
         gui = WINDOW_GUI(window);
         lineinfo.time = (gui->use_insert_after && gui->insert_after_time) ?
 		gui->insert_after_time : time(NULL);
+	lineinfo.format =
+	    dest != NULL && dest->flags & PRINT_FLAG_FORMAT ? LINE_INFO_FORMAT_SET : NULL;
 
 	view = gui->view;
 	insert_after = gui->use_insert_after ?
@@ -378,7 +385,8 @@ static void sig_gui_printtext_finished(WINDOW_REC *window)
 	insert_after = WINDOW_GUI(window)->use_insert_after ?
 		WINDOW_GUI(window)->insert_after : view->buffer->cur_line;
 
-        view_add_eol(view, &insert_after);
+	if (insert_after != NULL)
+		view_add_eol(view, &insert_after);
 	remove_old_lines(view);
 }
 
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 9ca2dfdb..46be2396 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -43,10 +43,9 @@ static GUI_WINDOW_REC *gui_window_init(WINDOW_REC *window,
 
 	gui = g_new0(GUI_WINDOW_REC, 1);
 	gui->parent = parent;
-	gui->view = textbuffer_view_create(textbuffer_create(),
-					   window->width, window->height,
-					   settings_get_bool("scroll"),
-					   term_type == TERM_TYPE_UTF8);
+	gui->view =
+	    textbuffer_view_create(textbuffer_create(window), window->width, window->height,
+	                           settings_get_bool("scroll"), term_type == TERM_TYPE_UTF8);
 	textbuffer_view_set_default_indent(gui->view,
 					   settings_get_int("indent"),
 					   !settings_get_bool("indent_always"),
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index c2013155..1b891522 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -71,6 +71,9 @@ void gui_expandos_deinit(void);
 void textbuffer_commands_init(void);
 void textbuffer_commands_deinit(void);
 
+void textbuffer_formats_init(void);
+void textbuffer_formats_deinit(void);
+
 void lastlog_init(void);
 void lastlog_deinit(void);
 
@@ -168,6 +171,7 @@ static void textui_finish_init(void)
 	textbuffer_init();
 	textbuffer_view_init();
 	textbuffer_commands_init();
+	textbuffer_formats_init();
 	gui_expandos_init();
 	gui_printtext_init();
 	gui_readline_init();
@@ -256,6 +260,7 @@ static void textui_deinit(void)
 	mainwindow_activity_deinit();
 	mainwindows_deinit();
 	gui_expandos_deinit();
+	textbuffer_formats_deinit();
 	textbuffer_commands_deinit();
 	textbuffer_view_deinit();
 	textbuffer_deinit();
diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index d5aa298a..54321832 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -199,7 +199,7 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 		}
 
                 /* get the line text */
-		textbuffer_line2text(rec, fhandle == NULL, line);
+		textbuffer_line2text(WINDOW_GUI(window)->view->buffer, rec, fhandle == NULL, line);
 		if (!settings_get_bool("timestamps")) {
 			struct tm *tm = localtime(&rec->info.time);
                         char timestamp[10];
diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 9070011e..4da98809 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -23,6 +23,7 @@ executable('irssi',
     'statusbar.c',
     'term.c',
     'textbuffer-commands.c',
+    'textbuffer-formats.c',
     'textbuffer-view.c',
     'textbuffer.c',
   )
@@ -53,6 +54,7 @@ install_headers(
     'statusbar-item.h',
     'statusbar.h',
     'term.h',
+    'textbuffer-formats.h',
     'textbuffer-view.h',
     'textbuffer.h',
   ),
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 11c0f123..f30eab0e 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -19,14 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/core/signals.h>
 #include <irssi/src/core/commands.h>
-#include <irssi/src/core/misc.h>
 #include <irssi/src/core/levels.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
 #include <irssi/src/core/refstrings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/fe-text/textbuffer-formats.h>
 
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/fe-text/gui-windows.h>
@@ -340,14 +341,29 @@ static void cmd_scrollback_status(void)
         total_lines = 0; total_mem = 0;
 	for (tmp = windows; tmp != NULL; tmp = tmp->next) {
 		WINDOW_REC *window = tmp->data;
+		int i;
+		LINE_REC *tmp;
 		TEXT_BUFFER_VIEW_REC *view;
 
 		view = WINDOW_GUI(window)->view;
 
 		window_mem = sizeof(TEXT_BUFFER_REC);
-		window_mem += g_slist_length(view->buffer->text_chunks) *
-			sizeof(TEXT_CHUNK_REC);
 		window_mem += view->buffer->lines_count * sizeof(LINE_REC);
+		for (tmp = view->buffer->cur_line; tmp != NULL; tmp = tmp->prev) {
+			if (tmp->info.text != NULL) {
+				window_mem += sizeof(char) * (strlen(tmp->info.text) + 1);
+			}
+			if (tmp->info.format != NULL) {
+				window_mem += sizeof(TEXT_BUFFER_FORMAT_REC);
+				for (i = 0; i < tmp->info.format->nargs; i++) {
+					if (tmp->info.format->args[i] != NULL) {
+						window_mem +=
+						    sizeof(char) *
+						    (strlen(tmp->info.format->args[i]) + 1);
+					}
+				}
+			}
+		}
 		total_lines += view->buffer->lines_count;
                 total_mem += window_mem;
 		printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP,
@@ -368,6 +384,19 @@ static void cmd_scrollback_status(void)
 	}
 }
 
+/* SYNTAX: SCROLLBACK REDRAW */
+static void cmd_scrollback_redraw(void)
+{
+	GUI_WINDOW_REC *gui;
+
+	gui = WINDOW_GUI(active_win);
+
+	term_refresh_freeze();
+	textbuffer_view_reset_cache(gui->view);
+	gui_window_redraw(active_win);
+	term_refresh_thaw();
+}
+
 static void sig_away_changed(SERVER_REC *server)
 {
 	GSList *tmp;
@@ -419,6 +448,7 @@ void textbuffer_commands_init(void)
 	command_bind("scrollback home", NULL, (SIGNAL_FUNC) cmd_scrollback_home);
 	command_bind("scrollback end", NULL, (SIGNAL_FUNC) cmd_scrollback_end);
 	command_bind("scrollback status", NULL, (SIGNAL_FUNC) cmd_scrollback_status);
+	command_bind("scrollback redraw", NULL, (SIGNAL_FUNC) cmd_scrollback_redraw);
 
 	command_set_options("clear", "all");
 	command_set_options("scrollback clear", "all");
@@ -442,6 +472,7 @@ void textbuffer_commands_deinit(void)
 	command_unbind("scrollback home", (SIGNAL_FUNC) cmd_scrollback_home);
 	command_unbind("scrollback end", (SIGNAL_FUNC) cmd_scrollback_end);
 	command_unbind("scrollback status", (SIGNAL_FUNC) cmd_scrollback_status);
+	command_unbind("scrollback redraw", (SIGNAL_FUNC) cmd_scrollback_redraw);
 
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 	signal_remove("away mode changed", (SIGNAL_FUNC) sig_away_changed);
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
new file mode 100644
index 00000000..599a85c6
--- /dev/null
+++ b/src/fe-text/textbuffer-formats.c
@@ -0,0 +1,258 @@
+#include "module.h"
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/refstrings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/textbuffer-formats.h>
+#include <irssi/src/fe-text/textbuffer-view.h>
+
+TEXT_BUFFER_REC *color_buf;
+
+void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec)
+{
+	int n;
+
+	if (rec == NULL)
+		return;
+	if (rec == LINE_INFO_FORMAT_SET)
+		return;
+
+	i_refstr_release(rec->module);
+	i_refstr_release(rec->format);
+	i_refstr_release(rec->server_tag);
+	i_refstr_release(rec->target);
+	i_refstr_release(rec->nick);
+	if (rec->nargs >= 1) {
+		i_refstr_release(rec->args[0]);
+	}
+	for (n = 1; n < rec->nargs; n++) {
+		g_free(rec->args[n]);
+	}
+	rec->nargs = 0;
+	g_free(rec->args);
+	g_slice_free(TEXT_BUFFER_FORMAT_REC, rec);
+}
+
+static TEXT_BUFFER_FORMAT_REC *format_rec_new(const char *module, const char *format_tag,
+                                              const char *server_tag, const char *target,
+                                              const char *nick, int nargs, const char **args)
+{
+	int n;
+	TEXT_BUFFER_FORMAT_REC *ret = g_slice_new0(TEXT_BUFFER_FORMAT_REC);
+	ret->module = i_refstr_intern(module);
+	ret->format = i_refstr_intern(format_tag);
+	ret->server_tag = i_refstr_intern(server_tag);
+	ret->target = i_refstr_intern(target);
+	ret->nick = i_refstr_intern(nick);
+	ret->nargs = nargs;
+	ret->args = g_new0(char *, nargs);
+	if (nargs >= 1) {
+		ret->args[0] = i_refstr_intern(args[0]);
+	}
+	for (n = 1; n < nargs; n++) {
+		ret->args[n] = g_strdup(args[n]);
+	}
+	return ret;
+}
+
+static LINE_INFO_REC *store_lineinfo_tmp(TEXT_DEST_REC *dest)
+{
+	GUI_WINDOW_REC *gui;
+	TEXT_BUFFER_VIEW_REC *view;
+	TEXT_BUFFER_REC *buffer;
+	LINE_INFO_REC *lineinfo;
+
+	gui = WINDOW_GUI(dest->window);
+	view = gui->view;
+	buffer = view->buffer;
+
+	lineinfo = g_new0(LINE_INFO_REC, 1);
+	lineinfo->level = dest->level;
+	lineinfo->time =
+	    (gui->use_insert_after && gui->insert_after_time) ? gui->insert_after_time : time(NULL);
+
+	buffer->cur_info = g_slist_prepend(buffer->cur_info, lineinfo);
+	return lineinfo;
+}
+
+static void free_lineinfo_tmp(WINDOW_REC *window)
+{
+	GUI_WINDOW_REC *gui;
+	TEXT_BUFFER_REC *buffer;
+	LINE_INFO_REC *info;
+
+	gui = WINDOW_GUI(window);
+	buffer = gui->view->buffer;
+
+	if (buffer->cur_info == NULL)
+		return;
+
+	info = buffer->cur_info->data;
+	buffer->cur_info = g_slist_delete_link(buffer->cur_info, buffer->cur_info);
+	textbuffer_format_rec_free(info->format);
+	g_free(info);
+}
+
+static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC *dest,
+                             void *formatnump, const char **args)
+{
+	int formatnum;
+	FORMAT_REC *formats;
+	LINE_INFO_REC *info;
+
+	info = store_lineinfo_tmp(dest);
+
+	formatnum = GPOINTER_TO_INT(formatnump);
+	formats = g_hash_table_lookup(default_formats, module);
+
+	info->format = format_rec_new(module, formats[formatnum].tag, dest->server_tag,
+	                              dest->target, dest->nick, formats[formatnum].params, args);
+
+	info->format->flags = dest->flags;
+	dest->flags |= PRINT_FLAG_FORMAT;
+
+	signal_continue(5, theme, module, dest, formatnump, args);
+
+	free_lineinfo_tmp(dest->window);
+}
+
+static void sig_print_noformat(TEXT_DEST_REC *dest, const char *text)
+{
+	LINE_INFO_REC *info;
+
+	info = store_lineinfo_tmp(dest);
+
+	info->format = format_rec_new(NULL, NULL, dest->server_tag, dest->target, dest->nick, 2,
+	                              (const char *[]){ NULL, text });
+
+	info->format->flags = dest->flags;
+	dest->flags |= PRINT_FLAG_FORMAT;
+
+	signal_continue(2, dest, text);
+
+	free_lineinfo_tmp(dest->window);
+}
+
+static void sig_gui_print_text_finished(WINDOW_REC *window)
+{
+	GUI_WINDOW_REC *gui;
+	LINE_REC *insert_after;
+	LINE_INFO_REC *info;
+	TEXT_BUFFER_REC *buffer;
+
+	gui = WINDOW_GUI(window);
+	buffer = gui->view->buffer;
+	insert_after = gui->use_insert_after ? gui->insert_after : buffer->cur_line;
+
+	if (buffer->cur_info == NULL)
+		return;
+
+	info = buffer->cur_info->data;
+
+	if (info->format == NULL)
+		return;
+
+	info->level |= MSGLEVEL_FORMAT;
+
+	/* the line will be inserted into the view with textbuffer_view_insert_line by
+	   gui-printtext.c:view_add_eol */
+	insert_after = textbuffer_insert(buffer, insert_after, (const unsigned char[]){}, 0, info);
+
+	/* the TEXT_BUFFER_FORMAT_REC pointer is now owned by the textbuffer */
+	info->format = LINE_INFO_FORMAT_SET;
+
+	if (gui->use_insert_after)
+		gui->insert_after = insert_after;
+}
+
+char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
+{
+	GUI_WINDOW_REC *gui;
+	LINE_REC *curr;
+
+	g_return_val_if_fail(buffer != NULL, NULL);
+	g_return_val_if_fail(buffer->window != NULL, NULL);
+
+	gui = WINDOW_GUI(buffer->window);
+	if (line == NULL || gui == NULL)
+		return NULL;
+
+	if (line->info.level & MSGLEVEL_FORMAT) {
+		TEXT_DEST_REC dest;
+		THEME_REC *theme;
+		int formatnum;
+		TEXT_BUFFER_FORMAT_REC *format_rec;
+		char *text, *tmp, *str;
+
+		curr = line;
+		line = NULL;
+		format_rec = curr->info.format;
+
+		format_create_dest(
+		    &dest,
+		    format_rec->server_tag != NULL ? server_find_tag(format_rec->server_tag) : NULL,
+		    format_rec->target, curr->info.level & ~MSGLEVEL_FORMAT, buffer->window);
+
+		theme = window_get_theme(dest.window);
+
+		if (format_rec->format != NULL) {
+			char *arglist[MAX_FORMAT_PARAMS] = { 0 };
+			formatnum = format_find_tag(format_rec->module, format_rec->format);
+			memcpy(arglist, format_rec->args, format_rec->nargs * sizeof(char *));
+			text = format_get_text_theme_charargs(theme, format_rec->module, &dest,
+			                                      formatnum, arglist);
+		} else {
+			text = g_strdup(format_rec->args[1]);
+		}
+
+		if (*text != '\0') {
+			current_time = curr->info.time;
+
+			tmp = format_get_level_tag(theme, &dest);
+			str = !theme->info_eol ? format_add_linestart(text, tmp) :
+			                         format_add_lineend(text, tmp);
+			g_free_not_null(tmp);
+			g_free_not_null(text);
+			text = str;
+			tmp = format_get_line_start(theme, &dest, curr->info.time);
+			str = !theme->info_eol ? format_add_linestart(text, tmp) :
+			                         format_add_lineend(text, tmp);
+			g_free_not_null(tmp);
+			g_free_not_null(text);
+			text = str;
+			/* str = g_strconcat(text, "\n", NULL); */
+			/* g_free(text); */
+
+			dest.flags |= PRINT_FLAG_FORMAT;
+
+			current_time = (time_t) -1;
+			return str;
+		} else if (format_rec->format != NULL) {
+			g_free(text);
+			return NULL;
+		} else {
+			return text;
+		}
+	} else {
+		return g_strdup(line->info.text);
+	}
+}
+
+void textbuffer_formats_init(void)
+{
+	signal_add("print format", (SIGNAL_FUNC) sig_print_format);
+	signal_add("print noformat", (SIGNAL_FUNC) sig_print_noformat);
+	signal_add_first("gui print text finished", (SIGNAL_FUNC) sig_gui_print_text_finished);
+}
+
+void textbuffer_formats_deinit(void)
+{
+	signal_remove("print format", (SIGNAL_FUNC) sig_print_format);
+	signal_remove("print noformat", (SIGNAL_FUNC) sig_print_noformat);
+	signal_remove("gui print text finished", (SIGNAL_FUNC) sig_gui_print_text_finished);
+}
diff --git a/src/fe-text/textbuffer-formats.h b/src/fe-text/textbuffer-formats.h
new file mode 100644
index 00000000..5a156fda
--- /dev/null
+++ b/src/fe-text/textbuffer-formats.h
@@ -0,0 +1,22 @@
+#ifndef IRSSI_FE_TEXT_TEXTBUFFER_FORMATS_H
+#define IRSSI_FE_TEXT_TEXTBUFFER_FORMATS_H
+
+#include <irssi/src/fe-text/textbuffer.h>
+
+typedef struct _TEXT_BUFFER_FORMAT_REC {
+	char *module;
+	char *format;
+	char *server_tag;
+	char *target;
+	char *nick;
+	char **args;
+	int nargs;
+	int flags;
+} TEXT_BUFFER_FORMAT_REC;
+
+void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec);
+char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line);
+void textbuffer_formats_init(void);
+void textbuffer_formats_deinit(void);
+
+#endif
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 45035fa8..0bbb3655 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -21,9 +21,12 @@
 #define	G_LOG_DOMAIN "TextBufferView"
 
 #include "module.h"
-#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssi/src/core/levels.h>
 #include <irssi/src/core/signals.h>
 #include <irssi/src/core/utf8.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-text/textbuffer-formats.h>
+#include <irssi/src/fe-text/textbuffer-view.h>
 
 typedef struct {
 	char *name;
@@ -93,6 +96,7 @@ textbuffer_cache_get(GSList *views, int width)
 
 static int line_cache_destroy(void *key, LINE_CACHE_REC *cache)
 {
+	g_free(cache->line_text);
 	g_free(cache);
 	return TRUE;
 }
@@ -114,52 +118,6 @@ static void textbuffer_cache_unref(TEXT_BUFFER_CACHE_REC *cache)
 #define FGATTR (ATTR_NOCOLORS | ATTR_RESETFG | FG_MASK | ATTR_FGCOLOR24)
 #define BGATTR (ATTR_NOCOLORS | ATTR_RESETBG | BG_MASK | ATTR_BGCOLOR24)
 
-static void update_cmd_color(unsigned char cmd, int *color)
-{
-	if ((cmd & 0x80) == 0) {
-		if (cmd & LINE_COLOR_BG) {
-			/* set background color */
-			*color &= FGATTR;
-			if ((cmd & LINE_COLOR_DEFAULT) == 0)
-				*color |= (cmd & 0x0f) << BG_SHIFT;
-			else {
-				*color = (*color & FGATTR) | ATTR_RESETBG;
-			}
-		} else {
-			/* set foreground color */
-			*color &= BGATTR;
-			if ((cmd & LINE_COLOR_DEFAULT) == 0)
-				*color |= cmd & 0x0f;
-			else {
-				*color = (*color & BGATTR) | ATTR_RESETFG;
-			}
-		}
-	} else switch (cmd) {
-	case LINE_CMD_UNDERLINE:
-		*color ^= ATTR_UNDERLINE;
-		break;
-	case LINE_CMD_REVERSE:
-		*color ^= ATTR_REVERSE;
-		break;
-	case LINE_CMD_BLINK:
-		*color ^= ATTR_BLINK;
-		break;
-	case LINE_CMD_BOLD:
-		*color ^= ATTR_BOLD;
-		break;
-	case LINE_CMD_ITALIC:
-		*color ^= ATTR_ITALIC;
-		break;
-	case LINE_CMD_MONOSPACE:
-		/* ignored */
-		break;
-	case LINE_CMD_COLOR0:
-		*color &= BGATTR;
-		*color &= ~ATTR_FGCOLOR24;
-		break;
-	}
-}
-
 #ifdef TERM_TRUECOLOR
 static void unformat_24bit_line_color(const unsigned char **ptr, int off, int *flags, unsigned int *fg, unsigned int *bg)
 {
@@ -167,6 +125,8 @@ static void unformat_24bit_line_color(const unsigned char **ptr, int off, int *f
 	unsigned char rgbx[4];
 	unsigned int i;
 	for (i = 0; i < 4; ++i) {
+		if ((*ptr)[i + off] == '\0')
+			return;
 		rgbx[i] = (*ptr)[i + off];
 	}
 	rgbx[3] -= 0x20;
@@ -202,6 +162,94 @@ static inline unichar read_unichar(const unsigned char *data, const unsigned cha
 	return chr;
 }
 
+static inline void unformat(const unsigned char **ptr, int *color, unsigned int *fg24,
+                            unsigned int *bg24)
+{
+	switch (**ptr) {
+	case FORMAT_STYLE_BLINK:
+		*color ^= ATTR_BLINK;
+		break;
+	case FORMAT_STYLE_UNDERLINE:
+		*color ^= ATTR_UNDERLINE;
+		break;
+	case FORMAT_STYLE_BOLD:
+		*color ^= ATTR_BOLD;
+		break;
+	case FORMAT_STYLE_REVERSE:
+		*color ^= ATTR_REVERSE;
+		break;
+	case FORMAT_STYLE_ITALIC:
+		*color ^= ATTR_ITALIC;
+		break;
+	case FORMAT_STYLE_MONOSPACE:
+		/* *color ^= ATTR_MONOSPACE; */
+		break;
+	case FORMAT_STYLE_DEFAULTS:
+		*color = ATTR_RESET;
+		break;
+	case FORMAT_STYLE_CLRTOEOL:
+		break;
+	case FORMAT_COLOR_EXT1:
+		*color &= ~ATTR_FGCOLOR24;
+		*color = (*color & BGATTR) | (0x10 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		break;
+	case FORMAT_COLOR_EXT1_BG:
+		*color &= ~ATTR_BGCOLOR24;
+		*color = (*color & FGATTR) | (0x10 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		break;
+	case FORMAT_COLOR_EXT2:
+		*color &= ~ATTR_FGCOLOR24;
+		*color = (*color & BGATTR) | (0x60 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		break;
+	case FORMAT_COLOR_EXT2_BG:
+		*color &= ~ATTR_BGCOLOR24;
+		*color = (*color & FGATTR) | (0x60 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		break;
+	case FORMAT_COLOR_EXT3:
+		*color &= ~ATTR_FGCOLOR24;
+		*color = (*color & BGATTR) | (0xb0 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		break;
+	case FORMAT_COLOR_EXT3_BG:
+		*color &= ~ATTR_BGCOLOR24;
+		*color = (*color & FGATTR) | (0xb0 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		break;
+#ifdef TERM_TRUECOLOR
+	case FORMAT_COLOR_24:
+		unformat_24bit_line_color(ptr, 1, color, fg24, bg24);
+		break;
+#endif
+	default:
+		if (**ptr != FORMAT_COLOR_NOCHANGE) {
+			if (**ptr == (unsigned char) 0xff) {
+				*color = (*color & BGATTR) | ATTR_RESETFG;
+			} else {
+				*color = (*color & BGATTR) | (((unsigned char) **ptr - '0') & 0xf);
+			}
+		}
+		if ((*ptr)[1] == '\0')
+			break;
+
+		(*ptr)++;
+		if (**ptr != FORMAT_COLOR_NOCHANGE) {
+			if (**ptr == (unsigned char) 0xff) {
+				*color = (*color & FGATTR) | ATTR_RESETBG;
+			} else {
+				*color = (*color & FGATTR) |
+				         ((((unsigned char) **ptr - '0') & 0xf) << BG_SHIFT);
+			}
+		}
+	}
+	if (**ptr == '\0')
+		return;
+
+	(*ptr)++;
+}
+
+#define NEXT_CHAR_OR_BREAK(p)                                                                      \
+	(p)++;                                                                                     \
+	if (*(p) == '\0')                                                                          \
+	break
+
 static LINE_CACHE_REC *
 view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 {
@@ -209,14 +257,12 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 	LINE_CACHE_REC *rec;
 	LINE_CACHE_SUB_REC *sub;
 	GSList *lines;
-        unsigned char cmd;
+	char *line_text;
 	const unsigned char *ptr, *next_ptr, *last_space_ptr;
 	int xpos, pos, indent_pos, last_space, last_color, color, linecount;
 	unsigned int last_bg24, last_fg24, bg24, fg24;
 	int char_width;
 
-	g_return_val_if_fail(line->text != NULL, NULL);
-
 	color = ATTR_RESETFG | ATTR_RESETBG;
 	xpos = 0; indent_pos = view->default_indent;
 	last_space = last_color = 0; last_space_ptr = NULL; sub = NULL;
@@ -225,114 +271,132 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
         indent_func = view->default_indent_func;
         linecount = 1;
 	lines = NULL;
-	for (ptr = line->text;;) {
-		if (*ptr == '\0') {
-			/* command */
-			ptr++;
-			cmd = *ptr;
-                        ptr++;
 
-			if (cmd == LINE_CMD_EOL)
+	line_text = textbuffer_line_get_text(view->buffer, line);
+	if (line_text != NULL) {
+		for (ptr = (unsigned char *) line_text;;) {
+			if (*ptr == '\0')
 				break;
 
-			if (cmd == LINE_CMD_CONTINUE) {
-				unsigned char *tmp;
+			if (*ptr == '\n') {
+				/* newline */
+				xpos = 0;
+				last_space = 0;
+
+				sub = g_new0(LINE_CACHE_SUB_REC, 1);
+
+				sub->start = ++ptr;
+				sub->color = color;
+#ifdef TERM_TRUECOLOR
+				sub->fg24 = fg24;
+				sub->bg24 = bg24;
+#endif
+
+				lines = g_slist_append(lines, sub);
+				linecount++;
 
-				memcpy(&tmp, ptr, sizeof(char *));
-				ptr = tmp;
 				continue;
 			}
 
-			if (cmd == LINE_CMD_INDENT) {
-				/* set indentation position here - don't do
-				   it if we're too close to right border */
-				if (xpos < view->width-5) indent_pos = xpos;
-			} else if (cmd == LINE_COLOR_EXT) {
-				color &= ~ATTR_FGCOLOR24;
-				color = (color & BGATTR) | *ptr++;
-			} else if (cmd == LINE_COLOR_EXT_BG) {
-				color &= ~ATTR_BGCOLOR24;
-				color = (color & FGATTR) | (*ptr++ << BG_SHIFT);
-			}
-#ifdef TERM_TRUECOLOR
-			else if (cmd == LINE_COLOR_24)
-				unformat_24bit_line_color(&ptr, 0, &color, &fg24, &bg24);
-#endif
-			else
-				update_cmd_color(cmd, &color);
-			continue;
-		}
+			if (*ptr == 4) {
+				/* format */
+				NEXT_CHAR_OR_BREAK(ptr);
 
-		if (!view->utf8) {
-			/* MH */
-			if (term_type != TERM_TYPE_BIG5 ||
-			    ptr[1] == '\0' || !is_big5(ptr[0], ptr[1]))
-				char_width = 1;
-			else
-				char_width = 2;
-			next_ptr = ptr+char_width;
-		} else {
-			read_unichar(ptr, &next_ptr, &char_width);
-		}
-
-		if (xpos + char_width > view->width && sub != NULL &&
-		    (last_space <= indent_pos || last_space <= 10) &&
-		    view->longword_noindent) {
-                        /* long word, remove the indentation from this line */
-			xpos -= sub->indent;
-                        sub->indent = 0;
-			sub->indent_func = NULL;
-		}
-
-		if (xpos + char_width > view->width) {
-			xpos = indent_func == NULL ? indent_pos :
-				indent_func(view, line, -1);
-
-			sub = g_new0(LINE_CACHE_SUB_REC, 1);
-			if (last_space > indent_pos && last_space > 10) {
-                                /* go back to last space */
-                                color = last_color; fg24 = last_fg24; bg24 = last_bg24;
-				ptr = last_space_ptr;
-				while (*ptr == ' ') ptr++;
-			} else if (view->longword_noindent) {
-				/* long word, no indentation in next line */
-				xpos = 0;
-				sub->continues = TRUE;
+				if (*ptr == FORMAT_STYLE_INDENT) {
+					/* set indentation position here - don't do
+					   it if we're too close to right border */
+					if (xpos < view->width - 5)
+						indent_pos = xpos;
+					ptr++;
+				} else {
+					unformat(&ptr, &color, &fg24, &bg24);
+				}
+				continue;
 			}
 
-			sub->start = ptr;
-			sub->indent = xpos;
-                        sub->indent_func = indent_func;
-			sub->color = color;
+			if (!view->utf8) {
+				/* MH */
+				if (term_type != TERM_TYPE_BIG5 || ptr[1] == '\0' ||
+				    !is_big5(ptr[0], ptr[1]))
+					char_width = 1;
+				else
+					char_width = 2;
+				next_ptr = ptr + char_width;
+			} else {
+				read_unichar(ptr, &next_ptr, &char_width);
+			}
+
+			if (xpos + char_width > view->width && sub != NULL &&
+			    (last_space <= indent_pos || last_space <= 10) &&
+			    view->longword_noindent) {
+				/* long word, remove the indentation from this line */
+				xpos -= sub->indent;
+				sub->indent = 0;
+				sub->indent_func = NULL;
+			}
+
+			if (xpos + char_width > view->width) {
+				xpos =
+				    indent_func == NULL ? indent_pos : indent_func(view, line, -1);
+
+				sub = g_new0(LINE_CACHE_SUB_REC, 1);
+				if (last_space > indent_pos && last_space > 10) {
+					/* go back to last space */
+					color = last_color;
+					fg24 = last_fg24;
+					bg24 = last_bg24;
+					ptr = last_space_ptr;
+					while (*ptr == ' ')
+						ptr++;
+				} else if (view->longword_noindent) {
+					/* long word, no indentation in next line */
+					xpos = 0;
+					sub->continues = TRUE;
+				}
+
+				sub->start = ptr;
+				sub->indent = xpos;
+				sub->indent_func = indent_func;
+				sub->color = color;
 #ifdef TERM_TRUECOLOR
-			sub->fg24 = fg24; sub->bg24 = bg24;
+				sub->fg24 = fg24;
+				sub->bg24 = bg24;
 #endif
 
-			lines = g_slist_append(lines, sub);
-			linecount++;
+				lines = g_slist_append(lines, sub);
+				linecount++;
 
-			last_space = 0;
-			continue;
+				last_space = 0;
+				continue;
+			}
+
+			if (view->break_wide && char_width > 1) {
+				last_space = xpos;
+				last_space_ptr = next_ptr;
+				last_color = color;
+				last_fg24 = fg24;
+				last_bg24 = bg24;
+			} else if (*ptr == ' ') {
+				last_space = xpos;
+				last_space_ptr = ptr;
+				last_color = color;
+				last_fg24 = fg24;
+				last_bg24 = bg24;
+			}
+
+			xpos += char_width;
+			ptr = next_ptr;
 		}
-
-		if (view->break_wide && char_width > 1) {
-			last_space = xpos;
-			last_space_ptr = next_ptr;
-			last_color = color; last_fg24 = fg24; last_bg24 = bg24;
-		} else if (*ptr == ' ') {
-			last_space = xpos;
-			last_space_ptr = ptr;
-			last_color = color; last_fg24 = fg24; last_bg24 = bg24;
-		}
-
-		xpos += char_width;
-		ptr = next_ptr;
 	}
 
 	rec = g_malloc(sizeof(LINE_CACHE_REC)-sizeof(LINE_CACHE_SUB_REC) +
 		       sizeof(LINE_CACHE_SUB_REC) * (linecount-1));
 	rec->last_access = time(NULL);
+	if (line_text == NULL) {
+		linecount = 0;
+	}
 	rec->count = linecount;
+	rec->line_text = line_text;
 
 	if (rec->count > 1) {
 		for (pos = 0; lines != NULL; pos++) {
@@ -398,12 +462,9 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	INDENT_FUNC indent_func;
 	LINE_CACHE_REC *cache;
 	const unsigned char *text, *end, *text_newline;
-	unsigned char *tmp;
 	unichar chr;
 	int xpos, color, drawcount, first, need_move, need_clrtoeol, char_width;
-#ifdef TERM_TRUECOLOR
 	unsigned int fg24, bg24;
-#endif
 
 	if (view->dirty) /* don't bother drawing anything - redraw is coming */
 		return 0;
@@ -416,7 +477,8 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	need_move = TRUE; need_clrtoeol = FALSE;
 	xpos = drawcount = 0; first = TRUE;
 	text_newline = text =
-		subline == 0 ? line->text : cache->lines[subline-1].start;
+	    subline == 0 ? (unsigned char *) cache->line_text : cache->lines[subline - 1].start;
+
 	for (;;) {
 		if (text == text_newline) {
 			if (need_clrtoeol && xpos < view->width + (view->width == term_width ? 0 : 1)) {
@@ -484,31 +546,29 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 			subline++;
 		}
 
-		if (*text == '\0') {
-			/* command */
-			text++;
-			if (*text == LINE_CMD_EOL)
-				break;
+		if (*text == '\n') {
+			/* newline */
+			NEXT_CHAR_OR_BREAK(text);
+			continue;
+		}
 
-			if (*text == LINE_CMD_CONTINUE) {
-				/* jump to next block */
-				memcpy(&tmp, text+1, sizeof(unsigned char *));
-				text = tmp;
-				continue;
+		if (*text == 0) {
+			break;
+		}
+
+		if (*text == 4) {
+			/* format */
+			NEXT_CHAR_OR_BREAK(text);
+
+			if (*text == FORMAT_STYLE_INDENT) {
+				/* ??? */
+				NEXT_CHAR_OR_BREAK(text);
 			} else {
-				if (*text == LINE_COLOR_EXT)
-					color = (color & BGATTR & ~ATTR_FGCOLOR24) | *++text;
-				else if (*text == LINE_COLOR_EXT_BG)
-					color = (color & FGATTR & ~ATTR_BGCOLOR24) | (*++text << BG_SHIFT);
-#ifdef TERM_TRUECOLOR
-				else if (*text == LINE_COLOR_24)
-					unformat_24bit_line_color(&text, 1, &color, &fg24, &bg24);
-#endif
-				else
-					update_cmd_color(*text, &color);
+				unformat(&text, &color, &fg24, &bg24);
 				term_set_color2(view->window, color, fg24, bg24);
+				if (*text == 0)
+					break;
 			}
-			text++;
 			continue;
 		}
 
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index 607016ac..4e5ed82f 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -27,6 +27,7 @@ typedef struct {
 typedef struct {
 	time_t last_access;
 
+	char *line_text;
 	int count; /* number of real lines */
 
 	/* variable sized array, actually. starts from the second line,
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 470c0b00..b8fd2090 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -26,176 +26,59 @@
 #include <irssi/src/core/utf8.h>
 #include <irssi/src/core/iregex.h>
 
+#include <irssi/src/fe-text/textbuffer-formats.h>
 #include <irssi/src/fe-text/textbuffer.h>
 
 #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*))
 
-TEXT_BUFFER_REC *textbuffer_create(void)
+TEXT_BUFFER_REC *textbuffer_create(WINDOW_REC *window)
 {
 	TEXT_BUFFER_REC *buffer;
 
 	buffer = g_slice_new0(TEXT_BUFFER_REC);
+	buffer->window = window;
 	buffer->last_eol = TRUE;
 	buffer->last_fg = -1;
 	buffer->last_bg = -1;
-        return buffer;
+	buffer->cur_text = g_string_sized_new(TEXT_CHUNK_USABLE_SIZE);
+	return buffer;
 }
 
 void textbuffer_destroy(TEXT_BUFFER_REC *buffer)
 {
+	GSList *tmp;
+
 	g_return_if_fail(buffer != NULL);
 
 	textbuffer_remove_all_lines(buffer);
-        g_slice_free(TEXT_BUFFER_REC, buffer);
-}
-
-static TEXT_CHUNK_REC *text_chunk_find(TEXT_BUFFER_REC *buffer,
-				       const unsigned char *data)
-{
-	GSList *tmp;
-
-	for (tmp = buffer->text_chunks; tmp != NULL; tmp = tmp->next) {
-		TEXT_CHUNK_REC *rec = tmp->data;
-
-		if (data >= rec->buffer &&
-		    data < rec->buffer+sizeof(rec->buffer))
-                        return rec;
+	g_string_free(buffer->cur_text, TRUE);
+	for (tmp = buffer->cur_info; tmp != NULL; tmp = tmp->next) {
+		LINE_INFO_REC *info = buffer->cur_info->data;
+		textbuffer_format_rec_free(info->format);
+		g_free(info->text);
+		g_free(info);
 	}
+	g_slist_free(buffer->cur_info);
 
-	return NULL;
-}
-
-#define mark_temp_eol(chunk) G_STMT_START { \
-	(chunk)->buffer[(chunk)->pos] = 0; \
-	(chunk)->buffer[(chunk)->pos+1] = LINE_CMD_EOL; \
-	} G_STMT_END
-
-static TEXT_CHUNK_REC *text_chunk_create(TEXT_BUFFER_REC *buffer)
-{
-	TEXT_CHUNK_REC *rec;
-	unsigned char *buf, *ptr, **pptr;
-
-	rec = g_slice_new(TEXT_CHUNK_REC);
-	rec->pos = 0;
-	rec->refcount = 0;
-
-	if (buffer->cur_line != NULL && buffer->cur_line->text != NULL) {
-		/* create a link to new block from the old block */
-		buf = buffer->cur_text->buffer + buffer->cur_text->pos;
-		*buf++ = 0; *buf++ = (char) LINE_CMD_CONTINUE;
-
-		/* we want to store pointer to beginning of the new text
-		   block to char* buffer. this probably isn't ANSI-C
-		   compatible, and trying this without the pptr variable
-		   breaks at least NetBSD/Alpha, so don't go "optimize"
-		   it :) */
-		ptr = rec->buffer; pptr = &ptr;
-		memcpy(buf, pptr, sizeof(unsigned char *));
-	} else {
-		/* just to be safe */
-		mark_temp_eol(rec);
-	}
-
-	buffer->cur_text = rec;
-	buffer->text_chunks = g_slist_append(buffer->text_chunks, rec);
-	return rec;
-}
-
-static void text_chunk_destroy(TEXT_BUFFER_REC *buffer, TEXT_CHUNK_REC *chunk)
-{
-	buffer->text_chunks = g_slist_remove(buffer->text_chunks, chunk);
-	g_slice_free(TEXT_CHUNK_REC, chunk);
-}
-
-static void text_chunk_line_free(TEXT_BUFFER_REC *buffer, LINE_REC *line)
-{
-	TEXT_CHUNK_REC *chunk;
-	const unsigned char *text;
-        unsigned char cmd, *tmp = NULL;
-
-	for (text = line->text;; text++) {
-		if (*text != '\0')
-                        continue;
-
-		text++;
-		cmd = *text;
-		if (cmd == LINE_CMD_CONTINUE || cmd == LINE_CMD_EOL) {
-			if (cmd == LINE_CMD_CONTINUE)
-				memcpy(&tmp, text+1, sizeof(char *));
-
-			/* free the previous block */
-			chunk = text_chunk_find(buffer, text);
-			if (--chunk->refcount == 0) {
-				if (buffer->cur_text == chunk)
-					chunk->pos = 0;
-				else
-					text_chunk_destroy(buffer, chunk);
-			}
-
-			if (cmd == LINE_CMD_EOL)
-				break;
-
-			text = tmp-1;
-		}
-	}
+	buffer->window = NULL;
+	g_slice_free(TEXT_BUFFER_REC, buffer);
 }
 
 static void text_chunk_append(TEXT_BUFFER_REC *buffer,
 			      const unsigned char *data, int len)
 {
-        TEXT_CHUNK_REC *chunk;
-	int left;
-	int i;
-
 	if (len == 0)
                 return;
 
-        chunk = buffer->cur_text;
-	while (chunk->pos + len >= TEXT_CHUNK_USABLE_SIZE) {
-		left = TEXT_CHUNK_USABLE_SIZE - chunk->pos;
-
-		/* don't split utf-8 character. (assume we can split non-utf8 anywhere.) */
-		if (left < len && !is_utf8_leading(data[left])) {
-			int i;
-			for (i = 1; i < 4 && left >= i; i++)
-				if (is_utf8_leading(data[left - i])) {
-					left -= i;
-					break;
-				}
-		}
-
-		for (i = 5; i > 0; --i) {
-			if (left >= i && data[left-i] == 0) {
-				left -= i; /* don't split the commands */
-				break;
-			}
-		}
-
-		memcpy(chunk->buffer + chunk->pos, data, left);
-		chunk->pos += left;
-
-		chunk = text_chunk_create(buffer);
-		chunk->refcount++;
-		len -= left; data += left;
-	}
-
-	memcpy(chunk->buffer + chunk->pos, data, len);
-	chunk->pos += len;
-
-	mark_temp_eol(chunk);
+	/* g_string_append_len(buffer->cur_text, (const char *)data, len); */
+	g_string_append(buffer->cur_text, (const char *) data);
 }
 
 static LINE_REC *textbuffer_line_create(TEXT_BUFFER_REC *buffer)
 {
 	LINE_REC *rec;
 
-	if (buffer->cur_text == NULL)
-                text_chunk_create(buffer);
-
 	rec = g_slice_new0(LINE_REC);
-	rec->text = buffer->cur_text->buffer + buffer->cur_text->pos;
-
-	buffer->cur_text->refcount++;
         return rec;
 }
 
@@ -241,103 +124,18 @@ int textbuffer_line_exists_after(LINE_REC *line, LINE_REC *search)
         return FALSE;
 }
 
-#ifdef TERM_TRUECOLOR
-static void format_24bit_line_color(unsigned char *out, int *pos, int bg, unsigned int color)
-{
-	unsigned char rgb[] = { color >> 16, color >> 8, color };
-	unsigned char x = bg ? 0x1 : 0;
-	unsigned int i;
-	out[(*pos)++] = LINE_COLOR_24;
-	for (i = 0; i < 3; ++i) {
-		if (rgb[i] > 0x20)
-			out[(*pos)++] = rgb[i];
-		else {
-			out[(*pos)++] = 0x20 + rgb[i];
-			x |= 0x10 << i;
-		}
-	}
-	out[(*pos)++] = 0x20 + x;
-}
-#endif
-
 void textbuffer_line_add_colors(TEXT_BUFFER_REC *buffer, LINE_REC **line,
 				int fg, int bg, int flags)
 {
-	unsigned char data[22];
-	int pos;
+	GString *out = g_string_new(NULL);
+	format_gui_flags(out, &buffer->last_fg, &buffer->last_bg, &buffer->last_flags, fg, bg,
+	                 flags);
 
-	pos = 0;
-	if (fg != buffer->last_fg
-	    || (flags & GUI_PRINT_FLAG_COLOR_24_FG) != (buffer->last_flags & GUI_PRINT_FLAG_COLOR_24_FG)) {
-		buffer->last_fg = fg;
-		data[pos++] = 0;
-#ifdef TERM_TRUECOLOR
-		if (flags & GUI_PRINT_FLAG_COLOR_24_FG)
-			format_24bit_line_color(data, &pos, 0, fg);
-		else
-#endif
-		if (fg < 0)
-			data[pos++] = LINE_COLOR_DEFAULT;
-		else if (fg < 16)
-			data[pos++] = fg == 0 ? LINE_CMD_COLOR0 : fg;
-		else if (fg < 256) {
-			data[pos++] = LINE_COLOR_EXT;
-			data[pos++] = fg;
-		}
+	if (*(out->str) != '\0') {
+		*line =
+		    textbuffer_insert(buffer, *line, (unsigned char *) out->str, out->len, NULL);
 	}
-	if (bg != buffer->last_bg
-	    || (flags & GUI_PRINT_FLAG_COLOR_24_BG) != (buffer->last_flags & GUI_PRINT_FLAG_COLOR_24_BG)) {
-                buffer->last_bg = bg;
-		data[pos++] = 0;
-#ifdef TERM_TRUECOLOR
-		if (flags & GUI_PRINT_FLAG_COLOR_24_BG)
-			format_24bit_line_color(data, &pos, 1, bg);
-		else
-#endif
-		if (bg < 0)
-			data[pos++] = LINE_COLOR_BG | LINE_COLOR_DEFAULT;
-		else if (bg < 16)
-			data[pos++] = LINE_COLOR_BG | bg;
-		else if (bg < 256) {
-			data[pos++] = LINE_COLOR_EXT_BG;
-			data[pos++] = bg;
-		}
-	}
-
-	if ((flags & GUI_PRINT_FLAG_UNDERLINE) != (buffer->last_flags & GUI_PRINT_FLAG_UNDERLINE)) {
-		data[pos++] = 0;
-		data[pos++] = LINE_CMD_UNDERLINE;
-	}
-	if ((flags & GUI_PRINT_FLAG_REVERSE) != (buffer->last_flags & GUI_PRINT_FLAG_REVERSE)) {
-		data[pos++] = 0;
-		data[pos++] = LINE_CMD_REVERSE;
-	}
-	if ((flags & GUI_PRINT_FLAG_BLINK) != (buffer->last_flags & GUI_PRINT_FLAG_BLINK)) {
-		data[pos++] = 0;
-		data[pos++] = LINE_CMD_BLINK;
-	}
-	if ((flags & GUI_PRINT_FLAG_BOLD) != (buffer->last_flags & GUI_PRINT_FLAG_BOLD)) {
-		data[pos++] = 0;
-		data[pos++] = LINE_CMD_BOLD;
-	}
-	if ((flags & GUI_PRINT_FLAG_ITALIC) != (buffer->last_flags & GUI_PRINT_FLAG_ITALIC)) {
-		data[pos++] = 0;
-		data[pos++] = LINE_CMD_ITALIC;
-	}
-	if ((flags & GUI_PRINT_FLAG_MONOSPACE) != (buffer->last_flags & GUI_PRINT_FLAG_MONOSPACE)) {
-		data[pos++] = 0;
-		data[pos++] = LINE_CMD_MONOSPACE;
-	}
-	if (flags & GUI_PRINT_FLAG_INDENT) {
-		data[pos++] = 0;
-		data[pos++] = LINE_CMD_INDENT;
-	}
-
-	if (pos > 0) {
-		*line = textbuffer_insert(buffer, *line, data, pos, NULL);
-	}
-
-	buffer->last_flags = flags;
+	g_string_free(out, TRUE);
 }
 
 LINE_REC *textbuffer_append(TEXT_BUFFER_REC *buffer,
@@ -368,6 +166,11 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after,
 		data[len-2] == 0 && data[len-1] == LINE_CMD_EOL;
 
 	if (buffer->last_eol) {
+		if (!line->info.format) {
+			line->info.text = g_strdup(buffer->cur_text->str);
+			g_string_truncate(buffer->cur_text, 0);
+		}
+
 		buffer->last_fg = -1;
 		buffer->last_bg = -1;
 		buffer->last_flags = 0;
@@ -395,145 +198,50 @@ void textbuffer_remove(TEXT_BUFFER_REC *buffer, LINE_REC *line)
         line->prev = line->next = NULL;
 
 	buffer->lines_count--;
-        text_chunk_line_free(buffer, line);
+	g_free(line->info.text);
+	textbuffer_format_rec_free(line->info.format);
 	g_slice_free(LINE_REC, line);
 }
 
 /* Removes all lines from buffer */
 void textbuffer_remove_all_lines(TEXT_BUFFER_REC *buffer)
 {
-	GSList *tmp;
         LINE_REC *line;
 
 	g_return_if_fail(buffer != NULL);
 
-	for (tmp = buffer->text_chunks; tmp != NULL; tmp = tmp->next)
-                g_slice_free(TEXT_CHUNK_REC, tmp->data);
-	g_slist_free(buffer->text_chunks);
-	buffer->text_chunks = NULL;
-
 	while (buffer->first_line != NULL) {
 		line = buffer->first_line->next;
+		g_free(buffer->first_line->info.text);
+		textbuffer_format_rec_free(buffer->first_line->info.format);
 		g_slice_free(LINE_REC, buffer->first_line);
                 buffer->first_line = line;
 	}
 	buffer->lines_count = 0;
 
         buffer->cur_line = NULL;
-        buffer->cur_text = NULL;
+	g_string_truncate(buffer->cur_text, 0);
 
 	buffer->last_eol = TRUE;
 }
 
-static void set_color(GString *str, int cmd)
+void textbuffer_line2text(TEXT_BUFFER_REC *buffer, LINE_REC *line, int coloring, GString *str)
 {
-	int color = -1;
-
-	if (!(cmd & LINE_COLOR_DEFAULT))
-		color = (cmd & 0x0f)+'0';
-
-	if ((cmd & LINE_COLOR_BG) == 0) {
-                /* change foreground color */
-		g_string_append_printf(str, "\004%c%c",
-				  color, FORMAT_COLOR_NOCHANGE);
-	} else {
-		/* change background color */
-		g_string_append_printf(str, "\004%c%c",
-				  FORMAT_COLOR_NOCHANGE, color);
-	}
-}
-
-void textbuffer_line2text(LINE_REC *line, int coloring, GString *str)
-{
-        unsigned char cmd, *ptr, *tmp;
+	char *ptr, *tmp;
 
 	g_return_if_fail(line != NULL);
 	g_return_if_fail(str != NULL);
 
         g_string_truncate(str, 0);
 
-	for (ptr = line->text;;) {
-		if (*ptr != 0) {
-			g_string_append_c(str, (char) *ptr);
-                        ptr++;
-			continue;
-		}
-
-		ptr++;
-                cmd = *ptr;
-		ptr++;
-
-		if (cmd == LINE_CMD_EOL) {
-                        /* end of line */
-			break;
-		}
-
-		if (cmd == LINE_CMD_CONTINUE) {
-                        /* line continues in another address.. */
-			memcpy(&tmp, ptr, sizeof(unsigned char *));
-			ptr = tmp;
-                        continue;
-		}
-
-		if (!coloring) {
-			/* no colors, skip coloring commands */
-			if (cmd == LINE_COLOR_EXT || cmd == LINE_COLOR_EXT_BG)
-				ptr++;
-#ifdef TERM_TRUECOLOR
-			else if (cmd == LINE_COLOR_24)
-				ptr+=4;
-#endif
-
-                        continue;
-		}
-
-		if ((cmd & LINE_CMD_EOL) == 0) {
-			/* set color */
-                        set_color(str, cmd);
-		} else switch (cmd) {
-		case LINE_CMD_UNDERLINE:
-			g_string_append_c(str, 31);
-			break;
-		case LINE_CMD_REVERSE:
-			g_string_append_c(str, 22);
-			break;
-		case LINE_CMD_BLINK:
-			g_string_append_printf(str, "\004%c",
-					  FORMAT_STYLE_BLINK);
-			break;
-		case LINE_CMD_BOLD:
-			g_string_append_printf(str, "\004%c",
-					  FORMAT_STYLE_BOLD);
-			break;
-		case LINE_CMD_ITALIC:
-			g_string_append_printf(str, "\004%c",
-					  FORMAT_STYLE_ITALIC);
-			break;
-		case LINE_CMD_MONOSPACE:
-			g_string_append_printf(str, "\004%c",
-					  FORMAT_STYLE_MONOSPACE);
-			break;
-		case LINE_CMD_COLOR0:
-			g_string_append_printf(str, "\004%c%c",
-					  '0', FORMAT_COLOR_NOCHANGE);
-			break;
-		case LINE_CMD_INDENT:
-			g_string_append_printf(str, "\004%c",
-					  FORMAT_STYLE_INDENT);
-			break;
-		case LINE_COLOR_EXT:
-			format_ext_color(str, 0, *ptr++);
-			break;
-		case LINE_COLOR_EXT_BG:
-			format_ext_color(str, 1, *ptr++);
-			break;
-#ifdef TERM_TRUECOLOR
-		case LINE_COLOR_24:
-			g_string_append_printf(str, "\004%c", FORMAT_COLOR_24);
-			break;
-#endif
-		}
+	ptr = textbuffer_line_get_text(buffer, line);
+	if (coloring == 0) {
+		tmp = ptr;
+		ptr = strip_codes(tmp);
+		g_free(tmp);
 	}
+	g_string_append(str, ptr);
+	g_free(ptr);
 }
 
 GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
@@ -575,7 +283,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			(line->info.level & nolevel) == 0;
 
 		if (*text != '\0') {
-			textbuffer_line2text(line, FALSE, str);
+			textbuffer_line2text(buffer, line, FALSE, str);
 
 			if (line_matched) {
 				line_matched = regexp ?
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index cbe4fbf0..5aaa817c 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -5,33 +5,23 @@
    wastes a lot of memory. */
 #define LINE_TEXT_CHUNK_SIZE (16384 - 16)
 
-#define LINE_COLOR_BG		0x20
-#define LINE_COLOR_DEFAULT	0x10
+#define LINE_INFO_FORMAT_SET (void *) 0x1
 
 enum {
 	LINE_CMD_EOL=0x80,	/* line ends here */
-	LINE_CMD_CONTINUE,	/* line continues in next block */
-	LINE_CMD_COLOR0,	/* change to black, would be same as \0\0 but it breaks things.. */
-	LINE_CMD_UNDERLINE,	/* enable/disable underlining */
-	LINE_CMD_REVERSE,	/* enable/disable reversed text */
-	LINE_CMD_INDENT,	/* if line is split, indent it at this position */
-	LINE_CMD_BLINK,		/* enable/disable blink */
-	LINE_CMD_BOLD,		/* enable/disable bold */
-	LINE_CMD_ITALIC,	/* enable/disable italic */
-	LINE_CMD_MONOSPACE,	/* enable/disable monospace (gui only) */
-	LINE_COLOR_EXT,		/* extended color */
-	LINE_COLOR_EXT_BG,	/* extended bg */
-#ifdef TERM_TRUECOLOR
-	LINE_COLOR_24,          /* 24bit color */
-#endif
 };
 
+struct _TEXT_BUFFER_FORMAT_REC;
+
 typedef struct {
 	int level;
 	time_t time;
+	char *text;
+	struct _TEXT_BUFFER_FORMAT_REC *format;
 } LINE_INFO_REC;
 
 typedef struct _LINE_REC {
+	struct _LINE_REC *prev, *next;
 	/* Text in the line. \0 means that the next char will be a
 	   color or command.
 
@@ -45,9 +35,6 @@ typedef struct _LINE_REC {
 
 	   DO NOT ADD BLACK WITH \0\0 - this will break things. Use
 	   LINE_CMD_COLOR0 instead. */
-	struct _LINE_REC *prev, *next;
-
-	unsigned char *text;
         LINE_INFO_REC info;
 } LINE_REC;
 
@@ -58,12 +45,14 @@ typedef struct {
 } TEXT_CHUNK_REC;
 
 typedef struct {
-	GSList *text_chunks;
-        LINE_REC *first_line;
-        int lines_count;
+	WINDOW_REC *window;
+
+	LINE_REC *first_line;
+	int lines_count;
 
 	LINE_REC *cur_line;
-	TEXT_CHUNK_REC *cur_text;
+	GString *cur_text;
+	GSList *cur_info;
 
 	int last_fg;
 	int last_bg;
@@ -72,7 +61,7 @@ typedef struct {
 } TEXT_BUFFER_REC;
 
 /* Create new buffer */
-TEXT_BUFFER_REC *textbuffer_create(void);
+TEXT_BUFFER_REC *textbuffer_create(WINDOW_REC *window);
 /* Destroy the buffer */
 void textbuffer_destroy(TEXT_BUFFER_REC *buffer);
 
@@ -96,7 +85,7 @@ void textbuffer_remove(TEXT_BUFFER_REC *buffer, LINE_REC *line);
 /* Removes all lines from buffer, ignoring reference counters */
 void textbuffer_remove_all_lines(TEXT_BUFFER_REC *buffer);
 
-void textbuffer_line2text(LINE_REC *line, int coloring, GString *str);
+void textbuffer_line2text(TEXT_BUFFER_REC *buffer, LINE_REC *line, int coloring, GString *str);
 GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			    int level, int nolevel, const char *text,
 			    int before, int after,
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index 14ef5950..40602272 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -25,7 +25,8 @@ OUTPUT:
 	RETVAL
 
 void
-textbuffer_line_get_text(line, coloring)
+textbuffer_line_get_text(buffer, line, coloring)
+	Irssi::TextUI::TextBuffer buffer
 	Irssi::TextUI::Line line
 	int coloring
 PREINIT:
@@ -33,7 +34,7 @@ PREINIT:
 	SV *result;
 PPCODE:
 	str = g_string_new(NULL);
-	textbuffer_line2text(line, coloring, str);
+	textbuffer_line2text(buffer, line, coloring, str);
 	result = new_pv(str->str);
 	XPUSHs(sv_2mortal(result));
 	g_string_free(str, TRUE);
diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am
index b1762c7d..2a3450e9 100644
--- a/tests/fe-text/Makefile.am
+++ b/tests/fe-text/Makefile.am
@@ -26,6 +26,7 @@ test_paste_join_multiline_SOURCES = \
 	../../src/fe-text/term-terminfo.c \
 	../../src/fe-text/terminfo-core.c \
 	../../src/fe-text/term.c \
+	../../src/fe-text/textbuffer-formats.c \
 	../../src/fe-text/textbuffer-view.c \
 	../../src/fe-text/textbuffer.c \
 	../../src/fe-text/gui-windows.c \
diff --git a/tests/fe-text/meson.build b/tests/fe-text/meson.build
index ea6ec620..397bd39f 100644
--- a/tests/fe-text/meson.build
+++ b/tests/fe-text/meson.build
@@ -7,6 +7,7 @@ test_test_paste_join_multiline = executable('test-paste-join-multiline',
     '../../src/fe-text/term-terminfo.c',
     '../../src/fe-text/term.c',
     '../../src/fe-text/terminfo-core.c',
+    '../../src/fe-text/textbuffer-formats.c',
     '../../src/fe-text/textbuffer-view.c',
     '../../src/fe-text/textbuffer.c',
     'mock-irssi.c',

From 6b93d6e3382b08b6e703b2c6dc71ff85b4c1fc9b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Aug 2019 15:15:15 +0200
Subject: [PATCH 1109/1650] implement expando cache

- the expando values need to be stored now that the lines are
  reformattable, otherwise the old values are lost (and they depend on
  context only available at the time the line is initially printed)

- the cache is collected from the special-vars evaluation code

- the cache is controlled by the textbuffer-formats code, and stored in
  the text_buffer_format_rec
---
 src/core/core.c                  |   9 ++-
 src/core/special-vars.c          | 119 ++++++++++++++++++++++++++-----
 src/core/special-vars.h          |   9 +++
 src/fe-text/textbuffer-formats.c |  39 +++++++++-
 src/fe-text/textbuffer-formats.h |   1 +
 5 files changed, 155 insertions(+), 22 deletions(-)

diff --git a/src/core/core.c b/src/core/core.c
index 85f3a5d5..34649c81 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -34,16 +34,17 @@
 #endif
 
 #include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/servers.h>
 #include <irssi/src/core/chatnets.h>
 #include <irssi/src/core/commands.h>
 #include <irssi/src/core/expandos.h>
-#include <irssi/src/core/write-buffer.h>
+#include <irssi/src/core/ignore.h>
 #include <irssi/src/core/log.h>
 #include <irssi/src/core/rawlog.h>
-#include <irssi/src/core/ignore.h>
 #include <irssi/src/core/recode.h>
 #include <irssi/src/core/refstrings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/write-buffer.h>
 
 #include <irssi/src/core/channels.h>
 #include <irssi/src/core/queries.h>
@@ -262,6 +263,7 @@ void core_init(void)
 
 	chat_commands_init();
 	i_refstr_init();
+	special_vars_init();
 	wcwidth_wrapper_init();
 
 	settings_add_str("misc", "ignore_signals", "");
@@ -288,6 +290,7 @@ void core_deinit(void)
 	signal_remove("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);
 
 	wcwidth_wrapper_deinit();
+	special_vars_deinit();
 	i_refstr_deinit();
 	chat_commands_deinit();
 
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index ef56e2e1..802fcb36 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -19,12 +19,13 @@
 */
 
 #include "module.h"
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/refstrings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/settings.h>
 #include <irssi/src/core/signals.h>
 #include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/expandos.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/misc.h>
 #include <irssi/src/core/utf8.h>
 
 #define isvarchar(c) \
@@ -40,6 +41,8 @@
 #endif
 
 static SPECIAL_HISTORY_FUNC history_func = NULL;
+static GSList *special_collector;
+static GSList *special_cache;
 
 static char *get_argument(char **cmd, char **arglist)
 {
@@ -121,8 +124,40 @@ static char *get_long_variable_value(const char *key, SERVER_REC *server,
 	return NULL;
 }
 
-static char *get_long_variable(char **cmd, SERVER_REC *server,
-			       void *item, int *free_ret, int getname)
+static gboolean cache_find(GSList **cache, const char *var, char **ret)
+{
+	GSList *tmp;
+	GSList *prev = NULL;
+
+	if (cache == NULL)
+		return FALSE;
+
+	for (tmp = *cache; tmp;) {
+		if (g_strcmp0(var, tmp->data) == 0) {
+			*ret = tmp->next->data;
+			if (prev != NULL)
+				prev->next->next = tmp->next->next;
+			else
+				*cache = tmp->next->next;
+
+			g_slist_free_1(tmp->next);
+			g_slist_free_1(tmp);
+			return TRUE;
+		}
+		prev = tmp;
+		tmp = tmp->next->next;
+	}
+	return FALSE;
+}
+
+static gboolean cache_find_char(GSList **cache, char var, char **ret)
+{
+	char varn[] = { var, '\0' };
+	return cache_find(cache, varn, ret);
+}
+
+static char *get_long_variable(char **cmd, SERVER_REC *server, void *item, int *free_ret,
+                               int getname, GSList **collector, GSList **cache)
 {
 	char *start, *var, *ret;
 
@@ -135,16 +170,23 @@ static char *get_long_variable(char **cmd, SERVER_REC *server,
 		*free_ret = TRUE;
                 return var;
 	}
+	if (cache_find(cache, var, &ret)) {
+		g_free(var);
+		return ret;
+	}
 	ret = get_long_variable_value(var, server, item, free_ret);
+	if (collector != NULL) {
+		*collector = g_slist_prepend(*collector, g_strdup(ret));
+		*collector = g_slist_prepend(*collector, i_refstr_intern(var));
+	}
 	g_free(var);
 	return ret;
 }
 
 /* return the value of the variable found from `cmd'.
    if 'getname' is TRUE, return the name of the variable instead it's value */
-static char *get_variable(char **cmd, SERVER_REC *server, void *item,
-			  char **arglist, int *free_ret, int *arg_used,
-			  int getname)
+static char *get_variable(char **cmd, SERVER_REC *server, void *item, char **arglist, int *free_ret,
+                          int *arg_used, int getname, GSList **collector, GSList **cache)
 {
 	EXPANDO_FUNC func;
 
@@ -158,7 +200,7 @@ static char *get_variable(char **cmd, SERVER_REC *server, void *item,
 
 	if (i_isalpha(**cmd) && isvarchar((*cmd)[1])) {
 		/* long variable name.. */
-		return get_long_variable(cmd, server, item, free_ret, getname);
+		return get_long_variable(cmd, server, item, free_ret, getname, collector, cache);
 	}
 
 	/* single character variable. */
@@ -167,15 +209,27 @@ static char *get_variable(char **cmd, SERVER_REC *server, void *item,
                 return g_strdup_printf("%c", **cmd);
 	}
 	*free_ret = FALSE;
+	{
+		char *ret;
+		if (cache_find_char(cache, **cmd, &ret)) {
+			return ret;
+		}
+	}
 	func = expando_find_char(**cmd);
 	if (func == NULL)
 		return NULL;
 	else {
 		char str[2];
+		char *ret;
 
 		str[0] = **cmd; str[1] = '\0';
 		current_expando = str;
-		return func(server, item, free_ret);
+		ret = func(server, item, free_ret);
+		if (**cmd != 'Z' && collector != NULL) {
+			*collector = g_slist_prepend(*collector, g_strdup(ret));
+			*collector = g_slist_prepend(*collector, i_refstr_intern(str));
+		}
+		return ret;
 	}
 }
 
@@ -199,9 +253,9 @@ static char *get_history(char **cmd, void *item, int *free_ret)
 	return ret;
 }
 
-static char *get_special_value(char **cmd, SERVER_REC *server, void *item,
-			       char **arglist, int *free_ret, int *arg_used,
-			       int flags)
+static char *get_special_value(char **cmd, SERVER_REC *server, void *item, char **arglist,
+                               int *free_ret, int *arg_used, int flags, GSList **collector,
+                               GSList **cache)
 {
 	char command, *value, *p;
 	int len;
@@ -236,8 +290,8 @@ static char *get_special_value(char **cmd, SERVER_REC *server, void *item,
 		}
 	}
 
-	value = get_variable(cmd, server, item, arglist, free_ret,
-			     arg_used, flags & PARSE_FLAG_GETNAME);
+	value = get_variable(cmd, server, item, arglist, free_ret, arg_used,
+	                     flags & PARSE_FLAG_GETNAME, collector, cache);
 
 	if (flags & PARSE_FLAG_GETNAME)
 		return value;
@@ -440,8 +494,9 @@ char *parse_special(char **cmd, SERVER_REC *server, void *item,
 		brackets = TRUE;
 	}
 
-	value = get_special_value(cmd, server, item, arglist,
-				  free_ret, arg_used, flags);
+	value = get_special_value(cmd, server, item, arglist, free_ret, arg_used, flags,
+	                          special_collector != NULL ? special_collector->data : NULL,
+	                          &special_cache);
 	if (**cmd == '\0')
 		g_error("parse_special() : buffer overflow!");
 
@@ -635,6 +690,22 @@ void special_history_func_set(SPECIAL_HISTORY_FUNC func)
 	history_func = func;
 }
 
+void special_push_collector(GSList **list)
+{
+	special_collector = g_slist_prepend(special_collector, list);
+}
+
+void special_pop_collector(void)
+{
+	special_collector = g_slist_delete_link(special_collector, special_collector);
+}
+
+void special_fill_cache(GSList *list)
+{
+	g_slist_free(special_cache);
+	special_cache = g_slist_copy(list);
+}
+
 static void update_signals_hash(GHashTable **hash, int *signals)
 {
 	void *signal_id;
@@ -758,3 +829,15 @@ int *special_vars_get_signals(const char *text)
 {
 	return special_vars_signals_task(text, 0, NULL, TASK_GET_SIGNALS);
 }
+
+void special_vars_init(void)
+{
+	special_cache = NULL;
+	special_collector = NULL;
+}
+
+void special_vars_deinit(void)
+{
+	g_slist_free(special_cache);
+	g_slist_free(special_collector);
+}
diff --git a/src/core/special-vars.h b/src/core/special-vars.h
index f4bd926d..87aba7d6 100644
--- a/src/core/special-vars.h
+++ b/src/core/special-vars.h
@@ -32,6 +32,11 @@ char *parse_special_string(const char *cmd, SERVER_REC *server, void *item,
 void eval_special_string(const char *cmd, const char *data,
 			 SERVER_REC *server, void *item);
 
+void special_push_collector(GSList **list);
+void special_pop_collector(void);
+
+void special_fill_cache(GSList *list);
+
 void special_history_func_set(SPECIAL_HISTORY_FUNC func);
 
 void special_vars_add_signals(const char *text,
@@ -41,4 +46,8 @@ void special_vars_remove_signals(const char *text,
 /* Returns [<signal id>, EXPANDO_ARG_xxx, <signal id>, ..., -1] */
 int *special_vars_get_signals(const char *text);
 
+void special_vars_init(void);
+
+void special_vars_deinit(void);
+
 #endif
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 599a85c6..e0a5f193 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -4,6 +4,7 @@
 #include <irssi/src/core/refstrings.h>
 #include <irssi/src/core/servers.h>
 #include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/fe-common/core/themes.h>
 #include <irssi/src/fe-text/gui-printtext.h>
@@ -13,6 +14,18 @@
 
 TEXT_BUFFER_REC *color_buf;
 
+static void collector_free(GSList **collector)
+{
+	while (*collector) {
+		GSList *next = (*collector)->next->next;
+		i_refstr_release((*collector)->data);
+		g_free((*collector)->next->data);
+		g_slist_free_1((*collector)->next);
+		g_slist_free_1((*collector));
+		*collector = next;
+	}
+}
+
 void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec)
 {
 	int n;
@@ -35,6 +48,7 @@ void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec)
 	}
 	rec->nargs = 0;
 	g_free(rec->args);
+	collector_free(&rec->expando_cache);
 	g_slice_free(TEXT_BUFFER_FORMAT_REC, rec);
 }
 
@@ -112,12 +126,14 @@ static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC
 
 	info->format = format_rec_new(module, formats[formatnum].tag, dest->server_tag,
 	                              dest->target, dest->nick, formats[formatnum].params, args);
+	special_push_collector(&info->format->expando_cache);
 
 	info->format->flags = dest->flags;
 	dest->flags |= PRINT_FLAG_FORMAT;
 
 	signal_continue(5, theme, module, dest, formatnump, args);
 
+	special_pop_collector();
 	free_lineinfo_tmp(dest->window);
 }
 
@@ -125,19 +141,36 @@ static void sig_print_noformat(TEXT_DEST_REC *dest, const char *text)
 {
 	LINE_INFO_REC *info;
 
+	special_push_collector(NULL);
 	info = store_lineinfo_tmp(dest);
 
 	info->format = format_rec_new(NULL, NULL, dest->server_tag, dest->target, dest->nick, 2,
 	                              (const char *[]){ NULL, text });
+	special_push_collector(&info->format->expando_cache);
 
 	info->format->flags = dest->flags;
 	dest->flags |= PRINT_FLAG_FORMAT;
 
 	signal_continue(2, dest, text);
 
+	special_pop_collector();
 	free_lineinfo_tmp(dest->window);
 }
 
+static GSList *reverse_collector(GSList *a1)
+{
+	GSList *b1, *c1;
+	c1 = NULL;
+	while (a1) {
+		b1 = a1->next->next;
+		a1->next->next = c1;
+
+		c1 = a1;
+		a1 = b1;
+	}
+	return c1;
+}
+
 static void sig_gui_print_text_finished(WINDOW_REC *window)
 {
 	GUI_WINDOW_REC *gui;
@@ -157,6 +190,8 @@ static void sig_gui_print_text_finished(WINDOW_REC *window)
 	if (info->format == NULL)
 		return;
 
+	info->format->expando_cache = reverse_collector(info->format->expando_cache);
+
 	info->level |= MSGLEVEL_FORMAT;
 
 	/* the line will be inserted into the view with textbuffer_view_insert_line by
@@ -182,7 +217,7 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 	if (line == NULL || gui == NULL)
 		return NULL;
 
-	if (line->info.level & MSGLEVEL_FORMAT) {
+	if (line->info.level & MSGLEVEL_FORMAT && line->info.format != NULL) {
 		TEXT_DEST_REC dest;
 		THEME_REC *theme;
 		int formatnum;
@@ -200,6 +235,7 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 
 		theme = window_get_theme(dest.window);
 
+		special_fill_cache(format_rec->expando_cache);
 		if (format_rec->format != NULL) {
 			char *arglist[MAX_FORMAT_PARAMS] = { 0 };
 			formatnum = format_find_tag(format_rec->module, format_rec->format);
@@ -238,6 +274,7 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 		} else {
 			return text;
 		}
+		special_fill_cache(NULL);
 	} else {
 		return g_strdup(line->info.text);
 	}
diff --git a/src/fe-text/textbuffer-formats.h b/src/fe-text/textbuffer-formats.h
index 5a156fda..45e4ce1b 100644
--- a/src/fe-text/textbuffer-formats.h
+++ b/src/fe-text/textbuffer-formats.h
@@ -11,6 +11,7 @@ typedef struct _TEXT_BUFFER_FORMAT_REC {
 	char *nick;
 	char **args;
 	int nargs;
+	GSList *expando_cache;
 	int flags;
 } TEXT_BUFFER_FORMAT_REC;
 

From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 23 Apr 2020 21:45:15 +0200
Subject: [PATCH 1110/1650] manually handle NUL unicode in
 g_utf8_get_next_char_validated

A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
NUL / U+0000 is a valid Unicode character. This would occur when the
user types Ctrl+Space. As a result, the input loop never manages to
process the NUL-byte (and any other user input that follows, ever).

This patch adds a manual check that properly advances the input loop if
GLib returns -2 (incomplete character) despite the length being positive
and a NUL is in first position.

Fixes #1180
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
https://gitlab.gnome.org/GNOME/glib/-/issues/2093
---
 src/fe-text/term-terminfo.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 5235f72d..78496a64 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -672,7 +672,11 @@ void term_stop(void)
 
 static int input_utf8(const unsigned char *buffer, int size, unichar *result)
 {
-	unichar c = g_utf8_get_char_validated((char *)buffer, size);
+	unichar c = g_utf8_get_char_validated((char *) buffer, size);
+
+	/* GLib >= 2.63 do not accept Unicode NUL anymore */
+	if (c == (unichar) -2 && *buffer == 0 && size > 0)
+		c = 0;
 
 	switch (c) {
 	case (unichar)-1:

From 57fb173130cec6e82bccfbe6ead09731b591c5a6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 8 Aug 2019 21:54:30 +0200
Subject: [PATCH 1111/1650] add perl code for textbuffer-formats

- compatibility shim for new line

- make format accessible from perl

- fix perl line IDs being mixed up due to wrapper
---
 src/perl/Makefile.am                  |  1 +
 src/perl/textui/TextBuffer.xs         | 39 ++++++++++--
 src/perl/textui/TextBufferView.xs     | 19 ++++++
 src/perl/textui/TextUI.xs             | 29 ++++++---
 src/perl/textui/module.h              |  2 +-
 src/perl/textui/typemap               |  7 ++-
 src/perl/textui/wrapper_buffer_line.h | 90 +++++++++++++++++++++++++++
 7 files changed, 170 insertions(+), 17 deletions(-)
 create mode 100644 src/perl/textui/wrapper_buffer_line.h

diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 0e56d7a3..45ac1eea 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -108,6 +108,7 @@ textui_sources = \
 	textui/TextBufferView.xs \
 	textui/Statusbar.xs \
 	textui/Makefile.PL.in \
+	textui/wrapper_buffer_line.h \
 	textui/typemap \
 	textui/module.h
 
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index 40602272..ae3973c8 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -1,5 +1,7 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
+#include "wrapper_buffer_line.h"
+#include <irssi/src/fe-text/textbuffer-formats.h>
 
 MODULE = Irssi::TextUI::TextBuffer  PACKAGE = Irssi
 PROTOTYPES: ENABLE
@@ -12,7 +14,7 @@ Irssi::TextUI::Line
 textbuffer_line_prev(line)
 	Irssi::TextUI::Line line
 CODE:
-	RETVAL = line->prev;
+	RETVAL = perl_wrap_buffer_line(line->buffer, line->line->prev);
 OUTPUT:
 	RETVAL
 
@@ -20,13 +22,12 @@ Irssi::TextUI::Line
 textbuffer_line_next(line)
 	Irssi::TextUI::Line line
 CODE:
-	RETVAL = line->next;
+	RETVAL = perl_wrap_buffer_line(line->buffer, line->line->next);
 OUTPUT:
 	RETVAL
 
 void
-textbuffer_line_get_text(buffer, line, coloring)
-	Irssi::TextUI::TextBuffer buffer
+textbuffer_line_get_text(line, coloring)
 	Irssi::TextUI::Line line
 	int coloring
 PREINIT:
@@ -34,8 +35,36 @@ PREINIT:
 	SV *result;
 PPCODE:
 	str = g_string_new(NULL);
-	textbuffer_line2text(buffer, line, coloring, str);
+	textbuffer_line2text(line->buffer, line->line, coloring, str);
 	result = new_pv(str->str);
 	XPUSHs(sv_2mortal(result));
 	g_string_free(str, TRUE);
 
+void
+textbuffer_line_get_format(line)
+	Irssi::TextUI::Line line
+PREINIT:
+	HV *hv;
+	AV *av;
+	LINE_REC *l;
+	TEXT_BUFFER_FORMAT_REC *f;
+	int i;
+PPCODE:
+	hv = newHV();
+	l = line->line;
+	if (l->info.format != NULL) {
+		f = l->info.format;
+		(void) hv_store(hv, "module", 6, new_pv(f->module), 0);
+		(void) hv_store(hv, "format", 6, new_pv(f->format), 0);
+		(void) hv_store(hv, "server_tag", 10, new_pv(f->server_tag), 0);
+		(void) hv_store(hv, "target", 6, new_pv(f->target), 0);
+		(void) hv_store(hv, "nick", 4, new_pv(f->nick), 0);
+		av = newAV();
+		for (i = 0; i < f->nargs; i++) {
+			av_push(av, new_pv(f->args[i]));
+		}
+		(void) hv_store(hv, "args", 4, newRV_noinc((SV *) av), 0);
+	} else {
+		(void) hv_store(hv, "text", 4, new_pv(l->info.text), 0);
+	}
+	XPUSHs(sv_2mortal(newRV_noinc((SV *) hv)));
diff --git a/src/perl/textui/TextBufferView.xs b/src/perl/textui/TextBufferView.xs
index c0dc762d..43aba4e6 100644
--- a/src/perl/textui/TextBufferView.xs
+++ b/src/perl/textui/TextBufferView.xs
@@ -1,5 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
+#include "wrapper_buffer_line.h"
 
 MODULE = Irssi::TextUI::TextBufferView  PACKAGE = Irssi::TextUI::TextBuffer  PREFIX = textbuffer_
 PROTOTYPES: ENABLE
@@ -33,6 +34,10 @@ textbuffer_view_clear(view)
 Irssi::TextUI::Line
 textbuffer_view_get_lines(view)
 	Irssi::TextUI::TextBufferView view
+CODE:
+	RETVAL = perl_wrap_buffer_line(view->buffer, textbuffer_view_get_lines(view));
+OUTPUT:
+	RETVAL
 
 void
 textbuffer_view_scroll(view, lines)
@@ -43,16 +48,24 @@ void
 textbuffer_view_scroll_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
+CODE:
+	textbuffer_view_scroll_line(view, line->line);
 
 Irssi::TextUI::LineCache
 textbuffer_view_get_line_cache(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
+CODE:
+	RETVAL = textbuffer_view_get_line_cache(view, line->line);
+OUTPUT:
+	RETVAL
 
 void
 textbuffer_view_remove_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
+CODE:
+	textbuffer_view_remove_line(view, line->line);
 
 void
 textbuffer_view_remove_all_lines(view)
@@ -68,6 +81,8 @@ textbuffer_view_set_bookmark(view, name, line)
 	Irssi::TextUI::TextBufferView view
 	char *name
 	Irssi::TextUI::Line line
+CODE:
+	textbuffer_view_set_bookmark(view, name, line->line);
 
 void
 textbuffer_view_set_bookmark_bottom(view, name)
@@ -78,6 +93,10 @@ Irssi::TextUI::Line
 textbuffer_view_get_bookmark(view, name)
 	Irssi::TextUI::TextBufferView view
 	char *name
+CODE:
+	RETVAL = perl_wrap_buffer_line(view->buffer, textbuffer_view_get_bookmark(view, name));
+OUTPUT:
+	RETVAL
 
 void
 textbuffer_view_redraw(view)
diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index af978162..e87efb65 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -1,11 +1,17 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
+#include "wrapper_buffer_line.h"
 
 void perl_statusbar_init(void);
 void perl_statusbar_deinit(void);
 
 static int initialized = FALSE;
 
+static SV *buffer_line_bless(TEXT_BUFFER_REC *buffer, LINE_REC *line)
+{
+	return perl_buffer_line_bless(perl_wrap_buffer_line(buffer, line));
+}
+
 static void perl_main_window_fill_hash(HV *hv, MAIN_WINDOW_REC *window)
 {
 	(void) hv_store(hv, "active", 6, plain_bless(window->active, "Irssi::UI::Window"), 0);
@@ -20,9 +26,9 @@ static void perl_main_window_fill_hash(HV *hv, MAIN_WINDOW_REC *window)
 
 static void perl_text_buffer_fill_hash(HV *hv, TEXT_BUFFER_REC *buffer)
 {
-	(void) hv_store(hv, "first_line", 10, plain_bless(buffer->first_line, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "first_line", 10, buffer_line_bless(buffer, buffer->first_line), 0);
 	(void) hv_store(hv, "lines_count", 11, newSViv(buffer->lines_count), 0);
-	(void) hv_store(hv, "cur_line", 8, plain_bless(buffer->cur_line, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "cur_line", 8, buffer_line_bless(buffer, buffer->cur_line), 0);
 	(void) hv_store(hv, "last_eol", 8, newSViv(buffer->last_eol), 0);
 }
 
@@ -38,20 +44,22 @@ static void perl_text_buffer_view_fill_hash(HV *hv, TEXT_BUFFER_VIEW_REC *view)
 
 	(void) hv_store(hv, "ypos", 4, newSViv(view->ypos), 0);
 
-	(void) hv_store(hv, "startline", 9, plain_bless(view->startline, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "startline", 9, buffer_line_bless(view->buffer, view->startline), 0);
 	(void) hv_store(hv, "subline", 7, newSViv(view->subline), 0);
 	(void) hv_store(hv, "hidden_level", 12, newSViv(view->hidden_level), 0);
 
-	(void) hv_store(hv, "bottom_startline", 16, plain_bless(view->bottom_startline, "Irssi::TextUI::Line"), 0);
+	(void) hv_store(hv, "bottom_startline", 16,
+	                buffer_line_bless(view->buffer, view->bottom_startline), 0);
 	(void) hv_store(hv, "bottom_subline", 14, newSViv(view->bottom_subline), 0);
 
 	(void) hv_store(hv, "empty_linecount", 15, newSViv(view->empty_linecount), 0);
 	(void) hv_store(hv, "bottom", 6, newSViv(view->bottom), 0);
 }
 
-static void perl_line_fill_hash(HV *hv, LINE_REC *line)
+static void perl_line_fill_hash(HV *hv, struct Buffer_Line_Wrapper *line)
 {
-	(void) hv_store(hv, "info", 4, plain_bless(&line->info, "Irssi::TextUI::LineInfo"), 0);
+	(void) hv_store(hv, "info", 4, plain_bless(&Line(line)->info, "Irssi::TextUI::LineInfo"),
+	                0);
 }
 
 static void perl_line_cache_fill_hash(HV *hv, LINE_CACHE_REC *cache)
@@ -242,7 +250,7 @@ CODE:
 	format_create_dest(&dest, NULL, NULL, level, window);
 	text = format_string_expand(str, NULL);
 	text2 = g_strconcat(text, "\n", NULL);
-	gui_printtext_after_time(&dest, prev, text2, time);
+	gui_printtext_after_time(&dest, Line(prev), text2, time);
 	g_free(text);
 	g_free(text2);
 
@@ -257,13 +265,14 @@ PREINIT:
 	TEXT_DEST_REC dest;
 CODE:
 	format_create_dest(&dest, NULL, NULL, level, window);
-	gui_printtext_after_time(&dest, prev, str, time);
+	gui_printtext_after_time(&dest, Line(prev), str, time);
 
 Irssi::TextUI::Line
 last_line_insert(window)
 	Irssi::UI::Window window
 CODE:
-	RETVAL = WINDOW_GUI(window)->insert_after;
+	RETVAL = perl_wrap_buffer_line(WINDOW_GUI(window)->view->buffer,
+	                               WINDOW_GUI(window)->insert_after);
 OUTPUT:
 	RETVAL
 
@@ -281,7 +290,7 @@ PREINIT:
 	TEXT_DEST_REC dest;
 CODE:
 	format_create_dest(&dest, server, target, level, NULL);
-	gui_printtext_after_time(&dest, prev, str, time);
+	gui_printtext_after_time(&dest, Line(prev), str, time);
 
 BOOT:
 	irssi_boot(TextUI__Statusbar);
diff --git a/src/perl/textui/module.h b/src/perl/textui/module.h
index 394c2839..aba5bd77 100644
--- a/src/perl/textui/module.h
+++ b/src/perl/textui/module.h
@@ -11,7 +11,7 @@
 typedef MAIN_WINDOW_REC *Irssi__TextUI__MainWindow;
 typedef TEXT_BUFFER_REC *Irssi__TextUI__TextBuffer;
 typedef TEXT_BUFFER_VIEW_REC *Irssi__TextUI__TextBufferView;
-typedef LINE_REC *Irssi__TextUI__Line;
+typedef struct Buffer_Line_Wrapper *Irssi__TextUI__Line;
 typedef LINE_CACHE_REC *Irssi__TextUI__LineCache;
 typedef LINE_INFO_REC *Irssi__TextUI__LineInfo;
 typedef SBAR_ITEM_REC *Irssi__TextUI__StatusbarItem;
diff --git a/src/perl/textui/typemap b/src/perl/textui/typemap
index 364cdf32..7710c2d2 100644
--- a/src/perl/textui/typemap
+++ b/src/perl/textui/typemap
@@ -2,7 +2,7 @@ TYPEMAP
 Irssi::TextUI::MainWindow	T_PlainObj
 Irssi::TextUI::TextBuffer	T_PlainObj
 Irssi::TextUI::TextBufferView	T_PlainObj
-Irssi::TextUI::Line		T_PlainObj
+Irssi::TextUI::Line		T_BufferLineWrapper
 Irssi::TextUI::LineCache	T_PlainObj
 Irssi::TextUI::LineInfo		T_PlainObj
 Irssi::TextUI::StatusbarItem   	T_PlainObj
@@ -12,8 +12,13 @@ INPUT
 T_PlainObj
 	$var = irssi_ref_object($arg)
 
+T_BufferLineWrapper
+	$var = irssi_ref_buffer_line_wrap($arg)
+
 OUTPUT
 
 T_PlainObj
 	$arg = plain_bless($var, \"$type\");
 
+T_BufferLineWrapper
+	$arg = perl_buffer_line_bless($var);
diff --git a/src/perl/textui/wrapper_buffer_line.h b/src/perl/textui/wrapper_buffer_line.h
new file mode 100644
index 00000000..34310655
--- /dev/null
+++ b/src/perl/textui/wrapper_buffer_line.h
@@ -0,0 +1,90 @@
+#ifndef IRSSI_PERL_TEXTUI_WRAPPER_BUFFER_LINE_H
+#define IRSSI_PERL_TEXTUI_WRAPPER_BUFFER_LINE_H
+
+/* This Buffer_Line_Wrapper is a compatibility shim so that the Perl
+ * API does not change in Irssi ABI 24 even though the C API was
+ * changed. That way scripts can continue to work unchanged. */
+
+struct Buffer_Line_Wrapper {
+	LINE_REC *line;
+	TEXT_BUFFER_REC *buffer;
+};
+
+#define Line(wrapper) ((wrapper) == NULL ? NULL : (wrapper)->line)
+
+static int magic_free_buffer_line(pTHX_ SV *sv, MAGIC *mg)
+{
+	struct Buffer_Line_Wrapper *wrap = (struct Buffer_Line_Wrapper *) mg->mg_ptr;
+	g_free(wrap);
+	mg->mg_ptr = NULL;
+	sv_setiv(sv, 0);
+	return 0;
+}
+
+static MGVTBL vtbl_free_buffer_line = { NULL, NULL, NULL, NULL, magic_free_buffer_line };
+
+static struct Buffer_Line_Wrapper *perl_wrap_buffer_line(TEXT_BUFFER_REC *buffer, LINE_REC *line)
+{
+	struct Buffer_Line_Wrapper *wrap;
+
+	if (line == NULL)
+		return NULL;
+
+	wrap = g_new0(struct Buffer_Line_Wrapper, 1);
+	wrap->buffer = buffer;
+	wrap->line = line;
+
+	return wrap;
+}
+
+/* This function is more or less a copy of plain_bless, but with a
+   special divertion to put the wrapper in _wrapper and the original
+   line pointer in _irssi, in order to stay compatible with signals
+   and scripts */
+static SV *perl_buffer_line_bless(struct Buffer_Line_Wrapper *object)
+{
+	SV *ret, **tmp;
+	HV *hv;
+	const char *stash = "Irssi::TextUI::Line";
+
+	if (object == NULL)
+		return &PL_sv_undef;
+
+	ret = irssi_bless_plain(stash, object);
+	hv = hvref(ret);
+
+	tmp = hv_fetch(hv, "_irssi", 6, 0);
+
+	sv_magic(*tmp, NULL, '~', NULL, 0);
+
+	SvMAGIC(*tmp)->mg_private = 0x1551; /* HF */
+	SvMAGIC(*tmp)->mg_virtual = &vtbl_free_buffer_line;
+	SvMAGIC(*tmp)->mg_ptr = (char *) object;
+
+	(void) hv_store(hv, "_wrapper", 8, *tmp, 0);
+	/* We have to put the Line Pointer in _irssi, not the
+	   compatibility wrapper */
+	*tmp = newSViv((IV) object->line);
+	return ret;
+}
+
+/* This function is a copy of irssi_ref_object, but looking up the
+   wrapper object in _wrapper instead */
+static void *irssi_ref_buffer_line_wrap(SV *o)
+{
+	SV **sv;
+	HV *hv;
+	void *p;
+
+	hv = hvref(o);
+	if (hv == NULL)
+		return NULL;
+
+	sv = hv_fetch(hv, "_wrapper", 8, 0);
+	if (sv == NULL)
+		croak("variable is damaged");
+	p = GINT_TO_POINTER(SvIV(*sv));
+	return p;
+}
+
+#endif

From 8fd6dccaf19b08542d855beb468bbf2ba4af56aa Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 17 Mar 2020 00:26:25 +0100
Subject: [PATCH 1112/1650] enable mirc colour processing

---
 src/fe-common/core/formats.c     | 38 ++++++++++++++++------
 src/fe-common/core/formats.h     | 11 ++++++-
 src/fe-text/gui-printtext.c      |  4 +--
 src/fe-text/gui-printtext.h      |  1 +
 src/fe-text/textbuffer-formats.c | 54 +++++++++++++++++++++++++++-----
 5 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index a6fde7ea..a4d3a023 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1222,8 +1222,14 @@ char *strip_codes(const char *input)
 	return str;
 }
 
-/* send a fully parsed text string for GUI to print */
-void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
+/* parse text string into GUI_PRINT_FLAG_* separated pieces and emit them to handler
+   handler is a SIGNAL_FUNC with the following arguments:
+
+   WINDOW_REC *window, void *fgcolor_int, void *bgcolor_int,
+       void *flags_int, const char *textpiece, TEXT_DEST_REC *dest
+
+ */
+void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC handler)
 {
 	THEME_REC *theme;
 	char *dup, *str, *ptr, type;
@@ -1238,8 +1244,8 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 
 	if (*str == '\0') {
 		/* empty line, write line info only */
-		signal_emit_id(signal_gui_print_text, 6, dest->window, GINT_TO_POINTER(fgcolor),
-		               GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, dest);
+		handler(dest->window, GINT_TO_POINTER(fgcolor), GINT_TO_POINTER(bgcolor),
+		        GINT_TO_POINTER(flags), str, dest);
 	}
 
 	while (*str != '\0') {
@@ -1259,16 +1265,14 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 
 		if (*str != '\0' || (flags & GUI_PRINT_FLAG_CLRTOEOL)) {
 			/* send the text to gui handler */
-			signal_emit_id(signal_gui_print_text, 6, dest->window,
-				       GINT_TO_POINTER(fgcolor),
-				       GINT_TO_POINTER(bgcolor),
-				       GINT_TO_POINTER(flags), str,
-				       dest);
+			handler(dest->window, GINT_TO_POINTER(fgcolor), GINT_TO_POINTER(bgcolor),
+			        GINT_TO_POINTER(flags), str, dest);
 			flags &= ~(GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_CLRTOEOL);
 		}
 
 		if (type == '\n') {
-			format_newline(dest);
+			handler(dest->window, GINT_TO_POINTER(-1), GINT_TO_POINTER(-1),
+			        GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), "", dest);
 			fgcolor = theme->default_color;
 			bgcolor = -1;
 			flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE;
@@ -1414,6 +1418,20 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 	g_free(dup);
 }
 
+inline static void gui_print_text_emitter(WINDOW_REC *window, void *fgcolor_int, void *bgcolor_int,
+                                          void *flags_int, const char *textpiece,
+                                          TEXT_DEST_REC *dest)
+{
+	signal_emit_id(signal_gui_print_text, 6, window, fgcolor_int, bgcolor_int, flags_int,
+	               textpiece, dest);
+}
+
+/* send a fully parsed text string for GUI to print */
+void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
+{
+	format_send_as_gui_flags(dest, text, (SIGNAL_FUNC) gui_print_text_emitter);
+}
+
 void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags, int fg, int bg,
                       int flags)
 {
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index e30ac290..226348de 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -1,8 +1,9 @@
 #ifndef IRSSI_FE_COMMON_CORE_FORMATS_H
 #define IRSSI_FE_COMMON_CORE_FORMATS_H
 
-#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/core/signals.h>
 #include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/themes.h>
 
 #define GUI_PRINT_FLAG_BOLD          0x0001
 #define GUI_PRINT_FLAG_REVERSE       0x0002
@@ -130,6 +131,14 @@ char *strip_codes(const char *input);
 
 /* send a fully parsed text string for GUI to print */
 void format_send_to_gui(TEXT_DEST_REC *dest, const char *text);
+/* parse text string into GUI_PRINT_FLAG_* separated pieces and emit them to handler
+   handler is a SIGNAL_FUNC with the following arguments:
+
+   WINDOW_REC *window, void *fgcolor_int, void *bgcolor_int,
+       void *flags_int, const char *textpiece, TEXT_DEST_REC *dest
+
+ */
+void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC handler);
 
 #define FORMAT_COLOR_NOCHANGE	('0'-1) /* don't change this, at least hilighting depends this value */
 #define FORMAT_COLOR_EXT1	('0'-2)
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index fe720264..872c73c4 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -238,7 +238,7 @@ static void remove_old_lines(TEXT_BUFFER_VIEW_REC *view)
 	}
 }
 
-static void get_colors(int *flags, int *fg, int *bg, int *attr)
+void gui_printtext_get_colors(int *flags, int *fg, int *bg, int *attr)
 {
 	*attr = 0;
 	if (*flags & GUI_PRINT_FLAG_MIRC_COLOR) {
@@ -336,7 +336,7 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 	flags = GPOINTER_TO_INT(pflags);
 	fg = GPOINTER_TO_INT(fgcolor);
 	bg = GPOINTER_TO_INT(bgcolor);
-	get_colors(&flags, &fg, &bg, &attr);
+	gui_printtext_get_colors(&flags, &fg, &bg, &attr);
 
 	if (window == NULL) {
 		print_text_no_window(flags, fg, bg, attr, str);
diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h
index ba5d6f8f..0acf4d31 100644
--- a/src/fe-text/gui-printtext.h
+++ b/src/fe-text/gui-printtext.h
@@ -21,5 +21,6 @@ void gui_printtext_internal(int xpos, int ypos, const char *str);
 void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str);
 void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str, time_t time);
 void gui_printtext_window_border(int xpos, int ypos);
+void gui_printtext_get_colors(int *flags, int *fg, int *bg, int *attr);
 
 #endif
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index e0a5f193..46876e75 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -205,10 +205,47 @@ static void sig_gui_print_text_finished(WINDOW_REC *window)
 		gui->insert_after = insert_after;
 }
 
+static void parse_colors_collector(const WINDOW_REC *window, const void *fgcolor_int,
+                                   const void *bgcolor_int, const void *flags_int,
+                                   const char *textpiece, const TEXT_DEST_REC *dest)
+{
+	int fg, bg, flags, attr;
+
+	flags = GPOINTER_TO_INT(flags_int);
+	fg = GPOINTER_TO_INT(fgcolor_int);
+	bg = GPOINTER_TO_INT(bgcolor_int);
+	gui_printtext_get_colors(&flags, &fg, &bg, &attr);
+
+	if (flags & GUI_PRINT_FLAG_NEWLINE) {
+		g_string_append_c(color_buf->cur_text, '\n');
+	}
+	format_gui_flags(color_buf->cur_text, &color_buf->last_fg, &color_buf->last_bg,
+	                 &color_buf->last_flags, fg, bg, flags);
+
+	g_string_append(color_buf->cur_text, textpiece);
+}
+
+static char *parse_colors(TEXT_DEST_REC *dest, const char *text)
+{
+	char *tmp;
+
+	if (text == NULL)
+		return NULL;
+
+	color_buf = textbuffer_create(NULL);
+	format_send_as_gui_flags(dest, text, (SIGNAL_FUNC) parse_colors_collector);
+	tmp = g_strdup(color_buf->cur_text->str);
+	textbuffer_destroy(color_buf);
+	color_buf = NULL;
+
+	return tmp;
+}
+
 char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 {
+	TEXT_DEST_REC dest;
 	GUI_WINDOW_REC *gui;
-	LINE_REC *curr;
+	char *tmp, *text = NULL;
 
 	g_return_val_if_fail(buffer != NULL, NULL);
 	g_return_val_if_fail(buffer->window != NULL, NULL);
@@ -218,11 +255,11 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 		return NULL;
 
 	if (line->info.level & MSGLEVEL_FORMAT && line->info.format != NULL) {
-		TEXT_DEST_REC dest;
+		LINE_REC *curr;
 		THEME_REC *theme;
 		int formatnum;
 		TEXT_BUFFER_FORMAT_REC *format_rec;
-		char *text, *tmp, *str;
+		char *str;
 
 		curr = line;
 		line = NULL;
@@ -267,17 +304,18 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 			dest.flags |= PRINT_FLAG_FORMAT;
 
 			current_time = (time_t) -1;
-			return str;
 		} else if (format_rec->format != NULL) {
 			g_free(text);
-			return NULL;
-		} else {
-			return text;
+			text = NULL;
 		}
 		special_fill_cache(NULL);
 	} else {
-		return g_strdup(line->info.text);
+		format_create_dest(&dest, NULL, NULL, line->info.level, buffer->window);
+		text = g_strdup(line->info.text);
 	}
+	tmp = parse_colors(&dest, text);
+	g_free(text);
+	return tmp;
 }
 
 void textbuffer_formats_init(void)

From 449d86caf0ff9f5458443d3bb60e5bc7658c038a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 29 Mar 2020 19:10:30 +0200
Subject: [PATCH 1113/1650] add setting to disable reformat

---
 src/fe-text/textbuffer-formats.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 46876e75..05158b6f 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -3,6 +3,7 @@
 #include <irssi/src/core/levels.h>
 #include <irssi/src/core/refstrings.h>
 #include <irssi/src/core/servers.h>
+#include <irssi/src/core/settings.h>
 #include <irssi/src/core/signals.h>
 #include <irssi/src/core/special-vars.h>
 #include <irssi/src/fe-common/core/printtext.h>
@@ -13,6 +14,7 @@
 #include <irssi/src/fe-text/textbuffer-view.h>
 
 TEXT_BUFFER_REC *color_buf;
+int scrollback_format;
 
 static void collector_free(GSList **collector)
 {
@@ -119,6 +121,9 @@ static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC
 	FORMAT_REC *formats;
 	LINE_INFO_REC *info;
 
+	if (!scrollback_format)
+		return;
+
 	info = store_lineinfo_tmp(dest);
 
 	formatnum = GPOINTER_TO_INT(formatnump);
@@ -141,6 +146,9 @@ static void sig_print_noformat(TEXT_DEST_REC *dest, const char *text)
 {
 	LINE_INFO_REC *info;
 
+	if (!scrollback_format)
+		return;
+
 	special_push_collector(NULL);
 	info = store_lineinfo_tmp(dest);
 
@@ -318,15 +326,25 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 	return tmp;
 }
 
+static void read_settings(void)
+{
+	scrollback_format = settings_get_bool("scrollback_format");
+}
+
 void textbuffer_formats_init(void)
 {
+	settings_add_bool("lookandfeel", "scrollback_format", TRUE);
+
+	read_settings();
 	signal_add("print format", (SIGNAL_FUNC) sig_print_format);
 	signal_add("print noformat", (SIGNAL_FUNC) sig_print_noformat);
 	signal_add_first("gui print text finished", (SIGNAL_FUNC) sig_gui_print_text_finished);
+	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 }
 
 void textbuffer_formats_deinit(void)
 {
+	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 	signal_remove("print format", (SIGNAL_FUNC) sig_print_format);
 	signal_remove("print noformat", (SIGNAL_FUNC) sig_print_noformat);
 	signal_remove("gui print text finished", (SIGNAL_FUNC) sig_gui_print_text_finished);

From 675696aa84bd9a2aeb2edfa2ec4edd88cffe04c8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 20 Apr 2020 23:55:46 +0200
Subject: [PATCH 1114/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index e0da1080..5fcf5d19 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 26
+#define IRSSI_ABI_VERSION 27
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 66a7cc3c345b29e2413a7a5e4cc8f9e234f61619 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 28 Apr 2020 15:34:47 +0200
Subject: [PATCH 1115/1650] check xs format

---
 .github/workflows/clangformat.yml             |   5 +
 .github/workflows/clangformat/clang-format-xs | 114 ++++++++++++++++++
 .github/workflows/clangformat/format-xs-1.pl  |  73 +++++++++++
 .github/workflows/clangformat/format-xs-2.pl  |  10 ++
 .../workflows/clangformat/format-xs-xml.pl    |  44 +++++++
 5 files changed, 246 insertions(+)
 create mode 100755 .github/workflows/clangformat/clang-format-xs
 create mode 100644 .github/workflows/clangformat/format-xs-1.pl
 create mode 100644 .github/workflows/clangformat/format-xs-2.pl
 create mode 100644 .github/workflows/clangformat/format-xs-xml.pl

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index b52dad8b..71f2ffed 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -10,6 +10,11 @@ jobs:
           |
             refs=($(git log -1 --format=%s))
             git fetch --depth=1 origin "${refs[3]}"
+      - name: configure clang-format
+        run:
+          |
+            git config clangformat.binary $PWD/.github/workflows/clangformat/clang-format-xs
+            git config clangformat.extensions c,h,xs
       - name: run git-clang-format and Check if no changes are needed
         run:
           |
diff --git a/.github/workflows/clangformat/clang-format-xs b/.github/workflows/clangformat/clang-format-xs
new file mode 100755
index 00000000..c77b7305
--- /dev/null
+++ b/.github/workflows/clangformat/clang-format-xs
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+set -eu
+
+srcdir=$(dirname "$(readlink -f "$0")")
+test -z "$srcdir" && srcdir=.
+
+CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
+options=()
+files=()
+lines=()
+no_options=0;inplace=0;xml=0;keep_offset=0;keep_length=0;keep=0;
+filename=tmp.1.c
+offsets=
+karg=
+off_opts=()
+for arg in "$@"; do
+    if [[ $keep = 1 ]]; then
+	if [[ "$karg" = "-offset" ]]; then
+	    offsets="$offsets${offsets:+ }$arg"
+	    off_opts+=("$karg" "$arg")
+	elif [[ "$karg" = "-length" ]]; then
+	    offsets="$offsets:$arg"
+	    off_opts+=("$karg" "$arg")
+	elif [[ "$karg" = "-assume-filename" ]]; then
+	    filename="$arg"
+	    options+=("$karg" "$arg")
+	else
+	    options+=("$karg" "$arg")
+	fi
+	keep=0
+    elif [[ $no_options = 0 ]]; then
+	case "$arg" in
+	    -assume-filename=*)
+		filename="${arg#-assume-filename=}"
+		;;
+	    -lines=*)
+		lines+=("${arg#-lines=}")
+		;;
+	    *)
+		;;
+	esac
+	case "$arg" in
+	    --) no_options=1
+		;;
+	    -i) inplace=1
+		;;
+	    -output-replacements-xml)
+		xml=1
+		;;
+	    -offset|-length|-cursor|-assume-filename|-fallback-style|-style)
+		keep=1
+		karg="$arg"
+		;;
+	    -*) options+=("$arg")
+		;;
+	    *) files+=("$arg")
+	       ;;
+	esac
+    else
+	files+=("$arg")
+    fi
+done
+
+export IN_LINES="${lines[*]}"
+export OFFSETS="$offsets"
+
+options_o=("${options[@]}")
+if [[ $inplace = 1 ]]; then
+    options_o=("-i" "${options[@]}")
+fi
+if [[ $xml = 1 ]]; then
+    options_o=("-output-replacements-xml" "${options[@]}")
+fi
+options_o+=("${off_opts[@]}")
+
+do_xs() {
+    perl "$srcdir"/format-xs-1.pl "$1" > "$1".1.c
+    $CLANG_FORMAT -i "${options[@]}" -- "$1".1.c
+    if [[ $xml = 1 ]]; then
+	perl "$srcdir"/format-xs-2.pl "$1".1.c > "$1".1.xs
+	perl "$srcdir"/format-xs-xml.pl <(diff -U0 <(od -An -tu1 -w1 -v "$1") <(od -An -tu1 -w1 -v "$1".1.xs))
+	rm "$1".1.xs
+    elif [[ $inplace = 1 ]]; then
+	perl "$srcdir"/format-xs-2.pl "$1".1.c > "$1"
+    else
+	perl "$srcdir"/format-xs-2.pl "$1".1.c
+    fi
+    rm "$1".1.c
+}
+
+if [[ ${#files[@]} -eq 0 ]]; then
+    case "$filename" in
+	    *.xs)
+		cat > "$filename".1.xs
+		do_xs "$filename".1.xs
+		rm "$filename".1.xs
+		;;
+	    *)
+		$CLANG_FORMAT "${options_o[@]}"
+		;;
+    esac
+else
+    for file in "${files[@]}"; do
+	case "$file" in
+	    *.xs)
+		do_xs "$file"
+		;;
+	    *)
+		$CLANG_FORMAT "${options_o[@]}" -- "$file"
+		;;
+	esac
+    done
+fi
diff --git a/.github/workflows/clangformat/format-xs-1.pl b/.github/workflows/clangformat/format-xs-1.pl
new file mode 100644
index 00000000..1d15316e
--- /dev/null
+++ b/.github/workflows/clangformat/format-xs-1.pl
@@ -0,0 +1,73 @@
+use strict;
+use warnings;
+
+my $in_code = 1;
+my @lines = $ENV{IN_LINES} =~ /(\d+):(\d+)/g;
+sub in_lines {
+    if (@lines) {
+	for (my $i = 0; $i < @lines; $i += 2) {
+	    if ($_[0] >= $lines[$i] && $_[0] <= $lines[$i + 1]) {
+		return 1;
+	    }
+	}
+	return '';
+    } else {
+	return 1;
+    }
+}
+while (<>) {
+    chomp;
+    my $copy;
+    my $prot = 0;
+    my $code = $in_code;
+    if (/^#(define|undef|include|if)/) {
+	$copy = 1;
+    }
+    elsif (/^#[* ]/) {
+	$prot = 1;
+    }
+    elsif (/^[A-Z_]+\s*=/) {
+	$prot = 2;
+	$in_code = 0;
+    }
+    elsif (/^((PP)?CODE|PREINIT):/) {
+	$prot = 1;
+	$in_code = 3;
+    }
+    elsif (/^[A-Z_]*:/) {
+	$prot = 1;
+	$in_code = 0;
+    }
+    elsif (/^[\w:* ]+\s*$/) {
+	$in_code = 0;
+    }
+
+    if ($prot || (!$copy && !$in_code)) {
+	if ($code == 2) {
+	    print "}/* -xs- */";
+	}
+	if ($prot == 2) {
+	    print "/* clang-format off */";
+	}
+	s/^\s+/\t/ if in_lines($.);
+	print "/* =xs= $_ */";
+	if ($prot == 2) {
+	    print "/* clang-format on */";
+	}
+	if ($in_code == 3) {
+	    print "{";
+	    $in_code = 2;
+	}
+	print "\n";
+    }
+    elsif ($copy) {
+	print "$_\n";
+    }
+    elsif ($in_code) {
+	print "$_\n";
+    }
+
+}
+if ($in_code) {
+    print "}/* -xs- */\n";
+}
diff --git a/.github/workflows/clangformat/format-xs-2.pl b/.github/workflows/clangformat/format-xs-2.pl
new file mode 100644
index 00000000..40242553
--- /dev/null
+++ b/.github/workflows/clangformat/format-xs-2.pl
@@ -0,0 +1,10 @@
+use strict;
+use warnings;
+
+my $doc = do { local $/; <> };
+
+$doc =~ s{\}[ \t]*/[*] -xs- [*]/\s*}{}g;
+$doc =~ s{^[ \t]*?/[*] =xs= (.*?) [*]/(\s*\{$)?}{$1}gms;
+$doc =~ s{^[ \t]*?/[*] clang-format off [*]//[*] =xs= (.*?) [*]/\s?/[*] clang-format on [*]/(\s*\{$)?}{$1}gms;
+
+print $doc;
diff --git a/.github/workflows/clangformat/format-xs-xml.pl b/.github/workflows/clangformat/format-xs-xml.pl
new file mode 100644
index 00000000..151649ca
--- /dev/null
+++ b/.github/workflows/clangformat/format-xs-xml.pl
@@ -0,0 +1,44 @@
+use strict;
+use warnings;
+
+my @diff = <>;
+if (@diff && $diff[0] !~ /^---/) {
+    die "Not valid diff output";
+}
+my @offs = $ENV{OFFSETS} =~ /(\d+):(\d+)/g;
+sub in_off {
+    if (@offs) {
+	for (my $i = 0; $i < @offs; $i += 2) {
+	    if ($_[0] + $_[1] >= $offs[$i] && $_[0] <= $offs[$i] + $offs[$i + 1]) {
+		return 1;
+	    }
+	}
+	return '';
+    } else {
+	return 1;
+    }
+}
+
+print "<?xml version='1.0'?>
+<replacements xml:space='preserve' incomplete_format='false'>\n";
+my $open;
+for (@diff) {
+    if (/^\@\@ -(\d+)(,(\d+))? /) {
+	if ($open) {
+	    print "</replacement>\n";
+	}
+	if (in_off($1-($3//1?1:0), $3//1)) {
+	    print "<replacement offset='@{[$1-($3//1?1:0)]}' length='@{[$3//1]}'>";
+	    $open = 1;
+	} else {
+	    $open = 0;
+	}
+    }
+    elsif (/^[+] +(\d+)/ && $open) {
+	print "&#$1;";
+    }
+}
+if ($open) {
+    print "</replacement>\n";
+}
+print "</replacements>\n";

From 08ead5ef06532bb45c79d1687b814e2c9b12d34a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 7 May 2020 01:11:15 +0200
Subject: [PATCH 1116/1650] fix npe on no text from
 format_get_text_theme_charargs

---
 src/fe-text/textbuffer-formats.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 05158b6f..f48773bc 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -249,6 +249,22 @@ static char *parse_colors(TEXT_DEST_REC *dest, const char *text)
 	return tmp;
 }
 
+static char *fallback_format(TEXT_BUFFER_FORMAT_REC *format_rec)
+{
+	int i;
+	GString *bs;
+	char *tmp;
+	bs = g_string_new(NULL);
+	g_string_printf(bs, "{%s#%s ", format_rec->module, format_rec->format);
+	for (i = 0; i < format_rec->nargs; i++) {
+		tmp = g_strescape(format_rec->args[i], "");
+		g_string_append_printf(bs, "\"%s\"%s", tmp, i + 1 < format_rec->nargs ? " " : "");
+		g_free(tmp);
+	}
+	g_string_append(bs, "}");
+	return g_string_free(bs, FALSE);
+}
+
 char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 {
 	TEXT_DEST_REC dest;
@@ -287,11 +303,14 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 			memcpy(arglist, format_rec->args, format_rec->nargs * sizeof(char *));
 			text = format_get_text_theme_charargs(theme, format_rec->module, &dest,
 			                                      formatnum, arglist);
+			if (text == NULL) {
+				text = fallback_format(format_rec);
+			}
 		} else {
 			text = g_strdup(format_rec->args[1]);
 		}
 
-		if (*text != '\0') {
+		if (text != NULL && *text != '\0') {
 			current_time = curr->info.time;
 
 			tmp = format_get_level_tag(theme, &dest);

From ba57684d73616af0c1678a54f4c8b13287cd8572 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 8 May 2020 15:34:49 +0200
Subject: [PATCH 1117/1650] fix NULL assertion in format args

---
 src/fe-text/textbuffer-formats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index f48773bc..edd14dbc 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -255,10 +255,10 @@ static char *fallback_format(TEXT_BUFFER_FORMAT_REC *format_rec)
 	GString *bs;
 	char *tmp;
 	bs = g_string_new(NULL);
-	g_string_printf(bs, "{%s#%s ", format_rec->module, format_rec->format);
-	for (i = 0; i < format_rec->nargs; i++) {
+	g_string_printf(bs, "{%s#%s", format_rec->module, format_rec->format);
+	for (i = 0; i < format_rec->nargs && format_rec->args[i] != NULL; i++) {
 		tmp = g_strescape(format_rec->args[i], "");
-		g_string_append_printf(bs, "\"%s\"%s", tmp, i + 1 < format_rec->nargs ? " " : "");
+		g_string_append_printf(bs, " \"%s\"", tmp);
 		g_free(tmp);
 	}
 	g_string_append(bs, "}");

From 4330dbec627d6bc1d2cd0c19fada7de4fd471bfc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 11 May 2020 17:46:45 +0200
Subject: [PATCH 1118/1650] add "print format" signal to perl

fix syntax in signals.txt with regards to GLists

simplify signal emit code
---
 docs/signals.txt                 |   4 +-
 src/fe-common/core/fe-log.c      |   6 +-
 src/fe-common/core/formats.c     |   3 +
 src/fe-text/textbuffer-formats.c |   3 +
 src/perl/common/Core.xs          |  38 ++--
 src/perl/get-signals.pl          |   5 +-
 src/perl/perl-signals.c          | 312 ++++++++++++++++++-------------
 src/perl/perl-signals.h          |   4 +-
 8 files changed, 214 insertions(+), 161 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index d7d42f5d..ff600cd3 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -251,7 +251,7 @@ FE common
 * Provides signals:
 
 completion.c:
- "complete word", GList * of char*, WINDOW_REC, char *word, char *linestart, int *want_space
+ "complete word", GList * of char *s, WINDOW_REC, char *word, char *linestart, int *want_space
 
 fe-common-core.c:
  "irssi init read settings"
@@ -285,6 +285,8 @@ keyboard.c:
 
 printtext.c:
  "print text", TEXT_DEST_REC *dest, char *text, char *stripped
+ "print format", THEME_REC *theme, char *module, TEXT_DEST_REC *dest, formatnum_args
+ "print noformat", TEXT_DEST_REC *dest, char *text
 
 themes.c:
  "theme created", THEME_REC
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 12b6b643..b5222059 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -570,10 +570,10 @@ static void sig_print_format(THEME_REC *theme, const char *module,
 
 	str = format_get_text_theme_charargs(log_theme, module, dest,
 					     GPOINTER_TO_INT(formatnum), args);
-	skip_next_printtext = TRUE;
+	if (str != NULL && *str != '\0') {
+		skip_next_printtext = TRUE;
 
-	if (*str != '\0') {
-                /* add the line start format */
+		/* add the line start format */
 		linestart = format_get_level_tag(log_theme, dest);
                 tmp = str;
 		str = format_add_linestart(tmp, linestart);
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index a4d3a023..eb47646e 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -650,6 +650,9 @@ char *format_get_text_theme_charargs(THEME_REC *theme, const char *module,
 	MODULE_THEME_REC *module_theme;
 	char *text;
 
+	if (module == NULL)
+		return NULL;
+
 	module_theme = g_hash_table_lookup(theme->modules, module);
 	if (module_theme == NULL)
 		return NULL;
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index edd14dbc..47f1735a 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -124,6 +124,9 @@ static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC
 	if (!scrollback_format)
 		return;
 
+	if (module == NULL)
+		return;
+
 	info = store_lineinfo_tmp(dest);
 
 	formatnum = GPOINTER_TO_INT(formatnump);
diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index 8e26f105..7ae18943 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -68,13 +68,15 @@ static void add_tuple(gpointer key_, gpointer value_, gpointer user_data)
 	(void) hv_store(hash, key, strlen(key), new_pv(value), 0);
 }
 
-static void wrap_signal_emit(void *signal, void **p) {
-	signal_emit(signal, 6, p[0], p[1], p[2], p[3], p[4], p[5]);
+static void wrap_signal_emit(void *signal, int params, void **p)
+{
+	signal_emit(signal, params, p[0], p[1], p[2], p[3], p[4], p[5]);
 }
 
-static void wrap_signal_continue(void *dummy, void **p) {
+static void wrap_signal_continue(void *dummy, int params, void **p)
+{
 	(void)dummy;
-	signal_continue(6, p[0], p[1], p[2], p[3], p[4], p[5]);
+	signal_continue(params, p[0], p[1], p[2], p[3], p[4], p[5]);
 }
 
 MODULE = Irssi::Core  PACKAGE = Irssi
@@ -85,33 +87,14 @@ signal_emit(signal, ...)
 	char *signal
 CODE:
 	int signal_id;
-	SV *args[SIGNAL_MAX_ARGUMENTS];
-	int n, used;
 
 	signal_id = signal_get_uniq_id(signal);
-	used = items - 1;
-	if (used > SIGNAL_MAX_ARGUMENTS) {
-		used = SIGNAL_MAX_ARGUMENTS;
-	}
-	for (n = 0; n < used; ++n) {
-		args[n] = ST(n + 1);
-	}
-	perl_signal_args_to_c(wrap_signal_emit, signal, signal_id, args, used);
+	perl_signal_args_to_c(wrap_signal_emit, signal, signal_id, &ST(1), items - 1);
 
 void
 signal_continue(...)
 CODE:
-	SV *args[SIGNAL_MAX_ARGUMENTS];
-	int n, used;
-
-	used = items;
-	if (used > SIGNAL_MAX_ARGUMENTS) {
-		used = SIGNAL_MAX_ARGUMENTS;
-	}
-	for (n = 0; n < used; ++n) {
-		args[n] = ST(n);
-	}
-	perl_signal_args_to_c(wrap_signal_continue, NULL, signal_get_emitted_id(), args, used);
+	perl_signal_args_to_c(wrap_signal_continue, NULL, signal_get_emitted_id(), &ST(0), items);
 
 void
 signal_add(...)
@@ -162,7 +145,7 @@ PREINIT:
 	HV *hv;
         HE *he;
 	I32 len, pos;
-	const char *arr[7];
+	const char *arr[SIGNAL_MAX_ARGUMENTS + 1];
 CODE:
 	if (items != 1 || !is_hvref(ST(0)))
 		croak("Usage: Irssi::signal_register(hash)");
@@ -179,7 +162,8 @@ CODE:
 
 		av = (AV *) SvRV(val);
 		len = av_len(av)+1;
-		if (len > 6) len = 6;
+		if (len > SIGNAL_MAX_ARGUMENTS)
+			len = SIGNAL_MAX_ARGUMENTS;
 		for (pos = 0; pos < len; pos++) {
                 	SV **val = av_fetch(av, pos, 0);
 			arr[pos] = SvPV_nolen(*val);
diff --git a/src/perl/get-signals.pl b/src/perl/get-signals.pl
index 275be157..12aebdba 100755
--- a/src/perl/get-signals.pl
+++ b/src/perl/get-signals.pl
@@ -16,14 +16,15 @@ while (<>) {
 	$signal = $1;
 	$_ = $3;
 
-	s/GList \* of ([^,]*)/glistptr_\1/g;
-	s/GSList of (\w+)s/gslist_\1/g;
+	s/GList \* of ([^,]*)s/glistptr_\1/g;
+	s/GSList of ([^,]*)s/gslist_\1/g;
 
 	s/char \*[^,]*/string/g;
 	s/ulong \*[^,]*/ulongptr/g;
 	s/int \*[^,]*/intptr/g;
 	s/int [^,]*/int/g;
 
+
 	my %map = (
 		# core
 		CHATNET_REC   => 'iobject',
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 59289588..27522f5e 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -21,10 +21,11 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/signals.h>
 #include <irssi/src/core/commands.h>
+#include <irssi/src/core/modules.h>
 #include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 #include <irssi/src/perl/perl-core.h>
 #include <irssi/src/perl/perl-common.h>
@@ -39,7 +40,7 @@ typedef struct {
 
 typedef struct {
 	char *signal;
-	char *args[7];
+	char *args[SIGNAL_MAX_ARGUMENTS + 1];
 	int dynamic;
 } PERL_SIGNAL_ARGS_REC;
 
@@ -71,9 +72,8 @@ static PERL_SIGNAL_ARGS_REC *perl_signal_args_find(int signal_id)
 	return NULL;
 }
 
-void perl_signal_args_to_c(
-        void (*callback)(void *, void **), void *cb_arg,
-        int signal_id, SV **args, size_t n_args)
+void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg, int signal_id,
+                           SV **args, size_t n_args)
 {
         union {
                 int v_int;
@@ -83,136 +83,162 @@ void perl_signal_args_to_c(
         } saved_args[SIGNAL_MAX_ARGUMENTS];
         void *p[SIGNAL_MAX_ARGUMENTS];
         PERL_SIGNAL_ARGS_REC *rec;
-        size_t n;
+	char *arglist[MAX_FORMAT_PARAMS];
+	size_t n;
 
-        if (!(rec = perl_signal_args_find(signal_id))) {
-                const char *name = signal_get_id_str(signal_id);
-                if (!name) {
-                        croak("%d is not a known signal id", signal_id);
-                }
-                croak("\"%s\" is not a registered signal", name);
-        }
+	if (!(rec = perl_signal_args_find(signal_id))) {
+		const char *name = signal_get_id_str(signal_id);
+		if (!name) {
+			croak("%d is not a known signal id", signal_id);
+		}
+		croak("\"%s\" is not a registered signal", name);
+	}
 
-        for (n = 0; n < SIGNAL_MAX_ARGUMENTS && n < n_args && rec->args[n] != NULL; ++n) {
-                void *c_arg;
-                SV *arg = args[n];
+	for (n = 0; n < SIGNAL_MAX_ARGUMENTS && n < n_args && rec->args[n] != NULL; ++n) {
+		void *c_arg;
+		SV *arg = args[n];
 
-                if (!SvOK(arg)) {
-                        c_arg = NULL;
-                } else if (g_strcmp0(rec->args[n], "string") == 0) {
-                        c_arg = SvPV_nolen(arg);
-                } else if (g_strcmp0(rec->args[n], "int") == 0) {
-                        c_arg = (void *)SvIV(arg);
-                } else if (g_strcmp0(rec->args[n], "ulongptr") == 0) {
-                        saved_args[n].v_ulong = SvUV(arg);
-                        c_arg = &saved_args[n].v_ulong;
-                } else if (g_strcmp0(rec->args[n], "intptr") == 0) {
-                        saved_args[n].v_int = SvIV(SvRV(arg));
-                        c_arg = &saved_args[n].v_int;
-                } else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
-                        GList *gl;
-                        int is_str;
-                        AV *av;
-                        SV *t;
-                        int count;
+		if (g_strcmp0(rec->args[n], "formatnum_args") == 0 && n >= 3) {
+			const FORMAT_REC *formats;
+			const char *module;
+			int num;
+			int formatnum;
 
-                        t = SvRV(arg);
-                        if (SvTYPE(t) != SVt_PVAV) {
-                                croak("Not an ARRAY reference");
-                        }
-                        av = (AV *)t;
+			module = SvPV_nolen(args[n - 2]);
+			formatnum = format_find_tag(module, SvPV_nolen(arg));
+			if (formatnum < 0) { /* format out of bounds */
+				p[n - 2] = NULL;
+				break;
+			}
 
-                        is_str = g_strcmp0(rec->args[n]+9, "char*") == 0;
+			formats = g_hash_table_lookup(default_formats, module);
+			arglist[formats[formatnum].params] = NULL;
 
-                        gl = NULL;
-                        count = av_len(av) + 1;
-                        while (count-- > 0) {
-                                SV **px = av_fetch(av, count, 0);
-                                SV *x = px ? *px : NULL;
-                                gl = g_list_prepend(
-                                        gl,
-                                        x == NULL ? NULL :
-                                        is_str ? g_strdup(SvPV_nolen(x)) :
-                                        irssi_ref_object(x)
-                                );
-                        }
-                        saved_args[n].v_glist = gl;
-                        c_arg = &saved_args[n].v_glist;
-                } else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
-                        GSList *gsl;
-                        AV *av;
-                        SV *t;
-                        int count;
+			p[n++] = GINT_TO_POINTER(formatnum);
 
-                        t = SvRV(arg);
-                        if (SvTYPE(t) != SVt_PVAV) {
-                                croak("Not an ARRAY reference");
-                        }
-                        av = (AV *)t;
+			for (num = 0; num < formats[formatnum].params; num++) {
+				if (n + num < n_args)
+					arglist[num] = SvPV_nolen(args[n + num]);
+				else
+					arglist[num] = "";
+			}
 
-                        gsl = NULL;
-                        count = av_len(av) + 1;
-                        while (count-- > 0) {
-                                SV **x = av_fetch(av, count, 0);
-                                gsl = g_slist_prepend(
-                                        gsl,
-                                        x == NULL ? NULL :
-                                        irssi_ref_object(*x)
-                                );
-                        }
-                        c_arg = saved_args[n].v_gslist = gsl;
-                } else {
-                        c_arg = irssi_ref_object(arg);
-                }
+			p[n++] = arglist;
+			n_args = n;
 
-                p[n] = c_arg;
-        }
+			break;
+		} else if (!SvOK(arg)) {
+			c_arg = NULL;
+		} else if (g_strcmp0(rec->args[n], "string") == 0) {
+			c_arg = SvPV_nolen(arg);
+		} else if (g_strcmp0(rec->args[n], "int") == 0) {
+			c_arg = (void *) SvIV(arg);
+		} else if (g_strcmp0(rec->args[n], "ulongptr") == 0) {
+			saved_args[n].v_ulong = SvUV(arg);
+			c_arg = &saved_args[n].v_ulong;
+		} else if (g_strcmp0(rec->args[n], "intptr") == 0) {
+			saved_args[n].v_int = SvIV(SvRV(arg));
+			c_arg = &saved_args[n].v_int;
+		} else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
+			GList *gl;
+			int is_str;
+			AV *av;
+			SV *t;
+			int count;
 
-        for (; n < SIGNAL_MAX_ARGUMENTS; ++n) {
-                p[n] = NULL;
-        }
+			t = SvRV(arg);
+			if (SvTYPE(t) != SVt_PVAV) {
+				croak("Not an ARRAY reference");
+			}
+			av = (AV *) t;
 
-        callback(cb_arg, p);
+			is_str = g_strcmp0(rec->args[n] + 9, "string") == 0 ||
+			         g_strcmp0(rec->args[n] + 9, "char*") == 0; /* deprecated form */
 
-        for (n = 0; n < SIGNAL_MAX_ARGUMENTS && n < n_args && rec->args[n] != NULL; ++n) {
-                SV *arg = args[n];
+			gl = NULL;
+			count = av_len(av) + 1;
+			while (count-- > 0) {
+				SV **px = av_fetch(av, count, 0);
+				SV *x = px ? *px : NULL;
+				gl = g_list_prepend(gl, x == NULL ?
+				                            NULL :
+				                            is_str ? g_strdup(SvPV_nolen(x)) :
+				                                     irssi_ref_object(x));
+			}
+			saved_args[n].v_glist = gl;
+			c_arg = &saved_args[n].v_glist;
+		} else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
+			GSList *gsl;
+			AV *av;
+			SV *t;
+			int count;
 
-                if (!SvOK(arg)) {
-                        continue;
-                }
+			t = SvRV(arg);
+			if (SvTYPE(t) != SVt_PVAV) {
+				croak("Not an ARRAY reference");
+			}
+			av = (AV *) t;
 
-                if (g_strcmp0(rec->args[n], "intptr") == 0) {
-                        SV *t = SvRV(arg);
-                        SvIOK_only(t);
-                        SvIV_set(t, saved_args[n].v_int);
-                } else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
-                        g_slist_free(saved_args[n].v_gslist);
-                } else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
-                        int is_iobject, is_str;
-                        AV *av;
-                        GList *gl, *tmp;
+			gsl = NULL;
+			count = av_len(av) + 1;
+			while (count-- > 0) {
+				SV **x = av_fetch(av, count, 0);
+				gsl = g_slist_prepend(gsl, x == NULL ? NULL : irssi_ref_object(*x));
+			}
+			c_arg = saved_args[n].v_gslist = gsl;
+		} else {
+			c_arg = irssi_ref_object(arg);
+		}
 
-                        is_iobject = g_strcmp0(rec->args[n]+9, "iobject") == 0;
-                        is_str = g_strcmp0(rec->args[n]+9, "char*") == 0;
+		p[n] = c_arg;
+	}
 
-                        av = (AV *)SvRV(arg);
-                        av_clear(av);
+	for (; n < SIGNAL_MAX_ARGUMENTS; ++n) {
+		p[n] = NULL;
+	}
 
-                        gl = saved_args[n].v_glist;
-                        for (tmp = gl; tmp != NULL; tmp = tmp->next) {
-                                av_push(av,
-                                        is_iobject ? iobject_bless((SERVER_REC *)tmp->data) :
-                                        is_str ? new_pv(tmp->data) :
-                                        irssi_bless_plain(rec->args[n]+9, tmp->data)
-                                );
-                        }
+	callback(cb_arg, n_args, p);
 
-                        if (is_str) {
-                                g_list_foreach(gl, (GFunc)g_free, NULL);
-                        }
-                        g_list_free(gl);
-                }
-        }
+	for (n = 0; n < SIGNAL_MAX_ARGUMENTS && n < n_args && rec->args[n] != NULL; ++n) {
+		SV *arg = args[n];
+
+		if (!SvOK(arg)) {
+			continue;
+		}
+
+		if (g_strcmp0(rec->args[n], "intptr") == 0) {
+			SV *t = SvRV(arg);
+			SvIOK_only(t);
+			SvIV_set(t, saved_args[n].v_int);
+		} else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
+			g_slist_free(saved_args[n].v_gslist);
+		} else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
+			int is_iobject, is_str;
+			AV *av;
+			GList *gl, *tmp;
+
+			is_iobject = g_strcmp0(rec->args[n] + 9, "iobject") == 0;
+			is_str = g_strcmp0(rec->args[n] + 9, "string") == 0 ||
+			         g_strcmp0(rec->args[n] + 9, "char*") == 0; /* deprecated form */
+
+			av = (AV *) SvRV(arg);
+			av_clear(av);
+
+			gl = saved_args[n].v_glist;
+			for (tmp = gl; tmp != NULL; tmp = tmp->next) {
+				av_push(av, is_iobject ?
+				                iobject_bless((SERVER_REC *) tmp->data) :
+				                is_str ?
+				                new_pv(tmp->data) :
+				                irssi_bless_plain(rec->args[n] + 9, tmp->data));
+			}
+
+			if (is_str) {
+				g_list_foreach(gl, (GFunc) g_free, NULL);
+			}
+			g_list_free(gl);
+		}
+	}
 }
 
 static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
@@ -246,7 +272,8 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
                         int is_iobject, is_str;
 
                         is_iobject = g_strcmp0(rec->args[n]+9, "iobject") == 0;
-                        is_str = g_strcmp0(rec->args[n]+9, "char*") == 0;
+			is_str = g_strcmp0(rec->args[n] + 9, "string") == 0 ||
+			         g_strcmp0(rec->args[n] + 9, "char*") == 0; /* deprecated form */
 			av = newAV();
 
 			ptr = arg;
@@ -267,8 +294,37 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
                 else if (g_strcmp0(rec->args[n], "ulongptr") == 0)
                         perlarg = newSViv(*(unsigned long *) arg);
                 else if (g_strcmp0(rec->args[n], "intptr") == 0)
-                        saved_args[n] = perlarg = newRV_noinc(newSViv(*(int *) arg));
-                else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
+			saved_args[n] = perlarg = newRV_noinc(newSViv(*(int *) arg));
+		else if (g_strcmp0(rec->args[n], "formatnum_args") == 0 && n >= 3) {
+			const THEME_REC *theme;
+			const MODULE_THEME_REC *rec;
+			const FORMAT_REC *formats;
+			char *const *tmp;
+			int formatnum;
+
+			theme = args[n - 3];
+			if (theme == NULL) /* no theme */
+				continue;
+
+			rec = g_hash_table_lookup(theme->modules, args[n - 2]);
+			if (rec == NULL) /* no module in theme */
+				continue;
+
+			formats = g_hash_table_lookup(default_formats, args[n - 2]);
+			if (formats == NULL) /* no module in default_formats */
+				continue;
+
+			formatnum = GPOINTER_TO_INT(arg);
+			if (formatnum >= rec->count) /* format out of bounds */
+				continue;
+
+			XPUSHs(sv_2mortal(new_pv(formats[formatnum].tag)));
+			for (tmp = args[n + 1]; *tmp != NULL; tmp++) {
+				XPUSHs(sv_2mortal(new_pv(*tmp)));
+			}
+
+			continue;
+		} else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
 			/* linked list - push as AV */
 			GSList *tmp;
 			int is_iobject;
@@ -338,8 +394,9 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 				out = g_list_append(out, val);
 			}
 
-			if (g_strcmp0(rec->args[n]+9, "char*") == 0)
-                                g_list_foreach(*ret, (GFunc) g_free, NULL);
+			if (g_strcmp0(rec->args[n] + 9, "string") == 0 ||
+			    g_strcmp0(rec->args[n] + 9, "char*") == 0) /* deprecated form */
+				g_list_foreach(*ret, (GFunc) g_free, NULL);
 			g_list_free(*ret);
                         *ret = out;
 		}
@@ -349,12 +406,15 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 	LEAVE;
 }
 
+#if SIGNAL_MAX_ARGUMENTS != 6
+#error SIGNAL_MAX_ARGUMENTS changed - update code
+#endif
 static void sig_func(const void *p1, const void *p2,
 		     const void *p3, const void *p4,
 		     const void *p5, const void *p6)
 {
 	PERL_SIGNAL_REC *rec;
-	const void *args[6];
+	const void *args[SIGNAL_MAX_ARGUMENTS];
 
 	args[0] = p1; args[1] = p2; args[2] = p3;
 	args[3] = p4; args[4] = p5; args[5] = p6;
@@ -553,7 +613,7 @@ void perl_signal_register(const char *signal, const char **args)
 		return;
 
 	rec = g_new0(PERL_SIGNAL_ARGS_REC, 1);
-	for (i = 0; i < 6 && args[i] != NULL; i++)
+	for (i = 0; i < SIGNAL_MAX_ARGUMENTS && args[i] != NULL; i++)
 		rec->args[i] = g_strdup(args[i]);
 	rec->dynamic = TRUE;
 	rec->signal = g_strdup(signal);
@@ -579,7 +639,7 @@ static void signal_args_free(PERL_SIGNAL_ARGS_REC *rec)
 	if (!rec->dynamic)
 		return;
 
-	for (i = 0; i < 6 && rec->args[i] != NULL; i++)
+	for (i = 0; i < SIGNAL_MAX_ARGUMENTS && rec->args[i] != NULL; i++)
 		g_free(rec->args[i]);
 	g_free(rec->signal);
 	g_free(rec);
diff --git a/src/perl/perl-signals.h b/src/perl/perl-signals.h
index 8191a917..cb636d3c 100644
--- a/src/perl/perl-signals.h
+++ b/src/perl/perl-signals.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_PERL_PERL_SIGNALS_H
 #define IRSSI_PERL_PERL_SIGNALS_H
 
-void perl_signal_args_to_c(void (*callback)(void *, void **), void *cb_arg,
-                           int signal_id, SV **args, size_t n_args);
+void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg, int signal_id,
+                           SV **args, size_t n_args);
 
 void perl_signal_add_full(const char *signal, SV *func, int priority);
 

From 3ea854816d378dd370575a4a557fbd2b80a55347 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 13 May 2020 00:03:36 +0200
Subject: [PATCH 1119/1650] Correct a wrong package for format_create_dest

---
 src/perl/ui/Formats.xs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/ui/Formats.xs b/src/perl/ui/Formats.xs
index c10f0b4e..8e34b7b9 100644
--- a/src/perl/ui/Formats.xs
+++ b/src/perl/ui/Formats.xs
@@ -104,7 +104,7 @@ PPCODE:
 	g_free_not_null(ret);
 
 #*******************************
-MODULE = Irssi::UI::Formats  PACKAGE = Irssi::Window
+MODULE = Irssi::UI::Formats  PACKAGE = Irssi::UI::Window
 #*******************************
 
 void

From b0cd72aadd62d6f018b36289635e7133f6988afc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 13 May 2020 00:23:12 +0200
Subject: [PATCH 1120/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 5fcf5d19..f2c50cde 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 27
+#define IRSSI_ABI_VERSION 28
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 3cb662797351506041f89c23deadeff498c8da44 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 15 May 2020 11:18:43 +0200
Subject: [PATCH 1121/1650] also check XS abi

---
 .github/workflows/abicheck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 8ea6837f..48f39b25 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -4,7 +4,7 @@ jobs:
   check-abi-diff:
     runs-on: ubuntu-latest
     env:
-      build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes
+      build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
       prefix: /usr/local
     steps:
       - name: set PATH

From ae6c8a1bd51b698c577c23a7be4862f8ab6cf470 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mh (IRCnet)>
Date: Fri, 15 May 2020 20:25:41 +0200
Subject: [PATCH 1122/1650] Add better support for numeric 489
 ERR_SECUREONLYCHAN along with a print format

modified:   src/fe-common/irc/fe-events-numeric.c
modified:   src/fe-common/irc/module-formats.c
modified:   src/fe-common/irc/module-formats.h
---
 src/fe-common/irc/fe-events-numeric.c | 29 +++++++++++++++++++++++++--
 src/fe-common/irc/module-formats.c    |  1 +
 src/fe-common/irc/module-formats.h    |  1 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index a6bbaa27..eb356945 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -531,6 +531,31 @@ static void event_477(IRC_SERVER_REC *server, const char *data,
 	g_free(params);
 }
 
+static void event_489(IRC_SERVER_REC *server, const char *data,
+		      const char *nick)
+{
+	/* Numeric 489 can mean one of two things things:
+	 * cannot join to channel (secure only), or not chanop or voice.
+	 * If we tried to join this channel, display the joinerror.
+	 * Otherwise depending on the channel being joined or not
+	 * display the error in the channel or status window.
+	 */
+	IRC_CHANNEL_REC *chanrec;
+	char *params, *channel;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 2, NULL, &channel);
+
+	chanrec = irc_channel_find(server, channel);
+	if (chanrec != NULL && !chanrec->joined) {
+		cannot_join(server, data, IRCTXT_JOINERROR_SECURE_ONLY);
+	} else {
+		print_event_received(server, data, nick, chanrec == NULL || chanrec->joined);
+	}
+	g_free(params);
+}
+
 static void event_target_too_fast(IRC_SERVER_REC *server, const char *data,
 		      const char *nick)
 {
@@ -683,6 +708,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 475", (SIGNAL_FUNC) event_bad_channel_key);
 	signal_add("event 476", (SIGNAL_FUNC) event_bad_channel_mask);
 	signal_add("event 477", (SIGNAL_FUNC) event_477);
+	signal_add("event 489", (SIGNAL_FUNC) event_489); /* cannot join to channel (secure only), or not chanop or voice. */
 	signal_add("event 375", (SIGNAL_FUNC) event_motd);
 	signal_add("event 376", (SIGNAL_FUNC) event_motd);
 	signal_add("event 372", (SIGNAL_FUNC) event_motd);
@@ -726,7 +752,6 @@ void fe_events_numeric_init(void)
 	signal_add("event 478", (SIGNAL_FUNC) event_target_received); /* ban list is full */
 	signal_add("event 482", (SIGNAL_FUNC) event_target_received); /* not chanop */
 	signal_add("event 486", (SIGNAL_FUNC) event_target_received); /* cannot /msg (+R) */
-	signal_add("event 489", (SIGNAL_FUNC) event_target_received); /* not chanop or voice */
 	signal_add("event 494", (SIGNAL_FUNC) event_target_received); /* cannot /msg (own +R) */
 	signal_add("event 506", (SIGNAL_FUNC) event_target_received); /* cannot send (+R) */
 	signal_add("event 716", (SIGNAL_FUNC) event_target_received); /* cannot /msg (+g) */
@@ -776,6 +801,7 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 475", (SIGNAL_FUNC) event_bad_channel_key);
 	signal_remove("event 476", (SIGNAL_FUNC) event_bad_channel_mask);
 	signal_remove("event 477", (SIGNAL_FUNC) event_477);
+	signal_remove("event 489", (SIGNAL_FUNC) event_489);
 	signal_remove("event 375", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 376", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 372", (SIGNAL_FUNC) event_motd);
@@ -815,7 +841,6 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 478", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 482", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 486", (SIGNAL_FUNC) event_target_received);
-	signal_remove("event 489", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 494", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 506", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 716", (SIGNAL_FUNC) event_target_received);
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index e36eed92..6cca76d2 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -63,6 +63,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "joinerror_banned", "Cannot join to channel {channel $0} (You are banned)", 1, { 0 } },
 	{ "joinerror_bad_key", "Cannot join to channel {channel $0} (Bad channel key)", 1, { 0 } },
 	{ "joinerror_bad_mask", "Cannot join to channel {channel $0} (Bad channel mask)", 1, { 0 } },
+	{ "joinerror_secure_only", "Cannot join to channel {channel $0} (Secure clients only)", 1, { 0 } },
 	{ "joinerror_unavail", "Cannot join to channel {channel $0} (Channel is temporarily unavailable)", 1, { 0 } },
 	{ "joinerror_duplicate", "Channel {channel $0} already exists - cannot create it", 1, { 0 } },
 	{ "channel_rejoin", "Channel {channel $0} is temporarily unavailable, this is normally because of netsplits. Irssi will now automatically try to rejoin back to this channel until the join is successful. Use /RMREJOINS command if you wish to abort this.", 1, { 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 66a9804f..02247c4d 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -40,6 +40,7 @@ enum {
 	IRCTXT_JOINERROR_BANNED,
 	IRCTXT_JOINERROR_BAD_KEY,
 	IRCTXT_JOINERROR_BAD_MASK,
+	IRCTXT_JOINERROR_SECURE_ONLY,
 	IRCTXT_JOINERROR_UNAVAIL,
 	IRCTXT_JOINERROR_DUPLICATE,
 	IRCTXT_CHANNEL_REJOIN,

From 28768e40a35488f6431ac924bfc1802fd1343f5b Mon Sep 17 00:00:00 2001
From: Michael Hansen <michael@fractal.(none)>
Date: Sat, 16 May 2020 00:48:58 +0200
Subject: [PATCH 1123/1650] Increased IRSSI_ABI_VERSION to 29

modified:   src/common.h
---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index f2c50cde..c9c4e545 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 28
+#define IRSSI_ABI_VERSION 29
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 1fef8f82a5d12ceb8525595f3b65c4de448b8019 Mon Sep 17 00:00:00 2001
From: Michael Hansen <michael@fractal.(none)>
Date: Sat, 16 May 2020 01:00:17 +0200
Subject: [PATCH 1124/1650] make git-clang-format check happy

modified:   src/fe-common/irc/fe-events-numeric.c
---
 src/fe-common/irc/fe-events-numeric.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index eb356945..8d672931 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -511,8 +511,7 @@ static void event_bad_channel_mask(IRC_SERVER_REC *server, const char *data)
 	cannot_join(server, data, IRCTXT_JOINERROR_BAD_MASK);
 }
 
-static void event_477(IRC_SERVER_REC *server, const char *data,
-		      const char *nick)
+static void event_477(IRC_SERVER_REC *server, const char *data, const char *nick)
 {
 	/* Numeric 477 can mean many things:
 	 * modeless channel, cannot join/send to channel (+r/+R/+M).

From 451e3692b24b9146788e35b4b7b950c1b5c18c52 Mon Sep 17 00:00:00 2001
From: Michael Hansen <michael@fractal.(none)>
Date: Sat, 16 May 2020 01:20:22 +0200
Subject: [PATCH 1125/1650] disable clang-format check for a few sections of
 code from before format strictnes got tightened

modified:   src/fe-common/irc/fe-events-numeric.c
modified:   src/fe-common/irc/module-formats.c
modified:   src/fe-common/irc/module-formats.h
---
 src/fe-common/irc/fe-events-numeric.c | 2 ++
 src/fe-common/irc/module-formats.c    | 2 ++
 src/fe-common/irc/module-formats.h    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 8d672931..08c97866 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -671,6 +671,7 @@ void fe_events_numeric_init(void)
 	last_away_nick = NULL;
 	last_away_msg = NULL;
 
+	/* clang-format off */
 	signal_add("event 221", (SIGNAL_FUNC) event_user_mode);
 	signal_add("event 303", (SIGNAL_FUNC) event_ison);
 	signal_add("event 353", (SIGNAL_FUNC) event_names_list);
@@ -757,6 +758,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 717", (SIGNAL_FUNC) event_target_received); /* +g notified */
 	signal_add("event 728", (SIGNAL_FUNC) event_target_received); /* quiet (or other) list */
 	signal_add("event 729", (SIGNAL_FUNC) event_target_received); /* end of quiet (or other) list */
+	/* clang-format on */
 }
 
 void fe_events_numeric_deinit(void)
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 6cca76d2..d4c00f25 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -21,6 +21,7 @@
 #include "module.h"
 #include <irssi/src/fe-common/core/formats.h>
 
+/* clang-format off */
 FORMAT_REC fecommon_irc_formats[] = {
 	{ MODULE_NAME, "IRC", 0 },
 
@@ -176,3 +177,4 @@ FORMAT_REC fecommon_irc_formats[] = {
 
 	{ NULL, NULL, 0 }
 };
+/* clang-format on */
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 02247c4d..892b77c8 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -1,5 +1,6 @@
 #include <irssi/src/fe-common/core/formats.h>
 
+/* clang-format off */
 enum {
 	IRCTXT_MODULE_NAME,
 
@@ -144,5 +145,6 @@ enum {
         IRCTXT_ASK_OPER_PASS,
 	IRCTXT_ACCEPT_LIST
 };
+/* clang-format on */
 
 extern FORMAT_REC fecommon_irc_formats[];

From 214c7ad7da283d37fa47ff663edbb4035c7aa0ac Mon Sep 17 00:00:00 2001
From: Michael Hansen <michael@fractal.(none)>
Date: Sat, 16 May 2020 01:26:00 +0200
Subject: [PATCH 1126/1650] make clang-format happy about the code i added,
 instead of the code above it.

modified:   src/fe-common/irc/fe-events-numeric.c
---
 src/fe-common/irc/fe-events-numeric.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 08c97866..37fdf30a 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -530,8 +530,7 @@ static void event_477(IRC_SERVER_REC *server, const char *data, const char *nick
 	g_free(params);
 }
 
-static void event_489(IRC_SERVER_REC *server, const char *data,
-		      const char *nick)
+static void event_489(IRC_SERVER_REC *server, const char *data, const char *nick)
 {
 	/* Numeric 489 can mean one of two things things:
 	 * cannot join to channel (secure only), or not chanop or voice.

From 7c1237de981bbb67d57869790427929e75f925d1 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Thu, 21 May 2020 11:14:16 +0300
Subject: [PATCH 1127/1650] use visible channel name in layout save

---
 irssi.conf                          | 2 +-
 src/fe-common/core/windows-layout.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/irssi.conf b/irssi.conf
index 828b5997..174d0552 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -107,7 +107,7 @@ channels = (
 
 aliases = {
   ATAG        = "WINDOW SERVER";
-  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}";
+  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{visible_name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}";
   B           = "BAN";
   BACK        = "AWAY";
   BANS        = "BAN";
diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 745453d5..fa209f48 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -169,12 +169,12 @@ static void sig_layout_save_item(WINDOW_REC *window, WI_ITEM_REC *item,
 		chat_protocol_find_id(item->chat_type);
 	if (proto != NULL)
 		iconfig_node_set_str(subnode, "chat_type", proto->name);
-	iconfig_node_set_str(subnode, "name", item->name);
+	iconfig_node_set_str(subnode, "name", item->visible_name);
 
 	if (item->server != NULL) {
 		iconfig_node_set_str(subnode, "tag", item->server->tag);
 		if (IS_CHANNEL(item)) {
-			rec = window_bind_add(window, item->server->tag, item->name);
+			rec = window_bind_add(window, item->server->tag, item->visible_name);
 			if (rec != NULL)
 				rec->sticky = TRUE;
 		}

From d5017cfc7c4e6155cbfe08b2af881ff44d930cf8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 24 May 2020 18:43:46 +0200
Subject: [PATCH 1128/1650] make actlist_sort a choice type now that we have it

---
 src/fe-text/statusbar-items.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 4bca9403..47b31103 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -451,28 +451,16 @@ static void item_input(SBAR_ITEM_REC *item, int get_size_only)
 
 static void read_settings(void)
 {
-	const char *str;
-
 	if (active_entry != NULL)
 		gui_entry_set_utf8(active_entry, term_type == TERM_TYPE_UTF8);
 
-	str = settings_get_str("actlist_sort");
-	if (g_ascii_strcasecmp(str, "recent") == 0)
-		actlist_sort = 1;
-	else if (g_ascii_strcasecmp(str, "level") == 0)
-		actlist_sort = 2;
-	else if (g_ascii_strcasecmp(str, "level,recent") == 0)
-		actlist_sort = 3;
-	else {
-		settings_set_str("actlist_sort", "refnum");
-		actlist_sort = 0;
-	}
+	actlist_sort = settings_get_choice("actlist_sort");
 }
 
 void statusbar_items_init(void)
 {
 	settings_add_time("misc", "lag_min_show", "1sec");
-	settings_add_str("lookandfeel", "actlist_sort", "refnum");
+	settings_add_choice("lookandfeel", "actlist_sort", 0, "refnum;recent;level;level,recent");
 	settings_add_bool("lookandfeel", "actlist_names", FALSE);
 	settings_add_bool("lookandfeel", "actlist_prefer_window_name", FALSE);
 

From 4b2c710ebe440bc90d2ec38733d83a15c124b0ff Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 2 Jun 2020 09:53:18 +0200
Subject: [PATCH 1129/1650] disable setuid/setgid on android

---
 src/fe-common/core/fe-exec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index 0da4ac89..58471345 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -316,11 +316,13 @@ static void process_exec(PROCESS_REC *rec, const char *cmd)
 	/* child process, try to clean up everything */
 	setsid();
 
+#ifndef __ANDROID__
 	if (setuid(getuid()) != 0)
 		_exit(EXIT_FAILURE);
 
 	if (setgid(getgid()) != 0)
 		_exit(EXIT_FAILURE);
+#endif
 
 	signal(SIGINT, SIG_IGN);
 	signal(SIGQUIT, SIG_DFL);

From 01ecb879a63941fbbe78c8f3d8683539d1f87d2e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 27 May 2020 22:28:07 +0200
Subject: [PATCH 1130/1650] Add support for building in Termux-Android in meson

- introduce cross perl
- workaround for the android linker
---
 INSTALL                                 | 32 +++++++--
 configure.ac                            |  1 +
 docs/example-cross-android-aarch64.txt  | 47 ++++++++++++
 meson.build                             | 95 ++++++++++++++++++-------
 meson_options.txt                       |  1 +
 src/fe-common/core/fe-exec.c            |  6 +-
 src/fe-fuzz/fe-common/core/theme-load.c |  4 +-
 src/perl/common/meson.build             |  4 +-
 src/perl/irc/meson.build                |  3 +-
 src/perl/meson.build                    | 14 ++--
 src/perl/textui/meson.build             |  3 +-
 src/perl/ui/meson.build                 |  3 +-
 12 files changed, 167 insertions(+), 46 deletions(-)
 create mode 100644 docs/example-cross-android-aarch64.txt

diff --git a/INSTALL b/INSTALL
index 3476211f..712678e4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,12 +2,12 @@
  Irssi installation instructions
  -------------------------------
 
-To compile irssi you need:
+To compile Irssi you need:
 
 - meson-0.49 build system with ninja-1.5 or greater
 - glib-2.28 or greater
 - openssl (for ssl support)
-- perl-5.6 or greater (for perl support)
+- perl-5.6 or greater (for Perl support)
 - terminfo or ncurses (for text frontend)
 
 For most people, this should work just fine:
@@ -35,13 +35,13 @@ configure options
 
   --prefix
 
-  Specifies the path where irssi will be installed.
-  YES, you can install irssi WITHOUT ROOT permissions
+  Specifies the path where Irssi will be installed.
+  YES, you can install Irssi WITHOUT ROOT permissions
   by using --prefix=/home/dir
 
   -Dwith-proxy=yes   /   --with-proxy
 
-  Build the irssi proxy (see startup-HOWTO).
+  Build the Irssi proxy (see startup-HOWTO).
 
   -Dwith-perl=[yes|no]   /   --with-perl=[yes|no|module]
 
@@ -70,9 +70,9 @@ configure options
   Build without text frontend
 
 If anything is in non-standard path, you can just give the paths in
-CPPFLAGS and LIBS environment variable, eg.:
+the -Dc_args and -Dc_link_args options variable, eg.:
 
-  CPPFLAGS=-I/opt/openssl/include LDFLAGS=-L/opt/openssl/lib ./configure
+  meson Build -Dc_args='-I/opt/openssl/include' -Dc_link_args='-L/opt/openssl/lib'
 
 
 
@@ -112,6 +112,24 @@ perl                 static  core fe
  System specific notes
  ---------------------
 
+ Android
+
+When cross compiling Irssi for Android, you can specify the path of
+the cross-perl in the cross file.
+
+You may not have a cross-perl available. In that case, you will have
+to manually supply the required Perl arguments in the cross file. See
+the commented properties in the example cross file.
+
+An example cross file can be found in the docs folder. To use it, you
+would call:
+
+  meson Build --cross-file cross-android-aarch64.txt \
+    --prefix /data/data/com.termux/files/usr \
+    --libdir lib \
+    -Dfhs-prefix=/data/data/com.termux/files/usr \
+
+
  Cygwin
 
 Getting perl scripting to work needs a few things:
diff --git a/configure.ac b/configure.ac
index 9198fd67..14a79fb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,6 +665,7 @@ else
 	want_gregex=no
 fi
 
+AC_DEFINE([FHS_PREFIX], [""], [Alternate filesystem prefix for Termux])
 AH_TEMPLATE(HAVE_GMODULE)
 AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
 AH_TEMPLATE(HAVE_STATIC_PERL)
diff --git a/docs/example-cross-android-aarch64.txt b/docs/example-cross-android-aarch64.txt
new file mode 100644
index 00000000..caae0383
--- /dev/null
+++ b/docs/example-cross-android-aarch64.txt
@@ -0,0 +1,47 @@
+[binaries]
+ar = 'aarch64-linux-android-ar'
+c = 'aarch64-linux-android-clang'
+cpp = 'aarch64-linux-android-clang++'
+ld = 'aarch64-linux-android-ld'
+pkgconfig = '/home/builder/.termux-build/_cache/android-r20-api-24-v3/bin/aarch64-linux-android-pkg-config'
+strip = 'aarch64-linux-android-strip'
+
+;; you have to substitute 5.30.2 with the Perl version, that can be
+;; obtained by running ` miniperl -e 'print substr $^V, 1' `
+
+perl = ['/home/builder/.termux-build/perl/src/miniperl', '-I/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android', '-I/data/data/com.termux/files/usr/lib/perl5/5.30.2']
+
+[properties]
+needs_exe_wrapper = true
+c_args = ['-fstack-protector-strong', '-Oz', '-I/data/data/com.termux/files/usr/include']
+cpp_args = ['-fstack-protector-strong', '-Oz', '-I/data/data/com.termux/files/usr/include']
+c_link_args = ['-L/data/data/com.termux/files/usr/lib', '-Wl,-rpath=/data/data/com.termux/files/usr/lib', '-Wl,--enable-new-dtags', '-Wl,--as-needed', '-Wl,-z,relro,-z,now', '-landroid-glob']
+cpp_link_args = ['-L/data/data/com.termux/files/usr/lib', '-Wl,-rpath=/data/data/com.termux/files/usr/lib', '-Wl,--enable-new-dtags', '-Wl,--as-needed', '-Wl,-z,relro,-z,now', '-landroid-glob']
+
+;; if you do not have a cross-perl like miniperl available, you have
+;; to specify the required options by uncommenting the following
+;; properties
+
+;; you can get the proper values by running the commands on your
+;; Android device:
+
+;; ` perl -V::version: `
+; perl_version = '5.30.2'
+;; ` perl -MExtUtils::Embed -o ccopts `
+; perl_ccopts = ['-I/data/data/com.termux/files/usr/include', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-I/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android/CORE']
+;; ` perl -MExtUtils::Embed -o ldopts `
+; perl_ldopts = ['-Wl,-E', '-I/data/data/com.termux/files/usr/include', '-L/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android/CORE', '-lperl', '-lm', '-ldl']
+;; ` perl -V::archname: `
+; perl_archname = 'aarch64-android'
+;; ` perl -V::installsitearch: `
+; perl_installsitearch = '/data/data/com.termux/files/usr/lib/perl5/site_perl/5.30.2/aarch64-android'
+;; ` perl -V::installvendorarch: `
+; perl_installvendorarch = ''
+;; ` perl -E 'say for @INC' `
+; perl_inc = ['/data/data/com.termux/files/usr/lib/perl5/site_perl/5.30.2/aarch64-android', '/data/data/com.termux/files/usr/lib/perl5/site_perl/5.30.2', '/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android', '/data/data/com.termux/files/usr/lib/perl5/5.30.2']
+
+[host_machine]
+cpu_family = 'arm'
+cpu = 'aarch64'
+endian = 'little'
+system = 'android'
diff --git a/meson.build b/meson.build
index cf982146..22ed9ec7 100644
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,12 @@ cc = meson.get_compiler('c')
 rootinc = include_directories('.')
 dep = []
 textui_dep = []
+need_dl_cross_link = false
+# The Android environment requires that all modules are linked to each other.
+# See https://github.com/android/ndk/issues/201
+if host_machine.system() == 'android'
+  need_dl_cross_link = true
+endif
 
 includedir          = get_option('includedir')
 incdir              = 'irssi'
@@ -66,8 +72,13 @@ def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
 # Help files #
 ##############
 
-perl = find_program('perl')
-run_command(perl, files('utils/syntax.pl'))
+build_perl = find_program('perl', native : true)
+if meson.is_cross_build()
+  cross_perl = find_program('perl')
+else
+  cross_perl = build_perl
+endif
+run_command(build_perl, files('utils/syntax.pl'))
 
 ###################
 # irssi-version.h #
@@ -313,34 +324,46 @@ if want_perl
   perl_rpath = ''
 
   #### ccopts ####
-  res = run_command(perl, '-MExtUtils::Embed', '-e', 'ccopts')
-  foreach fl : res.stdout().strip().split()
-   if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m')
-     perl_cflags += fl
-   endif
+  perl_ccopts = meson.get_cross_property('perl_ccopts', false)
+  if perl_ccopts == false
+    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts')
+    perl_ccopts = res.stdout().strip().split()
+  endif
+  foreach fl : perl_ccopts
+    if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m')
+      perl_cflags += fl
+    endif
   endforeach
 
   perl_cflags += cc.get_supported_arguments('-fPIC')
 
   #### ldopts ####
-  res = run_command(perl, '-MExtUtils::Embed', '-e', 'ldopts')
+  perl_ldopts = meson.get_cross_property('perl_ldopts', false)
+  if perl_ldopts == false
+    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts')
+    perl_ldopts = res.stdout().strip().split()
+  endif
   skip_libs = ['-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic']
-  foreach fl : res.stdout().strip().split()
-   if not fl.startswith('-A') and not skip_libs.contains(fl)
-     if fl.startswith('-Wl,-rpath,')
-       perl_rpath = fl.split(',')[2]
-       perl_rpath_flags += fl
-     else
-       perl_ldflags += fl
-     endif
-   endif
+  foreach fl : perl_ldopts
+    if not fl.startswith('-A') and not skip_libs.contains(fl)
+      if fl.startswith('-Wl,-rpath,')
+        perl_rpath = fl.split(',')[2]
+        perl_rpath_flags += fl
+      else
+        perl_ldflags += fl
+      endif
+    endif
   endforeach
 
+  perl_version = meson.get_cross_property('perl_version', false)
+  if perl_version == false
+    perl_version = run_command(cross_perl, '-V::version:').stdout().split('\'')[1]
+  endif
   perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
-    version : run_command(perl, '-V::version:').stdout().split('\'')[1])
+    version : perl_version)
 
   ####
-  if not cc.run('''
+  if not cc.compiles('''
 #include <EXTERN.h>
 #include <perl.h>
 int main()
@@ -349,15 +372,18 @@ int main()
   return 0;
 }
 ''', args : perl_cflags + perl_ldflags + perl_rpath_flags,
-     name : 'working Perl support').compiled()
+     name : 'working Perl support')
     if require_perl
       error('error linking with perl libraries')
     else
       warning('error linking with perl libraries')
     endif
   else
-    xsubpp_file_c = run_command(perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
-    xsubpp = generator(perl,
+    xsubpp_file_c = meson.get_cross_property('perl_xsubpp', false)
+    if xsubpp_file_c == false
+      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
+    endif
+    xsubpp = generator(build_perl,
       output : '@BASENAME@.c',
       capture : true,
       arguments : [ xsubpp_file_c, '@EXTRA_ARGS@', '@INPUT@' ],
@@ -365,7 +391,7 @@ int main()
     xsubpp_file = files(xsubpp_file_c)
 
     if with_perl_lib == 'module'
-      perl_install_base = run_command(perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}').stdout()
+      perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}').stdout()
       if perl_install_base == ''
         with_perl_lib = ''
       endif
@@ -381,9 +407,16 @@ int main()
       set_perl_use_lib = false
       perl_library_dir = with_perl_lib + ' default'
       if with_perl_lib in ['site', 'vendor']
-        perlmoddir = run_command(perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1]
+        perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', false)
+        if perlmoddir == false
+          perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1]
+        endif
       elif with_perl_lib == 'module'
-        perlmoddir = perl_install_base / 'lib' / 'perl5' / run_command(perl, '-V::archname:').stdout().split('\'')[1]
+        perl_archname = meson.get_cross_property('perl_archname', false)
+        if perl_archname == false
+          perl_archname = run_command(cross_perl, '-V::archname:').stdout().split('\'')[1]
+        endif
+        perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
       endif
     elif with_perl_lib == ''
       set_perl_use_lib = true
@@ -399,7 +432,12 @@ int main()
 
     perl_use_lib = get_option('prefix') / perlmoddir
     if set_perl_use_lib
-      set_perl_use_lib = run_command(perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0
+      perl_inc = meson.get_cross_property('perl_inc', false)
+      if perl_inc == false
+        set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0
+      else
+        set_perl_use_lib = not perl_inc.contains(perl_use_lib)
+      endif
       if not set_perl_use_lib
         perl_library_dir += ' - other path in @INC'
       else
@@ -460,6 +498,10 @@ dep_cflagsonly = []
 foreach d : dep
   dep_cflagsonly += d.partial_dependency(includes : true, compile_args : true)
 endforeach
+dl_cross_dep = []
+if need_dl_cross_link
+  dl_cross_dep = dep
+endif
 
 ##################
 # irssi-config.h #
@@ -473,6 +515,7 @@ conf.set('HAVE_SOCKS', false, description : 'Build with socks support')
 conf.set('TERM_TRUECOLOR', want_truecolor, description : 'true color support in terminal')
 conf.set('USE_GREGEX', want_gregex, description : 'use GRegex for regular expressions')
 conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.')
+conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix'))
 
 headers = [
   'sys/ioctl.h',
diff --git a/meson_options.txt b/meson_options.txt
index c975db3a..5dc9c514 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,3 +14,4 @@ option('with-capsicum',     type : 'combo',  description : 'Build with Capsicum
 option('static-dependency', type : 'combo',  description : 'Request static dependencies',                 choices : ['no', 'yes'])
 option('install-glib',      type : 'combo',  description : 'Download and install GLib for you',           choices : ['no', 'yes', 'force'])
 option('docdir',            type : 'string', description : 'Documentation directory')
+option('fhs-prefix',        type : 'string', description : 'System prefix for Termux')
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index 58471345..dcd4ecb5 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -281,8 +281,8 @@ static void exec_show_list(void)
 
 static void process_exec(PROCESS_REC *rec, const char *cmd)
 {
-	const char *shell_args[4] = { "/bin/sh", "-c", NULL, NULL };
-        char **args;
+	const char *shell_args[4] = { FHS_PREFIX "/bin/sh", "-c", NULL, NULL };
+	char **args;
 	int in[2], out[2];
         int n;
 
@@ -341,7 +341,7 @@ static void process_exec(PROCESS_REC *rec, const char *cmd)
 	if (rec->shell) {
 		execvp(shell_args[0], (char **) shell_args);
 
-		fprintf(stderr, "Exec: /bin/sh: %s\n", g_strerror(errno));
+		fprintf(stderr, "Exec: " FHS_PREFIX "/bin/sh: %s\n", g_strerror(errno));
 	} else {
 		args = g_strsplit(cmd, " ", -1);
                 execvp(args[0], args);
diff --git a/src/fe-fuzz/fe-common/core/theme-load.c b/src/fe-fuzz/fe-common/core/theme-load.c
index faa063bb..f6db8f5f 100644
--- a/src/fe-fuzz/fe-common/core/theme-load.c
+++ b/src/fe-fuzz/fe-common/core/theme-load.c
@@ -37,7 +37,7 @@
 #include <string.h>
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
-	char *irssi_argv[] = {*argv[0], "--home", "/tmp/irssi", NULL};
+	char *irssi_argv[] = { *argv[0], "--home", FHS_PREFIX "/tmp/irssi", NULL };
 	int irssi_argc = sizeof(irssi_argv) / sizeof(char *) - 1;
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	g_log_set_null_logger();
@@ -57,7 +57,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 	THEME_REC *theme;
 	gchar *copy = g_strndup((const gchar *)data, size);
 
-	FILE *fp = fopen("/tmp/irssi/fuzz.theme", "wb");
+	FILE *fp = fopen(FHS_PREFIX "/tmp/irssi/fuzz.theme", "wb");
 	if (fp) {
 		fwrite(copy, strlen(copy), 1, fp);
 		fclose(fp);
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
index 2cbf7f4c..f2a69bc9 100644
--- a/src/perl/common/meson.build
+++ b/src/perl/common/meson.build
@@ -1,4 +1,5 @@
-libperl_common_a = shared_module('Irssi',
+
+libperl_Irssi_a = shared_module('Irssi',
   [ xsubpp.process(
     files(
       'Channel.xs',
@@ -24,6 +25,7 @@ libperl_common_a = shared_module('Irssi',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
+  link_with : dl_cross_perl_core,
 )
 
 install_headers(
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index 7d77e0c1..0a8fd9f9 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -1,4 +1,4 @@
-libperl_irc_a = shared_module('Irc',
+libperl_Irssi_Irc_a = shared_module('Irc',
   [ xsubpp.process(
     files(
       'Channel.xs',
@@ -26,6 +26,7 @@ libperl_irc_a = shared_module('Irc',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
+  link_with : dl_cross_perl_core,
 )
 
 install_headers(
diff --git a/src/perl/meson.build b/src/perl/meson.build
index a9f1296a..6a2aaa85 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -4,7 +4,7 @@ perl_signals_list_h = custom_target('perl-signals-list.h',
   output : 'perl-signals-list.h',
   capture : true,
   depend_files : files('get-signals.pl'),
-  command : [perl, files('get-signals.pl'), '@INPUT@'],
+  command : [build_perl, files('get-signals.pl'), '@INPUT@'],
 )
 
 irssi_core_pl_h = custom_target('irssi-core.pl.h',
@@ -14,7 +14,7 @@ irssi_core_pl_h = custom_target('irssi-core.pl.h',
   command : [file2header, '@INPUT@', 'irssi_core_code'],
 )
 
-shared_module('perl_core',
+libperl_core_a = shared_module('perl_core',
   files(
     'perl-common.c',
     'perl-core.c',
@@ -35,11 +35,16 @@ shared_module('perl_core',
   install_dir : moduledir,
   install_rpath : perl_rpath,
   build_rpath : perl_rpath,
-  dependencies : dep_cflagsonly + [ perl_dep ],
+  dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep,
   override_options : ['b_asneeded=false'],
 )
 
-shared_module('fe_perl',
+dl_cross_perl_core = []
+if need_dl_cross_link
+  dl_cross_perl_core += libperl_core_a
+endif
+
+libfe_perl_a = shared_module('fe_perl',
   files(
     'module-formats.c',
     'perl-fe.c',
@@ -52,6 +57,7 @@ shared_module('fe_perl',
   install : true,
   install_dir : moduledir,
   dependencies : dep,
+  link_with : dl_cross_perl_core,
 )
 
 subdir('common')
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
index 61362d52..1705fa36 100644
--- a/src/perl/textui/meson.build
+++ b/src/perl/textui/meson.build
@@ -1,4 +1,4 @@
-libperl_textui_a = shared_module('TextUI',
+libperl_Irssi_TextUI_a = shared_module('TextUI',
   [ xsubpp.process(
     files(
       'Statusbar.xs',
@@ -22,6 +22,7 @@ libperl_textui_a = shared_module('TextUI',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
+  link_with : dl_cross_perl_core,
 )
 
 install_headers(
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
index eca864dd..14bc7699 100644
--- a/src/perl/ui/meson.build
+++ b/src/perl/ui/meson.build
@@ -1,4 +1,4 @@
-libperl_ui_a = shared_module('UI',
+libperl_Irssi_UI_a = shared_module('UI',
   [ xsubpp.process(
     files(
       'Formats.xs',
@@ -20,6 +20,7 @@ libperl_ui_a = shared_module('UI',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
+  link_with : dl_cross_perl_core,
 )
 
 install_headers(

From fe9a44338087b186deeb11d57c520d2be44c383b Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 29 Jun 2020 16:11:45 +0200
Subject: [PATCH 1131/1650] change to strstr

---
 src/fe-common/core/keyboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index 986ee7bd..fa8ca076 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -772,7 +772,7 @@ static void cmd_show_keys(const char *searchkey, int full)
 
 			if ((len == 0 ||
 			     (full ? strncmp(rec->key, searchkey, len) == 0 :
-			             g_strrstr(rec->key, searchkey) != NULL)) &&
+			             strstr(rec->key, searchkey) != NULL)) &&
 			    (!full || rec->key[len] == '\0')) {
 				printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_BIND_LIST,
 					    rec->key, rec->info->id, rec->data == NULL ? "" : rec->data);

From 0d2997b36f76798472d717ffb1fdee95b3561507 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:29:50 +0200
Subject: [PATCH 1132/1650] make clang-format happy in keyboard.c

---
 src/fe-common/core/keyboard.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index fa8ca076..e0e061dd 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -770,9 +770,8 @@ static void cmd_show_keys(const char *searchkey, int full)
 		for (key = rec->keys; key != NULL; key = key->next) {
 			KEY_REC *rec = key->data;
 
-			if ((len == 0 ||
-			     (full ? strncmp(rec->key, searchkey, len) == 0 :
-			             strstr(rec->key, searchkey) != NULL)) &&
+			if ((len == 0 || (full ? strncmp(rec->key, searchkey, len) == 0 :
+			                         strstr(rec->key, searchkey) != NULL)) &&
 			    (!full || rec->key[len] == '\0')) {
 				printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_BIND_LIST,
 					    rec->key, rec->info->id, rec->data == NULL ? "" : rec->data);

From 108f57ac7bc31bf0139dbdbbc0125c554d852bb7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 4 Jul 2020 12:15:25 +0200
Subject: [PATCH 1133/1650] fix extended bg colours

---
 src/fe-text/textbuffer-view.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 0bbb3655..bc7cc5a8 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -189,30 +189,32 @@ static inline void unformat(const unsigned char **ptr, int *color, unsigned int
 		break;
 	case FORMAT_STYLE_CLRTOEOL:
 		break;
+#define SET_COLOR_EXT_FG_BITS(base, pc)                                                            \
+	*color &= ~ATTR_FGCOLOR24;                                                                 \
+	*color = (*color & BGATTR) | (base + *pc - FORMAT_COLOR_NOCHANGE)
+#define SET_COLOR_EXT_BG_BITS(base, pc)                                                            \
+	*color &= ~ATTR_BGCOLOR24;                                                                 \
+	*color = (*color & FGATTR) | ((base + *pc - FORMAT_COLOR_NOCHANGE) << BG_SHIFT)
 	case FORMAT_COLOR_EXT1:
-		*color &= ~ATTR_FGCOLOR24;
-		*color = (*color & BGATTR) | (0x10 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		SET_COLOR_EXT_FG_BITS(0x10, ++*ptr);
 		break;
 	case FORMAT_COLOR_EXT1_BG:
-		*color &= ~ATTR_BGCOLOR24;
-		*color = (*color & FGATTR) | (0x10 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		SET_COLOR_EXT_BG_BITS(0x10, ++*ptr);
 		break;
 	case FORMAT_COLOR_EXT2:
-		*color &= ~ATTR_FGCOLOR24;
-		*color = (*color & BGATTR) | (0x60 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		SET_COLOR_EXT_FG_BITS(0x60, ++*ptr);
 		break;
 	case FORMAT_COLOR_EXT2_BG:
-		*color &= ~ATTR_BGCOLOR24;
-		*color = (*color & FGATTR) | (0x60 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		SET_COLOR_EXT_BG_BITS(0x60, ++*ptr);
 		break;
 	case FORMAT_COLOR_EXT3:
-		*color &= ~ATTR_FGCOLOR24;
-		*color = (*color & BGATTR) | (0xb0 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		SET_COLOR_EXT_FG_BITS(0xb0, ++*ptr);
 		break;
 	case FORMAT_COLOR_EXT3_BG:
-		*color &= ~ATTR_BGCOLOR24;
-		*color = (*color & FGATTR) | (0xb0 + *++*ptr - FORMAT_COLOR_NOCHANGE);
+		SET_COLOR_EXT_BG_BITS(0xb0, ++*ptr);
 		break;
+#undef SET_COLOR_EXT_BG_BITS
+#undef SET_COLOR_EXT_FG_BITS
 #ifdef TERM_TRUECOLOR
 	case FORMAT_COLOR_24:
 		unformat_24bit_line_color(ptr, 1, color, fg24, bg24);

From 0cc1e4b7cd4eb8881f58d03a5ab5d321f4ae12e8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 4 Jul 2020 18:19:37 +0200
Subject: [PATCH 1134/1650] properly restore the saved text dest

---
 docs/signals.txt                 |  4 +--
 src/common.h                     |  2 +-
 src/fe-common/core/printtext.c   |  2 +-
 src/fe-text/gui-printtext.c      |  5 ++--
 src/fe-text/textbuffer-formats.c | 44 ++++++++++++++++++++------------
 src/fe-text/textbuffer-formats.h |  1 +
 6 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index ff600cd3..1eefc7e0 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -246,7 +246,7 @@ FE common
  "gui print text", WINDOW_REC, int fg, int bg, int flags, char *text, TEXT_DEST_REC
 
 (Can be used to determine when all "gui print text"s are sent (not required))
- "gui print text finished", WINDOW_REC
+ "gui print text finished", WINDOW_REC, TEXT_DEST_REC
 
 * Provides signals:
 
@@ -353,7 +353,7 @@ gui-readline.c:
 
 gui-printtext.c:
  "beep"
- "gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line
+ "gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line, TEXT_DEST_REC
 
 textbuffer-view.c
  "gui textbuffer line removed", TEXTBUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line
diff --git a/src/common.h b/src/common.h
index c9c4e545..73de4b78 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 29
+#define IRSSI_ABI_VERSION 30
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 06c22a4c..6869fba3 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -442,7 +442,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text)
 	format_send_to_gui(dest, str);
 	g_free(str);
 
-	signal_emit_id(signal_gui_print_text_finished, 1, dest->window);
+	signal_emit_id(signal_gui_print_text_finished, 2, dest->window, dest);
 }
 
 static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC *dest,
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 872c73c4..a92c6f3b 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -158,7 +158,8 @@ void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *s
 	gui->insert_after_time = time;
 	format_send_to_gui(dest, str);
 	gui->use_insert_after = FALSE;
-	signal_emit("gui print text after finished", 3, dest->window, gui->insert_after, prev);
+	signal_emit("gui print text after finished", 4, dest->window, gui->insert_after, prev,
+	            dest);
 }
 
 void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str)
@@ -376,7 +377,7 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
                 gui->insert_after = insert_after;
 }
 
-static void sig_gui_printtext_finished(WINDOW_REC *window)
+static void sig_gui_printtext_finished(WINDOW_REC *window, TEXT_DEST_REC *dest)
 {
 	TEXT_BUFFER_VIEW_REC *view;
 	LINE_REC *insert_after;
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 47f1735a..84aaebb9 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -42,6 +42,7 @@ void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec)
 	i_refstr_release(rec->server_tag);
 	i_refstr_release(rec->target);
 	i_refstr_release(rec->nick);
+	i_refstr_release(rec->address);
 	if (rec->nargs >= 1) {
 		i_refstr_release(rec->args[0]);
 	}
@@ -54,17 +55,13 @@ void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec)
 	g_slice_free(TEXT_BUFFER_FORMAT_REC, rec);
 }
 
-static TEXT_BUFFER_FORMAT_REC *format_rec_new(const char *module, const char *format_tag,
-                                              const char *server_tag, const char *target,
-                                              const char *nick, int nargs, const char **args)
+static TEXT_BUFFER_FORMAT_REC *format_rec_new(const char *module, const char *format_tag, int nargs,
+                                              const char **args)
 {
 	int n;
 	TEXT_BUFFER_FORMAT_REC *ret = g_slice_new0(TEXT_BUFFER_FORMAT_REC);
 	ret->module = i_refstr_intern(module);
 	ret->format = i_refstr_intern(format_tag);
-	ret->server_tag = i_refstr_intern(server_tag);
-	ret->target = i_refstr_intern(target);
-	ret->nick = i_refstr_intern(nick);
 	ret->nargs = nargs;
 	ret->args = g_new0(char *, nargs);
 	if (nargs >= 1) {
@@ -76,6 +73,19 @@ static TEXT_BUFFER_FORMAT_REC *format_rec_new(const char *module, const char *fo
 	return ret;
 }
 
+static void format_rec_set_dest(TEXT_BUFFER_FORMAT_REC *rec, const TEXT_DEST_REC *dest)
+{
+	i_refstr_release(rec->server_tag);
+	i_refstr_release(rec->target);
+	i_refstr_release(rec->nick);
+	i_refstr_release(rec->address);
+	rec->server_tag = i_refstr_intern(dest->server_tag);
+	rec->target = i_refstr_intern(dest->target);
+	rec->nick = i_refstr_intern(dest->nick);
+	rec->address = i_refstr_intern(dest->address);
+	rec->flags = dest->flags & ~PRINT_FLAG_FORMAT;
+}
+
 static LINE_INFO_REC *store_lineinfo_tmp(TEXT_DEST_REC *dest)
 {
 	GUI_WINDOW_REC *gui;
@@ -132,11 +142,10 @@ static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC
 	formatnum = GPOINTER_TO_INT(formatnump);
 	formats = g_hash_table_lookup(default_formats, module);
 
-	info->format = format_rec_new(module, formats[formatnum].tag, dest->server_tag,
-	                              dest->target, dest->nick, formats[formatnum].params, args);
+	info->format =
+	    format_rec_new(module, formats[formatnum].tag, formats[formatnum].params, args);
 	special_push_collector(&info->format->expando_cache);
 
-	info->format->flags = dest->flags;
 	dest->flags |= PRINT_FLAG_FORMAT;
 
 	signal_continue(5, theme, module, dest, formatnump, args);
@@ -155,11 +164,9 @@ static void sig_print_noformat(TEXT_DEST_REC *dest, const char *text)
 	special_push_collector(NULL);
 	info = store_lineinfo_tmp(dest);
 
-	info->format = format_rec_new(NULL, NULL, dest->server_tag, dest->target, dest->nick, 2,
-	                              (const char *[]){ NULL, text });
+	info->format = format_rec_new(NULL, NULL, 2, (const char *[]){ NULL, text });
 	special_push_collector(&info->format->expando_cache);
 
-	info->format->flags = dest->flags;
 	dest->flags |= PRINT_FLAG_FORMAT;
 
 	signal_continue(2, dest, text);
@@ -182,7 +189,7 @@ static GSList *reverse_collector(GSList *a1)
 	return c1;
 }
 
-static void sig_gui_print_text_finished(WINDOW_REC *window)
+static void sig_gui_print_text_finished(WINDOW_REC *window, TEXT_DEST_REC *dest)
 {
 	GUI_WINDOW_REC *gui;
 	LINE_REC *insert_after;
@@ -202,6 +209,7 @@ static void sig_gui_print_text_finished(WINDOW_REC *window)
 		return;
 
 	info->format->expando_cache = reverse_collector(info->format->expando_cache);
+	format_rec_set_dest(info->format, dest);
 
 	info->level |= MSGLEVEL_FORMAT;
 
@@ -290,12 +298,16 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 
 		curr = line;
 		line = NULL;
-		format_rec = curr->info.format;
 
-		format_create_dest(
+		format_rec = curr->info.format;
+		format_create_dest_tag(
 		    &dest,
 		    format_rec->server_tag != NULL ? server_find_tag(format_rec->server_tag) : NULL,
-		    format_rec->target, curr->info.level & ~MSGLEVEL_FORMAT, buffer->window);
+		    format_rec->server_tag, format_rec->target, curr->info.level & ~MSGLEVEL_FORMAT,
+		    buffer->window);
+		dest.nick = format_rec->nick;
+		dest.address = format_rec->address;
+		dest.flags = format_rec->flags;
 
 		theme = window_get_theme(dest.window);
 
diff --git a/src/fe-text/textbuffer-formats.h b/src/fe-text/textbuffer-formats.h
index 45e4ce1b..b57f61c9 100644
--- a/src/fe-text/textbuffer-formats.h
+++ b/src/fe-text/textbuffer-formats.h
@@ -9,6 +9,7 @@ typedef struct _TEXT_BUFFER_FORMAT_REC {
 	char *server_tag;
 	char *target;
 	char *nick;
+	char *address;
 	char **args;
 	int nargs;
 	GSList *expando_cache;

From 6012ec9e56a8b3c41193652c58285699733cbf59 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Sun, 5 Jul 2020 15:31:07 -0600
Subject: [PATCH 1135/1650] Prevent double calls of perl_script_unload

---
 src/perl/perl-core.c    | 28 ++++++++++++++++++++++++----
 src/perl/perl-core.h    |  7 +++++++
 src/perl/perl-fe.c      |  2 +-
 src/perl/perl-signals.c |  4 ++++
 src/perl/perl-sources.c |  5 +++++
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 866b86e8..295715d3 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -67,9 +67,6 @@ static void perl_script_destroy(PERL_SCRIPT_REC *script)
 {
 	perl_scripts = g_slist_remove(perl_scripts, script);
 
-	perl_signal_remove_script(script);
-	perl_source_remove_script(script);
-
 	signal_emit("script destroyed", 1, script);
 
 	g_free(script->name);
@@ -314,7 +311,30 @@ void perl_script_unload(PERL_SCRIPT_REC *script)
         g_return_if_fail(script != NULL);
 
 	perl_script_destroy_package(script);
-        perl_script_destroy(script);
+
+	perl_signal_remove_script(script);
+	perl_source_remove_script(script);
+
+	script->unloaded = 1;
+	if (!script->active_signals)
+	        perl_script_destroy(script);
+}
+
+/* Enter a perl script (signal or input source) */
+void perl_script_enter(PERL_SCRIPT_REC *script)
+{
+	g_return_if_fail(script != NULL);
+
+	script->active_signals++;
+}
+
+void perl_script_exit(PERL_SCRIPT_REC *script)
+{
+	g_return_if_fail(script != NULL);
+
+	script->active_signals--;
+	if (script->unloaded)
+		perl_script_destroy(script);
 }
 
 /* Find loaded script by name */
diff --git a/src/perl/perl-core.h b/src/perl/perl-core.h
index 0d3a1a2f..5b2de9ac 100644
--- a/src/perl/perl-core.h
+++ b/src/perl/perl-core.h
@@ -8,6 +8,8 @@ typedef struct {
         /* Script can be loaded from a file, or from some data in memory */
 	char *path; /* FILE: full path for file */
 	char *data; /* DATA: data used for the script */
+	int unloaded; /* Indicates unloading has been done, so it should be destroyed once all signals exit */
+	int active_signals; /* active signal calls into this script - prevents full teardown when nonzero */
 } PERL_SCRIPT_REC;
 
 extern GSList *perl_scripts;
@@ -26,6 +28,11 @@ PERL_SCRIPT_REC *perl_script_load_data(const char *data);
 /* Unload perl script */
 void perl_script_unload(PERL_SCRIPT_REC *script);
 
+/* Mark a script as entered */
+void perl_script_enter(PERL_SCRIPT_REC *script);
+/* Mark a script as exited */
+void perl_script_exit(PERL_SCRIPT_REC *script);
+
 /* Find loaded script by name */
 PERL_SCRIPT_REC *perl_script_find(const char *name);
 /* Find loaded script by package */
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index ac84d67a..ba6dccce 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -106,7 +106,7 @@ static void cmd_script_unload(const char *data)
 
         script_fix_name(name);
 	script = perl_script_find(name);
-	if (script == NULL) {
+	if (script == NULL || script->unloaded) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
                             TXT_SCRIPT_NOT_LOADED, name);
 	} else {
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 27522f5e..5ea40d73 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -420,7 +420,10 @@ static void sig_func(const void *p1, const void *p2,
 	args[3] = p4; args[4] = p5; args[5] = p6;
 
 	rec = signal_get_user_data();
+	if (rec->script->unloaded) return; /* Drop signal calls into unloaded scripts. */
+	perl_script_enter(rec->script);
 	perl_call_signal(rec->script, rec->func, signal_get_emitted_id(), args);
+	perl_script_exit(rec->script);
 }
 
 static void perl_signal_add_full_int(const char *signal, SV *func,
@@ -437,6 +440,7 @@ static void perl_signal_add_full_int(const char *signal, SV *func,
 
         script = perl_script_find_package(perl_get_package());
         g_return_if_fail(script != NULL);
+	g_return_if_fail(script->unloaded);
 
 	rec = g_new(PERL_SIGNAL_REC, 1);
         rec->script = script;
diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c
index 3c72be22..57fb579d 100644
--- a/src/perl/perl-sources.c
+++ b/src/perl/perl-sources.c
@@ -78,6 +78,7 @@ static int perl_source_event(PERL_SOURCE_REC *rec)
 	PUTBACK;
 
         perl_source_ref(rec);
+	perl_script_enter(rec->script);
 	perl_call_sv(rec->func, G_EVAL|G_DISCARD);
 
 	if (SvTRUE(ERRSV)) {
@@ -86,6 +87,8 @@ static int perl_source_event(PERL_SOURCE_REC *rec)
                 g_free(error);
 	}
 
+	perl_script_exit(rec->script);
+
 	if (perl_source_unref(rec) && rec->once)
 		perl_source_destroy(rec);
 
@@ -104,6 +107,7 @@ int perl_timeout_add(int msecs, SV *func, SV *data, int once)
         pkg = perl_get_package();
 	script = perl_script_find_package(pkg);
         g_return_val_if_fail(script != NULL, -1);
+	g_return_val_if_fail(script->unloaded, -1);
 
 	rec = g_new0(PERL_SOURCE_REC, 1);
 	perl_source_ref(rec);
@@ -127,6 +131,7 @@ int perl_input_add(int source, int condition, SV *func, SV *data, int once)
         pkg = perl_get_package();
 	script = perl_script_find_package(pkg);
         g_return_val_if_fail(script != NULL, -1);
+	g_return_val_if_fail(script->unloaded, -1);
 
 	rec = g_new0(PERL_SOURCE_REC, 1);
 	perl_source_ref(rec);

From 7daeaa25b68b542326bc1226aa937e235c75c102 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Sun, 5 Jul 2020 15:46:34 -0600
Subject: [PATCH 1136/1650] Fix wrong way on unloaded checks

---
 src/perl/perl-signals.c | 2 +-
 src/perl/perl-sources.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 5ea40d73..792b1746 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -440,7 +440,7 @@ static void perl_signal_add_full_int(const char *signal, SV *func,
 
         script = perl_script_find_package(perl_get_package());
         g_return_if_fail(script != NULL);
-	g_return_if_fail(script->unloaded);
+	g_return_if_fail(!script->unloaded);
 
 	rec = g_new(PERL_SIGNAL_REC, 1);
         rec->script = script;
diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c
index 57fb579d..16260007 100644
--- a/src/perl/perl-sources.c
+++ b/src/perl/perl-sources.c
@@ -107,7 +107,7 @@ int perl_timeout_add(int msecs, SV *func, SV *data, int once)
         pkg = perl_get_package();
 	script = perl_script_find_package(pkg);
         g_return_val_if_fail(script != NULL, -1);
-	g_return_val_if_fail(script->unloaded, -1);
+	g_return_val_if_fail(!script->unloaded, -1);
 
 	rec = g_new0(PERL_SOURCE_REC, 1);
 	perl_source_ref(rec);
@@ -131,7 +131,7 @@ int perl_input_add(int source, int condition, SV *func, SV *data, int once)
         pkg = perl_get_package();
 	script = perl_script_find_package(pkg);
         g_return_val_if_fail(script != NULL, -1);
-	g_return_val_if_fail(script->unloaded, -1);
+	g_return_val_if_fail(!script->unloaded, -1);
 
 	rec = g_new0(PERL_SOURCE_REC, 1);
 	perl_source_ref(rec);

From 2d59df8162cd33220c7241528e66f511d1f9385c Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Sun, 5 Jul 2020 16:09:19 -0600
Subject: [PATCH 1137/1650] Don't try to use the PERL_SIGNAL_REC after it could
 be freed

---
 src/perl/perl-signals.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 792b1746..43c992fe 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -414,16 +414,18 @@ static void sig_func(const void *p1, const void *p2,
 		     const void *p5, const void *p6)
 {
 	PERL_SIGNAL_REC *rec;
+	PERL_SCRIPT_REC *script;
 	const void *args[SIGNAL_MAX_ARGUMENTS];
 
 	args[0] = p1; args[1] = p2; args[2] = p3;
 	args[3] = p4; args[4] = p5; args[5] = p6;
 
 	rec = signal_get_user_data();
+	script = rec->script;
 	if (rec->script->unloaded) return; /* Drop signal calls into unloaded scripts. */
-	perl_script_enter(rec->script);
-	perl_call_signal(rec->script, rec->func, signal_get_emitted_id(), args);
-	perl_script_exit(rec->script);
+	perl_script_enter(script);
+	perl_call_signal(script, rec->func, signal_get_emitted_id(), args);
+	perl_script_exit(script);
 }
 
 static void perl_signal_add_full_int(const char *signal, SV *func,

From 26f3049a86288ab37f1adcce2e25fc44a64d666b Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Sun, 5 Jul 2020 17:20:08 -0600
Subject: [PATCH 1138/1650] Refactor to pure refcount for PERL_SCRIPT_REC

---
 src/perl/perl-core.c    | 25 ++++++++++++++++---------
 src/perl/perl-core.h    |  7 +++----
 src/perl/perl-fe.c      |  2 +-
 src/perl/perl-signals.c |  6 ++----
 src/perl/perl-sources.c |  6 ++----
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 295715d3..6fd73322 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -65,7 +65,6 @@ static void perl_script_destroy_package(PERL_SCRIPT_REC *script)
 
 static void perl_script_destroy(PERL_SCRIPT_REC *script)
 {
-	perl_scripts = g_slist_remove(perl_scripts, script);
 
 	signal_emit("script destroyed", 1, script);
 
@@ -274,6 +273,7 @@ static PERL_SCRIPT_REC *script_load(char *name, const char *path,
 	script->package = g_strdup_printf("Irssi::Script::%s", name);
 	script->path = g_strdup(path);
         script->data = g_strdup(data);
+	script->refcount = 1;
 
 	perl_scripts = g_slist_append(perl_scripts, script);
 	signal_emit("script created", 1, script);
@@ -308,6 +308,7 @@ PERL_SCRIPT_REC *perl_script_load_data(const char *data)
 /* Unload perl script */
 void perl_script_unload(PERL_SCRIPT_REC *script)
 {
+	GSList* link;
         g_return_if_fail(script != NULL);
 
 	perl_script_destroy_package(script);
@@ -315,25 +316,31 @@ void perl_script_unload(PERL_SCRIPT_REC *script)
 	perl_signal_remove_script(script);
 	perl_source_remove_script(script);
 
-	script->unloaded = 1;
-	if (!script->active_signals)
-	        perl_script_destroy(script);
+	link = g_slist_find(perl_scripts, script);
+	if (link != NULL) {
+		perl_scripts = g_slist_remove_link(perl_scripts, link);
+		g_slist_free(link);
+		perl_script_unref(script);
+	}
+
+/*	perl_scripts = g_slist_remove(perl_scripts, script);
+	perl_script_unref(script);*/
 }
 
 /* Enter a perl script (signal or input source) */
-void perl_script_enter(PERL_SCRIPT_REC *script)
+void perl_script_ref(PERL_SCRIPT_REC *script)
 {
 	g_return_if_fail(script != NULL);
 
-	script->active_signals++;
+	script->refcount++;
 }
 
-void perl_script_exit(PERL_SCRIPT_REC *script)
+void perl_script_unref(PERL_SCRIPT_REC *script)
 {
 	g_return_if_fail(script != NULL);
 
-	script->active_signals--;
-	if (script->unloaded)
+	script->refcount--;
+	if (!script->refcount)
 		perl_script_destroy(script);
 }
 
diff --git a/src/perl/perl-core.h b/src/perl/perl-core.h
index 5b2de9ac..6ea637ae 100644
--- a/src/perl/perl-core.h
+++ b/src/perl/perl-core.h
@@ -8,8 +8,7 @@ typedef struct {
         /* Script can be loaded from a file, or from some data in memory */
 	char *path; /* FILE: full path for file */
 	char *data; /* DATA: data used for the script */
-	int unloaded; /* Indicates unloading has been done, so it should be destroyed once all signals exit */
-	int active_signals; /* active signal calls into this script - prevents full teardown when nonzero */
+	int refcount; /* 0 = destroy */
 } PERL_SCRIPT_REC;
 
 extern GSList *perl_scripts;
@@ -29,9 +28,9 @@ PERL_SCRIPT_REC *perl_script_load_data(const char *data);
 void perl_script_unload(PERL_SCRIPT_REC *script);
 
 /* Mark a script as entered */
-void perl_script_enter(PERL_SCRIPT_REC *script);
+void perl_script_ref(PERL_SCRIPT_REC *script);
 /* Mark a script as exited */
-void perl_script_exit(PERL_SCRIPT_REC *script);
+void perl_script_unref(PERL_SCRIPT_REC *script);
 
 /* Find loaded script by name */
 PERL_SCRIPT_REC *perl_script_find(const char *name);
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index ba6dccce..ac84d67a 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -106,7 +106,7 @@ static void cmd_script_unload(const char *data)
 
         script_fix_name(name);
 	script = perl_script_find(name);
-	if (script == NULL || script->unloaded) {
+	if (script == NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
                             TXT_SCRIPT_NOT_LOADED, name);
 	} else {
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 43c992fe..f5f9d6e2 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -422,10 +422,9 @@ static void sig_func(const void *p1, const void *p2,
 
 	rec = signal_get_user_data();
 	script = rec->script;
-	if (rec->script->unloaded) return; /* Drop signal calls into unloaded scripts. */
-	perl_script_enter(script);
+	perl_script_ref(script);
 	perl_call_signal(script, rec->func, signal_get_emitted_id(), args);
-	perl_script_exit(script);
+	perl_script_unref(script);
 }
 
 static void perl_signal_add_full_int(const char *signal, SV *func,
@@ -442,7 +441,6 @@ static void perl_signal_add_full_int(const char *signal, SV *func,
 
         script = perl_script_find_package(perl_get_package());
         g_return_if_fail(script != NULL);
-	g_return_if_fail(!script->unloaded);
 
 	rec = g_new(PERL_SIGNAL_REC, 1);
         rec->script = script;
diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c
index 16260007..69d86f1f 100644
--- a/src/perl/perl-sources.c
+++ b/src/perl/perl-sources.c
@@ -78,7 +78,7 @@ static int perl_source_event(PERL_SOURCE_REC *rec)
 	PUTBACK;
 
         perl_source_ref(rec);
-	perl_script_enter(rec->script);
+	perl_script_ref(rec->script);
 	perl_call_sv(rec->func, G_EVAL|G_DISCARD);
 
 	if (SvTRUE(ERRSV)) {
@@ -87,7 +87,7 @@ static int perl_source_event(PERL_SOURCE_REC *rec)
                 g_free(error);
 	}
 
-	perl_script_exit(rec->script);
+	perl_script_unref(rec->script);
 
 	if (perl_source_unref(rec) && rec->once)
 		perl_source_destroy(rec);
@@ -107,7 +107,6 @@ int perl_timeout_add(int msecs, SV *func, SV *data, int once)
         pkg = perl_get_package();
 	script = perl_script_find_package(pkg);
         g_return_val_if_fail(script != NULL, -1);
-	g_return_val_if_fail(!script->unloaded, -1);
 
 	rec = g_new0(PERL_SOURCE_REC, 1);
 	perl_source_ref(rec);
@@ -131,7 +130,6 @@ int perl_input_add(int source, int condition, SV *func, SV *data, int once)
         pkg = perl_get_package();
 	script = perl_script_find_package(pkg);
         g_return_val_if_fail(script != NULL, -1);
-	g_return_val_if_fail(!script->unloaded, -1);
 
 	rec = g_new0(PERL_SOURCE_REC, 1);
 	perl_source_ref(rec);

From 9593be14f5fb93be937a5c67426402757b528909 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 6 Jul 2020 12:22:16 +0200
Subject: [PATCH 1139/1650] print to active window when -window is specified

---
 src/fe-common/core/fe-core-commands.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index c9ca93ce..78c136dc 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -163,8 +163,10 @@ static void cmd_cat(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	buf = g_string_sized_new(512);
 	while (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) {
 		buf->str[tpos] = '\0';
-		printtext(target ? server : NULL, target && item != NULL ? item->name : NULL, MSGLEVEL_CLIENTCRAP |
-			  MSGLEVEL_NEVER, "%s", buf->str);
+		if (target)
+			printtext_window(active_win, MSGLEVEL_CLIENTCRAP | MSGLEVEL_NEVER, "%s", buf->str);
+		else
+			printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP | MSGLEVEL_NEVER, "%s", buf->str);
 	}
 	g_string_free(buf, TRUE);
 	cmd_params_free(free_arg);

From 357beb91f547051f1c3161df9081f632fcb2acd4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 7 Jul 2020 09:28:41 +0200
Subject: [PATCH 1140/1650] make clang-format happy

---
 src/fe-common/core/fe-core-commands.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 78c136dc..c314c405 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -164,7 +164,8 @@ static void cmd_cat(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	while (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) {
 		buf->str[tpos] = '\0';
 		if (target)
-			printtext_window(active_win, MSGLEVEL_CLIENTCRAP | MSGLEVEL_NEVER, "%s", buf->str);
+			printtext_window(active_win, MSGLEVEL_CLIENTCRAP | MSGLEVEL_NEVER, "%s",
+			                 buf->str);
 		else
 			printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP | MSGLEVEL_NEVER, "%s", buf->str);
 	}

From cc759e11790cdedf8b27646fcb140a7db6327a10 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Fri, 10 Jul 2020 18:27:54 -0600
Subject: [PATCH 1141/1650] Clean up commented out stuff and fix merge issues

---
 src/common.h         | 2 +-
 src/perl/perl-core.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/common.h b/src/common.h
index c9c4e545..73de4b78 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 29
+#define IRSSI_ABI_VERSION 30
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 6fd73322..24f0218c 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -308,8 +308,8 @@ PERL_SCRIPT_REC *perl_script_load_data(const char *data)
 /* Unload perl script */
 void perl_script_unload(PERL_SCRIPT_REC *script)
 {
-	GSList* link;
-        g_return_if_fail(script != NULL);
+	GSList *link;
+	g_return_if_fail(script != NULL);
 
 	perl_script_destroy_package(script);
 
@@ -322,9 +322,6 @@ void perl_script_unload(PERL_SCRIPT_REC *script)
 		g_slist_free(link);
 		perl_script_unref(script);
 	}
-
-/*	perl_scripts = g_slist_remove(perl_scripts, script);
-	perl_script_unref(script);*/
 }
 
 /* Enter a perl script (signal or input source) */

From af5987827c7c2b17f44122c46bf8718b805bf1b4 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Fri, 10 Jul 2020 18:31:47 -0600
Subject: [PATCH 1142/1650] ABI version again

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 73de4b78..0b429d45 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 30
+#define IRSSI_ABI_VERSION 31
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From ad30d568d6b1342f08b24aac1b3236958e402441 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 13 Jul 2020 13:25:18 +0200
Subject: [PATCH 1143/1650] do not use localtime result after other functions

---
 src/fe-common/core/fe-windows.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 88fc0711..d575813d 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -679,10 +679,11 @@ static void sig_server_disconnected(SERVER_REC *server)
 	}
 }
 
-static void window_print_daychange(WINDOW_REC *window, struct tm *tm)
+static void window_print_daychange(WINDOW_REC *window, time_t t)
 {
         THEME_REC *theme;
         TEXT_DEST_REC dest;
+	struct tm *tm;
 	char *format, str[256];
 	int ret;
 
@@ -690,6 +691,7 @@ static void window_print_daychange(WINDOW_REC *window, struct tm *tm)
 	format_create_dest(&dest, NULL, NULL, MSGLEVEL_NEVER, window);
 	format = format_get_text_theme(theme, MODULE_NAME, &dest,
 				       TXT_DAYCHANGE);
+	tm = localtime(&t);
 	ret = strftime(str, sizeof(str), format, tm);
 	g_free(format);
 	if (ret <= 0) return;
@@ -770,7 +772,7 @@ static void sig_print_text(void)
 
 	/* day changed, print notice about it to every window */
 	for (tmp = windows; tmp != NULL; tmp = tmp->next)
-		window_print_daychange(tmp->data, tm);
+		window_print_daychange(tmp->data, t);
 }
 
 static int sig_check_daychange(void)

From 4e9dab4aeb5435368627f644beddf5e9d25e1082 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@devio.us>
Date: Thu, 23 Jul 2020 00:42:54 +0200
Subject: [PATCH 1144/1650] fix crash when server got disconnected/reconnected
 before it was properly connected

---
 src/fe-common/core/chat-completion.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 144ed0f4..fb052f7f 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -1195,6 +1195,9 @@ static void sig_server_disconnected(SERVER_REC *server)
 	g_return_if_fail(server != NULL);
 
         mserver = MODULE_DATA(server);
+	if (mserver == NULL)
+		return;
+
 	while (mserver->lastmsgs)
                 last_msg_destroy(&mserver->lastmsgs, mserver->lastmsgs->data);
 }

From 468d8b0c78b371466c092c54308013cdda3bf8f5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@devio.us>
Date: Thu, 23 Jul 2020 00:18:22 +0200
Subject: [PATCH 1145/1650] fix missing wrapping of line in signals

---
 src/perl/perl-common.h    |  2 ++
 src/perl/perl-signals.c   | 47 +++++++++++++++++++++++++++++++++++----
 src/perl/perl-signals.h   |  2 ++
 src/perl/textui/TextUI.xs | 14 +++++++++++-
 4 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/perl/perl-common.h b/src/perl/perl-common.h
index 88adaa7e..1b802c6d 100644
--- a/src/perl/perl-common.h
+++ b/src/perl/perl-common.h
@@ -13,6 +13,8 @@
 
 typedef void (*PERL_OBJECT_FUNC) (HV *hv, void *object);
 
+typedef SV *(*PERL_BLESS_FUNC)(void *object, void *arg1, void *arg2, void *arg3);
+
 typedef struct {
 	char *name;
         PERL_OBJECT_FUNC fill_func;
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index f5f9d6e2..9dd73cdb 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -46,10 +46,16 @@ typedef struct {
 
 #include "perl-signals-list.h"
 
-static GHashTable *signals;
+static GHashTable *signals, *signal_stashes;
 static GHashTable *perl_signal_args_hash;
 static GSList *perl_signal_args_partial;
 
+void irssi_add_signal_arg_conv(const char *stash, PERL_BLESS_FUNC func)
+{
+	if (g_hash_table_lookup(signal_stashes, stash) == NULL)
+		g_hash_table_insert(signal_stashes, g_strdup(stash), func);
+}
+
 static PERL_SIGNAL_ARGS_REC *perl_signal_args_find(int signal_id)
 {
 	PERL_SIGNAL_ARGS_REC *rec;
@@ -348,8 +354,36 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 			   int type; as it's first variable (dcc) */
 			perlarg = simple_iobject_bless((SERVER_REC *) arg);
 		} else {
-			/* blessed object */
-			perlarg = plain_bless(arg, rec->args[n]);
+			PERL_BLESS_FUNC bless_func;
+
+			bless_func = g_hash_table_lookup(signal_stashes, rec->args[n]);
+			if (bless_func != NULL) {
+				void *a1 = NULL;
+				void *a2 = NULL;
+				void *a3 = NULL;
+				if (g_strcmp0(rec->args[n], "Irssi::TextUI::Line") == 0) {
+					/* need to find the corresponding buffer */
+					int j;
+
+					for (j = n - 1; j >= 0; j--) {
+						if (g_strcmp0(rec->args[j],
+						              "Irssi::TextUI::TextBufferView") ==
+						    0) {
+							a1 = (void *) args[j];
+							break;
+						} else if (g_strcmp0(rec->args[j],
+						                     "Irssi::UI::Window") == 0) {
+							a2 = (void *) args[j];
+							break;
+						}
+					}
+				}
+
+				perlarg = bless_func(rec->args[n], a1, a2, a3);
+			} else {
+				/* blessed object */
+				perlarg = plain_bless(arg, rec->args[n]);
+			}
 		}
 		XPUSHs(sv_2mortal(perlarg));
 	}
@@ -628,6 +662,7 @@ void perl_signals_init(void)
 {
 	int n;
 
+	signal_stashes = g_hash_table_new((GHashFunc) g_str_hash, (GCompareFunc) g_str_equal);
 	perl_signal_args_hash = g_hash_table_new((GHashFunc) g_direct_hash,
 						 (GCompareFunc) g_direct_equal);
         perl_signal_args_partial = NULL;
@@ -662,5 +697,9 @@ void perl_signals_deinit(void)
 
 	g_hash_table_foreach(perl_signal_args_hash,
 			     (GHFunc) signal_args_hash_free, NULL);
-        g_hash_table_destroy(perl_signal_args_hash);
+	g_hash_table_destroy(perl_signal_args_hash);
+
+	g_hash_table_foreach(signal_stashes, (GHFunc) g_free, NULL);
+	g_hash_table_destroy(signal_stashes);
+	signal_stashes = NULL;
 }
diff --git a/src/perl/perl-signals.h b/src/perl/perl-signals.h
index cb636d3c..0110b5ae 100644
--- a/src/perl/perl-signals.h
+++ b/src/perl/perl-signals.h
@@ -24,6 +24,8 @@ void perl_command_unbind(const char *cmd, SV *func);
 void perl_command_runsub(const char *cmd, const char *data,
 			 SERVER_REC *server, WI_ITEM_REC *item);
 
+void irssi_add_signal_arg_conv(const char *stash, PERL_BLESS_FUNC func);
+
 void perl_signal_register(const char *signal, const char **args);
 
 void perl_signals_start(void);
diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index e87efb65..0ebcc7a6 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -85,6 +85,16 @@ static void perl_statusbar_item_fill_hash(HV *hv, SBAR_ITEM_REC *item)
 		(void) hv_store(hv, "window", 6, plain_bless(item->bar->parent_window->active, "Irssi::UI::Window"), 0);
 }
 
+static SV *perl_line_signal_arg_conv(LINE_REC *line, TEXT_BUFFER_VIEW_REC *view, WINDOW_REC *window)
+{
+	if (view != NULL)
+		return buffer_line_bless(view->buffer, line);
+	else if (window != NULL)
+		return buffer_line_bless(WINDOW_GUI(window)->view->buffer, line);
+	else
+		return &PL_sv_undef;
+}
+
 static PLAIN_OBJECT_INIT_REC textui_plains[] = {
 	{ "Irssi::TextUI::MainWindow", (PERL_OBJECT_FUNC) perl_main_window_fill_hash },
 	{ "Irssi::TextUI::TextBuffer", (PERL_OBJECT_FUNC) perl_text_buffer_fill_hash },
@@ -109,7 +119,9 @@ CODE:
 	initialized = TRUE;
 
         irssi_add_plains(textui_plains);
-        perl_statusbar_init();
+	irssi_add_signal_arg_conv("Irssi::TextUI::Line",
+	                          (PERL_BLESS_FUNC) perl_line_signal_arg_conv);
+	perl_statusbar_init();
 
 void
 deinit()

From ffe0c715542f58705ae35cd5589c03a741590f3c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@devio.us>
Date: Thu, 23 Jul 2020 00:53:24 +0200
Subject: [PATCH 1146/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 0b429d45..3036397b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 31
+#define IRSSI_ABI_VERSION 32
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From f4f2350d3c804b3c8cefcadd80066a529273bfc1 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 23 Jul 2020 12:05:19 +0200
Subject: [PATCH 1147/1650] update github actions/checkout to new branch

---
 .github/workflows/abicheck.yml    | 4 ++--
 .github/workflows/check.yml       | 2 +-
 .github/workflows/clangformat.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 48f39b25..992f2811 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -17,11 +17,11 @@ jobs:
           pip3 install wheel
           pip3 install meson
       - name: checkout merge ref
-        uses: actions/checkout@master
+        uses: actions/checkout@main
         with:
           path: merge.src
       - name: checkout base ref
-        uses: actions/checkout@master
+        uses: actions/checkout@main
         with:
           path: base.src
           ref: ${{ github.base_ref }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 17da255d..4558a244 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -4,7 +4,7 @@ jobs:
   install:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@main
     - name: install
       uses: irssi-import/actions-irssi/check-irssi@master
       with:
diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index 71f2ffed..070227bf 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -4,7 +4,7 @@ jobs:
   check-clang-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
       - name: fetch target ref
         run:
           |

From fcf2919348d61cac1df282e827fbd9c562fadb78 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 27 Jul 2020 16:14:44 +0200
Subject: [PATCH 1148/1650] Update help with HIDDEN level

---
 docs/help/in/levels.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/help/in/levels.in b/docs/help/in/levels.in
index 429dd7c0..99f3070a 100644
--- a/docs/help/in/levels.in
+++ b/docs/help/in/levels.in
@@ -32,6 +32,7 @@
 
         HILIGHT         The text is highlighted.
         NEVER           Never ignores or logs the message.
+        HIDDEN          Hides the message when window HIDELEVEL includes HIDDEN.
         NO_ACT          Doesn't trigger any activity in the statusbar.
         NOHILIGHT       The text is not highlighted.
 

From 556cb2523905e1537fc5197221d4d6e880450f32 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 27 Jul 2020 17:37:01 +0200
Subject: [PATCH 1149/1650] Update ignore.in

---
 docs/help/in/ignore.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index b0a547c1..00d64963 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -25,6 +25,8 @@
     The special level 'NO_ACT' can be used to ignore activity in the statusbar
     without actually ignoring the message; this behavior is somewhat special
     because it is allowed in addition to other ignores for the same target.
+    The special level 'HIDDEN' can be used to hide matching activity without
+    actually ignoring the message.
 
 %9Examples:%9
 
@@ -40,6 +42,7 @@
     /IGNORE *away* NICKS
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
+    /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS
     /IGNORE -regexp -pattern
 
 %9See also:%9 ACCEPT, SILENCE, UNIGNORE

From ec2f269e98115a1852ecffcfe83103f8adbf8cb3 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Tue, 28 Jul 2020 23:48:52 +0200
Subject: [PATCH 1150/1650] Update ignore.in

---
 docs/help/in/ignore.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 00d64963..cb2393d2 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -25,8 +25,8 @@
     The special level 'NO_ACT' can be used to ignore activity in the statusbar
     without actually ignoring the message; this behavior is somewhat special
     because it is allowed in addition to other ignores for the same target.
-    The special level 'HIDDEN' can be used to hide matching activity without
-    actually ignoring the message.
+    The special level 'HIDDEN' can be used to hide matching messages that can
+    later be revealed using /WINDOW HIDELEVEL -HIDDEN
 
 %9Examples:%9
 

From a88806640b6672635983ba143b0c161ec03922d4 Mon Sep 17 00:00:00 2001
From: Nutchanon Wetchasit <Nutchanon.Wetchasit@gmail.com>
Date: Tue, 8 Sep 2020 17:59:24 +0700
Subject: [PATCH 1151/1650] Make colorless.theme de-color vertical window
 borders

Fixes #1220.
---
 themes/colorless.theme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/colorless.theme b/themes/colorless.theme
index 1b26f628..e87e12f1 100644
--- a/themes/colorless.theme
+++ b/themes/colorless.theme
@@ -251,6 +251,7 @@ abstracts = {
   # default background for all statusbars. You can also give
   # the default foreground color for statusbar items.
   sb_background = "%8";
+  window_border = "%8";
 
   # default backround for "default" statusbar group
   #sb_default_bg = "%8";

From 447e56530944bd3f914a77476ef38b365f3617da Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 26 Sep 2020 16:40:18 +0200
Subject: [PATCH 1152/1650] Fix meson capsicum

Fixes #1223
---
 meson.build          | 2 +-
 src/core/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 22ed9ec7..cb3c3c0c 100644
--- a/meson.build
+++ b/meson.build
@@ -477,7 +477,7 @@ have_capsicum = false
 if want_capsicum
   if cc.has_function('cap_enter', dependencies : cc.find_library('c'))
     libnv = cc.find_library('nv', required : require_capsicum)
-    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create_found', dependencies : libnv)
+    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv)
     if nvlist_create_found
       dep += libnv
       have_capsicum = true
diff --git a/src/core/meson.build b/src/core/meson.build
index b22a16de..c0e9b90e 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -7,7 +7,7 @@ else
 endif
 
 if have_capsicum
-  core_capsicum_source = files('fe-capsicum.c')
+  core_capsicum_source = files('capsicum.c')
 else
   core_capsicum_source = []
 endif

From eb4174ee1eabbee37622e8eb827719a16007f11f Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Fri, 23 Oct 2020 21:49:09 +0200
Subject: [PATCH 1153/1650] Make hilight priority work

---
 src/fe-common/core/hilight-text.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 2fe6068b..22e46ffa 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -244,6 +244,8 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 	GSList *tmp;
 	CHANNEL_REC *chanrec;
 	NICK_REC *nickrec;
+	HILIGHT_REC *tmprec;
+	int priority = -1;
 
 	g_return_val_if_fail(str != NULL, NULL);
 
@@ -274,11 +276,14 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 			hilight_match_channel(rec, channel) &&
 			(rec->servertag == NULL ||
 			 (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
-			hilight_match_text(rec, str, match_beg, match_end))
-			return rec;
+			hilight_match_text(rec, str, match_beg, match_end) &&
+			rec->priority > priority) {
+				tmprec = rec;
+				priority = rec->priority;
+			}
 	}
 
-	return NULL;
+	return tmprec;
 }
 
 static char *hilight_get_act_color(HILIGHT_REC *rec)

From 4fb10322d1a4ba8617dd6f53eda5f5002158d659 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 26 Oct 2020 10:57:05 +0100
Subject: [PATCH 1154/1650] Optimize execution

---
 src/fe-common/core/hilight-text.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 22e46ffa..fc213533 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -272,12 +272,11 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 	for (tmp = hilights; tmp != NULL; tmp = tmp->next) {
 		HILIGHT_REC *rec = tmp->data;
 
-		if (!rec->nickmask && hilight_match_level(rec, level) &&
-			hilight_match_channel(rec, channel) &&
+		if (rec->priority > priority && !rec->nickmask &&
+			hilight_match_level(rec, level) && hilight_match_channel(rec, channel) &&
 			(rec->servertag == NULL ||
 			 (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
-			hilight_match_text(rec, str, match_beg, match_end) &&
-			rec->priority > priority) {
+			hilight_match_text(rec, str, match_beg, match_end)) {
 				tmprec = rec;
 				priority = rec->priority;
 			}

From 8f4f0be6d48b169f20389d73f3d7cd3259d6f5a9 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 26 Oct 2020 11:01:03 +0100
Subject: [PATCH 1155/1650] Add prio check to hilight_nick_cache also

---
 src/fe-common/core/hilight-text.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index fc213533..4e971d75 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -674,6 +674,7 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 	HILIGHT_REC *match;
 	char *nickmask;
 	int len, best_match;
+	int priority = -1;
 
 	if (nick->host == NULL)
 		return; /* don't check until host is known */
@@ -684,11 +685,12 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 	for (tmp = hilights; tmp != NULL; tmp = tmp->next) {
 		HILIGHT_REC *rec = tmp->data;
 
-		if (rec->nickmask &&
+		if (rec->priority > priority && rec->nickmask &&
 			hilight_match_channel(rec, channel->name) &&
 			match_wildcards(rec->text, nickmask)) {
 			len = strlen(rec->text);
 			if (best_match < len) {
+				priority = rec->priority;
 				best_match = len;
 				match = rec;
 			}

From 11b9cbdf3571b1db608fdc6ac83fe3669c3fcebe Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 26 Oct 2020 17:00:58 +0100
Subject: [PATCH 1156/1650] fix clang-format-xs option parser by using getopt

---
 .github/workflows/clangformat/clang-format-xs | 98 ++++++++++---------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/clangformat/clang-format-xs b/.github/workflows/clangformat/clang-format-xs
index c77b7305..dd93592e 100755
--- a/.github/workflows/clangformat/clang-format-xs
+++ b/.github/workflows/clangformat/clang-format-xs
@@ -9,58 +9,60 @@ CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
 options=()
 files=()
 lines=()
-no_options=0;inplace=0;xml=0;keep_offset=0;keep_length=0;keep=0;
+inplace=0;xml=0;
 filename=tmp.1.c
 offsets=
-karg=
 off_opts=()
-for arg in "$@"; do
-    if [[ $keep = 1 ]]; then
-	if [[ "$karg" = "-offset" ]]; then
-	    offsets="$offsets${offsets:+ }$arg"
-	    off_opts+=("$karg" "$arg")
-	elif [[ "$karg" = "-length" ]]; then
-	    offsets="$offsets:$arg"
-	    off_opts+=("$karg" "$arg")
-	elif [[ "$karg" = "-assume-filename" ]]; then
-	    filename="$arg"
-	    options+=("$karg" "$arg")
-	else
-	    options+=("$karg" "$arg")
-	fi
-	keep=0
-    elif [[ $no_options = 0 ]]; then
-	case "$arg" in
-	    -assume-filename=*)
-		filename="${arg#-assume-filename=}"
-		;;
-	    -lines=*)
-		lines+=("${arg#-lines=}")
-		;;
-	    *)
-		;;
-	esac
-	case "$arg" in
-	    --) no_options=1
-		;;
-	    -i) inplace=1
-		;;
-	    -output-replacements-xml)
-		xml=1
-		;;
-	    -offset|-length|-cursor|-assume-filename|-fallback-style|-style)
-		keep=1
-		karg="$arg"
-		;;
-	    -*) options+=("$arg")
-		;;
-	    *) files+=("$arg")
-	       ;;
-	esac
-    else
-	files+=("$arg")
-    fi
+opts=$(getopt -n clang-format-xs -s bash -a -o in -l Werror,assume-filename:,cursor:,dry-run,dump-config,fallback-style:,ferror-limit:,help,length:,lines:,offset:,output-replacement-xmls,sort-includes,style:,verbose,version -- "$@")
+if [ $? -ne 0 ]; then exit 1; fi
+eval set -- "$opts"; unset opts
+while :; do
+    case "$1" in
+	--offset)
+	    offsets="$offsets${offsets:+ }$2"
+	    off_opts+=("$1" "$2")
+	    shift 2
+	    continue
+	    ;;
+	--length)
+	    offsets="$offsets:$2"
+	    off_opts+=("$1" "$2")
+	    shift 2
+	    continue
+	    ;;
+	--assume-filename)
+	    filename="$2"
+	    options+=("$1" "$2")
+	    shift 2
+	    continue
+	    ;;
+	--lines)
+	    lines+=("$2")
+	    shift 2
+	    continue
+	    ;;
+	--output-replacements-xml)
+	    xml=1
+	    shift
+	    continue
+	    ;;
+	-i)
+	    inplace=1
+	    shift
+	    continue
+	    ;;
+	--)
+	    shift
+	    break
+	    ;;
+	*)
+	    options+=("$1")
+	    shift
+	    continue
+	    ;;
+    esac
 done
+files=("$@")
 
 export IN_LINES="${lines[*]}"
 export OFFSETS="$offsets"

From 5c0d798ef4e77dface1541d4677eec1b6cae212e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 26 Oct 2020 23:24:30 +0100
Subject: [PATCH 1157/1650] keep up with github-actions changes

---
 .github/workflows/abicheck.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 992f2811..86b065cd 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - name: set PATH
         run: |
-          echo "::add-path::$HOME/.local/bin"
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
       - name: prepare required software
         run: |
           sudo apt install abigail-tools ninja-build libutf8proc-dev libperl-dev libotr5-dev
@@ -41,15 +41,15 @@ jobs:
           base_abi=$(getabidef base$prefix)
           echo base abi : $base_abi
           ./base$prefix/bin/irssi --version
-          echo "::set-env name=base_abi::$base_abi"
+          echo "base_abi=$base_abi" >> $GITHUB_ENV
           merge_abi=$(getabidef merge$prefix)
           echo merge abi : $merge_abi
           ./merge$prefix/bin/irssi --version
-          echo "::set-env name=merge_abi::$merge_abi"
+          echo "merge_abi=$merge_abi" >> $GITHUB_ENV
       - run: |
           # abipkgdiff
           abipkgdiff -l base merge && diff_ret=0 || diff_ret=$?
-          echo "::set-env name=diff_ret::$diff_ret"
+          echo "diff_ret=$diff_ret" >> $GITHUB_ENV
       - run: |
           # Check if no changes are needed
           if [ "$diff_ret" -ne 0 ]; then

From 323b60f339bd9b139bbcb9a5cd07747bc10a9b84 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Tue, 27 Oct 2020 09:49:54 +0100
Subject: [PATCH 1158/1650] Initialize tmprec

---
 src/fe-common/core/hilight-text.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 4e971d75..b3247efc 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -248,6 +248,7 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 	int priority = -1;
 
 	g_return_val_if_fail(str != NULL, NULL);
+	tmprec = NULL;
 
 	if ((never_hilight_level & level) == level)
 		return NULL;

From 5f7d274ec5762cbdfc56379c66e20807bd93d2ec Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 11 Nov 2020 23:08:28 +0100
Subject: [PATCH 1159/1650] fix clang-format-xs formatting whole file

regression of #1230
---
 .github/workflows/clangformat/clang-format-xs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/clangformat/clang-format-xs b/.github/workflows/clangformat/clang-format-xs
index dd93592e..a48eafe9 100755
--- a/.github/workflows/clangformat/clang-format-xs
+++ b/.github/workflows/clangformat/clang-format-xs
@@ -38,6 +38,7 @@ while :; do
 	    ;;
 	--lines)
 	    lines+=("$2")
+	    off_opts+=("$1" "$2")
 	    shift 2
 	    continue
 	    ;;

From c9ccf9867f322138c8468f8f7a5691b742dd976a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 11 Nov 2020 23:06:59 +0100
Subject: [PATCH 1160/1650] Make a copy of the signal arguments so we don't
 have to worry about the stack

plug some mem leaks

later copy
---
 src/perl/perl-signals.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 9dd73cdb..9f49fba8 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -87,8 +87,9 @@ void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg,
                 GSList *v_gslist;
                 GList *v_glist;
         } saved_args[SIGNAL_MAX_ARGUMENTS];
-        void *p[SIGNAL_MAX_ARGUMENTS];
-        PERL_SIGNAL_ARGS_REC *rec;
+	AV *aargs;
+	void *p[SIGNAL_MAX_ARGUMENTS];
+	PERL_SIGNAL_ARGS_REC *rec;
 	char *arglist[MAX_FORMAT_PARAMS];
 	size_t n;
 
@@ -203,10 +204,13 @@ void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg,
 		p[n] = NULL;
 	}
 
+	/* make a copy of the stack now, since the callback might change it */
+	aargs = av_make(n_args, args);
+
 	callback(cb_arg, n_args, p);
 
 	for (n = 0; n < SIGNAL_MAX_ARGUMENTS && n < n_args && rec->args[n] != NULL; ++n) {
-		SV *arg = args[n];
+		SV *arg = *av_fetch(aargs, n, 0);
 
 		if (!SvOK(arg)) {
 			continue;
@@ -245,6 +249,7 @@ void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg,
 			g_list_free(gl);
 		}
 	}
+	av_undef(aargs);
 }
 
 static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,

From 69396482be83b51af1817c308eead76e1ca57f31 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 2 Dec 2020 14:33:23 +0100
Subject: [PATCH 1161/1650] style format change

---
 src/fe-common/core/hilight-text.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index b3247efc..153a7a15 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -273,14 +273,14 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 	for (tmp = hilights; tmp != NULL; tmp = tmp->next) {
 		HILIGHT_REC *rec = tmp->data;
 
-		if (rec->priority > priority && !rec->nickmask &&
-			hilight_match_level(rec, level) && hilight_match_channel(rec, channel) &&
-			(rec->servertag == NULL ||
-			 (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
-			hilight_match_text(rec, str, match_beg, match_end)) {
-				tmprec = rec;
-				priority = rec->priority;
-			}
+		if (rec->priority > priority && !rec->nickmask && hilight_match_level(rec, level) &&
+		    hilight_match_channel(rec, channel) &&
+		    (rec->servertag == NULL ||
+		     (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
+		    hilight_match_text(rec, str, match_beg, match_end)) {
+			tmprec = rec;
+			priority = rec->priority;
+		}
 	}
 
 	return tmprec;
@@ -687,8 +687,8 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 		HILIGHT_REC *rec = tmp->data;
 
 		if (rec->priority > priority && rec->nickmask &&
-			hilight_match_channel(rec, channel->name) &&
-			match_wildcards(rec->text, nickmask)) {
+		    hilight_match_channel(rec, channel->name) &&
+		    match_wildcards(rec->text, nickmask)) {
 			len = strlen(rec->text);
 			if (best_match < len) {
 				priority = rec->priority;

From ae5e2fe5e5c472a54fe3a1526a7ae443ec18d035 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 31 Dec 2020 17:50:40 +0100
Subject: [PATCH 1162/1650] properly ignore empty lines and comments in servers
 and channels config

fixes #1242
---
 src/core/channels-setup.c | 4 ++++
 src/core/servers-setup.c  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index 55b4533e..cd323a84 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -34,6 +34,10 @@ static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
 {
 	char *name, *chatnet;
 
+	/* skip comment nodes */
+	if (node->type == NODE_TYPE_COMMENT)
+		return -1;
+
 	name = config_node_get_str(node, "name", NULL);
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 8662b30c..6e4e238a 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -472,6 +472,10 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 	char *address, *chatnet;
 	int port;
 
+	/* skip comment nodes */
+	if (node->type == NODE_TYPE_COMMENT)
+		return -1;
+
 	address = config_node_get_str(node, "address", NULL);
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 	port = config_node_get_int(node, "port", 0);

From 06396e9c8fa10b98d4e369152982b35863d3d96c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 3 Jan 2021 23:07:27 +0100
Subject: [PATCH 1163/1650] error out on empty perlmodlib, for example
 non-existant vendor

reported by Xogium
---
 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index cb3c3c0c..b7143fbf 100644
--- a/meson.build
+++ b/meson.build
@@ -403,6 +403,7 @@ int main()
         with_perl_lib = 'vendor'
       endif
     endif
+    perlmoddir = ''
     if with_perl_lib in ['site', 'vendor', 'module']
       set_perl_use_lib = false
       perl_library_dir = with_perl_lib + ' default'
@@ -426,7 +427,8 @@ int main()
       set_perl_use_lib = true
       perl_library_dir = 'custom'
       perlmoddir = with_perl_lib
-    else
+    endif
+    if perlmoddir == ''
       error('Unrecognised with-perl-lib value: ' + with_perl_lib)
     endif
 

From 0706ad14fcaa24cd97852851f8580f20416f3c76 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 08:37:56 +0100
Subject: [PATCH 1164/1650] use cc.links in meson.build to fix regression of
 meson 0.56

fixes #1235 reported by dcbaker
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index cb3c3c0c..026028f9 100644
--- a/meson.build
+++ b/meson.build
@@ -363,7 +363,7 @@ if want_perl
     version : perl_version)
 
   ####
-  if not cc.compiles('''
+  if not cc.links('''
 #include <EXTERN.h>
 #include <perl.h>
 int main()

From e08aca6c8569dd30ad34503cc9d2610b1a47678a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 12:14:42 +0100
Subject: [PATCH 1165/1650] fix clang-format-xs formatting whole file

incomplete fix in #1234
---
 .github/workflows/clangformat/clang-format-xs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clangformat/clang-format-xs b/.github/workflows/clangformat/clang-format-xs
index a48eafe9..3216210b 100755
--- a/.github/workflows/clangformat/clang-format-xs
+++ b/.github/workflows/clangformat/clang-format-xs
@@ -38,7 +38,7 @@ while :; do
 	    ;;
 	--lines)
 	    lines+=("$2")
-	    off_opts+=("$1" "$2")
+	    options+=("$1" "$2")
 	    shift 2
 	    continue
 	    ;;

From 18a1a0ba7c7f1471e6376b0bc9bcc5ed5a987fd0 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 5 Jan 2021 21:22:49 +0100
Subject: [PATCH 1166/1650] fix multiple identical active caps

---
 src/irc/core/irc-cap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 4dd9ceca..bcf5b5df 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -224,7 +224,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 
 			if (disable)
 				server->cap_active = gslist_delete_string(server->cap_active, caps[i] + 1, g_free);
-			else
+			else if (!gslist_find_string(server->cap_active, caps[i]))
 				server->cap_active = g_slist_prepend(server->cap_active, g_strdup(caps[i]));
 
 			if (!strcmp(caps[i], "sasl"))

From 1e7af8bf611df1c8dc1834dfa1860223fdee7ffc Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Jan 2021 21:52:32 +0100
Subject: [PATCH 1167/1650] fix autotools build

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 14a79fb5..453fcd33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -735,7 +735,7 @@ if test "x$old_dir" != "x$whole_dir"; then
 	if test "x$want_perl" != "xno"; then
 		subdirfiles=""
 		for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do
-			subdirfiles=`echo $subdirfiles $i/typemap $i/module.h $i/*.pm $i/*.xs`
+			subdirfiles=`echo $subdirfiles $i/typemap $i/*.h $i/*.pm $i/*.xs`
 		done
 		for file in $whole_dir/src/perl/module.h $subdirfiles; do
 			link=`echo $file|$sedpath "s?$whole_dir/??"`

From 1f05f8616765fbbe901d208f697653d5ed42157f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Jan 2021 20:58:08 +0100
Subject: [PATCH 1168/1650] package the meson.build files

---
 Makefile.am                              | 4 +++-
 docs/Makefile.am                         | 3 ++-
 docs/help/Makefile.am.gen                | 3 ++-
 scripts/Makefile.am                      | 3 ++-
 src/Makefile.am                          | 2 ++
 src/core/Makefile.am                     | 2 ++
 src/fe-common/Makefile.am                | 2 ++
 src/fe-common/core/Makefile.am           | 2 ++
 src/fe-common/irc/Makefile.am            | 2 ++
 src/fe-common/irc/dcc/Makefile.am        | 2 ++
 src/fe-common/irc/notifylist/Makefile.am | 2 ++
 src/fe-fuzz/Makefile.am                  | 2 ++
 src/fe-fuzz/fe-common/Makefile.am        | 2 ++
 src/fe-fuzz/fe-common/core/Makefile.am   | 2 ++
 src/fe-fuzz/irc/Makefile.am              | 2 ++
 src/fe-fuzz/irc/core/Makefile.am         | 2 ++
 src/fe-none/Makefile.am                  | 2 ++
 src/fe-text/Makefile.am                  | 3 ++-
 src/irc/Makefile.am                      | 2 ++
 src/irc/core/Makefile.am                 | 2 ++
 src/irc/dcc/Makefile.am                  | 2 ++
 src/irc/flood/Makefile.am                | 2 ++
 src/irc/notifylist/Makefile.am           | 2 ++
 src/irc/proxy/Makefile.am                | 2 ++
 src/lib-config/Makefile.am               | 2 ++
 src/otr/Makefile.am                      | 2 ++
 src/perl/Makefile.am                     | 7 ++++++-
 tests/Makefile.am                        | 2 ++
 tests/fe-common/Makefile.am              | 2 ++
 tests/fe-common/core/Makefile.am         | 2 ++
 tests/fe-text/Makefile.am                | 2 ++
 tests/irc/Makefile.am                    | 2 ++
 tests/irc/core/Makefile.am               | 2 ++
 tests/irc/flood/Makefile.am              | 2 ++
 themes/Makefile.am                       | 3 ++-
 35 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8bfa362e..74f81303 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,4 +30,6 @@ EXTRA_DIST = \
 	autogen.sh \
 	README.md \
 	$(conf_DATA) \
-	irssi-icon.png
+	irssi-icon.png \
+	meson.build \
+	meson_options.txt
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 23d61648..05ebb319 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -15,6 +15,7 @@ doc_DATA = \
 	startup-HOWTO.html \
 	startup-HOWTO.txt
 
-EXTRA_DIST = $(doc_DATA) $(man_MANS)
+EXTRA_DIST = $(doc_DATA) $(man_MANS) \
+	meson.build
 
 SUBDIRS = help
diff --git a/docs/help/Makefile.am.gen b/docs/help/Makefile.am.gen
index abf824b4..917abe64 100644
--- a/docs/help/Makefile.am.gen
+++ b/docs/help/Makefile.am.gen
@@ -7,6 +7,7 @@ help_DATA = \
 
 EXTRA_DIST = \
 	Makefile.am.gen \
-	$(help_DATA)
+	$(help_DATA) \
+	meson.build
 
 SUBDIRS = in
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cd795153..42b3ea7b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -14,4 +14,5 @@ script_DATA = \
 	scriptassist.pl \
 	usercount.pl
 
-EXTRA_DIST = $(script_DATA)
+EXTRA_DIST = $(script_DATA) \
+	meson.build
diff --git a/src/Makefile.am b/src/Makefile.am
index 48cdc3eb..83fb562f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,3 +23,5 @@ pkginc_src_HEADERS = \
 	common.h
 
 SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(OTRDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI)
+
+EXTRA_DIST = meson.build
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 7cf172ef..b49dad18 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -117,3 +117,5 @@ pkginc_core_HEADERS = \
 	tls.h \
 	write-buffer.h \
 	$(structure_headers)
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-common/Makefile.am b/src/fe-common/Makefile.am
index d5f92eec..f4b78b34 100644
--- a/src/fe-common/Makefile.am
+++ b/src/fe-common/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = core irc
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 4e8fdcb2..7e76d3a0 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -68,3 +68,5 @@ pkginc_fe_common_core_HEADERS = \
 	window-items.h \
 	windows-layout.h \
 	fe-windows.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index 9efb71d3..401720f6 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -37,3 +37,5 @@ pkginc_fe_common_irc_HEADERS = \
 	fe-irc-channels.h \
 	module.h \
 	module-formats.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index c6a5d79d..0be3cffa 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -19,3 +19,5 @@ pkginc_fe_common_irc_dcc_HEADERS = \
 	module.h \
 	module-formats.h \
 	fe-dcc.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index b0f35fdf..6fca7676 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -13,3 +13,5 @@ pkginc_fe_common_irc_notifylistdir=$(pkgincludedir)/src/fe-common/irc/notifylist
 pkginc_fe_common_irc_notifylist_HEADERS = \
 	module.h \
 	module-formats.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index 7ce2fcdd..d54c3291 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -35,3 +35,5 @@ server_fuzz_SOURCES = \
 noinst_HEADERS = \
         null-logger.h \
 	../fe-text/module-formats.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/fe-common/Makefile.am b/src/fe-fuzz/fe-common/Makefile.am
index 52770885..74f13119 100644
--- a/src/fe-fuzz/fe-common/Makefile.am
+++ b/src/fe-fuzz/fe-common/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = core
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
index da8731b9..8fcd59b3 100644
--- a/src/fe-fuzz/fe-common/core/Makefile.am
+++ b/src/fe-fuzz/fe-common/core/Makefile.am
@@ -28,3 +28,5 @@ theme_load_fuzz_SOURCES = \
 
 noinst_HEADERS = \
 	$(top_srcdir)/src/fe-text/module-formats.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/irc/Makefile.am b/src/fe-fuzz/irc/Makefile.am
index 52770885..74f13119 100644
--- a/src/fe-fuzz/irc/Makefile.am
+++ b/src/fe-fuzz/irc/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = core
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
index d66c2479..33f7664d 100644
--- a/src/fe-fuzz/irc/core/Makefile.am
+++ b/src/fe-fuzz/irc/core/Makefile.am
@@ -28,3 +28,5 @@ event_get_params_fuzz_SOURCES = \
 
 noinst_HEADERS = \
 	$(top_srcdir)/src/fe-text/module-formats.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
index 570d6261..44c23d6e 100644
--- a/src/fe-none/Makefile.am
+++ b/src/fe-none/Makefile.am
@@ -16,3 +16,5 @@ botti_SOURCES = \
 
 noinst_HEADERS = \
 	module.h
+
+EXTRA_DIST = meson.build
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 8835f4b9..c7044ba9 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -70,4 +70,5 @@ noinst_HEADERS = \
 	module-formats.h
 
 EXTRA_DIST = \
-	$(terminfo_sources)
+	$(terminfo_sources) \
+	meson.build
diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
index 78a38643..a271a891 100644
--- a/src/irc/Makefile.am
+++ b/src/irc/Makefile.am
@@ -7,3 +7,5 @@ SUBDIRS = core dcc flood notifylist $(PROXY)
 noinst_LIBRARIES = libirc.a
 
 libirc_a_SOURCES = irc.c
+
+EXTRA_DIST = meson.build
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index 63b41113..858d7fcb 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -57,3 +57,5 @@ pkginc_irc_core_HEADERS = \
         netsplit.h \
         servers-idle.h \
         servers-redirect.h
+
+EXTRA_DIST = meson.build
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index a81bf84d..887a65d2 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -25,3 +25,5 @@ pkginc_irc_dcc_HEADERS = \
 	dcc-queue.h \
 	module.h \
 	dcc-server.h
+
+EXTRA_DIST = meson.build
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index b582ffe4..7a49001d 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -10,3 +10,5 @@ libirc_flood_a_SOURCES = \
 pkginc_irc_flooddir=$(pkgincludedir)/src/irc/flood
 pkginc_irc_flood_HEADERS = \
 	module.h
+
+EXTRA_DIST = meson.build
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index 421bc7d4..9bc0fd8b 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -15,3 +15,5 @@ pkginc_irc_notifylist_HEADERS = \
 	notifylist.h \
 	notify-setup.h \
 	module.h
+
+EXTRA_DIST = meson.build
diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am
index 6411f49d..2e7259ad 100644
--- a/src/irc/proxy/Makefile.am
+++ b/src/irc/proxy/Makefile.am
@@ -23,3 +23,5 @@ noinst_HEADERS = \
 
 clean-generic:
 	rm -f libirc_proxy.a
+
+EXTRA_DIST = meson.build
diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am
index d644eae5..4912aa9b 100644
--- a/src/lib-config/Makefile.am
+++ b/src/lib-config/Makefile.am
@@ -13,3 +13,5 @@ pkginc_lib_configdir=$(pkgincludedir)/src/lib-config
 pkginc_lib_config_HEADERS = \
 	iconfig.h \
 	module.h
+
+EXTRA_DIST = meson.build
diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am
index ac40cbac..149b952d 100644
--- a/src/otr/Makefile.am
+++ b/src/otr/Makefile.am
@@ -35,3 +35,5 @@ noinst_HEADERS = \
 	otr-formats.h \
 	otr-fe.h \
 	otr.h
+
+EXTRA_DIST = meson.build
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 45ac1eea..ad937457 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -119,7 +119,12 @@ EXTRA_DIST = \
 	$(common_sources) \
 	$(irc_sources) \
 	$(ui_sources) \
-	$(textui_sources)
+	$(textui_sources) \
+	meson.build \
+	common/meson.build \
+	irc/meson.build \
+	ui/meson.build \
+	textui/meson.build
 
 am_v_pl__show_gen = $(am__v_pl__show_gen_$(V))
 am_v_pl__hide_gen = $(am__v_pl__hide_gen_$(V))
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8713b38f..0799ee3f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,3 +3,5 @@ TEXTUI=fe-text
 endif
 
 SUBDIRS = fe-common irc $(TEXTUI)
+
+EXTRA_DIST = meson.build
diff --git a/tests/fe-common/Makefile.am b/tests/fe-common/Makefile.am
index 52770885..74f13119 100644
--- a/tests/fe-common/Makefile.am
+++ b/tests/fe-common/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = core
+
+EXTRA_DIST = meson.build
diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am
index ddd619a0..eb7e2c7f 100644
--- a/tests/fe-common/core/Makefile.am
+++ b/tests/fe-common/core/Makefile.am
@@ -22,3 +22,5 @@ test_formats_LDADD = \
 
 test_formats_SOURCES = \
 	test-formats.c
+
+EXTRA_DIST += meson.build
diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am
index 2a3450e9..8f44dded 100644
--- a/tests/fe-text/Makefile.am
+++ b/tests/fe-text/Makefile.am
@@ -33,3 +33,5 @@ test_paste_join_multiline_SOURCES = \
 	../../src/fe-text/gui-printtext.c \
 	mock-irssi.c \
 	test-paste-join-multiline.c
+
+EXTRA_DIST += meson.build
diff --git a/tests/irc/Makefile.am b/tests/irc/Makefile.am
index d42cfc87..88adb5b9 100644
--- a/tests/irc/Makefile.am
+++ b/tests/irc/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = \
 	core \
 	flood
+
+EXTRA_DIST = meson.build
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index 23c1ef2c..fbf001da 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -26,3 +26,5 @@ test_channel_events_SOURCES = \
 
 test_irc_SOURCES = \
 	test-irc.c
+
+EXTRA_DIST += meson.build
diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
index 17885d53..f815504d 100644
--- a/tests/irc/flood/Makefile.am
+++ b/tests/irc/flood/Makefile.am
@@ -32,3 +32,5 @@ test_796_LDADD = \
 
 test_796_SOURCES = \
 	test-796.c
+
+EXTRA_DIST += meson.build
diff --git a/themes/Makefile.am b/themes/Makefile.am
index ad0707c2..c8814532 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -2,4 +2,5 @@ themedir = $(datadir)/irssi/themes
 theme_DATA = default.theme colorless.theme
 
 EXTRA_DIST = \
-	$(theme_DATA)
+	$(theme_DATA) \
+	meson.build

From 8f6e67b9b3858f3f4dd06909fa5013a6029634b8 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Jan 2021 17:10:59 +0100
Subject: [PATCH 1169/1650] Check Irssi compilation using github actions

---
 .github/actions.yml            |  43 ------------
 .github/workflows/abicheck.yml |  96 +++++++++++++++++++++------
 .github/workflows/check.yml    | 118 ++++++++++++++++++++++++++++-----
 3 files changed, 178 insertions(+), 79 deletions(-)
 delete mode 100644 .github/actions.yml

diff --git a/.github/actions.yml b/.github/actions.yml
deleted file mode 100644
index ae47fbde..00000000
--- a/.github/actions.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-before_install:
-    - ./autogen.sh --with-proxy=module --with-bot --with-perl=module --with-otr=module
-    - make dist
-    - CO_DIR=$(pwd)
-    - mkdir -p $HOME/src
-    - cd $HOME/src
-    - tar xaf $CO_DIR/irssi-*.tar.*
-
-install:
-    - cd $HOME/src/irssi-*
-    - ./configure --with-proxy=module --with-bot --with-perl=module --with-otr=module --prefix=$HOME/irssi-build --enable-always-build-tests
-    - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
-    - make install
-
-unit_tests:
-    - cd $HOME/src/irssi-*
-    - make -C tests -sk check
-
-after_unit_tests:
-    - cd $HOME/src/irssi-*
-    - find -name test-suite.log -exec cat {} +
-
-before_script:
-    - cd $HOME
-    - mkdir irssi-test
-    - |
-      echo 'echo automated irssi launch test
-      ^set settings_autosave off
-      ^set -clear log_close_string
-      ^set -clear log_day_changed
-      ^set -clear log_open_string
-      ^set log_timestamp * 
-      ^window log on' > irssi-test/startup
-    - echo load perl >> irssi-test/startup
-    - echo load proxy >> irssi-test/startup
-    - echo ^quit >> irssi-test/startup
-
-script:
-    - cd $HOME
-    - irssi-build/bin/irssi --home irssi-test | /tools/render.pl
-
-after_script:
-    - cat $HOME/irc.log.*
diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 86b065cd..eceaa32e 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -1,25 +1,24 @@
 on: [pull_request]
 name: abicheck
+env:
+  build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
+  prefix: /usr/local
+  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
+  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install meson
+  getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
-  check-abi-diff:
+  build-base-ref:
     runs-on: ubuntu-latest
-    env:
-      build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
-      prefix: /usr/local
+    outputs:
+      base_abi: ${{ steps.out.outputs.base_abi }}
     steps:
       - name: set PATH
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
       - name: prepare required software
         run: |
-          sudo apt install abigail-tools ninja-build libutf8proc-dev libperl-dev libotr5-dev
-          pip3 install setuptools
-          pip3 install wheel
-          pip3 install meson
-      - name: checkout merge ref
-        uses: actions/checkout@main
-        with:
-          path: merge.src
+          sudo apt install $apt_build_deps
+          eval "$get_pip_build_deps"
       - name: checkout base ref
         uses: actions/checkout@main
         with:
@@ -30,26 +29,83 @@ jobs:
           meson Build.base base.src $build_options
           ninja -C Build.base
           DESTDIR=$PWD/base ninja -C Build.base install
+      - id: out
+        run: |
+          # print versions and abi versions
+          eval "$getabidef_def"
+          base_abi=$(getabidef base$prefix)
+          echo base abi : $base_abi
+          ./base$prefix/bin/irssi --version
+          echo "::set-output name=base_abi::$base_abi"
+      - uses: actions/upload-artifact@v2
+        with:
+          name: base.inst
+          path: base
+          retention-days: 1
+  build-merge-ref:
+    runs-on: ubuntu-latest
+    outputs:
+      merge_abi: ${{ steps.out.outputs.merge_abi }}
+    steps:
+      - name: set PATH
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - name: prepare required software
+        run: |
+          sudo apt install $apt_build_deps
+          eval "$get_pip_build_deps"
+      - name: checkout merge ref
+        uses: actions/checkout@main
+        with:
+          path: merge.src
       - name: build merge ref
         run: |
           meson Build.merge merge.src $build_options
           ninja -C Build.merge
           DESTDIR=$PWD/merge ninja -C Build.merge install
-      - run: |
+      - id: out
+        run: |
           # print versions and abi versions
-          getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
-          base_abi=$(getabidef base$prefix)
-          echo base abi : $base_abi
-          ./base$prefix/bin/irssi --version
-          echo "base_abi=$base_abi" >> $GITHUB_ENV
+          eval "$getabidef_def"
           merge_abi=$(getabidef merge$prefix)
           echo merge abi : $merge_abi
           ./merge$prefix/bin/irssi --version
-          echo "merge_abi=$merge_abi" >> $GITHUB_ENV
+          echo "::set-output name=merge_abi::$merge_abi"
+      - uses: actions/upload-artifact@v2
+        with:
+          name: merge.inst
+          path: merge
+          retention-days: 1
+  check-abi-diff:
+    runs-on: ubuntu-latest
+    needs:
+      - build-merge-ref
+      - build-base-ref
+    env:
+      base_abi: ${{ needs.build-base-ref.outputs.base_abi }}
+      merge_abi: ${{ needs.build-merge-ref.outputs.merge_abi }}
+    steps:
+      - name: prepare required software
+        run: |
+          sudo apt install abigail-tools
+      - name: fetch base build
+        uses: actions/download-artifact@v2
+        with:
+          name: base.inst
+          path: base
+      - name: fetch merge build
+        uses: actions/download-artifact@v2
+        with:
+          name: merge.inst
+          path: merge
       - run: |
           # abipkgdiff
-          abipkgdiff -l base merge && diff_ret=0 || diff_ret=$?
+          abipkgdiff -l base merge >abipkgdiff.out && diff_ret=0 || diff_ret=$?
           echo "diff_ret=$diff_ret" >> $GITHUB_ENV
+          cat abipkgdiff.out
+      - uses: actions/upload-artifact@v2
+        with:
+          path: abipkgdiff.out
       - run: |
           # Check if no changes are needed
           if [ "$diff_ret" -ne 0 ]; then
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 4558a244..64e5442f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,21 +1,107 @@
 on: [pull_request]
 name: Check Irssi
+env:
+  apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
+  apt_build_deps_meson: ninja-build
+  apt_build_deps_autotools: autoconf automake libtool
+  get_pip_build_deps_meson: pip3 install setuptools; pip3 install wheel; pip3 install meson${meson_ver:+==${meson_ver}}
+  build_options_meson: -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes
+  build_options_configure: --with-proxy=module --with-bot --with-perl=module --with-otr=module
+  prefix: ~/irssi-build
 jobs:
-  install:
+  dist:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@main
-    - name: install
-      uses: irssi-import/actions-irssi/check-irssi@master
-      with:
-        args: before_install install
-    - name: unit_tests
-      uses: irssi-import/actions-irssi/check-irssi@master
-      with:
-        args: unit_tests after_unit_tests
-    - name: script
-      uses: irssi-import/actions-irssi/check-irssi@master
-      env:
-        TERM: xterm
-      with:
-        args: before_script script after_script
+      - name: prepare required software
+        run: |
+          sudo apt install $apt_build_deps $apt_build_deps_autotools
+      - uses: actions/checkout@main
+      - name: make dist
+        run: |
+          # make dist
+          ./autogen.sh $build_options_configure
+          make dist
+      - uses: actions/upload-artifact@v2
+        with:
+          path: irssi-*.tar.gz
+          retention-days: 1
+  install:
+    runs-on: ${{ matrix.os }}
+    env:
+      CC: ${{ matrix.compiler }}
+    needs: dist
+    strategy:
+      matrix:
+        os: [ubuntu-16.04, ubuntu-latest]
+        builder: [meson, configure]
+        compiler: [clang, gcc]
+        include:
+          - os: ubuntu-16.04
+            builder: meson
+            meson_ver: 0.49.2
+    steps:
+      - name: fetch dist
+        uses: actions/download-artifact@v2
+      - name: set PATH
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - name: prepare required software
+        env:
+          meson_ver: ${{ matrix.meson_ver }}
+        run: |
+          sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
+          eval "$get_pip_build_deps_${{ matrix.builder }}"
+          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
+      - name: unpack archive
+        run: tar xaf artifact/irssi-*.tar.gz
+      - name: build and install with meson
+        run: |
+          # ninja install
+          cd irssi-*/
+          meson Build $build_options_meson --prefix=${prefix/\~/~}
+          ninja -C Build
+          ninja -C Build install
+        if: ${{ matrix.builder == 'meson' }}
+      - name: build and install with Makefile
+        run: |
+          # make install
+          cd irssi-*/
+          mkdir Build
+          cd Build
+          ../configure $build_options_configure --prefix=${prefix/\~/~} --enable-always-build-tests
+          make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
+          make install
+        if: ${{ matrix.builder == 'configure' }}
+      - name: run tests with Makefile
+        run: |
+          # make check
+          cd irssi-*/Build
+          make -C tests -sk check
+          find -name test-suite.log -exec cat {} +
+        if: ${{ matrix.builder == 'configure' }}
+      - name: run tests with Meson
+        run: |
+          # ninja test
+          cd irssi-*/
+          ninja -C Build test
+          find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
+        if: ${{ matrix.builder == 'meson' }}
+      - name: run launch test
+        env:
+          TERM: xterm
+        run: |
+          # automated irssi launch test
+          cd
+          mkdir irssi-test
+          echo 'echo automated irssi launch test
+          ^set settings_autosave off
+          ^set -clear log_close_string
+          ^set -clear log_day_changed
+          ^set -clear log_open_string
+          ^set log_timestamp * 
+          ^window log on' > irssi-test/startup
+          echo load perl >> irssi-test/startup
+          echo load proxy >> irssi-test/startup
+          echo ^quit >> irssi-test/startup
+          irssi-build/bin/irssi --home irssi-test | ~/render.pl
+          cat irc.log.*

From 7379833b53ed098bd11c4aa6a2e4dc554a574e57 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Jan 2021 22:22:00 +0100
Subject: [PATCH 1170/1650] move clang-format-xs into utils

---
 .github/workflows/clangformat.yml                               | 2 +-
 .../clangformat => utils/clang-format-xs}/clang-format-xs       | 0
 .../clangformat => utils/clang-format-xs}/format-xs-1.pl        | 0
 .../clangformat => utils/clang-format-xs}/format-xs-2.pl        | 0
 .../clangformat => utils/clang-format-xs}/format-xs-xml.pl      | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename {.github/workflows/clangformat => utils/clang-format-xs}/clang-format-xs (100%)
 rename {.github/workflows/clangformat => utils/clang-format-xs}/format-xs-1.pl (100%)
 rename {.github/workflows/clangformat => utils/clang-format-xs}/format-xs-2.pl (100%)
 rename {.github/workflows/clangformat => utils/clang-format-xs}/format-xs-xml.pl (100%)

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index 070227bf..b959fe92 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -13,7 +13,7 @@ jobs:
       - name: configure clang-format
         run:
           |
-            git config clangformat.binary $PWD/.github/workflows/clangformat/clang-format-xs
+            git config clangformat.binary $PWD/utils/clang-format-xs/clang-format-xs
             git config clangformat.extensions c,h,xs
       - name: run git-clang-format and Check if no changes are needed
         run:
diff --git a/.github/workflows/clangformat/clang-format-xs b/utils/clang-format-xs/clang-format-xs
similarity index 100%
rename from .github/workflows/clangformat/clang-format-xs
rename to utils/clang-format-xs/clang-format-xs
diff --git a/.github/workflows/clangformat/format-xs-1.pl b/utils/clang-format-xs/format-xs-1.pl
similarity index 100%
rename from .github/workflows/clangformat/format-xs-1.pl
rename to utils/clang-format-xs/format-xs-1.pl
diff --git a/.github/workflows/clangformat/format-xs-2.pl b/utils/clang-format-xs/format-xs-2.pl
similarity index 100%
rename from .github/workflows/clangformat/format-xs-2.pl
rename to utils/clang-format-xs/format-xs-2.pl
diff --git a/.github/workflows/clangformat/format-xs-xml.pl b/utils/clang-format-xs/format-xs-xml.pl
similarity index 100%
rename from .github/workflows/clangformat/format-xs-xml.pl
rename to utils/clang-format-xs/format-xs-xml.pl

From 57408b19d5f34540b7b83feb280d0c36661a7f1a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 16:50:02 +0100
Subject: [PATCH 1171/1650] put proper versions in PACKAGE_VERSION

---
 utils/irssi-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 41970cb2..b096fd90 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -22,7 +22,7 @@ echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
 
 if echo "${VERSION}" | grep -q -- -head; then
   # -head version, get extra details from git if we can
-  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --always --tags 2>/dev/null)
+  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null)
   if [ $? = 0 ]; then
     echo "#undef PACKAGE_VERSION"
     echo "#define PACKAGE_VERSION \"${git_version}\""

From 168ba937c15fd8392172c3039837e9faf04a95e2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Jan 2021 22:23:23 +0100
Subject: [PATCH 1172/1650] remove travis

---
 .github/workflows/check.yml |  6 +++-
 .travis.yml                 | 65 -------------------------------------
 README.md                   |  2 +-
 3 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 64e5442f..55499ce3 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,4 +1,8 @@
-on: [pull_request]
+on:
+  push:
+    branches:
+     - master
+  pull_request:
 name: Check Irssi
 env:
   apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 896048d6..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-sudo: false
-dist: xenial
-language: perl
-perl:
-    # ~stretch
-    - "5.24-shrplib"
-    - "system-perl"
-env:
-    - CC=clang UNITTESTS=false
-    - CC=gcc   UNITTESTS=false
-    - CC=clang UNITTESTS=true
-matrix:
-    exclude:
-        - env: CC=clang UNITTESTS=true
-          perl: "system-perl"
-    allow_failures:
-        - env: CC=clang UNITTESTS=true
-
-addons:
-    apt:
-        packages:
-            - libperl-dev
-            - elinks
-            - libgcrypt11-dev
-            - libotr5-dev
-
-before_install:
-    - perl -V
-    - pushd ~
-    - curl -sSLf https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip | funzip > bin/ninja
-    - chmod +x bin/ninja
-    - curl -sSLf https://github.com/mesonbuild/meson/releases/download/0.51.1/meson-0.51.1.tar.gz | tar xz
-    - ( cd bin ; ln -s ../meson-*/meson.py meson )
-    - curl -sSLf https://github.com/irssi-import/glib-travis-build/releases/download/2.58.3/travis-xenial-glib-2.58.3.tar.xz | tar xJ
-    - export PKG_CONFIG_PATH=$HOME/glib-build/lib/x86_64-linux-gnu/pkgconfig
-    - export LD_LIBRARY_PATH=$HOME/glib-build/lib/x86_64-linux-gnu
-    - popd
-
-install:
-    - meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes --prefix=$HOME/irssi-build
-    - ninja -C Build
-    - ninja -C Build install
-
-before_script:
-    - pushd ~
-    - mkdir irssi-test
-    - echo echo automated irssi launch test > irssi-test/startup;
-      echo ^set settings_autosave off >> irssi-test/startup;
-      echo ^set -clear log_close_string >> irssi-test/startup;
-      echo ^set -clear log_day_changed >> irssi-test/startup;
-      echo ^set -clear log_open_string >> irssi-test/startup;
-      echo ^set log_timestamp '* ' >> irssi-test/startup;
-      echo ^window log on >> irssi-test/startup
-    - echo load perl >> irssi-test/startup
-    - echo load proxy >> irssi-test/startup
-    - echo ^quit >> irssi-test/startup
-
-script:
-    - irssi-build/bin/irssi --home irssi-test
-    - popd
-    - if $UNITTESTS; then ninja -C Build test; fi
-
-after_script:
-    - cat ~/irc.log.*
-    - find -name testlog.txt -exec sed -i -e '/Inherited environment:.* TRAVIS/d' {} + -exec cat {} +
diff --git a/README.md b/README.md
index f73b58a0..8b857eeb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # [Irssi](https://irssi.org/)
 
-[![Build Status](https://travis-ci.org/irssi/irssi.svg?branch=master)](https://travis-ci.org/irssi/irssi)
+![Build Status](https://github.com/irssi/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
 
 Irssi is a modular chat client that is most commonly known for its
 text mode user interface, but 80% of the code isn't text mode

From 9cbdf9175e81988053c2290aab2c9380be333ae3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 16:50:02 +0100
Subject: [PATCH 1173/1650] put proper versions in PACKAGE_VERSION

---
 utils/irssi-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 41970cb2..b096fd90 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -22,7 +22,7 @@ echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
 
 if echo "${VERSION}" | grep -q -- -head; then
   # -head version, get extra details from git if we can
-  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --always --tags 2>/dev/null)
+  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null)
   if [ $? = 0 ]; then
     echo "#undef PACKAGE_VERSION"
     echo "#define PACKAGE_VERSION \"${git_version}\""

From edb2f699d181c109522c07d5f943e6dae16cb4fa Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 12:57:23 +0100
Subject: [PATCH 1174/1650] correct wrong function prefixes: g_input -> i_input

---
 src/common.h                 | 11 +++++------
 src/core/misc.c              | 27 ++++++++++++---------------
 src/core/misc.h              |  3 +--
 src/core/net-disconnect.c    |  3 +--
 src/core/net-sendbuffer.c    |  3 +--
 src/core/servers.c           | 21 ++++++++-------------
 src/fe-common/core/fe-exec.c |  5 ++---
 src/fe-text/gui-readline.c   |  5 ++---
 src/irc/core/irc.c           |  6 ++----
 src/irc/dcc/dcc-chat.c       | 18 +++++++-----------
 src/irc/dcc/dcc-get.c        | 23 +++++++++--------------
 src/irc/dcc/dcc-send.c       | 21 ++++++++-------------
 src/irc/dcc/dcc-server.c     | 12 ++++++------
 src/irc/proxy/listen.c       |  6 ++----
 src/otr/key.c                |  3 ++-
 src/perl/common/Core.xs      |  4 ++--
 src/perl/perl-sources.c      |  4 ++--
 17 files changed, 72 insertions(+), 103 deletions(-)

diff --git a/src/common.h b/src/common.h
index 3036397b..02bdbeb8 100644
--- a/src/common.h
+++ b/src/common.h
@@ -45,15 +45,14 @@ typedef guint64 uoff_t;
 #define PRIuUOFF_T G_GUINT64_FORMAT
 
 /* input functions */
-#define G_INPUT_READ	(1 << 0)
-#define G_INPUT_WRITE	(1 << 1)
+#define I_INPUT_READ (1 << 0)
+#define I_INPUT_WRITE (1 << 1)
 
 typedef void (*GInputFunction) (void *data, GIOChannel *source, int condition);
 
-int g_input_add(GIOChannel *source, int condition,
-		GInputFunction function, void *data);
-int g_input_add_full(GIOChannel *source, int priority, int condition,
-		     GInputFunction function, void *data);
+int i_input_add(GIOChannel *source, int condition, GInputFunction function, void *data);
+int i_input_add_full(GIOChannel *source, int priority, int condition, GInputFunction function,
+                     void *data);
 
 /* return full path for ~/.irssi */
 const char *get_irssi_dir(void);
diff --git a/src/core/misc.c b/src/core/misc.c
index 25e4f32b..35c2f571 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -37,15 +37,15 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition,
 	if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
 		/* error, we have to call the function.. */
 		if (rec->condition & G_IO_IN)
-			icond |= G_INPUT_READ;
+			icond |= I_INPUT_READ;
 		else
-			icond |= G_INPUT_WRITE;
+			icond |= I_INPUT_WRITE;
 	}
 
 	if (condition & (G_IO_IN | G_IO_PRI))
-		icond |= G_INPUT_READ;
+		icond |= I_INPUT_READ;
 	if (condition & G_IO_OUT)
-		icond |= G_INPUT_WRITE;
+		icond |= I_INPUT_WRITE;
 
 	if (rec->condition & icond)
 		rec->function(rec->data, source, icond);
@@ -53,8 +53,8 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition,
 	return TRUE;
 }
 
-int g_input_add_full(GIOChannel *source, int priority, int condition,
-		     GInputFunction function, void *data)
+int i_input_add_full(GIOChannel *source, int priority, int condition, GInputFunction function,
+                     void *data)
 {
         IRSSI_INPUT_REC *rec;
 	unsigned int result;
@@ -66,9 +66,9 @@ int g_input_add_full(GIOChannel *source, int priority, int condition,
 	rec->data = data;
 
 	cond = (GIOCondition) (G_IO_ERR|G_IO_HUP|G_IO_NVAL);
-	if (condition & G_INPUT_READ)
+	if (condition & I_INPUT_READ)
 		cond |= G_IO_IN|G_IO_PRI;
-	if (condition & G_INPUT_WRITE)
+	if (condition & I_INPUT_WRITE)
 		cond |= G_IO_OUT;
 
 	result = g_io_add_watch_full(source, priority, cond,
@@ -77,19 +77,16 @@ int g_input_add_full(GIOChannel *source, int priority, int condition,
 	return result;
 }
 
-int g_input_add(GIOChannel *source, int condition,
-		GInputFunction function, void *data)
+int i_input_add(GIOChannel *source, int condition, GInputFunction function, void *data)
 {
-	return g_input_add_full(source, G_PRIORITY_DEFAULT, condition,
-				function, data);
+	return i_input_add_full(source, G_PRIORITY_DEFAULT, condition, function, data);
 }
 
 /* easy way to bypass glib polling of io channel internal buffer */
-int g_input_add_poll(int fd, int priority, int condition,
-		     GInputFunction function, void *data)
+int i_input_add_poll(int fd, int priority, int condition, GInputFunction function, void *data)
 {
 	GIOChannel *source = g_io_channel_unix_new(fd);
-	int ret = g_input_add_full(source, priority, condition, function, data);
+	int ret = i_input_add_full(source, priority, condition, function, data);
 	g_io_channel_unref(source);
 	return ret;
 }
diff --git a/src/core/misc.h b/src/core/misc.h
index cd5cf29c..6c117648 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -1,8 +1,7 @@
 #ifndef IRSSI_CORE_MISC_H
 #define IRSSI_CORE_MISC_H
 
-int g_input_add_poll(int fd, int priority, int condition,
-		     GInputFunction function, void *data);
+int i_input_add_poll(int fd, int priority, int condition, GInputFunction function, void *data);
 
 /* `str' should be type char[MAX_INT_STRLEN] */
 #define ltoa(str, num) \
diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index 27540767..a2f7e290 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -97,8 +97,7 @@ void net_disconnect_later(GIOChannel *handle)
 	rec = g_new(NET_DISCONNECT_REC, 1);
 	rec->created = time(NULL);
 	rec->handle = handle;
-	rec->tag = g_input_add(handle, G_INPUT_READ,
-			       (GInputFunction) sig_disconnect, rec);
+	rec->tag = i_input_add(handle, I_INPUT_READ, (GInputFunction) sig_disconnect, rec);
 
 	if (timeout_tag == -1) {
 		timeout_tag = g_timeout_add(10000, (GSourceFunc)
diff --git a/src/core/net-sendbuffer.c b/src/core/net-sendbuffer.c
index a085fac7..0cb462a1 100644
--- a/src/core/net-sendbuffer.c
+++ b/src/core/net-sendbuffer.c
@@ -132,8 +132,7 @@ int net_sendbuffer_send(NET_SENDBUF_REC *rec, const void *data, int size)
 	/* everything couldn't be sent. */
 	if (rec->send_tag == -1) {
 		rec->send_tag =
-			g_input_add(rec->handle, G_INPUT_WRITE,
-				    (GInputFunction) sig_sendbuffer, rec);
+		    i_input_add(rec->handle, I_INPUT_WRITE, (GInputFunction) sig_sendbuffer, rec);
 	}
 
 	return buffer_add(rec, data, size) ? 0 : -1;
diff --git a/src/core/servers.c b/src/core/servers.c
index 7709e3a2..11dfeba3 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -184,10 +184,9 @@ static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *han
 	if (error & 1) {
 		if (server->connect_tag != -1)
 			g_source_remove(server->connect_tag);
-		server->connect_tag = g_input_add(handle, error == 1 ? G_INPUT_READ : G_INPUT_WRITE,
-						  (GInputFunction)
-						  server_connect_callback_init_ssl,
-						  server);
+		server->connect_tag =
+		    i_input_add(handle, error == 1 ? I_INPUT_READ : I_INPUT_WRITE,
+		                (GInputFunction) server_connect_callback_init_ssl, server);
 		return;
 	}
 
@@ -253,11 +252,9 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		if (server->connrec->use_tls)
 			server_connect_callback_init_ssl(server, handle);
 		else
-		server->connect_tag =
-			g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
-				    (GInputFunction)
-				    server_connect_callback_init,
-				    server);
+			server->connect_tag =
+			    i_input_add(handle, I_INPUT_WRITE | I_INPUT_READ,
+			                (GInputFunction) server_connect_callback_init, server);
 	}
 }
 
@@ -418,10 +415,8 @@ int server_start_connect(SERVER_REC *server)
 			net_gethostbyname_nonblock(connect_address,
 						   server->connect_pipe[1], 0);
 		server->connect_tag =
-			g_input_add(server->connect_pipe[0], G_INPUT_READ,
-				    (GInputFunction)
-				    server_connect_callback_readpipe,
-				    server);
+		    i_input_add(server->connect_pipe[0], I_INPUT_READ,
+		                (GInputFunction) server_connect_callback_readpipe, server);
 
 		server->connect_time = time(NULL);
 		lookup_servers = g_slist_append(lookup_servers, server);
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index dcd4ecb5..a69b3e7c 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -524,9 +524,8 @@ static void handle_exec(const char *args, GHashTable *optlist,
 	level = g_hash_table_lookup(optlist, "level");
 	rec->level = level == NULL ? MSGLEVEL_CLIENTCRAP : level2bits(level, NULL);
 
-	rec->read_tag = g_input_add(rec->in, G_INPUT_READ,
-				    (GInputFunction) sig_exec_input_reader,
-				    rec);
+	rec->read_tag =
+	    i_input_add(rec->in, I_INPUT_READ, (GInputFunction) sig_exec_input_reader, rec);
 	processes = g_slist_append(processes, rec);
 
 	if (rec->target == NULL && interactive)
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index d56ebfb8..f848ba1b 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -85,9 +85,8 @@ static void sig_input(void);
 
 void input_listen_init(int handle)
 {
-	readtag = g_input_add_poll(handle,
-				   G_PRIORITY_HIGH, G_INPUT_READ,
-				   (GInputFunction) sig_input, NULL);
+	readtag = i_input_add_poll(handle, G_PRIORITY_HIGH, I_INPUT_READ,
+	                           (GInputFunction) sig_input, NULL);
 }
 
 void input_listen_deinit(void)
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index ef7a3ad1..f3f9f307 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -491,10 +491,8 @@ static void irc_init_server(IRC_SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
-	server->readtag =
-		g_input_add(net_sendbuffer_handle(server->handle),
-			    G_INPUT_READ,
-			    (GInputFunction) irc_parse_incoming, server);
+	server->readtag = i_input_add(net_sendbuffer_handle(server->handle), I_INPUT_READ,
+	                              (GInputFunction) irc_parse_incoming, server);
 }
 
 void irc_irc_init(void)
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 987a5ba9..3f471eac 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -355,8 +355,7 @@ static void dcc_chat_listen(CHAT_DCC_REC *dcc)
 	memcpy(&dcc->addr, &ip, sizeof(IPADDR));
 	net_ip2host(&dcc->addr, dcc->addrstr);
 	dcc->port = port;
-	dcc->tagread = g_input_add(handle, G_INPUT_READ,
-				   (GInputFunction) dcc_chat_input, dcc);
+	dcc->tagread = i_input_add(handle, I_INPUT_READ, (GInputFunction) dcc_chat_input, dcc);
 
 	signal_emit("dcc connected", 1, dcc);
 }
@@ -379,8 +378,7 @@ static void sig_chat_connected(CHAT_DCC_REC *dcc)
 
 	dcc->starttime = time(NULL);
 	dcc->sendbuf = net_sendbuffer_create(dcc->handle, 0);
-	dcc->tagread = g_input_add(dcc->handle, G_INPUT_READ,
-				   (GInputFunction) dcc_chat_input, dcc);
+	dcc->tagread = i_input_add(dcc->handle, I_INPUT_READ, (GInputFunction) dcc_chat_input, dcc);
 
 	signal_emit("dcc connected", 1, dcc);
 }
@@ -397,9 +395,8 @@ static void dcc_chat_connect(CHAT_DCC_REC *dcc)
 
 	dcc->handle = dcc_connect_ip(&dcc->addr, dcc->port);
 	if (dcc->handle != NULL) {
-		dcc->tagconn = g_input_add(dcc->handle,
-					   G_INPUT_WRITE | G_INPUT_READ,
-					   (GInputFunction) sig_chat_connected, dcc);
+		dcc->tagconn = i_input_add(dcc->handle, I_INPUT_WRITE | I_INPUT_READ,
+		                           (GInputFunction) sig_chat_connected, dcc);
 	} else {
 		/* error connecting */
 		signal_emit("dcc error connect", 1, dcc);
@@ -428,8 +425,8 @@ static void dcc_chat_passive(CHAT_DCC_REC *dcc)
 		cmd_return_error(CMDERR_ERRNO);
 
 	dcc->handle = handle;
-	dcc->tagconn = g_input_add(dcc->handle, G_INPUT_READ,
-				   (GInputFunction) dcc_chat_listen, dcc);
+	dcc->tagconn =
+	    i_input_add(dcc->handle, I_INPUT_READ, (GInputFunction) dcc_chat_listen, dcc);
 
 	/* Let's send the reply to the other client! */
 	dcc_ip2str(&own_ip, host);
@@ -508,8 +505,7 @@ static void cmd_dcc_chat(const char *data, IRC_SERVER_REC *server)
 
 		dcc->handle = handle;
 		dcc->tagconn =
-			g_input_add(dcc->handle, G_INPUT_READ,
-				    (GInputFunction) dcc_chat_listen, dcc);
+		    i_input_add(dcc->handle, I_INPUT_READ, (GInputFunction) dcc_chat_listen, dcc);
 
 		/* send the chat request */
 		signal_emit("dcc request send", 1, dcc);
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 73a06590..5af557ea 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -112,9 +112,8 @@ void dcc_get_send_received(GET_DCC_REC *dcc)
 	   last 1-3 bytes should be sent later. these happen probably
 	   never, but I just want to do it right.. :) */
 	if (dcc->tagwrite == -1) {
-		dcc->tagwrite = g_input_add(dcc->handle, G_INPUT_WRITE,
-					    (GInputFunction) sig_dccget_send,
-					    dcc);
+		dcc->tagwrite =
+		    i_input_add(dcc->handle, I_INPUT_WRITE, (GInputFunction) sig_dccget_send, dcc);
 	}
 }
 
@@ -285,8 +284,8 @@ void sig_dccget_connected(GET_DCC_REC *dcc)
 		dcc_close(DCC(dcc));
 		return;
 	}
-	dcc->tagread = g_input_add(dcc->handle, G_INPUT_READ,
-				   (GInputFunction) sig_dccget_receive, dcc);
+	dcc->tagread =
+	    i_input_add(dcc->handle, I_INPUT_READ, (GInputFunction) sig_dccget_receive, dcc);
 	signal_emit("dcc connected", 1, dcc);
 
 	if (dcc->from_dccserver) {
@@ -311,11 +310,8 @@ void dcc_get_connect(GET_DCC_REC *dcc)
 	dcc->handle = dcc_connect_ip(&dcc->addr, dcc->port);
 
 	if (dcc->handle != NULL) {
-		dcc->tagconn =
-			g_input_add(dcc->handle,
-				    G_INPUT_WRITE | G_INPUT_READ,
-				    (GInputFunction) sig_dccget_connected,
-				    dcc);
+		dcc->tagconn = i_input_add(dcc->handle, I_INPUT_WRITE | I_INPUT_READ,
+		                           (GInputFunction) sig_dccget_connected, dcc);
 	} else {
 		/* error connecting */
 		signal_emit("dcc error connect", 1, dcc);
@@ -344,8 +340,8 @@ static void dcc_get_listen(GET_DCC_REC *dcc)
 	net_ip2host(&dcc->addr, dcc->addrstr);
 	dcc->port = port;
 
-	dcc->tagconn = g_input_add(handle, G_INPUT_READ | G_INPUT_WRITE,
-				   (GInputFunction) sig_dccget_connected, dcc);
+	dcc->tagconn = i_input_add(handle, I_INPUT_READ | I_INPUT_WRITE,
+	                           (GInputFunction) sig_dccget_connected, dcc);
 }
 
 void dcc_get_passive(GET_DCC_REC *dcc)
@@ -361,8 +357,7 @@ void dcc_get_passive(GET_DCC_REC *dcc)
 		cmd_return_error(CMDERR_ERRNO);
 
 	dcc->handle = handle;
-	dcc->tagconn = g_input_add(dcc->handle, G_INPUT_READ,
-				   (GInputFunction) dcc_get_listen, dcc);
+	dcc->tagconn = i_input_add(dcc->handle, I_INPUT_READ, (GInputFunction) dcc_get_listen, dcc);
 
 	/* Let's send the reply to the other client! */
 	dcc_ip2str(&own_ip, host);
diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c
index 6eabd25f..eccb8d37 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -336,10 +336,8 @@ static void dcc_send_connected(SEND_DCC_REC *dcc)
 	net_ip2host(&dcc->addr, dcc->addrstr);
 	dcc->port = port;
 
-	dcc->tagread = g_input_add(handle, G_INPUT_READ,
-				   (GInputFunction) dcc_send_read_size, dcc);
-	dcc->tagwrite = g_input_add(handle, G_INPUT_WRITE,
-				    (GInputFunction) dcc_send_data, dcc);
+	dcc->tagread = i_input_add(handle, I_INPUT_READ, (GInputFunction) dcc_send_read_size, dcc);
+	dcc->tagwrite = i_input_add(handle, I_INPUT_WRITE, (GInputFunction) dcc_send_data, dcc);
 
 	signal_emit("dcc connected", 1, dcc);
 }
@@ -352,12 +350,10 @@ static void dcc_send_connect(SEND_DCC_REC *dcc)
 	if (dcc->handle != NULL) {
 		dcc->starttime = time(NULL);
 
-		dcc->tagread = g_input_add(dcc->handle, G_INPUT_READ,
-					   (GInputFunction) dcc_send_read_size,
-					   dcc);
-		dcc->tagwrite = g_input_add(dcc->handle, G_INPUT_WRITE,
-					    (GInputFunction) dcc_send_data,
-					    dcc);
+		dcc->tagread = i_input_add(dcc->handle, I_INPUT_READ,
+		                           (GInputFunction) dcc_send_read_size, dcc);
+		dcc->tagwrite =
+		    i_input_add(dcc->handle, I_INPUT_WRITE, (GInputFunction) dcc_send_data, dcc);
 		signal_emit("dcc connected", 1, dcc);
 	} else {
 		/* error connecting */
@@ -436,9 +432,8 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname,
 	dcc->queue = queue;
         dcc->file_quoted = strchr(fname, ' ') != NULL;
 	if (!passive) {
-		dcc->tagconn = g_input_add(handle, G_INPUT_READ,
-					   (GInputFunction) dcc_send_connected,
-					   dcc);
+		dcc->tagconn =
+		    i_input_add(handle, I_INPUT_READ, (GInputFunction) dcc_send_connected, dcc);
 	}
 
 	/* Generate an ID for this send if using passive protocol */
diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c
index 9c20e9bf..4d1e94aa 100644
--- a/src/irc/dcc/dcc-server.c
+++ b/src/irc/dcc/dcc-server.c
@@ -183,8 +183,8 @@ static void dcc_server_listen(SERVER_DCC_REC *dcc)
 	memcpy(&newdcc->addr, &ip, sizeof(IPADDR));
 	net_ip2host(&newdcc->addr, newdcc->addrstr);
 	newdcc->port = port;
-	newdcc->tagread = g_input_add(handle, G_INPUT_READ,
-				      (GInputFunction) dcc_server_input, newdcc);
+	newdcc->tagread =
+	    i_input_add(handle, I_INPUT_READ, (GInputFunction) dcc_server_input, newdcc);
 
 	signal_emit("dcc connected", 1, newdcc);
 }
@@ -210,8 +210,8 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg)
 			memcpy(&dccchat->addr, &dcc->addr, sizeof(IPADDR));
 			net_ip2host(&dccchat->addr, dccchat->addrstr);
 			dccchat->port = dcc->port;
-			dccchat->tagread = g_input_add(dccchat->handle, G_INPUT_READ,
-						       (GInputFunction) dcc_chat_input, dccchat);
+			dccchat->tagread = i_input_add(dccchat->handle, I_INPUT_READ,
+			                               (GInputFunction) dcc_chat_input, dccchat);
 
 			dcc->connection_established = 1;
 			signal_emit("dcc connected", 1, dccchat);
@@ -347,8 +347,8 @@ static void cmd_dcc_server(const char *data, IRC_SERVER_REC *server)
 	dcc = dcc_server_create(server, flags);
 	dcc->handle = handle;
 	dcc->port = atoi(port);
-	dcc->tagconn = g_input_add(dcc->handle, G_INPUT_READ,
-				   (GInputFunction) dcc_server_listen, dcc);
+	dcc->tagconn =
+	    i_input_add(dcc->handle, I_INPUT_READ, (GInputFunction) dcc_server_listen, dcc);
 
 	signal_emit("dcc server started", 1, dcc);
 
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 1c53369c..1183c8d7 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -470,8 +470,7 @@ static void sig_listen(LISTEN_REC *listen)
 		rec->server = servers == NULL ? NULL :
 			IRC_SERVER(server_find_chatnet(listen->ircnet));
 	}
-	rec->recv_tag = g_input_add(handle, G_INPUT_READ,
-	                            (GInputFunction) sig_listen_client, rec);
+	rec->recv_tag = i_input_add(handle, I_INPUT_READ, (GInputFunction) sig_listen_client, rec);
 
 	proxy_clients = g_slist_prepend(proxy_clients, rec);
 	listen->clients = g_slist_prepend(listen->clients, rec);
@@ -739,8 +738,7 @@ static void add_listen(const char *ircnet, int port, const char *port_or_path)
 	rec->port = port;
 	rec->port_or_path = g_strdup(port_or_path);
 
-	rec->tag = g_input_add(rec->handle, G_INPUT_READ,
-	                       (GInputFunction) sig_listen, rec);
+	rec->tag = i_input_add(rec->handle, I_INPUT_READ, (GInputFunction) sig_listen, rec);
 
 	proxy_listens = g_slist_append(proxy_listens, rec);
 }
diff --git a/src/otr/key.c b/src/otr/key.c
index 27de0226..26565c9a 100644
--- a/src/otr/key.c
+++ b/src/otr/key.c
@@ -252,7 +252,8 @@ void key_gen_run(struct otr_user_state *ustate, const char *account_name)
 	if (pid > 0) {
 		/* Parent process */
 		pidwait_add(pid);
-		worker->tag = g_input_add(worker->pipes[0], G_INPUT_READ, (GInputFunction)read_key_gen_status, worker);
+		worker->tag = i_input_add(worker->pipes[0], I_INPUT_READ,
+		                          (GInputFunction) read_key_gen_status, worker);
 		return;
 	}
 
diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index 7ae18943..9e582a70 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -258,14 +258,14 @@ CODE:
 int
 INPUT_READ()
 CODE:
-	RETVAL = G_INPUT_READ;
+	RETVAL = I_INPUT_READ;
 OUTPUT:
 	RETVAL
 
 int
 INPUT_WRITE()
 CODE:
-	RETVAL = G_INPUT_WRITE;
+	RETVAL = I_INPUT_WRITE;
 OUTPUT:
 	RETVAL
 
diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c
index 69d86f1f..9f5773f1 100644
--- a/src/perl/perl-sources.c
+++ b/src/perl/perl-sources.c
@@ -139,8 +139,8 @@ int perl_input_add(int source, int condition, SV *func, SV *data, int once)
 	rec->func = perl_func_sv_inc(func, pkg);
 	rec->data = SvREFCNT_inc(data);
 
-	rec->tag = g_input_add_poll(source, G_PRIORITY_DEFAULT, condition,
-			       (GInputFunction) perl_source_event, rec);
+	rec->tag = i_input_add_poll(source, G_PRIORITY_DEFAULT, condition,
+	                            (GInputFunction) perl_source_event, rec);
 
 	perl_sources = g_slist_append(perl_sources, rec);
 	return rec->tag;

From 91817964729dc34da23ba63832f18361cc11fd01 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 13:11:09 +0100
Subject: [PATCH 1175/1650] correct wrong function prefixes: g_istr -> i_istr

---
 src/core/commands.c             |  3 +--
 src/core/misc.c                 |  6 +++---
 src/core/misc.h                 |  6 +++---
 src/core/nicklist.c             |  3 +--
 src/core/settings.c             |  3 +--
 src/fe-common/core/completion.c | 12 ++++++++----
 src/fe-common/core/themes.c     |  3 +--
 src/fe-common/irc/fe-netjoin.c  |  3 +--
 src/fe-fuzz/server.c            |  3 +--
 src/irc/core/irc-servers.c      |  8 +++-----
 src/irc/core/irc-session.c      |  4 ++--
 src/irc/flood/flood.c           |  3 +--
 src/lib-config/parse.c          |  6 +++---
 tests/irc/flood/test-796.c      |  3 +--
 14 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/src/core/commands.c b/src/core/commands.c
index 198b1327..e2bee576 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -740,8 +740,7 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...)
 		opthash = (GHashTable **) va_arg(args, GHashTable **);
 
 		rec->options = *opthash =
-			g_hash_table_new((GHashFunc) g_istr_hash,
-					 (GCompareFunc) g_istr_equal);
+		    g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 		ignore_unknown = count & PARAM_FLAG_UNKNOWN_OPTIONS;
 		error = get_cmd_options(&datad, ignore_unknown,
diff --git a/src/core/misc.c b/src/core/misc.c
index 35c2f571..d0c2a49e 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -408,17 +408,17 @@ char *convert_home(const char *path)
 	}
 }
 
-int g_istr_equal(gconstpointer v, gconstpointer v2)
+int i_istr_equal(gconstpointer v, gconstpointer v2)
 {
 	return g_ascii_strcasecmp((const char *) v, (const char *) v2) == 0;
 }
 
-int g_istr_cmp(gconstpointer v, gconstpointer v2)
+int i_istr_cmp(gconstpointer v, gconstpointer v2)
 {
 	return g_ascii_strcasecmp((const char *) v, (const char *) v2);
 }
 
-guint g_istr_hash(gconstpointer v)
+guint i_istr_hash(gconstpointer v)
 {
 	const signed char *p;
 	guint32 h = 5381;
diff --git a/src/core/misc.h b/src/core/misc.h
index 6c117648..a441a468 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -41,11 +41,11 @@ GList *optlist_remove_known(const char *cmd, GHashTable *optlist);
 char *convert_home(const char *path);
 
 /* Case-insensitive string hash functions */
-int g_istr_equal(gconstpointer v, gconstpointer v2);
-unsigned int g_istr_hash(gconstpointer v);
+int i_istr_equal(gconstpointer v, gconstpointer v2);
+unsigned int i_istr_hash(gconstpointer v);
 
 /* Case-insensitive GCompareFunc func */
-int g_istr_cmp(gconstpointer v, gconstpointer v2);
+int i_istr_cmp(gconstpointer v, gconstpointer v2);
 
 /* Find `mask' from `data', you can use * and ? wildcards. */
 int match_wildcards(const char *mask, const char *data);
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index f2aa1315..34c4b24b 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -456,8 +456,7 @@ static void sig_channel_created(CHANNEL_REC *channel)
 {
 	g_return_if_fail(IS_CHANNEL(channel));
 
-	channel->nicks = g_hash_table_new((GHashFunc) g_istr_hash,
-					  (GCompareFunc) g_istr_equal);
+	channel->nicks = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 }
 
 static void nicklist_remove_hash(gpointer key, NICK_REC *nick,
diff --git a/src/core/settings.c b/src/core/settings.c
index f8c0b9df..1720d922 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -876,8 +876,7 @@ static int sig_autosave(void)
 
 void settings_init(void)
 {
-	settings = g_hash_table_new((GHashFunc) g_istr_hash,
-				    (GCompareFunc) g_istr_equal);
+	settings = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 	last_errors = NULL;
         last_invalid_modules = NULL;
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 0102bd2c..a897c452 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -425,7 +425,8 @@ static GList *completion_get_settings(const char *key, SettingType type)
 		SETTINGS_REC *rec = tmp->data;
 
 		if ((type == SETTING_TYPE_ANY || rec->type == type) && g_ascii_strncasecmp(rec->key, key, len) == 0)
-			complist = g_list_insert_sorted(complist, g_strdup(rec->key), (GCompareFunc) g_istr_cmp);
+			complist = g_list_insert_sorted(complist, g_strdup(rec->key),
+			                                (GCompareFunc) i_istr_cmp);
 	}
 	g_slist_free(sets);
 	return complist;
@@ -460,7 +461,8 @@ static GList *completion_get_aliases(const char *alias, char cmdchar)
 			   be appended after command completions and kept in
 			   uppercase to show it's an alias */
 			if (glist_find_icase_string(complist, word) == NULL)
-				complist = g_list_insert_sorted(complist, word, (GCompareFunc) g_istr_cmp);
+				complist =
+				    g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
 			else
 				g_free(word);
 		}
@@ -489,7 +491,8 @@ static GList *completion_get_commands(const char *cmd, char cmdchar)
 			word = cmdchar == '\0' ? g_strdup(rec->cmd) :
 				g_strdup_printf("%c%s", cmdchar, rec->cmd);
 			if (glist_find_icase_string(complist, word) == NULL)
-				complist = g_list_insert_sorted(complist, word, (GCompareFunc) g_istr_cmp);
+				complist =
+				    g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
 			else
 				g_free(word);
 		}
@@ -523,7 +526,8 @@ static GList *completion_get_subcommands(const char *cmd)
 			continue;
 
 		if (g_ascii_strncasecmp(rec->cmd, cmd, len) == 0)
-			complist = g_list_insert_sorted(complist, g_strdup(rec->cmd+skip), (GCompareFunc) g_istr_cmp);
+			complist = g_list_insert_sorted(complist, g_strdup(rec->cmd + skip),
+			                                (GCompareFunc) i_istr_cmp);
 	}
 	return complist;
 }
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index ff737c41..04f00477 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -56,8 +56,7 @@ THEME_REC *theme_create(const char *path, const char *name)
 	rec->name = g_strdup(name);
 	rec->abstracts = g_hash_table_new((GHashFunc) g_str_hash,
 					  (GCompareFunc) g_str_equal);
-	rec->modules = g_hash_table_new((GHashFunc) g_istr_hash,
-					(GCompareFunc) g_istr_equal);
+	rec->modules = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 	themes = g_slist_append(themes, rec);
 	signal_emit("theme created", 1, rec);
 
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 602eaf20..f6d9e4b3 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -176,8 +176,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channe
 
 	/* save nicks to string, clear now_channels and remove the same
 	   channels from old_channels list */
-	channels = g_hash_table_new((GHashFunc) g_istr_hash,
-				    (GCompareFunc) g_istr_equal);
+	channels = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 	for (tmp = server->netjoins; tmp != NULL; tmp = next) {
 		NETJOIN_REC *rec = tmp->data;
 
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index e8caafa0..a444494d 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -102,8 +102,7 @@ void event_connected(IRC_SERVER_REC *server, const char *data, const char *from)
 
 void irc_server_init_bare_minimum(IRC_SERVER_REC *server) {
 	server->rawlog = rawlog_create();
-	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
-					    (GCompareFunc) g_istr_equal);
+	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 	/* set the standards */
 	g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 9779ab58..fa02094e 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -283,8 +283,7 @@ static void server_init(IRC_SERVER_REC *server)
 		g_free(cmd);
 	}
 
-	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
-					    (GCompareFunc) g_istr_equal);
+	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 	/* set the standards */
 	g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
@@ -417,10 +416,9 @@ static void sig_connected(IRC_SERVER_REC *server)
 		(QUERY_REC *(*)(SERVER_REC *, const char *)) irc_query_find;
 	server->nick_comp_func = irc_nickcmp_rfc1459;
 
-	server->splits = g_hash_table_new((GHashFunc) g_istr_hash,
-					  (GCompareFunc) g_istr_equal);
+	server->splits = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
-        if (!server->session_reconnect)
+	if (!server->session_reconnect)
 		server_init(server);
 }
 
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index ec2c86ee..6b817099 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -106,8 +106,8 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 	server->connrec->sasl_password = g_strdup(config_node_get_str(node, "sasl_password", NULL));
 
 	if (server->isupport == NULL) {
-		server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
-						    (GCompareFunc) g_istr_equal);
+		server->isupport =
+		    g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 	}
 
 	node = config_node_section(NULL, node, "isupport", -1);
diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c
index a7425b90..a1472648 100644
--- a/src/irc/flood/flood.c
+++ b/src/irc/flood/flood.c
@@ -120,8 +120,7 @@ static void flood_init_server(IRC_SERVER_REC *server)
 	rec = g_new0(MODULE_SERVER_REC, 1);
 	MODULE_DATA_SET(server, rec);
 
-	rec->floodlist = g_hash_table_new((GHashFunc) g_istr_hash,
-					  (GCompareFunc) g_istr_equal);
+	rec->floodlist = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 }
 
 static void flood_hash_destroy(const char *key, FLOOD_REC *flood)
diff --git a/src/lib-config/parse.c b/src/lib-config/parse.c
index c106fc46..e4ff1abb 100644
--- a/src/lib-config/parse.c
+++ b/src/lib-config/parse.c
@@ -20,13 +20,13 @@
 
 #include "module.h"
 
-static int g_istr_equal(gconstpointer v, gconstpointer v2)
+static int i_istr_equal(gconstpointer v, gconstpointer v2)
 {
 	return g_ascii_strcasecmp((const char *) v, (const char *) v2) == 0;
 }
 
 /* a char* hash function from ASU */
-static unsigned int g_istr_hash(gconstpointer v)
+static unsigned int i_istr_hash(gconstpointer v)
 {
 	const char *s = (const char *) v;
 	unsigned int h = 0, g;
@@ -314,7 +314,7 @@ CONFIG_REC *config_open(const char *fname, int create_mode)
 	rec->create_mode = create_mode;
 	rec->mainnode = g_new0(CONFIG_NODE, 1);
 	rec->mainnode->type = NODE_TYPE_BLOCK;
-	rec->cache = g_hash_table_new((GHashFunc) g_istr_hash, (GCompareFunc) g_istr_equal);
+	rec->cache = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 	rec->cache_nodes = g_hash_table_new((GHashFunc) g_direct_hash, (GCompareFunc) g_direct_equal);
 
 	return rec;
diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index 9e8aeee7..a2864144 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -102,8 +102,7 @@ static void server_destroy_flood_tear_down(ServerDestroyFloodData *fixture, cons
 
 static void irc_server_init_bare_minimum(IRC_SERVER_REC *server)
 {
-	server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
-					    (GCompareFunc) g_istr_equal);
+	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 	/* set the standards */
 	g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));

From 50ed476623c54c0ce80cf81190fe339f41e205be Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 15:42:20 +0100
Subject: [PATCH 1176/1650] correct wrong function prefixes: g_io_channel ->
 i_io_channel

---
 src/core/net-nonblock.c      |  8 ++++----
 src/core/network.c           | 14 +++++++-------
 src/core/network.h           |  6 +++---
 src/core/servers.c           |  4 ++--
 src/core/session.c           |  2 +-
 src/fe-common/core/fe-exec.c |  4 ++--
 src/irc/proxy/listen.c       |  4 ++--
 src/otr/key.c                |  8 ++++----
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 1ad5f42f..643884ee 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -62,9 +62,9 @@ int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe, int reverse_l
 		rec.errlen = errorstr == NULL ? 0 : strlen(errorstr)+1;
 	}
 
-	g_io_channel_write_block(pipe, &rec, sizeof(rec));
+	i_io_channel_write_block(pipe, &rec, sizeof(rec));
 	if (rec.errlen != 0)
-		g_io_channel_write_block(pipe, (void *) errorstr, rec.errlen);
+		i_io_channel_write_block(pipe, (void *) errorstr, rec.errlen);
 
 	if (pid == 0)
 		_exit(99);
@@ -82,7 +82,7 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
 
 	/* get ip+error */
-	if (g_io_channel_read_block(pipe, rec, sizeof(*rec)) == -1) {
+	if (i_io_channel_read_block(pipe, rec, sizeof(*rec)) == -1) {
 		rec->errorstr = g_strdup_printf("Host name lookup: %s",
 						g_strerror(errno));
 		return -1;
@@ -92,7 +92,7 @@ int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
 		/* read error string, if we can't read everything for some
 		   reason, just ignore it. */
 		rec->errorstr = g_malloc0(rec->errlen+1);
-		g_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
+		i_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
 	}
 
 	return 0;
diff --git a/src/core/network.c b/src/core/network.c
index 87b91698..85fe9896 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -39,7 +39,7 @@ union sockaddr_union {
 #define SIZEOF_SOCKADDR(so) ((so).sa.sa_family == AF_INET6 ? \
 	sizeof(so.sin6) : sizeof(so.sin))
 
-GIOChannel *g_io_channel_new(int handle)
+GIOChannel *i_io_channel_new(int handle)
 {
 	GIOChannel *chan;
 	chan = g_io_channel_unix_new(handle);
@@ -48,7 +48,7 @@ GIOChannel *g_io_channel_new(int handle)
 	return chan;
 }
 
-int g_io_channel_write_block(GIOChannel *channel, void *data, int len)
+int i_io_channel_write_block(GIOChannel *channel, void *data, int len)
 {
 	gsize ret;
 	int sent;
@@ -63,7 +63,7 @@ int g_io_channel_write_block(GIOChannel *channel, void *data, int len)
 	return sent < len ? -1 : 0;
 }
 
-int g_io_channel_read_block(GIOChannel *channel, void *data, int len)
+int i_io_channel_read_block(GIOChannel *channel, void *data, int len)
 {
 	time_t maxwait;
 	gsize ret;
@@ -211,7 +211,7 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
 	if (handle == -1)
 		return (NULL);
 
-	return g_io_channel_new(handle);
+	return i_io_channel_new(handle);
 }
 
 /* Connect to named UNIX socket */
@@ -242,7 +242,7 @@ GIOChannel *net_connect_unix(const char *path)
 		return NULL;
 	}
 
-	return g_io_channel_new(handle);
+	return i_io_channel_new(handle);
 }
 
 /* Disconnect socket */
@@ -298,7 +298,7 @@ GIOChannel *net_listen(IPADDR *my_ip, int *port)
 
 			/* start listening */
 			if (listen(handle, 1) >= 0)
-                                return g_io_channel_new(handle);
+				return i_io_channel_new(handle);
 		}
 
 	}
@@ -327,7 +327,7 @@ GIOChannel *net_accept(GIOChannel *handle, IPADDR *addr, int *port)
 	if (port != NULL) *port = sin_get_port(&so);
 
 	fcntl(ret, F_SETFL, O_NONBLOCK);
-	return g_io_channel_new(ret);
+	return i_io_channel_new(ret);
 }
 
 /* Read data from socket, return number of bytes read, -1 = error */
diff --git a/src/core/network.h b/src/core/network.h
index 1776005d..0747f018 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -31,13 +31,13 @@ struct _IPADDR {
 
 extern IPADDR ip4_any;
 
-GIOChannel *g_io_channel_new(int handle);
+GIOChannel *i_io_channel_new(int handle);
 
 /* Returns 1 if IPADDRs are the same. */
 /* Deprecated since it is unused. It will be deleted in a later release. */
 int net_ip_compare(IPADDR *ip1, IPADDR *ip2) G_GNUC_DEPRECATED;
-int g_io_channel_write_block(GIOChannel *channel, void *data, int len);
-int g_io_channel_read_block(GIOChannel *channel, void *data, int len);
+int i_io_channel_write_block(GIOChannel *channel, void *data, int len);
+int i_io_channel_read_block(GIOChannel *channel, void *data, int len);
 
 int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
 
diff --git a/src/core/servers.c b/src/core/servers.c
index 11dfeba3..841700d4 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -406,8 +406,8 @@ int server_start_connect(SERVER_REC *server)
 			return FALSE;
 		}
 
-		server->connect_pipe[0] = g_io_channel_new(fd[0]);
-		server->connect_pipe[1] = g_io_channel_new(fd[1]);
+		server->connect_pipe[0] = i_io_channel_new(fd[0]);
+		server->connect_pipe[1] = i_io_channel_new(fd[1]);
 
 		connect_address = server->connrec->proxy != NULL ?
 			server->connrec->proxy : server->connrec->address;
diff --git a/src/core/session.c b/src/core/session.c
index 0dc36fef..6f3908e5 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -262,7 +262,7 @@ static void session_restore_server(CONFIG_NODE *node)
 				  chatnet, password, nick);
 	if (conn != NULL) {
 		conn->reconnection = TRUE;
-		conn->connect_handle = g_io_channel_new(handle);
+		conn->connect_handle = i_io_channel_new(handle);
 
 		server = proto->server_init_connect(conn);
 		server->version = g_strdup(config_node_get_str(node, "version", NULL));
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index a69b3e7c..0e929bae 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -302,9 +302,9 @@ static void process_exec(PROCESS_REC *rec, const char *cmd)
 
 	if (rec->pid != 0) {
 		/* parent process */
-                GIOChannel *outio = g_io_channel_new(in[1]);
+		GIOChannel *outio = i_io_channel_new(in[1]);
 
-		rec->in = g_io_channel_new(out[0]);
+		rec->in = i_io_channel_new(out[0]);
 		rec->out = net_sendbuffer_create(outio, 0);
 
                 close(out[1]);
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 1183c8d7..19aba87d 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -74,7 +74,7 @@ static GIOChannel *net_listen_unix(const char *path)
 		goto error_unlink;
 	}
 
-	return g_io_channel_new(handle);
+	return i_io_channel_new(handle);
 
 error_unlink:
 	unlink(sa.sun_path);
@@ -99,7 +99,7 @@ static GIOChannel *net_accept_unix(GIOChannel *handle)
 		return NULL;
 
 	fcntl(ret, F_SETFL, O_NONBLOCK);
-	return g_io_channel_new(ret);
+	return i_io_channel_new(ret);
 }
 
 static void remove_client(CLIENT_REC *rec)
diff --git a/src/otr/key.c b/src/otr/key.c
index 26565c9a..36eb9f9d 100644
--- a/src/otr/key.c
+++ b/src/otr/key.c
@@ -107,7 +107,7 @@ static void emit_event(GIOChannel *pipe, enum key_gen_status status, gcry_error_
 	event.status = status;
 	event.error = error;
 
-	g_io_channel_write_block(pipe, &event, sizeof(event));
+	i_io_channel_write_block(pipe, &event, sizeof(event));
 }
 
 /*
@@ -137,7 +137,7 @@ static void read_key_gen_status(struct key_gen_worker *worker, GIOChannel *pipe)
 
 	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
 
-	if (g_io_channel_read_block(pipe, &event, sizeof(event)) == -1) {
+	if (i_io_channel_read_block(pipe, &event, sizeof(event)) == -1) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
 				TXT_OTR_KEYGEN_FAILED,
 				key_gen_state.account_name,
@@ -244,8 +244,8 @@ void key_gen_run(struct otr_user_state *ustate, const char *account_name)
 		return;
 	}
 
-	worker->pipes[0] = g_io_channel_new(fd[0]);
-	worker->pipes[1] = g_io_channel_new(fd[1]);
+	worker->pipes[0] = i_io_channel_new(fd[0]);
+	worker->pipes[1] = i_io_channel_new(fd[1]);
 
 	pid = fork();
 

From 8405c6970aaef56eef00659e19968d01f404be7a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 15:44:10 +0100
Subject: [PATCH 1177/1650] correct wrong function prefixes: g_hash_free_value
 -> i_hash_free_value

---
 src/fe-common/core/fe-messages.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index c1d87b2b..c4469178 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -774,7 +774,7 @@ static void sig_channel_joined(CHANNEL_REC *channel)
 	}
 }
 
-static void g_hash_free_value(void *key, void *value)
+static void i_hash_free_value(void *key, void *value)
 {
         g_free(value);
 }
@@ -825,7 +825,7 @@ void fe_messages_init(void)
 
 void fe_messages_deinit(void)
 {
-        g_hash_table_foreach(printnicks, (GHFunc) g_hash_free_value, NULL);
+	g_hash_table_foreach(printnicks, (GHFunc) i_hash_free_value, NULL);
 	g_hash_table_destroy(printnicks);
 
 	signal_remove("message public", (SIGNAL_FUNC) sig_message_public);

From b5ddc55fe663f49cfdb89ba8fce9de26def00579 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 5 Jan 2021 21:35:18 +0100
Subject: [PATCH 1178/1650] correct wrong function prefixes: gslist -> i_slist

---
 src/core/channels.c                          | 10 ++++------
 src/core/commands.c                          |  7 +++----
 src/core/log.c                               |  2 +-
 src/core/misc.c                              | 14 ++++++-------
 src/core/misc.h                              | 14 ++++++-------
 src/core/settings.c                          |  5 ++---
 src/fe-common/core/fe-common-core.c          |  2 +-
 src/fe-common/irc/fe-modes.c                 |  2 +-
 src/fe-common/irc/fe-netjoin.c               |  5 ++---
 src/fe-common/irc/notifylist/fe-notifylist.c |  2 +-
 src/irc/core/irc-cap.c                       | 21 ++++++++++----------
 src/irc/core/irc-servers.c                   |  4 ++--
 src/irc/core/servers-redirect.c              |  2 +-
 src/irc/dcc/dcc.c                            |  4 ++--
 src/irc/notifylist/notify-ison.c             |  2 +-
 src/perl/common/Settings.xs                  |  2 +-
 src/perl/perl-common.c                       |  2 +-
 17 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/src/core/channels.c b/src/core/channels.c
index edc30544..68209a7c 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -126,9 +126,8 @@ CHANNEL_REC *channel_find(SERVER_REC *server, const char *name)
 		return channel_find_server(server, name);
 
 	/* find from any server */
-	return gslist_foreach_find(servers,
-				   (FOREACH_FIND_FUNC) channel_find_server,
-				   (void *) name);
+	return i_slist_foreach_find(servers, (FOREACH_FIND_FUNC) channel_find_server,
+	                            (void *) name);
 }
 
 void channel_change_name(CHANNEL_REC *channel, const char *name)
@@ -153,9 +152,8 @@ void channel_change_visible_name(CHANNEL_REC *channel, const char *name)
 
 static CHANNEL_REC *channel_find_servers(GSList *servers, const char *name)
 {
-	return gslist_foreach_find(servers,
-				   (FOREACH_FIND_FUNC) channel_find_server,
-				   (void *) name);
+	return i_slist_foreach_find(servers, (FOREACH_FIND_FUNC) channel_find_server,
+	                            (void *) name);
 }
 
 static GSList *servers_find_chatnet_except(SERVER_REC *server)
diff --git a/src/core/commands.c b/src/core/commands.c
index e2bee576..deb5fe90 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -431,7 +431,7 @@ static void command_calc_options(COMMAND_REC *rec, const char *options)
 	g_strfreev(optlist);
 
 	/* linked list -> string[] */
-	str = gslist_to_string(list, " ");
+	str = i_slist_to_string(list, " ");
 	rec->options = g_strsplit(str, " ", -1);
         g_free(str);
 
@@ -831,7 +831,7 @@ void commands_remove_module(const char *module)
 		COMMAND_REC *rec = tmp->data;
 
                 next = tmp->next;
-		modlist = gslist_find_string(rec->modules, module);
+		modlist = i_slist_find_string(rec->modules, module);
 		if (modlist != NULL)
 			command_module_unbind_all(rec, modlist->data);
 	}
@@ -865,8 +865,7 @@ static int cmd_protocol_match(COMMAND_REC *cmd, SERVER_REC *server)
 #define alias_runstack_pop(alias) \
 	alias_runstack = g_slist_remove(alias_runstack, alias)
 
-#define alias_runstack_find(alias) \
-        (gslist_find_icase_string(alias_runstack, alias) != NULL)
+#define alias_runstack_find(alias) (i_slist_find_icase_string(alias_runstack, alias) != NULL)
 
 static void parse_command(const char *command, int expand_aliases,
 			  SERVER_REC *server, void *item)
diff --git a/src/core/log.c b/src/core/log.c
index 3e260fe7..cb6f1edd 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -561,7 +561,7 @@ static void log_read_config(void)
 		if (node != NULL)
 			log_items_read_config(node, log);
 
-		if (log->autoopen || gslist_find_string(fnames, log->fname))
+		if (log->autoopen || i_slist_find_string(fnames, log->fname))
 			log_start_logging(log);
 	}
 
diff --git a/src/core/misc.c b/src/core/misc.c
index d0c2a49e..576d23f2 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -167,7 +167,7 @@ int strarray_find(char **array, const char *item)
 	return -1;
 }
 
-GSList *gslist_find_string(GSList *list, const char *key)
+GSList *i_slist_find_string(GSList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
 		if (g_strcmp0(list->data, key) == 0) return list;
@@ -175,7 +175,7 @@ GSList *gslist_find_string(GSList *list, const char *key)
 	return NULL;
 }
 
-GSList *gslist_find_icase_string(GSList *list, const char *key)
+GSList *i_slist_find_icase_string(GSList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
 		if (g_ascii_strcasecmp(list->data, key) == 0) return list;
@@ -183,7 +183,7 @@ GSList *gslist_find_icase_string(GSList *list, const char *key)
 	return NULL;
 }
 
-void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data)
+void *i_slist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data)
 {
 	void *ret;
 
@@ -197,7 +197,7 @@ void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data
 	return NULL;
 }
 
-void gslist_free_full (GSList *list, GDestroyNotify free_func)
+void i_slist_free_full(GSList *list, GDestroyNotify free_func)
 {
 	GSList *tmp;
 
@@ -210,7 +210,7 @@ void gslist_free_full (GSList *list, GDestroyNotify free_func)
 	g_slist_free(list);
 }
 
-GSList *gslist_remove_string (GSList *list, const char *str)
+GSList *i_slist_remove_string(GSList *list, const char *str)
 {
 	GSList *l;
 
@@ -221,7 +221,7 @@ GSList *gslist_remove_string (GSList *list, const char *str)
 	return list;
 }
 
-GSList *gslist_delete_string (GSList *list, const char *str, GDestroyNotify free_func)
+GSList *i_slist_delete_string(GSList *list, const char *str, GDestroyNotify free_func)
 {
 	GSList *l;
 
@@ -255,7 +255,7 @@ char *gslistptr_to_string(GSList *list, int offset, const char *delimiter)
 }
 
 /* `list' contains char* */
-char *gslist_to_string(GSList *list, const char *delimiter)
+char *i_slist_to_string(GSList *list, const char *delimiter)
 {
 	GString *str;
 	char *ret;
diff --git a/src/core/misc.h b/src/core/misc.h
index a441a468..0774bbba 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -19,21 +19,21 @@ int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
 long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
 #pragma GCC diagnostic pop
 
-GSList *gslist_find_string(GSList *list, const char *key);
-GSList *gslist_find_icase_string(GSList *list, const char *key);
+GSList *i_slist_find_string(GSList *list, const char *key);
+GSList *i_slist_find_icase_string(GSList *list, const char *key);
 GList *glist_find_string(GList *list, const char *key);
 GList *glist_find_icase_string(GList *list, const char *key);
-GSList *gslist_remove_string (GSList *list, const char *str) G_GNUC_DEPRECATED;
-GSList *gslist_delete_string (GSList *list, const char *str, GDestroyNotify free_func);
+GSList *i_slist_remove_string(GSList *list, const char *str) G_GNUC_DEPRECATED;
+GSList *i_slist_delete_string(GSList *list, const char *str, GDestroyNotify free_func);
 
-void gslist_free_full (GSList *list, GDestroyNotify free_func);
+void i_slist_free_full(GSList *list, GDestroyNotify free_func);
 
-void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data);
+void *i_slist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data);
 
 /* `list' contains pointer to structure with a char* to string. */
 char *gslistptr_to_string(GSList *list, int offset, const char *delimiter);
 /* `list' contains char* */
-char *gslist_to_string(GSList *list, const char *delimiter);
+char *i_slist_to_string(GSList *list, const char *delimiter);
 
 GList *optlist_remove_known(const char *cmd, GHashTable *optlist);
 
diff --git a/src/core/settings.c b/src/core/settings.c
index 1720d922..04c7bbe6 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -613,9 +613,8 @@ void settings_check_module(const char *module)
 		}
 	}
 	if (count > 0) {
-		if (gslist_find_icase_string(last_invalid_modules,
-					     module) == NULL) {
-                        /* mark this module having invalid settings */
+		if (i_slist_find_icase_string(last_invalid_modules, module) == NULL) {
+			/* mark this module having invalid settings */
 			last_invalid_modules =
 				g_slist_append(last_invalid_modules,
 					       g_strdup(module));
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index c7cdd995..be6631b3 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -357,7 +357,7 @@ static void autoconnect_servers(void)
 
 		if (rec->autoconnect &&
 		    (rec->chatnet == NULL ||
-		     gslist_find_icase_string(chatnets, rec->chatnet) == NULL)) {
+		     i_slist_find_icase_string(chatnets, rec->chatnet) == NULL)) {
 			if (rec->chatnet != NULL) {
 				chatnets = g_slist_append(chatnets, rec->chatnet);
 				str = g_strdup_printf("-network %s %s %d", rec->chatnet, rec->address, rec->port);
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index 9ea2414d..623fca0c 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -84,7 +84,7 @@ static void print_mode(MODE_REC *rec)
 
 	tmp = modes; modes = NULL;
 
-	nicks = gslist_to_string(rec->nicks, ", ");
+	nicks = i_slist_to_string(rec->nicks, ", ");
 	printformat(rec->channel->server, rec->channel->visible_name, rec->level,
 	            IRCTXT_CHANMODE_CHANGE, rec->channel->visible_name, rec->mode, nicks, "");
 	g_free(nicks);
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index f6d9e4b3..ea41f7fa 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -212,8 +212,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channe
 			}
 
 			/* remove the channel from old_channels too */
-			old = gslist_find_icase_string(rec->old_channels,
-						       realchannel);
+			old = i_slist_find_icase_string(rec->old_channels, realchannel);
 			if (old != NULL) {
 				void *data = old->data;
 				rec->old_channels =
@@ -340,7 +339,7 @@ static void msg_join(IRC_SERVER_REC *server, const char *channel,
 
 	/* if this was not a channel they split from, treat it normally */
 	if (netjoin != NULL) {
-		if (!gslist_find_icase_string(netjoin->old_channels, channel))
+		if (!i_slist_find_icase_string(netjoin->old_channels, channel))
 			return;
 	} else {
 		channels = split->channels;
diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c
index 579b1824..68b98a09 100644
--- a/src/fe-common/irc/notifylist/fe-notifylist.c
+++ b/src/fe-common/irc/notifylist/fe-notifylist.c
@@ -46,7 +46,7 @@ static GSList *mask_add_once(GSList *list, const char *mask)
 	str = ptr == NULL ? g_strdup(mask) :
 		g_strndup(mask, (int) (ptr-mask));
 
-	if (gslist_find_icase_string(list, str) == NULL)
+	if (i_slist_find_icase_string(list, str) == NULL)
 		return g_slist_append(list, str);
 
 	g_free(str);
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index bcf5b5df..61a80066 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -31,19 +31,18 @@ int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 
 	/* If the negotiation hasn't been completed yet just queue the requests */
 	if (!server->cap_complete) {
-		if (enable && !gslist_find_string(server->cap_queue, cap)) {
+		if (enable && !i_slist_find_string(server->cap_queue, cap)) {
 			server->cap_queue = g_slist_prepend(server->cap_queue, g_strdup(cap));
 			return TRUE;
-		}
-		else if (!enable && gslist_find_string(server->cap_queue, cap)) {
-			server->cap_queue = gslist_delete_string(server->cap_queue, cap, g_free);
+		} else if (!enable && i_slist_find_string(server->cap_queue, cap)) {
+			server->cap_queue = i_slist_delete_string(server->cap_queue, cap, g_free);
 			return TRUE;
 		}
 
 		return FALSE;
 	}
 
-	if (enable && !gslist_find_string(server->cap_active, cap)) {
+	if (enable && !i_slist_find_string(server->cap_active, cap)) {
 		/* Make sure the required cap is supported by the server */
 		if (!g_hash_table_lookup_extended(server->cap_supported, cap, NULL, NULL))
 			return FALSE;
@@ -51,8 +50,7 @@ int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 		signal_emit("server cap req", 2, server, cap);
 		irc_send_cmdv(server, "CAP REQ %s", cap);
 		return TRUE;
-	}
-	else if (!enable && gslist_find_string(server->cap_active, cap)) {
+	} else if (!enable && i_slist_find_string(server->cap_active, cap)) {
 		char *negcap = g_strdup_printf("-%s", cap);
 
 		signal_emit("server cap req", 2, server, negcap);
@@ -200,7 +198,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 				}
 
 				/* Clear the queue here */
-				gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
+				i_slist_free_full(server->cap_queue, (GDestroyNotify) g_free);
 				server->cap_queue = NULL;
 
 				/* If the server doesn't support any cap we requested close the negotiation here */
@@ -223,8 +221,9 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			disable = (*caps[i] == '-');
 
 			if (disable)
-				server->cap_active = gslist_delete_string(server->cap_active, caps[i] + 1, g_free);
-			else if (!gslist_find_string(server->cap_active, caps[i]))
+				server->cap_active =
+				    i_slist_delete_string(server->cap_active, caps[i] + 1, g_free);
+			else if (!i_slist_find_string(server->cap_active, caps[i]))
 				server->cap_active = g_slist_prepend(server->cap_active, g_strdup(caps[i]));
 
 			if (!strcmp(caps[i], "sasl"))
@@ -273,7 +272,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 			cap_emit_signal(server, "delete", key);
 			/* The server removed this CAP, remove it from the list
 			 * of the active ones if we had requested it */
-			server->cap_active = gslist_delete_string(server->cap_active, key, g_free);
+			server->cap_active = i_slist_delete_string(server->cap_active, key, g_free);
 			/* We don't transfer the ownership of those two
 			 * variables this time, just free them when we're done. */
 			g_free(key);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index fa02094e..cde6a4fc 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -443,7 +443,7 @@ static void sig_destroyed(IRC_SERVER_REC *server)
 	g_slist_free(server->cmdqueue);
 	server->cmdqueue = NULL;
 
-	gslist_free_full(server->cap_active, (GDestroyNotify) g_free);
+	i_slist_free_full(server->cap_active, (GDestroyNotify) g_free);
 	server->cap_active = NULL;
 
 	if (server->cap_supported) {
@@ -451,7 +451,7 @@ static void sig_destroyed(IRC_SERVER_REC *server)
 		server->cap_supported = NULL;
 	}
 
-	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
+	i_slist_free_full(server->cap_queue, (GDestroyNotify) g_free);
 	server->cap_queue = NULL;
 
 	/* was g_free_and_null, but can't use on a GString */
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 770aa4c2..2790c75a 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -219,7 +219,7 @@ static char *signal_list_move(GSList **signals, const char *event)
 	GSList *link;
         char *linkevent, *linksignal;
 
-	link = gslist_find_string(*signals, event);
+	link = i_slist_find_string(*signals, event);
 	if (link == NULL)
 		return NULL;
 
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index 4c276ac6..bb1c6c22 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -55,7 +55,7 @@ void dcc_unregister_type(const char *type)
 {
 	GSList *pos;
 
-	pos = gslist_find_string(dcc_types, type);
+	pos = i_slist_find_string(dcc_types, type);
 	if (pos != NULL) {
 		void *tmp = pos->data;
 		dcc_types = g_slist_remove(dcc_types, pos->data);
@@ -65,7 +65,7 @@ void dcc_unregister_type(const char *type)
 
 int dcc_str2type(const char *str)
 {
-	if (gslist_find_string(dcc_types, str) == NULL)
+	if (i_slist_find_string(dcc_types, str) == NULL)
 		return -1;
 
         return module_get_uniq_id_str("DCC", str);
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index 910c0b73..32316038 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -279,7 +279,7 @@ static void ison_check_parts(IRC_SERVER_REC *server)
 		NOTIFY_NICK_REC *rec = tmp->data;
 		next = tmp->next;
 
-		if (gslist_find_icase_string(mserver->ison_tempusers, rec->nick) != NULL)
+		if (i_slist_find_icase_string(mserver->ison_tempusers, rec->nick) != NULL)
 			continue;
 
                 notifylist_left(server, rec);
diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs
index d1bce856..20596c86 100644
--- a/src/perl/common/Settings.xs
+++ b/src/perl/common/Settings.xs
@@ -26,7 +26,7 @@ static void perl_settings_remove(const char *key)
 	g_return_if_fail(script != NULL);
 
 	list = g_hash_table_lookup(perl_settings, script);
-	pos = gslist_find_icase_string(list, key);
+	pos = i_slist_find_icase_string(list, key);
 	if (pos != NULL) {
 		list = g_slist_remove(list, pos->data);
 		g_hash_table_insert(perl_settings, script, list);
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 0c2b90e7..7eaab8eb 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -664,7 +664,7 @@ static void perl_unregister_protocol(CHAT_PROTOCOL_REC *rec)
 	GSList *item;
 	void *data;
 
-	item = gslist_find_icase_string(use_protocols, rec->name);
+	item = i_slist_find_icase_string(use_protocols, rec->name);
 	if (item != NULL) {
 		data = item->data;
 		use_protocols = g_slist_remove(use_protocols, data);

From aa653aa3892b363d32b9096ff17a1083f2a60102 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 7 Jan 2021 10:09:29 +0100
Subject: [PATCH 1179/1650] correct wrong function prefixes: glog_func ->
 i_log_func

---
 src/fe-common/core/fe-common-core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index be6631b3..8f412198 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -254,8 +254,7 @@ void fe_common_core_deinit(void)
         signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 }
 
-void glog_func(const char *log_domain, GLogLevelFlags log_level,
-	       const char *message)
+void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *message)
 {
 	const char *reason;
 
@@ -459,7 +458,7 @@ void fe_common_core_finish_init(void)
 	signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed);
 
         /* _after_ windows are created.. */
-	g_log_set_default_handler((GLogFunc) glog_func, NULL);
+	g_log_set_default_handler((GLogFunc) i_log_func, NULL);
 
 	if (setup_changed)
                 signal_emit("setup changed", 0);

From 504cf217838052204fac34547efcef72af9c58a5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 15:50:34 +0100
Subject: [PATCH 1180/1650] correct wrong function prefixes: remove g_free_true

---
 src/fe-text/textbuffer-view.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index bc7cc5a8..9af3cb3c 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -1376,12 +1376,6 @@ void textbuffer_view_remove_lines_by_level(TEXT_BUFFER_VIEW_REC *view, int level
 	term_refresh_thaw();
 }
 
-static int g_free_true(void *data)
-{
-	g_free(data);
-        return TRUE;
-}
-
 /* Remove all lines from buffer. */
 void textbuffer_view_remove_all_lines(TEXT_BUFFER_VIEW_REC *view)
 {
@@ -1389,8 +1383,8 @@ void textbuffer_view_remove_all_lines(TEXT_BUFFER_VIEW_REC *view)
 
 	textbuffer_remove_all_lines(view->buffer);
 
-	g_hash_table_foreach_remove(view->bookmarks,
-				    (GHRFunc) g_free_true, NULL);
+	g_hash_table_foreach(view->bookmarks, (GHFunc) g_free, NULL);
+	g_hash_table_remove_all(view->bookmarks);
 
 	textbuffer_view_reset_cache(view);
 	textbuffer_view_clear(view);

From 68da49db784591139b1b45a61231286347eb6eaf Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 16:18:54 +0100
Subject: [PATCH 1181/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 02bdbeb8..bb339f1f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 32
+#define IRSSI_ABI_VERSION 33
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 16b1d587036d4becc71bfeec202f83bed1362884 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 7 Jan 2021 09:12:17 +0100
Subject: [PATCH 1182/1650] Abort Irssi on wrong entries in the channels or
 servers config

---
 src/core/channels-setup.c | 13 +++++++++++--
 src/core/servers-setup.c  | 13 +++++++++++--
 src/fe-text/irssi.c       | 25 ++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index cd323a84..c72f057c 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -207,9 +207,18 @@ static void channels_read_config(void)
 	/* Read channels */
 	node = iconfig_node_traverse("channels", FALSE);
 	if (node != NULL) {
+		int i = 0;
 		tmp = config_node_first(node->value);
-		for (; tmp != NULL; tmp = config_node_next(tmp))
-			channel_setup_read(tmp->data);
+		for (; tmp != NULL; tmp = config_node_next(tmp), i++) {
+			node = tmp->data;
+			if (node->type != NODE_TYPE_BLOCK) {
+				g_critical("Expected block node at `channels[%d]' was of %s type. "
+				           "Corrupt config?",
+				           i, node->type == NODE_TYPE_LIST ? "list" : "scalar");
+			} else {
+				channel_setup_read(node);
+			}
+		}
 	}
 }
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 6e4e238a..43653c43 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -625,9 +625,18 @@ static void read_servers(void)
 	/* Read servers */
 	node = iconfig_node_traverse("servers", FALSE);
 	if (node != NULL) {
+		int i = 0;
 		tmp = config_node_first(node->value);
-		for (; tmp != NULL; tmp = config_node_next(tmp))
-			server_setup_read(tmp->data);
+		for (; tmp != NULL; tmp = config_node_next(tmp), i++) {
+			node = tmp->data;
+			if (node->type != NODE_TYPE_BLOCK) {
+				g_critical("Expected block node at `servers[%d]' was of %s type. "
+				           "Corrupt config?",
+				           i, node->type == NODE_TYPE_LIST ? "list" : "scalar");
+			} else {
+				server_setup_read(node);
+			}
+		}
 	}
 }
 
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 1b891522..5c20eb37 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -162,6 +162,16 @@ static void textui_init(void)
 	signal_add_last("gui exit", (SIGNAL_FUNC) sig_exit);
 }
 
+static int critical_fatal_section_begin(void)
+{
+	return g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
+}
+
+static void critical_fatal_section_end(int loglev)
+{
+	g_log_set_always_fatal(loglev);
+}
+
 static void textui_finish_init(void)
 {
 	int loglev;
@@ -182,10 +192,9 @@ static void textui_finish_init(void)
 	mainwindows_layout_init();
 	gui_windows_init();
 	/* Temporarily raise the fatal level to abort on config errors. */
-	loglev = g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
+	loglev = critical_fatal_section_begin();
 	statusbar_init();
-	g_log_set_always_fatal(loglev);
-	term_refresh_thaw();
+	critical_fatal_section_end(loglev);
 
 	settings_check();
 
@@ -202,7 +211,12 @@ static void textui_finish_init(void)
 
 	dirty_check();
 
+	/* Temporarily raise the fatal level to abort on config errors. */
+	loglev = critical_fatal_section_begin();
 	fe_common_core_finish_init();
+	critical_fatal_section_end(loglev);
+	term_refresh_thaw();
+
 	signal_emit("irssi init finished", 0);
 	statusbar_redraw(NULL, TRUE);
 
@@ -329,7 +343,7 @@ int main(int argc, char **argv)
 	setlocale(LC_ALL, "");
 
 	/* Temporarily raise the fatal level to abort on config errors. */
-	loglev = g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
+	loglev = critical_fatal_section_begin();
 	textui_init();
 
 	if (!term_init()) {
@@ -337,7 +351,8 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	g_log_set_always_fatal(loglev);
+	critical_fatal_section_end(loglev);
+
 	textui_finish_init();
 	main_loop = g_main_loop_new(NULL, TRUE);
 

From 4db0535b32d85821974f3e8f8dd598575b9870b3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 7 Jan 2021 18:31:41 +0100
Subject: [PATCH 1183/1650] undraft setname

---
 src/irc/core/irc-servers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index b7d31038..e775e505 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -20,7 +20,7 @@
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"
 #define CAP_EXTENDED_JOIN "extended-join"
-#define CAP_SETNAME "draft/setname"
+#define CAP_SETNAME "setname"
 #define CAP_INVITE_NOTIFY "invite-notify"
 #define CAP_AWAY_NOTIFY "away-notify"
 #define CAP_CHGHOST "chghost"

From b7bea3d2f38f47e2917134ef2509e44042457513 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Thu, 7 Jan 2021 20:00:26 +0100
Subject: [PATCH 1184/1650] Update ignore.in

---
 docs/help/in/ignore.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index cb2393d2..0fbf970d 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -37,13 +37,13 @@
     /IGNORE #irssi ALL -PUBLIC -ACTIONS
     /IGNORE -replies *!*@*.irssi.org ALL
     /IGNORE -regexp -pattern (away|gone|back|playing|returned) * ACTIONS
+    /IGNORE -regexp -pattern (away|gone|back|playing|returned) #channel ACTIONS
     /IGNORE *zzz* NICKS
     /IGNORE *afk* NICKS
     /IGNORE *away* NICKS
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
     /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS
-    /IGNORE -regexp -pattern
 
 %9See also:%9 ACCEPT, SILENCE, UNIGNORE
 

From a76debde58439fcb0f4d51633f8b60c00671fe51 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 20 Jan 2021 09:58:25 +0100
Subject: [PATCH 1185/1650] unfix breakage in python setuptools

see pypa/setuptools#2541
---
 .github/workflows/check.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 55499ce3..038d2416 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -8,7 +8,7 @@ env:
   apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
   apt_build_deps_meson: ninja-build
   apt_build_deps_autotools: autoconf automake libtool
-  get_pip_build_deps_meson: pip3 install setuptools; pip3 install wheel; pip3 install meson${meson_ver:+==${meson_ver}}
+  get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel; pip3 install meson${meson_ver}
   build_options_meson: -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes
   build_options_configure: --with-proxy=module --with-bot --with-perl=module --with-otr=module
   prefix: ~/irssi-build
@@ -42,7 +42,8 @@ jobs:
         include:
           - os: ubuntu-16.04
             builder: meson
-            meson_ver: 0.49.2
+            meson_ver: ==0.49.2
+            setuptools_ver: <51
     steps:
       - name: fetch dist
         uses: actions/download-artifact@v2
@@ -52,6 +53,7 @@ jobs:
       - name: prepare required software
         env:
           meson_ver: ${{ matrix.meson_ver }}
+          setuptools_ver: ${{ matrix.setuptools_ver }}
         run: |
           sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
           eval "$get_pip_build_deps_${{ matrix.builder }}"

From feb83b20584b4e33a9a5427841995d8311fc6aee Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 30 Jan 2021 23:21:14 +0100
Subject: [PATCH 1186/1650] two more wrong prefixes

---
 src/core/misc.c                      |  4 ++--
 src/core/misc.h                      |  4 ++--
 src/fe-common/core/chat-completion.c | 16 ++++++++--------
 src/fe-common/core/completion.c      |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index 576d23f2..c66bbd6d 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -293,7 +293,7 @@ GList *optlist_remove_known(const char *cmd, GHashTable *optlist)
 	return list;
 }
 
-GList *glist_find_string(GList *list, const char *key)
+GList *i_list_find_string(GList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
 		if (g_strcmp0(list->data, key) == 0) return list;
@@ -301,7 +301,7 @@ GList *glist_find_string(GList *list, const char *key)
 	return NULL;
 }
 
-GList *glist_find_icase_string(GList *list, const char *key)
+GList *i_list_find_icase_string(GList *list, const char *key)
 {
 	for (; list != NULL; list = list->next)
 		if (g_ascii_strcasecmp(list->data, key) == 0) return list;
diff --git a/src/core/misc.h b/src/core/misc.h
index 0774bbba..76f5644b 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -21,8 +21,8 @@ long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATE
 
 GSList *i_slist_find_string(GSList *list, const char *key);
 GSList *i_slist_find_icase_string(GSList *list, const char *key);
-GList *glist_find_string(GList *list, const char *key);
-GList *glist_find_icase_string(GList *list, const char *key);
+GList *i_list_find_string(GList *list, const char *key);
+GList *i_list_find_icase_string(GList *list, const char *key);
 GSList *i_slist_remove_string(GSList *list, const char *str) G_GNUC_DEPRECATED;
 GSList *i_slist_delete_string(GSList *list, const char *str, GDestroyNotify free_func);
 
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index fb052f7f..be16db7e 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -374,10 +374,10 @@ static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
 	for (tmp = mchannel->lastmsgs; tmp != NULL; tmp = tmp->next) {
 		LAST_MSG_REC *rec = tmp->data;
 
-		if ((match_case? strncmp(rec->nick, nick, len)
-		     : g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
-		    (match_case? glist_find_string(*outlist, rec->nick)
-		     : glist_find_icase_string(*outlist, rec->nick)) == NULL) {
+		if ((match_case ? strncmp(rec->nick, nick, len) :
+		                  g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
+		    (match_case ? i_list_find_string(*outlist, rec->nick) :
+		                  i_list_find_icase_string(*outlist, rec->nick)) == NULL) {
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase) ascii_strdown(str);
 			if (rec->own)
@@ -435,7 +435,7 @@ static GList *completion_nicks_nonstrict(CHANNEL_REC *channel,
 			if (completion_lowercase)
 				ascii_strdown(tnick);
 
-			if (glist_find_icase_string(list, tnick) == NULL)
+			if (i_list_find_icase_string(list, tnick) == NULL)
 				list = g_list_append(list, tnick);
 			else
                                 g_free(tnick);
@@ -482,7 +482,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase)
 				ascii_strdown(str);
-                        if (glist_find_icase_string(list, str) == NULL)
+			if (i_list_find_icase_string(list, str) == NULL)
 				list = g_list_append(list, str);
 			else
                                 g_free(str);
@@ -505,7 +505,7 @@ static GList *completion_joinlist(GList *list1, GList *list2)
 
 	old = list2;
 	while (list2 != NULL) {
-		if (!glist_find_icase_string(list1, list2->data))
+		if (!i_list_find_icase_string(list1, list2->data))
 			list1 = g_list_append(list1, list2->data);
 		else
 			g_free(list2->data);
@@ -570,7 +570,7 @@ GList *completion_get_channels(SERVER_REC *server, const char *word)
 		CHANNEL_SETUP_REC *rec = tmp->data;
 
 		if (g_ascii_strncasecmp(rec->name, word, len) == 0 &&
-		    glist_find_icase_string(list, rec->name) == NULL)
+		    i_list_find_icase_string(list, rec->name) == NULL)
 			list = g_list_append(list, g_strdup(rec->name));
 
 	}
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index a897c452..06ac124c 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -460,7 +460,7 @@ static GList *completion_get_aliases(const char *alias, char cmdchar)
 			/* add matching alias to completion list, aliases will
 			   be appended after command completions and kept in
 			   uppercase to show it's an alias */
-			if (glist_find_icase_string(complist, word) == NULL)
+			if (i_list_find_icase_string(complist, word) == NULL)
 				complist =
 				    g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
 			else
@@ -490,7 +490,7 @@ static GList *completion_get_commands(const char *cmd, char cmdchar)
 		if (g_ascii_strncasecmp(rec->cmd, cmd, len) == 0) {
 			word = cmdchar == '\0' ? g_strdup(rec->cmd) :
 				g_strdup_printf("%c%s", cmdchar, rec->cmd);
-			if (glist_find_icase_string(complist, word) == NULL)
+			if (i_list_find_icase_string(complist, word) == NULL)
 				complist =
 				    g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
 			else

From e7f3946583f1f0fbd5c1847ba717130149cf54e8 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 2 Feb 2021 00:24:34 +0100
Subject: [PATCH 1187/1650] configure automake with nostdinc

the current directoryh won't be added to the compiler's -I path
---
 configure.ac                             | 2 +-
 src/core/Makefile.am                     | 1 +
 src/fe-common/core/Makefile.am           | 1 +
 src/fe-common/irc/Makefile.am            | 1 +
 src/fe-common/irc/dcc/Makefile.am        | 1 +
 src/fe-common/irc/notifylist/Makefile.am | 1 +
 src/fe-fuzz/Makefile.am                  | 1 +
 src/fe-fuzz/fe-common/core/Makefile.am   | 1 +
 src/fe-fuzz/irc/core/Makefile.am         | 1 +
 src/fe-none/Makefile.am                  | 1 +
 src/fe-text/Makefile.am                  | 1 +
 src/irc/core/Makefile.am                 | 1 +
 src/irc/dcc/Makefile.am                  | 1 +
 src/irc/flood/Makefile.am                | 1 +
 src/irc/notifylist/Makefile.am           | 1 +
 src/irc/proxy/Makefile.am                | 1 +
 src/lib-config/Makefile.am               | 1 +
 src/otr/Makefile.am                      | 1 +
 src/perl/Makefile.am                     | 2 ++
 tests/fe-common/core/Makefile.am         | 1 +
 tests/fe-text/Makefile.am                | 1 +
 tests/irc/core/Makefile.am               | 1 +
 tests/irc/flood/Makefile.am              | 1 +
 23 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 453fcd33..cafd2970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.50)
 
 AC_CONFIG_HEADERS([irssi-config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects])
+AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects nostdinc])
 
 AM_SILENT_RULES([yes])
 
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b49dad18..493c42b2 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libcore.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DMODULEDIR=\""$(libdir)/irssi/modules"\"
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 7e76d3a0..01e934e0 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libfe_common_core.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index 401720f6..8a04bee4 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = dcc notifylist
 noinst_LIBRARIES = libfe_common_irc.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index 0be3cffa..feee349d 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libfe_irc_dcc.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index 6fca7676..5eecb5fb 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libfe_irc_notifylist.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index d54c3291..3efa83b6 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -6,6 +6,7 @@ bin_PROGRAMS = irssi-fuzz server-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 irssi_fuzz_DEPENDENCIES = @COMMON_LIBS@
diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
index 8fcd59b3..8f6ae477 100644
--- a/src/fe-fuzz/fe-common/core/Makefile.am
+++ b/src/fe-fuzz/fe-common/core/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = theme-load-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 LDADD = \
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
index 33f7664d..9221e29e 100644
--- a/src/fe-fuzz/irc/core/Makefile.am
+++ b/src/fe-fuzz/irc/core/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = event-get-params-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 LDADD = \
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
index 44c23d6e..bbcd63f8 100644
--- a/src/fe-none/Makefile.am
+++ b/src/fe-none/Makefile.am
@@ -1,6 +1,7 @@
 bin_PROGRAMS = botti
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 botti_DEPENDENCIES = @COMMON_NOUI_LIBS@
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index c7044ba9..d97cbfa5 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -1,6 +1,7 @@
 bin_PROGRAMS = irssi
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 irssi_DEPENDENCIES = \
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index 858d7fcb..5881481b 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_core.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index 887a65d2..c5592f7f 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_dcc.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_dcc_a_SOURCES = \
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index 7a49001d..4b37cede 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_flood.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_flood_a_SOURCES = \
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index 9bc0fd8b..3f913d58 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_notifylist.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_notifylist_a_SOURCES = \
diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am
index 2e7259ad..437a6dc0 100644
--- a/src/irc/proxy/Makefile.am
+++ b/src/irc/proxy/Makefile.am
@@ -2,6 +2,7 @@ moduledir = $(libdir)/irssi/modules
 module_LTLIBRARIES = libirc_proxy.la
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_proxy.a:
diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am
index 4912aa9b..cd319edb 100644
--- a/src/lib-config/Makefile.am
+++ b/src/lib-config/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirssi_config.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirssi_config_a_SOURCES = \
diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am
index 149b952d..b9b82d9a 100644
--- a/src/otr/Makefile.am
+++ b/src/otr/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_LTLIBRARIES = \
 	libotr_core_static.la
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	$(OTR_CFLAGS)
 
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index ad937457..ca81d3c6 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -15,6 +15,8 @@ perl-core.lo: irssi-core.pl.h
 perl-signals.lo: perl-signals-list.h
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	-I$(builddir) \
 	$(GLIB_CFLAGS) \
 	-DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \
 	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am
index eb7e2c7f..15287601 100644
--- a/tests/fe-common/core/Makefile.am
+++ b/tests/fe-common/core/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=fe-common/core
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 test_programs = test-formats
diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am
index 8f44dded..a0e1d0f5 100644
--- a/tests/fe-text/Makefile.am
+++ b/tests/fe-text/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=fe-text
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 test_programs = test-paste-join-multiline
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index fbf001da..503989a9 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=irc/core
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
index f815504d..6c4eec84 100644
--- a/tests/irc/flood/Makefile.am
+++ b/tests/irc/flood/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=irc/flood
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 

From 33bfd88d9ecb6a89992d9c3c7bc5ec9665c3538c Mon Sep 17 00:00:00 2001
From: ihsinme <61293369+ihsinme@users.noreply.github.com>
Date: Fri, 5 Feb 2021 18:34:54 +0300
Subject: [PATCH 1188/1650] Update gui-entry.c

---
 src/fe-text/gui-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index d1cc8811..4fde83c8 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -835,7 +835,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	}
 
 	if (entry->utf8)
-		while (entry->pos-size-w > 0 &&
+		while (entry->pos > size-w &&
 		       i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
 
 	memmove(entry->text + entry->pos - size, entry->text + entry->pos,

From 5e88c107f1bfeee9a0f62a5a47017b47f69f9c47 Mon Sep 17 00:00:00 2001
From: ihsinme <61293369+ihsinme@users.noreply.github.com>
Date: Fri, 5 Feb 2021 18:36:15 +0300
Subject: [PATCH 1189/1650] Update gui-entry.c

---
 src/fe-text/gui-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 4fde83c8..3995319e 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -835,7 +835,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	}
 
 	if (entry->utf8)
-		while (entry->pos > size-w &&
+		while (entry->pos > size+w &&
 		       i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
 
 	memmove(entry->text + entry->pos - size, entry->text + entry->pos,

From 39ed1ba0552ea03239cd056cb788ba51e47bef75 Mon Sep 17 00:00:00 2001
From: ihsinme <61293369+ihsinme@users.noreply.github.com>
Date: Fri, 5 Feb 2021 22:48:43 +0300
Subject: [PATCH 1190/1650] Update gui-entry.c

---
 src/fe-text/gui-entry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 3995319e..25965495 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -835,8 +835,8 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	}
 
 	if (entry->utf8)
-		while (entry->pos > size+w &&
-		       i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
+		while (entry->pos > size + w && i_wcwidth(entry->text[entry->pos - size - w]) == 0)
+			w++;
 
 	memmove(entry->text + entry->pos - size, entry->text + entry->pos,
 	        (entry->text_len-entry->pos+1) * sizeof(unichar));

From 23e4bfa1db0bc3397e74ea0f075f90a7e40350ac Mon Sep 17 00:00:00 2001
From: ihsinme <61293369+ihsinme@users.noreply.github.com>
Date: Mon, 8 Feb 2021 12:17:09 +0300
Subject: [PATCH 1191/1650] Update write-buffer.c

---
 src/core/write-buffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/write-buffer.c b/src/core/write-buffer.c
index 475e41b8..a1401542 100644
--- a/src/core/write-buffer.c
+++ b/src/core/write-buffer.c
@@ -63,14 +63,14 @@ int write_buffer(int handle, const void *data, int size)
         const char *cdata = data;
 	int next_size;
 
+	if (size <= 0)
+		return size;
+
 	if (write_buffer_max_blocks <= 0) {
 		/* no write buffer */
                 return write(handle, data, size);
 	}
 
-	if (size <= 0)
-		return size;
-
 	rec = g_hash_table_lookup(buffers, GINT_TO_POINTER(handle));
 	if (rec == NULL) {
 		rec = g_new0(BUFFER_REC, 1);

From a426d669dc729a78f862db52754ed968a17ab818 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Thu, 18 Feb 2021 14:47:07 +0100
Subject: [PATCH 1192/1650] Update dcc-get.c

---
 src/irc/dcc/dcc-get.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 5af557ea..0214387b 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -177,6 +177,7 @@ static void sig_dccget_receive(GET_DCC_REC *dcc)
                         return;
 		}
 		dcc->transfd += ret;
+		break;
 	}
 
 	/* send number of total bytes received */

From ccf59868e244cd2ff88eb851f7e959a357aa8df0 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 24 Feb 2021 21:57:11 +0100
Subject: [PATCH 1193/1650] update deprecated GLib symbol

g_main_quit -> g_main_loop_quit
---
 src/fe-none/irssi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index e7b4c427..6a02ff6a 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -39,7 +39,7 @@ static int reload;
 
 static void sig_exit(void)
 {
-	g_main_quit(main_loop);
+	g_main_loop_quit(main_loop);
 }
 
 static void sig_reload(void)

From 33d8cc3254bd8b2232efeb0b91eb52719c5d5e41 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:55:57 +0200
Subject: [PATCH 1194/1650] GLib < 2.56 compat code for
 g_date_time_new_from_iso8601

---
 src/fe-text/textbuffer-formats.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 84aaebb9..17ec118a 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -16,6 +16,21 @@
 TEXT_BUFFER_REC *color_buf;
 int scrollback_format;
 
+#if GLIB_CHECK_VERSION(2, 56, 0)
+/* nothing */
+#else
+/* compatibility code for old GLib */
+static GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *default_tz)
+{
+	GTimeVal time;
+	if (g_time_val_from_iso8601(iso_date, &time)) {
+		return g_date_time_new_from_timeval_utc(&time);
+	} else {
+		return NULL;
+	}
+}
+#endif
+
 static void collector_free(GSList **collector)
 {
 	while (*collector) {

From d535a79730ea291a1dfe9f5be190009eecc1e275 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 20 Aug 2019 01:47:52 +0200
Subject: [PATCH 1195/1650] implement server-time

---
 src/core/expandos.c              | 24 +++++++--
 src/core/expandos.h              |  1 +
 src/core/refstrings.c            | 11 +++-
 src/core/refstrings.h            |  2 +
 src/core/server-rec.h            |  3 ++
 src/core/servers.c               | 25 ++++++++-
 src/core/servers.h               |  7 +++
 src/fe-common/core/formats.c     | 26 ++++++----
 src/fe-common/core/formats.h     |  1 +
 src/fe-text/gui-printtext.c      |  9 ++--
 src/fe-text/textbuffer-formats.c | 76 ++++++++++++++++++++++++---
 src/fe-text/textbuffer-formats.h |  6 +++
 src/fe-text/textbuffer.c         | 18 ++++---
 src/fe-text/textbuffer.h         |  2 +
 src/irc/core/irc-servers.c       |  1 +
 src/irc/core/irc-servers.h       |  1 +
 src/irc/core/irc.c               | 89 +++++++++++++++++++++++++++++---
 src/irc/core/irc.h               |  3 ++
 src/perl/common/Server.xs        | 14 +++++
 src/perl/irc/Irc.xs              | 21 +++++++-
 src/perl/textui/TextBuffer.xs    | 26 ++++++++++
 21 files changed, 325 insertions(+), 41 deletions(-)

diff --git a/src/core/expandos.c b/src/core/expandos.c
index 9280b6f3..0f317e51 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -48,6 +48,7 @@ typedef struct {
 } EXPANDO_REC;
 
 const char *current_expando = NULL;
+time_t reference_time = (time_t) -1;
 time_t current_time = (time_t)-1;
 
 static int timer_tag;
@@ -59,6 +60,7 @@ static char *last_privmsg_from, *last_public_from;
 static char *sysname, *sysrelease, *sysarch;
 
 static char *timestamp_format;
+static char *timestamp_format_alt;
 static int timestamp_seconds;
 static time_t last_timestamp;
 
@@ -441,12 +443,24 @@ static char *expando_time(SERVER_REC *server, void *item, int *free_ret)
 	time_t now;
 	struct tm *tm;
         char str[256];
+	char *format;
 
-        now = current_time != (time_t)-1 ? current_time : time(NULL);
+	now = current_time != (time_t) -1 ? current_time : time(NULL);
 	tm = localtime(&now);
+	format = timestamp_format;
 
-	if (strftime(str, sizeof(str), timestamp_format, tm) == 0)
-                return "";
+	if (reference_time != (time_t) -1) {
+		time_t ref = reference_time;
+		struct tm tm_ref;
+		if (localtime_r(&ref, &tm_ref)) {
+			if (tm_ref.tm_yday != tm->tm_yday || tm_ref.tm_year != tm->tm_year) {
+				format = timestamp_format_alt;
+			}
+		}
+	}
+
+	if (strftime(str, sizeof(str), format, tm) == 0)
+		return "";
 
 	*free_ret = TRUE;
         return g_strdup(str);
@@ -576,7 +590,9 @@ static int sig_timer(void)
 static void read_settings(void)
 {
 	g_free_not_null(timestamp_format);
+	g_free_not_null(timestamp_format_alt);
 	timestamp_format = g_strdup(settings_get_str("timestamp_format"));
+	timestamp_format_alt = g_strdup(settings_get_str("timestamp_format_alt"));
 
 	timestamp_seconds =
 		strstr(timestamp_format, "%r") != NULL ||
@@ -594,6 +610,7 @@ void expandos_init(void)
 #endif
 	settings_add_str("misc", "STATUS_OPER", "*");
 	settings_add_str("lookandfeel", "timestamp_format", "%H:%M");
+	settings_add_str("lookandfeel", "timestamp_format_alt", "%a %e %b %H:%M");
 	settings_add_bool("lookandfeel", "chanmode_expando_strip", FALSE);
 
 	last_sent_msg = NULL; last_sent_msg_body = NULL;
@@ -730,6 +747,7 @@ void expandos_deinit(void)
 	g_free_not_null(sysrelease);
 	g_free_not_null(sysarch);
 	g_free_not_null(timestamp_format);
+	g_free_not_null(timestamp_format_alt);
 
 	g_source_remove(timer_tag);
 	signal_remove("message public", (SIGNAL_FUNC) sig_message_public);
diff --git a/src/core/expandos.h b/src/core/expandos.h
index c03333a7..17cee608 100644
--- a/src/core/expandos.h
+++ b/src/core/expandos.h
@@ -18,6 +18,7 @@ typedef char* (*EXPANDO_FUNC)
 
 extern const char *current_expando;
 extern time_t current_time;
+extern time_t reference_time;
 
 /* Create expando - overrides any existing ones.
    ... = signal, type, ..., NULL - list of signals that might change the
diff --git a/src/core/refstrings.c b/src/core/refstrings.c
index 4b675fa5..8391766d 100644
--- a/src/core/refstrings.c
+++ b/src/core/refstrings.c
@@ -3,7 +3,16 @@
 #include <irssi/src/core/refstrings.h>
 
 #if GLIB_CHECK_VERSION(2, 58, 0)
-/* nothing */
+
+/* callback implementation for GHashTable */
+#undef i_refstr_release
+void i_refstr_release(char *str)
+{
+	if (str != NULL) {
+		g_ref_string_release(str);
+	}
+}
+
 #else
 
 GHashTable *i_refstr_table;
diff --git a/src/core/refstrings.h b/src/core/refstrings.h
index 79036a20..35f52176 100644
--- a/src/core/refstrings.h
+++ b/src/core/refstrings.h
@@ -6,6 +6,8 @@
 #if GLIB_CHECK_VERSION(2, 58, 0)
 
 #define i_refstr_init() /* nothing */
+/* callback implementation */
+void i_refstr_release(char *str);
 #define i_refstr_release(str) ((str) == NULL ? NULL : g_ref_string_release(str))
 #define i_refstr_intern(str) ((str) == NULL ? NULL : g_ref_string_new_intern(str))
 #define i_refstr_deinit() /* nothing */
diff --git a/src/core/server-rec.h b/src/core/server-rec.h
index c36c8abb..6c7c63e3 100644
--- a/src/core/server-rec.h
+++ b/src/core/server-rec.h
@@ -44,6 +44,9 @@ int lag; /* server lag in milliseconds */
 GSList *channels;
 GSList *queries;
 
+/* transient meta data stash */
+GHashTable *current_incoming_meta;
+
 /* -- support for multiple server types -- */
 
 /* -- must not be NULL: -- */
diff --git a/src/core/servers.c b/src/core/servers.c
index 841700d4..a20d5f4a 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -19,14 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
 #include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
 #include <irssi/src/core/net-disconnect.h>
 #include <irssi/src/core/net-nonblock.h>
 #include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/misc.h>
 #include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/refstrings.h>
 #include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers.h>
@@ -354,6 +355,9 @@ void server_connect_init(SERVER_REC *server)
 	MODULE_DATA_INIT(server);
 	server->type = module_get_uniq_id("SERVER", 0);
 	server_ref(server);
+	server->current_incoming_meta =
+	    g_hash_table_new_full(g_str_hash, (GEqualFunc) g_strcmp0,
+	                          (GDestroyNotify) i_refstr_release, (GDestroyNotify) g_free);
 
 	server->nick = g_strdup(server->connrec->nick);
 	if (server->connrec->username == NULL || *server->connrec->username == '\0') {
@@ -535,6 +539,7 @@ int server_unref(SERVER_REC *server)
 	g_free(server->away_reason);
 	g_free(server->nick);
 	g_free(server->tag);
+	g_hash_table_destroy(server->current_incoming_meta);
 
 	server->type = 0;
 	g_free(server);
@@ -655,6 +660,22 @@ void server_change_nick(SERVER_REC *server, const char *nick)
 	signal_emit("server nick changed", 1, server);
 }
 
+void server_meta_stash(SERVER_REC *server, const char *meta_key, const char *meta_value)
+{
+	g_hash_table_replace(server->current_incoming_meta, i_refstr_intern(meta_key),
+	                     g_strdup(meta_value));
+}
+
+const char *server_meta_stash_find(SERVER_REC *server, const char *meta_key)
+{
+	return g_hash_table_lookup(server->current_incoming_meta, meta_key);
+}
+
+void server_meta_clear_all(SERVER_REC *server)
+{
+	g_hash_table_remove_all(server->current_incoming_meta);
+}
+
 /* Update own IPv4 and IPv6 records */
 void server_connect_own_ip_save(SERVER_CONNECT_REC *conn,
 				IPADDR *ip4, IPADDR *ip6)
diff --git a/src/core/servers.h b/src/core/servers.h
index 7b998c8d..d52603eb 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -66,6 +66,13 @@ void server_connect_failed(SERVER_REC *server, const char *msg);
 /* Change your nick */
 void server_change_nick(SERVER_REC *server, const char *nick);
 
+/* Push meta data onto the server stash */
+void server_meta_stash(SERVER_REC *server, const char *meta_key, const char *meta_value);
+/* Get a value from the stash */
+const char *server_meta_stash_find(SERVER_REC *server, const char *meta_key);
+/* clear meta stash */
+void server_meta_clear_all(SERVER_REC *server);
+
 /* Update own IPv4 and IPv6 records */
 void server_connect_own_ip_save(SERVER_CONNECT_REC *conn,
 				IPADDR *ip4, IPADDR *ip6);
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index eb47646e..de3898ee 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -406,16 +406,10 @@ void format_read_arglist(va_list va, FORMAT_REC *format,
 		}
 	}
 }
-void format_create_dest(TEXT_DEST_REC *dest,
-			void *server, const char *target,
-			int level, WINDOW_REC *window)
-{
-	format_create_dest_tag(dest, server, NULL, target, level, window);
-}
 
-void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
-			    const char *server_tag, const char *target,
-			    int level, WINDOW_REC *window)
+void format_create_dest_tag_meta(TEXT_DEST_REC *dest, void *server, const char *server_tag,
+                                 const char *target, int level, WINDOW_REC *window,
+                                 GHashTable *meta)
 {
 	memset(dest, 0, sizeof(TEXT_DEST_REC));
 
@@ -425,6 +419,20 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
 	dest->level = level;
 	dest->window = window != NULL ? window :
 		window_find_closest(server, target, level);
+	dest->meta = meta;
+}
+
+void format_create_dest_tag(TEXT_DEST_REC *dest, void *server, const char *server_tag,
+                            const char *target, int level, WINDOW_REC *window)
+{
+	format_create_dest_tag_meta(dest, server, server_tag, target, level, window,
+	                            server != NULL ? SERVER(server)->current_incoming_meta : NULL);
+}
+
+void format_create_dest(TEXT_DEST_REC *dest, void *server, const char *target, int level,
+                        WINDOW_REC *window)
+{
+	format_create_dest_tag(dest, server, NULL, target, level, window);
 }
 
 /* Return length of text part in string (ie. without % codes) */
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 226348de..530f42bf 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -64,6 +64,7 @@ typedef struct _TEXT_DEST_REC {
 	int hilight_priority;
 	char *hilight_color;
         int flags;
+	GHashTable *meta;
 } TEXT_DEST_REC;
 
 #define window_get_theme(window) \
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index a92c6f3b..d317456b 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -348,14 +348,15 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
 		return;
 	}
 
-	lineinfo.level = dest == NULL ? 0 : dest->level;
         gui = WINDOW_GUI(window);
-        lineinfo.time = (gui->use_insert_after && gui->insert_after_time) ?
-		gui->insert_after_time : time(NULL);
+	view = gui->view;
+
+	lineinfo.level = dest == NULL ? 0 : dest->level;
+	lineinfo.time =
+	    (gui->use_insert_after && gui->insert_after_time) ? gui->insert_after_time : time(NULL);
 	lineinfo.format =
 	    dest != NULL && dest->flags & PRINT_FLAG_FORMAT ? LINE_INFO_FORMAT_SET : NULL;
 
-	view = gui->view;
 	insert_after = gui->use_insert_after ?
 		gui->insert_after : view->buffer->cur_line;
 
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 17ec118a..e3d331f1 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -14,7 +14,8 @@
 #include <irssi/src/fe-text/textbuffer-view.h>
 
 TEXT_BUFFER_REC *color_buf;
-int scrollback_format;
+gboolean scrollback_format;
+gboolean show_server_time;
 
 #if GLIB_CHECK_VERSION(2, 56, 0)
 /* nothing */
@@ -101,6 +102,55 @@ static void format_rec_set_dest(TEXT_BUFFER_FORMAT_REC *rec, const TEXT_DEST_REC
 	rec->flags = dest->flags & ~PRINT_FLAG_FORMAT;
 }
 
+void textbuffer_meta_rec_free(TEXT_BUFFER_META_REC *rec)
+{
+	if (rec == NULL)
+		return;
+
+	if (rec->hash != NULL)
+		g_hash_table_destroy(rec->hash);
+
+	g_free(rec);
+}
+
+static void meta_hash_create(struct _TEXT_BUFFER_META_REC *meta)
+{
+	if (meta->hash == NULL) {
+		meta->hash = g_hash_table_new_full(g_str_hash, (GEqualFunc) g_strcmp0,
+		                                   (GDestroyNotify) i_refstr_release,
+		                                   (GDestroyNotify) g_free);
+	}
+}
+
+static TEXT_BUFFER_META_REC *line_meta_create(GHashTable *meta_hash)
+{
+	struct _TEXT_BUFFER_META_REC *meta;
+	GHashTableIter iter;
+	const char *key;
+	const char *val;
+
+	if (meta_hash == NULL || g_hash_table_size(meta_hash) == 0)
+		return NULL;
+
+	meta = g_new0(struct _TEXT_BUFFER_META_REC, 1);
+
+	g_hash_table_iter_init(&iter, meta_hash);
+	while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) {
+		if (g_strcmp0("time", key) == 0) {
+			GDateTime *time;
+			if ((time = g_date_time_new_from_iso8601(val, NULL)) != NULL) {
+				meta->server_time = g_date_time_to_unix(time);
+				g_date_time_unref(time);
+			}
+		} else {
+			meta_hash_create(meta);
+			g_hash_table_replace(meta->hash, i_refstr_intern(key), g_strdup(val));
+		}
+	}
+
+	return meta;
+}
+
 static LINE_INFO_REC *store_lineinfo_tmp(TEXT_DEST_REC *dest)
 {
 	GUI_WINDOW_REC *gui;
@@ -135,7 +185,7 @@ static void free_lineinfo_tmp(WINDOW_REC *window)
 
 	info = buffer->cur_info->data;
 	buffer->cur_info = g_slist_delete_link(buffer->cur_info, buffer->cur_info);
-	textbuffer_format_rec_free(info->format);
+	textbuffer_line_info_free1(info);
 	g_free(info);
 }
 
@@ -226,14 +276,17 @@ static void sig_gui_print_text_finished(WINDOW_REC *window, TEXT_DEST_REC *dest)
 	info->format->expando_cache = reverse_collector(info->format->expando_cache);
 	format_rec_set_dest(info->format, dest);
 
+	info->meta = line_meta_create(dest->meta);
+
 	info->level |= MSGLEVEL_FORMAT;
 
 	/* the line will be inserted into the view with textbuffer_view_insert_line by
 	   gui-printtext.c:view_add_eol */
 	insert_after = textbuffer_insert(buffer, insert_after, (const unsigned char[]){}, 0, info);
 
-	/* the TEXT_BUFFER_FORMAT_REC pointer is now owned by the textbuffer */
+	/* the TEXT_BUFFER_FORMAT_REC and meta pointer is now owned by the textbuffer */
 	info->format = LINE_INFO_FORMAT_SET;
+	info->meta = NULL;
 
 	if (gui->use_insert_after)
 		gui->insert_after = insert_after;
@@ -309,12 +362,14 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 		THEME_REC *theme;
 		int formatnum;
 		TEXT_BUFFER_FORMAT_REC *format_rec;
+		TEXT_BUFFER_META_REC *meta;
 		char *str;
 
 		curr = line;
 		line = NULL;
-
 		format_rec = curr->info.format;
+		meta = curr->info.meta;
+
 		format_create_dest_tag(
 		    &dest,
 		    format_rec->server_tag != NULL ? server_find_tag(format_rec->server_tag) : NULL,
@@ -341,7 +396,12 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 		}
 
 		if (text != NULL && *text != '\0') {
-			current_time = curr->info.time;
+			reference_time = curr->info.time;
+			if (show_server_time && meta != NULL && meta->server_time != 0) {
+				current_time = meta->server_time;
+			} else {
+				current_time = curr->info.time;
+			}
 
 			tmp = format_get_level_tag(theme, &dest);
 			str = !theme->info_eol ? format_add_linestart(text, tmp) :
@@ -349,7 +409,7 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 			g_free_not_null(tmp);
 			g_free_not_null(text);
 			text = str;
-			tmp = format_get_line_start(theme, &dest, curr->info.time);
+			tmp = format_get_line_start(theme, &dest, current_time);
 			str = !theme->info_eol ? format_add_linestart(text, tmp) :
 			                         format_add_lineend(text, tmp);
 			g_free_not_null(tmp);
@@ -360,7 +420,7 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 
 			dest.flags |= PRINT_FLAG_FORMAT;
 
-			current_time = (time_t) -1;
+			reference_time = current_time = (time_t) -1;
 		} else if (format_rec->format != NULL) {
 			g_free(text);
 			text = NULL;
@@ -378,11 +438,13 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 static void read_settings(void)
 {
 	scrollback_format = settings_get_bool("scrollback_format");
+	show_server_time = settings_get_bool("show_server_time");
 }
 
 void textbuffer_formats_init(void)
 {
 	settings_add_bool("lookandfeel", "scrollback_format", TRUE);
+	settings_add_bool("lookandfeel", "show_server_time", FALSE);
 
 	read_settings();
 	signal_add("print format", (SIGNAL_FUNC) sig_print_format);
diff --git a/src/fe-text/textbuffer-formats.h b/src/fe-text/textbuffer-formats.h
index b57f61c9..d595df8a 100644
--- a/src/fe-text/textbuffer-formats.h
+++ b/src/fe-text/textbuffer-formats.h
@@ -3,6 +3,11 @@
 
 #include <irssi/src/fe-text/textbuffer.h>
 
+typedef struct _TEXT_BUFFER_META_REC {
+	gint64 server_time;
+	GHashTable *hash;
+} TEXT_BUFFER_META_REC;
+
 typedef struct _TEXT_BUFFER_FORMAT_REC {
 	char *module;
 	char *format;
@@ -17,6 +22,7 @@ typedef struct _TEXT_BUFFER_FORMAT_REC {
 } TEXT_BUFFER_FORMAT_REC;
 
 void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec);
+void textbuffer_meta_rec_free(TEXT_BUFFER_META_REC *rec);
 char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line);
 void textbuffer_formats_init(void);
 void textbuffer_formats_deinit(void);
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index b8fd2090..8761507b 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -54,8 +54,7 @@ void textbuffer_destroy(TEXT_BUFFER_REC *buffer)
 	g_string_free(buffer->cur_text, TRUE);
 	for (tmp = buffer->cur_info; tmp != NULL; tmp = tmp->next) {
 		LINE_INFO_REC *info = buffer->cur_info->data;
-		textbuffer_format_rec_free(info->format);
-		g_free(info->text);
+		textbuffer_line_info_free1(info);
 		g_free(info);
 	}
 	g_slist_free(buffer->cur_info);
@@ -64,6 +63,13 @@ void textbuffer_destroy(TEXT_BUFFER_REC *buffer)
 	g_slice_free(TEXT_BUFFER_REC, buffer);
 }
 
+void textbuffer_line_info_free1(LINE_INFO_REC *info)
+{
+	textbuffer_format_rec_free(info->format);
+	textbuffer_meta_rec_free(info->meta);
+	g_free(info->text);
+}
+
 static void text_chunk_append(TEXT_BUFFER_REC *buffer,
 			      const unsigned char *data, int len)
 {
@@ -198,8 +204,7 @@ void textbuffer_remove(TEXT_BUFFER_REC *buffer, LINE_REC *line)
         line->prev = line->next = NULL;
 
 	buffer->lines_count--;
-	g_free(line->info.text);
-	textbuffer_format_rec_free(line->info.format);
+	textbuffer_line_info_free1(&line->info);
 	g_slice_free(LINE_REC, line);
 }
 
@@ -212,10 +217,9 @@ void textbuffer_remove_all_lines(TEXT_BUFFER_REC *buffer)
 
 	while (buffer->first_line != NULL) {
 		line = buffer->first_line->next;
-		g_free(buffer->first_line->info.text);
-		textbuffer_format_rec_free(buffer->first_line->info.format);
+		textbuffer_line_info_free1(&buffer->first_line->info);
 		g_slice_free(LINE_REC, buffer->first_line);
-                buffer->first_line = line;
+		buffer->first_line = line;
 	}
 	buffer->lines_count = 0;
 
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index 5aaa817c..bb4e820a 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -17,6 +17,7 @@ typedef struct {
 	int level;
 	time_t time;
 	char *text;
+	struct _TEXT_BUFFER_META_REC *meta;
 	struct _TEXT_BUFFER_FORMAT_REC *format;
 } LINE_INFO_REC;
 
@@ -84,6 +85,7 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after,
 void textbuffer_remove(TEXT_BUFFER_REC *buffer, LINE_REC *line);
 /* Removes all lines from buffer, ignoring reference counters */
 void textbuffer_remove_all_lines(TEXT_BUFFER_REC *buffer);
+void textbuffer_line_info_free1(LINE_INFO_REC *info);
 
 void textbuffer_line2text(TEXT_BUFFER_REC *buffer, LINE_REC *line, int coloring, GString *str);
 GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index cde6a4fc..f29a8f91 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -242,6 +242,7 @@ static void server_init(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_CHGHOST, TRUE);
 	irc_cap_toggle(server, CAP_ACCOUNT_NOTIFY, TRUE);
 	irc_cap_toggle(server, CAP_SELF_MESSAGE, TRUE);
+	irc_cap_toggle(server, CAP_SERVER_TIME, TRUE);
 
 	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index e775e505..4833972a 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -26,6 +26,7 @@
 #define CAP_CHGHOST "chghost"
 #define CAP_ACCOUNT_NOTIFY "account-notify"
 #define CAP_SELF_MESSAGE "znc.in/self-message"
+#define CAP_SERVER_TIME "server-time"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index f3f9f307..96a09333 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -19,14 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/rawlog.h>
 #include <irssi/src/core/misc.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/refstrings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/servers-redirect.h>
 
 char *current_server_event;
@@ -383,11 +384,83 @@ static void irc_server_event(IRC_SERVER_REC *server, const char *line,
 	g_free(event);
 }
 
-static void irc_server_event_tags(IRC_SERVER_REC *server, const char *line,
-				  const char *nick, const char *address, const char *tags)
+static void unescape_tag(char *tag)
 {
+	char *tmp;
+
+	if (tag == NULL)
+		return;
+
+	tmp = tag;
+	for (; *tmp != '\0'; tmp++, tag++) {
+		if (*tmp == '\\') {
+			tmp++;
+			switch (*tmp) {
+			case ':':
+				*tag = ';';
+				break;
+			case 'n':
+				*tag = '\n';
+				break;
+			case 'r':
+				*tag = '\r';
+				break;
+			case 's':
+				*tag = ' ';
+				break;
+			default:
+				*tag = *tmp;
+				break;
+			}
+		} else {
+			*tag = *tmp;
+		}
+	}
+	*tag = '\0';
+}
+
+static gboolean i_str0_equal(const char *s1, const char *s2)
+{
+	return g_strcmp0(s1, s2) == 0;
+}
+
+GHashTable *irc_parse_message_tags(const char *tags)
+{
+	char **split, **tmp, **kv;
+	GHashTable *hash;
+
+	hash = g_hash_table_new_full(g_str_hash, (GEqualFunc) i_str0_equal,
+	                             (GDestroyNotify) i_refstr_release, (GDestroyNotify) g_free);
+	split = g_strsplit(tags, ";", -1);
+	for (tmp = split; *tmp != NULL; tmp++) {
+		kv = g_strsplit(*tmp, "=", 2);
+		unescape_tag(kv[1]);
+		g_hash_table_replace(hash, i_refstr_intern(kv[0]),
+		                     g_strdup(kv[1] == NULL ? "" : kv[1]));
+		g_strfreev(kv);
+	}
+	g_strfreev(split);
+	return hash;
+}
+
+static void irc_server_event_tags(IRC_SERVER_REC *server, const char *line, const char *nick,
+                                  const char *address, const char *tags)
+{
+	char *timestr;
+	GHashTable *tags_hash = NULL;
+
+	if (tags != NULL && *tags != '\0') {
+		tags_hash = irc_parse_message_tags(tags);
+		if ((timestr = g_hash_table_lookup(tags_hash, "time")) != NULL) {
+			server_meta_stash(SERVER(server), "time", timestr);
+		}
+	}
+
 	if (*line != '\0')
 		signal_emit_id(signal_server_event, 4, server, line, nick, address);
+
+	if (tags_hash != NULL)
+		g_hash_table_destroy(tags_hash);
 }
 
 static char *irc_parse_prefix(char *line, char **nick, char **address, char **tags)
@@ -449,6 +522,8 @@ static void irc_parse_incoming_line(IRC_SERVER_REC *server, char *line)
 	line = irc_parse_prefix(line, &nick, &address, &tags);
 	if (*line != '\0' || tags != NULL)
 		signal_emit_id(signal_server_event_tags, 5, server, line, nick, address, tags);
+
+	server_meta_clear_all(SERVER(server));
 }
 
 /* input function: handle incoming server messages */
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index 3f1a9887..8803f662 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -48,6 +48,9 @@ void irc_send_cmd_first(IRC_SERVER_REC *server, const char *cmd);
 void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 		       int send_now, int immediate, int raw);
 
+/* Extract a tag value from tags */
+GHashTable *irc_parse_message_tags(const char *tags);
+
 /* Get count parameters from data */
 #include <irssi/src/core/commands.h>
 char *event_get_param(char **data);
diff --git a/src/perl/common/Server.xs b/src/perl/common/Server.xs
index 7ed41109..60878a6a 100644
--- a/src/perl/common/Server.xs
+++ b/src/perl/common/Server.xs
@@ -103,3 +103,17 @@ send_message(server, target, msg, target_type)
 CODE:
 	server->send_message(server, target, msg, target_type);
 
+void
+server_meta_stash(server, meta_key, meta_value)
+	Irssi::Server server
+	char *meta_key
+	char *meta_value
+
+char *
+server_meta_stash_find(server, meta_key)
+	Irssi::Server server
+	char *meta_key
+CODE:
+	RETVAL = (char *) server_meta_stash_find(server, meta_key);
+OUTPUT:
+	RETVAL
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index f64d9728..f973da22 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -199,10 +199,29 @@ static PLAIN_OBJECT_INIT_REC irc_plains[] = {
 	{ NULL, NULL }
 };
 
-MODULE = Irssi::Irc  PACKAGE = Irssi::Irc
+MODULE = Irssi::Irc  PACKAGE = Irssi::Irc  PREFIX = irc_
 
 PROTOTYPES: ENABLE
 
+void
+irc_parse_message_tags(tags)
+	char *tags
+PREINIT:
+	HV *hv;
+	GHashTable *hash;
+	GHashTableIter iter;
+	char *key;
+	char *val;
+PPCODE:
+	hv = newHV();
+	hash = irc_parse_message_tags(tags);
+	g_hash_table_iter_init(&iter, hash);
+	while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) {
+		(void) hv_store(hv, key, strlen(key), new_pv(val), 0);
+	}
+	g_hash_table_destroy(hash);
+	XPUSHs(sv_2mortal(newRV_noinc((SV *) hv)));
+
 void
 init()
 PREINIT:
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index ae3973c8..4859f3da 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -68,3 +68,29 @@ PPCODE:
 		(void) hv_store(hv, "text", 4, new_pv(l->info.text), 0);
 	}
 	XPUSHs(sv_2mortal(newRV_noinc((SV *) hv)));
+
+void
+textbuffer_line_get_meta(line)
+	Irssi::TextUI::Line line
+PREINIT:
+	HV *hv;
+	LINE_REC *l;
+	TEXT_BUFFER_META_REC *m;
+	GHashTableIter iter;
+	char *key;
+	char *val;
+PPCODE:
+	hv = newHV();
+	l = line->line;
+	if (l->info.meta != NULL) {
+		m = l->info.meta;
+		if (m->hash != NULL) {
+			g_hash_table_iter_init(&iter, m->hash);
+			while (
+			    g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) {
+				(void) hv_store(hv, key, strlen(key), new_pv(val), 0);
+			}
+		}
+		(void) hv_store(hv, "server_time", 11, newSViv(m->server_time), 0);
+	}
+	XPUSHs(sv_2mortal(newRV_noinc((SV *) hv)));

From 322df0d2c8e1c0c836a9cdaeaf481e7b2ece2086 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 25 Feb 2021 10:50:51 +0100
Subject: [PATCH 1196/1650] replace refstring macro implementation with C
 functions

---
 src/core/refstrings.c | 34 ++++++++++++++++++++++++++++++----
 src/core/refstrings.h | 16 ----------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/core/refstrings.c b/src/core/refstrings.c
index 8391766d..8f220f6f 100644
--- a/src/core/refstrings.c
+++ b/src/core/refstrings.c
@@ -1,16 +1,42 @@
+#include <glib.h>
 #include <string.h>
 
 #include <irssi/src/core/refstrings.h>
 
 #if GLIB_CHECK_VERSION(2, 58, 0)
 
-/* callback implementation for GHashTable */
-#undef i_refstr_release
+void i_refstr_init(void)
+{
+	/* nothing */
+}
+
+char *i_refstr_intern(const char *str)
+{
+	if (str == NULL) {
+		return NULL;
+	}
+
+	return g_ref_string_new_intern(str);
+}
+
 void i_refstr_release(char *str)
 {
-	if (str != NULL) {
-		g_ref_string_release(str);
+	if (str == NULL) {
+		return;
 	}
+
+	g_ref_string_release(str);
+}
+
+void i_refstr_deinit(void)
+{
+	/* nothing */
+}
+
+char *i_refstr_table_size_info(void)
+{
+	/* not available */
+	return NULL;
 }
 
 #else
diff --git a/src/core/refstrings.h b/src/core/refstrings.h
index 35f52176..89ef84d1 100644
--- a/src/core/refstrings.h
+++ b/src/core/refstrings.h
@@ -1,20 +1,6 @@
 #ifndef IRSSI_CORE_REFSTRINGS_H
 #define IRSSI_CORE_REFSTRINGS_H
 
-#include <glib.h>
-
-#if GLIB_CHECK_VERSION(2, 58, 0)
-
-#define i_refstr_init() /* nothing */
-/* callback implementation */
-void i_refstr_release(char *str);
-#define i_refstr_release(str) ((str) == NULL ? NULL : g_ref_string_release(str))
-#define i_refstr_intern(str) ((str) == NULL ? NULL : g_ref_string_new_intern(str))
-#define i_refstr_deinit() /* nothing */
-#define i_refstr_table_size_info() NULL
-
-#else
-
 void i_refstr_init(void);
 char *i_refstr_intern(const char *str);
 void i_refstr_release(char *str);
@@ -22,5 +8,3 @@ void i_refstr_deinit(void);
 char *i_refstr_table_size_info(void);
 
 #endif
-
-#endif

From 3ea25fb7046897da5f8143be78e13b2e90778aa2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 25 Feb 2021 10:59:19 +0100
Subject: [PATCH 1197/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index bb339f1f..39045de7 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 33
+#define IRSSI_ABI_VERSION 34
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 7adf81f9b530937bdad561a46c09e847ba78604a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 28 Jan 2021 21:25:53 +0100
Subject: [PATCH 1198/1650] raise glib version requirement to 2.32 for
 g_hash_table_contains

---
 INSTALL      | 2 +-
 README.md    | 2 +-
 configure.ac | 2 +-
 meson.build  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index 712678e4..3dbe2ebd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@
 To compile Irssi you need:
 
 - meson-0.49 build system with ninja-1.5 or greater
-- glib-2.28 or greater
+- glib-2.32 or greater
 - openssl (for ssl support)
 - perl-5.6 or greater (for Perl support)
 - terminfo or ncurses (for text frontend)
diff --git a/README.md b/README.md
index 8b857eeb..08be65b4 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ make && sudo make install
 
 ### Requirements
 
-- [glib-2.28](https://wiki.gnome.org/Projects/GLib) or greater
+- [glib-2.32](https://wiki.gnome.org/Projects/GLib) or greater
 - [openssl](https://www.openssl.org/)
 - [perl-5.6](https://www.perl.org/) or greater (for perl support)
 - terminfo or ncurses (for text frontend)
diff --git a/configure.ac b/configure.ac
index cafd2970..41a053fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,7 +273,7 @@ for try in 1 2; do
     echo "*** trying without -lgmodule"
     glib_modules=
   fi
-  AM_PATH_GLIB_2_0(2.28.0,,, $glib_modules)
+  AM_PATH_GLIB_2_0(2.32.0,,, $glib_modules)
   if test "$GLIB_LIBS"; then
     if test $glib_modules = gmodule; then
       AC_DEFINE(HAVE_GMODULE)
diff --git a/meson.build b/meson.build
index f54db548..bd076a4d 100644
--- a/meson.build
+++ b/meson.build
@@ -166,7 +166,7 @@ message('*** Or alternatively install your distribution\'s package')
 message('*** On Debian: sudo apt-get install libglib2.0-dev')
 message('*** On Redhat: dnf install glib2-devel')
 if not require_glib_internal
-  glib_dep = dependency('glib-2.0', version : '>=2.28', required : not want_glib_internal, static : want_static_dependency)
+  glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency)
 else
   glib_dep = dependency('', required : false)
 endif

From bf1376e34ef0a5adfa0fca1bc0679b539690e8ae Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 28 Jan 2021 21:47:11 +0100
Subject: [PATCH 1199/1650] update clang-format to clang-format-11, fixes enum
 bug

---
 .github/workflows/clangformat.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index b959fe92..59beb928 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -2,8 +2,10 @@ on: [pull_request]
 name: clang-format
 jobs:
   check-clang-format:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
+      - name: install clang-format
+        run: sudo apt install clang-format-11
       - uses: actions/checkout@main
       - name: fetch target ref
         run:
@@ -18,7 +20,7 @@ jobs:
       - name: run git-clang-format and Check if no changes are needed
         run:
           |
-            git-clang-format-9 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
+            CLANG_FORMAT=clang-format-11 git-clang-format-11 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
             cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
       - uses: actions/upload-artifact@v1
         if: failure()

From dc8719910052000b1f920d62d3762a38059c528f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 5 Jan 2021 21:34:09 +0100
Subject: [PATCH 1200/1650] better account tracking

---
 src/fe-common/irc/fe-whois.c    |   2 +
 src/irc/core/channels-query.c   | 105 ++++++++++++++++++++++--
 src/irc/core/irc-commands.c     |  21 ++---
 src/irc/core/irc-nicklist.c     | 138 +++++++++++++++++++++++++++-----
 src/irc/core/massjoin.c         |  15 ++--
 src/irc/core/servers-redirect.c |  11 ++-
 6 files changed, 247 insertions(+), 45 deletions(-)

diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c
index 9a31cd9e..b0eeb19a 100644
--- a/src/fe-common/irc/fe-whois.c
+++ b/src/fe-common/irc/fe-whois.c
@@ -415,6 +415,7 @@ void fe_whois_init(void)
 	signal_add("event 319", (SIGNAL_FUNC) event_whois_channels);
 	signal_add("event 313", (SIGNAL_FUNC) event_whois_oper);
 	signal_add("event 330", (SIGNAL_FUNC) event_whois_auth);
+	signal_add("whois account", (SIGNAL_FUNC) event_whois_auth);
 	signal_add("event 377", (SIGNAL_FUNC) event_whois_usermode);
 	signal_add("event 378", (SIGNAL_FUNC) event_whois_realhost);
 	signal_add("event 379", (SIGNAL_FUNC) event_whois_modes);
@@ -438,6 +439,7 @@ void fe_whois_deinit(void)
 	signal_remove("event 319", (SIGNAL_FUNC) event_whois_channels);
 	signal_remove("event 313", (SIGNAL_FUNC) event_whois_oper);
 	signal_remove("event 330", (SIGNAL_FUNC) event_whois_auth);
+	signal_remove("whois account", (SIGNAL_FUNC) event_whois_auth);
 	signal_remove("event 377", (SIGNAL_FUNC) event_whois_usermode);
 	signal_remove("event 378", (SIGNAL_FUNC) event_whois_realhost);
 	signal_remove("event 379", (SIGNAL_FUNC) event_whois_modes);
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 8f90af64..8bf60587 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -229,15 +229,19 @@ static void query_send(IRC_SERVER_REC *server, int query)
 		break;
 
 	case CHANNEL_QUERY_WHO:
-		cmd = g_strdup_printf("WHO %s", chanstr_commas);
+		if (server->isupport != NULL &&
+		    g_hash_table_lookup(server->isupport, "whox") != NULL) {
+			cmd = g_strdup_printf("WHO %s %%tcuhnfdar,743", chanstr_commas);
+		} else {
+			cmd = g_strdup_printf("WHO %s", chanstr_commas);
+		}
 
-		server_redirect_event(server, "who",
-				      server->one_endofwho ? 1 : count,
-				      chanstr, -1,
-				      "chanquery abort",
-				      "event 315", "chanquery who end",
-				      "event 352", "silent event who",
-				      "", "chanquery abort", NULL);
+		server_redirect_event(server, "who", server->one_endofwho ? 1 : count, chanstr, -1,
+		                      "chanquery abort",                /* failure signal */
+		                      "event 315", "chanquery who end", /* */
+		                      "event 352", "silent event who",  /* */
+		                      "event 354", "silent event whox", /* */
+		                      "", "chanquery abort", NULL);
 		break;
 
 	case CHANNEL_QUERY_BMODE:
@@ -395,6 +399,87 @@ static void channel_got_query(IRC_CHANNEL_REC *chanrec, int query_type)
 	query_check(chanrec->server);
 }
 
+static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char *nick,
+                           const char *address)
+{
+	char *params, *channel, *ptr, *account;
+	GSList *nicks, *tmp;
+	IRC_CHANNEL_REC *chanrec;
+	NICK_REC *nickrec;
+
+	g_return_if_fail(data != NULL);
+
+	if (i_slist_find_string(server->cap_active, CAP_EXTENDED_JOIN)) {
+		/* no need to chase accounts */
+		return;
+	}
+
+	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
+		/* You joined, do nothing */
+		return;
+	}
+
+	params = event_get_params(data, 3, &channel, NULL, NULL);
+
+	ptr = strchr(channel, 7); /* ^G does something weird.. */
+	if (ptr != NULL)
+		*ptr = '\0';
+
+	/* find channel */
+	chanrec = irc_channel_find(server, channel);
+	if (chanrec == NULL) {
+		g_free(params);
+		return;
+	}
+
+	g_free(params);
+
+	if (!chanrec->wholist) {
+		return;
+	}
+
+	/* find nick */
+	nickrec = nicklist_find(CHANNEL(chanrec), nick);
+	if (nickrec == NULL) {
+		return;
+	}
+
+	if (nickrec->account != NULL) {
+		return;
+	}
+
+	account = NULL;
+
+	/* Check if user is already in some other channel, get the account from there */
+	nicks = nicklist_get_same(SERVER(server), nick);
+	for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
+		NICK_REC *rec = tmp->next->data;
+
+		if (rec->account != NULL) {
+			account = rec->account;
+			break;
+		}
+	}
+	g_slist_free(nicks);
+
+	if (account != NULL) {
+		nicklist_set_account(CHANNEL(chanrec), nickrec, account);
+		return;
+	}
+
+	if (g_hash_table_size(chanrec->nicks) < settings_get_int("channel_max_who_sync") &&
+	    server->isupport != NULL && g_hash_table_lookup(server->isupport, "whox") != NULL) {
+		char *cmd;
+		server_redirect_event(server, "who user", 1, nick, -1, NULL, /* failure signal */
+		                      "event 354", "silent event whox useraccount", /* */
+		                      "", "event empty",                            /* */
+		                      NULL);
+		cmd = g_strdup_printf("WHO %s %%tna,745", nick);
+		irc_send_cmd(server, cmd);
+		g_free(cmd);
+	}
+}
+
 static void event_channel_mode(IRC_SERVER_REC *server, const char *data,
 			       const char *nick)
 {
@@ -493,6 +578,8 @@ void channels_query_init(void)
 	signal_add("channel joined", (SIGNAL_FUNC) sig_channel_joined);
 	signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 
+	signal_add("event join", (SIGNAL_FUNC) sig_event_join);
+
 	signal_add("chanquery mode", (SIGNAL_FUNC) event_channel_mode);
 	signal_add("chanquery who end", (SIGNAL_FUNC) event_end_of_who);
 
@@ -507,6 +594,8 @@ void channels_query_deinit(void)
 	signal_remove("channel joined", (SIGNAL_FUNC) sig_channel_joined);
 	signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 
+	signal_remove("event join", (SIGNAL_FUNC) sig_event_join);
+
 	signal_remove("chanquery mode", (SIGNAL_FUNC) event_channel_mode);
 	signal_remove("chanquery who end", (SIGNAL_FUNC) event_end_of_who);
 
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index f6c25641..935c6b42 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -438,15 +438,18 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
 	query = get_redirect_nicklist(query, &free_nick);
 
 	str = g_strconcat(qserver, " ", query, NULL);
-	server_redirect_event(server, "whois", 1, str, TRUE,
-	              NULL,
-	              "event 318", "whois end",
-	              "event 402", event_402,
-	              "event 301", "whois away", /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
-	              "event 313", "whois oper",
-	              "event 401", (settings_get_bool("auto_whowas") ? "whois try whowas" : "whois event not found"),
-	              "event 311", "whois event",
-	              "", "whois default event", NULL);
+	server_redirect_event(
+	    server, "whois", 1, str, TRUE, /* */
+	    NULL,                          /* */
+	    "event 318", "whois end",      /* */
+	    "event 402", event_402,        /* */
+	    "event 301", "whois away",     /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
+	    "event 313", "whois oper",     /* */
+	    "event 330", "whois account",  /* */
+	    "event 401",
+	    (settings_get_bool("auto_whowas") ? "whois try whowas" : "whois event not found"),
+	    "event 311", "whois event", /* */
+	    "", "whois default event", NULL);
 	g_free(str);
 
 	server->whois_found = FALSE;
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index cc630a58..4965e1bf 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -29,6 +29,34 @@
 #include <irssi/src/irc/core/modes.h>
 #include <irssi/src/core/servers.h>
 
+static void nicklist_set_modes(IRC_CHANNEL_REC *channel, NICK_REC *rec, gboolean op,
+                               gboolean halfop, gboolean voice, const char *prefixes,
+                               gboolean send_changed)
+{
+	gboolean changed = FALSE;
+	if (rec->op != op) {
+		rec->op = op;
+		changed = TRUE;
+	}
+	if (rec->halfop != halfop) {
+		rec->halfop = halfop;
+		changed = TRUE;
+	}
+	if (rec->voice != voice) {
+		rec->voice = voice;
+		changed = TRUE;
+	}
+
+	if (prefixes != NULL && g_strcmp0(rec->prefixes, prefixes) != 0) {
+		g_strlcpy(rec->prefixes, prefixes, sizeof(rec->prefixes));
+		changed = TRUE;
+	}
+
+	if (changed && send_changed) {
+		signal_emit("nicklist changed", 3, channel, rec, rec->nick);
+	}
+}
+
 /* Add new nick to list */
 NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
 			      int op, int halfop, int voice, int send_massjoin,
@@ -42,14 +70,8 @@ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
 	rec = g_new0(NICK_REC, 1);
 	rec->nick = g_strdup(nick);
 
-	if (op) rec->op = TRUE;
-	if (halfop) rec->halfop = TRUE;
-	if (voice) rec->voice = TRUE;
 	rec->send_massjoin = send_massjoin;
-
-	if (prefixes != NULL) {
-		g_strlcpy(rec->prefixes, prefixes, sizeof(rec->prefixes));
-	}
+	nicklist_set_modes(channel, rec, op, halfop, voice, prefixes, FALSE);
 
 	nicklist_insert(CHANNEL(channel), rec);
 	return rec;
@@ -154,11 +176,14 @@ static void event_names_list(IRC_SERVER_REC *server, const char *data)
 		if (host != NULL)
 			*host++ = '\0';
 
-		if (nicklist_find((CHANNEL_REC *) chanrec, ptr) == NULL) {
+		rec = nicklist_find((CHANNEL_REC *) chanrec, ptr);
+		if (rec == NULL) {
 			rec = irc_nicklist_insert(chanrec, ptr, op, halfop,
 						  voice, FALSE, prefixes);
 			if (host != NULL)
 				nicklist_set_host(CHANNEL(chanrec), rec, host);
+		} else {
+			nicklist_set_modes(chanrec, rec, op, halfop, voice, prefixes, TRUE);
 		}
 	}
 
@@ -196,23 +221,13 @@ static void event_end_of_names(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-static void event_who(SERVER_REC *server, const char *data)
+static void fill_who(SERVER_REC *server, const char *channel, const char *user, const char *host,
+                     const char *nick, const char *stat, const char *hops, const char *account,
+                     const char *realname)
 {
-	char *params, *nick, *channel, *user, *host, *stat, *realname, *hops;
 	CHANNEL_REC *chanrec;
 	NICK_REC *nickrec;
 
-	g_return_if_fail(data != NULL);
-
-	params = event_get_params(data, 8, NULL, &channel, &user, &host,
-				  NULL, &nick, &stat, &realname);
-
-	/* get hop count */
-	hops = realname;
-	while (*realname != '\0' && *realname != ' ') realname++;
-	if (*realname == ' ')
-		*realname++ = '\0';
-
 	/* update host, realname, hopcount */
 	chanrec = channel_find(server, channel);
 	nickrec = chanrec == NULL ? NULL :
@@ -223,15 +238,88 @@ static void event_who(SERVER_REC *server, const char *data)
 			nicklist_set_host(chanrec, nickrec, str);
                         g_free(str);
 		}
-		if (nickrec->realname == NULL)
+		if (nickrec->realname == NULL) {
 			nickrec->realname = g_strdup(realname);
+		}
+		if (nickrec->account == NULL && account != NULL) {
+			nicklist_set_account(chanrec, nickrec,
+			                     strcmp(account, "0") == 0 ? "*" : account);
+		}
 		sscanf(hops, "%d", &nickrec->hops);
 	}
 
 	nicklist_update_flags(server, nick,
 			      strchr(stat, 'G') != NULL, /* gone */
 			      strchr(stat, '*') != NULL); /* ircop */
+}
 
+static void event_who(SERVER_REC *server, const char *data)
+{
+	char *params, *nick, *channel, *user, *host, *stat, *realname, *hops;
+
+	g_return_if_fail(data != NULL);
+
+	params =
+	    event_get_params(data, 8, NULL, &channel, &user, &host, NULL, &nick, &stat, &realname);
+
+	/* get hop count */
+	hops = realname;
+	while (*realname != '\0' && *realname != ' ')
+		realname++;
+	if (*realname == ' ')
+		*realname++ = '\0';
+
+	fill_who(server, channel, user, host, nick, stat, hops, NULL, realname);
+
+	g_free(params);
+}
+
+static void event_whox_743(SERVER_REC *server, const char *data)
+{
+	char *params, *id, *nick, *channel, *user, *host, *stat, *hops, *account, *realname;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 10, NULL, &id, &channel, &user, &host, &nick, &stat, &hops,
+	                          &account, &realname);
+
+	if (g_strcmp0(id, "743") != 0) {
+		g_free(params);
+		return;
+	}
+
+	fill_who(server, channel, user, host, nick, stat, hops, account, realname);
+
+	g_free(params);
+}
+
+static void event_whox_745(SERVER_REC *server, const char *data)
+{
+	char *params, *id, *nick, *account;
+	GSList *nicks, *tmp;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 4, NULL, &id, &nick, &account);
+
+	if (g_strcmp0(id, "745") != 0) {
+		g_free(params);
+		return;
+	}
+
+	if (strcmp(account, "0") == 0) {
+		account = "*";
+	}
+
+	nicks = nicklist_get_same(SERVER(server), nick);
+	for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
+		NICK_REC *rec = tmp->next->data;
+
+		if (rec->account == NULL || g_strcmp0(rec->account, account) != 0) {
+			nicklist_set_account(CHANNEL(tmp->data), rec, account);
+		}
+	}
+	g_slist_free(nicks);
 	g_free(params);
 }
 
@@ -510,7 +598,10 @@ void irc_nicklist_init(void)
 {
 	signal_add_first("event nick", (SIGNAL_FUNC) event_nick);
 	signal_add_first("event 352", (SIGNAL_FUNC) event_who);
+	signal_add_first("event 354", (SIGNAL_FUNC) event_whox_743);
 	signal_add("silent event who", (SIGNAL_FUNC) event_who);
+	signal_add("silent event whox", (SIGNAL_FUNC) event_whox_743);
+	signal_add("silent event whox useraccount", (SIGNAL_FUNC) event_whox_745);
 	signal_add("silent event whois", (SIGNAL_FUNC) event_whois);
 	signal_add_first("event 311", (SIGNAL_FUNC) event_whois);
 	signal_add_first("whois away", (SIGNAL_FUNC) event_whois_away);
@@ -534,7 +625,10 @@ void irc_nicklist_deinit(void)
 {
 	signal_remove("event nick", (SIGNAL_FUNC) event_nick);
 	signal_remove("event 352", (SIGNAL_FUNC) event_who);
+	signal_remove("event 354", (SIGNAL_FUNC) event_whox_743);
 	signal_remove("silent event who", (SIGNAL_FUNC) event_who);
+	signal_remove("silent event whox", (SIGNAL_FUNC) event_whox_743);
+	signal_remove("silent event whox useraccount", (SIGNAL_FUNC) event_whox_745);
 	signal_remove("silent event whois", (SIGNAL_FUNC) event_whois);
 	signal_remove("event 311", (SIGNAL_FUNC) event_whois);
 	signal_remove("whois away", (SIGNAL_FUNC) event_whois_away);
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 2405f947..98802f7f 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -39,12 +39,15 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 	IRC_CHANNEL_REC *chanrec;
 	NICK_REC *nickrec;
 	GSList *nicks, *tmp;
+	gboolean send_massjoin;
 
 	g_return_if_fail(data != NULL);
 
 	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
-		/* You joined, no need to do anything here */
-		return;
+		/* You joined, do not massjoin */
+		send_massjoin = FALSE;
+	} else {
+		send_massjoin = TRUE;
 	}
 
 	params = event_get_params(data, 3, &channel, &account, &realname);
@@ -68,14 +71,14 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 	}
 
 	/* add user to nicklist */
-	nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, FALSE, TRUE, NULL);
+	nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, FALSE, send_massjoin, NULL);
 	if (*account != '\0' && g_strcmp0(nickrec->account, account) != 0) {
 		nicklist_set_account(CHANNEL(chanrec), nickrec, account);
 	}
 
         nicklist_set_host(CHANNEL(chanrec), nickrec, address);
 
-	if (chanrec->massjoins == 0) {
+	if (send_massjoin && chanrec->massjoins == 0) {
 		/* no nicks waiting in massjoin queue */
 		chanrec->massjoin_start = time(NULL);
 		chanrec->last_massjoins = 0;
@@ -104,7 +107,9 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 		nickrec->realname = g_strdup(realname);
 	}
 
-	chanrec->massjoins++;
+	if (send_massjoin) {
+		chanrec->massjoins++;
+	}
 	g_free(params);
 }
 
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 2790c75a..066ba82f 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -671,7 +671,16 @@ void servers_redirect_init(void)
 				 NULL,
 				 NULL);
 
-        /* LIST */
+	/* WHO user */
+	server_redirect_register("who user", FALSE, 0, /* */
+	                         "event 352", 5,       /* An element of the WHO */
+	                         "event 354", -1,      /* WHOX element */
+	                         NULL,                 /* */
+	                         "event 315", 1,       /* End of WHO */
+	                         NULL,                 /* */
+	                         NULL);
+
+	/* LIST */
 	server_redirect_register("list", FALSE, 0,
 				 "event 321", 1, /* Begins the LIST */
 				 NULL,

From 04035ab7ca0f085f84cf7edaa1f86a071fe1db42 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 28 Jan 2021 21:32:52 +0100
Subject: [PATCH 1201/1650] Track the account queries which are in progress

---
 src/irc/core/channels-query.c   | 39 +++++++++++++++++----------------
 src/irc/core/irc-channels.h     | 18 +++++++++++++++
 src/irc/core/irc-nicklist.c     |  7 ++++--
 src/irc/core/irc-servers.h      |  2 +-
 src/irc/core/massjoin.c         |  3 +++
 src/irc/core/servers-redirect.c |  2 +-
 6 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 8bf60587..9e284754 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -50,23 +50,6 @@ loop:
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/irc/core/servers-redirect.h>
 
-enum {
-	CHANNEL_QUERY_MODE,
-	CHANNEL_QUERY_WHO,
-	CHANNEL_QUERY_BMODE,
-
-	CHANNEL_QUERIES
-};
-
-#define CHANNEL_IS_MODE_QUERY(a) ((a) != CHANNEL_QUERY_WHO)
-
-typedef struct {
-	int current_query_type; /* query type that is currently being asked */
-        GSList *current_queries; /* All channels that are currently being queried */
-
-	GSList *queries[CHANNEL_QUERIES]; /* All queries that need to be asked from server */
-} SERVER_QUERY_REC;
-
 static void sig_connected(IRC_SERVER_REC *server)
 {
 	SERVER_QUERY_REC *rec;
@@ -76,7 +59,9 @@ static void sig_connected(IRC_SERVER_REC *server)
 		return;
 
 	rec = g_new0(SERVER_QUERY_REC, 1);
-        server->chanqueries = rec;
+	rec->accountqueries = g_hash_table_new_full(
+	    (GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal, (GDestroyNotify) g_free, NULL);
+	server->chanqueries = rec;
 }
 
 static void sig_disconnected(IRC_SERVER_REC *server)
@@ -91,6 +76,8 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	rec = server->chanqueries;
 	g_return_if_fail(rec != NULL);
 
+	g_hash_table_foreach(rec->accountqueries, (GHFunc) g_free, NULL);
+	g_hash_table_destroy(rec->accountqueries);
 	for (n = 0; n < CHANNEL_QUERIES; n++)
 		g_slist_free(rec->queries[n]);
         g_slist_free(rec->current_queries);
@@ -399,6 +386,12 @@ static void channel_got_query(IRC_CHANNEL_REC *chanrec, int query_type)
 	query_check(chanrec->server);
 }
 
+static void query_useraccount_error(IRC_SERVER_REC *server, const char *cmd, const char *arg)
+{
+	/* query failed, ignore it but remove the marker */
+	g_hash_table_remove(server->chanqueries->accountqueries, arg);
+}
+
 static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char *nick,
                            const char *address)
 {
@@ -448,6 +441,10 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 		return;
 	}
 
+	if (g_hash_table_contains(server->chanqueries->accountqueries, nick)) {
+		/* query already sent */
+		return;
+	}
 	account = NULL;
 
 	/* Check if user is already in some other channel, get the account from there */
@@ -470,11 +467,13 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 	if (g_hash_table_size(chanrec->nicks) < settings_get_int("channel_max_who_sync") &&
 	    server->isupport != NULL && g_hash_table_lookup(server->isupport, "whox") != NULL) {
 		char *cmd;
-		server_redirect_event(server, "who user", 1, nick, -1, NULL, /* failure signal */
+		server_redirect_event(server, "who user", 1, nick, -1,
+		                      "chanquery useraccount abort", /* failure signal */
 		                      "event 354", "silent event whox useraccount", /* */
 		                      "", "event empty",                            /* */
 		                      NULL);
 		cmd = g_strdup_printf("WHO %s %%tna,745", nick);
+		g_hash_table_add(server->chanqueries->accountqueries, g_strdup(nick));
 		irc_send_cmd(server, cmd);
 		g_free(cmd);
 	}
@@ -585,6 +584,7 @@ void channels_query_init(void)
 
 	signal_add("chanquery ban end", (SIGNAL_FUNC) event_end_of_banlist);
 	signal_add("chanquery abort", (SIGNAL_FUNC) query_current_error);
+	signal_add("chanquery useraccount abort", (SIGNAL_FUNC) query_useraccount_error);
 }
 
 void channels_query_deinit(void)
@@ -601,4 +601,5 @@ void channels_query_deinit(void)
 
 	signal_remove("chanquery ban end", (SIGNAL_FUNC) event_end_of_banlist);
 	signal_remove("chanquery abort", (SIGNAL_FUNC) query_current_error);
+	signal_remove("chanquery useraccount abort", (SIGNAL_FUNC) query_useraccount_error);
 }
diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h
index 4ed7fd73..769ddf2f 100644
--- a/src/irc/core/irc-channels.h
+++ b/src/irc/core/irc-channels.h
@@ -11,6 +11,16 @@
 #define IS_IRC_CHANNEL(channel) \
 	(IRC_CHANNEL(channel) ? TRUE : FALSE)
 
+enum {
+	CHANNEL_QUERY_MODE,
+	CHANNEL_QUERY_WHO,
+	CHANNEL_QUERY_BMODE,
+
+	CHANNEL_QUERIES
+};
+
+#define CHANNEL_IS_MODE_QUERY(a) ((a) != CHANNEL_QUERY_WHO)
+
 #define STRUCT_SERVER_REC IRC_SERVER_REC
 struct _IRC_CHANNEL_REC {
 #include <irssi/src/core/channel-rec.h>
@@ -22,6 +32,14 @@ struct _IRC_CHANNEL_REC {
 	int last_massjoins; /* Massjoins when last checked in timeout function */
 };
 
+typedef struct _SERVER_QUERY_REC {
+	int current_query_type;  /* query type that is currently being asked */
+	GSList *current_queries; /* All channels that are currently being queried */
+
+	GSList *queries[CHANNEL_QUERIES]; /* All queries that need to be asked from server */
+	GHashTable *accountqueries;       /* Per-nick account queries */
+} SERVER_QUERY_REC;
+
 void irc_channels_init(void);
 void irc_channels_deinit(void);
 
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 4965e1bf..76543ac1 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -293,7 +293,7 @@ static void event_whox_743(SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-static void event_whox_745(SERVER_REC *server, const char *data)
+static void event_whox_745(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *id, *nick, *account;
 	GSList *nicks, *tmp;
@@ -306,6 +306,7 @@ static void event_whox_745(SERVER_REC *server, const char *data)
 		g_free(params);
 		return;
 	}
+	g_hash_table_remove(server->chanqueries->accountqueries, nick);
 
 	if (strcmp(account, "0") == 0) {
 		account = "*";
@@ -503,7 +504,9 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
 		server_change_nick(SERVER(server), nick);
 	}
 
-        nicklist_rename(SERVER(server), orignick, nick);
+	/* invalidate any outstanding accountqueries for the old nick */
+	g_hash_table_remove(server->chanqueries->accountqueries, orignick);
+	nicklist_rename(SERVER(server), orignick, nick);
 	g_free(params);
 }
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 4833972a..14560611 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -136,7 +136,7 @@ struct _IRC_SERVER_REC {
 	GSList *rejoin_channels; /* try to join to these channels after a while -
 	                            channels go here if they're "temporarily unavailable"
 				    because of netsplits */
-	void *chanqueries;
+	struct _SERVER_QUERY_REC *chanqueries;
 
 	GHashTable *isupport;
 	struct modes_type modes[256]; /* Stores the modes sent by a server in an isupport reply */
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 98802f7f..b83bdabf 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -222,6 +222,9 @@ static void event_quit(IRC_SERVER_REC *server, const char *data,
 		nicklist_remove(CHANNEL(channel), nickrec);
 	}
 	g_slist_free(nicks);
+
+	/* invalidate any outstanding accountqueries for the nick */
+	g_hash_table_remove(server->chanqueries->accountqueries, nick);
 }
 
 static void event_kick(IRC_SERVER_REC *server, const char *data)
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 066ba82f..a4b7b64f 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -442,7 +442,7 @@ static void redirect_abort(IRC_SERVER_REC *server, REDIRECT_REC *rec)
 		g_free(str);
 
 		if (rec->failure_signal != NULL)
-			signal_emit(rec->failure_signal, 1, server);
+			signal_emit(rec->failure_signal, 3, server, rec->cmd->name, rec->arg);
 	} else if (rec->last_signal != NULL) {
                 /* emit the last signal */
 		signal_emit(rec->last_signal, 1, server);

From 04089d5866bf415732785ae908e014541d5a0bc9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 29 Jan 2021 14:11:07 +0100
Subject: [PATCH 1202/1650] purge whos from queue

---
 src/irc/core/channels-query.c | 50 ++++++++++++++++++++++++++++++++++-
 src/irc/core/irc-channels.h   |  2 ++
 src/irc/core/irc-nicklist.c   |  2 +-
 src/irc/core/massjoin.c       |  2 +-
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 9e284754..7274ab81 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -50,6 +50,8 @@ loop:
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/irc/core/servers-redirect.h>
 
+#define WHO_Ps_PPtna_745 "WHO %s %%tna,745"
+
 static void sig_connected(IRC_SERVER_REC *server)
 {
 	SERVER_QUERY_REC *rec;
@@ -386,6 +388,52 @@ static void channel_got_query(IRC_CHANNEL_REC *chanrec, int query_type)
 	query_check(chanrec->server);
 }
 
+void irc_channels_query_purge_accountquery(IRC_SERVER_REC *server, const char *nick)
+{
+	GSList *tmp, *next, *prev;
+	REDIRECT_REC *redirect;
+	char *cmd, *target_cmd;
+	gboolean was_removed;
+
+	/* remove the marker */
+	was_removed = g_hash_table_remove(server->chanqueries->accountqueries, nick);
+
+	/* if it was removed we may have an outstanding query */
+	if (was_removed) {
+		target_cmd = g_strdup_printf(WHO_Ps_PPtna_745, nick);
+
+		/* remove queued WHO command */
+		prev = NULL;
+		for (tmp = server->cmdqueue; tmp != NULL; tmp = next) {
+			next = tmp->next->next;
+			cmd = tmp->data;
+			redirect = tmp->next->data;
+
+			if (g_strcmp0(cmd, target_cmd) == 0) {
+				if (prev != NULL)
+					prev->next = next;
+				else
+					server->cmdqueue = next;
+
+				/* remove the redirection */
+				g_slist_free_1(tmp->next);
+				if (redirect != NULL)
+					server_redirect_destroy(redirect);
+
+				/* remove the command */
+				g_slist_free_1(tmp);
+				g_free(cmd);
+
+				server->cmdcount--;
+			} else {
+				prev = tmp;
+			}
+		}
+
+		g_free(target_cmd);
+	}
+}
+
 static void query_useraccount_error(IRC_SERVER_REC *server, const char *cmd, const char *arg)
 {
 	/* query failed, ignore it but remove the marker */
@@ -472,7 +520,7 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 		                      "event 354", "silent event whox useraccount", /* */
 		                      "", "event empty",                            /* */
 		                      NULL);
-		cmd = g_strdup_printf("WHO %s %%tna,745", nick);
+		cmd = g_strdup_printf(WHO_Ps_PPtna_745, nick);
 		g_hash_table_add(server->chanqueries->accountqueries, g_strdup(nick));
 		irc_send_cmd(server, cmd);
 		g_free(cmd);
diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h
index 769ddf2f..67b550d5 100644
--- a/src/irc/core/irc-channels.h
+++ b/src/irc/core/irc-channels.h
@@ -40,6 +40,8 @@ typedef struct _SERVER_QUERY_REC {
 	GHashTable *accountqueries;       /* Per-nick account queries */
 } SERVER_QUERY_REC;
 
+void irc_channels_query_purge_accountquery(IRC_SERVER_REC *server, const char *nick);
+
 void irc_channels_init(void);
 void irc_channels_deinit(void);
 
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 76543ac1..f62f3d49 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -505,7 +505,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
 	}
 
 	/* invalidate any outstanding accountqueries for the old nick */
-	g_hash_table_remove(server->chanqueries->accountqueries, orignick);
+	irc_channels_query_purge_accountquery(server, orignick);
 	nicklist_rename(SERVER(server), orignick, nick);
 	g_free(params);
 }
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index b83bdabf..61e2615f 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -224,7 +224,7 @@ static void event_quit(IRC_SERVER_REC *server, const char *data,
 	g_slist_free(nicks);
 
 	/* invalidate any outstanding accountqueries for the nick */
-	g_hash_table_remove(server->chanqueries->accountqueries, nick);
+	irc_channels_query_purge_accountquery(server, nick);
 }
 
 static void event_kick(IRC_SERVER_REC *server, const char *data)

From a0a9a82673b8079da834243e57516b6a105b62f3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 1 Feb 2021 20:01:38 +0100
Subject: [PATCH 1203/1650] fix missing output

---
 src/fe-common/irc/fe-events-numeric.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 37fdf30a..f78289c0 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -724,6 +724,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 004", (SIGNAL_FUNC) event_received);
 	signal_add("event 005", (SIGNAL_FUNC) event_received);
 	signal_add("event 254", (SIGNAL_FUNC) event_received);
+	signal_add("event 354", (SIGNAL_FUNC) event_received);
 	signal_add("event 364", (SIGNAL_FUNC) event_received);
 	signal_add("event 365", (SIGNAL_FUNC) event_received);
 	signal_add("event 381", (SIGNAL_FUNC) event_received);
@@ -814,6 +815,7 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 004", (SIGNAL_FUNC) event_received);
 	signal_remove("event 005", (SIGNAL_FUNC) event_received);
 	signal_remove("event 254", (SIGNAL_FUNC) event_received);
+	signal_remove("event 354", (SIGNAL_FUNC) event_received);
 	signal_remove("event 364", (SIGNAL_FUNC) event_received);
 	signal_remove("event 365", (SIGNAL_FUNC) event_received);
 	signal_remove("event 381", (SIGNAL_FUNC) event_received);

From 09c17c3302742be94da39996bf0ffac455bafd1e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 1 Feb 2021 21:59:32 +0100
Subject: [PATCH 1204/1650] maybe this matches the command now

---
 src/irc/core/channels-query.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 7274ab81..664b429e 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -400,7 +400,7 @@ void irc_channels_query_purge_accountquery(IRC_SERVER_REC *server, const char *n
 
 	/* if it was removed we may have an outstanding query */
 	if (was_removed) {
-		target_cmd = g_strdup_printf(WHO_Ps_PPtna_745, nick);
+		target_cmd = g_strdup_printf(WHO_Ps_PPtna_745 "\r\n", nick);
 
 		/* remove queued WHO command */
 		prev = NULL;

From b11f9733457bb191aebc81dc9734da200f9e7dba Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 6 Feb 2021 22:17:29 +0100
Subject: [PATCH 1205/1650] fix off by one

---
 src/irc/core/channels-query.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 664b429e..dc29e914 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -426,7 +426,7 @@ void irc_channels_query_purge_accountquery(IRC_SERVER_REC *server, const char *n
 
 				server->cmdcount--;
 			} else {
-				prev = tmp;
+				prev = tmp->next;
 			}
 		}
 

From 79be775f2bf653a886b351e3552d4c8cbdb35f26 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 26 Feb 2021 14:28:37 +0100
Subject: [PATCH 1206/1650] queue the who command on join

---
 src/irc/core/channels-query.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index dc29e914..ad8d898c 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -250,7 +250,8 @@ static void query_send(IRC_SERVER_REC *server, int query)
                 cmd = NULL;
 	}
 
-	irc_send_cmd(server, cmd);
+	/* queue the command */
+	irc_send_cmd_full(server, cmd, FALSE, FALSE, FALSE);
 
 	g_free(chanstr);
 	g_free(chanstr_commas);

From 3a929898e2c569412cd36e7c14a3ea1ff65955c8 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 26 Feb 2021 14:28:51 +0100
Subject: [PATCH 1207/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 39045de7..ccd000d5 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 34
+#define IRSSI_ABI_VERSION 35
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From a8144cd98fdb08c1d942195f65fbc604f7bd3055 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 26 Feb 2021 20:25:48 +0100
Subject: [PATCH 1208/1650] skip parsing empty tags

Credit to OSS-Fuzz
---
 src/irc/core/irc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 96a09333..a5bd608b 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -433,6 +433,8 @@ GHashTable *irc_parse_message_tags(const char *tags)
 	                             (GDestroyNotify) i_refstr_release, (GDestroyNotify) g_free);
 	split = g_strsplit(tags, ";", -1);
 	for (tmp = split; *tmp != NULL; tmp++) {
+		if (*tmp[0] == '\0')
+			continue;
 		kv = g_strsplit(*tmp, "=", 2);
 		unescape_tag(kv[1]);
 		g_hash_table_replace(hash, i_refstr_intern(kv[0]),

From 4c069f5c8f3b63d8ba8556ba8292e1f5972508d6 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 27 Feb 2021 18:31:00 +0100
Subject: [PATCH 1209/1650] stop parsing on lone tag escape

It's C

Credit to OSS-Fuzz
---
 src/irc/core/irc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index a5bd608b..8ecda85b 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -395,6 +395,8 @@ static void unescape_tag(char *tag)
 	for (; *tmp != '\0'; tmp++, tag++) {
 		if (*tmp == '\\') {
 			tmp++;
+			if (*tmp == '\0')
+				break;
 			switch (*tmp) {
 			case ':':
 				*tag = ';';

From 04b44a8f8d3bc12122bb583ec458c1a3c744c58c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 27 Feb 2021 21:02:48 +0100
Subject: [PATCH 1210/1650] Revert "queue the who command on join"

This reverts commit 79be775f2bf653a886b351e3552d4c8cbdb35f26.
---
 src/irc/core/channels-query.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index ad8d898c..dc29e914 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -250,8 +250,7 @@ static void query_send(IRC_SERVER_REC *server, int query)
                 cmd = NULL;
 	}
 
-	/* queue the command */
-	irc_send_cmd_full(server, cmd, FALSE, FALSE, FALSE);
+	irc_send_cmd(server, cmd);
 
 	g_free(chanstr);
 	g_free(chanstr_commas);

From 6eeec6a1129c1ce050ea44f283a7f81c8cc70144 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 27 Feb 2021 21:04:02 +0100
Subject: [PATCH 1211/1650] fix double free

---
 src/irc/core/channels-query.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index dc29e914..b90e32f5 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -78,7 +78,6 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	rec = server->chanqueries;
 	g_return_if_fail(rec != NULL);
 
-	g_hash_table_foreach(rec->accountqueries, (GHFunc) g_free, NULL);
 	g_hash_table_destroy(rec->accountqueries);
 	for (n = 0; n < CHANNEL_QUERIES; n++)
 		g_slist_free(rec->queries[n]);

From 18ee6bb6f9a16b993407fe27b964071dc2bf9e44 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 27 Feb 2021 21:05:30 +0100
Subject: [PATCH 1212/1650] queue the who command on join

---
 src/irc/core/channels-query.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index b90e32f5..4e972121 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -521,7 +521,8 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 		                      NULL);
 		cmd = g_strdup_printf(WHO_Ps_PPtna_745, nick);
 		g_hash_table_add(server->chanqueries->accountqueries, g_strdup(nick));
-		irc_send_cmd(server, cmd);
+		/* queue the command */
+		irc_send_cmd_full(server, cmd, FALSE, FALSE, FALSE);
 		g_free(cmd);
 	}
 }

From b957d3ad4b948007f94d4fc9d3a46e21386f2680 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 27 Feb 2021 21:30:29 +0100
Subject: [PATCH 1213/1650] add constants for WHOX queries

---
 src/irc/core/channels-query.c | 22 ++++++++++++++++++----
 src/irc/core/irc-channels.h   |  4 ++++
 src/irc/core/irc-nicklist.c   | 20 ++++++++++----------
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 4e972121..97e982b7 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -50,7 +50,21 @@ loop:
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/irc/core/servers-redirect.h>
 
-#define WHO_Ps_PPtna_745 "WHO %s %%tna,745"
+/* here are the WHOX commands we send. the full spec can be found on [1].
+
+   (1) WHOX_CHANNEL_FULL_CMD for getting the user list when we join a channel. we request the fields
+       c (channel), u (user), h (host), n (nick), f (flags), d (hops), a (important, account!), and
+       r (the real name goes last because it os the only that can contain spaces.) we request all
+       those fields as they are also included in the "regular" WHO reply we would get without WHOX.
+
+   (2) WHOX_USERACCOUNT_CMD for getting the account names of people that joined. this code is
+       obviously only used when we don't have extended-joins. we request n (nick) and a (account)
+       only, and we only send WHO nick with this command.
+
+   [1] https://github.com/UndernetIRC/ircu2/blob/u2_10_12_branch/doc/readme.who
+  */
+#define WHOX_CHANNEL_FULL_CMD "WHO %s %%tcuhnfdar," WHOX_CHANNEL_FULL_ID
+#define WHOX_USERACCOUNT_CMD "WHO %s %%tna," WHOX_USERACCOUNT_ID
 
 static void sig_connected(IRC_SERVER_REC *server)
 {
@@ -219,7 +233,7 @@ static void query_send(IRC_SERVER_REC *server, int query)
 	case CHANNEL_QUERY_WHO:
 		if (server->isupport != NULL &&
 		    g_hash_table_lookup(server->isupport, "whox") != NULL) {
-			cmd = g_strdup_printf("WHO %s %%tcuhnfdar,743", chanstr_commas);
+			cmd = g_strdup_printf(WHOX_CHANNEL_FULL_CMD, chanstr_commas);
 		} else {
 			cmd = g_strdup_printf("WHO %s", chanstr_commas);
 		}
@@ -399,7 +413,7 @@ void irc_channels_query_purge_accountquery(IRC_SERVER_REC *server, const char *n
 
 	/* if it was removed we may have an outstanding query */
 	if (was_removed) {
-		target_cmd = g_strdup_printf(WHO_Ps_PPtna_745 "\r\n", nick);
+		target_cmd = g_strdup_printf(WHOX_USERACCOUNT_CMD "\r\n", nick);
 
 		/* remove queued WHO command */
 		prev = NULL;
@@ -519,7 +533,7 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 		                      "event 354", "silent event whox useraccount", /* */
 		                      "", "event empty",                            /* */
 		                      NULL);
-		cmd = g_strdup_printf(WHO_Ps_PPtna_745, nick);
+		cmd = g_strdup_printf(WHOX_USERACCOUNT_CMD, nick);
 		g_hash_table_add(server->chanqueries->accountqueries, g_strdup(nick));
 		/* queue the command */
 		irc_send_cmd_full(server, cmd, FALSE, FALSE, FALSE);
diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h
index 67b550d5..0f955dd8 100644
--- a/src/irc/core/irc-channels.h
+++ b/src/irc/core/irc-channels.h
@@ -19,6 +19,10 @@ enum {
 	CHANNEL_QUERIES
 };
 
+/* arbitrary 3-digit identifiers so we can find our WHOX responses */
+#define WHOX_CHANNEL_FULL_ID "743"
+#define WHOX_USERACCOUNT_ID "745"
+
 #define CHANNEL_IS_MODE_QUERY(a) ((a) != CHANNEL_QUERY_WHO)
 
 #define STRUCT_SERVER_REC IRC_SERVER_REC
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index f62f3d49..f62a96f2 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -274,7 +274,7 @@ static void event_who(SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-static void event_whox_743(SERVER_REC *server, const char *data)
+static void event_whox_channel_full(SERVER_REC *server, const char *data)
 {
 	char *params, *id, *nick, *channel, *user, *host, *stat, *hops, *account, *realname;
 
@@ -283,7 +283,7 @@ static void event_whox_743(SERVER_REC *server, const char *data)
 	params = event_get_params(data, 10, NULL, &id, &channel, &user, &host, &nick, &stat, &hops,
 	                          &account, &realname);
 
-	if (g_strcmp0(id, "743") != 0) {
+	if (g_strcmp0(id, WHOX_CHANNEL_FULL_ID) != 0) {
 		g_free(params);
 		return;
 	}
@@ -293,7 +293,7 @@ static void event_whox_743(SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-static void event_whox_745(IRC_SERVER_REC *server, const char *data)
+static void event_whox_useraccount(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *id, *nick, *account;
 	GSList *nicks, *tmp;
@@ -302,7 +302,7 @@ static void event_whox_745(IRC_SERVER_REC *server, const char *data)
 
 	params = event_get_params(data, 4, NULL, &id, &nick, &account);
 
-	if (g_strcmp0(id, "745") != 0) {
+	if (g_strcmp0(id, WHOX_USERACCOUNT_ID) != 0) {
 		g_free(params);
 		return;
 	}
@@ -601,10 +601,10 @@ void irc_nicklist_init(void)
 {
 	signal_add_first("event nick", (SIGNAL_FUNC) event_nick);
 	signal_add_first("event 352", (SIGNAL_FUNC) event_who);
-	signal_add_first("event 354", (SIGNAL_FUNC) event_whox_743);
+	signal_add_first("event 354", (SIGNAL_FUNC) event_whox_channel_full);
 	signal_add("silent event who", (SIGNAL_FUNC) event_who);
-	signal_add("silent event whox", (SIGNAL_FUNC) event_whox_743);
-	signal_add("silent event whox useraccount", (SIGNAL_FUNC) event_whox_745);
+	signal_add("silent event whox", (SIGNAL_FUNC) event_whox_channel_full);
+	signal_add("silent event whox useraccount", (SIGNAL_FUNC) event_whox_useraccount);
 	signal_add("silent event whois", (SIGNAL_FUNC) event_whois);
 	signal_add_first("event 311", (SIGNAL_FUNC) event_whois);
 	signal_add_first("whois away", (SIGNAL_FUNC) event_whois_away);
@@ -628,10 +628,10 @@ void irc_nicklist_deinit(void)
 {
 	signal_remove("event nick", (SIGNAL_FUNC) event_nick);
 	signal_remove("event 352", (SIGNAL_FUNC) event_who);
-	signal_remove("event 354", (SIGNAL_FUNC) event_whox_743);
+	signal_remove("event 354", (SIGNAL_FUNC) event_whox_channel_full);
 	signal_remove("silent event who", (SIGNAL_FUNC) event_who);
-	signal_remove("silent event whox", (SIGNAL_FUNC) event_whox_743);
-	signal_remove("silent event whox useraccount", (SIGNAL_FUNC) event_whox_745);
+	signal_remove("silent event whox", (SIGNAL_FUNC) event_whox_channel_full);
+	signal_remove("silent event whox useraccount", (SIGNAL_FUNC) event_whox_useraccount);
 	signal_remove("silent event whois", (SIGNAL_FUNC) event_whois);
 	signal_remove("event 311", (SIGNAL_FUNC) event_whois);
 	signal_remove("whois away", (SIGNAL_FUNC) event_whois_away);

From 53c91623c53ecdd94457a7fba826a1da0277f718 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 3 Mar 2021 17:39:19 +0100
Subject: [PATCH 1214/1650] fix level uninitialised

Credit to OSS-Fuzz
---
 src/fe-common/irc/fe-irc-messages.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index d287bf1f..714b2eb2 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -87,11 +87,6 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 	/* and clean the rest here */
 	cleantarget = get_visible_target(IRC_SERVER(server), cleantarget);
 
-	if (ignore_check_plus(server, nick, address, cleantarget, msg, &level, TRUE)) {
-		g_free(prefix);
-		return;
-	}
-
 	chanrec = channel_find(server, cleantarget);
 
 	nickmode = channel_get_nickmode(chanrec, nick);
@@ -111,6 +106,14 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 	if (for_me)
 		level |= MSGLEVEL_HILIGHT;
 
+	if (ignore_check_plus(server, nick, address, cleantarget, msg, &level, TRUE)) {
+		g_free(nickmode);
+		g_free(color);
+		g_free(optarget);
+		g_free(prefix);
+		return;
+	}
+
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) chanrec, msg);
 

From 4e1aad6679648c6ec0ee4d436b03dec5684eac5e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 5 Mar 2021 20:28:10 +0100
Subject: [PATCH 1215/1650] fix assertion failure when the line does not have
 text (yet)

---
 src/fe-text/textbuffer.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 8761507b..5a5ddf21 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -238,14 +238,15 @@ void textbuffer_line2text(TEXT_BUFFER_REC *buffer, LINE_REC *line, int coloring,
 
         g_string_truncate(str, 0);
 
-	ptr = textbuffer_line_get_text(buffer, line);
-	if (coloring == 0) {
-		tmp = ptr;
-		ptr = strip_codes(tmp);
-		g_free(tmp);
+	if ((ptr = textbuffer_line_get_text(buffer, line)) != NULL) {
+		if (coloring == 0) {
+			tmp = ptr;
+			ptr = strip_codes(tmp);
+			g_free(tmp);
+		}
+		g_string_append(str, ptr);
+		g_free(ptr);
 	}
-	g_string_append(str, ptr);
-	g_free(ptr);
 }
 
 GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,

From 5f1fe607e4f472bdf71ef55de8a1be0f0a1d0fff Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 3 Mar 2021 17:18:55 +0100
Subject: [PATCH 1216/1650] Test CIFuzz offering

---
 .github/workflows/cifuzz.yml | 40 ++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/workflows/cifuzz.yml

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
new file mode 100644
index 00000000..9f956d5c
--- /dev/null
+++ b/.github/workflows/cifuzz.yml
@@ -0,0 +1,40 @@
+name: CIFuzz
+on:
+  pull_request:
+    paths:
+    - 'src/core/**/*.c'
+    - 'src/fe-common/core/**/*.c'
+    - 'src/fe-text/gui-*.c'
+    - 'src/irc/**/*.c'
+    - 'src/fe-common/irc/**/*.c'
+    - 'src/lib-config/**/*.c'
+    - 'tests/**/*.c'
+    - '.github/workflows/cifuzz.yml'
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sanitizer: [address, undefined, memory]
+    steps:
+    - name: Build Fuzzers (${{ matrix.sanitizer }})
+      id: build
+      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'irssi'
+        dry-run: false
+        sanitizer: ${{ matrix.sanitizer }}
+    - name: Run Fuzzers (${{ matrix.sanitizer }})
+      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'irssi'
+        fuzz-seconds: 600
+        dry-run: false
+        sanitizer: ${{ matrix.sanitizer }}
+    - name: Upload Crash
+      uses: actions/upload-artifact@v1
+      if: failure() && steps.build.outcome == 'success'
+      with:
+        name: ${{ matrix.sanitizer }}-artifacts
+        path: ./out/artifacts

From f5339edbbc921dc225ba5fba2cc59d19b08db7c7 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 12 Mar 2021 21:15:58 +0100
Subject: [PATCH 1217/1650] fail redirects on freenode 263

---
 src/irc/core/servers-redirect.c | 38 +++++++++++++++++++++++++++------
 src/irc/core/servers-redirect.h |  5 ++---
 src/perl/irc/Server.xs          |  7 +++---
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 2790c75a..72601d34 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -39,6 +39,7 @@ typedef struct {
 
 	int remote;
 	int timeout;
+	int pos;
 	GSList *start, *stop, *opt; /* char *event, int argpos, ... */
 } REDIRECT_CMD_REC;
 
@@ -151,13 +152,11 @@ void server_redirect_register(const char *command,
 
 	va_end(va);
 
-	server_redirect_register_list(command, remote, timeout,
-				      start, stop, opt);
+	server_redirect_register_list(command, remote, timeout, start, stop, opt, 0);
 }
 
-void server_redirect_register_list(const char *command,
-				   int remote, int timeout,
-				   GSList *start, GSList *stop, GSList *opt)
+void server_redirect_register_list(const char *command, int remote, int timeout, GSList *start,
+                                   GSList *stop, GSList *opt, int pos)
 {
 	REDIRECT_CMD_REC *rec;
         gpointer key, value;
@@ -181,7 +180,8 @@ void server_redirect_register_list(const char *command,
 	rec->start = start;
         rec->stop = stop;
         rec->opt = opt;
-        g_hash_table_insert(command_redirects, rec->name, rec);
+	rec->pos = pos;
+	g_hash_table_insert(command_redirects, rec->name, rec);
 }
 
 void server_redirect_event(IRC_SERVER_REC *server, const char *command,
@@ -483,6 +483,32 @@ static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event,
 		}
 	}
 
+	if (g_strcmp0("event 263", event) == 0) { /* RPL_TRYAGAIN */
+		char *params, *command;
+		params = event_get_params(args, 3, NULL, &command, NULL);
+
+		for (tmp = server->redirects; tmp != NULL; tmp = next) {
+			REDIRECT_REC *rec = tmp->data;
+
+			next = tmp->next;
+
+			if (rec == redirect)
+				break;
+
+			if (g_slist_find(server->redirect_active, rec) != NULL)
+				continue;
+
+			if (redirect_args_match(rec->cmd->name, command, rec->cmd->pos)) {
+				/* the server crashed our command with RPL_TRYAGAIN, send the
+				   failure */
+				rec->aborted = TRUE;
+				redirect_abort(server, rec);
+				break;
+			}
+		}
+		g_free(params);
+	}
+
 	/* remove the destroyed, non-remote and timeouted remote
 	   redirections that should have happened before this redirection */
 	now = time(NULL);
diff --git a/src/irc/core/servers-redirect.h b/src/irc/core/servers-redirect.h
index f8ca605f..0d8b63f8 100644
--- a/src/irc/core/servers-redirect.h
+++ b/src/irc/core/servers-redirect.h
@@ -22,9 +22,8 @@ void server_redirect_register(const char *command,
 			      int remote, int timeout, ...);
 /* start/stop/opt lists shouldn't be free'd after, and their strings
    should be dynamically allocated */
-void server_redirect_register_list(const char *command,
-				   int remote, int timeout,
-				   GSList *start, GSList *stop, GSList *opt);
+void server_redirect_register_list(const char *command, int remote, int timeout, GSList *start,
+                                   GSList *stop, GSList *opt, int pos);
 
 /* Specify that the next command sent to server will be redirected.
    NOTE: This command MUST be called before irc_send_cmd().
diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs
index a42f5c82..54361ec9 100644
--- a/src/perl/irc/Server.xs
+++ b/src/perl/irc/Server.xs
@@ -97,10 +97,9 @@ server_redirect_register(command, remote, timeout, start, stop, opt)
 	SV *stop
 	SV *opt
 CODE:
-	server_redirect_register_list(command, remote, timeout, 
-				      register_hash2list(hvref(start)),
-				      register_hash2list(hvref(stop)),
-				      register_hash2list(hvref(opt)));
+	server_redirect_register_list(command, remote, timeout, register_hash2list(hvref(start)),
+	                              register_hash2list(hvref(stop)),
+	                              register_hash2list(hvref(opt)), 1);
 
 void
 server_redirect_event(server, command, count, arg, remote, failure_signal, signals)

From 9ce3420440e0305031a2d81321915084f62e79f0 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 12 Mar 2021 23:17:53 +0100
Subject: [PATCH 1218/1650] printformats

---
 src/perl/ui/Themes.xs | 49 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/perl/ui/Themes.xs b/src/perl/ui/Themes.xs
index ab7c1909..e9e56395 100644
--- a/src/perl/ui/Themes.xs
+++ b/src/perl/ui/Themes.xs
@@ -1,20 +1,26 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
 
-static void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
+static void printformat_module_perl(TEXT_DEST_REC *dest, const char *module, char *format,
+                                    char **arglist)
 {
-	char *module;
 	int formatnum;
 
-	module = g_strdup(perl_get_package());
 	formatnum = format_find_tag(module, format);
 	if (formatnum < 0) {
 		die("printformat(): unregistered format '%s'", format);
-                g_free(module);
 		return;
 	}
 
 	printformat_module_dest_charargs(module, dest, formatnum, arglist);
+}
+
+static void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
+{
+	char *module;
+
+	module = g_strdup(perl_get_package());
+	printformat_module_perl(dest, module, format, arglist);
 	g_free(module);
 }
 
@@ -226,6 +232,41 @@ CODE:
 
         printformat_perl(&dest, format, arglist);
 
+#*******************************
+MODULE = Irssi::UI::Formats  PACKAGE = Irssi::UI::TextDest
+#*******************************
+
+void
+printformat(dest, format, ...)
+	Irssi::UI::TextDest dest
+	char *format
+PREINIT:
+	char *arglist[MAX_FORMAT_PARAMS + 1];
+	int n;
+CODE:
+	memset(arglist, 0, sizeof(arglist));
+	for (n = 2; n < items && n < MAX_FORMAT_PARAMS + 2; n++) {
+		arglist[n - 2] = SvPV_nolen(ST(n));
+	}
+
+	printformat_perl(dest, format, arglist);
+
+void
+printformat_module(dest, module, format, ...)
+	Irssi::UI::TextDest dest
+	char *module
+	char *format
+PREINIT:
+	char *arglist[MAX_FORMAT_PARAMS + 1];
+	int n;
+CODE:
+	memset(arglist, 0, sizeof(arglist));
+	for (n = 3; n < items && n < MAX_FORMAT_PARAMS + 3; n++) {
+		arglist[n - 3] = SvPV_nolen(ST(n));
+	}
+
+	printformat_module_perl(dest, module, format, arglist);
+
 #*******************************
 MODULE = Irssi::UI::Themes  PACKAGE = Irssi::UI::Theme  PREFIX = theme_
 #*******************************

From 7d213da88acb6dfbdcae799dba1d8e9c05490c67 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 28 Jan 2021 21:47:11 +0100
Subject: [PATCH 1219/1650] update clang-format to clang-format-11, fixes enum
 bug

---
 .github/workflows/clangformat.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index b959fe92..59beb928 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -2,8 +2,10 @@ on: [pull_request]
 name: clang-format
 jobs:
   check-clang-format:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
+      - name: install clang-format
+        run: sudo apt install clang-format-11
       - uses: actions/checkout@main
       - name: fetch target ref
         run:
@@ -18,7 +20,7 @@ jobs:
       - name: run git-clang-format and Check if no changes are needed
         run:
           |
-            git-clang-format-9 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
+            CLANG_FORMAT=clang-format-11 git-clang-format-11 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
             cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
       - uses: actions/upload-artifact@v1
         if: failure()

From 25ad30d5e42e918358ef325ea59db9d52ea477f3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 13 Mar 2021 21:51:01 +0100
Subject: [PATCH 1220/1650] add format_string_expand to Perl

---
 src/perl/ui/Formats.xs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/perl/ui/Formats.xs b/src/perl/ui/Formats.xs
index 8e34b7b9..fbd0cbf4 100644
--- a/src/perl/ui/Formats.xs
+++ b/src/perl/ui/Formats.xs
@@ -50,6 +50,16 @@ format_real_length(str, len)
 	char *str
 	int len
 
+void
+format_string_expand(str)
+	char *str
+PREINIT:
+	char *ret;
+PPCODE:
+	ret = format_string_expand(str, NULL);
+	XPUSHs(sv_2mortal(new_pv(ret)));
+	g_free(ret);
+
 void
 strip_codes(input)
 	char *input

From 030da3ec9c62e7c30b4a6ebe49a285aed278a5b5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 14 Mar 2021 18:31:56 +0100
Subject: [PATCH 1221/1650] add format_string_expand and format_string_unexpand
 methods to Perl

---
 src/fe-common/core/formats.c     | 163 +++++++++++++++++++++++++++++++
 src/fe-common/core/formats.h     |   1 +
 src/fe-text/textbuffer-formats.c |   6 +-
 src/fe-text/textbuffer-formats.h |   2 +-
 src/fe-text/textbuffer-view.c    |   2 +-
 src/fe-text/textbuffer.c         |  10 +-
 src/fe-text/textbuffer.h         |   7 ++
 src/perl/textui/TextBuffer.xs    |  32 ++++++
 src/perl/ui/Formats.xs           |   9 ++
 9 files changed, 226 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index de3898ee..51588afb 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -38,6 +38,7 @@
 static const char *format_backs = "04261537";
 static const char *format_fores = "kbgcrmyw";
 static const char *format_boldfores = "KBGCRMYW";
+static const char *ext_color_al = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 static int signal_gui_print_text;
 static int hide_text_style, hide_server_tags, hide_colors;
@@ -121,10 +122,23 @@ void format_ext_color(GString *out, int bg, int color)
 					  : FORMAT_COLOR_EXT3);
 		g_string_append_c(out, FORMAT_COLOR_NOCHANGE + ((color-0x10)%0x50));
 	}
+
 	if (!bg && color < 0x10)
 		g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
 }
 
+static void format_ext_color_unexpand(GString *out, gboolean bg, int base, char color)
+{
+	unsigned char value = base + (unsigned char) color - FORMAT_COLOR_NOCHANGE - 0x10;
+
+	g_string_append_c(out, '%');
+	g_string_append_c(out, bg ? 'x' : 'X');
+	if (value > 214)
+		value += 10;
+	g_string_append_c(out, '1' + (value / 36));
+	g_string_append_c(out, ext_color_al[value % 36]);
+}
+
 #ifdef TERM_TRUECOLOR
 void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *flags)
 {
@@ -152,6 +166,28 @@ void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *
 		*flags |= GUI_PRINT_FLAG_COLOR_24_FG;
 	}
 }
+
+static void format_24bit_color_unexpand(GString *out, int off, const char **ptr)
+{
+	unsigned int color;
+	unsigned char rgbx[4];
+	unsigned int i;
+	for (i = 0; i < 4; ++i) {
+		if ((*ptr)[i + off] == '\0')
+			return;
+		rgbx[i] = (*ptr)[i + off];
+	}
+	rgbx[3] -= 0x20;
+	*ptr += 4;
+	g_string_append_c(out, '%');
+	for (i = 0; i < 3; ++i) {
+		if (rgbx[3] & (0x10 << i))
+			rgbx[i] -= 0x20;
+	}
+	color = rgbx[0] << 16 | rgbx[1] << 8 | rgbx[2];
+	g_string_append_c(out, rgbx[3] & 0x1 ? 'z' : 'Z');
+	g_string_append_printf(out, "%06X", color);
+}
 #endif
 
 void format_24bit_color(GString *out, int bg, unsigned int color)
@@ -308,6 +344,16 @@ int format_expand_styles(GString *out, const char **format, int *flags)
 
 		format_24bit_color(out, fmt == 'z', tmp2);
 		break;
+	case 'o':
+		g_string_append_c(out, 4);
+		g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
+		g_string_append_c(out, (char) -1);
+		break;
+	case 'O':
+		g_string_append_c(out, 4);
+		g_string_append_c(out, (char) -1);
+		g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
+		break;
 	default:
 		/* check if it's a background color */
 		p = strchr(format_backs, fmt);
@@ -557,6 +603,123 @@ char *format_string_expand(const char *text, int *flags)
 	return ret;
 }
 
+inline static void format_flag_unexpand(GString *out, char flag)
+{
+	g_string_append_c(out, '%');
+	g_string_append_c(out, flag);
+}
+
+char *format_string_unexpand(const char *text, int flags)
+{
+	GString *out;
+
+	g_return_val_if_fail(text != NULL, NULL);
+
+	out = g_string_sized_new(strlen(text));
+	while (*text != '\0') {
+		switch (*text) {
+		case '%':
+			g_string_append(out, "%%");
+			break;
+		case 4:
+			text++;
+			if (*text == '\0')
+				break;
+			switch (*text) {
+			case FORMAT_COLOR_EXT1:
+				format_ext_color_unexpand(out, FALSE, 0x10, *++text);
+				break;
+			case FORMAT_COLOR_EXT1_BG:
+				format_ext_color_unexpand(out, TRUE, 0x10, *++text);
+				break;
+			case FORMAT_COLOR_EXT2:
+				format_ext_color_unexpand(out, FALSE, 0x60, *++text);
+				break;
+			case FORMAT_COLOR_EXT2_BG:
+				format_ext_color_unexpand(out, TRUE, 0x60, *++text);
+				break;
+			case FORMAT_COLOR_EXT3:
+				format_ext_color_unexpand(out, FALSE, 0xb0, *++text);
+				break;
+			case FORMAT_COLOR_EXT3_BG:
+				format_ext_color_unexpand(out, TRUE, 0xb0, *++text);
+				break;
+#ifdef TERM_TRUECOLOR
+			case FORMAT_COLOR_24:
+				format_24bit_color_unexpand(out, 1, &text);
+				break;
+#endif
+			case FORMAT_STYLE_BLINK:
+				format_flag_unexpand(out, 'F');
+				break;
+			case FORMAT_STYLE_UNDERLINE:
+				format_flag_unexpand(out, 'U');
+				break;
+			case FORMAT_STYLE_BOLD:
+				format_flag_unexpand(out, '9');
+				break;
+			case FORMAT_STYLE_REVERSE:
+				format_flag_unexpand(out, '8');
+				break;
+			case FORMAT_STYLE_INDENT:
+				format_flag_unexpand(out, '|');
+				break;
+			case FORMAT_STYLE_ITALIC:
+				format_flag_unexpand(out, 'I');
+				break;
+			case FORMAT_STYLE_DEFAULTS:
+				format_flag_unexpand(out, 'N');
+				break;
+			case FORMAT_STYLE_CLRTOEOL:
+				format_flag_unexpand(out, '>');
+				break;
+			case FORMAT_STYLE_MONOSPACE:
+				format_flag_unexpand(out, '#');
+				break;
+			default:
+				if (*text != FORMAT_COLOR_NOCHANGE) {
+					unsigned int value = (unsigned char) *text - '0';
+
+					g_string_append_c(out, '%');
+					if (value < 8) {
+						g_string_append_c(out, format_fores[value]);
+					} else if (value < 16) {
+						g_string_append_c(out, format_boldfores[value - 8]);
+					} else {
+						g_string_append_c(out, 'O');
+					}
+				}
+				text++;
+				if (*text == '\0')
+					break;
+
+				if (*text != FORMAT_COLOR_NOCHANGE) {
+					unsigned int value = (unsigned char) *text - '0';
+
+					g_string_append_c(out, '%');
+					if (value < 8) {
+						g_string_append_c(out, format_backs[value]);
+					} else if (value < 16) {
+						g_string_append(out, "x0");
+						g_string_append_c(out, ext_color_al[value]);
+					} else {
+						g_string_append_c(out, 'o');
+					}
+				}
+				break;
+			}
+			break;
+		default:
+			g_string_append_c(out, *text);
+			break;
+		}
+		if (*text != '\0')
+			text++;
+	}
+
+	return g_string_free(out, FALSE);
+}
+
 static char *format_get_text_args(TEXT_DEST_REC *dest,
 				  const char *text, char **arglist)
 {
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 530f42bf..12274638 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -81,6 +81,7 @@ int format_get_length(const char *str);
 int format_real_length(const char *str, int len);
 
 char *format_string_expand(const char *text, int *flags);
+char *format_string_unexpand(const char *text, int flags);
 
 char *format_get_text(const char *module, WINDOW_REC *window,
 		      void *server, const char *target,
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index e3d331f1..2aa06cb2 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -344,7 +344,7 @@ static char *fallback_format(TEXT_BUFFER_FORMAT_REC *format_rec)
 	return g_string_free(bs, FALSE);
 }
 
-char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
+char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line, gboolean raw)
 {
 	TEXT_DEST_REC dest;
 	GUI_WINDOW_REC *gui;
@@ -430,6 +430,10 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
 		format_create_dest(&dest, NULL, NULL, line->info.level, buffer->window);
 		text = g_strdup(line->info.text);
 	}
+
+	if (raw)
+		return text;
+
 	tmp = parse_colors(&dest, text);
 	g_free(text);
 	return tmp;
diff --git a/src/fe-text/textbuffer-formats.h b/src/fe-text/textbuffer-formats.h
index d595df8a..17a907c1 100644
--- a/src/fe-text/textbuffer-formats.h
+++ b/src/fe-text/textbuffer-formats.h
@@ -23,7 +23,7 @@ typedef struct _TEXT_BUFFER_FORMAT_REC {
 
 void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec);
 void textbuffer_meta_rec_free(TEXT_BUFFER_META_REC *rec);
-char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line);
+char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line, gboolean raw);
 void textbuffer_formats_init(void);
 void textbuffer_formats_deinit(void);
 
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 9af3cb3c..79f3522c 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -274,7 +274,7 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
         linecount = 1;
 	lines = NULL;
 
-	line_text = textbuffer_line_get_text(view->buffer, line);
+	line_text = textbuffer_line_get_text(view->buffer, line, FALSE);
 	if (line_text != NULL) {
 		for (ptr = (unsigned char *) line_text;;) {
 			if (*ptr == '\0')
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 5a5ddf21..25fce22f 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -238,11 +238,15 @@ void textbuffer_line2text(TEXT_BUFFER_REC *buffer, LINE_REC *line, int coloring,
 
         g_string_truncate(str, 0);
 
-	if ((ptr = textbuffer_line_get_text(buffer, line)) != NULL) {
-		if (coloring == 0) {
+	if ((ptr = textbuffer_line_get_text(buffer, line, coloring == COLORING_RAW)) != NULL) {
+		if (coloring == COLORING_STRIP) {
 			tmp = ptr;
 			ptr = strip_codes(tmp);
 			g_free(tmp);
+		} else if (coloring == COLORING_UNEXPAND) {
+			tmp = ptr;
+			ptr = format_string_unexpand(tmp, 0);
+			g_free(tmp);
 		}
 		g_string_append(str, ptr);
 		g_free(ptr);
@@ -288,7 +292,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
 			(line->info.level & nolevel) == 0;
 
 		if (*text != '\0') {
-			textbuffer_line2text(buffer, line, FALSE, str);
+			textbuffer_line2text(buffer, line, 0, str);
 
 			if (line_matched) {
 				line_matched = regexp ?
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index bb4e820a..5f5f9a27 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -11,6 +11,13 @@ enum {
 	LINE_CMD_EOL=0x80,	/* line ends here */
 };
 
+enum {
+	COLORING_STRIP = 0,
+	COLORING_EXPAND = 1,
+	COLORING_UNEXPAND = 2,
+	COLORING_RAW = 3,
+};
+
 struct _TEXT_BUFFER_FORMAT_REC;
 
 typedef struct {
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index 4859f3da..6695eae0 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -6,6 +6,38 @@
 MODULE = Irssi::TextUI::TextBuffer  PACKAGE = Irssi
 PROTOTYPES: ENABLE
 
+#*******************************
+MODULE = Irssi::TextUI::TextBuffer  PACKAGE = Irssi
+#*******************************
+
+int
+COLORING_STRIP()
+CODE:
+	RETVAL = COLORING_STRIP;
+OUTPUT:
+	RETVAL
+
+int
+COLORING_EXPAND()
+CODE:
+	RETVAL = COLORING_EXPAND;
+OUTPUT:
+	RETVAL
+
+int
+COLORING_UNEXPAND()
+CODE:
+	RETVAL = COLORING_UNEXPAND;
+OUTPUT:
+	RETVAL
+
+int
+COLORING_RAW()
+CODE:
+	RETVAL = COLORING_RAW;
+OUTPUT:
+	RETVAL
+
 #*******************************
 MODULE = Irssi::TextUI::TextBuffer  PACKAGE = Irssi::TextUI::Line  PREFIX = textbuffer_line_
 #*******************************
diff --git a/src/perl/ui/Formats.xs b/src/perl/ui/Formats.xs
index fbd0cbf4..c03e6bb5 100644
--- a/src/perl/ui/Formats.xs
+++ b/src/perl/ui/Formats.xs
@@ -70,6 +70,15 @@ PPCODE:
 	XPUSHs(sv_2mortal(new_pv(ret)));
 	g_free(ret);
 
+void
+format_string_unexpand(input)
+	char *input
+PREINIT:
+	char *ret;
+PPCODE:
+	ret = format_string_unexpand(input, 0);
+	XPUSHs(sv_2mortal(new_pv(ret)));
+	g_free(ret);
 
 void
 format_create_dest(target, level=MSGLEVEL_CLIENTNOTICE, window=NULL)

From a0142ce38463e3835ff67e14efcafefdd6d4a084 Mon Sep 17 00:00:00 2001
From: jesopo <github@lolnerd.net>
Date: Wed, 17 Mar 2021 20:29:07 +0000
Subject: [PATCH 1222/1650] add IRC_CHATNET_REC->usermode to perl chatnet
 hashes

---
 src/perl/irc/Irc.xs   | 9 +++++++++
 src/perl/irc/module.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index f973da22..7ee47180 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -3,6 +3,12 @@
 
 static int initialized = FALSE;
 
+static void perl_irc_chatnet_fill_hash(HV *hv, IRC_CHATNET_REC *chatnet)
+{
+	perl_chatnet_fill_hash(hv, (CHATNET_REC *) chatnet);
+	(void) hv_store(hv, "usermode", 8, new_pv(chatnet->usermode), 0);
+}
+
 static void perl_irc_connect_fill_hash(HV *hv, IRC_SERVER_CONNECT_REC *conn)
 {
 	perl_connect_fill_hash(hv, (SERVER_CONNECT_REC *) conn);
@@ -233,6 +239,9 @@ CODE:
 
 	chat_type = chat_protocol_lookup("IRC");
 
+	irssi_add_object(module_get_uniq_id("CHATNET", 0),
+			 chat_type, "Irssi::Irc::Chatnet",
+			 (PERL_OBJECT_FUNC) perl_irc_chatnet_fill_hash);
 	irssi_add_object(module_get_uniq_id("SERVER CONNECT", 0),
 			 chat_type, "Irssi::Irc::Connect",
 			 (PERL_OBJECT_FUNC) perl_irc_connect_fill_hash);
diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h
index 71801419..3dcfb065 100644
--- a/src/perl/irc/module.h
+++ b/src/perl/irc/module.h
@@ -1,6 +1,7 @@
 #include <irssi/src/perl/common/module.h>
 
 #include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-chatnets.h>
 #include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/irc/core/irc-queries.h>

From 0b82f14151dad5f106c208d25818816a8f782a54 Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Fri, 26 Mar 2021 19:20:22 -0700
Subject: [PATCH 1223/1650] Add a check for term.h

If term.h is present, use that instead of defining prototypes for the
terminfo functions in terminfo-core.c. This causes problems on certain
platforms (e.g. Apple aarch64) due to the functions being prototyped as
non-variadic but called as variadic. If term.h isn't found, it falls
back to the old behaviour.

Fixes #1238.
---
 configure.ac                | 4 ++++
 meson.build                 | 1 +
 src/fe-text/terminfo-core.c | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index cafd2970..87baddec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,6 +355,10 @@ if test "x$want_textui" != "xno"; then
 	AC_SUBST(TEXTUI_LIBS)
 	LIBS="$TEXTUI_NO_LIBS"
 
+	AC_CHECK_HEADER([term.h], [
+		AC_DEFINE(HAVE_TERM_H, [], [Define to 1 if you have the `term.h' header.])
+	])
+
 fi
 
 dnl **
diff --git a/meson.build b/meson.build
index f54db548..43a6eced 100644
--- a/meson.build
+++ b/meson.build
@@ -525,6 +525,7 @@ headers = [
   'sys/time.h',
   'sys/utsname.h',
   'dirent.h',
+  'term.h',
   'unistd.h',
 ]
 foreach h : headers
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index d2273d71..6be54c32 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -12,6 +12,9 @@ inline static int term_putchar(int c)
         return fputc(c, current_term->out);
 }
 
+#ifdef HAVE_TERM_H
+#include <term.h>
+#else
 /* Don't bother including curses.h because of these -
    they might not even be defined there */
 char *tparm();
@@ -21,6 +24,8 @@ int setupterm();
 char *tigetstr();
 int tigetnum();
 int tigetflag();
+#endif
+
 #define term_getstr(x, buffer) tigetstr(x.ti_name)
 #define term_getnum(x) tigetnum(x.ti_name);
 #define term_getflag(x) tigetflag(x.ti_name);

From c5cc58d34e0f9a26aeec8481fa843d89d01b132f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 27 Mar 2021 21:17:15 +0100
Subject: [PATCH 1224/1650] remove unused include

---
 src/core/tls.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/tls.h b/src/core/tls.h
index 791bde86..1e1a1038 100644
--- a/src/core/tls.h
+++ b/src/core/tls.h
@@ -21,8 +21,6 @@
 
 #include <openssl/ssl.h>
 
-#include <stdbool.h>
-
 typedef struct _TLS_REC TLS_REC;
 typedef struct _TLS_CERT_REC TLS_CERT_REC;
 typedef struct _TLS_CERT_ENTRY_REC TLS_CERT_ENTRY_REC;

From 8b597cb75320c7c6ba4fcaefc75c8020899f465c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 1 Apr 2021 21:21:06 +0200
Subject: [PATCH 1225/1650] fix clang formatting

---
 .clang-format       | 2 +-
 src/perl/irc/Irc.xs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.clang-format b/.clang-format
index 1180910e..a0cb79c0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -27,7 +27,7 @@ Language: Cpp
 Cpp11BracedListStyle: false
 MaxEmptyLinesToKeep: 1
 PointerAlignment: Right
-SortIncludes: true
+SortIncludes: false
 SpaceAfterCStyleCast: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 7ee47180..33be93d5 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -239,9 +239,8 @@ CODE:
 
 	chat_type = chat_protocol_lookup("IRC");
 
-	irssi_add_object(module_get_uniq_id("CHATNET", 0),
-			 chat_type, "Irssi::Irc::Chatnet",
-			 (PERL_OBJECT_FUNC) perl_irc_chatnet_fill_hash);
+	irssi_add_object(module_get_uniq_id("CHATNET", 0), chat_type, "Irssi::Irc::Chatnet",
+	                 (PERL_OBJECT_FUNC) perl_irc_chatnet_fill_hash);
 	irssi_add_object(module_get_uniq_id("SERVER CONNECT", 0),
 			 chat_type, "Irssi::Irc::Connect",
 			 (PERL_OBJECT_FUNC) perl_irc_connect_fill_hash);

From 4c25bef29c9ab5e5892c66800fbc03064d788b02 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 1 Apr 2021 21:53:30 +0200
Subject: [PATCH 1226/1650] don't bother if we don't have a nick

Credit to OSS-Fuzz
---
 src/irc/core/massjoin.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 61e2615f..b8b8912f 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -72,6 +72,11 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 
 	/* add user to nicklist */
 	nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, FALSE, send_massjoin, NULL);
+	if (nickrec == NULL) {
+		/* invalid nick? */
+		g_free(params);
+		return;
+	}
 	if (*account != '\0' && g_strcmp0(nickrec->account, account) != 0) {
 		nicklist_set_account(CHANNEL(chanrec), nickrec, account);
 	}

From 80926476fc4c17dea9f24f9da753f7443b8c05e1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 15 Jan 2021 23:32:25 +0100
Subject: [PATCH 1227/1650] do not beep on hidden lines with /set
 beep_msg_level ... -hidden

---
 src/core/settings.c            | 17 +++++++++++++++++
 src/core/settings.h            |  1 +
 src/fe-common/core/printtext.c | 18 ++++++++++++++++--
 src/perl/common/Settings.xs    |  4 ++++
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 04c7bbe6..28f953ba 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -138,6 +138,23 @@ int settings_get_level(const char *key)
 	return str == NULL ? 0 : level2bits(str, NULL);
 }
 
+int settings_get_level_negative(const char *key)
+{
+	const char *str, *tmp, *all_levels;
+	int levels;
+
+	str = settings_get_str_type(key, SETTING_TYPE_LEVEL);
+	if (str == NULL)
+		return 0;
+
+	all_levels = bits2level(~0);
+	tmp = g_strdup_printf("%s %s", all_levels, str);
+	levels = level2bits(tmp, NULL) ^ level2bits(all_levels, NULL);
+	g_free((char *) tmp);
+	g_free((char *) all_levels);
+	return levels;
+}
+
 int settings_get_size(const char *key)
 {
 	const char *str;
diff --git a/src/core/settings.h b/src/core/settings.h
index 3a8a4646..9c78b3db 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -66,6 +66,7 @@ int settings_get_int(const char *key);
 int settings_get_bool(const char *key);
 int settings_get_time(const char *key); /* as milliseconds */
 int settings_get_level(const char *key);
+int settings_get_level_negative(const char *key);
 int settings_get_size(const char *key); /* as bytes */
 int settings_get_choice(const char *key);
 char *settings_get_print(SETTINGS_REC *rec);
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 6869fba3..18652689 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -32,13 +32,14 @@
 #include <irssi/src/fe-common/core/fe-windows.h>
 #include <irssi/src/fe-common/core/printtext.h>
 
-static int beep_msg_level, beep_when_away, beep_when_window_active;
+static int beep_msg_level, beep_msg_level_ignore, beep_when_away, beep_when_window_active;
 
 static int signal_gui_print_text_finished;
 static int signal_print_starting;
 static int signal_print_text;
 static int signal_print_format;
 static int signal_print_noformat;
+static int signal_window_hilight_check;
 
 static int sending_print_starting;
 
@@ -404,7 +405,18 @@ static void msg_beep_check(TEXT_DEST_REC *dest)
 	    (beep_when_away || (dest->server != NULL &&
 				!dest->server->usermode_away)) &&
 	    (beep_when_window_active || dest->window != active_win)) {
-                signal_emit("beep", 0);
+		if (beep_msg_level_ignore & MSGLEVEL_HIDDEN) {
+			int cb_ignore = 0;
+			if (signal_emit_id(signal_window_hilight_check, 4, dest, NULL, NULL,
+			                   &cb_ignore),
+			    cb_ignore) {
+				return;
+			}
+		} else if (beep_msg_level_ignore & dest->level) {
+			return;
+		}
+
+		signal_emit("beep", 0);
 	}
 }
 
@@ -521,6 +533,7 @@ static void sig_gui_dialog(const char *type, const char *text)
 static void read_settings(void)
 {
 	beep_msg_level = settings_get_level("beep_msg_level");
+	beep_msg_level_ignore = settings_get_level_negative("beep_msg_level");
 	beep_when_away = settings_get_bool("beep_when_away");
         beep_when_window_active = settings_get_bool("beep_when_window_active");
 }
@@ -533,6 +546,7 @@ void printtext_init(void)
 	signal_print_text = signal_get_uniq_id("print text");
 	signal_print_format = signal_get_uniq_id("print format");
 	signal_print_noformat = signal_get_uniq_id("print noformat");
+	signal_window_hilight_check = signal_get_uniq_id("window hilight check");
 
 	read_settings();
 	signal_add("print text", (SIGNAL_FUNC) sig_print_text);
diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs
index 20596c86..2da23400 100644
--- a/src/perl/common/Settings.xs
+++ b/src/perl/common/Settings.xs
@@ -96,6 +96,10 @@ int
 settings_get_level(key)
        char *key
 
+int
+settings_get_level_negative(key)
+	char *key
+	
 int
 settings_get_size(key)
        char *key

From 7a3a383772fd50b6ae5ce7f0418d22871b2c28d5 Mon Sep 17 00:00:00 2001
From: ihsinme <ihsinme@gmail.com>
Date: Fri, 2 Apr 2021 14:21:06 +0300
Subject: [PATCH 1228/1650] Update sasl.c

---
 src/irc/core/sasl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 22a10ec7..9bc40ff2 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -158,6 +158,7 @@ static gboolean sasl_reassemble_incoming(IRC_SERVER_REC *server, const char *fra
 	 * Fail authentication with this server. They have sent too much data.
 	 */
 	if (enc_req->len > AUTHENTICATE_MAX_SIZE) {
+		g_string_free(enc_req, TRUE);
 		return FALSE;
 	}
 

From d20d2753da32d38bf5a4b3749f4daa10b8b8a86d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 15 Mar 2021 20:24:00 +0100
Subject: [PATCH 1229/1650] autoload modules from default setting

---
 src/core/core.c                     |  1 +
 src/fe-common/core/fe-common-core.c |  1 +
 src/fe-common/core/fe-modules.c     | 18 +++++++++++++++++-
 src/fe-text/irssi.c                 | 17 +++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/core/core.c b/src/core/core.c
index 34649c81..cbe3eb7c 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -269,6 +269,7 @@ void core_init(void)
 	settings_add_str("misc", "ignore_signals", "");
 	settings_add_bool("misc", "override_coredump_limit", FALSE);
 	settings_add_bool("misc", "quit_on_hup", FALSE);
+	settings_add_str("misc", "autoload_modules", "perl otr");
 
 #ifdef HAVE_SYS_RESOURCE_H
 	getrlimit(RLIMIT_CORE, &orig_core_rlimit);
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 8f412198..63df1698 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -464,6 +464,7 @@ void fe_common_core_finish_init(void)
                 signal_emit("setup changed", 0);
 
 	autorun_startup();
+	signal_emit("module autoload", 0);
 	autoconnect_servers();
 }
 
diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index 9ad594cb..01b603f5 100644
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@@ -170,15 +170,25 @@ static void cmd_load(const char *data)
         char *rootmodule, *submodule;
 	char **module_prefixes;
 	void *free_arg;
+	gboolean silent;
+	GHashTable *optlist;
 
 	g_return_if_fail(data != NULL);
 
-	if (!cmd_get_params(data, &free_arg, 2 , &rootmodule, &submodule))
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS, "load", &optlist, &rootmodule,
+	                    &submodule))
 		return;
 
+	silent = g_hash_table_lookup(optlist, "silent") != NULL;
+
 	if (*rootmodule == '\0')
 		cmd_load_list();
 	else {
+		if (silent) {
+			signal_add_first("module error", (SIGNAL_FUNC) signal_stop);
+			signal_add_first("module loaded", (SIGNAL_FUNC) signal_stop);
+		}
+
 		module_prefixes = module_prefixes_get();
 		if (*submodule == '\0')
 			module_load(rootmodule, module_prefixes);
@@ -187,6 +197,11 @@ static void cmd_load(const char *data)
 					module_prefixes);
 		}
                 module_prefixes_free(module_prefixes);
+
+		if (silent) {
+			signal_remove("module error", (SIGNAL_FUNC) signal_stop);
+			signal_remove("module loaded", (SIGNAL_FUNC) signal_stop);
+		}
 	}
 
 	cmd_params_free(free_arg);
@@ -244,6 +259,7 @@ void fe_modules_init(void)
 
 	command_bind("load", NULL, (SIGNAL_FUNC) cmd_load);
 	command_bind("unload", NULL, (SIGNAL_FUNC) cmd_unload);
+	command_set_options("load", "silent");
 }
 
 void fe_modules_deinit(void)
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 5c20eb37..fbaa303a 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -102,6 +102,21 @@ static void sig_settings_userinfo_changed(gpointer changedp)
 	user_settings_changed = GPOINTER_TO_UINT(changedp);
 }
 
+static void sig_autoload_modules(void)
+{
+	char **list, **module;
+	list = g_strsplit_set(settings_get_str("autoload_modules"), " ,", -1);
+	for (module = list; *module != NULL; module++) {
+		char *tmp;
+		if ((tmp = strchr(*module, ':')) != NULL)
+			*tmp = ' ';
+		tmp = g_strdup_printf("-silent %s", *module);
+		signal_emit("command load", 1, tmp);
+		g_free(tmp);
+	}
+	g_strfreev(list);
+}
+
 /* redraw irssi's screen.. */
 void irssi_redraw(void)
 {
@@ -159,6 +174,7 @@ static void textui_init(void)
 
 	theme_register(gui_text_formats);
 	signal_add("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
+	signal_add("module autoload", (SIGNAL_FUNC) sig_autoload_modules);
 	signal_add_last("gui exit", (SIGNAL_FUNC) sig_exit);
 }
 
@@ -262,6 +278,7 @@ static void textui_deinit(void)
 
 	dirty_check(); /* one last time to print any quit messages */
 	signal_remove("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
+	signal_remove("module autoload", (SIGNAL_FUNC) sig_autoload_modules);
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
 
 	lastlog_deinit();

From b4ab8c1ada0ca01db97eadd6c0fd412668920326 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 3 Apr 2021 21:32:04 +0200
Subject: [PATCH 1230/1650] missing strdup on netsplits w/o chan

---
 src/fe-common/irc/fe-netsplit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index 4b7850da..b76d4ce7 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -320,9 +320,9 @@ static void split_print(NETSPLIT_REC *rec, SERVER_REC *server)
         char *chanstr;
 
 	chan = rec->channels->data;
-	chanstr = chan == NULL ? "" :
-		g_strconcat(chan->op ? "@" :
-			    (chan->voice ? "+" : ""), chan->name, NULL);
+	chanstr = chan == NULL ?
+                      g_strdup("") :
+                      g_strconcat(chan->op ? "@" : (chan->voice ? "+" : ""), chan->name, NULL);
 
 	printformat(server, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_NETSPLITS_LINE,
 		    rec->nick, chanstr, rec->server->server,

From efd705ba594fa50f7b04c3f0b415fa4173b8a2b5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 3 Apr 2021 21:54:53 +0200
Subject: [PATCH 1231/1650] fix crash on /connect /dev/null

---
 src/core/servers.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index a20d5f4a..143158ba 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -244,7 +244,9 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 			server->no_reconnect = TRUE;
 
 		server->connection_lost = TRUE;
-		server->connrec->last_failed_family = ip->family;
+		if (ip != NULL) {
+			server->connrec->last_failed_family = ip->family;
+		}
 		server_connect_failed(server, errmsg2 ? errmsg2 : errmsg);
 		g_free(errmsg2);
 	} else {

From 1e54b92220b0eba2af63226d41e9c8ea197677d0 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 3 Apr 2021 22:38:00 +0200
Subject: [PATCH 1232/1650] fix crash on /connect -tls

fixes #1239
---
 src/core/servers.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index 143158ba..77b88fa9 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -208,7 +208,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 	const char *errmsg;
 	char *errmsg2;
 	char ipaddr[MAX_IP_LEN];
-        int port;
+	int port = 0;
 
 	g_return_if_fail(ip != NULL || unix_socket != NULL);
 
@@ -222,12 +222,21 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
-		handle = server->connrec->use_tls ?
-			net_connect_ip_ssl(ip, port, own_ip, server) : net_connect_ip(ip, port, own_ip);
+		handle = net_connect_ip(ip, port, own_ip);
 	} else {
 		handle = net_connect_unix(unix_socket);
 	}
 
+	if (server->connrec->use_tls && handle != NULL) {
+		server->handle = net_sendbuffer_create(handle, 0);
+		handle = net_start_ssl(server);
+		if (handle == NULL) {
+			net_sendbuffer_destroy(server->handle, TRUE);
+		} else {
+			server->handle->handle = handle;
+		}
+	}
+
 	if (handle == NULL) {
 		/* failed */
 		errmsg = g_strerror(errno);
@@ -251,7 +260,8 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		g_free(errmsg2);
 	} else {
 		server->connrec->last_failed_family = 0;
-		server->handle = net_sendbuffer_create(handle, 0);
+		if (!server->connrec->use_tls)
+			server->handle = net_sendbuffer_create(handle, 0);
 		if (server->connrec->use_tls)
 			server_connect_callback_init_ssl(server, handle);
 		else

From 46493c051b73822838cb6d2af264248a0125d150 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 16 Jan 2021 00:31:56 +0100
Subject: [PATCH 1233/1650] add /IGNORE ... NOHILIGHT to ignore some hilights

---
 src/core/ignore.c                   | 21 ++++++++++-----------
 src/core/ignore.h                   |  9 ++++-----
 src/core/levels.c                   |  6 ++++++
 src/fe-common/core/fe-ignore.c      |  8 ++++++++
 src/fe-common/core/fe-messages.c    |  5 +++++
 src/fe-common/irc/fe-irc-messages.c |  6 ++++++
 6 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 14fa585e..0bc12ed3 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -81,7 +81,7 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
  * used as a flag to indicate it should only look at ignore items with NO_ACT.
  * However we also want to allow NO_ACT combined with levels, so mask it out and
  * match levels if set. */
-#define FLAG_MSGLEVELS ( MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN )
+#define FLAG_MSGLEVELS (MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN | MSGLEVEL_NOHILIGHT)
 static int ignore_match_level(IGNORE_REC *rec, int level, int flags)
 {
 	level &= ~FLAG_MSGLEVELS;
@@ -214,6 +214,9 @@ int ignore_check_plus(SERVER_REC *server, const char *nick, const char *address,
 	if (ignore_check_flags(server, nick, address, target, msg, olevel, MSGLEVEL_HIDDEN))
 		*level |= MSGLEVEL_HIDDEN;
 
+	if (ignore_check_flags(server, nick, address, target, msg, olevel, MSGLEVEL_NOHILIGHT))
+		*level |= MSGLEVEL_NOHILIGHT;
+
 	return FALSE;
 }
 
@@ -252,6 +255,12 @@ IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char
 		if (!(flags & IGNORE_FIND_HIDDEN) && (rec->level & MSGLEVEL_HIDDEN) != 0)
 			continue;
 
+		if ((flags & IGNORE_FIND_NOHILIGHT) && (rec->level & MSGLEVEL_NOHILIGHT) == 0)
+			continue;
+
+		if (!(flags & IGNORE_FIND_NOHILIGHT) && (rec->level & MSGLEVEL_NOHILIGHT) != 0)
+			continue;
+
 		if ((rec->mask == NULL && mask != NULL) ||
 		    (rec->mask != NULL && mask == NULL))
 			continue;
@@ -299,16 +308,6 @@ IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels
 	return ignore_find_full(servertag, mask, NULL, channels, 0);
 }
 
-IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact)
-{
-	return ignore_find_full(servertag, mask, NULL, channels, IGNORE_FIND_NOACT);
-}
-
-IGNORE_REC *ignore_find_hidden(const char *servertag, const char *mask, char **channels, int hidden)
-{
-	return ignore_find_full(servertag, mask, NULL, channels, IGNORE_FIND_HIDDEN);
-}
-
 static void ignore_set_config(IGNORE_REC *rec)
 {
 	CONFIG_NODE *node;
diff --git a/src/core/ignore.h b/src/core/ignore.h
index bf55a76b..739514a9 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -31,9 +31,10 @@ int ignore_check_plus(SERVER_REC *server, const char *nick, const char *host,
 		      const char *channel, const char *text, int *level, int test_ignore);
 
 enum {
-	IGNORE_FIND_PATTERN = 0x01, /* Match the pattern */
-	IGNORE_FIND_NOACT   = 0x02, /* Exclude the targets with NOACT level */
-	IGNORE_FIND_HIDDEN  = 0x04, /* Exclude the targets with HIDDEN level */
+	IGNORE_FIND_PATTERN = 0x01,   /* Match the pattern */
+	IGNORE_FIND_NOACT = 0x02,     /* Exclude the targets with NOACT level */
+	IGNORE_FIND_HIDDEN = 0x04,    /* Exclude the targets with HIDDEN level */
+	IGNORE_FIND_NOHILIGHT = 0x08, /* Exclude the targets with NOHILIGHT level */
 };
 
 IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern,
@@ -42,8 +43,6 @@ IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const cha
 /* Convenience wrappers around ignore_find_full, for compatibility purpose */
 
 IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
-IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact);
-IGNORE_REC *ignore_find_hidden(const char *servertag, const char *mask, char **channels, int hidden);
 
 void ignore_add_rec(IGNORE_REC *rec);
 void ignore_update_rec(IGNORE_REC *rec);
diff --git a/src/core/levels.c b/src/core/levels.c
index 9102696e..e62bc68c 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -61,6 +61,9 @@ int level_get(const char *level)
 	if (g_ascii_strcasecmp(level, "NO_ACT") == 0)
 		return MSGLEVEL_NO_ACT;
 
+	if (g_ascii_strcasecmp(level, "NOHILIGHT") == 0)
+		return MSGLEVEL_NOHILIGHT;
+
 	if (g_ascii_strcasecmp(level, "HIDDEN") == 0)
 		return MSGLEVEL_HIDDEN;
 
@@ -154,6 +157,9 @@ char *bits2level(int bits)
 		}
 	}
 
+	if (bits & MSGLEVEL_NOHILIGHT)
+		g_string_append(str, "NOHILIGHT ");
+
 	if (bits & MSGLEVEL_HIDDEN)
 		g_string_append(str, "HIDDEN ");
 
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 890d2c19..276169df 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -169,6 +169,8 @@ static void cmd_ignore(const char *data)
 		flags |= IGNORE_FIND_NOACT;
 	if (level & MSGLEVEL_HIDDEN)
 		flags |= IGNORE_FIND_HIDDEN;
+	if (level & MSGLEVEL_NOHILIGHT)
+		flags |= IGNORE_FIND_NOHILIGHT;
 
 	rec = ignore_find_full(servertag, mask, patternarg, channels, flags);
 	new_ignore = rec == NULL;
@@ -198,6 +200,12 @@ static void cmd_ignore(const char *data)
 		rec->level |= MSGLEVEL_ALL;
 	}
 
+	if (rec->level == MSGLEVEL_NOHILIGHT) {
+		/* If only NOHILIGHT was specified add all levels; it makes no
+		 * sense on its own. */
+		rec->level |= MSGLEVEL_ALL;
+	}
+
 	if (new_ignore && rec->level == 0) {
 		/* tried to unignore levels from nonexisting ignore */
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index c4469178..355d4fd4 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -202,6 +202,11 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
 		level |= MSGLEVEL_HILIGHT;
 
 	ignore_check_plus(server, nick, address, target, msg, &level, FALSE);
+	if (level & MSGLEVEL_NOHILIGHT) {
+		for_me = FALSE;
+		g_free_and_null(color);
+		level &= ~MSGLEVEL_HILIGHT;
+	}
 
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) chanrec, msg);
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 714b2eb2..2e71b34f 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -114,6 +114,12 @@ static void sig_message_irc_op_public(SERVER_REC *server, const char *msg,
 		return;
 	}
 
+	if (level & MSGLEVEL_NOHILIGHT) {
+		for_me = FALSE;
+		g_free_and_null(color);
+		level &= ~MSGLEVEL_HILIGHT;
+	}
+
 	if (settings_get_bool("emphasis"))
 		msg = freemsg = expand_emphasis((WI_ITEM_REC *) chanrec, msg);
 

From 308400154b76897413f02987b9b8997fd6482af4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 7 Apr 2021 21:36:27 +0200
Subject: [PATCH 1234/1650] fix crash on tls error

---
 src/core/servers.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/servers.c b/src/core/servers.c
index 77b88fa9..159af0e1 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -232,6 +232,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		handle = net_start_ssl(server);
 		if (handle == NULL) {
 			net_sendbuffer_destroy(server->handle, TRUE);
+			server->handle = NULL;
 		} else {
 			server->handle->handle = handle;
 		}

From 51508ff1d38b47760068da8c9ce0229e3eed3f05 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 5 Apr 2020 13:18:54 +0200
Subject: [PATCH 1235/1650] use starttls

---
 src/core/chat-commands.c             |   4 +-
 src/core/servers-setup.c             |  42 ++---
 src/core/servers-setup.h             |   4 +
 src/fe-common/core/fe-server.c       |   2 +-
 src/fe-common/irc/fe-irc-server.c    |  67 +++++---
 src/irc/core/irc-cap.c               | 100 +++++++-----
 src/irc/core/irc-commands.c          |   2 +-
 src/irc/core/irc-servers-reconnect.c |   2 +
 src/irc/core/irc-servers-setup.c     |  16 +-
 src/irc/core/irc-servers-setup.h     |   1 +
 src/irc/core/irc-servers.c           | 235 +++++++++++++++++++++------
 src/irc/core/irc-servers.h           |   7 +
 src/irc/core/irc.c                   |   2 +
 13 files changed, 346 insertions(+), 138 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index ae44ef63..8c70bfc6 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -71,8 +71,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 	if (chatnet == NULL)
 		chatnet = g_hash_table_lookup(optlist, "network");
 
-	conn = server_create_conn(proto != NULL ? proto->id : -1, addr,
-				  atoi(portstr), chatnet, password, nick);
+	conn = server_create_conn_opt(proto != NULL ? proto->id : -1, addr, atoi(portstr), chatnet,
+	                              password, nick, optlist);
 	if (conn == NULL) {
 		signal_emit("error command", 1,
 			    GINT_TO_POINTER(CMDERR_NO_SERVER_DEFINED));
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 43653c43..ea15e2a8 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -140,8 +140,8 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn,
 	signal_emit("server setup fill reconn", 2, conn, sserver);
 }
 
-static void server_setup_fill(SERVER_CONNECT_REC *conn,
-			      const char *address, int port)
+static void server_setup_fill(SERVER_CONNECT_REC *conn, const char *address, int port,
+                              GHashTable *optlist)
 {
 	g_return_if_fail(conn != NULL);
 	g_return_if_fail(address != NULL);
@@ -177,7 +177,7 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
 		memcpy(conn->own_ip6, source_host_ip6, sizeof(IPADDR));
 	}
 
-	signal_emit("server setup fill connect", 1, conn);
+	signal_emit("server setup fill connect", 2, conn, optlist);
 }
 
 static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
@@ -219,10 +219,9 @@ static void server_setup_fill_chatnet(SERVER_CONNECT_REC *conn,
 	signal_emit("server setup fill chatnet", 2, conn, chatnet);
 }
 
-static SERVER_CONNECT_REC *
-create_addr_conn(int chat_type, const char *address, int port,
-		 const char *chatnet, const char *password,
-		 const char *nick)
+static SERVER_CONNECT_REC *create_addr_conn(int chat_type, const char *address, int port,
+                                            const char *chatnet, const char *password,
+                                            const char *nick, GHashTable *optlist)
 {
         CHAT_PROTOCOL_REC *proto;
 	SERVER_CONNECT_REC *conn;
@@ -250,7 +249,7 @@ create_addr_conn(int chat_type, const char *address, int port,
 		conn->chatnet = g_strdup(chatnet);
 
 	/* fill in the defaults */
-	server_setup_fill(conn, address, port);
+	server_setup_fill(conn, address, port, optlist);
 
 	/* fill the rest from chat network settings */
 	chatnetrec = chatnet != NULL ? chatnet_find(chatnet) :
@@ -279,9 +278,8 @@ create_addr_conn(int chat_type, const char *address, int port,
 /* Connect to server where last connect succeeded (or we haven't tried to
    connect yet). If there's no such server, connect to server where we
    haven't connected for the longest time */
-static SERVER_CONNECT_REC *
-create_chatnet_conn(const char *dest, int port,
-		    const char *password, const char *nick)
+static SERVER_CONNECT_REC *create_chatnet_conn(const char *dest, int port, const char *password,
+                                               const char *nick, GHashTable *optlist)
 {
 	SERVER_SETUP_REC *bestrec;
 	GSList *tmp;
@@ -308,16 +306,15 @@ create_chatnet_conn(const char *dest, int port,
 	}
 
 	return bestrec == NULL ? NULL :
-		create_addr_conn(bestrec->chat_type, bestrec->address, 0,
-				 dest, NULL, nick);
+                                 create_addr_conn(bestrec->chat_type, bestrec->address, 0, dest,
+	                                          NULL, nick, optlist);
 }
 
 /* Create server connection record. `dest' is required, rest can be NULL.
    `dest' is either a server address or chat network */
-SERVER_CONNECT_REC *
-server_create_conn(int chat_type, const char *dest, int port,
-		   const char *chatnet, const char *password,
-		   const char *nick)
+SERVER_CONNECT_REC *server_create_conn_opt(int chat_type, const char *dest, int port,
+                                           const char *chatnet, const char *password,
+                                           const char *nick, GHashTable *optlist)
 {
 	SERVER_CONNECT_REC *rec;
         CHATNET_REC *chatrec;
@@ -326,7 +323,7 @@ server_create_conn(int chat_type, const char *dest, int port,
 
         chatrec = chatnet_find(dest);
 	if (chatrec != NULL) {
-		rec = create_chatnet_conn(chatrec->name, port, password, nick);
+		rec = create_chatnet_conn(chatrec->name, port, password, nick, optlist);
 		/* If rec is NULL the chatnet has no url to connect to */
 		return rec;
 	}
@@ -335,8 +332,13 @@ server_create_conn(int chat_type, const char *dest, int port,
 	if (chatrec != NULL)
 		chatnet = chatrec->name;
 
-	return create_addr_conn(chat_type, dest, port,
-				chatnet, password, nick);
+	return create_addr_conn(chat_type, dest, port, chatnet, password, nick, optlist);
+}
+
+SERVER_CONNECT_REC *server_create_conn(int chat_type, const char *dest, int port,
+                                       const char *chatnet, const char *password, const char *nick)
+{
+	return server_create_conn_opt(chat_type, dest, port, chatnet, password, nick, NULL);
 }
 
 /* Find matching server from setup. Try to find record with a same port,
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index 296a94fa..f35c3873 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -31,6 +31,10 @@ server_create_conn(int chat_type, const char *dest, int port,
 		   const char *chatnet, const char *password,
 		   const char *nick);
 
+SERVER_CONNECT_REC *server_create_conn_opt(int chat_type, const char *dest, int port,
+                                           const char *chatnet, const char *password,
+                                           const char *nick, GHashTable *optlist);
+
 /* Find matching server from setup. Try to find record with a same port,
    but fallback to any server with the same address. */
 SERVER_SETUP_REC *server_setup_find(const char *address, int port,
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 5ed67170..0bf9a104 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -246,7 +246,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		rec->own_ip4 = rec->own_ip6 = NULL;
 	}
 
-	signal_emit("server add fill", 2, rec, optlist);
+	signal_emit("server add fill", 3, rec, optlist, GINT_TO_POINTER(add));
 
 	server_setup_add(rec);
 	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 7e3a6300..b5697c96 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -51,12 +51,12 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 	return target;
 }
 
-/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>]
-                             [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>]
-                             [-tls_ciphers <list>]
+/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+                             [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
+                             [-tls_capath <capath>] [-tls_ciphers <list>] [-starttls | -nostarttls]
                              [-auto | -noauto] [-network <network>] [-host <hostname>]
-                             [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
-                             <address> [<port> [<password>]] */
+                             [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>] <address> [<port>
+                             [<password>]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 				GHashTable *optlist)
@@ -85,6 +85,12 @@ static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 	if (value != NULL && *value != '\0') rec->max_cmds_at_once = atoi(value);
 	value = g_hash_table_lookup(optlist, "querychans");
 	if (value != NULL && *value != '\0') rec->max_query_chans = atoi(value);
+	if (g_hash_table_lookup(optlist, "nonostarttls"))
+		rec->starttls = -1;
+	if (g_hash_table_lookup(optlist, "nostarttls"))
+		rec->starttls = 0;
+	if (g_hash_table_lookup(optlist, "starttls"))
+		rec->starttls = 1;
 }
 
 /* SYNTAX: SERVER LIST */
@@ -108,29 +114,31 @@ static void cmd_server_list(const char *data)
 			g_string_append(str, "autoconnect, ");
 		if (rec->no_proxy)
 			g_string_append(str, "noproxy, ");
-		if (rec->use_tls) {
+		if (rec->starttls >= 0)
+			g_string_append_printf(str, "%sstarttls, ", rec->starttls ? "" : "no");
+		if (rec->use_tls)
 			g_string_append(str, "tls, ");
-			if (rec->tls_cert) {
-				g_string_append_printf(str, "tls_cert: %s, ", rec->tls_cert);
-				if (rec->tls_pkey)
-					g_string_append_printf(str, "tls_pkey: %s, ", rec->tls_pkey);
-				if (rec->tls_pass)
-					g_string_append_printf(str, "(pass), ");
-			}
-			if (rec->tls_verify)
-				g_string_append(str, "tls_verify, ");
-			if (rec->tls_cafile)
-				g_string_append_printf(str, "tls_cafile: %s, ", rec->tls_cafile);
-			if (rec->tls_capath)
-				g_string_append_printf(str, "tls_capath: %s, ", rec->tls_capath);
-			if (rec->tls_ciphers)
-				g_string_append_printf(str, "tls_ciphers: %s, ", rec->tls_ciphers);
-			if (rec->tls_pinned_cert)
-				g_string_append_printf(str, "tls_pinned_cert: %s, ", rec->tls_pinned_cert);
-			if (rec->tls_pinned_pubkey)
-				g_string_append_printf(str, "tls_pinned_pubkey: %s, ", rec->tls_pinned_pubkey);
-
+		if (rec->tls_cert) {
+			g_string_append_printf(str, "tls_cert: %s, ", rec->tls_cert);
+			if (rec->tls_pkey)
+				g_string_append_printf(str, "tls_pkey: %s, ", rec->tls_pkey);
+			if (rec->tls_pass)
+				g_string_append_printf(str, "(pass), ");
 		}
+		if (rec->tls_verify)
+			g_string_append(str, "tls_verify, ");
+		if (rec->tls_cafile)
+			g_string_append_printf(str, "tls_cafile: %s, ", rec->tls_cafile);
+		if (rec->tls_capath)
+			g_string_append_printf(str, "tls_capath: %s, ", rec->tls_capath);
+		if (rec->tls_ciphers)
+			g_string_append_printf(str, "tls_ciphers: %s, ", rec->tls_ciphers);
+		if (rec->tls_pinned_cert)
+			g_string_append_printf(str, "tls_pinned_cert: %s, ", rec->tls_pinned_cert);
+		if (rec->tls_pinned_pubkey)
+			g_string_append_printf(str, "tls_pinned_pubkey: %s, ",
+			                       rec->tls_pinned_pubkey);
+
 		if (rec->max_cmds_at_once > 0)
 			g_string_append_printf(str, "cmdmax: %d, ", rec->max_cmds_at_once);
 		if (rec->cmd_queue_speed > 0)
@@ -155,7 +163,12 @@ void fe_irc_server_init(void)
 	signal_add("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
 	command_bind("server list", NULL, (SIGNAL_FUNC) cmd_server_list);
 
-	command_set_options("server add", "-ircnet -network -cmdspeed -cmdmax -querychans");
+	command_set_options(
+	    "server add",
+	    "-ircnet -network -cmdspeed -cmdmax -querychans starttls nostarttls nonostarttls");
+	command_set_options(
+	    "server modify",
+	    "-ircnet -network -cmdspeed -cmdmax -querychans starttls nostarttls nonostarttls");
 }
 
 void fe_irc_server_deinit(void)
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 61a80066..ce7e1616 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -104,12 +104,54 @@ static gboolean parse_cap_name(char *name, char **key, char **val)
 	return TRUE;
 }
 
+static void cap_process_request_queue(IRC_SERVER_REC *server)
+{
+	/* No CAP has been requested */
+	if (server->cap_queue == NULL) {
+		irc_cap_finish_negotiation(server);
+	} else {
+		GSList *tmp;
+		GString *cmd;
+		int avail_caps = 0;
+
+		cmd = g_string_new("CAP REQ :");
+
+		/* To process the queue in order, we need to reverse the stack once */
+		server->cap_queue = g_slist_reverse(server->cap_queue);
+
+		/* Check whether the cap is supported by the server */
+		for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
+			if (g_hash_table_lookup_extended(server->cap_supported, tmp->data, NULL,
+			                                 NULL)) {
+				if (avail_caps > 0)
+					g_string_append_c(cmd, ' ');
+				g_string_append(cmd, tmp->data);
+
+				avail_caps++;
+			}
+		}
+
+		/* Clear the queue here */
+		i_slist_free_full(server->cap_queue, (GDestroyNotify) g_free);
+		server->cap_queue = NULL;
+
+		/* If the server doesn't support any cap we requested close the negotiation here */
+		if (avail_caps > 0) {
+			signal_emit("server cap req", 2, server,
+			            cmd->str + sizeof("CAP REQ :") - 1);
+			irc_send_cmd_now(server, cmd->str);
+		} else {
+			irc_cap_finish_negotiation(server);
+		}
+
+		g_string_free(cmd, TRUE);
+	}
+}
+
 static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *address)
 {
-	GSList *tmp;
-	GString *cmd;
 	char *params, *evt, *list, *star, **caps;
-	int i, caps_length, disable, avail_caps, multiline;
+	int i, caps_length, disable, multiline;
 
 	params = event_get_params(args, 4, NULL, &evt, &star, &list);
 	if (params == NULL)
@@ -174,42 +216,20 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		/* A multiline response is always terminated by a normal one,
 		 * wait until we receive that one to require any CAP */
 		if (multiline == FALSE) {
-			/* No CAP has been requested */
-			if (server->cap_queue == NULL) {
-				irc_cap_finish_negotiation(server);
-			}
-			else {
-				cmd = g_string_new("CAP REQ :");
-
-				avail_caps = 0;
-
-				/* To process the queue in order, we need to reverse the stack once */
-				server->cap_queue = g_slist_reverse(server->cap_queue);
-
-				/* Check whether the cap is supported by the server */
-				for (tmp = server->cap_queue; tmp != NULL; tmp = tmp->next) {
-					if (g_hash_table_lookup_extended(server->cap_supported, tmp->data, NULL, NULL)) {
-						if (avail_caps > 0)
-							g_string_append_c(cmd, ' ');
-						g_string_append(cmd, tmp->data);
-
-						avail_caps++;
-					}
-				}
-
-				/* Clear the queue here */
-				i_slist_free_full(server->cap_queue, (GDestroyNotify) g_free);
-				server->cap_queue = NULL;
-
-				/* If the server doesn't support any cap we requested close the negotiation here */
-				if (avail_caps > 0) {
-					signal_emit("server cap req", 2, server, cmd->str + sizeof("CAP REQ :") - 1);
-					irc_send_cmd_now(server, cmd->str);
-				} else {
-					irc_cap_finish_negotiation(server);
-				}
-
-				g_string_free(cmd, TRUE);
+			gboolean want_starttls =
+			    i_slist_find_string(server->cap_queue, CAP_STARTTLS) != NULL;
+			server->cap_queue =
+			    i_slist_delete_string(server->cap_queue, CAP_STARTTLS, g_free);
+			if (server->connrec->starttls) {
+				/* the connection has requested starttls,
+				   no more data must be sent now */
+			} else if (want_starttls &&
+			           g_hash_table_lookup_extended(server->cap_supported, CAP_STARTTLS,
+			                                        NULL, NULL)) {
+				irc_server_send_starttls(server);
+				/* no more data must be sent now */
+			} else {
+				cap_process_request_queue(server);
 			}
 		}
 	}
@@ -301,12 +321,14 @@ static void event_invalid_cap (IRC_SERVER_REC *server, const char *data, const c
 
 void irc_cap_init (void)
 {
+	signal_add_last("server cap continue", (SIGNAL_FUNC) cap_process_request_queue);
 	signal_add_first("event cap", (SIGNAL_FUNC) event_cap);
 	signal_add_first("event 410", (SIGNAL_FUNC) event_invalid_cap);
 }
 
 void irc_cap_deinit (void)
 {
+	signal_remove("server cap continue", (SIGNAL_FUNC) cap_process_request_queue);
 	signal_remove("event cap", (SIGNAL_FUNC) event_cap);
 	signal_remove("event 410", (SIGNAL_FUNC) event_invalid_cap);
 }
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 935c6b42..8c8179e0 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -1053,7 +1053,7 @@ void irc_commands_init(void)
 	signal_add("whois end", (SIGNAL_FUNC) event_end_of_whois);
 	signal_add("whowas event", (SIGNAL_FUNC) event_whowas);
 
-	command_set_options("connect", "+ircnet");
+	command_set_options("connect", "+ircnet starttls nostarttls");
 	command_set_options("topic", "delete");
 	command_set_options("list", "yes");
 	command_set_options("away", "one all");
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index cfe28a1a..4a8d2908 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -51,6 +51,8 @@ static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 	rec->sasl_mechanism = src->sasl_mechanism;
 	rec->sasl_username = g_strdup(src->sasl_username);
 	rec->sasl_password = g_strdup(src->sasl_password);
+	rec->no_starttls = src->no_starttls;
+	rec->starttls = src->starttls;
 	*dest = (SERVER_CONNECT_REC *) rec;
 }
 
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 5f1290a2..74edb47b 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -44,9 +44,13 @@ static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
 		conn->max_cmds_at_once = sserver->max_cmds_at_once;
 	if (sserver->max_query_chans > 0)
 		conn->max_query_chans = sserver->max_query_chans;
+	if (sserver->starttls == 0)
+		conn->no_starttls = 1;
+	else if (sserver->starttls == 1)
+		conn->starttls = 1;
 }
 
-static void sig_server_setup_fill_connect(IRC_SERVER_CONNECT_REC *conn)
+static void sig_server_setup_fill_connect(IRC_SERVER_CONNECT_REC *conn, GHashTable *optlist)
 {
 	const char *value;
 
@@ -60,6 +64,11 @@ static void sig_server_setup_fill_connect(IRC_SERVER_CONNECT_REC *conn)
 	value = settings_get_str("usermode");
 	conn->usermode = (value != NULL && *value != '\0') ?
 		g_strdup(value) : NULL;
+
+	if (g_hash_table_lookup(optlist, "starttls") != NULL)
+		conn->starttls = 1;
+	else if (g_hash_table_lookup(optlist, "nostarttls") != NULL)
+		conn->no_starttls = 1;
 }
 
 static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
@@ -174,6 +183,7 @@ static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)
 	rec->max_cmds_at_once = config_node_get_int(node, "cmds_max_at_once", 0);
 	rec->cmd_queue_speed = config_node_get_int(node, "cmd_queue_speed", 0);
 	rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0);
+	rec->starttls = config_node_get_bool(node, "starttls", -1);
 }
 
 static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
@@ -188,6 +198,10 @@ static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
 		iconfig_node_set_int(node, "cmd_queue_speed", rec->cmd_queue_speed);
 	if (rec->max_query_chans > 0)
 		iconfig_node_set_int(node, "max_query_chans", rec->max_query_chans);
+	if (rec->starttls >= 0)
+		iconfig_node_set_bool(node, "starttls", rec->starttls);
+	else
+		iconfig_node_set_str(node, "starttls", NULL);
 }
 
 void irc_servers_setup_init(void)
diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index d3bafdef..8fbb311e 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -18,6 +18,7 @@ typedef struct {
 	int max_cmds_at_once;
 	int cmd_queue_speed;
         int max_query_chans;
+	int starttls;
 } IRC_SERVER_SETUP_REC;
 
 void irc_servers_setup_init(void);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index f29a8f91..29b389f4 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -20,10 +20,11 @@
 
 #include "module.h"
 
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/rawlog.h>
 #include <irssi/src/core/misc.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/signals.h>
 
 #include <irssi/src/core/channels.h>
 #include <irssi/src/core/queries.h>
@@ -207,17 +208,17 @@ static char **split_message(SERVER_REC *server, const char *target,
 			  strlen(target));
 }
 
-static void server_init(IRC_SERVER_REC *server)
+static void server_init_2(IRC_SERVER_REC *server);
+static void server_init_1(IRC_SERVER_REC *server)
 {
 	IRC_SERVER_CONNECT_REC *conn;
-	char *address, *ptr, *username, *cmd;
+	char *cmd;
 
 	g_return_if_fail(server != NULL);
 
 	conn = server->connrec;
 
-	if (conn->proxy != NULL && conn->proxy_password != NULL &&
-	    *conn->proxy_password != '\0') {
+	if (conn->proxy != NULL && conn->proxy_password != NULL && *conn->proxy_password != '\0') {
 		cmd = g_strdup_printf("PASS %s", conn->proxy_password);
 		irc_send_cmd_now(server, cmd);
 		g_free(cmd);
@@ -243,45 +244,8 @@ static void server_init(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_ACCOUNT_NOTIFY, TRUE);
 	irc_cap_toggle(server, CAP_SELF_MESSAGE, TRUE);
 	irc_cap_toggle(server, CAP_SERVER_TIME, TRUE);
-
-	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
-
-	if (conn->password != NULL && *conn->password != '\0') {
-                /* send password */
-		cmd = g_strdup_printf("PASS %s", conn->password);
-		irc_send_cmd_now(server, cmd);
-		g_free(cmd);
-	}
-
-        /* send nick */
-	cmd = g_strdup_printf("NICK %s", conn->nick);
-	irc_send_cmd_now(server, cmd);
-	g_free(cmd);
-
-	/* send user/realname */
-	address = server->connrec->address;
-        ptr = strrchr(address, ':');
-	if (ptr != NULL) {
-		/* IPv6 address .. doesn't work here, use the string after
-		   the last : char */
-		address = ptr+1;
-		if (*address == '\0')
-			address = "x";
-	}
-
-	username = g_strdup(conn->username);
-	ptr = strchr(username, ' ');
-	if (ptr != NULL) *ptr = '\0';
-
-	cmd = g_strdup_printf("USER %s %s %s :%s", username, username, address, conn->realname);
-	irc_send_cmd_now(server, cmd);
-	g_free(cmd);
-	g_free(username);
-
-	if (conn->proxy != NULL && conn->proxy_string_after != NULL) {
-		cmd = g_strdup_printf(conn->proxy_string_after, conn->address, conn->port);
-		irc_send_cmd_now(server, cmd);
-		g_free(cmd);
+	if (!conn->use_tls && (conn->starttls || !conn->no_starttls)) {
+		irc_cap_toggle(server, CAP_STARTTLS, TRUE);
 	}
 
 	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
@@ -296,6 +260,163 @@ static void server_init(IRC_SERVER_REC *server)
 	/* this will reset to 1 sec after we get the 001 event */
 	server->wait_cmd = g_get_real_time();
 	server->wait_cmd += 120 * G_USEC_PER_SEC;
+
+	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
+	/* to detect non-CAP servers, send this bogus join */
+	irc_send_cmd_now(server, "JOIN ");
+	if (conn->starttls)
+		irc_server_send_starttls(server);
+}
+
+static void init_ssl_loop(IRC_SERVER_REC *server, GIOChannel *handle)
+{
+	int error;
+
+	if (server->starttls_tag) {
+		g_source_remove(server->starttls_tag);
+		server->starttls_tag = 0;
+	}
+
+	error = irssi_ssl_handshake(handle);
+	if (error == -1) {
+		server->connection_lost = TRUE;
+		server_disconnect((SERVER_REC *) server);
+		return;
+	}
+	if (error & 1) { /* wait */
+		server->starttls_tag =
+		    i_input_add(handle, error == 1 ? I_INPUT_READ : I_INPUT_WRITE,
+		                (GInputFunction) init_ssl_loop, server);
+		return;
+	}
+	/* continue */
+	rawlog_redirect(server->rawlog, "Now talking encrypted");
+	signal_emit("server connection switched", 1, server);
+	if (!server->cap_supported) {
+		server_init_2(server);
+	} else {
+		signal_emit("server cap continue", 1, server);
+	}
+
+	server->connrec->starttls = 1;
+	if (settings_get_bool("starttls_sts")) {
+		IRC_SERVER_SETUP_REC *ssetup = IRC_SERVER_SETUP(server_setup_find(
+		    server->connrec->address, server->connrec->port, server->connrec->chatnet));
+		if (ssetup != NULL) {
+			ssetup->starttls = 1;
+			server_setup_add((SERVER_SETUP_REC *) ssetup);
+		}
+	}
+}
+
+#include <irssi/src/core/line-split.h>
+void irc_server_send_starttls(IRC_SERVER_REC *server)
+{
+	g_return_if_fail(server != NULL);
+
+	g_warning("Now attempting STARTTLS");
+	irc_send_cmd_now(server, "STARTTLS");
+}
+
+static void event_starttls(IRC_SERVER_REC *server, const char *data)
+{
+	GIOChannel *ssl_handle;
+
+	g_return_if_fail(server != NULL);
+
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	if (server->handle->readbuffer != NULL &&
+	    !line_split_is_empty(server->handle->readbuffer)) {
+		char *str;
+		line_split("", -1, &str, &server->handle->readbuffer);
+	}
+	ssl_handle = net_start_ssl((SERVER_REC *) server);
+	if (ssl_handle != NULL) {
+		g_source_remove(server->readtag);
+		server->readtag = -1;
+		server->handle->handle = ssl_handle;
+		init_ssl_loop(server, server->handle->handle);
+	} else {
+		g_warning("net_start_ssl failed");
+	}
+}
+
+static void event_registerfirst(IRC_SERVER_REC *server, const char *data)
+{
+	g_return_if_fail(server != NULL);
+
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	if (server->connected)
+		return;
+
+	if (!server->cap_supported && !server->connrec->starttls)
+		server_init_2(server);
+}
+
+static void event_capend(IRC_SERVER_REC *server)
+{
+	g_return_if_fail(server != NULL);
+
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	if (server->connected)
+		return;
+
+	server_init_2(server);
+}
+
+static void server_init_2(IRC_SERVER_REC *server)
+{
+	IRC_SERVER_CONNECT_REC *conn;
+	char *address, *ptr, *username, *cmd;
+
+	g_return_if_fail(server != NULL);
+
+	conn = server->connrec;
+
+	if (conn->password != NULL && *conn->password != '\0') {
+		/* send password */
+		cmd = g_strdup_printf("PASS %s", conn->password);
+		irc_send_cmd_now(server, cmd);
+		g_free(cmd);
+	}
+
+	/* send nick */
+	cmd = g_strdup_printf("NICK %s", conn->nick);
+	irc_send_cmd_now(server, cmd);
+	g_free(cmd);
+
+	/* send user/realname */
+	address = server->connrec->address;
+	ptr = strrchr(address, ':');
+	if (ptr != NULL) {
+		/* IPv6 address .. doesn't work here, use the string after
+		   the last : char */
+		address = ptr + 1;
+		if (*address == '\0')
+			address = "x";
+	}
+
+	username = g_strdup(conn->username);
+	ptr = strchr(username, ' ');
+	if (ptr != NULL)
+		*ptr = '\0';
+
+	cmd = g_strdup_printf("USER %s %s %s :%s", username, username, address, conn->realname);
+	irc_send_cmd_now(server, cmd);
+	g_free(cmd);
+	g_free(username);
+
+	if (conn->proxy != NULL && conn->proxy_string_after != NULL) {
+		cmd = g_strdup_printf(conn->proxy_string_after, conn->address, conn->port);
+		irc_send_cmd_now(server, cmd);
+		g_free(cmd);
+	}
 }
 
 SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
@@ -420,7 +541,7 @@ static void sig_connected(IRC_SERVER_REC *server)
 	server->splits = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 	if (!server->session_reconnect)
-		server_init(server);
+		server_init_1(server);
 }
 
 static void isupport_destroy_hash(void *key, void *value)
@@ -429,6 +550,17 @@ static void isupport_destroy_hash(void *key, void *value)
 	g_free(value);
 }
 
+static void sig_disconnected(IRC_SERVER_REC *server)
+{
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	if (server->starttls_tag) {
+		g_source_remove(server->starttls_tag);
+		server->starttls_tag = 0;
+	}
+}
+
 static void sig_destroyed(IRC_SERVER_REC *server)
 {
 	GSList *tmp;
@@ -1048,6 +1180,7 @@ void irc_server_init_isupport(IRC_SERVER_REC *server)
 
 void irc_servers_init(void)
 {
+	settings_add_bool("servers", "starttls_sts", TRUE);
 	settings_add_choice("servers", "rejoin_channels_on_reconnect", 1, "off;on;auto");
 	settings_add_str("misc", "usermode", DEFAULT_USER_MODE);
 	settings_add_str("misc", "split_line_start", "");
@@ -1059,9 +1192,13 @@ void irc_servers_init(void)
 	cmd_tag = -1;
 
 	signal_add_first("server connected", (SIGNAL_FUNC) sig_connected);
+	signal_add_first("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
 	signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit);
 	signal_add("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
+	signal_add("event 670", (SIGNAL_FUNC) event_starttls);
+	signal_add("event 451", (SIGNAL_FUNC) event_registerfirst);
+	signal_add("server cap end", (SIGNAL_FUNC) event_capend);
 	signal_add("event 001", (SIGNAL_FUNC) event_connected);
 	signal_add("event 004", (SIGNAL_FUNC) event_server_info);
 	signal_add("event 005", (SIGNAL_FUNC) event_isupport);
@@ -1087,9 +1224,13 @@ void irc_servers_deinit(void)
 		g_source_remove(cmd_tag);
 
 	signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
+	signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
 	signal_remove("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
+	signal_remove("event 670", (SIGNAL_FUNC) event_starttls);
+	signal_remove("event 451", (SIGNAL_FUNC) event_registerfirst);
+	signal_remove("server cap end", (SIGNAL_FUNC) event_capend);
 	signal_remove("event 001", (SIGNAL_FUNC) event_connected);
 	signal_remove("event 004", (SIGNAL_FUNC) event_server_info);
 	signal_remove("event 005", (SIGNAL_FUNC) event_isupport);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 14560611..753666ff 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -27,6 +27,7 @@
 #define CAP_ACCOUNT_NOTIFY "account-notify"
 #define CAP_SELF_MESSAGE "znc.in/self-message"
 #define CAP_SERVER_TIME "server-time"
+#define CAP_STARTTLS "tls"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
 #define IRC_SERVER(server) \
@@ -42,6 +43,7 @@
 #define IS_IRC_SERVER_CONNECT(conn) \
 	(IRC_SERVER_CONNECT(conn) ? TRUE : FALSE)
 
+/* clang-format off */
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _IRC_SERVER_CONNECT_REC {
@@ -59,7 +61,10 @@ struct _IRC_SERVER_CONNECT_REC {
 	int max_query_chans;
 
 	int max_kicks, max_msgs, max_modes, max_whois;
+	int no_starttls:1;
+	int starttls:1;
 };
+/* clang-format on */
 
 #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC
 struct _IRC_SERVER_REC {
@@ -136,6 +141,7 @@ struct _IRC_SERVER_REC {
 	GSList *rejoin_channels; /* try to join to these channels after a while -
 	                            channels go here if they're "temporarily unavailable"
 				    because of netsplits */
+	guint starttls_tag;      /* Holds the source id of the running timeout */
 	struct _SERVER_QUERY_REC *chanqueries;
 
 	GHashTable *isupport;
@@ -155,6 +161,7 @@ void irc_server_purge_output(IRC_SERVER_REC *server, const char *target);
    like "#a,#b,#c,#d x,b_chan_key,x,x" or just "#e,#f,#g" */
 char *irc_server_get_channels(IRC_SERVER_REC *server);
 
+void irc_server_send_starttls(IRC_SERVER_REC *server);
 /* INTERNAL: */
 void irc_server_send_action(IRC_SERVER_REC *server, const char *target,
 			    const char *data);
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 8ecda85b..628d7130 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -579,6 +579,7 @@ void irc_irc_init(void)
 	signal_add("server event", (SIGNAL_FUNC) irc_server_event);
 	signal_add("server event tags", (SIGNAL_FUNC) irc_server_event_tags);
 	signal_add("server connected", (SIGNAL_FUNC) irc_init_server);
+	signal_add("server connection switched", (SIGNAL_FUNC) irc_init_server);
 	signal_add("server incoming", (SIGNAL_FUNC) irc_parse_incoming_line);
 
 	current_server_event = NULL;
@@ -593,5 +594,6 @@ void irc_irc_deinit(void)
 	signal_remove("server event", (SIGNAL_FUNC) irc_server_event);
 	signal_remove("server event tags", (SIGNAL_FUNC) irc_server_event_tags);
 	signal_remove("server connected", (SIGNAL_FUNC) irc_init_server);
+	signal_remove("server connection switched", (SIGNAL_FUNC) irc_init_server);
 	signal_remove("server incoming", (SIGNAL_FUNC) irc_parse_incoming_line);
 }

From 9668217509f81f1b7887f14b8d0885622cf20ad5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 6 Apr 2021 17:40:37 +0200
Subject: [PATCH 1236/1650] changes suggested by ahf

---
 src/core/chat-commands.c             | 22 +++++++++++++---------
 src/fe-common/irc/fe-irc-server.c    | 27 +++++++++++++++------------
 src/irc/core/irc-commands.c          |  2 +-
 src/irc/core/irc-servers-reconnect.c |  2 +-
 src/irc/core/irc-servers-setup.c     |  6 +++---
 src/irc/core/irc-servers.c           |  4 ++--
 src/irc/core/irc-servers.h           |  2 +-
 7 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 8c70bfc6..92bb9db8 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -99,6 +99,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 	else if (g_hash_table_lookup(optlist, "4") != NULL)
 		conn->family = AF_INET;
 
+	if (g_hash_table_lookup(optlist, "notls") != NULL)
+		conn->use_tls = FALSE;
 	if (g_hash_table_lookup(optlist, "tls") != NULL || g_hash_table_lookup(optlist, "ssl") != NULL)
 		conn->use_tls = TRUE;
 	if ((tmp = g_hash_table_lookup(optlist, "tls_cert")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL)
@@ -107,6 +109,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 		conn->tls_pkey = g_strdup(tmp);
 	if ((tmp = g_hash_table_lookup(optlist, "tls_pass")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pass")) != NULL)
 		conn->tls_pass = g_strdup(tmp);
+	if (g_hash_table_lookup(optlist, "notls_verify") != NULL)
+		conn->tls_verify = FALSE;
 	if (g_hash_table_lookup(optlist, "tls_verify") != NULL || g_hash_table_lookup(optlist, "ssl_verify") != NULL)
 		conn->tls_verify = TRUE;
 	if ((tmp = g_hash_table_lookup(optlist, "tls_cafile")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_cafile")) != NULL)
@@ -149,13 +153,13 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
         return conn;
 }
 
-/* SYNTAX: CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>]
+/* SYNTAX: CONNECT [-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>] [-tls_pass <password>]
                    [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>]
-                   [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
-                   [-!] [-noautosendcmd]
-		   [-noproxy] [-network <network>] [-host <hostname>]
-		   [-rawlog <file>]
-		   <address>|<chatnet> [<port> [<password> [<nick>]]] */
+                   [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>]
+                   [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-tls | -notls]
+                   [-starttls | -disallow_starttls] [-noproxy] [-network <network>]
+                   [-host <hostname>] [-rawlog <file>]
+                   <address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_connect(const char *data)
 {
@@ -520,9 +524,9 @@ void chat_commands_init(void)
 	command_set_options(
 	    "connect",
 	    "4 6 !! -network ~ssl ~+ssl_cert ~+ssl_pkey ~+ssl_pass ~ssl_verify ~+ssl_cafile "
-	    "~+ssl_capath ~+ssl_ciphers ~+ssl_pinned_cert ~+ssl_pinned_pubkey tls +tls_cert "
-	    "+tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert "
-	    "+tls_pinned_pubkey +host noproxy -rawlog noautosendcmd");
+	    "~+ssl_capath ~+ssl_ciphers ~+ssl_pinned_cert ~+ssl_pinned_pubkey tls notls +tls_cert "
+	    "+tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers "
+	    "+tls_pinned_cert +tls_pinned_pubkey +host noproxy -rawlog noautosendcmd");
 	command_set_options("msg", "channel nick");
 }
 
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index b5697c96..d30aa45d 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -51,9 +51,10 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 	return target;
 }
 
-/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>]
                              [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
-                             [-tls_capath <capath>] [-tls_ciphers <list>] [-starttls | -nostarttls]
+                             [-tls_capath <capath>] [-tls_ciphers <list>] [-tls | -notls]
+                             [-starttls | -nostarttls | -disallow_starttls | -nodisallow_starttls]
                              [-auto | -noauto] [-network <network>] [-host <hostname>]
                              [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>] <address> [<port>
                              [<password>]] */
@@ -85,9 +86,10 @@ static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 	if (value != NULL && *value != '\0') rec->max_cmds_at_once = atoi(value);
 	value = g_hash_table_lookup(optlist, "querychans");
 	if (value != NULL && *value != '\0') rec->max_query_chans = atoi(value);
-	if (g_hash_table_lookup(optlist, "nonostarttls"))
+	if (g_hash_table_lookup(optlist, "nodisallow_starttls") ||
+	    g_hash_table_lookup(optlist, "nostarttls"))
 		rec->starttls = -1;
-	if (g_hash_table_lookup(optlist, "nostarttls"))
+	if (g_hash_table_lookup(optlist, "disallow_starttls"))
 		rec->starttls = 0;
 	if (g_hash_table_lookup(optlist, "starttls"))
 		rec->starttls = 1;
@@ -114,8 +116,10 @@ static void cmd_server_list(const char *data)
 			g_string_append(str, "autoconnect, ");
 		if (rec->no_proxy)
 			g_string_append(str, "noproxy, ");
-		if (rec->starttls >= 0)
-			g_string_append_printf(str, "%sstarttls, ", rec->starttls ? "" : "no");
+		if (rec->starttls == 0)
+			g_string_append(str, "disallow_starttls, ");
+		if (rec->starttls == 1)
+			g_string_append(str, "starttls, ");
 		if (rec->use_tls)
 			g_string_append(str, "tls, ");
 		if (rec->tls_cert) {
@@ -163,12 +167,11 @@ void fe_irc_server_init(void)
 	signal_add("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
 	command_bind("server list", NULL, (SIGNAL_FUNC) cmd_server_list);
 
-	command_set_options(
-	    "server add",
-	    "-ircnet -network -cmdspeed -cmdmax -querychans starttls nostarttls nonostarttls");
-	command_set_options(
-	    "server modify",
-	    "-ircnet -network -cmdspeed -cmdmax -querychans starttls nostarttls nonostarttls");
+	command_set_options("server add", "-ircnet -network -cmdspeed -cmdmax -querychans starttls "
+	                                  "nostarttls disallow_starttls nodisallow_starttls");
+	command_set_options("server modify",
+	                    "-ircnet -network -cmdspeed -cmdmax -querychans starttls nostarttls "
+	                    "disallow_starttls nodisallow_starttls");
 }
 
 void fe_irc_server_deinit(void)
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 8c8179e0..9cc8afe8 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -1053,7 +1053,7 @@ void irc_commands_init(void)
 	signal_add("whois end", (SIGNAL_FUNC) event_end_of_whois);
 	signal_add("whowas event", (SIGNAL_FUNC) event_whowas);
 
-	command_set_options("connect", "+ircnet starttls nostarttls");
+	command_set_options("connect", "+ircnet starttls disallow_starttls");
 	command_set_options("topic", "delete");
 	command_set_options("list", "yes");
 	command_set_options("away", "one all");
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index 4a8d2908..f0e6f345 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -51,7 +51,7 @@ static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 	rec->sasl_mechanism = src->sasl_mechanism;
 	rec->sasl_username = g_strdup(src->sasl_username);
 	rec->sasl_password = g_strdup(src->sasl_password);
-	rec->no_starttls = src->no_starttls;
+	rec->disallow_starttls = src->disallow_starttls;
 	rec->starttls = src->starttls;
 	*dest = (SERVER_CONNECT_REC *) rec;
 }
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 74edb47b..6ba22862 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -45,7 +45,7 @@ static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
 	if (sserver->max_query_chans > 0)
 		conn->max_query_chans = sserver->max_query_chans;
 	if (sserver->starttls == 0)
-		conn->no_starttls = 1;
+		conn->disallow_starttls = 1;
 	else if (sserver->starttls == 1)
 		conn->starttls = 1;
 }
@@ -67,8 +67,8 @@ static void sig_server_setup_fill_connect(IRC_SERVER_CONNECT_REC *conn, GHashTab
 
 	if (g_hash_table_lookup(optlist, "starttls") != NULL)
 		conn->starttls = 1;
-	else if (g_hash_table_lookup(optlist, "nostarttls") != NULL)
-		conn->no_starttls = 1;
+	else if (g_hash_table_lookup(optlist, "disallow_starttls") != NULL)
+		conn->disallow_starttls = 1;
 }
 
 static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 29b389f4..bcad3f9e 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -244,7 +244,7 @@ static void server_init_1(IRC_SERVER_REC *server)
 	irc_cap_toggle(server, CAP_ACCOUNT_NOTIFY, TRUE);
 	irc_cap_toggle(server, CAP_SELF_MESSAGE, TRUE);
 	irc_cap_toggle(server, CAP_SERVER_TIME, TRUE);
-	if (!conn->use_tls && (conn->starttls || !conn->no_starttls)) {
+	if (!conn->use_tls && (conn->starttls || !conn->disallow_starttls)) {
 		irc_cap_toggle(server, CAP_STARTTLS, TRUE);
 	}
 
@@ -314,7 +314,7 @@ void irc_server_send_starttls(IRC_SERVER_REC *server)
 {
 	g_return_if_fail(server != NULL);
 
-	g_warning("Now attempting STARTTLS");
+	g_warning("[%s] Now attempting STARTTLS", server->tag);
 	irc_send_cmd_now(server, "STARTTLS");
 }
 
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 753666ff..16e2061e 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -61,7 +61,7 @@ struct _IRC_SERVER_CONNECT_REC {
 	int max_query_chans;
 
 	int max_kicks, max_msgs, max_modes, max_whois;
-	int no_starttls:1;
+	int disallow_starttls:1;
 	int starttls:1;
 };
 /* clang-format on */

From db2fed0d38f1da819e041ca5668368415b5fa590 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 6 Apr 2021 20:29:13 +0200
Subject: [PATCH 1237/1650] fix reconnect to use tls settings

---
 src/core/servers-reconnect.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 0cfac2ec..a9d9422b 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -239,8 +239,11 @@ static void sig_reconnect(SERVER_REC *server)
 	if (reconnect_time == -1 || !server_should_reconnect(server))
 		return;
 
-	conn = server_connect_copy_skeleton(server->connrec, FALSE);
-        g_return_if_fail(conn != NULL);
+	sserver = server_setup_find(server->connrec->address, server->connrec->port,
+	                            server->connrec->chatnet);
+
+	conn = server_connect_copy_skeleton(server->connrec, sserver == NULL);
+	g_return_if_fail(conn != NULL);
 
 	/* save the server status */
 	if (server->connected) {
@@ -249,10 +252,6 @@ static void sig_reconnect(SERVER_REC *server)
                 reconnect_save_status(conn, server);
 	}
 
-	sserver = server_setup_find(server->connrec->address,
-				    server->connrec->port,
-				    server->connrec->chatnet);
-
 	if (sserver != NULL) {
 		/* save the last connection time/status */
 		sserver->last_connect = server->connect_time == 0 ?

From f2795abcc59f4c2a7f509071ec4398759b47e964 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 6 Apr 2021 19:31:10 +0200
Subject: [PATCH 1238/1650] actually use the tls settings on upgrade, and
 disconnect gracefully

---
 src/core/servers-setup.c             |  9 ++++++-
 src/core/session.c                   | 32 +++++++++++++++++--------
 src/fe-common/core/fe-server.c       |  8 ++-----
 src/irc/core/channels-query.c        |  2 ++
 src/irc/core/irc-servers-reconnect.c |  3 ++-
 src/irc/core/irc-servers.c           | 35 ++++++++++++++++++++++------
 src/irc/core/irc-servers.h           |  8 ++++++-
 src/irc/core/irc-session.c           | 29 ++++++++++++++++++++++-
 src/irc/core/netsplit.c              |  3 +++
 src/irc/notifylist/notifylist.c      |  3 +++
 src/perl/irc/Server.xs               | 13 +++++++++--
 11 files changed, 116 insertions(+), 29 deletions(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index ea15e2a8..c6612e84 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -338,7 +338,14 @@ SERVER_CONNECT_REC *server_create_conn_opt(int chat_type, const char *dest, int
 SERVER_CONNECT_REC *server_create_conn(int chat_type, const char *dest, int port,
                                        const char *chatnet, const char *password, const char *nick)
 {
-	return server_create_conn_opt(chat_type, dest, port, chatnet, password, nick, NULL);
+	SERVER_CONNECT_REC *ret;
+	GHashTable *opt;
+
+	opt = g_hash_table_new(NULL, NULL);
+	ret = server_create_conn_opt(chat_type, dest, port, chatnet, password, nick, opt);
+	g_hash_table_destroy(opt);
+
+	return ret;
 }
 
 /* Find matching server from setup. Try to find record with a same port,
diff --git a/src/core/session.c b/src/core/session.c
index 6f3908e5..5fe481fb 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -254,23 +254,35 @@ static void session_restore_server(CONFIG_NODE *node)
 
 	proto = chat_protocol_find(chat_type);
 	if (proto == NULL || proto->not_initialized) {
-		if (handle < 0) close(handle);
+		if (handle >= 0)
+			close(handle);
 		return;
 	}
 
 	conn = server_create_conn(proto->id, address, port,
 				  chatnet, password, nick);
-	if (conn != NULL) {
-		conn->reconnection = TRUE;
-		conn->connect_handle = i_io_channel_new(handle);
+	if (conn == NULL)
+		return;
 
-		server = proto->server_init_connect(conn);
-		server->version = g_strdup(config_node_get_str(node, "version", NULL));
-		server->session_reconnect = TRUE;
-		signal_emit("session restore server", 2, server, node);
+	conn->use_tls = config_node_get_bool(node, "use_tls", FALSE);
+	conn->tls_cert = g_strdup(config_node_get_str(node, "tls_cert", NULL));
+	conn->tls_pkey = g_strdup(config_node_get_str(node, "tls_pkey", NULL));
+	conn->tls_verify = config_node_get_bool(node, "tls_verify", TRUE);
+	conn->tls_cafile = g_strdup(config_node_get_str(node, "tls_cafile", NULL));
+	conn->tls_capath = g_strdup(config_node_get_str(node, "tls_capath", NULL));
+	conn->tls_ciphers = g_strdup(config_node_get_str(node, "tls_ciphers", NULL));
+	conn->tls_pinned_cert = g_strdup(config_node_get_str(node, "tls_pinned_cert", NULL));
+	conn->tls_pinned_pubkey = g_strdup(config_node_get_str(node, "tls_pinned_pubkey", NULL));
 
-		proto->server_connect(server);
-	}
+	conn->reconnection = TRUE;
+	conn->connect_handle = i_io_channel_new(handle);
+
+	server = proto->server_init_connect(conn);
+	server->version = g_strdup(config_node_get_str(node, "version", NULL));
+	server->session_reconnect = TRUE;
+	signal_emit("session restore server", 2, server, node);
+
+	proto->server_connect(server);
 }
 
 static void sig_session_save(CONFIG_REC *config)
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 0bf9a104..5e51e511 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -165,14 +165,10 @@ static void cmd_server_add_modify(const char *data, gboolean add)
         else if (g_hash_table_lookup(optlist, "4"))
 		rec->family = AF_INET;
 
-	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl")) {
+	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl"))
 		rec->use_tls = TRUE;
-	}
-	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl")) {
+	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl"))
 		rec->use_tls = FALSE;
-		/* tls_verify implies use_tls, disable it explicitly */
-		rec->tls_verify = FALSE;
-	}
 
 	value = g_hash_table_lookup(optlist, "tls_cert");
 	if (value == NULL)
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 97e982b7..6cf3dd2b 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -90,6 +90,8 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 		return;
 
 	rec = server->chanqueries;
+	if (rec == NULL)
+		return;
 	g_return_if_fail(rec != NULL);
 
 	g_hash_table_destroy(rec->accountqueries);
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index f0e6f345..cc34c6d3 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -64,7 +64,8 @@ static void sig_server_reconnect_save_status(IRC_SERVER_CONNECT_REC *conn,
 		return;
 
 	g_free_not_null(conn->channels);
-	conn->channels = irc_server_get_channels(server);
+	conn->channels =
+	    irc_server_get_channels(server, settings_get_choice("rejoin_channels_on_reconnect"));
 
 	g_free_not_null(conn->usermode);
 	conn->usermode = g_strdup(server->wanted_usermode);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index bcad3f9e..00a6458b 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -469,6 +469,26 @@ void irc_server_connect(SERVER_REC *server)
 {
 	g_return_if_fail(server != NULL);
 
+	if (server->connrec->connect_handle != NULL) {
+		IRC_SERVER_CONNECT_REC *conn;
+		int tls_disconnect;
+
+		conn = ((IRC_SERVER_REC *) server)->connrec;
+		tls_disconnect = conn->use_tls || conn->starttls;
+
+		if (tls_disconnect) {
+			/* we cannot use it, it is encrypted. force a reconnect */
+			g_io_channel_unref(conn->connect_handle);
+			conn->connect_handle = NULL;
+			server->session_reconnect = FALSE;
+			server_connect_ref((SERVER_CONNECT_REC *) conn);
+			server_disconnect(server);
+			server_connect((SERVER_CONNECT_REC *) conn);
+			server_connect_unref((SERVER_CONNECT_REC *) conn);
+			return;
+		}
+	}
+
 	if (!server_start_connect(server)) {
                 server_connect_unref(server->connrec);
 		g_free(server);
@@ -782,20 +802,17 @@ void irc_servers_start_cmd_timeout(void)
 
 /* Return a string of all channels (and keys, if any have them) in server,
    like "#a,#b,#c,#d x,b_chan_key,x,x" or just "#e,#f,#g" */
-char *irc_server_get_channels(IRC_SERVER_REC *server)
+char *irc_server_get_channels(IRC_SERVER_REC *server, int rejoin_channels_mode)
 {
 	GSList *tmp;
 	GString *chans, *keys;
 	char *ret;
 	int use_keys;
-	int rejoin_channels_mode;
 
 	g_return_val_if_fail(server != NULL, FALSE);
 
-	rejoin_channels_mode = settings_get_choice("rejoin_channels_on_reconnect");
-
 	/* do we want to rejoin channels in the first place? */
-	if(rejoin_channels_mode == 0)
+	if (rejoin_channels_mode == REJOIN_CHANNELS_MODE_OFF)
 		return g_strdup("");
 
 	chans = g_string_new(NULL);
@@ -806,7 +823,9 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *channel = tmp->data;
 		CHANNEL_SETUP_REC *setup = channel_setup_find(channel->name, channel->server->connrec->chatnet);
-		if ((setup != NULL && setup->autojoin && rejoin_channels_mode == 2) || rejoin_channels_mode == 1) {
+		if ((setup != NULL && setup->autojoin &&
+		     rejoin_channels_mode == REJOIN_CHANNELS_MODE_AUTO) ||
+		    rejoin_channels_mode == REJOIN_CHANNELS_MODE_ON) {
 			g_string_append_printf(chans, "%s,", channel->name);
 			g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" : channel->key);
 			if (channel->key != NULL)
@@ -819,7 +838,9 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
 		REJOIN_REC *rec = tmp->data;
 		CHANNEL_SETUP_REC *setup = channel_setup_find(rec->channel, server->tag);
 
-		if ((setup != NULL && setup->autojoin && rejoin_channels_mode == 2) || rejoin_channels_mode == 1) {
+		if ((setup != NULL && setup->autojoin &&
+		     rejoin_channels_mode == REJOIN_CHANNELS_MODE_AUTO) ||
+		    rejoin_channels_mode == REJOIN_CHANNELS_MODE_ON) {
 			g_string_append_printf(chans, "%s,", rec->channel);
 			g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" :
 									rec->key);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 16e2061e..04d1f693 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -157,9 +157,15 @@ void irc_server_connect(SERVER_REC *server);
 /* Purge server output, either all or for specified target */
 void irc_server_purge_output(IRC_SERVER_REC *server, const char *target);
 
+enum {
+	REJOIN_CHANNELS_MODE_OFF = 0, /* */
+	REJOIN_CHANNELS_MODE_ON,
+	REJOIN_CHANNELS_MODE_AUTO
+};
+
 /* Return a string of all channels (and keys, if any have them) in server,
    like "#a,#b,#c,#d x,b_chan_key,x,x" or just "#e,#f,#g" */
-char *irc_server_get_channels(IRC_SERVER_REC *server);
+char *irc_server_get_channels(IRC_SERVER_REC *server, int rejoin_channels_mode);
 
 void irc_server_send_starttls(IRC_SERVER_REC *server);
 /* INTERNAL: */
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index 6b817099..70683c4f 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -23,6 +23,7 @@
 #include <irssi/src/core/net-sendbuffer.h>
 #include <irssi/src/lib-config/iconfig.h>
 #include <irssi/src/core/misc.h>
+#include <irssi/src/core/network.h>
 
 #include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/irc-channels.h>
@@ -43,6 +44,7 @@ static void sig_session_save_server(IRC_SERVER_REC *server, CONFIG_REC *config,
         GSList *tmp;
 	CONFIG_NODE *isupport;
 	struct _isupport_data isupport_data;
+	int tls_disconnect;
 
 	if (!IS_IRC_SERVER(server))
 		return;
@@ -58,7 +60,15 @@ static void sig_session_save_server(IRC_SERVER_REC *server, CONFIG_REC *config,
 				break;
 		}
 	}
-        net_sendbuffer_flush(server->handle);
+	/* we cannot upgrade TLS (yet?) */
+	tls_disconnect = server->connrec->use_tls || server->connrec->starttls;
+	if (tls_disconnect) {
+		config_node_set_str(config, node, "rejoin_channels",
+		                    irc_server_get_channels(server, REJOIN_CHANNELS_MODE_ON));
+		irc_send_cmd_now(server, "QUIT :[TLS] Client upgrade");
+	}
+
+	net_sendbuffer_flush(server->handle);
 
 	config_node_set_str(config, node, "real_address", server->real_address);
 	config_node_set_str(config, node, "userhost", server->userhost);
@@ -71,18 +81,26 @@ static void sig_session_save_server(IRC_SERVER_REC *server, CONFIG_REC *config,
 	config_node_set_str(config, node, "sasl_username", server->connrec->sasl_username);
 	config_node_set_str(config, node, "sasl_password", server->connrec->sasl_password);
 
+	config_node_set_int(config, node, "starttls",
+	                    server->connrec->disallow_starttls ? 0 :
+	                    server->connrec->starttls          ? 1 :
+                                                                 -1);
+
 	config_node_set_bool(config, node, "isupport_sent", server->isupport_sent);
 	isupport = config_node_section(config, node, "isupport", NODE_TYPE_BLOCK);
         isupport_data.config = config;
         isupport_data.node = isupport;
 
         g_hash_table_foreach(server->isupport, (GHFunc) session_isupport_foreach, &isupport_data);
+
+	/* we have to defer the disconnect to irc_server_connect */
 }
 
 static void sig_session_restore_server(IRC_SERVER_REC *server,
 				       CONFIG_NODE *node)
 {
 	GSList *tmp;
+	int starttls_mode;
 
 	if (!IS_IRC_SERVER(server))
 		return;
@@ -105,6 +123,14 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 	g_free(server->connrec->sasl_password);
 	server->connrec->sasl_password = g_strdup(config_node_get_str(node, "sasl_password", NULL));
 
+	server->connrec->channels = g_strdup(config_node_get_str(node, "rejoin_channels", NULL));
+
+	starttls_mode = config_node_get_int(node, "starttls", -1);
+	if (starttls_mode == 0)
+		server->connrec->disallow_starttls = 1;
+	if (starttls_mode == 1)
+		server->connrec->starttls = 1;
+
 	if (server->isupport == NULL) {
 		server->isupport =
 		    g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
@@ -123,6 +149,7 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 	}
 	irc_server_init_isupport(server);
 
+	/* we will reconnect in irc_server_connect if the connection was TLS */
 }
 
 static void sig_session_restore_nick(IRC_CHANNEL_REC *channel,
diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 1463f962..38b63fe5 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -381,6 +381,9 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
+	if (server->splits == NULL)
+		return;
+
 	g_hash_table_foreach(server->splits,
 			     (GHFunc) netsplit_destroy_hash, server);
 	g_hash_table_destroy(server->splits);
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index 158b4dea..73737b37 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -209,6 +209,9 @@ static void notifylist_deinit_server(IRC_SERVER_REC *server)
 		return;
 
 	mserver = MODULE_DATA(server);
+	if (!mserver)
+		return;
+
 	while (mserver->notify_users != NULL) {
 		rec = mserver->notify_users->data;
 
diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs
index 54361ec9..fef3698f 100644
--- a/src/perl/irc/Server.xs
+++ b/src/perl/irc/Server.xs
@@ -1,5 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
+#include <irssi/src/core/misc.h>
 
 static GSList *register_hash2list(HV *hv)
 {
@@ -47,12 +48,20 @@ MODULE = Irssi::Irc::Server	PACKAGE = Irssi::Irc::Server  PREFIX = irc_server_
 PROTOTYPES: ENABLE
 
 void
-irc_server_get_channels(server)
+irc_server_get_channels(server, rejoin_channels_mode = "")
 	Irssi::Irc::Server server
+	char *rejoin_channels_mode
 PREINIT:
 	char *ret;
+	int mode;
+	SETTINGS_REC *setting;
 PPCODE:
-	ret = irc_server_get_channels(server);
+	setting = settings_get_record("rejoin_channels_on_reconnect");
+	mode = strarray_find(setting->choices, rejoin_channels_mode);
+	if (mode < 0)
+		mode = setting->default_value.v_int;
+
+	ret = irc_server_get_channels(server, mode);
 	XPUSHs(sv_2mortal(new_pv(ret)));
 	g_free(ret);
 

From 2a0f1d7636a9fd941fbb04f52fe9c23b3263406a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 7 Apr 2021 11:05:05 +0200
Subject: [PATCH 1239/1650] fix fe-fuzz

---
 src/fe-fuzz/server.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index a444494d..a2ffb9e9 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -177,12 +177,23 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 
 	for (; *lines != NULL; lines++) {
 		gchar *prefixedLine;
+		int disconnected;
 		if (prefixedChoice) {
 			prefixedLine = g_strdup_printf(":user %s\n", *lines);
 		} else {
 			prefixedLine = g_strdup_printf("%s\n", *lines);
 		}
+		server_ref(server);
 		signal_emit("server incoming", 2, server, prefixedLine);
+		disconnected = server->disconnected;
+		if (disconnected) {
+			server_connect_unref(server->connrec);
+		}
+		server_unref(server);
+		if (disconnected) {
+			/* reconnect */
+			test_server();
+		}
 		g_free(prefixedLine);
 	}
 

From 244a8c72b4d1226469f1193b3ca58946c01d9e00 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 7 Apr 2021 22:18:05 +0200
Subject: [PATCH 1240/1650] verify tls connection

---
 irssi.conf                        |  4 +-
 src/core/chat-commands.c          | 47 +-------------------
 src/core/servers-setup.c          | 74 ++++++++++++++++++++++++++++---
 src/fe-common/core/fe-server.c    | 39 +++++++++++-----
 src/fe-common/irc/fe-irc-server.c |  8 ++--
 src/irc/core/irc-servers-setup.c  | 17 ++++++-
 src/irc/core/irc-servers.c        |  1 +
 src/irc/core/irc-session.c        |  4 +-
 8 files changed, 123 insertions(+), 71 deletions(-)

diff --git a/irssi.conf b/irssi.conf
index 174d0552..80c2b9c3 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,10 +1,10 @@
 servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
-  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
   { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
-  { address = "eu.irc6.net";       chatnet = "IRCnet";    port = "6667"; use_tls = "yes"; },
+  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
   { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
   { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 92bb9db8..dd8dbe75 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -40,7 +40,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
         CHAT_PROTOCOL_REC *proto;
 	SERVER_CONNECT_REC *conn;
 	GHashTable *optlist;
-	char *addr, *portstr, *password, *nick, *chatnet, *host, *tmp;
+	char *addr, *portstr, *password, *nick, *chatnet, *host;
 	void *free_arg;
 
 	g_return_val_if_fail(data != NULL, NULL);
@@ -94,50 +94,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 	if (strchr(addr, '/') != NULL)
 		conn->unix_socket = TRUE;
 
-	if (g_hash_table_lookup(optlist, "6") != NULL)
-		conn->family = AF_INET6;
-	else if (g_hash_table_lookup(optlist, "4") != NULL)
-		conn->family = AF_INET;
-
-	if (g_hash_table_lookup(optlist, "notls") != NULL)
-		conn->use_tls = FALSE;
-	if (g_hash_table_lookup(optlist, "tls") != NULL || g_hash_table_lookup(optlist, "ssl") != NULL)
-		conn->use_tls = TRUE;
-	if ((tmp = g_hash_table_lookup(optlist, "tls_cert")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL)
-		conn->tls_cert = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "tls_pkey")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL)
-		conn->tls_pkey = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "tls_pass")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pass")) != NULL)
-		conn->tls_pass = g_strdup(tmp);
-	if (g_hash_table_lookup(optlist, "notls_verify") != NULL)
-		conn->tls_verify = FALSE;
-	if (g_hash_table_lookup(optlist, "tls_verify") != NULL || g_hash_table_lookup(optlist, "ssl_verify") != NULL)
-		conn->tls_verify = TRUE;
-	if ((tmp = g_hash_table_lookup(optlist, "tls_cafile")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_cafile")) != NULL)
-		conn->tls_cafile = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "tls_capath")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_capath")) != NULL)
-		conn->tls_capath = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "tls_ciphers")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_ciphers")) != NULL)
-		conn->tls_ciphers = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "tls_pinned_cert")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pinned_cert")) != NULL)
-		conn->tls_pinned_cert = g_strdup(tmp);
-	if ((tmp = g_hash_table_lookup(optlist, "tls_pinned_pubkey")) != NULL || (tmp = g_hash_table_lookup(optlist, "ssl_pinned_pubkey")) != NULL)
-		conn->tls_pinned_pubkey = g_strdup(tmp);
-	if ((conn->tls_capath != NULL && conn->tls_capath[0] != '\0')
-	||  (conn->tls_cafile != NULL && conn->tls_cafile[0] != '\0'))
-		conn->tls_verify = TRUE;
-	if ((conn->tls_cert != NULL && conn->tls_cert[0] != '\0') || conn->tls_verify)
-		conn->use_tls = TRUE;
-
-	if (g_hash_table_lookup(optlist, "!") != NULL)
-		conn->no_autojoin_channels = TRUE;
-
-	if (g_hash_table_lookup(optlist, "noautosendcmd") != NULL)
-		conn->no_autosendcmd = TRUE;
-
-	if (g_hash_table_lookup(optlist, "noproxy") != NULL)
-                g_free_and_null(conn->proxy);
-
+	/* TLS options are handled in server_create_conn_opt ... -> server_setup_fill_optlist */
 
 	*rawlog_file = g_strdup(g_hash_table_lookup(optlist, "rawlog"));
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index c6612e84..357e8ebe 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -180,6 +180,68 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn, const char *address, int
 	signal_emit("server setup fill connect", 2, conn, optlist);
 }
 
+static void server_setup_fill_optlist(SERVER_CONNECT_REC *conn, GHashTable *optlist)
+{
+	char *tmp;
+
+	if (g_hash_table_lookup(optlist, "6") != NULL)
+		conn->family = AF_INET6;
+	else if (g_hash_table_lookup(optlist, "4") != NULL)
+		conn->family = AF_INET;
+
+	/* ad-hoc TLS settings from command optlist */
+	if ((tmp = g_hash_table_lookup(optlist, "tls_cert")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL)
+		conn->tls_cert = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pkey")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL)
+		conn->tls_pkey = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pass")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_pass")) != NULL)
+		conn->tls_pass = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_cafile")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_cafile")) != NULL)
+		conn->tls_cafile = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_capath")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_capath")) != NULL)
+		conn->tls_capath = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_ciphers")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_ciphers")) != NULL)
+		conn->tls_ciphers = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pinned_cert")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_pinned_cert")) != NULL)
+		conn->tls_pinned_cert = g_strdup(tmp);
+	if ((tmp = g_hash_table_lookup(optlist, "tls_pinned_pubkey")) != NULL ||
+	    (tmp = g_hash_table_lookup(optlist, "ssl_pinned_pubkey")) != NULL)
+		conn->tls_pinned_pubkey = g_strdup(tmp);
+	if ((conn->tls_capath != NULL && conn->tls_capath[0] != '\0') ||
+	    (conn->tls_cafile != NULL && conn->tls_cafile[0] != '\0'))
+		conn->tls_verify = TRUE;
+	if (g_hash_table_lookup(optlist, "notls_verify") != NULL)
+		conn->tls_verify = FALSE;
+	if (g_hash_table_lookup(optlist, "tls_verify") != NULL ||
+	    g_hash_table_lookup(optlist, "ssl_verify") != NULL)
+		conn->tls_verify = TRUE;
+	if ((conn->tls_cert != NULL && conn->tls_cert[0] != '\0') || conn->tls_verify)
+		conn->use_tls = TRUE;
+	if (g_hash_table_lookup(optlist, "notls") != NULL)
+		conn->use_tls = FALSE;
+	if (g_hash_table_lookup(optlist, "tls") != NULL ||
+	    g_hash_table_lookup(optlist, "ssl") != NULL)
+		conn->use_tls = TRUE;
+
+	if (g_hash_table_lookup(optlist, "!") != NULL)
+		conn->no_autojoin_channels = TRUE;
+
+	if (g_hash_table_lookup(optlist, "noautosendcmd") != NULL)
+		conn->no_autosendcmd = TRUE;
+
+	if (g_hash_table_lookup(optlist, "noproxy") != NULL)
+		g_free_and_null(conn->proxy);
+
+	signal_emit("server setup fill optlist", 2, conn, optlist);
+}
+
 static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
 				     SERVER_SETUP_REC *sserver)
 {
@@ -262,6 +324,10 @@ static SERVER_CONNECT_REC *create_addr_conn(int chat_type, const char *address,
 	if (sserver != NULL)
 		server_setup_fill_server(conn, sserver);
 
+	/* fill the optlist overrides */
+	if (g_hash_table_size(optlist))
+		server_setup_fill_optlist(conn, optlist);
+
 	/* nick / password given in command line overrides all settings */
 	if (password && *password) {
 		g_free_not_null(conn->password);
@@ -418,7 +484,8 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 	rec->password = g_strdup(config_node_get_str(node, "password", NULL));
 
 	rec->use_tls = config_node_get_bool(node, "use_tls", FALSE) || config_node_get_bool(node, "use_ssl", FALSE);
-	rec->tls_verify = config_node_get_bool(node, "tls_verify", FALSE) || config_node_get_bool(node, "ssl_verify", FALSE);
+	rec->tls_verify = config_node_get_bool(node, "tls_verify", TRUE) ||
+	                  config_node_get_bool(node, "ssl_verify", FALSE);
 
 	value = config_node_get_str(node, "tls_cert", NULL);
 	if (value == NULL)
@@ -460,11 +527,6 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 		value = config_node_get_str(node, "ssl_pinned_pubkey", NULL);
 	rec->tls_pinned_pubkey = g_strdup(value);
 
-	if (rec->tls_cafile || rec->tls_capath)
-		rec->tls_verify = TRUE;
-	if (rec->tls_cert != NULL || rec->tls_verify)
-		rec->use_tls = TRUE;
-
 	rec->port = port;
 	rec->autoconnect = config_node_get_bool(node, "autoconnect", FALSE);
 	rec->no_proxy = config_node_get_bool(node, "no_proxy", FALSE);
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 5e51e511..e0100618 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -101,6 +101,7 @@ static SERVER_SETUP_REC *create_server_setup(GHashTable *optlist)
 
         server = rec->create_server_setup();
         server->chat_type = rec->id;
+	server->tls_verify = TRUE;
 	return server;
 }
 
@@ -110,6 +111,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	SERVER_SETUP_REC *rec;
 	char *addr, *portstr, *password, *value, *chatnet;
 	void *free_arg;
+	gboolean newrec;
 	int port;
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_OPTIONS,
@@ -135,6 +137,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	rec = server_setup_find(addr, port, chatnet);
 
 	if (rec == NULL) {
+		newrec = TRUE;
 		if (add == FALSE) {
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				TXT_SETUPSERVER_NOT_FOUND, addr, port);
@@ -150,6 +153,7 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		rec->address = g_strdup(addr);
 		rec->port = port;
 	} else {
+		newrec = FALSE;
 		if (*portstr != '\0' || g_hash_table_lookup(optlist, "port"))
 			rec->port = port;
 
@@ -165,16 +169,17 @@ static void cmd_server_add_modify(const char *data, gboolean add)
         else if (g_hash_table_lookup(optlist, "4"))
 		rec->family = AF_INET;
 
-	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl"))
-		rec->use_tls = TRUE;
-	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl"))
-		rec->use_tls = FALSE;
-
 	value = g_hash_table_lookup(optlist, "tls_cert");
 	if (value == NULL)
 		value = g_hash_table_lookup(optlist, "ssl_cert");
-	if (value != NULL && *value != '\0')
+	if (value != NULL && *value != '\0') {
 		rec->tls_cert = g_strdup(value);
+		if (newrec) {
+			/* convenience and backward compatibility, turn on tls if tls_cert is given
+			 */
+			rec->use_tls = TRUE;
+		}
+	}
 
 	value = g_hash_table_lookup(optlist, "tls_pkey");
 	if (value == NULL)
@@ -188,11 +193,6 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	if (value != NULL && *value != '\0')
 		rec->tls_pass = g_strdup(value);
 
-	if (g_hash_table_lookup(optlist, "tls_verify") || g_hash_table_lookup(optlist, "ssl_verify"))
-		rec->tls_verify = TRUE;
-	else if (g_hash_table_lookup(optlist, "notls_verify") || g_hash_table_lookup(optlist, "nossl_verify"))
-		rec->tls_verify = FALSE;
-
 	value = g_hash_table_lookup(optlist, "tls_cafile");
 	if (value == NULL)
 		value = g_hash_table_lookup(optlist, "ssl_cafile");
@@ -227,8 +227,23 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 	||  (rec->tls_capath != NULL && rec->tls_capath[0] != '\0'))
 		rec->tls_verify = TRUE;
 
-	if ((rec->tls_cert != NULL && rec->tls_cert[0] != '\0') || rec->tls_verify == TRUE)
+	if (g_hash_table_lookup(optlist, "tls_verify") ||
+	    g_hash_table_lookup(optlist, "ssl_verify")) {
+		rec->tls_verify = TRUE;
+		if (newrec) {
+			/* convenience and backward compatibility, turn on tls if tls_verify is
+			 * given */
+			rec->use_tls = TRUE;
+		}
+	} else if (g_hash_table_lookup(optlist, "notls_verify") ||
+	           g_hash_table_lookup(optlist, "nossl_verify")) {
+		rec->tls_verify = FALSE;
+	}
+
+	if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl"))
 		rec->use_tls = TRUE;
+	else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl"))
+		rec->use_tls = FALSE;
 
 	if (g_hash_table_lookup(optlist, "auto")) rec->autoconnect = TRUE;
 	if (g_hash_table_lookup(optlist, "noauto")) rec->autoconnect = FALSE;
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index d30aa45d..66483991 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -91,8 +91,10 @@ static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 		rec->starttls = -1;
 	if (g_hash_table_lookup(optlist, "disallow_starttls"))
 		rec->starttls = 0;
-	if (g_hash_table_lookup(optlist, "starttls"))
+	if (g_hash_table_lookup(optlist, "starttls")) {
 		rec->starttls = 1;
+		rec->use_tls = 0;
+	}
 }
 
 /* SYNTAX: SERVER LIST */
@@ -129,8 +131,8 @@ static void cmd_server_list(const char *data)
 			if (rec->tls_pass)
 				g_string_append_printf(str, "(pass), ");
 		}
-		if (rec->tls_verify)
-			g_string_append(str, "tls_verify, ");
+		if (!rec->tls_verify)
+			g_string_append(str, "notls_verify, ");
 		if (rec->tls_cafile)
 			g_string_append_printf(str, "tls_cafile: %s, ", rec->tls_cafile);
 		if (rec->tls_capath)
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 6ba22862..a48e1e92 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -64,11 +64,19 @@ static void sig_server_setup_fill_connect(IRC_SERVER_CONNECT_REC *conn, GHashTab
 	value = settings_get_str("usermode");
 	conn->usermode = (value != NULL && *value != '\0') ?
 		g_strdup(value) : NULL;
+}
 
-	if (g_hash_table_lookup(optlist, "starttls") != NULL)
+static void sig_server_setup_fill_optlist(IRC_SERVER_CONNECT_REC *conn, GHashTable *optlist)
+{
+	if (!IS_IRC_SERVER_CONNECT(conn))
+		return;
+
+	if (g_hash_table_lookup(optlist, "starttls") != NULL) {
 		conn->starttls = 1;
-	else if (g_hash_table_lookup(optlist, "disallow_starttls") != NULL)
+		conn->use_tls = 0;
+	} else if (g_hash_table_lookup(optlist, "disallow_starttls") != NULL) {
 		conn->disallow_starttls = 1;
+	}
 }
 
 static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
@@ -184,6 +192,9 @@ static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)
 	rec->cmd_queue_speed = config_node_get_int(node, "cmd_queue_speed", 0);
 	rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0);
 	rec->starttls = config_node_get_bool(node, "starttls", -1);
+	if (rec->starttls == 1) {
+		rec->use_tls = 0;
+	}
 }
 
 static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
@@ -213,6 +224,7 @@ void irc_servers_setup_init(void)
 	signal_add("server setup fill reconn", (SIGNAL_FUNC) sig_server_setup_fill_reconn);
 	signal_add("server setup fill connect", (SIGNAL_FUNC) sig_server_setup_fill_connect);
 	signal_add("server setup fill chatnet", (SIGNAL_FUNC) sig_server_setup_fill_chatnet);
+	signal_add("server setup fill optlist", (SIGNAL_FUNC) sig_server_setup_fill_optlist);
 	signal_add("server setup read", (SIGNAL_FUNC) sig_server_setup_read);
 	signal_add("server setup saved", (SIGNAL_FUNC) sig_server_setup_saved);
 }
@@ -222,6 +234,7 @@ void irc_servers_setup_deinit(void)
 	signal_remove("server setup fill reconn", (SIGNAL_FUNC) sig_server_setup_fill_reconn);
 	signal_remove("server setup fill connect", (SIGNAL_FUNC) sig_server_setup_fill_connect);
 	signal_remove("server setup fill chatnet", (SIGNAL_FUNC) sig_server_setup_fill_chatnet);
+	signal_remove("server setup fill optlist", (SIGNAL_FUNC) sig_server_setup_fill_optlist);
 	signal_remove("server setup read", (SIGNAL_FUNC) sig_server_setup_read);
 	signal_remove("server setup saved", (SIGNAL_FUNC) sig_server_setup_saved);
 }
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 00a6458b..62d47db1 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -470,6 +470,7 @@ void irc_server_connect(SERVER_REC *server)
 	g_return_if_fail(server != NULL);
 
 	if (server->connrec->connect_handle != NULL) {
+		/* an existing handle from upgrade */
 		IRC_SERVER_CONNECT_REC *conn;
 		int tls_disconnect;
 
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index 70683c4f..164e68bc 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -128,8 +128,10 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 	starttls_mode = config_node_get_int(node, "starttls", -1);
 	if (starttls_mode == 0)
 		server->connrec->disallow_starttls = 1;
-	if (starttls_mode == 1)
+	if (starttls_mode == 1) {
 		server->connrec->starttls = 1;
+		server->connrec->use_tls = 0;
+	}
 
 	if (server->isupport == NULL) {
 		server->isupport =

From 085c08e65c7624dd5264dbacaee913e36e95c170 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 7 Apr 2021 22:29:48 +0200
Subject: [PATCH 1241/1650] use enum

---
 src/fe-common/irc/fe-irc-server.c | 10 +++++-----
 src/irc/core/irc-servers-setup.c  | 10 +++++-----
 src/irc/core/irc-servers-setup.h  |  6 ++++++
 src/irc/core/irc-servers.c        |  2 +-
 src/irc/core/irc-session.c        | 13 +++++++------
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 66483991..f637a7e8 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -88,11 +88,11 @@ static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 	if (value != NULL && *value != '\0') rec->max_query_chans = atoi(value);
 	if (g_hash_table_lookup(optlist, "nodisallow_starttls") ||
 	    g_hash_table_lookup(optlist, "nostarttls"))
-		rec->starttls = -1;
+		rec->starttls = STARTTLS_NOTSET;
 	if (g_hash_table_lookup(optlist, "disallow_starttls"))
-		rec->starttls = 0;
+		rec->starttls = STARTTLS_DISALLOW;
 	if (g_hash_table_lookup(optlist, "starttls")) {
-		rec->starttls = 1;
+		rec->starttls = STARTTLS_ENABLED;
 		rec->use_tls = 0;
 	}
 }
@@ -118,9 +118,9 @@ static void cmd_server_list(const char *data)
 			g_string_append(str, "autoconnect, ");
 		if (rec->no_proxy)
 			g_string_append(str, "noproxy, ");
-		if (rec->starttls == 0)
+		if (rec->starttls == STARTTLS_DISALLOW)
 			g_string_append(str, "disallow_starttls, ");
-		if (rec->starttls == 1)
+		if (rec->starttls == STARTTLS_ENABLED)
 			g_string_append(str, "starttls, ");
 		if (rec->use_tls)
 			g_string_append(str, "tls, ");
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index a48e1e92..739e364e 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -44,9 +44,9 @@ static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
 		conn->max_cmds_at_once = sserver->max_cmds_at_once;
 	if (sserver->max_query_chans > 0)
 		conn->max_query_chans = sserver->max_query_chans;
-	if (sserver->starttls == 0)
+	if (sserver->starttls == STARTTLS_DISALLOW)
 		conn->disallow_starttls = 1;
-	else if (sserver->starttls == 1)
+	else if (sserver->starttls == STARTTLS_ENABLED)
 		conn->starttls = 1;
 }
 
@@ -191,8 +191,8 @@ static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)
 	rec->max_cmds_at_once = config_node_get_int(node, "cmds_max_at_once", 0);
 	rec->cmd_queue_speed = config_node_get_int(node, "cmd_queue_speed", 0);
 	rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0);
-	rec->starttls = config_node_get_bool(node, "starttls", -1);
-	if (rec->starttls == 1) {
+	rec->starttls = config_node_get_bool(node, "starttls", STARTTLS_NOTSET);
+	if (rec->starttls == STARTTLS_ENABLED) {
 		rec->use_tls = 0;
 	}
 }
@@ -209,7 +209,7 @@ static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
 		iconfig_node_set_int(node, "cmd_queue_speed", rec->cmd_queue_speed);
 	if (rec->max_query_chans > 0)
 		iconfig_node_set_int(node, "max_query_chans", rec->max_query_chans);
-	if (rec->starttls >= 0)
+	if (rec->starttls != STARTTLS_NOTSET)
 		iconfig_node_set_bool(node, "starttls", rec->starttls);
 	else
 		iconfig_node_set_str(node, "starttls", NULL);
diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index 8fbb311e..47bdc012 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -11,6 +11,12 @@
 #define IS_IRC_SERVER_SETUP(server) \
 	(IRC_SERVER_SETUP(server) ? TRUE : FALSE)
 
+enum {
+	STARTTLS_DISALLOW = -1, /* */
+	STARTTLS_NOTSET = 0,
+	STARTTLS_ENABLED = 1
+};
+
 typedef struct {
 #include <irssi/src/core/server-setup-rec.h>
 
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 62d47db1..0326bc65 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -303,7 +303,7 @@ static void init_ssl_loop(IRC_SERVER_REC *server, GIOChannel *handle)
 		IRC_SERVER_SETUP_REC *ssetup = IRC_SERVER_SETUP(server_setup_find(
 		    server->connrec->address, server->connrec->port, server->connrec->chatnet));
 		if (ssetup != NULL) {
-			ssetup->starttls = 1;
+			ssetup->starttls = STARTTLS_ENABLED;
 			server_setup_add((SERVER_SETUP_REC *) ssetup);
 		}
 	}
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index 164e68bc..ac71f986 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -26,6 +26,7 @@
 #include <irssi/src/core/network.h>
 
 #include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-servers-setup.h>
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/irc/core/irc-nicklist.h>
 
@@ -82,9 +83,9 @@ static void sig_session_save_server(IRC_SERVER_REC *server, CONFIG_REC *config,
 	config_node_set_str(config, node, "sasl_password", server->connrec->sasl_password);
 
 	config_node_set_int(config, node, "starttls",
-	                    server->connrec->disallow_starttls ? 0 :
-	                    server->connrec->starttls          ? 1 :
-                                                                 -1);
+	                    server->connrec->disallow_starttls ? STARTTLS_DISALLOW :
+	                    server->connrec->starttls          ? STARTTLS_ENABLED :
+                                                                 STARTTLS_NOTSET);
 
 	config_node_set_bool(config, node, "isupport_sent", server->isupport_sent);
 	isupport = config_node_section(config, node, "isupport", NODE_TYPE_BLOCK);
@@ -125,10 +126,10 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 
 	server->connrec->channels = g_strdup(config_node_get_str(node, "rejoin_channels", NULL));
 
-	starttls_mode = config_node_get_int(node, "starttls", -1);
-	if (starttls_mode == 0)
+	starttls_mode = config_node_get_int(node, "starttls", STARTTLS_NOTSET);
+	if (starttls_mode == STARTTLS_DISALLOW)
 		server->connrec->disallow_starttls = 1;
-	if (starttls_mode == 1) {
+	if (starttls_mode == STARTTLS_ENABLED) {
 		server->connrec->starttls = 1;
 		server->connrec->use_tls = 0;
 	}

From 61237ee6c0b459c0a9d210e4b4d3f6f186ec0c92 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 8 Apr 2021 21:16:55 +0200
Subject: [PATCH 1242/1650] reorder code

---
 src/irc/core/irc-servers.c | 101 ++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 51 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 0326bc65..8d4f8a9e 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -208,7 +208,55 @@ static char **split_message(SERVER_REC *server, const char *target,
 			  strlen(target));
 }
 
-static void server_init_2(IRC_SERVER_REC *server);
+static void server_init_2(IRC_SERVER_REC *server)
+{
+	IRC_SERVER_CONNECT_REC *conn;
+	char *address, *ptr, *username, *cmd;
+
+	g_return_if_fail(server != NULL);
+
+	conn = server->connrec;
+
+	if (conn->password != NULL && *conn->password != '\0') {
+		/* send password */
+		cmd = g_strdup_printf("PASS %s", conn->password);
+		irc_send_cmd_now(server, cmd);
+		g_free(cmd);
+	}
+
+	/* send nick */
+	cmd = g_strdup_printf("NICK %s", conn->nick);
+	irc_send_cmd_now(server, cmd);
+	g_free(cmd);
+
+	/* send user/realname */
+	address = server->connrec->address;
+	ptr = strrchr(address, ':');
+	if (ptr != NULL) {
+		/* IPv6 address .. doesn't work here, use the string after
+		   the last : char */
+		address = ptr + 1;
+		if (*address == '\0')
+			address = "x";
+	}
+
+	username = g_strdup(conn->username);
+	ptr = strchr(username, ' ');
+	if (ptr != NULL)
+		*ptr = '\0';
+
+	cmd = g_strdup_printf("USER %s %s %s :%s", username, username, address, conn->realname);
+	irc_send_cmd_now(server, cmd);
+	g_free(cmd);
+	g_free(username);
+
+	if (conn->proxy != NULL && conn->proxy_string_after != NULL) {
+		cmd = g_strdup_printf(conn->proxy_string_after, conn->address, conn->port);
+		irc_send_cmd_now(server, cmd);
+		g_free(cmd);
+	}
+}
+
 static void server_init_1(IRC_SERVER_REC *server)
 {
 	IRC_SERVER_CONNECT_REC *conn;
@@ -271,6 +319,7 @@ static void server_init_1(IRC_SERVER_REC *server)
 static void init_ssl_loop(IRC_SERVER_REC *server, GIOChannel *handle)
 {
 	int error;
+	server->connrec->starttls = 1;
 
 	if (server->starttls_tag) {
 		g_source_remove(server->starttls_tag);
@@ -298,7 +347,6 @@ static void init_ssl_loop(IRC_SERVER_REC *server, GIOChannel *handle)
 		signal_emit("server cap continue", 1, server);
 	}
 
-	server->connrec->starttls = 1;
 	if (settings_get_bool("starttls_sts")) {
 		IRC_SERVER_SETUP_REC *ssetup = IRC_SERVER_SETUP(server_setup_find(
 		    server->connrec->address, server->connrec->port, server->connrec->chatnet));
@@ -370,55 +418,6 @@ static void event_capend(IRC_SERVER_REC *server)
 	server_init_2(server);
 }
 
-static void server_init_2(IRC_SERVER_REC *server)
-{
-	IRC_SERVER_CONNECT_REC *conn;
-	char *address, *ptr, *username, *cmd;
-
-	g_return_if_fail(server != NULL);
-
-	conn = server->connrec;
-
-	if (conn->password != NULL && *conn->password != '\0') {
-		/* send password */
-		cmd = g_strdup_printf("PASS %s", conn->password);
-		irc_send_cmd_now(server, cmd);
-		g_free(cmd);
-	}
-
-	/* send nick */
-	cmd = g_strdup_printf("NICK %s", conn->nick);
-	irc_send_cmd_now(server, cmd);
-	g_free(cmd);
-
-	/* send user/realname */
-	address = server->connrec->address;
-	ptr = strrchr(address, ':');
-	if (ptr != NULL) {
-		/* IPv6 address .. doesn't work here, use the string after
-		   the last : char */
-		address = ptr + 1;
-		if (*address == '\0')
-			address = "x";
-	}
-
-	username = g_strdup(conn->username);
-	ptr = strchr(username, ' ');
-	if (ptr != NULL)
-		*ptr = '\0';
-
-	cmd = g_strdup_printf("USER %s %s %s :%s", username, username, address, conn->realname);
-	irc_send_cmd_now(server, cmd);
-	g_free(cmd);
-	g_free(username);
-
-	if (conn->proxy != NULL && conn->proxy_string_after != NULL) {
-		cmd = g_strdup_printf(conn->proxy_string_after, conn->address, conn->port);
-		irc_send_cmd_now(server, cmd);
-		g_free(cmd);
-	}
-}
-
 SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 {
 	IRC_SERVER_CONNECT_REC *ircconn;

From 8a5d5d384ed20cefa3fdc4a65d27fac3e4913a7b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 8 Apr 2021 22:28:35 +0200
Subject: [PATCH 1243/1650] add nocap flag

---
 src/fe-common/irc/fe-irc-server.c    | 24 +++++++++++++++++++++---
 src/fe-common/irc/module-formats.c   |  1 +
 src/fe-common/irc/module-formats.h   |  1 +
 src/irc/core/irc-commands.c          |  2 +-
 src/irc/core/irc-servers-reconnect.c |  1 +
 src/irc/core/irc-servers-setup.c     |  9 +++++++++
 src/irc/core/irc-servers-setup.h     |  1 +
 src/irc/core/irc-servers.c           | 11 ++++++++---
 src/irc/core/irc-servers.h           |  1 +
 src/irc/core/irc-session.c           |  2 ++
 10 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index f637a7e8..fbd70404 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -95,6 +95,19 @@ static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 		rec->starttls = STARTTLS_ENABLED;
 		rec->use_tls = 0;
 	}
+	if (g_hash_table_lookup(optlist, "nocap"))
+		rec->no_cap = 1;
+	if (g_hash_table_lookup(optlist, "cap"))
+		rec->no_cap = 0;
+}
+
+static void sig_server_waiting_info(IRC_SERVER_REC *server, const char *version)
+{
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	printformat(server, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_SERVER_WAITING_CAP_LS, server,
+	            version);
 }
 
 /* SYNTAX: SERVER LIST */
@@ -118,6 +131,8 @@ static void cmd_server_list(const char *data)
 			g_string_append(str, "autoconnect, ");
 		if (rec->no_proxy)
 			g_string_append(str, "noproxy, ");
+		if (rec->no_cap)
+			g_string_append(str, "nocap, ");
 		if (rec->starttls == STARTTLS_DISALLOW)
 			g_string_append(str, "disallow_starttls, ");
 		if (rec->starttls == STARTTLS_ENABLED)
@@ -167,17 +182,20 @@ static void cmd_server_list(const char *data)
 void fe_irc_server_init(void)
 {
 	signal_add("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
+	signal_add("server waiting cap ls", (SIGNAL_FUNC) sig_server_waiting_info);
 	command_bind("server list", NULL, (SIGNAL_FUNC) cmd_server_list);
 
-	command_set_options("server add", "-ircnet -network -cmdspeed -cmdmax -querychans starttls "
-	                                  "nostarttls disallow_starttls nodisallow_starttls");
+	command_set_options("server add",
+	                    "-ircnet -network -cmdspeed -cmdmax -querychans starttls "
+	                    "nostarttls disallow_starttls nodisallow_starttls cap nocap");
 	command_set_options("server modify",
 	                    "-ircnet -network -cmdspeed -cmdmax -querychans starttls nostarttls "
-	                    "disallow_starttls nodisallow_starttls");
+	                    "disallow_starttls nodisallow_starttls cap nocap");
 }
 
 void fe_irc_server_deinit(void)
 {
 	signal_remove("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
+	signal_remove("server waiting cap ls", (SIGNAL_FUNC) sig_server_waiting_info);
 	command_unbind("server list", (SIGNAL_FUNC) cmd_server_list);
 }
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index d4c00f25..1a96cbce 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -45,6 +45,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "setupserver_header", "%#Server               Port  Network    Settings", 0 },
 	{ "setupserver_line", "%#%|$[!20]0 $[5]1 $[10]2 $3", 4, { 0, 1, 0, 0 } },
 	{ "setupserver_footer", "", 0 },
+	{ "server_waiting_cap_ls", "Waiting for CAP LS response...", 2, { 0, 0 } },
 	{ "sasl_success", "SASL authentication succeeded", 0 },
 	{ "sasl_error", "Cannot authenticate via SASL ($0)", 1, { 0 } },
 	{ "cap_req",  "Capabilities requested: $0", 1, { 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 892b77c8..5abd04a4 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -23,6 +23,7 @@ enum {
 	IRCTXT_SETUPSERVER_HEADER,
 	IRCTXT_SETUPSERVER_LINE,
 	IRCTXT_SETUPSERVER_FOOTER,
+	IRCTXT_SERVER_WAITING_CAP_LS,
 	IRCTXT_SASL_SUCCESS,
 	IRCTXT_SASL_ERROR,
 	IRCTXT_CAP_REQ,
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 9cc8afe8..cba909c1 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -1053,7 +1053,7 @@ void irc_commands_init(void)
 	signal_add("whois end", (SIGNAL_FUNC) event_end_of_whois);
 	signal_add("whowas event", (SIGNAL_FUNC) event_whowas);
 
-	command_set_options("connect", "+ircnet starttls disallow_starttls");
+	command_set_options("connect", "+ircnet starttls disallow_starttls nocap");
 	command_set_options("topic", "delete");
 	command_set_options("list", "yes");
 	command_set_options("away", "one all");
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index cc34c6d3..e18a5a9b 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -53,6 +53,7 @@ static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 	rec->sasl_password = g_strdup(src->sasl_password);
 	rec->disallow_starttls = src->disallow_starttls;
 	rec->starttls = src->starttls;
+	rec->no_cap = src->no_cap;
 	*dest = (SERVER_CONNECT_REC *) rec;
 }
 
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 739e364e..5299ef04 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -48,6 +48,8 @@ static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
 		conn->disallow_starttls = 1;
 	else if (sserver->starttls == STARTTLS_ENABLED)
 		conn->starttls = 1;
+	if (sserver->no_cap)
+		conn->no_cap = 1;
 }
 
 static void sig_server_setup_fill_connect(IRC_SERVER_CONNECT_REC *conn, GHashTable *optlist)
@@ -77,6 +79,10 @@ static void sig_server_setup_fill_optlist(IRC_SERVER_CONNECT_REC *conn, GHashTab
 	} else if (g_hash_table_lookup(optlist, "disallow_starttls") != NULL) {
 		conn->disallow_starttls = 1;
 	}
+	if (g_hash_table_lookup(optlist, "nocap"))
+		conn->no_cap = 1;
+	if (g_hash_table_lookup(optlist, "cap"))
+		conn->no_cap = 0;
 }
 
 static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
@@ -195,6 +201,7 @@ static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)
 	if (rec->starttls == STARTTLS_ENABLED) {
 		rec->use_tls = 0;
 	}
+	rec->no_cap = config_node_get_bool(node, "no_cap", FALSE);
 }
 
 static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
@@ -213,6 +220,8 @@ static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
 		iconfig_node_set_bool(node, "starttls", rec->starttls);
 	else
 		iconfig_node_set_str(node, "starttls", NULL);
+	if (rec->no_cap)
+		iconfig_node_set_bool(node, "no_cap", TRUE);
 }
 
 void irc_servers_setup_init(void)
diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index 47bdc012..7b11a2fe 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -25,6 +25,7 @@ typedef struct {
 	int cmd_queue_speed;
         int max_query_chans;
 	int starttls;
+	int no_cap : 1;
 } IRC_SERVER_SETUP_REC;
 
 void irc_servers_setup_init(void);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 8d4f8a9e..06f3d3c8 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -309,11 +309,16 @@ static void server_init_1(IRC_SERVER_REC *server)
 	server->wait_cmd = g_get_real_time();
 	server->wait_cmd += 120 * G_USEC_PER_SEC;
 
-	irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
-	/* to detect non-CAP servers, send this bogus join */
-	irc_send_cmd_now(server, "JOIN ");
+	if (!conn->no_cap) {
+		signal_emit("server waiting cap ls", 2, server, CAP_LS_VERSION);
+		irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
+		/* to detect non-CAP servers, send this bogus join */
+		irc_send_cmd_now(server, "JOIN ");
+	}
 	if (conn->starttls)
 		irc_server_send_starttls(server);
+	else if (conn->no_cap)
+		server_init_2(server);
 }
 
 static void init_ssl_loop(IRC_SERVER_REC *server, GIOChannel *handle)
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 04d1f693..544baba9 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -63,6 +63,7 @@ struct _IRC_SERVER_CONNECT_REC {
 	int max_kicks, max_msgs, max_modes, max_whois;
 	int disallow_starttls:1;
 	int starttls:1;
+	int no_cap:1;
 };
 /* clang-format on */
 
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index ac71f986..49d9a3f2 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -87,6 +87,7 @@ static void sig_session_save_server(IRC_SERVER_REC *server, CONFIG_REC *config,
 	                    server->connrec->starttls          ? STARTTLS_ENABLED :
                                                                  STARTTLS_NOTSET);
 
+	config_node_set_bool(config, node, "no_cap", server->connrec->no_cap);
 	config_node_set_bool(config, node, "isupport_sent", server->isupport_sent);
 	isupport = config_node_section(config, node, "isupport", NODE_TYPE_BLOCK);
         isupport_data.config = config;
@@ -115,6 +116,7 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
 	server->emode_known = config_node_get_bool(node, "emode_known", FALSE);
 	server->isupport_sent = config_node_get_bool(node, "isupport_sent", FALSE);
 
+	server->connrec->no_cap = config_node_get_bool(node, "no_cap", FALSE);
 	server->connrec->sasl_mechanism = config_node_get_int(node, "sasl_mechanism", SASL_MECHANISM_NONE);
 	/* The fields below might have been filled when loading the chatnet
 	 * description from the config and we favor the content that's been saved

From 645d80d3b8bcf17b09b7e22ccf251da3fb0b8a9e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 9 Apr 2021 19:03:41 +0200
Subject: [PATCH 1244/1650] Merge tag '1.2.3' into integrate/1.2.3

---
 NEWS                     | 40 +++++++++++++++++++++++++++++++++++++++-
 src/fe-text/textbuffer.c |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 2e6e5025..1bdffd82 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,42 @@
-v1.3-head 2019-xx-xx  The Irssi team <staff@irssi.org>
+v1.3-head 2021-xx-xx  The Irssi team <staff@irssi.org>
+
+v1.2.3 2021-04-11 The Irssi team <staff@irssi.org>
+	- Fix the compilation of utf8proc (#1021)
+	- Fix wrong call to free. By Zero King (#1076)
+	- Fix a colour reset in true colour themes when encountering
+          mIRC colours (#1059)
+	- Fix memory leak on malformed CAP requests (#1120)
+	- Fix an erroneous free of SASL data. Credit to Oss-Fuzz (#1128,
+	  #1130)
+	- Re-set the TLS flag when reconnecting (#1027, #1134)
+	- Fix the scrollback getting stuck after /clear (#1115, #1136)
+	- Fix the input of Ctrl+C as the first character (#1153,  #1154)
+	- Fix crash on quit during unloading of modules on certain
+          platforms (#1167)
+	- Fix Irssi freezing input after Ctrl+Space on GLib >2.62 (#1180,
+	  #1183)
+	- Fix layout of IDCHANs. By Lauri Tirkkonen (#1197)
+	- Fix crash when server got reconnected before it was properly
+          connected (#1210, #1211)
+	- Fix multiple identical active caps (#1249)
+	- Minor help corrections (#1156, #1213, #1214, #1255)
+	- Remove erroneous colour in the colorless theme. Reported and
+          fixed by Nutchanon Wetchasit (#1220, #1221)
+	- Fix invalid bounds calculation when editing the text
+          entry. Found and fixed by Sergey Valentey (#1269)
+	- Fix passing of negative size in buffer writes. Found and
+          fixed by Sergey Valentey (#1270)
+	- Fix Irssi freezing on slow hardware and fast DCC transfers (#159,
+	  #1271)
+	- Fix compilation on Solaris (#1291)
+	- Fix null pointer dereference when receiving broken JOIN
+          record. Credit to Oss-Fuzz (#1292)
+	- Fix crash on /connect to some sockets (#1239, #1298)
+	- Fix Irssi rendering on Apple ARM. By Misty De Méo (#1267,
+	  #1268, #1290)
+	- Fix crash on /lastlog with broken lines (#1281, #1299)
+	- Fix memory leak when receiving bogus SASL authentication
+          data. Found and fixed by Sergey Valentey (#1293)
 
 v1.2.2 2019-08-29 The Irssi team <staff@irssi.org>
 	- Fix a use after free issue when receiving IRCv3 CAP
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 25fce22f..8a206f2c 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -236,7 +236,7 @@ void textbuffer_line2text(TEXT_BUFFER_REC *buffer, LINE_REC *line, int coloring,
 	g_return_if_fail(line != NULL);
 	g_return_if_fail(str != NULL);
 
-        g_string_truncate(str, 0);
+	g_string_truncate(str, 0);
 
 	if ((ptr = textbuffer_line_get_text(buffer, line, coloring == COLORING_RAW)) != NULL) {
 		if (coloring == COLORING_STRIP) {

From 8bb4875007bfebf99f826971ed756e4f0284363a Mon Sep 17 00:00:00 2001
From: Rene Kita <mail@rkta.de>
Date: Sat, 10 Apr 2021 09:44:53 +0200
Subject: [PATCH 1245/1650] Ignore files generated by ./autogen.sh

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 79e4d4bb..217ce3a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,8 @@ src/fe-fuzz/crash-*
 src/fe-fuzz/oom-*
 
 /core
+/irssi-1.pc
+/irssi/
 /tests/fe-common/core/test-formats
 /tests/fe-common/core/test-formats.log
 /tests/fe-common/core/test-formats.trs

From 90003a2bf652ed660946ebf1f5f17693331e9df5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 18 Apr 2021 11:38:20 +0200
Subject: [PATCH 1246/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index ccd000d5..bdbafca7 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 35
+#define IRSSI_ABI_VERSION 36
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 3dbfac5699c6887b7149a0b1c805c4730f63d0f4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 20 Apr 2021 09:11:06 +0200
Subject: [PATCH 1247/1650] fuzz test

---
 .github/workflows/cifuzz.yml | 1 +
 src/fe-fuzz/server.c         | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 9f956d5c..a32e335d 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -8,6 +8,7 @@ on:
     - 'src/irc/**/*.c'
     - 'src/fe-common/irc/**/*.c'
     - 'src/lib-config/**/*.c'
+    - 'src/fe-fuzz/**/*.c'
     - 'tests/**/*.c'
     - '.github/workflows/cifuzz.yml'
 jobs:
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index a2ffb9e9..83ce7bfa 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -186,9 +186,11 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 		server_ref(server);
 		signal_emit("server incoming", 2, server, prefixedLine);
 		disconnected = server->disconnected;
+		/*
 		if (disconnected) {
-			server_connect_unref(server->connrec);
+		        server_connect_unref(server->connrec);
 		}
+		*/
 		server_unref(server);
 		if (disconnected) {
 			/* reconnect */

From 4fa72e857c6a21160e8cc7d85425fffcb6fff09a Mon Sep 17 00:00:00 2001
From: nia <nia@netbsd.org>
Date: Mon, 26 Apr 2021 10:31:34 +0200
Subject: [PATCH 1248/1650] Fix build on operating systems with X/Open Curses,
 version 2

Add the missing arguments to tparm. X/Open Curses specifies
tparm takes a fixed number of 10 arguments, while ncurses
has implemented it as a varargs function. tiparm is a standardized
version of varargs tparm, support in both NetBSD libcurses and
ncurses, but not by older versions of Solaris.

This is an alternate fix to the one proposed in irssi/irssi/#1305
that should keep compatibility with older versions of Solaris by
avoiding tiparm.
---
 src/fe-text/terminfo-core.c | 92 ++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 6be54c32..0a09aa3f 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -110,14 +110,14 @@ static TERMINFO_REC tcaps[] = {
 /* Move cursor (cursor_address / cup) */
 static void _move_cup(TERM_REC *term, int x, int y)
 {
-	tput(tparm(term->TI_cup, y, x));
+	tput(tparm(term->TI_cup, y, x, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Move cursor (column_address+row_address / hpa+vpa) */
 static void _move_pa(TERM_REC *term, int x, int y)
 {
-	tput(tparm(term->TI_hpa, x));
-	tput(tparm(term->TI_vpa, y));
+	tput(tparm(term->TI_hpa, x, 0, 0, 0, 0, 0, 0, 0, 0));
+	tput(tparm(term->TI_vpa, y, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Move cursor from a known position */
@@ -133,38 +133,38 @@ static void _move_relative(TERM_REC *term, int oldx, int oldy, int x, int y)
 	if (oldx > 0 && y == oldy) {
                 /* move cursor left/right */
 		if (x == oldx-1 && term->TI_cub1) {
-			tput(tparm(term->TI_cub1));
+			tput(tparm(term->TI_cub1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
                         return;
 		}
 		if (x == oldx+1 && y == oldy && term->TI_cuf1) {
-			tput(tparm(term->TI_cuf1));
+			tput(tparm(term->TI_cuf1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
                         return;
 		}
 	}
 
         /* fallback to absolute positioning */
 	if (term->TI_cup) {
-		tput(tparm(term->TI_cup, y, x));
+		tput(tparm(term->TI_cup, y, x, 0, 0, 0, 0, 0, 0, 0));
                 return;
 	}
 
 	if (oldy != y)
-		tput(tparm(term->TI_vpa, y));
+		tput(tparm(term->TI_vpa, y, 0, 0, 0, 0, 0, 0, 0, 0));
         if (oldx != x)
-		tput(tparm(term->TI_hpa, x));
+		tput(tparm(term->TI_hpa, x, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Set cursor visible/invisible */
 static void _set_cursor_visible(TERM_REC *term, int set)
 {
-	tput(tparm(set ? term->TI_cnorm : term->TI_civis));
+	tput(tparm(set ? term->TI_cnorm : term->TI_civis, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 #define scroll_region_setup(term, y1, y2) \
 	if ((term)->TI_csr != NULL) \
-		tput(tparm((term)->TI_csr, y1, y2)); \
+		tput(tparm((term)->TI_csr, y1, y2, 0, 0, 0, 0, 0, 0, 0)); \
 	else if ((term)->TI_wind != NULL) \
-		tput(tparm((term)->TI_wind, y1, y2, 0, (term)->width-1));
+		tput(tparm((term)->TI_wind, y1, y2, 0, (term)->width-1, 0, 0, 0, 0, 0));
 
 /* Scroll (change_scroll_region+parm_rindex+parm_index / csr+rin+indn) */
 static void _scroll_region(TERM_REC *term, int y1, int y2, int count)
@@ -175,10 +175,10 @@ static void _scroll_region(TERM_REC *term, int y1, int y2, int count)
 	term->move(term, 0, y1);
 	if (count > 0) {
 		term->move(term, 0, y2);
-		tput(tparm(term->TI_indn, count, count));
+		tput(tparm(term->TI_indn, count, count, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
 		term->move(term, 0, y1);
-		tput(tparm(term->TI_rin, -count, -count));
+		tput(tparm(term->TI_rin, -count, -count, 0, 0, 0, 0, 0, 0, 0));
 	}
 
         /* reset the scrolling region to full screen */
@@ -196,11 +196,11 @@ static void _scroll_region_1(TERM_REC *term, int y1, int y2, int count)
 	if (count > 0) {
 		term->move(term, 0, y2);
 		for (i = 0; i < count; i++)
-			tput(tparm(term->TI_ind));
+			tput(tparm(term->TI_ind, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
 		term->move(term, 0, y1);
 		for (i = count; i < 0; i++)
-			tput(tparm(term->TI_ri));
+			tput(tparm(term->TI_ri, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	}
 
         /* reset the scrolling region to full screen */
@@ -217,14 +217,14 @@ static void _scroll_line(TERM_REC *term, int y1, int y2, int count)
 
 	if (count > 0) {
 		term->move(term, 0, y1);
-		tput(tparm(term->TI_dl, count, count));
+		tput(tparm(term->TI_dl, count, count, 0, 0, 0, 0, 0, 0, 0));
 		term->move(term, 0, y2-count+1);
-		tput(tparm(term->TI_il, count, count));
+		tput(tparm(term->TI_il, count, count, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
 		term->move(term, 0, y2+count+1);
-		tput(tparm(term->TI_dl, -count, -count));
+		tput(tparm(term->TI_dl, -count, -count, 0, 0, 0, 0, 0, 0, 0));
 		term->move(term, 0, y1);
-		tput(tparm(term->TI_il, -count, -count));
+		tput(tparm(term->TI_il, -count, -count, 0, 0, 0, 0, 0, 0, 0));
 	}
 
         /* reset the scrolling region to full screen */
@@ -239,38 +239,38 @@ static void _scroll_line_1(TERM_REC *term, int y1, int y2, int count)
 	if (count > 0) {
 		term->move(term, 0, y1);
                 for (i = 0; i < count; i++)
-			tput(tparm(term->TI_dl1));
+			tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 		term->move(term, 0, y2-count+1);
                 for (i = 0; i < count; i++)
-			tput(tparm(term->TI_il1));
+			tput(tparm(term->TI_il1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
 		term->move(term, 0, y2+count+1);
 		for (i = count; i < 0; i++)
-			tput(tparm(term->TI_dl1));
+			tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 		term->move(term, 0, y1);
 		for (i = count; i < 0; i++)
-			tput(tparm(term->TI_il1));
+			tput(tparm(term->TI_il1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	}
 }
 
 /* Clear screen (clear_screen / clear) */
 static void _clear_screen(TERM_REC *term)
 {
-	tput(tparm(term->TI_clear));
+	tput(tparm(term->TI_clear, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Clear screen (clr_eos / ed) */
 static void _clear_eos(TERM_REC *term)
 {
         term->move(term, 0, 0);
-	tput(tparm(term->TI_ed));
+	tput(tparm(term->TI_ed, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Clear screen (parm_delete_line / dl) */
 static void _clear_del(TERM_REC *term)
 {
         term->move(term, 0, 0);
-	tput(tparm(term->TI_dl, term->height, term->height));
+	tput(tparm(term->TI_dl, term->height, term->height, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Clear screen (delete_line / dl1) */
@@ -280,19 +280,19 @@ static void _clear_del_1(TERM_REC *term)
 
 	term->move(term, 0, 0);
         for (i = 0; i < term->height; i++)
-		tput(tparm(term->TI_dl1));
+		tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Clear to end of line (clr_eol / el) */
 static void _clrtoeol(TERM_REC *term)
 {
-	tput(tparm(term->TI_el));
+	tput(tparm(term->TI_el, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Repeat character (rep / rp) */
 static void _repeat(TERM_REC *term, char chr, int count)
 {
-	tput(tparm(term->TI_rep, chr, count));
+	tput(tparm(term->TI_rep, chr, count, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Repeat character (manual) */
@@ -307,42 +307,42 @@ static void _repeat_manual(TERM_REC *term, char chr, int count)
 /* Reset all terminal attributes */
 static void _set_normal(TERM_REC *term)
 {
-	tput(tparm(term->TI_normal));
+	tput(tparm(term->TI_normal, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 static void _set_blink(TERM_REC *term)
 {
-	tput(tparm(term->TI_blink));
+	tput(tparm(term->TI_blink, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Reverse on */
 static void _set_reverse(TERM_REC *term)
 {
-	tput(tparm(term->TI_rev));
+	tput(tparm(term->TI_rev, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Bold on */
 static void _set_bold(TERM_REC *term)
 {
-	tput(tparm(term->TI_bold));
+	tput(tparm(term->TI_bold, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Underline on/off */
 static void _set_uline(TERM_REC *term, int set)
 {
-	tput(tparm(set ? term->TI_smul : term->TI_rmul));
+	tput(tparm(set ? term->TI_smul : term->TI_rmul, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Standout on/off */
 static void _set_standout(TERM_REC *term, int set)
 {
-	tput(tparm(set ? term->TI_smso : term->TI_rmso));
+	tput(tparm(set ? term->TI_smso : term->TI_rmso, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Italic on/off */
 static void _set_italic(TERM_REC *term, int set)
 {
-	tput(tparm(set ? term->TI_sitm : term->TI_ritm));
+	tput(tparm(set ? term->TI_sitm : term->TI_ritm, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Standout on (fallback for reverse) */
@@ -367,19 +367,19 @@ inline static int color256(const TERM_REC *term, const int color) {
 /* Change foreground color */
 static void _set_fg(TERM_REC *term, int color)
 {
-	tput(tparm(term->TI_fg[color256(term, color)]));
+	tput(tparm(term->TI_fg[color256(term, color)], 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Change background color */
 static void _set_bg(TERM_REC *term, int color)
 {
-	tput(tparm(term->TI_bg[color256(term, color)]));
+	tput(tparm(term->TI_bg[color256(term, color)], 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Beep */
 static void _beep(TERM_REC *term)
 {
-	tput(tparm(term->TI_bel));
+	tput(tparm(term->TI_bel, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 static void _ignore(TERM_REC *term)
@@ -393,7 +393,7 @@ static void _ignore_parm(TERM_REC *term, int param)
 static void terminfo_set_appkey_mode(TERM_REC *term, int set)
 {
 	if (term->TI_smkx && term->TI_rmkx)
-		tput(tparm(set ? term->TI_smkx : term->TI_rmkx));
+		tput(tparm(set ? term->TI_smkx : term->TI_rmkx, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 static void term_dec_set_bracketed_paste_mode(int enable)
@@ -478,11 +478,11 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	if (term->TI_setaf) {
 		for (i = 0; i < term->TI_colors; i++) {
 			color = i < 16 ? ansitab[i] : i;
-			term->TI_fg[i] = g_strdup(tparm(term->TI_setaf, color, 0));
+			term->TI_fg[i] = g_strdup(tparm(term->TI_setaf, color, 0, 0, 0, 0, 0, 0, 0, 0));
 		}
 	} else if (term->TI_setf) {
 		for (i = 0; i < term->TI_colors; i++)
-                        term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0));
+                        term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
                         term->TI_fg[i] = g_strdup_printf("\033[%dm", 30+ansitab[i]);
@@ -491,11 +491,11 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	if (term->TI_setab) {
 		for (i = 0; i < term->TI_colors; i++) {
 			color = i < 16 ? ansitab[i] : i;
-			term->TI_bg[i] = g_strdup(tparm(term->TI_setab, color, 0));
+			term->TI_bg[i] = g_strdup(tparm(term->TI_setab, color, 0, 0, 0, 0, 0, 0, 0, 0));
 		}
 	} else if (term->TI_setb) {
 		for (i = 0; i < term->TI_colors; i++)
-                        term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0));
+                        term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
                         term->TI_bg[i] = g_strdup_printf("\033[%dm", 40+ansitab[i]);
@@ -539,7 +539,7 @@ static void terminfo_input_deinit(TERM_REC *term)
 void terminfo_cont(TERM_REC *term)
 {
 	if (term->TI_smcup)
-		tput(tparm(term->TI_smcup));
+		tput(tparm(term->TI_smcup, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 
 	if (term->appkey_enabled)
 		terminfo_set_appkey_mode(term, TRUE);
@@ -562,7 +562,7 @@ void terminfo_stop(TERM_REC *term)
 
 	/* stop cup-mode */
 	if (term->TI_rmcup)
-		tput(tparm(term->TI_rmcup));
+		tput(tparm(term->TI_rmcup, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 
 	if (term->appkey_enabled)
 		terminfo_set_appkey_mode(term, FALSE);

From 2122daa3f3c9cb0a74182d1c23590e4949f38746 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 30 Apr 2021 10:27:47 +0200
Subject: [PATCH 1249/1650] Run clang-format

---
 src/fe-text/terminfo-core.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 0a09aa3f..7c21d509 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -134,23 +134,23 @@ static void _move_relative(TERM_REC *term, int oldx, int oldy, int x, int y)
                 /* move cursor left/right */
 		if (x == oldx-1 && term->TI_cub1) {
 			tput(tparm(term->TI_cub1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-                        return;
+			return;
 		}
 		if (x == oldx+1 && y == oldy && term->TI_cuf1) {
 			tput(tparm(term->TI_cuf1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-                        return;
+			return;
 		}
 	}
 
         /* fallback to absolute positioning */
 	if (term->TI_cup) {
 		tput(tparm(term->TI_cup, y, x, 0, 0, 0, 0, 0, 0, 0));
-                return;
+		return;
 	}
 
 	if (oldy != y)
 		tput(tparm(term->TI_vpa, y, 0, 0, 0, 0, 0, 0, 0, 0));
-        if (oldx != x)
+	if (oldx != x)
 		tput(tparm(term->TI_hpa, x, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
@@ -160,11 +160,11 @@ static void _set_cursor_visible(TERM_REC *term, int set)
 	tput(tparm(set ? term->TI_cnorm : term->TI_civis, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
-#define scroll_region_setup(term, y1, y2) \
-	if ((term)->TI_csr != NULL) \
-		tput(tparm((term)->TI_csr, y1, y2, 0, 0, 0, 0, 0, 0, 0)); \
-	else if ((term)->TI_wind != NULL) \
-		tput(tparm((term)->TI_wind, y1, y2, 0, (term)->width-1, 0, 0, 0, 0, 0));
+#define scroll_region_setup(term, y1, y2)                                                          \
+	if ((term)->TI_csr != NULL)                                                                \
+		tput(tparm((term)->TI_csr, y1, y2, 0, 0, 0, 0, 0, 0, 0));                          \
+	else if ((term)->TI_wind != NULL)                                                          \
+		tput(tparm((term)->TI_wind, y1, y2, 0, (term)->width - 1, 0, 0, 0, 0, 0));
 
 /* Scroll (change_scroll_region+parm_rindex+parm_index / csr+rin+indn) */
 static void _scroll_region(TERM_REC *term, int y1, int y2, int count)
@@ -478,11 +478,12 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	if (term->TI_setaf) {
 		for (i = 0; i < term->TI_colors; i++) {
 			color = i < 16 ? ansitab[i] : i;
-			term->TI_fg[i] = g_strdup(tparm(term->TI_setaf, color, 0, 0, 0, 0, 0, 0, 0, 0));
+			term->TI_fg[i] =
+			    g_strdup(tparm(term->TI_setaf, color, 0, 0, 0, 0, 0, 0, 0, 0));
 		}
 	} else if (term->TI_setf) {
 		for (i = 0; i < term->TI_colors; i++)
-                        term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0, 0, 0, 0, 0, 0, 0, 0));
+			term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
                         term->TI_fg[i] = g_strdup_printf("\033[%dm", 30+ansitab[i]);
@@ -491,11 +492,12 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	if (term->TI_setab) {
 		for (i = 0; i < term->TI_colors; i++) {
 			color = i < 16 ? ansitab[i] : i;
-			term->TI_bg[i] = g_strdup(tparm(term->TI_setab, color, 0, 0, 0, 0, 0, 0, 0, 0));
+			term->TI_bg[i] =
+			    g_strdup(tparm(term->TI_setab, color, 0, 0, 0, 0, 0, 0, 0, 0));
 		}
 	} else if (term->TI_setb) {
 		for (i = 0; i < term->TI_colors; i++)
-                        term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0, 0, 0, 0, 0, 0, 0, 0));
+			term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
                         term->TI_bg[i] = g_strdup_printf("\033[%dm", 40+ansitab[i]);

From f5303c153ca0becd9d74873ac6df469320007aea Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 10 May 2021 08:34:19 +0200
Subject: [PATCH 1250/1650] slightly improve nocap detection

Fixes #1311
---
 src/irc/core/irc-servers.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 06f3d3c8..676e8cb9 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -313,7 +313,8 @@ static void server_init_1(IRC_SERVER_REC *server)
 		signal_emit("server waiting cap ls", 2, server, CAP_LS_VERSION);
 		irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
 		/* to detect non-CAP servers, send this bogus join */
-		irc_send_cmd_now(server, "JOIN ");
+		/* the : will make INSPIRCD respond with 451 instead of 461, too */
+		irc_send_cmd_now(server, "JOIN :");
 	}
 	if (conn->starttls)
 		irc_server_send_starttls(server);

From dcbc895e26813a36fbcd789d4b5eb25ad9f91df9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 10 May 2021 10:13:35 +0200
Subject: [PATCH 1251/1650] downgrade meson in github actions

---
 .github/workflows/abicheck.yml | 2 +-
 .github/workflows/check.yml    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index eceaa32e..a1b57662 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -4,7 +4,7 @@ env:
   build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
   prefix: /usr/local
   apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
-  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install meson
+  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.58.0'
   getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
   build-base-ref:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 038d2416..7bdd2dea 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -34,16 +34,25 @@ jobs:
     env:
       CC: ${{ matrix.compiler }}
     needs: dist
+    continue-on-error: ${{ contains(matrix.flags, 'FAILURE-OK') }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-16.04, ubuntu-latest]
         builder: [meson, configure]
         compiler: [clang, gcc]
+        flags: [regular]
         include:
           - os: ubuntu-16.04
             builder: meson
             meson_ver: ==0.49.2
             setuptools_ver: <51
+          - os: ubuntu-latest
+            builder: meson
+            meson_ver: <0.58.0
+          - os: ubuntu-latest
+            builder: meson
+            flags: meson-latest FAILURE-OK
     steps:
       - name: fetch dist
         uses: actions/download-artifact@v2

From af489b2d5f4ff1bbbb517d84f1cb9d97e89bcebf Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 10 May 2021 13:07:22 +0200
Subject: [PATCH 1252/1650] fix build with meson 0.58.0

---
 .github/workflows/abicheck.yml | 2 +-
 .github/workflows/check.yml    | 2 +-
 src/perl/meson.build           | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index a1b57662..4e14353d 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -4,7 +4,7 @@ env:
   build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
   prefix: /usr/local
   apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
-  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.58.0'
+  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.59.0'
   getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
   build-base-ref:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 7bdd2dea..aeaf6c27 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -49,7 +49,7 @@ jobs:
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.58.0
+            meson_ver: <0.59.0
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK
diff --git a/src/perl/meson.build b/src/perl/meson.build
index 6a2aaa85..d81173d9 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -14,6 +14,9 @@ irssi_core_pl_h = custom_target('irssi-core.pl.h',
   command : [file2header, '@INPUT@', 'irssi_core_code'],
 )
 
+# required as of Meson 0.58.0
+generated_files_inc = include_directories('.')
+
 libperl_core_a = shared_module('perl_core',
   files(
     'perl-common.c',
@@ -29,7 +32,7 @@ libperl_core_a = shared_module('perl_core',
     def_perl_use_lib,
     '-D' + 'PERL_STATIC_LIBS' + '=' + 0.to_string(),
   ],
-  include_directories : rootinc,
+  include_directories : [ rootinc ] + [ generated_files_inc ],
   implicit_include_directories : false,
   install : true,
   install_dir : moduledir,

From a3248d43ecc315358b1dfe596684cacf4083d744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claes=20N=C3=A4st=C3=A9n?= <pekdon@gmail.com>
Date: Sat, 15 May 2021 18:10:02 +0200
Subject: [PATCH 1253/1650] Use g_strndup, strndup is not available on old
 platforms

strndup is not available on Solaris 10, to ensure building is ok use
glib function.
---
 src/otr/otr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/otr/otr.c b/src/otr/otr.c
index 80604513..abe24726 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -643,7 +643,7 @@ static enum otr_msg_status enqueue_otr_fragment(const char *msg, struct otr_peer
 		 * Dup the string with enough space for the NULL byte since we are
 		 * about to free it before passing it to the caller.
 		 */
-		*full_msg = strndup(opc->full_msg, opc->msg_len + 1);
+		*full_msg = g_strndup(opc->full_msg, opc->msg_len + 1);
 		/* Reset everything. */
 		free(opc->full_msg);
 		opc->full_msg = NULL;

From 5779306df01dc7c92f4e0bb20a69ab56547d7611 Mon Sep 17 00:00:00 2001
From: Mathis Beer <Mathis.Beer@funkwerk-itk.com>
Date: Thu, 20 May 2021 10:20:33 +0200
Subject: [PATCH 1254/1650] Add aliases for ns, ms, os, cs shorthand commands
 supported by many servers to message services easily.

---
 irssi.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/irssi.conf b/irssi.conf
index 80c2b9c3..edaeb3f5 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -115,6 +115,7 @@ aliases = {
   C           = "CLEAR";
   CALC        = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi";
   CHAT        = "DCC CHAT";
+  CS          = "QUOTE CS";
   DATE        = "TIME";
   DEHIGHLIGHT = "DEHILIGHT";
   DESCRIBE    = "ACTION";
@@ -133,9 +134,12 @@ aliases = {
   LAST        = "LASTLOG";
   LEAVE       = "PART";
   M           = "MSG";
+  MS          = "QUOTE MS";
   MUB         = "UNBAN *";
   N           = "NAMES";
   NMSG        = "^MSG";
+  NS          = "QUOTE NS";
+  OS          = "QUOTE OS";
   P           = "PART";
   Q           = "QUERY";
   RESET       = "SET -default";

From 1ba48840a112dfacf13cbbf6b77c1e3489fefcf8 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 19 May 2021 21:51:39 +0200
Subject: [PATCH 1255/1650] update default network

---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 ++++----
 docs/help/in/connect.in    |  6 +++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 ++++----
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 +++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 ++--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 ++++++++--------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 ++--
 docs/startup-HOWTO.txt     |  4 ++--
 irssi.conf                 |  8 ++++----
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 08be65b4..d1232764 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on freenode.
+[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index 2b6f8b73..acb6e1ae 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN orwell.freenode.net
+    /ADMIN irc.libera.chat
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 86e824c2..d9be8cf5 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi Freenode
+    /CHANNEL ADD -auto #irssi liberachat
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout liberachat
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi Freenode
-    /CHANNEL REMOVE #hideout Freenode
+    /CHANNEL MODIFY -noauto #irssi liberachat
+    /CHANNEL REMOVE #hideout liberachat
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index e861ad74..d4375eec 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT Freenode
-    /CONNECT -6 Freenode
-    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
+    /CONNECT liberachat
+    /CONNECT -6 liberachat
+    /CONNECT -4 -! -host staff.irssi.org -network liberachat irc.libera.chat
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index bd4a4e17..c53b1e60 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT Freenode I'm off for today, take care!
+    /DISCONNECT liberachat I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index 275f349d..d8d8cfc9 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO orwell.freenode.net
+    /INFO irc.libera.chat
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index 39fa23f8..adf7158e 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -freenode #github,#freenode,#irssi
+    /JOIN -liberachat #github,#libera,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index bb554d55..ce8f9aa0 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #freenode
+    /KNOCK #libera
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index e4743d46..3ca8782c 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index e33a1c75..6e86681e 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD orwel.freenode.org
+    /MOTD irc.libera.chat
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index 8fd8cf91..974b845f 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#freenode
+    /NAMES -voices #irssi,#libera
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 93c3f3ec..9f516730 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#freenode USERINFO I am bob :p
+    /NCTCP bob,#libera USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index fbdaa0b4..0542bd7d 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org liberachat
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' liberachat
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE Freenode
+    /NETWORK REMOVE liberachat
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index e96abfbb..f89769cc 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #freenode,#irssi
+    /PART #libera,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index 1c0ba5b9..a34f85e8 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -freenode bob
-    /QUERY -freenode -window sarah
+    /QUERY -liberachat bob
+    /QUERY -liberachat -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 63f52339..760c66cd 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD Freenode/mike utf-8
+    /RECODE ADD liberachat/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index aa1dc946..87beb95a 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT Freenode
+    /RECONNECT liberachat
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index beb75114..f7d907f3 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT chat.freenode.net
-    /SERVER CONNECT +chat.freenode.net
-    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
-    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
-    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
-    /SERVER REMOVE orwell.freenode.net 6667 Freenode
+    /SERVER CONNECT irc.libera.chat
+    /SERVER CONNECT +irc.libera.chat
+    /SERVER ADD -network liberachat -noautosendcmd irc.libera.chat
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network liberachat -noproxy irc.libera.chat 6667
+    /SERVER MODIFY -network liberachat -noauto irc.libera.chat
+    /SERVER MODIFY -network liberachat irc.libera.chat 6697 -
+    /SERVER REMOVE irc.libera.chat 6667 liberachat
     /SERVER PURGE
-    /SERVER PURGE orwell.freenode.net
+    /SERVER PURGE irc.libera.chat
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 0f24ffe3..5f0eac51 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" liberachat
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 224d24e3..172770e8 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
+  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 liberachat=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 48f6e6df..b0c68f1f 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT Freenode
+<div><div><pre><code>/CONNECT liberachat
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 61de27e3..bff33108 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT Freenode
+/CONNECT liberachat
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index 80c2b9c3..7a471b73 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -2,7 +2,7 @@ servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
   { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
   { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.libera.chat";   chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
   { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
@@ -34,7 +34,7 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  Freenode = {
+  liberachat = {
     type      = "IRC";
     max_kicks = "1";
     max_msgs  = "4";
@@ -95,8 +95,8 @@ chatnets = {
 
 channels = (
   { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#libera";    chatnet = "liberachat";autojoin = "No"; },
+  { name = "#irssi";     chatnet = "liberachat";autojoin = "No"; },
   { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
   { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
   { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },

From 700ec4c472dd415536a29ffe1509473d6cc588e9 Mon Sep 17 00:00:00 2001
From: ffrogman <ffrogman@gmail.com>
Date: Tue, 25 May 2021 23:37:36 -0400
Subject: [PATCH 1256/1650] Fix cursor getting stuck for auto completions that
 exclusively change the case of letters

---
 src/fe-common/core/completion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 06ac124c..e2c4d2a9 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -104,7 +104,7 @@ char *auto_word_complete(const char *line, int *pos)
 
 	/* check for words in autocompletion list */
 	replace = completion_find(word, TRUE);
-	if (replace == NULL) {
+	if (replace == NULL || (!g_strcmp0(replace, word))) {
 		ret = NULL;
 		g_string_free(result, TRUE);
 	} else {

From a4486c236a3bf15192d0500b3a1892f7465826c7 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Wed, 26 May 2021 09:24:32 +0300
Subject: [PATCH 1257/1650] Irssi does not take a political stance.

---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 ++++----
 docs/help/in/connect.in    |  6 +++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 ++++----
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 +++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 ++--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 ++++++++--------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 ++--
 docs/startup-HOWTO.txt     |  4 ++--
 irssi.conf                 |  8 ++++----
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index d1232764..08be65b4 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
+[#irssi](https://irssi.org/support/irc/) on freenode.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index acb6e1ae..2b6f8b73 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN irc.libera.chat
+    /ADMIN orwell.freenode.net
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index d9be8cf5..86e824c2 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi liberachat
+    /CHANNEL ADD -auto #irssi Freenode
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout liberachat
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi liberachat
-    /CHANNEL REMOVE #hideout liberachat
+    /CHANNEL MODIFY -noauto #irssi Freenode
+    /CHANNEL REMOVE #hideout Freenode
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index d4375eec..e861ad74 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT liberachat
-    /CONNECT -6 liberachat
-    /CONNECT -4 -! -host staff.irssi.org -network liberachat irc.libera.chat
+    /CONNECT Freenode
+    /CONNECT -6 Freenode
+    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index c53b1e60..bd4a4e17 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT liberachat I'm off for today, take care!
+    /DISCONNECT Freenode I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index d8d8cfc9..275f349d 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO irc.libera.chat
+    /INFO orwell.freenode.net
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index adf7158e..39fa23f8 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -liberachat #github,#libera,#irssi
+    /JOIN -freenode #github,#freenode,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index ce8f9aa0..bb554d55 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #libera
+    /KNOCK #freenode
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index 3ca8782c..e4743d46 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index 6e86681e..e33a1c75 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD irc.libera.chat
+    /MOTD orwel.freenode.org
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index 974b845f..8fd8cf91 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#libera
+    /NAMES -voices #irssi,#freenode
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 9f516730..93c3f3ec 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#libera USERINFO I am bob :p
+    /NCTCP bob,#freenode USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 0542bd7d..fbdaa0b4 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org liberachat
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' liberachat
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE liberachat
+    /NETWORK REMOVE Freenode
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index f89769cc..e96abfbb 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #libera,#irssi
+    /PART #freenode,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index a34f85e8..1c0ba5b9 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -liberachat bob
-    /QUERY -liberachat -window sarah
+    /QUERY -freenode bob
+    /QUERY -freenode -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 760c66cd..63f52339 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD liberachat/mike utf-8
+    /RECODE ADD Freenode/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index 87beb95a..aa1dc946 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT liberachat
+    /RECONNECT Freenode
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index f7d907f3..beb75114 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT irc.libera.chat
-    /SERVER CONNECT +irc.libera.chat
-    /SERVER ADD -network liberachat -noautosendcmd irc.libera.chat
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network liberachat -noproxy irc.libera.chat 6667
-    /SERVER MODIFY -network liberachat -noauto irc.libera.chat
-    /SERVER MODIFY -network liberachat irc.libera.chat 6697 -
-    /SERVER REMOVE irc.libera.chat 6667 liberachat
+    /SERVER CONNECT chat.freenode.net
+    /SERVER CONNECT +chat.freenode.net
+    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
+    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
+    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
+    /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
-    /SERVER PURGE irc.libera.chat
+    /SERVER PURGE orwell.freenode.net
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 5f0eac51..0f24ffe3 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" liberachat
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 172770e8..224d24e3 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 liberachat=2779
+  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index b0c68f1f..48f6e6df 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT liberachat
+<div><div><pre><code>/CONNECT Freenode
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index bff33108..61de27e3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT liberachat
+/CONNECT Freenode
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index 21c3ba4c..edaeb3f5 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -2,7 +2,7 @@ servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
   { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
   { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.libera.chat";   chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
   { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
@@ -34,7 +34,7 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  liberachat = {
+  Freenode = {
     type      = "IRC";
     max_kicks = "1";
     max_msgs  = "4";
@@ -95,8 +95,8 @@ chatnets = {
 
 channels = (
   { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#libera";    chatnet = "liberachat";autojoin = "No"; },
-  { name = "#irssi";     chatnet = "liberachat";autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
   { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
   { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
   { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },

From 1773fa8d191c9f1dcc7c1e59dbcdf31c1263c918 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Thu, 27 May 2021 20:47:09 +0300
Subject: [PATCH 1258/1650] Applied the updated docs changes in line with the
 upcoming blog post.

---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 +++---
 docs/help/in/connect.in    |  6 ++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 +++---
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 ++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 +--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 +++++------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 +--
 docs/startup-HOWTO.txt     |  4 +--
 irssi.conf                 | 54 ++++++++++++++++++++++----------------
 23 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/README.md b/README.md
index 08be65b4..d229391a 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on freenode.
+[#irssi](https://irssi.org/support/irc/) on irc.example.com.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index 2b6f8b73..cfe66eba 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN orwell.freenode.net
+    /ADMIN irc.example.com
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 86e824c2..0e15b6d5 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi Freenode
+    /CHANNEL ADD -auto #irssi ExampleNet
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout ExampleNet
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi Freenode
-    /CHANNEL REMOVE #hideout Freenode
+    /CHANNEL MODIFY -noauto #irssi ExampleNet
+    /CHANNEL REMOVE #hideout ExampleNet
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index e861ad74..4d59dde1 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT Freenode
-    /CONNECT -6 Freenode
-    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
+    /CONNECT ExampleNet
+    /CONNECT -6 ExampleNet
+    /CONNECT -4 -! -host staff.irssi.org -network ExampleNet irc.example.com
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index bd4a4e17..88772e1e 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT Freenode I'm off for today, take care!
+    /DISCONNECT ExampleNet I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index 275f349d..41578501 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO orwell.freenode.net
+    /INFO irc.example.com
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index 39fa23f8..55190267 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -freenode #github,#freenode,#irssi
+    /JOIN -ExampleNet #github,#example,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index bb554d55..3e2fdbdb 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #freenode
+    /KNOCK #example
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index e4743d46..dfe26e30 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index e33a1c75..ee1233b2 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD orwel.freenode.org
+    /MOTD irc.example.com
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index 8fd8cf91..deccea40 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#freenode
+    /NAMES -voices #irssi,#example
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 93c3f3ec..68d789d6 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#freenode USERINFO I am bob :p
+    /NCTCP bob,#example USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index fbdaa0b4..183fd5b5 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org ExampleNet
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' ExampleNet
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE Freenode
+    /NETWORK REMOVE ExampleNet
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index e96abfbb..51be59bd 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #freenode,#irssi
+    /PART #example,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index 1c0ba5b9..85f2556e 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -freenode bob
-    /QUERY -freenode -window sarah
+    /QUERY -ExampleNet bob
+    /QUERY -ExampleNet -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 63f52339..c34822de 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD Freenode/mike utf-8
+    /RECODE ADD ExampleNet/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index aa1dc946..f2148c90 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT Freenode
+    /RECONNECT ExampleNet
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index beb75114..8a4d8887 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT chat.freenode.net
-    /SERVER CONNECT +chat.freenode.net
-    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
-    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
-    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
-    /SERVER REMOVE orwell.freenode.net 6667 Freenode
+    /SERVER CONNECT irc.example.com
+    /SERVER CONNECT +irc.example.com
+    /SERVER ADD -network ExampleNet -noautosendcmd irc.example.com
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network ExampleNet -noproxy irc.example.com 6667
+    /SERVER MODIFY -network ExampleNet -noauto irc.example.com
+    /SERVER MODIFY -network ExampleNet irc.example.com 6697 -
+    /SERVER REMOVE irc.example.com 6667 ExampleNet
     /SERVER PURGE
-    /SERVER PURGE orwell.freenode.net
+    /SERVER PURGE irc.example.com
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 0f24ffe3..29065feb 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" ExampleNet
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 224d24e3..9ed7ecdb 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
+  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 ExampleNet=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 48f6e6df..ecbeb467 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT Freenode
+<div><div><pre><code>/CONNECT ExampleNet
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 61de27e3..84397f33 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT Freenode
+/CONNECT LiberaChat
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index edaeb3f5..9faa8973 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,18 +1,19 @@
 servers = (
-  { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
-  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
-  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
-  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
-  { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
-  { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
-  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.quakenet.org";  chatnet = "QuakeNet";  port = "6667"; },
-  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "silc.silcnet.org";  chatnet = "SILC";      port = "706";  },
-  { address = "irc.undernet.org";  chatnet = "Undernet";  port = "6667"; }
+  { address = "irc.dal.net";       chatnet = "DALnet";     port = "6667"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";      port = "9999"; use_tls = "yes"; tls_verify = "no"; },
+  { address = "irc.esper.net";     chatnet = "EsperNet";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.gamesurge.net"; chatnet = "GameSurge";  port = "6667"; },
+  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "open.ircnet.net";   chatnet = "IRCnet";     port = "6667"; },
+  { address = "irc.ircsource.net"; chatnet = "IRCSource";  port = "6667"; },
+  { address = "irc.libera.chat";   chatnet = "LiberaChat"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.netfuze.net";   chatnet = "NetFuze";    port = "6667"; },
+  { address = "irc.oftc.net";      chatnet = "OFTC";       port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.quakenet.org";  chatnet = "QuakeNet";   port = "6667"; },
+  { address = "irc.rizon.net";     chatnet = "Rizon";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "silc.silcnet.org";  chatnet = "SILC";       port = "706";  },
+  { address = "irc.undernet.org";  chatnet = "Undernet";   port = "6667"; }
 );
 
 chatnets = {
@@ -58,6 +59,12 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
+  LiberaChat = {
+    type      = "IRC";
+    max_kicks = "1";
+    max_msgs  = "4";
+    max_whois = "1";
+  };
   NetFuze = {
     type      = "IRC";
     max_kicks = "1";
@@ -94,15 +101,16 @@ chatnets = {
 };
 
 channels = (
-  { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
-  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
-  { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
-  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
-  { name = "#netfuze";   chatnet = "NetFuze";   autojoin = "No"; },
-  { name = "#oftc";      chatnet = "OFTC";      autojoin = "No"; },
-  { name = "silc";       chatnet = "SILC";      autojoin = "No"; }
+  { name = "#lobby";     chatnet = "EsperNet";   autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";   autojoin = "No"; },
+  { name = "#gamesurge"; chatnet = "GameSurge";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "IRCNet";     autojoin = "No"; },
+  { name = "#ircsource"; chatnet = "IRCSource";  autojoin = "No"; },
+  { name = "#libera";    chatnet = "LiberaChat"; autojoin = "No"; },
+  { name = "#irssi";     chatnet = "LiberaChat"; autojoin = "No"; },
+  { name = "#netfuze";   chatnet = "NetFuze";    autojoin = "No"; },
+  { name = "#oftc";      chatnet = "OFTC";       autojoin = "No"; },
+  { name = "silc";       chatnet = "SILC";       autojoin = "No"; }
 );
 
 aliases = {

From a5d4fd5aa7ad1d57c0b8e11e382944a3654cfa00 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Thu, 27 May 2021 20:50:38 +0300
Subject: [PATCH 1259/1650] Changed the support channel to LiberaChat.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d229391a..d1232764 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.example.com.
+[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.

From f147589e528722859d604446b6496a992602f3a9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 28 Jul 2021 11:05:30 +0200
Subject: [PATCH 1260/1650] can do /server add -matrix -network
 my_matrix_network

By Andrej Kacian
---
 src/fe-common/core/fe-server.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index e0100618..468ac4e7 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -91,7 +91,9 @@ static SERVER_SETUP_REC *create_server_setup(GHashTable *optlist)
 	if (rec == NULL)
                 rec = chat_protocol_get_default();
 	else {
-		chatnet = g_hash_table_lookup(optlist, rec->chatnet);
+		chatnet = g_hash_table_lookup(optlist, "network");
+		if (chatnet == NULL && g_hash_table_lookup(optlist, rec->chatnet) != NULL)
+			chatnet = rec->chatnet;
 		if (chatnet_find(chatnet) == NULL) {
 			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 				    TXT_UNKNOWN_CHATNET, chatnet);

From 6591c94635e4da69693cbe55dae747d970e6a52b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 14 Jan 2021 14:27:57 +0100
Subject: [PATCH 1261/1650] add a limit to showing /NAMES on join

only show the counts if too many nicks
---
 src/fe-common/core/fe-channels.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 8c914cb8..2d4e9ece 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -107,9 +107,14 @@ static void signal_window_item_changed(WINDOW_REC *window, WI_ITEM_REC *item)
 
 static void sig_channel_joined(CHANNEL_REC *channel)
 {
-	if (settings_get_bool("show_names_on_join") &&
-	    !channel->session_rejoin)
-		fe_channels_nicklist(channel, CHANNEL_NICKLIST_FLAG_ALL);
+	if (settings_get_bool("show_names_on_join") && !channel->session_rejoin) {
+		int limit = settings_get_int("show_names_on_join_limit");
+		int flags = CHANNEL_NICKLIST_FLAG_ALL;
+		if (limit > 0 && g_hash_table_size(channel->nicks) > limit) {
+			flags |= CHANNEL_NICKLIST_FLAG_COUNT;
+		}
+		fe_channels_nicklist(channel, flags);
+	}
 }
 
 /* SYNTAX: JOIN [-window] [-invite] [-<server tag>] <channels> [<keys>] */
@@ -625,6 +630,7 @@ void fe_channels_init(void)
 {
 	settings_add_bool("lookandfeel", "autoclose_windows", TRUE);
 	settings_add_bool("lookandfeel", "show_names_on_join", TRUE);
+	settings_add_int("lookandfeel", "show_names_on_join_limit", 18);
 	settings_add_int("lookandfeel", "names_max_columns", 6);
 	settings_add_int("lookandfeel", "names_max_width", 0);
 

From aecf0870143d9dc3530a9e6cc8b64928178d7794 Mon Sep 17 00:00:00 2001
From: Guntbert Reiter <guntbert@gmx.at>
Date: Sun, 30 May 2021 21:11:10 +0200
Subject: [PATCH 1262/1650] Add documentation for  escaping some characters

this is especially important when using `sendcmd` to send a password for autologin
---
 docs/help/in/eval.in    | 6 ++++++
 docs/help/in/network.in | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/help/in/eval.in b/docs/help/in/eval.in
index b2d4b625..b0c904b4 100644
--- a/docs/help/in/eval.in
+++ b/docs/help/in/eval.in
@@ -11,11 +11,17 @@
 
     Evaluates the given commands and executes them; you can use internal
     variables and separate multiple commands by using the ';' character.
+    If the command contains a string with '$', '\' or ';' those characters 
+    need to be escaped:
+        '$' -> '$$'
+        '\' -> '\\' (or even '\\\\', depending on where they are used)
+        ';' -> '\;'
 
 %9Examples:%9
 
     /EVAL echo I am connected to ${S} on ${chatnet} as ${N}
     /EVAL echo My user privileges are +${usermode}; echo Let's party!
+    to print '1;2$3\4': /EVAL echo 1\;2$$3\\4       
 
 %9References:%9
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 0542bd7d..788c1c65 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -18,7 +18,8 @@
     -usermode:       Specifies the user modes to set on yourself.
     -autosendcmd:    Specifies the commands, separated by the ';' character,
                      and enclosed within two "'" characters, to perform after
-                     connecting.
+                     connecting. 
+                     (Some characters need to be escaped - see /help eval)
     -querychans:     Specifies the maximum number of channels to put in one MODE
                      or WHO command when synchronizing.
     -whois:          Specifies the maximum number of nicknames in one WHOIS

From 77741b187ca72ffef747eff3f36903bb1afbba21 Mon Sep 17 00:00:00 2001
From: Francis M <francism@destinatech.com>
Date: Tue, 22 Jun 2021 16:10:55 +0100
Subject: [PATCH 1263/1650] Fix minor typos in help text

---
 docs/help/in/otr.in    | 2 +-
 docs/help/in/window.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/otr.in b/docs/help/in/otr.in
index f76a2d53..fcfcd875 100644
--- a/docs/help/in/otr.in
+++ b/docs/help/in/otr.in
@@ -51,7 +51,7 @@ GENKEY <name>
 
     This process is done in a background worker and can take an arbitrary
     amount of time. The completion is checked when another irssi event is
-    catched.
+    caught.
 
 HELP
     Print this help.
diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index aa133766..9a7a7b10 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -33,12 +33,12 @@
     THEME:        %|Applies or removes a per-window theme.
     GROW:         %|Increase the size of the active split window by the specified number of lines.
     SHRINK:       %|Decrease the size of the active split window by the specified number of lines.
-    SIZE:         %|Set the current split window size to the specified numer of lines.
+    SIZE:         %|Set the current split window size to the specified number of lines.
     BALANCE:      %|Balance the heights of all split windows.
     HIDE:         %|Hides the current split window, or the split window specified by number or item name.
     SHOW:         %|Show the window specified by number or item name as a new split windows. It is made sticky when autostick_split_windows is turned on.
     UP:           %|Set the split window left or above the current one active. At the top, wraps to the bottom.
-    DOWN:         %|Set the split window right or below the current one active. At the bottom, wraps teft.
+    DOWN:         %|Set the split window right or below the current one active. At the bottom, wraps left.
     LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
     RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
     STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.

From d2062e34cf0e74faffb725928809837807ca67b9 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Wed, 23 Jun 2021 20:56:05 +0200
Subject: [PATCH 1264/1650] Update fe-common-core.c

---
 src/fe-common/core/fe-common-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 63df1698..e981db33 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -500,7 +500,8 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 			str += server_tag_len + 1;
 		}
 
-		if (g_strcmp0(str, "") == 0 || g_strcmp0(str, "::all") == 0) {
+		if (g_strcmp0(str, "") == 0 || g_strcmp0(str, "*") == 0	||
+		    g_strcmp0(str, "::all") == 0) {
 			return TRUE;
 		} else if (g_ascii_strcasecmp(str, dest->target) == 0) {
 			return TRUE;

From 3aeebd310db1c026d90bb05c4f8e7d1ae9ffe544 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Wed, 23 Jun 2021 21:07:31 +0200
Subject: [PATCH 1265/1650] Update fe-common-core.c

---
 src/fe-common/core/fe-common-core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index e981db33..1fcd5df1 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -500,8 +500,7 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
 			str += server_tag_len + 1;
 		}
 
-		if (g_strcmp0(str, "") == 0 || g_strcmp0(str, "*") == 0	||
-		    g_strcmp0(str, "::all") == 0) {
+		if (g_strcmp0(str, "*") == 0 || g_strcmp0(str, "::all") == 0) {
 			return TRUE;
 		} else if (g_ascii_strcasecmp(str, dest->target) == 0) {
 			return TRUE;

From 554a8556d27c66917ed274a76d8ba47bdc7ba13a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 12 Aug 2021 23:46:31 +0200
Subject: [PATCH 1266/1650] fix use of wrong "equal" function in meta hash
 tables

---
 src/core/servers.c               | 2 +-
 src/fe-text/textbuffer-formats.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index 159af0e1..30fc6844 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -369,7 +369,7 @@ void server_connect_init(SERVER_REC *server)
 	server->type = module_get_uniq_id("SERVER", 0);
 	server_ref(server);
 	server->current_incoming_meta =
-	    g_hash_table_new_full(g_str_hash, (GEqualFunc) g_strcmp0,
+	    g_hash_table_new_full(g_str_hash, (GEqualFunc) g_str_equal,
 	                          (GDestroyNotify) i_refstr_release, (GDestroyNotify) g_free);
 
 	server->nick = g_strdup(server->connrec->nick);
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 2aa06cb2..2cd0d4a3 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -116,7 +116,7 @@ void textbuffer_meta_rec_free(TEXT_BUFFER_META_REC *rec)
 static void meta_hash_create(struct _TEXT_BUFFER_META_REC *meta)
 {
 	if (meta->hash == NULL) {
-		meta->hash = g_hash_table_new_full(g_str_hash, (GEqualFunc) g_strcmp0,
+		meta->hash = g_hash_table_new_full(g_str_hash, (GEqualFunc) g_str_equal,
 		                                   (GDestroyNotify) i_refstr_release,
 		                                   (GDestroyNotify) g_free);
 	}

From 7d13cfba074b7dc849f095a3281952ee38518a92 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 12 Aug 2021 23:48:37 +0200
Subject: [PATCH 1267/1650] add a meta table to all lines

---
 src/fe-common/core/formats.c | 32 +++++++++++++++++++++++++++++++-
 src/fe-common/core/formats.h | 12 ++++++++----
 src/perl/ui/Formats.xs       | 19 +++++++++++++++++++
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 51588afb..b660b616 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -34,6 +34,7 @@
 #include <irssi/src/core/recode.h>
 #include <irssi/src/core/utf8.h>
 #include <irssi/src/core/misc.h>
+#include <irssi/src/core/refstrings.h>
 
 static const char *format_backs = "04261537";
 static const char *format_fores = "kbgcrmyw";
@@ -46,6 +47,8 @@ static int hide_text_style, hide_server_tags, hide_colors;
 static int timestamp_level;
 static int timestamp_timeout;
 
+static GHashTable *global_meta;
+
 int format_find_tag(const char *module, const char *tag)
 {
 	FORMAT_REC *formats;
@@ -453,6 +456,27 @@ void format_read_arglist(va_list va, FORMAT_REC *format,
 	}
 }
 
+void format_dest_meta_stash(TEXT_DEST_REC *dest, const char *meta_key, const char *meta_value)
+{
+	g_hash_table_replace(dest->meta, i_refstr_intern(meta_key), g_strdup(meta_value));
+}
+
+const char *format_dest_meta_stash_find(TEXT_DEST_REC *dest, const char *meta_key)
+{
+	return g_hash_table_lookup(dest->meta, meta_key);
+}
+
+void format_dest_meta_clear_all(TEXT_DEST_REC *dest)
+{
+	g_hash_table_remove_all(dest->meta);
+}
+
+static void clear_global_meta(WINDOW_REC *window, TEXT_DEST_REC *dest)
+{
+	if (dest != NULL && dest->meta == global_meta)
+		g_hash_table_remove_all(global_meta);
+}
+
 void format_create_dest_tag_meta(TEXT_DEST_REC *dest, void *server, const char *server_tag,
                                  const char *target, int level, WINDOW_REC *window,
                                  GHashTable *meta)
@@ -465,7 +489,7 @@ void format_create_dest_tag_meta(TEXT_DEST_REC *dest, void *server, const char *
 	dest->level = level;
 	dest->window = window != NULL ? window :
 		window_find_closest(server, target, level);
-	dest->meta = meta;
+	dest->meta = meta != NULL ? meta : global_meta;
 }
 
 void format_create_dest_tag(TEXT_DEST_REC *dest, void *server, const char *server_tag,
@@ -1705,12 +1729,18 @@ static void read_settings(void)
 void formats_init(void)
 {
 	signal_gui_print_text = signal_get_uniq_id("gui print text");
+	global_meta =
+	    g_hash_table_new_full(g_str_hash, (GEqualFunc) g_str_equal,
+	                          (GDestroyNotify) i_refstr_release, (GDestroyNotify) g_free);
 
 	read_settings();
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_add_last("gui print text finished", (SIGNAL_FUNC) clear_global_meta);
 }
 
 void formats_deinit(void)
 {
+	g_hash_table_destroy(global_meta);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_remove("gui print text finished", (SIGNAL_FUNC) clear_global_meta);
 }
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 12274638..c17bcc75 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -63,7 +63,7 @@ typedef struct _TEXT_DEST_REC {
 
 	int hilight_priority;
 	char *hilight_color;
-        int flags;
+	int flags; /* PRINT_FLAG */
 	GHashTable *meta;
 } TEXT_DEST_REC;
 
@@ -116,12 +116,16 @@ char *format_get_line_start(THEME_REC *theme, TEXT_DEST_REC *dest, time_t t);
 void format_create_dest(TEXT_DEST_REC *dest,
 			void *server, const char *target,
 			int level, WINDOW_REC *window);
-void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
-			    const char *server_tag, const char *target,
-			    int level, WINDOW_REC *window);
+void format_create_dest_tag(TEXT_DEST_REC *dest, void *server, const char *server_tag,
+                            const char *target, int level, WINDOW_REC *window);
 
 void format_newline(TEXT_DEST_REC *dest);
 
+/* manipulate the meta table of a dest */
+void format_dest_meta_stash(TEXT_DEST_REC *dest, const char *meta_key, const char *meta_value);
+const char *format_dest_meta_stash_find(TEXT_DEST_REC *dest, const char *meta_key);
+void format_dest_meta_clear_all(TEXT_DEST_REC *dest);
+
 /* Return how many characters in `str' must be skipped before `len'
    characters of text is skipped. */
 int strip_real_length(const char *str, int len,
diff --git a/src/perl/ui/Formats.xs b/src/perl/ui/Formats.xs
index c03e6bb5..0f8b59b7 100644
--- a/src/perl/ui/Formats.xs
+++ b/src/perl/ui/Formats.xs
@@ -156,3 +156,22 @@ print(dest, str)
 	char *str
 CODE:
 	printtext_dest(dest, "%s", str);
+
+#*******************************
+MODULE = Irssi::UI::Formats  PACKAGE = Irssi::UI::TextDest  PREFIX = format_dest_
+#*******************************
+
+void
+format_dest_meta_stash(dest, meta_key, meta_value)
+	Irssi::UI::TextDest dest
+	char *meta_key
+	char *meta_value
+
+char *
+format_dest_meta_stash_find(dest, meta_key)
+	Irssi::UI::TextDest dest
+	char *meta_key
+CODE:
+	RETVAL = (char *) format_dest_meta_stash_find(dest, meta_key);
+OUTPUT:
+	RETVAL

From 9677b07488b6b7b4ee7a425d8f2826669404d058 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 12 Aug 2021 23:49:40 +0200
Subject: [PATCH 1268/1650] fix wrong server_time in $line->get_meta

---
 src/perl/textui/TextBuffer.xs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index 6695eae0..301e2d4a 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -123,6 +123,8 @@ PPCODE:
 				(void) hv_store(hv, key, strlen(key), new_pv(val), 0);
 			}
 		}
-		(void) hv_store(hv, "server_time", 11, newSViv(m->server_time), 0);
+		if (m->server_time) {
+			(void) hv_store(hv, "server_time", 11, newSViv(m->server_time), 0);
+		}
 	}
 	XPUSHs(sv_2mortal(newRV_noinc((SV *) hv)));

From 8d314eadf1350619d481cc5729c7bd74eec85693 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 12 Aug 2021 23:51:18 +0200
Subject: [PATCH 1269/1650] move TEXT_BUFFER_META_REC -> LINE_INFO_META_REC

---
 src/fe-common/core/formats.h     |  5 +++++
 src/fe-text/textbuffer-formats.c | 12 ++++++------
 src/fe-text/textbuffer-formats.h |  8 ++------
 src/fe-text/textbuffer.h         |  2 +-
 src/perl/textui/TextBuffer.xs    |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index c17bcc75..5666c73b 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -67,6 +67,11 @@ typedef struct _TEXT_DEST_REC {
 	GHashTable *meta;
 } TEXT_DEST_REC;
 
+typedef struct _LINE_INFO_META_REC {
+	gint64 server_time;
+	GHashTable *hash;
+} LINE_INFO_META_REC;
+
 #define window_get_theme(window) \
 	(window != NULL && (window)->theme != NULL ? \
 	(window)->theme : current_theme)
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 2cd0d4a3..b194a18a 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -102,7 +102,7 @@ static void format_rec_set_dest(TEXT_BUFFER_FORMAT_REC *rec, const TEXT_DEST_REC
 	rec->flags = dest->flags & ~PRINT_FLAG_FORMAT;
 }
 
-void textbuffer_meta_rec_free(TEXT_BUFFER_META_REC *rec)
+void textbuffer_meta_rec_free(LINE_INFO_META_REC *rec)
 {
 	if (rec == NULL)
 		return;
@@ -113,7 +113,7 @@ void textbuffer_meta_rec_free(TEXT_BUFFER_META_REC *rec)
 	g_free(rec);
 }
 
-static void meta_hash_create(struct _TEXT_BUFFER_META_REC *meta)
+static void meta_hash_create(struct _LINE_INFO_META_REC *meta)
 {
 	if (meta->hash == NULL) {
 		meta->hash = g_hash_table_new_full(g_str_hash, (GEqualFunc) g_str_equal,
@@ -122,9 +122,9 @@ static void meta_hash_create(struct _TEXT_BUFFER_META_REC *meta)
 	}
 }
 
-static TEXT_BUFFER_META_REC *line_meta_create(GHashTable *meta_hash)
+static LINE_INFO_META_REC *line_meta_create(GHashTable *meta_hash)
 {
-	struct _TEXT_BUFFER_META_REC *meta;
+	struct _LINE_INFO_META_REC *meta;
 	GHashTableIter iter;
 	const char *key;
 	const char *val;
@@ -132,7 +132,7 @@ static TEXT_BUFFER_META_REC *line_meta_create(GHashTable *meta_hash)
 	if (meta_hash == NULL || g_hash_table_size(meta_hash) == 0)
 		return NULL;
 
-	meta = g_new0(struct _TEXT_BUFFER_META_REC, 1);
+	meta = g_new0(struct _LINE_INFO_META_REC, 1);
 
 	g_hash_table_iter_init(&iter, meta_hash);
 	while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) {
@@ -362,7 +362,7 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line, gboolean
 		THEME_REC *theme;
 		int formatnum;
 		TEXT_BUFFER_FORMAT_REC *format_rec;
-		TEXT_BUFFER_META_REC *meta;
+		LINE_INFO_META_REC *meta;
 		char *str;
 
 		curr = line;
diff --git a/src/fe-text/textbuffer-formats.h b/src/fe-text/textbuffer-formats.h
index 17a907c1..86587563 100644
--- a/src/fe-text/textbuffer-formats.h
+++ b/src/fe-text/textbuffer-formats.h
@@ -2,11 +2,7 @@
 #define IRSSI_FE_TEXT_TEXTBUFFER_FORMATS_H
 
 #include <irssi/src/fe-text/textbuffer.h>
-
-typedef struct _TEXT_BUFFER_META_REC {
-	gint64 server_time;
-	GHashTable *hash;
-} TEXT_BUFFER_META_REC;
+#include <irssi/src/fe-common/core/formats.h>
 
 typedef struct _TEXT_BUFFER_FORMAT_REC {
 	char *module;
@@ -22,7 +18,7 @@ typedef struct _TEXT_BUFFER_FORMAT_REC {
 } TEXT_BUFFER_FORMAT_REC;
 
 void textbuffer_format_rec_free(TEXT_BUFFER_FORMAT_REC *rec);
-void textbuffer_meta_rec_free(TEXT_BUFFER_META_REC *rec);
+void textbuffer_meta_rec_free(LINE_INFO_META_REC *rec);
 char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line, gboolean raw);
 void textbuffer_formats_init(void);
 void textbuffer_formats_deinit(void);
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index 5f5f9a27..6c72a569 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -24,7 +24,7 @@ typedef struct {
 	int level;
 	time_t time;
 	char *text;
-	struct _TEXT_BUFFER_META_REC *meta;
+	struct _LINE_INFO_META_REC *meta;
 	struct _TEXT_BUFFER_FORMAT_REC *format;
 } LINE_INFO_REC;
 
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index 301e2d4a..be83cc59 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -107,7 +107,7 @@ textbuffer_line_get_meta(line)
 PREINIT:
 	HV *hv;
 	LINE_REC *l;
-	TEXT_BUFFER_META_REC *m;
+	LINE_INFO_META_REC *m;
 	GHashTableIter iter;
 	char *key;
 	char *val;

From 5953b675b9411a87d111ea82ecd7c0876de3f186 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 12 Aug 2021 23:53:44 +0200
Subject: [PATCH 1270/1650] store the hilight result in the meta table and
 apply it during the "gui render line text" signal

---
 src/fe-common/core/hilight-text.c | 98 +++++++++++++++++++++++++++----
 src/fe-text/textbuffer-formats.c  | 28 ++++++---
 2 files changed, 108 insertions(+), 18 deletions(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 153a7a15..4b5e4edd 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -323,6 +323,71 @@ void hilight_update_text_dest(TEXT_DEST_REC *dest, HILIGHT_REC *rec)
 
 static void hilight_print(int index, HILIGHT_REC *rec);
 
+static void sig_render_line_text(TEXT_DEST_REC *dest, GString *str, LINE_INFO_META_REC *meta)
+{
+	char *color, *tmp, *tmp2;
+
+	if (meta == NULL || meta->hash == NULL)
+		return;
+
+	color = g_hash_table_lookup(meta->hash, "hilight-color");
+
+	if ((tmp = g_hash_table_lookup(meta->hash, "hilight-line")) != NULL) {
+		/* hilight whole line */
+
+		tmp = strip_codes(str->str);
+
+		color = format_string_expand(
+		    color != NULL ? color : settings_get_str("hilight_color"), NULL);
+
+		g_string_truncate(str, 0);
+		g_string_append(str, color);
+		g_string_append(str, tmp);
+
+		g_free(color);
+		g_free(tmp);
+	} else if ((tmp = g_hash_table_lookup(meta->hash, "hilight-start")) != NULL &&
+	           (tmp2 = g_hash_table_lookup(meta->hash, "hilight-end")) != NULL) {
+		/* hilight part of the line */
+		int hilight_start, hilight_end;
+		int pos, color_pos, color_len;
+		char *middle;
+		GString *str2;
+
+		hilight_start = atoi(tmp);
+		hilight_end = atoi(tmp2);
+
+		/* start of the line */
+		pos = strip_real_length(str->str, hilight_start, NULL, NULL);
+
+		str2 = g_string_new_len(str->str, pos);
+
+		/* color */
+		color = format_string_expand(
+		    color != NULL ? color : settings_get_str("hilight_color"), NULL);
+		g_string_append(str2, color);
+		g_free(color);
+
+		/* middle of the line, stripped */
+		middle = strip_codes(str->str + pos);
+		g_string_append_len(str2, middle, hilight_end - hilight_start);
+		g_free(middle);
+
+		/* end of the line */
+		pos = strip_real_length(str->str, hilight_end, &color_pos, &color_len);
+		if (color_pos > 0) {
+			g_string_append_len(str2, str->str + color_pos, color_len);
+		} else {
+			/* no colors in line, change back to default */
+			g_string_append_c(str2, 4);
+			g_string_append_c(str2, FORMAT_STYLE_DEFAULTS);
+		}
+		g_string_append(str2, str->str + pos);
+
+		g_string_assign(str, g_string_free(str2, FALSE));
+	}
+}
+
 static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 			   const char *stripped)
 {
@@ -372,38 +437,47 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 		char *tmp = strip_codes(text);
 		newstr = g_strconcat(color, tmp, NULL);
 		g_free(tmp);
+
+		format_dest_meta_stash(dest, "hilight-line", "\001");
 	} else {
 		/* hilight part of the line */
-		GString *tmp;
-		char *middle;
+		GString *str;
+		char *middle, *tmp;
 		int pos, color_pos, color_len;
 
 		/* start of the line */
 		pos = strip_real_length(text, hilight_start, NULL, NULL);
-		tmp = g_string_new_len(text, pos);
+		str = g_string_new_len(text, pos);
 
 		/* color */
-		g_string_append(tmp, color);
+		g_string_append(str, color);
 
 		/* middle of the line, stripped */
 		middle = strip_codes(text + pos);
-		g_string_append_len(tmp, middle, hilight_len);
+		g_string_append_len(str, middle, hilight_len);
 		g_free(middle);
 
 		/* end of the line */
 		pos = strip_real_length(text, hilight_end,
 					&color_pos, &color_len);
 		if (color_pos > 0) {
-			g_string_append_len(tmp, text + color_pos, color_len);
+			g_string_append_len(str, text + color_pos, color_len);
 		} else {
 			/* no colors in line, change back to default */
-			g_string_append_c(tmp, 4);
-			g_string_append_c(tmp, FORMAT_STYLE_DEFAULTS);
+			g_string_append_c(str, 4);
+			g_string_append_c(str, FORMAT_STYLE_DEFAULTS);
 		}
-		g_string_append(tmp, text + pos);
+		g_string_append(str, text + pos);
 
-		newstr = tmp->str;
-		g_string_free(tmp, FALSE);
+		newstr = str->str;
+		g_string_free(str, FALSE);
+
+		format_dest_meta_stash(dest, "hilight-start",
+		                       tmp = g_strdup_printf("%d", hilight_start));
+		g_free(tmp);
+		format_dest_meta_stash(dest, "hilight-end",
+		                       tmp = g_strdup_printf("%d", hilight_end));
+		g_free(tmp);
 	}
 
 	signal_emit("print text", 3, dest, newstr, stripped);
@@ -721,6 +795,7 @@ void hilight_text_init(void)
 	read_hilight_config();
 
 	signal_add_first("print text", (SIGNAL_FUNC) sig_print_text);
+	signal_add("gui render line text", (SIGNAL_FUNC) sig_render_line_text);
 	signal_add("setup reread", (SIGNAL_FUNC) read_hilight_config);
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 
@@ -735,6 +810,7 @@ void hilight_text_deinit(void)
 	nickmatch_deinit(nickmatch);
 
 	signal_remove("print text", (SIGNAL_FUNC) sig_print_text);
+	signal_remove("gui render line text", (SIGNAL_FUNC) sig_render_line_text);
 	signal_remove("setup reread", (SIGNAL_FUNC) read_hilight_config);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index b194a18a..5b15313f 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -16,6 +16,7 @@
 TEXT_BUFFER_REC *color_buf;
 gboolean scrollback_format;
 gboolean show_server_time;
+int signal_gui_render_line_text;
 
 #if GLIB_CHECK_VERSION(2, 56, 0)
 /* nothing */
@@ -363,7 +364,7 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line, gboolean
 		int formatnum;
 		TEXT_BUFFER_FORMAT_REC *format_rec;
 		LINE_INFO_META_REC *meta;
-		char *str;
+		char *tmp2;
 
 		curr = line;
 		line = NULL;
@@ -396,6 +397,8 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line, gboolean
 		}
 
 		if (text != NULL && *text != '\0') {
+			GString *str;
+
 			reference_time = curr->info.time;
 			if (show_server_time && meta != NULL && meta->server_time != 0) {
 				current_time = meta->server_time;
@@ -403,18 +406,27 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line, gboolean
 				current_time = curr->info.time;
 			}
 
+			str = g_string_new(text);
+			signal_emit_id(signal_gui_render_line_text, 3, &dest, str, meta);
+			if (g_strcmp0(text, str->str) == 0) {
+				g_string_free(str, TRUE);
+			} else {
+				g_free(text);
+				text = g_string_free(str, FALSE);
+			}
+
 			tmp = format_get_level_tag(theme, &dest);
-			str = !theme->info_eol ? format_add_linestart(text, tmp) :
-			                         format_add_lineend(text, tmp);
+			tmp2 = !theme->info_eol ? format_add_linestart(text, tmp) :
+                                                  format_add_lineend(text, tmp);
 			g_free_not_null(tmp);
 			g_free_not_null(text);
-			text = str;
+			text = tmp2;
 			tmp = format_get_line_start(theme, &dest, current_time);
-			str = !theme->info_eol ? format_add_linestart(text, tmp) :
-			                         format_add_lineend(text, tmp);
+			tmp2 = !theme->info_eol ? format_add_linestart(text, tmp) :
+                                                  format_add_lineend(text, tmp);
 			g_free_not_null(tmp);
 			g_free_not_null(text);
-			text = str;
+			text = tmp2;
 			/* str = g_strconcat(text, "\n", NULL); */
 			/* g_free(text); */
 
@@ -447,6 +459,8 @@ static void read_settings(void)
 
 void textbuffer_formats_init(void)
 {
+	signal_gui_render_line_text = signal_get_uniq_id("gui render line text");
+
 	settings_add_bool("lookandfeel", "scrollback_format", TRUE);
 	settings_add_bool("lookandfeel", "show_server_time", FALSE);
 

From 6a52b5ac07fe57ebd5973871db64b775e41a3f84 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 00:44:33 +0200
Subject: [PATCH 1271/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index bdbafca7..990cc0cf 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 36
+#define IRSSI_ABI_VERSION 37
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 1602b506a69d12f6d15014f1c6b246066e29e404 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 17:31:14 +0200
Subject: [PATCH 1272/1650] add LINE_INFO_META_REC to Perl

---
 src/perl/get-signals.pl       | 13 +++++++------
 src/perl/textui/TextBuffer.xs | 30 +++++-------------------------
 src/perl/ui/UI.xs             | 21 +++++++++++++++++++++
 src/perl/ui/module.h          |  1 +
 src/perl/ui/typemap           |  1 +
 5 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/perl/get-signals.pl b/src/perl/get-signals.pl
index 12aebdba..a76d7ecf 100755
--- a/src/perl/get-signals.pl
+++ b/src/perl/get-signals.pl
@@ -52,12 +52,13 @@ while (<>) {
 		CLIENT_REC     => 'Irssi::Irc::Client',
 
 		# fe-common
-		THEME_REC     => 'Irssi::UI::Theme',
-		KEYINFO_REC   => 'Irssi::UI::Keyinfo',
-		PROCESS_REC   => 'Irssi::UI::Process',
-		TEXT_DEST_REC => 'Irssi::UI::TextDest',
-		WINDOW_REC    => 'Irssi::UI::Window',
-		WI_ITEM_REC   => 'iobject',
+		THEME_REC	   => 'Irssi::UI::Theme',
+		KEYINFO_REC	   => 'Irssi::UI::Keyinfo',
+		PROCESS_REC	   => 'Irssi::UI::Process',
+		TEXT_DEST_REC	   => 'Irssi::UI::TextDest',
+		LINE_INFO_META_REC => 'Irssi::UI::LineInfoMeta',
+		WINDOW_REC	   => 'Irssi::UI::Window',
+		WI_ITEM_REC	   => 'iobject',
 
 		# fe-text
 		TEXTBUFFER_VIEW_REC => 'Irssi::TextUI::TextBufferView',
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index be83cc59..655dbd3c 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -101,30 +101,10 @@ PPCODE:
 	}
 	XPUSHs(sv_2mortal(newRV_noinc((SV *) hv)));
 
-void
+Irssi::UI::LineInfoMeta
 textbuffer_line_get_meta(line)
 	Irssi::TextUI::Line line
-PREINIT:
-	HV *hv;
-	LINE_REC *l;
-	LINE_INFO_META_REC *m;
-	GHashTableIter iter;
-	char *key;
-	char *val;
-PPCODE:
-	hv = newHV();
-	l = line->line;
-	if (l->info.meta != NULL) {
-		m = l->info.meta;
-		if (m->hash != NULL) {
-			g_hash_table_iter_init(&iter, m->hash);
-			while (
-			    g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) {
-				(void) hv_store(hv, key, strlen(key), new_pv(val), 0);
-			}
-		}
-		if (m->server_time) {
-			(void) hv_store(hv, "server_time", 11, newSViv(m->server_time), 0);
-		}
-	}
-	XPUSHs(sv_2mortal(newRV_noinc((SV *) hv)));
+CODE:
+	RETVAL = line->line->info.meta;
+OUTPUT:
+	RETVAL
diff --git a/src/perl/ui/UI.xs b/src/perl/ui/UI.xs
index 5ac3da4e..30b0f637 100644
--- a/src/perl/ui/UI.xs
+++ b/src/perl/ui/UI.xs
@@ -64,6 +64,26 @@ static void perl_text_dest_fill_hash(HV *hv, TEXT_DEST_REC *dest)
 	(void) hv_store(hv, "hilight_color", 13, new_pv(dest->hilight_color), 0);
 }
 
+static void perl_line_info_meta_fill_hash(HV *hv, LINE_INFO_META_REC *meta)
+{
+	GHashTableIter iter;
+	char *key;
+	char *val;
+
+	if (meta != NULL) {
+		if (meta->hash != NULL) {
+			g_hash_table_iter_init(&iter, meta->hash);
+			while (
+			    g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) {
+				(void) hv_store(hv, key, strlen(key), new_pv(val), 0);
+			}
+		}
+		if (meta->server_time) {
+			(void) hv_store(hv, "server_time", 11, newSViv(meta->server_time), 0);
+		}
+	}
+}
+
 static void perl_exec_fill_hash(HV *hv, EXEC_WI_REC *item)
 {
 	g_return_if_fail(hv != NULL);
@@ -81,6 +101,7 @@ static PLAIN_OBJECT_INIT_REC fe_plains[] = {
 	{ "Irssi::UI::Process", (PERL_OBJECT_FUNC) perl_process_fill_hash },
 	{ "Irssi::UI::Window", (PERL_OBJECT_FUNC) perl_window_fill_hash },
 	{ "Irssi::UI::TextDest", (PERL_OBJECT_FUNC) perl_text_dest_fill_hash },
+	{ "Irssi::UI::LineInfoMeta", (PERL_OBJECT_FUNC) perl_line_info_meta_fill_hash },
 
 	{ NULL, NULL }
 };
diff --git a/src/perl/ui/module.h b/src/perl/ui/module.h
index 4e19d4c0..4106aec4 100644
--- a/src/perl/ui/module.h
+++ b/src/perl/ui/module.h
@@ -12,3 +12,4 @@ typedef WINDOW_REC *Irssi__UI__Window;
 typedef TEXT_DEST_REC *Irssi__UI__TextDest;
 typedef THEME_REC *Irssi__UI__Theme;
 typedef KEYINFO_REC *Irssi__UI__Keyinfo;
+typedef LINE_INFO_META_REC *Irssi__UI__LineInfoMeta;
diff --git a/src/perl/ui/typemap b/src/perl/ui/typemap
index 2a16fe44..4afb273d 100644
--- a/src/perl/ui/typemap
+++ b/src/perl/ui/typemap
@@ -3,6 +3,7 @@ Irssi::UI::Theme		T_PlainObj
 Irssi::UI::Window		T_PlainObj
 Irssi::UI::Keyinfo		T_PlainObj
 Irssi::UI::TextDest		T_PlainObj
+Irssi::UI::LineInfoMeta		T_PlainObj
 
 INPUT
 

From 425178e793f03dfaa3b42f4999f3b04eaad48732 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 17:31:49 +0200
Subject: [PATCH 1273/1650] add GString to Perl

---
 src/perl/get-signals.pl |  2 ++
 src/perl/perl-signals.c | 39 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/perl/get-signals.pl b/src/perl/get-signals.pl
index a76d7ecf..f7675f1b 100755
--- a/src/perl/get-signals.pl
+++ b/src/perl/get-signals.pl
@@ -19,6 +19,8 @@ while (<>) {
 	s/GList \* of ([^,]*)s/glistptr_\1/g;
 	s/GSList of ([^,]*)s/gslist_\1/g;
 
+	s/GString \*[^,]*/gstring/g;
+
 	s/char \*[^,]*/string/g;
 	s/ulong \*[^,]*/ulongptr/g;
 	s/int \*[^,]*/intptr/g;
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 9f49fba8..897689e1 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -86,7 +86,8 @@ void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg,
                 unsigned long v_ulong;
                 GSList *v_gslist;
                 GList *v_glist;
-        } saved_args[SIGNAL_MAX_ARGUMENTS];
+		GString *v_gstring;
+	} saved_args[SIGNAL_MAX_ARGUMENTS];
 	AV *aargs;
 	void *p[SIGNAL_MAX_ARGUMENTS];
 	PERL_SIGNAL_ARGS_REC *rec;
@@ -146,6 +147,12 @@ void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg,
 		} else if (g_strcmp0(rec->args[n], "intptr") == 0) {
 			saved_args[n].v_int = SvIV(SvRV(arg));
 			c_arg = &saved_args[n].v_int;
+		} else if (g_strcmp0(rec->args[n], "gstring") == 0) {
+			char *pv;
+			size_t len;
+
+			pv = SvPV(SvRV(arg), len);
+			c_arg = saved_args[n].v_gstring = g_string_new_len(pv, len);
 		} else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
 			GList *gl;
 			int is_str;
@@ -220,6 +227,16 @@ void perl_signal_args_to_c(void (*callback)(void *, int, void **), void *cb_arg,
 			SV *t = SvRV(arg);
 			SvIOK_only(t);
 			SvIV_set(t, saved_args[n].v_int);
+		} else if (g_strcmp0(rec->args[n], "gstring") == 0) {
+			GString *str;
+			SV *t;
+
+			str = saved_args[n].v_gstring;
+			t = SvRV(arg);
+			SvPOK_only(t);
+			sv_setpvn(t, str->str, str->len);
+
+			g_string_free(str, TRUE);
 		} else if (strncmp(rec->args[n], "gslist_", 7) == 0) {
 			g_slist_free(saved_args[n].v_gslist);
 		} else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
@@ -306,7 +323,10 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
                         perlarg = newSViv(*(unsigned long *) arg);
                 else if (g_strcmp0(rec->args[n], "intptr") == 0)
 			saved_args[n] = perlarg = newRV_noinc(newSViv(*(int *) arg));
-		else if (g_strcmp0(rec->args[n], "formatnum_args") == 0 && n >= 3) {
+		else if (g_strcmp0(rec->args[n], "gstring") == 0) {
+			GString *str = arg;
+			saved_args[n] = perlarg = newRV_noinc(newSVpvn(str->str, str->len));
+		} else if (g_strcmp0(rec->args[n], "formatnum_args") == 0 && n >= 3) {
 			const THEME_REC *theme;
 			const MODULE_THEME_REC *rec;
 			const FORMAT_REC *formats;
@@ -415,8 +435,21 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 		if (g_strcmp0(rec->args[n], "intptr") == 0) {
 			int *val = arg;
 			*val = SvIV(SvRV(saved_args[n]));
+		} else if (g_strcmp0(rec->args[n], "gstring") == 0) {
+			SV *os, *ns;
+			GString *str = arg;
+
+			os = sv_2mortal(newSVpvn(str->str, str->len));
+			ns = SvRV(saved_args[n]);
+			if (sv_cmp(os, ns) != 0) {
+				size_t len;
+				char *pv = SvPV(ns, len);
+
+				g_string_truncate(str, 0);
+				g_string_append_len(str, pv, len);
+			}
 		} else if (strncmp(rec->args[n], "glistptr_", 9) == 0) {
-                        GList **ret = arg;
+			GList **ret = arg;
 			GList *out = NULL;
                         void *val;
                         int count;

From ed23d89a5a69b324ed05b5f9bd8115c34ad4b7a9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 17:32:09 +0200
Subject: [PATCH 1274/1650] fix recursive crash in Perl scripts

---
 src/perl/perl-signals.c | 1 +
 src/perl/perl-sources.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 897689e1..683b4c3f 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -419,6 +419,7 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func,
 
 	if (SvTRUE(ERRSV)) {
 		char *error = g_strdup(SvPV_nolen(ERRSV));
+		perl_signal_remove_script(script);
 		signal_emit("script error", 2, script, error);
                 g_free(error);
                 rec = NULL;
diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c
index 9f5773f1..9f9ec6b5 100644
--- a/src/perl/perl-sources.c
+++ b/src/perl/perl-sources.c
@@ -83,6 +83,7 @@ static int perl_source_event(PERL_SOURCE_REC *rec)
 
 	if (SvTRUE(ERRSV)) {
                 char *error = g_strdup(SvPV_nolen(ERRSV));
+		perl_source_remove_script(rec->script);
 		signal_emit("script error", 2, rec->script, error);
                 g_free(error);
 	}

From 96e9ab41e9f353fc9612c27e3d61bc8ab978564d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 17:32:25 +0200
Subject: [PATCH 1275/1650] add "gui render line text" to signals.txt

---
 docs/signals.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/signals.txt b/docs/signals.txt
index 1eefc7e0..4e5f85b4 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -358,6 +358,9 @@ gui-printtext.c:
 textbuffer-view.c
  "gui textbuffer line removed", TEXTBUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line
 
+textbuffer-formats.c
+ "gui render line text", TEXT_DEST_REC, GString *str, LINE_INFO_META_REC
+
 Perl
 ----
 

From 5a8b23cab0f758f78c0dc495ce788d0c58b8a661 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 17:38:57 +0200
Subject: [PATCH 1276/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 990cc0cf..cc334476 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 37
+#define IRSSI_ABI_VERSION 38
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 0c82a3adfd48df33c971a74ff862d69e23e6909e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 15 Aug 2021 00:08:44 +0200
Subject: [PATCH 1277/1650] Workaround for google/oss-fuzz#3731

Run CIFuzz docker manually
---
 .github/workflows/cifuzz.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index a32e335d..6325d671 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -19,13 +19,23 @@ jobs:
       matrix:
         sanitizer: [address, undefined, memory]
     steps:
+    - uses: actions/checkout@main
+      with:
+        path: irssi
+    - name: Docker build build_fuzzers container
+      run: |
+        # google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+        docker build -t build_fuzzers:actions -f "/home/runner/work/_actions/google/oss-fuzz/master/infra/build_fuzzers.Dockerfile" "/home/runner/work/_actions/google/oss-fuzz/master/infra"
     - name: Build Fuzzers (${{ matrix.sanitizer }})
       id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'irssi'
-        dry-run: false
-        sanitizer: ${{ matrix.sanitizer }}
+      env:
+        OSS_FUZZ_PROJECT_NAME: 'irssi'
+        DRY_RUN: false
+        SANITIZER: ${{ matrix.sanitizer }}
+        PROJECT_SRC_PATH: /github/workspace/irssi
+        REPOSITORY: 'irssi'
+      run: |
+        docker run --workdir /github/workspace --rm -e OSS_FUZZ_PROJECT_NAME -e DRY_RUN -e SANITIZER -e PROJECT_SRC_PATH -e REPOSITORY -e WORKSPACE=/github/workspace -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$GITHUB_WORKSPACE":"/github/workspace" build_fuzzers:actions
     - name: Run Fuzzers (${{ matrix.sanitizer }})
       uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
       with:

From fdd61f5898c8a97b6a1088db717c16691d601d60 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 21:11:22 +0200
Subject: [PATCH 1278/1650] add a log_server_time setting

---
 src/core/log.c              | 14 +++++++-------
 src/core/log.h              |  6 +++---
 src/fe-common/core/fe-log.c | 33 ++++++++++++++++++++++++++-------
 src/perl/common/Log.xs      |  3 ++-
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/core/log.c b/src/core/log.c
index cb6f1edd..5bc953a1 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -204,11 +204,10 @@ static void log_rotate_check(LOG_REC *log)
 	g_free(new_fname);
 }
 
-void log_write_rec(LOG_REC *log, const char *str, int level)
+void log_write_rec(LOG_REC *log, const char *str, int level, time_t now)
 {
         char *colorstr;
 	struct tm *tm;
-	time_t now;
 	int hour, day;
 
 	g_return_if_fail(log != NULL);
@@ -217,7 +216,8 @@ void log_write_rec(LOG_REC *log, const char *str, int level)
 	if (log->handle == -1)
 		return;
 
-	now = time(NULL);
+	if (now == (time_t) -1)
+		now = time(NULL);
 	tm = localtime(&now);
 	hour = tm->tm_hour;
 	day = tm->tm_mday;
@@ -282,8 +282,8 @@ LOG_ITEM_REC *log_item_find(LOG_REC *log, int type, const char *item,
 	return NULL;
 }
 
-void log_file_write(const char *server_tag, const char *item, int level,
-		    const char *str, int no_fallbacks)
+void log_file_write(const char *server_tag, const char *item, int level, time_t t, const char *str,
+                    int no_fallbacks)
 {
 	GSList *tmp, *fallbacks;
 	char *tmpstr;
@@ -309,7 +309,7 @@ void log_file_write(const char *server_tag, const char *item, int level,
 			fallbacks = g_slist_append(fallbacks, rec);
 		else if (log_item_find(rec, LOG_ITEM_TARGET, item,
 				       server_tag) != NULL)
-			log_write_rec(rec, str, level);
+			log_write_rec(rec, str, level, t);
 	}
 
 	if (!found && !no_fallbacks && fallbacks != NULL) {
@@ -319,7 +319,7 @@ void log_file_write(const char *server_tag, const char *item, int level,
 			g_strdup(str);
 
 		for (tmp = fallbacks; tmp != NULL; tmp = tmp->next)
-                        log_write_rec(tmp->data, tmpstr, level);
+			log_write_rec(tmp->data, tmpstr, level, t);
 
 		g_free(tmpstr);
 	}
diff --git a/src/core/log.h b/src/core/log.h
index 1c529670..19bca4f3 100644
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -51,9 +51,9 @@ void log_item_destroy(LOG_REC *log, LOG_ITEM_REC *item);
 LOG_ITEM_REC *log_item_find(LOG_REC *log, int type, const char *item,
 			    const char *servertag);
 
-void log_file_write(const char *server_tag, const char *item, int level,
-		    const char *str, int no_fallbacks);
-void log_write_rec(LOG_REC *log, const char *str, int level);
+void log_file_write(const char *server_tag, const char *item, int level, time_t t, const char *str,
+                    int no_fallbacks);
+void log_write_rec(LOG_REC *log, const char *str, int level, time_t now);
 
 int log_start_logging(LOG_REC *log);
 void log_stop_logging(LOG_REC *log);
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index b5222059..984b3548 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -48,6 +48,7 @@
 #define AUTOLOG_INACTIVITY_CLOSE (60*5)
 
 static int autolog_level;
+static int log_server_time;
 static int autoremove_tag;
 static char *autolog_path;
 
@@ -502,8 +503,8 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 		autolog_open(server, server_tag, g_strcmp0(target, "*") ? target : deftarget);
 }
 
-static void log_single_line(WINDOW_REC *window, const char *server_tag,
-			    const char *target, int level, const char *text)
+static void log_single_line(WINDOW_REC *window, const char *server_tag, const char *target,
+                            int level, time_t t, const char *text)
 {
 	char windownum[MAX_INT_STRLEN];
 	LOG_REC *log;
@@ -514,15 +515,16 @@ static void log_single_line(WINDOW_REC *window, const char *server_tag,
 		log = logs_find_item(LOG_ITEM_WINDOW_REFNUM,
 				     windownum, NULL, NULL);
 		if (log != NULL)
-			log_write_rec(log, text, level);
+			log_write_rec(log, text, level, t);
 	}
 
-	log_file_write(server_tag, target, level, text, FALSE);
+	log_file_write(server_tag, target, level, t, text, FALSE);
 }
 
 static void log_line(TEXT_DEST_REC *dest, const char *text)
 {
 	char **lines, **tmp;
+	time_t t = (time_t) -1;
 
 	if (dest->level == MSGLEVEL_NEVER)
 		return;
@@ -536,9 +538,18 @@ static void log_line(TEXT_DEST_REC *dest, const char *text)
 	/* text may contain one or more lines, log wants to eat them one
 	   line at a time */
 	lines = g_strsplit(text, "\n", -1);
+	if (log_server_time && dest->meta != NULL) {
+		char *val;
+		if ((val = g_hash_table_lookup(dest->meta, "time")) != NULL) {
+			GDateTime *time;
+			if ((time = g_date_time_new_from_iso8601(val, NULL)) != NULL) {
+				t = g_date_time_to_unix(time);
+				g_date_time_unref(time);
+			}
+		}
+	}
 	for (tmp = lines; *tmp != NULL; tmp++)
-		log_single_line(dest->window, dest->server_tag,
-				dest->target, dest->level, *tmp);
+		log_single_line(dest->window, dest->server_tag, dest->target, dest->level, t, *tmp);
 	g_strfreev(lines);
 }
 
@@ -720,6 +731,13 @@ static void read_settings(void)
 		g_strfreev(autolog_ignore_targets);
 
 	autolog_ignore_targets = g_strsplit(settings_get_str("autolog_ignore_targets"), " ", -1);
+
+	log_server_time = settings_get_choice("log_server_time");
+	if (log_server_time == 2) {
+		SETTINGS_REC *rec = settings_get_record("show_server_time");
+		if (rec != NULL)
+			log_server_time = settings_get_bool("show_server_time");
+	}
 }
 
 void fe_log_init(void)
@@ -731,7 +749,8 @@ void fe_log_init(void)
         settings_add_bool("log", "autolog", FALSE);
 	settings_add_bool("log", "autolog_colors", FALSE);
 	settings_add_bool("log", "autolog_only_saved_channels", FALSE);
-        settings_add_str("log", "autolog_path", "~/irclogs/$tag/$0.log");
+	settings_add_choice("log", "log_server_time", 2, "off;on;auto");
+	settings_add_str("log", "autolog_path", "~/irclogs/$tag/$0.log");
 	settings_add_level("log", "autolog_level", "all -crap -clientcrap -ctcps");
         settings_add_str("log", "log_theme", "");
 	settings_add_str("log", "autolog_ignore_targets", "");
diff --git a/src/perl/common/Log.xs b/src/perl/common/Log.xs
index cdcdbd90..532095fb 100644
--- a/src/perl/common/Log.xs
+++ b/src/perl/common/Log.xs
@@ -54,10 +54,11 @@ log_close(log)
 	Irssi::Log log
 
 void
-log_write_rec(log, str, level)
+log_write_rec(log, str, level, now = -1)
 	Irssi::Log log
 	char *str
 	int level
+	time_t now
 
 void
 log_start_logging(log)

From 6a331399399dc9b91d75fbe6b065e31a2db49fe0 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 14 Aug 2021 22:43:50 +0200
Subject: [PATCH 1279/1650] compat for glib 2.55

---
 src/core/misc.c                  | 20 ++++++++++++++++----
 src/core/misc.h                  |  7 +++++++
 src/fe-text/textbuffer-formats.c | 16 +---------------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/core/misc.c b/src/core/misc.c
index c66bbd6d..f0bbf4e0 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -95,7 +95,6 @@ int i_input_add_poll(int fd, int priority, int condition, GInputFunction functio
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2)
 {
-#pragma GCC diagnostic pop
 	if (tv1->tv_sec < tv2->tv_sec)
 		return -1;
 	if (tv1->tv_sec > tv2->tv_sec)
@@ -105,11 +104,8 @@ int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2)
 		tv1->tv_usec > tv2->tv_usec ? 1 : 0;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2)
 {
-#pragma GCC diagnostic pop
 	long secs, usecs;
 
 	secs = tv1->tv_sec - tv2->tv_sec;
@@ -122,6 +118,22 @@ long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2)
 
 	return usecs;
 }
+#pragma GCC diagnostic pop
+
+#if GLIB_CHECK_VERSION(2, 56, 0)
+/* nothing */
+#else
+/* compatibility code for old GLib */
+GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *default_tz)
+{
+	GTimeVal time;
+	if (g_time_val_from_iso8601(iso_date, &time)) {
+		return g_date_time_new_from_timeval_utc(&time);
+	} else {
+		return NULL;
+	}
+}
+#endif
 
 int find_substr(const char *list, const char *item)
 {
diff --git a/src/core/misc.h b/src/core/misc.h
index 76f5644b..622470f7 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -19,6 +19,13 @@ int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
 long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
 #pragma GCC diagnostic pop
 
+#if GLIB_CHECK_VERSION(2, 56, 0)
+/* nothing */
+#else
+/* compatibility code for old GLib */
+GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *default_tz);
+#endif
+
 GSList *i_slist_find_string(GSList *list, const char *key);
 GSList *i_slist_find_icase_string(GSList *list, const char *key);
 GList *i_list_find_string(GList *list, const char *key);
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 5b15313f..20abc0df 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -1,6 +1,7 @@
 #include "module.h"
 #include <irssi/src/core/expandos.h>
 #include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
 #include <irssi/src/core/refstrings.h>
 #include <irssi/src/core/servers.h>
 #include <irssi/src/core/settings.h>
@@ -18,21 +19,6 @@ gboolean scrollback_format;
 gboolean show_server_time;
 int signal_gui_render_line_text;
 
-#if GLIB_CHECK_VERSION(2, 56, 0)
-/* nothing */
-#else
-/* compatibility code for old GLib */
-static GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *default_tz)
-{
-	GTimeVal time;
-	if (g_time_val_from_iso8601(iso_date, &time)) {
-		return g_date_time_new_from_timeval_utc(&time);
-	} else {
-		return NULL;
-	}
-}
-#endif
-
 static void collector_free(GSList **collector)
 {
 	while (*collector) {

From b3f74fe0ab1fd8dc145dab662e74eeaaeeb6fffe Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 15 Aug 2021 15:58:10 +0200
Subject: [PATCH 1280/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index cc334476..a89b4964 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 38
+#define IRSSI_ABI_VERSION 39
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From a07a4c1ea886e35a17847ff004495e2f18b8b489 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 30 Aug 2021 20:27:35 +0200
Subject: [PATCH 1281/1650] use an internal build of openssl when fuzzer is
 enabled

---
 meson.build              |  7 ++++++-
 subprojects/openssl.wrap | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 subprojects/openssl.wrap

diff --git a/meson.build b/meson.build
index 1a5182af..fe5aa99f 100644
--- a/meson.build
+++ b/meson.build
@@ -273,7 +273,12 @@ endif
 dep += glib_dep
 dep += gmodule_dep
 
-openssl_dep = dependency('openssl', static : want_static_dependency)
+if glib_internal and want_static_dependency and want_fuzzer
+  openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled'])
+  openssl_dep = openssl_proj.get_variable('openssl_dep')
+else
+  openssl_dep = dependency('openssl', static : want_static_dependency)
+endif
 dep += openssl_dep
 
 ############
diff --git a/subprojects/openssl.wrap b/subprojects/openssl.wrap
new file mode 100644
index 00000000..4aaaba38
--- /dev/null
+++ b/subprojects/openssl.wrap
@@ -0,0 +1,14 @@
+[wrap-file]
+directory = openssl-1.1.1l
+source_url = https://www.openssl.org/source/openssl-1.1.1l.tar.gz
+source_filename = openssl-1.1.1l.tar.gz
+source_hash = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
+patch_filename = openssl_1.1.1l-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/openssl_1.1.1l-1/get_patch
+patch_hash = 670db31580039e06c17f48bcd31e489f453fe72c22006de6d693b9b033f1003a
+
+[provide]
+libcrypto = libcrypto_dep
+libssl = libssl_dep
+openssl = openssl_dep
+

From 49903f41854114aec37a74a907135e17931b43c8 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 30 Aug 2021 21:59:38 +0200
Subject: [PATCH 1282/1650] mess with server ports

---
 src/core/servers-setup.c       | 31 ++++++++++++++-------
 src/core/servers-setup.h       |  1 +
 src/fe-common/core/fe-server.c | 51 +++++++++++++++++++++++-----------
 3 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 357e8ebe..fd719c38 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -457,7 +457,7 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 	port = config_node_get_int(node, "port", 0);
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 
-	if (server_setup_find(server, port, chatnet) != NULL) {
+	if ((rec = server_setup_find(server, port, chatnet)) != NULL && rec->port == port) {
 		return NULL;
 	}
 
@@ -548,7 +548,7 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 		return -1;
 
 	address = config_node_get_str(node, "address", NULL);
-	chatnet = config_node_get_str(node, "chatnet", NULL);
+	chatnet = config_node_get_str(node, "chatnet", "");
 	port = config_node_get_int(node, "port", 0);
 
 	if (address == NULL || chatnet == NULL) {
@@ -556,7 +556,7 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 	}
 
 	if (g_ascii_strcasecmp(address, server->address) != 0 ||
-	    g_ascii_strcasecmp(chatnet, server->chatnet) != 0 ||
+	    g_ascii_strcasecmp(chatnet, server->chatnet != NULL ? server->chatnet : "") != 0 ||
 	    port != server->port) {
 		return 1;
 	}
@@ -564,16 +564,20 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
 	return 0;
 }
 
-static void server_setup_save(SERVER_SETUP_REC *rec)
+static void server_setup_save(SERVER_SETUP_REC *rec, int old_port, const char *old_chatnet)
 {
 	CONFIG_NODE *parent_node, *node;
+	SERVER_SETUP_REC search_rec = { 0 };
 	GSList *config_node;
 
 	parent_node = iconfig_node_traverse("(servers", TRUE);
 
 	/* Try to find this channel in the configuration */
-	config_node = g_slist_find_custom(parent_node->value, rec,
-					  (GCompareFunc)compare_server_setup);
+	search_rec.address = rec->address;
+	search_rec.chatnet = old_chatnet != NULL ? (char *) old_chatnet : rec->chatnet;
+	search_rec.port = old_port;
+	config_node = g_slist_find_custom(parent_node->value, &search_rec,
+	                                  (GCompareFunc) compare_server_setup);
 	if (config_node != NULL)
 		/* Let's update this server record */
 		node = config_node->data;
@@ -654,16 +658,23 @@ static void server_setup_destroy(SERVER_SETUP_REC *rec)
 	g_free(rec);
 }
 
-void server_setup_add(SERVER_SETUP_REC *rec)
+void server_setup_modify(SERVER_SETUP_REC *rec, int old_port, const char *old_chatnet)
 {
+	g_return_if_fail(g_slist_find(setupservers, rec) != NULL);
+
 	rec->type = module_get_uniq_id("SERVER SETUP", 0);
-	if (g_slist_find(setupservers, rec) == NULL)
-		setupservers = g_slist_append(setupservers, rec);
-	server_setup_save(rec);
+	server_setup_save(rec, old_port, old_chatnet);
 
 	signal_emit("server setup updated", 1, rec);
 }
 
+void server_setup_add(SERVER_SETUP_REC *rec)
+{
+	if (g_slist_find(setupservers, rec) == NULL)
+		setupservers = g_slist_append(setupservers, rec);
+	server_setup_modify(rec, -1, NULL);
+}
+
 void server_setup_remove_chatnet(const char *chatnet)
 {
 	GSList *tmp, *next;
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index f35c3873..742ed4dd 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -41,6 +41,7 @@ SERVER_SETUP_REC *server_setup_find(const char *address, int port,
 				    const char *chatnet);
 
 void server_setup_add(SERVER_SETUP_REC *rec);
+void server_setup_modify(SERVER_SETUP_REC *rec, int old_port, const char *old_chatnet);
 void server_setup_remove(SERVER_SETUP_REC *rec);
 
 /* Remove servers attached to chatne */
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 468ac4e7..de45f8e9 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -110,11 +110,11 @@ static SERVER_SETUP_REC *create_server_setup(GHashTable *optlist)
 static void cmd_server_add_modify(const char *data, gboolean add)
 {
         GHashTable *optlist;
-	SERVER_SETUP_REC *rec;
-	char *addr, *portstr, *password, *value, *chatnet;
+	SERVER_SETUP_REC *rec, *tmp;
+	char *addr, *portstr, *password, *value, *chatnet, *old_chatnet;
 	void *free_arg;
 	gboolean newrec;
-	int port;
+	int port, old_port, add_port;
 
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_OPTIONS,
 		"server add", &optlist, &addr, &portstr, &password))
@@ -122,27 +122,39 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
-	value = g_hash_table_lookup(optlist, "port");
+	port = old_port = -1;
 
 	if (*portstr != '\0')
-		port = atoi(portstr);
-	else if (value != NULL && *value != '\0')
-		port = atoi(value);
+		port = add_port = atoi(portstr);
 	else if (g_hash_table_lookup(optlist, "tls") ||
 		 g_hash_table_lookup(optlist, "ssl"))
-		port = DEFAULT_SERVER_ADD_TLS_PORT;
+		add_port = DEFAULT_SERVER_ADD_TLS_PORT;
 	else
-		port = DEFAULT_SERVER_ADD_PORT;
+		add_port = DEFAULT_SERVER_ADD_PORT;
+
+	value = g_hash_table_lookup(optlist, "port");
+	if (value != NULL && *value != '\0')
+		old_port = atoi(value);
 
 	chatnet = g_hash_table_lookup(optlist, "network");
 
-	rec = server_setup_find(addr, port, chatnet);
+	rec = server_setup_find(addr, old_port != -1 ? old_port : add_port, chatnet);
+	if (old_port == -1 && rec != NULL)
+		old_port = rec->port;
 
-	if (rec == NULL) {
+	if (port == -1)
+		port = old_port != -1 ? old_port : add_port;
+
+	/* make sure the new port doesn't exist */
+	tmp = server_setup_find(addr, port, chatnet);
+	if (tmp != NULL && tmp->port == port)
+		rec = tmp;
+
+	if (rec == NULL || (rec->port != old_port && rec->port != port)) {
 		newrec = TRUE;
 		if (add == FALSE) {
-			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-				TXT_SETUPSERVER_NOT_FOUND, addr, port);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND,
+			            addr, old_port == -1 ? port : old_port);
 			cmd_params_free(free_arg);
 			return;
 		}
@@ -156,8 +168,9 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		rec->port = port;
 	} else {
 		newrec = FALSE;
-		if (*portstr != '\0' || g_hash_table_lookup(optlist, "port"))
-			rec->port = port;
+		old_chatnet = g_strdup(rec->chatnet);
+		old_port = rec->port;
+		rec->port = port;
 
 		if (*password != '\0') g_free_and_null(rec->password);
 		if (g_hash_table_lookup(optlist, "host")) {
@@ -261,7 +274,13 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	signal_emit("server add fill", 3, rec, optlist, GINT_TO_POINTER(add));
 
-	server_setup_add(rec);
+	if (newrec) {
+		server_setup_add(rec);
+	} else {
+		server_setup_modify(rec, old_port, old_chatnet);
+		g_free(old_chatnet);
+	}
+
 	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
 		    TXT_SETUPSERVER_ADDED, addr, port);
 

From c4fd417ccef8f2af6b3efbc4afa72997949a79c9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 31 Aug 2021 11:09:42 +0200
Subject: [PATCH 1283/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index a89b4964..245f2223 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 39
+#define IRSSI_ABI_VERSION 40
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 4b506fc45c518619f968377b925492a96c7041d5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 31 Aug 2021 14:49:56 +0200
Subject: [PATCH 1284/1650] remove duplicated servers on load

---
 src/core/servers-setup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index fd719c38..59ca6997 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -458,7 +458,8 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 	chatnet = config_node_get_str(node, "chatnet", NULL);
 
 	if ((rec = server_setup_find(server, port, chatnet)) != NULL && rec->port == port) {
-		return NULL;
+		/* duplicate server setup */
+		server_setup_remove(rec);
 	}
 
 	rec = NULL;

From 63a5b80ba7c1df88544ee10fa66ca6202d7ed077 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 30 Aug 2021 20:36:24 +0200
Subject: [PATCH 1285/1650] only enable sasl plain when username and password
 are set

may fix #1325
---
 src/irc/core/irc-servers-setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 5299ef04..e0982550 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -121,9 +121,9 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 	if (ircnet->sasl_mechanism != NULL) {
 		if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "plain")) {
 			/* The PLAIN method needs both the username and the password */
-			conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
 			if (ircnet->sasl_username != NULL && *ircnet->sasl_username &&
 			    ircnet->sasl_password != NULL && *ircnet->sasl_password) {
+				conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
 				conn->sasl_username = g_strdup(ircnet->sasl_username);
 				conn->sasl_password = g_strdup(ircnet->sasl_password);
 			} else

From 6710b357369e561138b2ee18da6acca1be3f97ed Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 30 Aug 2021 19:31:56 +0200
Subject: [PATCH 1286/1650] fix reading of starttls = "no" in config

---
 src/irc/core/irc-servers-setup.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index 7b11a2fe..d55507d8 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -12,8 +12,8 @@
 	(IRC_SERVER_SETUP(server) ? TRUE : FALSE)
 
 enum {
-	STARTTLS_DISALLOW = -1, /* */
-	STARTTLS_NOTSET = 0,
+	STARTTLS_NOTSET = -1, /* */
+	STARTTLS_DISALLOW = 0,
 	STARTTLS_ENABLED = 1
 };
 

From 92ade2f591475f310e83b4557012aa5480449fcb Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 30 Aug 2021 19:40:41 +0200
Subject: [PATCH 1287/1650] fuzz server ssl init

---
 src/fe-fuzz/server.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index 83ce7bfa..b74a29b9 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -152,6 +152,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 	args_execute(0, NULL);
 	core_preinit((*argv)[0]);
 	core_init();
+	irssi_ssl_init();
 	irc_init();
 	fe_common_core_init();
 	fe_common_irc_init();

From e10e1c2da73a4af4ffc9acb3dd91b65feb93e6c7 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 30 Aug 2021 18:43:50 +0200
Subject: [PATCH 1288/1650] fix reading of old config ssl_verify key

---
 src/core/servers-setup.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 357e8ebe..0664aa38 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -484,8 +484,9 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 	rec->password = g_strdup(config_node_get_str(node, "password", NULL));
 
 	rec->use_tls = config_node_get_bool(node, "use_tls", FALSE) || config_node_get_bool(node, "use_ssl", FALSE);
-	rec->tls_verify = config_node_get_bool(node, "tls_verify", TRUE) ||
-	                  config_node_get_bool(node, "ssl_verify", FALSE);
+	rec->tls_verify = config_node_find(node, "tls_verify") != NULL ?
+                              config_node_get_bool(node, "tls_verify", TRUE) :
+                              config_node_get_bool(node, "ssl_verify", TRUE);
 
 	value = config_node_get_str(node, "tls_cert", NULL);
 	if (value == NULL)

From 215cf08828d14e5e307e0f334e51f7ac41e83329 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 30 Aug 2021 19:40:41 +0200
Subject: [PATCH 1289/1650] fuzz server ssl init

---
 src/fe-fuzz/server.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index 83ce7bfa..b74a29b9 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -152,6 +152,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 	args_execute(0, NULL);
 	core_preinit((*argv)[0]);
 	core_init();
+	irssi_ssl_init();
 	irc_init();
 	fe_common_core_init();
 	fe_common_irc_init();

From 21701a1299cd6b64db5b2fb3765f578ff1f9fc6b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 31 Aug 2021 17:29:43 +0200
Subject: [PATCH 1290/1650] do not unconditionally enable tls on /connect -!

---
 src/core/servers-setup.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index b1f57a99..82e5f6be 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -191,8 +191,10 @@ static void server_setup_fill_optlist(SERVER_CONNECT_REC *conn, GHashTable *optl
 
 	/* ad-hoc TLS settings from command optlist */
 	if ((tmp = g_hash_table_lookup(optlist, "tls_cert")) != NULL ||
-	    (tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL)
+	    (tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL) {
 		conn->tls_cert = g_strdup(tmp);
+		conn->use_tls = TRUE;
+	}
 	if ((tmp = g_hash_table_lookup(optlist, "tls_pkey")) != NULL ||
 	    (tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL)
 		conn->tls_pkey = g_strdup(tmp);
@@ -220,10 +222,10 @@ static void server_setup_fill_optlist(SERVER_CONNECT_REC *conn, GHashTable *optl
 	if (g_hash_table_lookup(optlist, "notls_verify") != NULL)
 		conn->tls_verify = FALSE;
 	if (g_hash_table_lookup(optlist, "tls_verify") != NULL ||
-	    g_hash_table_lookup(optlist, "ssl_verify") != NULL)
+	    g_hash_table_lookup(optlist, "ssl_verify") != NULL) {
 		conn->tls_verify = TRUE;
-	if ((conn->tls_cert != NULL && conn->tls_cert[0] != '\0') || conn->tls_verify)
 		conn->use_tls = TRUE;
+	}
 	if (g_hash_table_lookup(optlist, "notls") != NULL)
 		conn->use_tls = FALSE;
 	if (g_hash_table_lookup(optlist, "tls") != NULL ||

From 6c47fcf10d5a4b7718a3351ea0571da4d9f3c536 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 31 Aug 2021 21:49:29 +0200
Subject: [PATCH 1291/1650] Revert "Merge pull request #19 from
 ailin-nemui/starttls-no"

This reverts commit 3324c5da89c694ce5bbd20ecb313da870d1bb914, reversing
changes made to d3115f38550f26b935d4e22201d09287ce44e5ac.
---
 src/irc/core/irc-servers-setup.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index d55507d8..7b11a2fe 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -12,8 +12,8 @@
 	(IRC_SERVER_SETUP(server) ? TRUE : FALSE)
 
 enum {
-	STARTTLS_NOTSET = -1, /* */
-	STARTTLS_DISALLOW = 0,
+	STARTTLS_DISALLOW = -1, /* */
+	STARTTLS_NOTSET = 0,
 	STARTTLS_ENABLED = 1
 };
 

From 1a6d74ac2645cf4f1c980604894f60dbf29a2d95 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 31 Aug 2021 21:54:41 +0200
Subject: [PATCH 1292/1650] fix reading of starttls = "no" in config, attempt 2

---
 src/irc/core/irc-servers-setup.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 5299ef04..2cc80946 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -188,6 +188,7 @@ static void init_userinfo(void)
 
 static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)
 {
+	int starttls;
 	g_return_if_fail(rec != NULL);
 	g_return_if_fail(node != NULL);
 
@@ -197,7 +198,10 @@ static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node)
 	rec->max_cmds_at_once = config_node_get_int(node, "cmds_max_at_once", 0);
 	rec->cmd_queue_speed = config_node_get_int(node, "cmd_queue_speed", 0);
 	rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0);
-	rec->starttls = config_node_get_bool(node, "starttls", STARTTLS_NOTSET);
+	starttls = config_node_get_bool(node, "starttls", -1);
+	rec->starttls = starttls == -1 ? STARTTLS_NOTSET :
+	                starttls == 0  ? STARTTLS_DISALLOW :
+                                         STARTTLS_ENABLED;
 	if (rec->starttls == STARTTLS_ENABLED) {
 		rec->use_tls = 0;
 	}

From 939b773b8bea76dcf4ab33bb53d9899c84c218fb Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 1 Sep 2021 13:37:07 +0200
Subject: [PATCH 1293/1650] Revert "Changed the support channel to LiberaChat."

This reverts commit a5d4fd5aa7ad1d57c0b8e11e382944a3654cfa00.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d1232764..d229391a 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
+[#irssi](https://irssi.org/support/irc/) on irc.example.com.

From 1a30e646d9a450b19582bdf306d7aad66730a632 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 1 Sep 2021 13:37:17 +0200
Subject: [PATCH 1294/1650] Revert "Applied the updated docs changes in line
 with the upcoming blog post."

This reverts commit 1773fa8d191c9f1dcc7c1e59dbcdf31c1263c918.
---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 +++---
 docs/help/in/connect.in    |  6 ++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 +++---
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 ++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 +--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 +++++------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 +--
 docs/startup-HOWTO.txt     |  4 +--
 irssi.conf                 | 54 ++++++++++++++++----------------------
 23 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/README.md b/README.md
index d229391a..08be65b4 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.example.com.
+[#irssi](https://irssi.org/support/irc/) on freenode.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index cfe66eba..2b6f8b73 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN irc.example.com
+    /ADMIN orwell.freenode.net
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 0e15b6d5..86e824c2 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi ExampleNet
+    /CHANNEL ADD -auto #irssi Freenode
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout ExampleNet
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi ExampleNet
-    /CHANNEL REMOVE #hideout ExampleNet
+    /CHANNEL MODIFY -noauto #irssi Freenode
+    /CHANNEL REMOVE #hideout Freenode
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index 4d59dde1..e861ad74 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT ExampleNet
-    /CONNECT -6 ExampleNet
-    /CONNECT -4 -! -host staff.irssi.org -network ExampleNet irc.example.com
+    /CONNECT Freenode
+    /CONNECT -6 Freenode
+    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index 88772e1e..bd4a4e17 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT ExampleNet I'm off for today, take care!
+    /DISCONNECT Freenode I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index 41578501..275f349d 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO irc.example.com
+    /INFO orwell.freenode.net
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index 55190267..39fa23f8 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -ExampleNet #github,#example,#irssi
+    /JOIN -freenode #github,#freenode,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index 3e2fdbdb..bb554d55 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #example
+    /KNOCK #freenode
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index dfe26e30..e4743d46 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index ee1233b2..e33a1c75 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD irc.example.com
+    /MOTD orwel.freenode.org
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index deccea40..8fd8cf91 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#example
+    /NAMES -voices #irssi,#freenode
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 68d789d6..93c3f3ec 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#example USERINFO I am bob :p
+    /NCTCP bob,#freenode USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 183fd5b5..fbdaa0b4 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org ExampleNet
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' ExampleNet
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE ExampleNet
+    /NETWORK REMOVE Freenode
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index 51be59bd..e96abfbb 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #example,#irssi
+    /PART #freenode,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index 85f2556e..1c0ba5b9 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -ExampleNet bob
-    /QUERY -ExampleNet -window sarah
+    /QUERY -freenode bob
+    /QUERY -freenode -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index c34822de..63f52339 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD ExampleNet/mike utf-8
+    /RECODE ADD Freenode/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index f2148c90..aa1dc946 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT ExampleNet
+    /RECONNECT Freenode
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 8a4d8887..beb75114 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT irc.example.com
-    /SERVER CONNECT +irc.example.com
-    /SERVER ADD -network ExampleNet -noautosendcmd irc.example.com
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network ExampleNet -noproxy irc.example.com 6667
-    /SERVER MODIFY -network ExampleNet -noauto irc.example.com
-    /SERVER MODIFY -network ExampleNet irc.example.com 6697 -
-    /SERVER REMOVE irc.example.com 6667 ExampleNet
+    /SERVER CONNECT chat.freenode.net
+    /SERVER CONNECT +chat.freenode.net
+    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
+    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
+    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
+    /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
-    /SERVER PURGE irc.example.com
+    /SERVER PURGE orwell.freenode.net
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 29065feb..0f24ffe3 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" ExampleNet
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 9ed7ecdb..224d24e3 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 ExampleNet=2779
+  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index ecbeb467..48f6e6df 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT ExampleNet
+<div><div><pre><code>/CONNECT Freenode
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 84397f33..61de27e3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT LiberaChat
+/CONNECT Freenode
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index 9faa8973..edaeb3f5 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,19 +1,18 @@
 servers = (
-  { address = "irc.dal.net";       chatnet = "DALnet";     port = "6667"; },
-  { address = "ssl.efnet.org";     chatnet = "EFNet";      port = "9999"; use_tls = "yes"; tls_verify = "no"; },
-  { address = "irc.esper.net";     chatnet = "EsperNet";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.gamesurge.net"; chatnet = "GameSurge";  port = "6667"; },
-  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "open.ircnet.net";   chatnet = "IRCnet";     port = "6667"; },
-  { address = "irc.ircsource.net"; chatnet = "IRCSource";  port = "6667"; },
-  { address = "irc.libera.chat";   chatnet = "LiberaChat"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.netfuze.net";   chatnet = "NetFuze";    port = "6667"; },
-  { address = "irc.oftc.net";      chatnet = "OFTC";       port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.quakenet.org";  chatnet = "QuakeNet";   port = "6667"; },
-  { address = "irc.rizon.net";     chatnet = "Rizon";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "silc.silcnet.org";  chatnet = "SILC";       port = "706";  },
-  { address = "irc.undernet.org";  chatnet = "Undernet";   port = "6667"; }
+  { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
+  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
+  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
+  { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
+  { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
+  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.quakenet.org";  chatnet = "QuakeNet";  port = "6667"; },
+  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "silc.silcnet.org";  chatnet = "SILC";      port = "706";  },
+  { address = "irc.undernet.org";  chatnet = "Undernet";  port = "6667"; }
 );
 
 chatnets = {
@@ -59,12 +58,6 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  LiberaChat = {
-    type      = "IRC";
-    max_kicks = "1";
-    max_msgs  = "4";
-    max_whois = "1";
-  };
   NetFuze = {
     type      = "IRC";
     max_kicks = "1";
@@ -101,16 +94,15 @@ chatnets = {
 };
 
 channels = (
-  { name = "#lobby";     chatnet = "EsperNet";   autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";   autojoin = "No"; },
-  { name = "#gamesurge"; chatnet = "GameSurge";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "IRCNet";     autojoin = "No"; },
-  { name = "#ircsource"; chatnet = "IRCSource";  autojoin = "No"; },
-  { name = "#libera";    chatnet = "LiberaChat"; autojoin = "No"; },
-  { name = "#irssi";     chatnet = "LiberaChat"; autojoin = "No"; },
-  { name = "#netfuze";   chatnet = "NetFuze";    autojoin = "No"; },
-  { name = "#oftc";      chatnet = "OFTC";       autojoin = "No"; },
-  { name = "silc";       chatnet = "SILC";       autojoin = "No"; }
+  { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
+  { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
+  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
+  { name = "#netfuze";   chatnet = "NetFuze";   autojoin = "No"; },
+  { name = "#oftc";      chatnet = "OFTC";      autojoin = "No"; },
+  { name = "silc";       chatnet = "SILC";      autojoin = "No"; }
 );
 
 aliases = {

From 82d2cd88e78b4bffe0c710dd940d1771506eced6 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 1 Sep 2021 13:37:37 +0200
Subject: [PATCH 1295/1650] Revert "Irssi does not take a political stance."

This reverts commit a4486c236a3bf15192d0500b3a1892f7465826c7.
---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 ++++----
 docs/help/in/connect.in    |  6 +++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 ++++----
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 +++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 ++--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 ++++++++--------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 ++--
 docs/startup-HOWTO.txt     |  4 ++--
 irssi.conf                 |  8 ++++----
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 08be65b4..d1232764 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on freenode.
+[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index 2b6f8b73..acb6e1ae 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN orwell.freenode.net
+    /ADMIN irc.libera.chat
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 86e824c2..d9be8cf5 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi Freenode
+    /CHANNEL ADD -auto #irssi liberachat
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout liberachat
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi Freenode
-    /CHANNEL REMOVE #hideout Freenode
+    /CHANNEL MODIFY -noauto #irssi liberachat
+    /CHANNEL REMOVE #hideout liberachat
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index e861ad74..d4375eec 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT Freenode
-    /CONNECT -6 Freenode
-    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
+    /CONNECT liberachat
+    /CONNECT -6 liberachat
+    /CONNECT -4 -! -host staff.irssi.org -network liberachat irc.libera.chat
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index bd4a4e17..c53b1e60 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT Freenode I'm off for today, take care!
+    /DISCONNECT liberachat I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index 275f349d..d8d8cfc9 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO orwell.freenode.net
+    /INFO irc.libera.chat
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index 39fa23f8..adf7158e 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -freenode #github,#freenode,#irssi
+    /JOIN -liberachat #github,#libera,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index bb554d55..ce8f9aa0 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #freenode
+    /KNOCK #libera
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index e4743d46..3ca8782c 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index e33a1c75..6e86681e 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD orwel.freenode.org
+    /MOTD irc.libera.chat
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index 8fd8cf91..974b845f 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#freenode
+    /NAMES -voices #irssi,#libera
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 93c3f3ec..9f516730 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#freenode USERINFO I am bob :p
+    /NCTCP bob,#libera USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index fbdaa0b4..0542bd7d 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org liberachat
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' liberachat
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE Freenode
+    /NETWORK REMOVE liberachat
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index e96abfbb..f89769cc 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #freenode,#irssi
+    /PART #libera,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index 1c0ba5b9..a34f85e8 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -freenode bob
-    /QUERY -freenode -window sarah
+    /QUERY -liberachat bob
+    /QUERY -liberachat -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 63f52339..760c66cd 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD Freenode/mike utf-8
+    /RECODE ADD liberachat/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index aa1dc946..87beb95a 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT Freenode
+    /RECONNECT liberachat
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index beb75114..f7d907f3 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT chat.freenode.net
-    /SERVER CONNECT +chat.freenode.net
-    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
-    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
-    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
-    /SERVER REMOVE orwell.freenode.net 6667 Freenode
+    /SERVER CONNECT irc.libera.chat
+    /SERVER CONNECT +irc.libera.chat
+    /SERVER ADD -network liberachat -noautosendcmd irc.libera.chat
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network liberachat -noproxy irc.libera.chat 6667
+    /SERVER MODIFY -network liberachat -noauto irc.libera.chat
+    /SERVER MODIFY -network liberachat irc.libera.chat 6697 -
+    /SERVER REMOVE irc.libera.chat 6667 liberachat
     /SERVER PURGE
-    /SERVER PURGE orwell.freenode.net
+    /SERVER PURGE irc.libera.chat
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 0f24ffe3..5f0eac51 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" liberachat
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 224d24e3..172770e8 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
+  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 liberachat=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 48f6e6df..b0c68f1f 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT Freenode
+<div><div><pre><code>/CONNECT liberachat
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 61de27e3..bff33108 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT Freenode
+/CONNECT liberachat
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index edaeb3f5..21c3ba4c 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -2,7 +2,7 @@ servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
   { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
   { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.libera.chat";   chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
   { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
@@ -34,7 +34,7 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  Freenode = {
+  liberachat = {
     type      = "IRC";
     max_kicks = "1";
     max_msgs  = "4";
@@ -95,8 +95,8 @@ chatnets = {
 
 channels = (
   { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#libera";    chatnet = "liberachat";autojoin = "No"; },
+  { name = "#irssi";     chatnet = "liberachat";autojoin = "No"; },
   { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
   { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
   { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },

From 240b79aa2677c5f21ec3350123eb573502bea85d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 1 Sep 2021 22:56:06 +0200
Subject: [PATCH 1296/1650] send channel sync requests "later" in the command
 queue

---
 src/irc/core/channels-query.c    | 16 +++++----
 src/irc/core/irc-servers.h       |  1 +
 src/irc/core/irc.c               | 59 ++++++++++++++++++++------------
 src/irc/core/irc.h               | 12 +++++--
 src/irc/notifylist/notify-ison.c |  6 ++--
 src/perl/irc/Server.xs           |  7 ++++
 6 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 6cf3dd2b..37fcb2d2 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -53,9 +53,9 @@ loop:
 /* here are the WHOX commands we send. the full spec can be found on [1].
 
    (1) WHOX_CHANNEL_FULL_CMD for getting the user list when we join a channel. we request the fields
-       c (channel), u (user), h (host), n (nick), f (flags), d (hops), a (important, account!), and
-       r (the real name goes last because it os the only that can contain spaces.) we request all
-       those fields as they are also included in the "regular" WHO reply we would get without WHOX.
+       c (channel), u (user), h (host), n (nick), f (flags), d (hops), a (account), and r (the real
+       name goes last because it is the only that can contain spaces.) we request all those fields
+       as they are also included in the "regular" WHO reply we would get without WHOX.
 
    (2) WHOX_USERACCOUNT_CMD for getting the account names of people that joined. this code is
        obviously only used when we don't have extended-joins. we request n (nick) and a (account)
@@ -265,7 +265,7 @@ static void query_send(IRC_SERVER_REC *server, int query)
                 cmd = NULL;
 	}
 
-	irc_send_cmd(server, cmd);
+	irc_send_cmd_later(server, cmd);
 
 	g_free(chanstr);
 	g_free(chanstr_commas);
@@ -440,6 +440,7 @@ void irc_channels_query_purge_accountquery(IRC_SERVER_REC *server, const char *n
 				g_free(cmd);
 
 				server->cmdcount--;
+				server->cmdlater--;
 			} else {
 				prev = tmp->next;
 			}
@@ -528,7 +529,9 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 	}
 
 	if (g_hash_table_size(chanrec->nicks) < settings_get_int("channel_max_who_sync") &&
-	    server->isupport != NULL && g_hash_table_lookup(server->isupport, "whox") != NULL) {
+	    server->isupport != NULL && g_hash_table_lookup(server->isupport, "whox") != NULL &&
+	    g_hash_table_size(server->chanqueries->accountqueries) <
+	        settings_get_int("account_max_chase")) {
 		char *cmd;
 		server_redirect_event(server, "who user", 1, nick, -1,
 		                      "chanquery useraccount abort", /* failure signal */
@@ -538,7 +541,7 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 		cmd = g_strdup_printf(WHOX_USERACCOUNT_CMD, nick);
 		g_hash_table_add(server->chanqueries->accountqueries, g_strdup(nick));
 		/* queue the command */
-		irc_send_cmd_full(server, cmd, FALSE, FALSE, FALSE);
+		irc_send_cmd_later(server, cmd);
 		g_free(cmd);
 	}
 }
@@ -635,6 +638,7 @@ void channels_query_init(void)
 {
 	settings_add_bool("misc", "channel_sync", TRUE);
 	settings_add_int("misc", "channel_max_who_sync", 1000);
+	settings_add_int("misc", "account_max_chase", 10);
 
 	signal_add("server connected", (SIGNAL_FUNC) sig_connected);
 	signal_add("server disconnected", (SIGNAL_FUNC) sig_disconnected);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 544baba9..93fa02a4 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -119,6 +119,7 @@ struct _IRC_SERVER_REC {
 	                 there actually is, to make flood control remember
 			 how many messages can be sent before starting the
 			 flood control */
+	int cmdlater; /* number of commands in queue to be sent later */
 	GSList *cmdqueue; /* command, redirection, ... */
 	gint64 wait_cmd; /* don't send anything to server before this */
 	gint64 last_cmd; /* last time command was sent to server */
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 628d7130..e712c9bf 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -47,8 +47,7 @@ static void strip_params_colon(char *const);
 /* The core of the irc_send_cmd* functions. If `raw' is TRUE, the `cmd'
    won't be checked at all if it's 512 bytes or not, or if it contains
    line feeds or not. Use with extreme caution! */
-void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
-		       int send_now, int immediate, int raw)
+void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_when, int raw)
 {
 	GString *str;
 	int len;
@@ -65,6 +64,8 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 
 	if (server->cmdcount == 0)
 		irc_servers_start_cmd_timeout();
+	if (server->cmdlater > server->cmdcount)
+		server->cmdlater = server->cmdcount;
 	server->cmdcount++;
 
 	if (!raw) {
@@ -105,7 +106,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 		g_string_append(str, cmd);
 	}
 
-	if (send_now) {
+	if (irc_send_when == IRC_SEND_NOW) {
 		rawlog_output(server->rawlog, str->str);
 		server_redirect_command(server, str->str, server->redirect_next);
                 server->redirect_next = NULL;
@@ -117,25 +118,31 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 		g_string_append_c(str, 10);
 	}
 
-	if (send_now) {
-                irc_server_send_data(server, str->str, str->len);
+	if (irc_send_when == IRC_SEND_NOW) {
+		irc_server_send_data(server, str->str, str->len);
 		g_string_free(str, TRUE);
-	} else {
-
+	} else if (irc_send_when == IRC_SEND_NEXT) {
 		/* add to queue */
-		if (immediate) {
-			server->cmdqueue = g_slist_prepend(server->cmdqueue,
-							   server->redirect_next);
-			server->cmdqueue = g_slist_prepend(server->cmdqueue,
-							   g_string_free(str, FALSE));
-		} else {
-			server->cmdqueue = g_slist_append(server->cmdqueue,
-							  g_string_free(str, FALSE));
-			server->cmdqueue = g_slist_append(server->cmdqueue,
-							  server->redirect_next);
-		}
+		server->cmdqueue = g_slist_prepend(server->cmdqueue, server->redirect_next);
+		server->cmdqueue = g_slist_prepend(server->cmdqueue, g_string_free(str, FALSE));
+	} else if (irc_send_when == IRC_SEND_NORMAL) {
+		guint pos = g_slist_length(server->cmdqueue);
+		if (pos > 2 * server->cmdlater)
+			pos -= 2 * server->cmdlater;
+		else
+			pos = 0;
+
+		server->cmdqueue = g_slist_insert(server->cmdqueue, server->redirect_next, pos);
+		server->cmdqueue = g_slist_insert(server->cmdqueue, g_string_free(str, FALSE), pos);
+	} else if (irc_send_when == IRC_SEND_LATER) {
+		server->cmdqueue = g_slist_append(server->cmdqueue, g_string_free(str, FALSE));
+		server->cmdqueue = g_slist_append(server->cmdqueue, server->redirect_next);
+		server->cmdlater++;
+	} else {
+		g_warn_if_reached();
 	}
-        server->redirect_next = NULL;
+
+	server->redirect_next = NULL;
 }
 
 /* Send command to IRC server */
@@ -149,7 +156,7 @@ void irc_send_cmd(IRC_SERVER_REC *server, const char *cmd)
 	           (server->cmdcount < server->max_cmds_at_once ||
 		    server->cmd_queue_speed <= 0);
 
-	irc_send_cmd_full(server, cmd, send_now, FALSE, FALSE);
+	irc_send_cmd_full(server, cmd, send_now ? IRC_SEND_NOW : IRC_SEND_NORMAL, FALSE);
 }
 
 /* Send command to IRC server */
@@ -173,7 +180,7 @@ void irc_send_cmd_now(IRC_SERVER_REC *server, const char *cmd)
 {
 	g_return_if_fail(cmd != NULL);
 
-        irc_send_cmd_full(server, cmd, TRUE, TRUE, FALSE);
+	irc_send_cmd_full(server, cmd, IRC_SEND_NOW, FALSE);
 }
 
 /* Send command to server putting it at the beginning of the queue of
@@ -183,7 +190,15 @@ void irc_send_cmd_first(IRC_SERVER_REC *server, const char *cmd)
 {
 	g_return_if_fail(cmd != NULL);
 
-        irc_send_cmd_full(server, cmd, FALSE, TRUE, FALSE);
+	irc_send_cmd_full(server, cmd, IRC_SEND_NEXT, FALSE);
+}
+
+/* Send command to server putting it at the end of the queue. */
+void irc_send_cmd_later(IRC_SERVER_REC *server, const char *cmd)
+{
+	g_return_if_fail(cmd != NULL);
+
+	irc_send_cmd_full(server, cmd, IRC_SEND_LATER, FALSE);
 }
 
 static char *split_nicks(const char *cmd, char **pre, char **nicks, char **post, int arg)
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index 8803f662..92fb4ccb 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -27,6 +27,13 @@ typedef struct _REDIRECT_REC REDIRECT_REC;
 
 extern char *current_server_event; /* current server event being processed */
 
+enum {
+	IRC_SEND_NOW, /* */
+	IRC_SEND_NEXT,
+	IRC_SEND_NORMAL,
+	IRC_SEND_LATER
+};
+
 /* Send command to IRC server */
 void irc_send_cmd(IRC_SERVER_REC *server, const char *cmd);
 void irc_send_cmdv(IRC_SERVER_REC *server, const char *cmd, ...) G_GNUC_PRINTF (2, 3);
@@ -42,11 +49,12 @@ void irc_send_cmd_now(IRC_SERVER_REC *server, const char *cmd);
     commands to send -- it will go out as soon as possible in accordance
     to the flood protection settings. */
 void irc_send_cmd_first(IRC_SERVER_REC *server, const char *cmd);
+/* Send command to server putting it at the end of the queue. */
+void irc_send_cmd_later(IRC_SERVER_REC *server, const char *cmd);
 /* The core of the irc_send_cmd* functions. If `raw' is TRUE, the `cmd'
    won't be checked at all if it's 512 bytes or not, or if it contains
    line feeds or not. Use with extreme caution! */
-void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
-		       int send_now, int immediate, int raw);
+void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_when, int raw);
 
 /* Extract a tag value from tags */
 GHashTable *irc_parse_message_tags(const char *tags);
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index 32316038..809394c4 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -92,7 +92,7 @@ static void ison_send(IRC_SERVER_REC *server, GString *cmd)
 
 	server_redirect_event(server, "ison", 1, NULL, -1, NULL,
 			      "event 303", "notifylist event", NULL);
-	irc_send_cmd(server, cmd->str);
+	irc_send_cmd_later(server, cmd->str);
 
 	g_string_truncate(cmd, 0);
 }
@@ -183,7 +183,9 @@ static void whois_send(IRC_SERVER_REC *server, const char *nicks,
 			      "", "event empty", NULL);
 	g_free(str);
 
-	irc_send_cmdv(server, "WHOIS %s", whois_request);
+	str = g_strdup_printf("WHOIS %s", whois_request);
+	irc_send_cmd_later(server, str);
+	g_free(str);
 }
 
 static void whois_send_server(IRC_SERVER_REC *server, char *nick)
diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs
index fef3698f..63e3111a 100644
--- a/src/perl/irc/Server.xs
+++ b/src/perl/irc/Server.xs
@@ -86,6 +86,13 @@ send_raw_first(server, cmd)
 CODE:
 	irc_send_cmd_first(server, cmd);
 
+void
+send_raw_later(server, cmd)
+	Irssi::Irc::Server server
+	char *cmd
+CODE:
+	irc_send_cmd_later(server, cmd);
+
 void
 send_raw_split(server, cmd, nickarg, max_nicks)
 	Irssi::Irc::Server server

From 157913bd98f1f95eb7eb58b2c73a8e6685f0c8cc Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 1 Sep 2021 23:26:35 +0200
Subject: [PATCH 1297/1650] do not chase during netsplit

---
 src/irc/core/channels-query.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 37fcb2d2..05c9768c 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -530,6 +530,7 @@ static void sig_event_join(IRC_SERVER_REC *server, const char *data, const char
 
 	if (g_hash_table_size(chanrec->nicks) < settings_get_int("channel_max_who_sync") &&
 	    server->isupport != NULL && g_hash_table_lookup(server->isupport, "whox") != NULL &&
+	    server->split_servers == NULL &&
 	    g_hash_table_size(server->chanqueries->accountqueries) <
 	        settings_get_int("account_max_chase")) {
 		char *cmd;

From 2de9c25376c18776011a42dc9f2e3ff4370bb700 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 1 Sep 2021 23:01:58 +0200
Subject: [PATCH 1298/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 245f2223..d2dd2f7c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 40
+#define IRSSI_ABI_VERSION 41
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 37237f377e639650a4eb92168661fe4d53989400 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 2 Sep 2021 22:38:53 +0200
Subject: [PATCH 1299/1650] actually remember the hilight -color

---
 src/fe-common/core/hilight-text.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 4b5e4edd..d308bd04 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -479,6 +479,8 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 		                       tmp = g_strdup_printf("%d", hilight_end));
 		g_free(tmp);
 	}
+	if (hilight->color != NULL)
+		format_dest_meta_stash(dest, "hilight-color", hilight->color);
 
 	signal_emit("print text", 3, dest, newstr, stripped);
 

From cf903840233904de85858aa180f1a6b2e339a45d Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Thu, 2 Sep 2021 23:10:37 +0200
Subject: [PATCH 1300/1650] Allow -tls_ca{file,path} '' to unset an argument

---
 src/fe-common/core/fe-server.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index de45f8e9..78e7202c 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -213,12 +213,16 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 		value = g_hash_table_lookup(optlist, "ssl_cafile");
 	if (value != NULL && *value != '\0')
 		rec->tls_cafile = g_strdup(value);
+	else if (value != NULL && *value == '\0')
+		g_free_and_null(rec->tls_cafile);
 
 	value = g_hash_table_lookup(optlist, "tls_capath");
 	if (value == NULL)
 		value = g_hash_table_lookup(optlist, "ssl_capath");
 	if (value != NULL && *value != '\0')
 		rec->tls_capath = g_strdup(value);
+	else if (value != NULL && *value == '\0')
+		g_free_and_null(rec->tls_capath);
 
 	value = g_hash_table_lookup(optlist, "tls_ciphers");
 	if (value == NULL)

From cb11fd9cf76a368d8672925d02272c8a24992017 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 3 Sep 2021 16:18:21 +0200
Subject: [PATCH 1301/1650] add a PACKAGE_VERSION override for meson

---
 meson.build       | 10 ++++++++--
 meson_options.txt |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index fe5aa99f..bd192a92 100644
--- a/meson.build
+++ b/meson.build
@@ -53,6 +53,8 @@ require_glib_internal = get_option('install-glib') == 'force'
 
 want_static_dependency = get_option('static-dependency') == 'yes'
 
+package_version     = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version()
+
 chat_modules = ['irc']
 
 run_command('mkdir', meson.current_build_dir() / incdir)
@@ -540,7 +542,7 @@ foreach h : headers
 endforeach
 
 conf.set('HAVE_LIBUTF8PROC', have_libutf8proc)
-conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+conf.set_quoted('PACKAGE_VERSION', package_version)
 conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
 
 configure_file(output : 'irssi-config.h',
@@ -581,7 +583,11 @@ pc_requires = []
 if not glib_internal
   pc_requires += glib_dep
 endif
-pc.generate(filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', requires : pc_requires)
+pc.generate(filebase : 'irssi-1',
+  name : 'Irssi',
+  description : 'Irssi chat client',
+  version : package_version,
+  requires : pc_requires)
 
 ###########
 # irssi.1 #
diff --git a/meson_options.txt b/meson_options.txt
index 5dc9c514..1013166d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,3 +15,4 @@ option('static-dependency', type : 'combo',  description : 'Request static depen
 option('install-glib',      type : 'combo',  description : 'Download and install GLib for you',           choices : ['no', 'yes', 'force'])
 option('docdir',            type : 'string', description : 'Documentation directory')
 option('fhs-prefix',        type : 'string', description : 'System prefix for Termux')
+option('PACKAGE_VERSION',   type : 'string', description : 'Override PACKAGE_VERSION in tarballs')

From 37eb6c351cd46af6b5827a4f6cd58dbe493067ca Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 3 Sep 2021 19:34:11 +0200
Subject: [PATCH 1302/1650] fix queue bug

---
 src/irc/core/irc.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index e712c9bf..51b55a2b 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -51,6 +51,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 {
 	GString *str;
 	int len;
+	guint pos;
 	gboolean server_supports_tag;
 
 	g_return_if_fail(server != NULL);
@@ -64,10 +65,16 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 
 	if (server->cmdcount == 0)
 		irc_servers_start_cmd_timeout();
-	if (server->cmdlater > server->cmdcount)
-		server->cmdlater = server->cmdcount;
 	server->cmdcount++;
 
+	pos = g_slist_length(server->cmdqueue);
+	if (server->cmdlater > pos / 2) {
+		server->cmdlater = pos / 2;
+		pos = 0;
+	} else {
+		pos -= 2 * server->cmdlater;
+	}
+
 	if (!raw) {
 		const char *tmp = cmd;
 
@@ -126,12 +133,6 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 		server->cmdqueue = g_slist_prepend(server->cmdqueue, server->redirect_next);
 		server->cmdqueue = g_slist_prepend(server->cmdqueue, g_string_free(str, FALSE));
 	} else if (irc_send_when == IRC_SEND_NORMAL) {
-		guint pos = g_slist_length(server->cmdqueue);
-		if (pos > 2 * server->cmdlater)
-			pos -= 2 * server->cmdlater;
-		else
-			pos = 0;
-
 		server->cmdqueue = g_slist_insert(server->cmdqueue, server->redirect_next, pos);
 		server->cmdqueue = g_slist_insert(server->cmdqueue, g_string_free(str, FALSE), pos);
 	} else if (irc_send_when == IRC_SEND_LATER) {

From 9e128901104afb61ca29926e4421aadda031f38d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 13 Aug 2021 18:32:49 +0200
Subject: [PATCH 1303/1650] add a "server outgoing modify" signal to intercept
 outgoing messages

---
 docs/signals.txt           |  1 +
 src/irc/core/irc-servers.c | 24 ++++++++++++++----------
 src/irc/core/irc.c         | 21 +++++++++++++--------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 4e5f85b4..6128084b 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -151,6 +151,7 @@ irc.c:
  "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
 
  "server incoming", SERVER_REC, char *data
+ "server outgoing modify", SERVER_REC, GString *data
 
 (for perl parser..)
  "redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 676e8cb9..1c9f0cec 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -734,9 +734,9 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 {
 	REDIRECT_REC *redirect;
         GSList *link;
+	GString *str;
 	long usecs;
 	char *cmd;
-	int len;
 
 	if (!IS_IRC_SERVER(server))
 		return 0;
@@ -759,16 +759,20 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
         redirect = server->cmdqueue->next->data;
 
 	/* send command */
-	len = strlen(cmd);
-	irc_server_send_data(server, cmd, len);
+	str = g_string_new(cmd);
+	signal_emit("server outgoing modify", 2, server, str);
+	if (str->len) {
+		irc_server_send_data(server, str->str, str->len);
 
-	/* add to rawlog without [CR+]LF */
-        if (len > 2 && cmd[len-2] == '\r')
-		cmd[len-2] = '\0';
-        else if (cmd[len-1] == '\n')
-		cmd[len-1] = '\0';
-	rawlog_output(server->rawlog, cmd);
-	server_redirect_command(server, cmd, redirect);
+		/* add to rawlog without [CR+]LF */
+		if (str->len > 2 && str->str[str->len - 2] == '\r')
+			str->str[str->len - 2] = '\0';
+		else if (str->str[str->len - 1] == '\n')
+			str->str[str->len - 1] = '\0';
+		rawlog_output(server->rawlog, str->str);
+		server_redirect_command(server, str->str, redirect);
+	}
+	g_string_free(str, TRUE);
 
 	/* remove from queue */
 	server->cmdqueue = g_slist_remove(server->cmdqueue, cmd);
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 51b55a2b..c17e2470 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -113,20 +113,25 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 		g_string_append(str, cmd);
 	}
 
-	if (irc_send_when == IRC_SEND_NOW) {
-		rawlog_output(server->rawlog, str->str);
-		server_redirect_command(server, str->str, server->redirect_next);
-                server->redirect_next = NULL;
-	}
-
 	if (!raw) {
-                /* Add CR+LF to command */
+		/* Add CR+LF to command */
 		g_string_append_c(str, 13);
 		g_string_append_c(str, 10);
 	}
 
 	if (irc_send_when == IRC_SEND_NOW) {
-		irc_server_send_data(server, str->str, str->len);
+		signal_emit("server outgoing modify", 2, server, str);
+		if (str->len) {
+			irc_server_send_data(server, str->str, str->len);
+
+			/* add to rawlog without [CR+]LF */
+			if (str->len > 2 && str->str[str->len - 2] == '\r')
+				str->str[str->len - 2] = '\0';
+			else if (str->str[str->len - 1] == '\n')
+				str->str[str->len - 1] = '\0';
+			rawlog_output(server->rawlog, str->str);
+			server_redirect_command(server, str->str, server->redirect_next);
+		}
 		g_string_free(str, TRUE);
 	} else if (irc_send_when == IRC_SEND_NEXT) {
 		/* add to queue */

From 2cdcf86174b420091372edd295dc81cda8b46d8f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 1 Sep 2021 23:37:11 +0200
Subject: [PATCH 1304/1650] branding

---
 .github/workflows/check.yml  |   2 +-
 NEWS                         | 274 ++++++++++++++++++++++++++++++++++-
 README.md                    |  33 ++---
 src/core/expandos.c          |   2 +-
 src/fe-text/module-formats.c |   6 +-
 5 files changed, 291 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index aeaf6c27..61de72ff 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -118,5 +118,5 @@ jobs:
           echo load perl >> irssi-test/startup
           echo load proxy >> irssi-test/startup
           echo ^quit >> irssi-test/startup
-          irssi-build/bin/irssi --home irssi-test | ~/render.pl
+          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
           cat irc.log.*
diff --git a/NEWS b/NEWS
index 1bdffd82..b3282761 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,274 @@
-v1.3-head 2021-xx-xx  The Irssi team <staff@irssi.org>
+v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
+	* /SET resolve_reverse_lookup setting was removed (#1135)
+	* Irssi will try to connect on IPv4 if IPv6 connection failed
+	  (#1146). By Shivaram Lingamneni
+	* The display system now renders formats on the fly (#1079,
+	  #1188, #1191, #1192, #1204, #1205, #1209, an#13, an#14, an#28,
+	  an#29)
+
+	  This major change will break scripts that try to modify
+	  printed text during "print text" signal (#1189). They need
+	  to be ported to modify the text during "print format"
+	  instead. It also breaks the usage of using /FORMAT to add
+	  different colours to a line. Such usage needs to be ported
+	  to using $expando variables instead. Affected scripts
+	  include format_identify.pl, friends_peder.pl, nickcolor.pl,
+	  nm.pl, people.pl
+
+	  The "gui print text finished" and "gui print text after
+	  finished" signals gained a TEXT_DEST_REC *parameter in the
+	  process.
+
+	  A new "gui render line text" signal is available to change
+	  the rendering of a line
+
+	* made the $Z expando (time) dynamic (#1087, #1207, #1208)
+
+	  This change breaks the usage of /SET timestamp_format to
+	  supply a custom displayed time stamp. Affected scripts
+	  include binary_time.pl
+
+	* /HILIGHT -priority now affects which hilight rule gets
+	  applied (#1228, #1232)
+	* The NAMES list is now hidden by default if there are more
+	  than 18 users on the channel (an#7)
+
+	  To revert to the previous behaviour
+
+	      /SET show_names_on_join_limit -1
+
+	* -tls_verify is now enabled by default (#1170, an#18, #1309,
+           an#23)
+
+	  This may cause an ugly display of notls_verify in the output
+	  of /SERVER LIST, even on plain-text connection, on old
+	  configs. Kindly remove the "tls_verify = "no";" entries from
+	  your config file manually.
+
+	* Irssi will now attempt STARTTLS if advertised (#1170, #1312,
+	  an#19)
+
+	  Use -disallow_starttls if you absolutely do not want this
+
+	  In order to check for a STARTTLS advertisement, Irssi will
+	  now wait for a response (even an error) to CAP LS 302. If
+	  your bouncer/server does not want to communicate before
+	  receiving USER/PASS at all, use -nocap to disable the CAP
+	  check.
+
+	* Channel sync requests (WHO, MODE) are now sent "later" than
+          user commands. This should improve responsiveness to user
+          commands in the autojoin phase (an#26, an#32, an#33)
+	* Irssi is now using full paths in #include directives and
+          consequently does not add all directories to the include
+          path anymore (#1040)
+	* The Build System was ported to Meson (#1064, #1065, #1068,
+	  #1071, #1072, #1073, #1074, #1075, #1084, #1085, #1118, #1166,
+	  #1223, #1224, #1245, #1313, #1314, an#31)
+	* Scriptassist was changed to use a YAML database (#1163)
+
+	  It will tell you when you need to update your setting
+
+	* /BIND shows all partial matches (#1155)
+	* Cleanup of unused functions (#1017, #1132, #1145, #1182,
+	  #1246, #1264)
+
+	  Functions removed:
+
+	      NET_CALLBACK
+	      NET_HOST_CALLBACK
+	      RESOLVED_NAME_REC
+	      net_gethostbyaddr_nonblock
+	      net_connect_nonblock
+	      [ SIMPLE_THREAD_REC, simple_init, simple_readpipe ]
+	      hash_save_key
+
+	  Functions deprecated:
+
+	      dec2octal
+	      g_timeval_cmp
+	      get_timeval_diff
+
+	  Function names corrected:
+
+	      g_input -> i_input
+	      g_istr -> i_istr
+	      g_io_channel -> i_io_channel
+	      g_hash_free_value -> i_hash_free_value
+	      remove g_free_true
+	      gslist -> i_slist
+	      glog_func -> i_log_func
+	      glist -> i_list
+
+	  If multi-version compatibility is desired, module authors
+	  can find an example of backwards compatible code in
+	  cdidier/irssi-xmpp#55
+
+	+ Add MSGLEVEL_HIDDEN to Perl (#1044)
+	+ Add $view->set_hidden_level and $view->remove_lines_by_level
+	  to Perl (#1026)
+	+ Add a /SET scrollback_max_age setting (#1022). By Heikki
+	  Orsila
+	+ Add /SET actlist_prefer_window_name (#1025)
+	+ Add -window option to /CAT (#1023, #1159)
+	+ Add an option to list specific sections with
+
+	      /SET -section lookandfeel
+
+	  (#1048)
+
+	+ Add support for IRCv3 CAP LS 302 (#1091)
+	+ Add a new "print noformat" signal that goes together with
+	  "print format" (#1088, #1192)
+	+ Add support for IRCv3 extended-join. /SET show_extended_join
+	  to enable (#1097, #1107, #1124)
+
+	  There are two new /FORMATs, join_extended and
+	  join_extended_account, that theme writers need to take into
+	  account if desired.
+
+	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33,
+	  #1104, #1254)
+	+ Add support for IRCv3 account-notify (#1100, #1098, GL#33,
+	  #1105, #1131). Credit to oss-fuzz
+	  /SET show_account_notify to enable
+	+ Add support for IRCv3 invite-notify (#1094)
+	+ Add support for receiving IRCv3 message-tags (#576, #1090)
+	+ Add support for sending IRCv3 message-tags (#1092)
+	+ Add support for the oragono.io/maxline-2 CAP to increase IRC
+	  protocol line length (#1092)
+	+ Enable the znc.in/self-message CAP by default (#1123)
+	+ Add support for IRCv3 away-notify. /SET away_notify_public
+	  to enable (#1099, GL#33, #1105)
+	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
+	+ Add support for IRCv3 account-notify.
+	+ Add support for IRCv3 server-time. /SET show_server_time to
+	  enable (#1108)
+	+ Add support for logging IRCv3 server-time.
+	  /SET log_server_time to disable (#1318, an#16)
+	+ Add IRCv3 features to signals.txt (#1111)
+
+	  In particular, "message join" now takes 2 additional
+	  arguments, script and module authors must beware of this
+	  change.
+
+	+ Show the unignore time in /IGNORE output (#1158, #1161)
+	+ Add /SET quit_on_hup to make the behaviour of SIGHUP
+	  configurable (#828, #1169). By Pinguin1234
+	+ Support numeric 489 as ERR_SECUREONLYCHAN (#1193, #1196). By
+	  Michael Hansen
+	+ Improve support for building Irssi in Termux-Android with
+	  Meson (#1199)
+	+ Add usermode key to Irssi::Irc::Chatnet in Perl (#1288). By
+	  Jessica Sophie Porter
+	+ Add format_string_expand and format_string_unexpand
+	  functions to Perl (#1286)
+	+ Add ...->format_create_dest(...)->printformat("format",
+	  args...) and ...->printformat_module("module", "format",
+	  args...) methods to Perl (#1284)
+
+	  You can avoid any CORE::GLOBAL::caller hacks using the
+	  printformat_module method, especially sind that hack was not
+	  safe during signal emissions
+
+	+ Add tracking of user accounts in the channel nicklist using
+	  WHOX on join (#1250)
+	+ Add auto-loading of the Perl and otr module from /SET
+	  autoload_modules (#1295)
+	+ Add /IGNORE ... NOHILIGHT to ignore some hilights (#1260)
+	+ Do not beep on hidden lines with /SET beep_msg_level
+	  ... -HIDDEN (#1259)
+	+ Added /CS, /MS, /NS, and /OS aliases to the default config
+	  (#1316). By Mathis Beer
+	+ Allow -tls_ca{file,path} '' to unset an argument (#730,
+	  #1060, an#30)
+	+ Add a "server outgoing modify" signal to intercept outgoing
+	  messages (#1148, #1151, an#15). Original by
+	  JustAnotherArchivist
+	- remove some hard-coded 510 byte assumptions (#1086)
+	- Several fixes for error checks in SSL (#944, #1037, #943,
+          #1036). Reported by Chi Li
+	- Wrong variable tested in mask_match (#902, #1035)
+	- Fix bug where irssi-proxy with `?'-port would not reconnect
+          (#1041)
+	- Allow shrinking of /SET rawlog_lines (#957, #1020). By
+          Marcus "Teschi" Prinz
+	- Fix /WINDOW BALANCE warning (#1054)
+	- fix overflow when first command history entry expires
+          (#1070)
+	- begin modularising IRC module (#1067, #1112, #1113)
+	- fix some memory leaks in /DCC RESUME and settings_add
+          (#1077). By Zero King
+	- fix cut-off text with theme_indent module and /SET
+          indent_always OFF (#1078)
+	- fix the cap_queue order (#1095)
+	- add reference counted strings (#1089)
+	- Fix irc_op_public messages not triggering hilights (#354,
+          #891, #1129). By Dan Collins
+	- Fix /IGNORE not setting the right level in irc_op_public
+          messages (#1280). Credit to oss-fuzz
+	- Fix GTimeVal deprecation (#1141, #1144, #1145)
+
+	  If multi-version compatibility is desired, module authors
+	  can find an example of backwards compatible code in
+	  cdidier/irssi-xmpp#53
+
+	- Fix /IGNORE ... MODES NO_ACT not working (#1164)
+	- Deprecated -ssl* options are hidden from tab completion
+          (#1171)
+	- Make /SET actlist_sort a choice type (#1198)
+	- Fix crash from self-unloading script (#1206). By Thomas
+          Stagner
+	- Fix crash during Perl signal emission (#1233, #1234)
+	- Fix a case where empty lines or comments inside channels or
+          servers in the config would confuse Irssi (#1062, #1242,
+          #1243)
+	- Fix reported freezing in DCC GET on slow disks (#159, #1271)
+	- Fix message-tags parsing (#1274, #1275). Credit to oss-fuzz
+	- Fail redirects when receiving numeric 263 (RPL_TRYAGAIN) in
+          response to /WHO (#1283)
+	- Some updates to .gitignore (#1302). By Rene Kita
+	- Fix build on operating systems with X/Open Curses, version 2
+	  (#1305, #1308). By Nia Alarie (Regression introduced with
+	  #1290, alternative fix for Irssi 1.2.3 no-term.h.patch)
+	- Fix otr module not using g_strndup, e.g. on Solaris 10
+          (#1315). By Claes Nästén
+	- Fix cursor getting stuck for auto completions that changes
+          case (#1176, #1322, an#8). By ffrogman
+	- Restore operation of tag/* in /SET activity_hide_targets
+	  (#1337, an#11) nb. the ::all syntax was working in Irssi 1.1
+	  and 1.2 (and continues to work)
+	- Fix /SERVER ADD -matrix -network my_matrix_network
+          (an#12). By Andrej Kacian
+	- Fix /SERVER ADD creating duplicated entries in the config
+          file (#1317, an#22)
+	- Fix critical when SASL user is set and SASL password is
+          empty (#1325, an#21)
+	- Misc fixes (#1106, #1141, #1272, #1297)
+	- Fuzz fixes (#1116, #1117, #1119, #1125, #1126, an#20)
+	- Build system fixes (#1101, #1102, #1069, #1140, #1181, #1253)
+	- Text and Help updates
+	  - add -tls_* options to manual (#1029, #1030). By Jacob
+            V. Rasmussen
+	  - missing targets in /MSG (#1032)
+	  - wrong parameter in /ECHO (#1024)
+	  - Spelling in OTR (#1047). By David Gall
+	  - Clarify statusbar priority (#1049). By Marius Gedminas
+	  - Document get_irssi_dir in Perl (#1051, #1052). By Alex
+            Shafer
+	  - typo in /HILIGHT help (#1081). By DFrostByte
+	  - improved clarity of your_nick_owned (#1138). By Mike Quin
+	  - Update some URLs to https (#1163)
+	  - Add documentation for escaping some characters (#1329,
+            #1330, an#9). By Guntbert Reiter
+	  - Fix some typos (#1336, an#10). By Francis Mteo
+	- Infrastructure updates:
+	  - Support for Github Actions (#1039, #1103, #1160, #1212,
+            #1231, #1252, #1261)
+	  - Run clang-format on pull requests (#1172, #1173, #1184,
+            #1230, #1247, #1287)
+	  - Run abidiff on pull requests (#1179, #1195)
+	  - Test CI-Fuzz (#1279, #1304, an#17)
 
 v1.2.3 2021-04-11 The Irssi team <staff@irssi.org>
 	- Fix the compilation of utf8proc (#1021)
@@ -40,7 +310,7 @@ v1.2.3 2021-04-11 The Irssi team <staff@irssi.org>
 
 v1.2.2 2019-08-29 The Irssi team <staff@irssi.org>
 	- Fix a use after free issue when receiving IRCv3 CAP
-          information from the server (GL#34)
+          information from the server (GL#34, GL!35)
 	- Fix a crash during startup when windows weren't fully
           initialised yet (#1114, bdo#935813)
 
diff --git a/README.md b/README.md
index d1232764..21fa14e8 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
-# [Irssi](https://irssi.org/)
+# Neırssi
 
-![Build Status](https://github.com/irssi/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
+![Build Status](https://github.com/ailin-nemui/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
 
-Irssi is a modular chat client that is most commonly known for its
-text mode user interface, but 80% of the code isn't text mode
-specific. Irssi comes with IRC support built in, and there are
-third party [ICB](https://github.com/jperkin/irssi-icb),
+Neırssi is a modular text mode chat client mostly compatible with
+[Irssi](https://irssi.org). It comes with IRC support built in, and
+there are third party [ICB](https://github.com/jperkin/irssi-icb),
 [SILC](http://www.silcnet.org/),
 [XMPP](http://cybione.org/~irssi-xmpp/) (Jabber),
 [PSYC](http://about.psyc.eu/Irssyc) and
@@ -14,14 +13,14 @@ available.
 
 ![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
 
-## [Download information](https://irssi.org/download/)
+## [Download information](https://ailin-nemui.github.io/irssi/Getting.html)
 
 #### Development source installation
 
 [Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49
 
 ```
-git clone https://github.com/irssi/irssi
+git clone https://github.com/ailin-nemui/irssi
 cd irssi
 meson Build
 ninja -C Build && sudo ninja -C Build install
@@ -29,13 +28,13 @@ ninja -C Build && sudo ninja -C Build install
 
 #### Release source installation
 
-* Download [release](https://github.com/irssi/irssi/releases)
-* [Verify](https://irssi.org/download/#release-sources) signature
+* Download [release](https://github.com/ailin-nemui/irssi/releases)
+* Verify signature
 ```
 tar xJf irssi-*.tar.xz
 cd irssi-*
-./configure
-make && sudo make install
+meson Build
+ninja -C Build && sudo ninja -C Build install
 ```
 
 ### Requirements
@@ -47,23 +46,23 @@ make && sudo make install
 
 #### See the [INSTALL](INSTALL) file for details
 
-## [Documentation](https://irssi.org/documentation/)
+## Documentation
 
-* [Frequently Asked Questions](https://irssi.org/documentation/faq)
-* [Startup How-To](https://irssi.org/documentation/startup)
+* [New users guide](https://ailin-nemui.github.io/irssi/New-users.html)
 * Check the built-in `/HELP`, it has all the details on command syntax
+* Other random Irssi documentation on https://irssi.org/documentation/
 
 ## [Themes](https://irssi-import.github.io/themes/)
 
 ## [Scripts](https://scripts.irssi.org/)
 
-## [Modules](https://irssi.org/modules/)
+## [Modules](https://ailin-nemui.github.io/irssi/Modules.html)
 
 ## [Security information](https://irssi.org/security/)
 
 Please report security issues to staff@irssi.org. Thanks!
 
-## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / [Contributing](https://irssi.org/development/)
+## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / Contributing
 
 Check the GitHub issues if it is already listed in there; if not, open
 an issue on GitHub or send a mail to [staff@irssi.org](mailto:staff@irssi.org).
diff --git a/src/core/expandos.c b/src/core/expandos.c
index 0f317e51..da84b568 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -322,7 +322,7 @@ static char *expando_last_invite(SERVER_REC *server, void *item, int *free_ret)
 /* client version text string */
 static char *expando_version(SERVER_REC *server, void *item, int *free_ret)
 {
-	return PACKAGE_VERSION;
+	return PACKAGE_VERSION "-an";
 }
 
 /* current value of CMDCHARS */
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index 7cdc5654..e9d4fab9 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -84,11 +84,7 @@ FORMAT_REC gui_text_formats[] =
 	{ NULL, "Welcome", 0 },
 
 	{ "irssi_banner",
-	  " ___           _%:"
-	  "|_ _|_ _ _____(_)%:"
-	  " | || '_(_-<_-< |%:"
-	  "|___|_| /__/__/_|%:"
-	  "Irssi v$J - https://irssi.org", 0 },
+	  "Neırssi v$J", 0 },
 	{ "welcome_firsttime",
 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
 	  "Hi there! If this is your first time using Irssi, you%:"

From 2003446e988280d86aebd2bc2492670f3329a9b7 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 7 Sep 2021 01:21:35 +0200
Subject: [PATCH 1305/1650] continue head

---
 NEWS                | 2 ++
 configure.ac        | 2 +-
 meson.build         | 2 +-
 src/core/expandos.c | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index b3282761..87cd3cfd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+v1.4-head-an 2022-xx-xx  Ailin Nemui <Nei>
+
 v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
diff --git a/configure.ac b/configure.ac
index 3a9e7bd6..a51edf3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3-head)
+AC_INIT(irssi, 1.4-head-an)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index bd192a92..31bdfa9f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3-head',
+  version : '1.4-head-an',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/src/core/expandos.c b/src/core/expandos.c
index da84b568..0f317e51 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -322,7 +322,7 @@ static char *expando_last_invite(SERVER_REC *server, void *item, int *free_ret)
 /* client version text string */
 static char *expando_version(SERVER_REC *server, void *item, int *free_ret)
 {
-	return PACKAGE_VERSION "-an";
+	return PACKAGE_VERSION;
 }
 
 /* current value of CMDCHARS */

From 521c0d4e6fb906f65855f13e70c063ec7eb13552 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 8 Sep 2021 11:57:25 +0200
Subject: [PATCH 1306/1650] remove oragono.io/maxline-2

---
 src/irc/core/irc-servers.c | 21 ---------------------
 src/irc/core/irc-servers.h |  1 -
 2 files changed, 22 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 1c9f0cec..664ca9a4 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -282,7 +282,6 @@ static void server_init_1(IRC_SERVER_REC *server)
 		irc_cap_toggle(server, CAP_SASL, TRUE);
 	}
 
-	irc_cap_toggle(server, CAP_MAXLINE, TRUE);
 	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
 	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
 	irc_cap_toggle(server, CAP_SETNAME, TRUE);
@@ -647,24 +646,6 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
 	g_free(recoded);
 }
 
-static void cap_maxline(IRC_SERVER_REC *server)
-{
-	unsigned int maxline = 0;
-	gboolean parse_successful = FALSE;
-	const char *maxline_str;
-
-	maxline_str = g_hash_table_lookup(server->cap_supported, CAP_MAXLINE);
-	if (maxline_str != NULL) {
-		parse_successful = parse_uint(maxline_str, NULL, 10, &maxline);
-
-	}
-
-	if (parse_successful &&
-	    maxline >= MAX_IRC_MESSAGE_LEN + 2 /* 2 bytes for CR+LF */) {
-		server->max_message_len = maxline - 2;
-	}
-}
-
 void irc_server_send_action(IRC_SERVER_REC *server, const char *target, const char *data)
 {
 	char *recoded;
@@ -1226,7 +1207,6 @@ void irc_servers_init(void)
 	signal_add_first("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
 	signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit);
-	signal_add("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_add("event 670", (SIGNAL_FUNC) event_starttls);
 	signal_add("event 451", (SIGNAL_FUNC) event_registerfirst);
 	signal_add("server cap end", (SIGNAL_FUNC) event_capend);
@@ -1258,7 +1238,6 @@ void irc_servers_deinit(void)
 	signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
-	signal_remove("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_remove("event 670", (SIGNAL_FUNC) event_starttls);
 	signal_remove("event 451", (SIGNAL_FUNC) event_registerfirst);
 	signal_remove("server cap end", (SIGNAL_FUNC) event_capend);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 93fa02a4..903de773 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -15,7 +15,6 @@
 #define MAX_IRC_USER_TAGS_LEN 4094
 
 #define CAP_LS_VERSION "302"
-#define CAP_MAXLINE "oragono.io/maxline-2"
 #define CAP_MESSAGE_TAGS "message-tags"
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"

From 85eb4f118fca71daaf67c0c1440f169c164bd87f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 8 Sep 2021 12:03:05 +0200
Subject: [PATCH 1307/1650] also remove from NEWS

---
 NEWS | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 87cd3cfd..7ed44195 100644
--- a/NEWS
+++ b/NEWS
@@ -136,9 +136,7 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  /SET show_account_notify to enable
 	+ Add support for IRCv3 invite-notify (#1094)
 	+ Add support for receiving IRCv3 message-tags (#576, #1090)
-	+ Add support for sending IRCv3 message-tags (#1092)
-	+ Add support for the oragono.io/maxline-2 CAP to increase IRC
-	  protocol line length (#1092)
+	+ Add support for sending IRCv3 message-tags (#1092, an#34)
 	+ Enable the znc.in/self-message CAP by default (#1123)
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)

From 27a73e253b66240d02d0738e38c6162765e27726 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 8 Sep 2021 12:04:18 +0200
Subject: [PATCH 1308/1650] duplicate issue in NEWS

reported by @tobbez
---
 NEWS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 87cd3cfd..0515314f 100644
--- a/NEWS
+++ b/NEWS
@@ -129,8 +129,7 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  join_extended_account, that theme writers need to take into
 	  account if desired.
 
-	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33,
-	  #1104, #1254)
+	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33)
 	+ Add support for IRCv3 account-notify (#1100, #1098, GL#33,
 	  #1105, #1131). Credit to oss-fuzz
 	  /SET show_account_notify to enable

From 42f749346b375ccd5e46527a21ff2e7192273f5f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 8 Sep 2021 13:03:03 +0200
Subject: [PATCH 1309/1650] Merge pull request #34 from ailin-nemui/no-maxline

remove oragono.io/maxline-2

(cherry picked from commit 7e1401140412361b813accd99aa367658435c12f)
---
 NEWS                       |  4 +---
 src/irc/core/irc-servers.c | 21 ---------------------
 src/irc/core/irc-servers.h |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/NEWS b/NEWS
index b3282761..8be7531e 100644
--- a/NEWS
+++ b/NEWS
@@ -134,9 +134,7 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  /SET show_account_notify to enable
 	+ Add support for IRCv3 invite-notify (#1094)
 	+ Add support for receiving IRCv3 message-tags (#576, #1090)
-	+ Add support for sending IRCv3 message-tags (#1092)
-	+ Add support for the oragono.io/maxline-2 CAP to increase IRC
-	  protocol line length (#1092)
+	+ Add support for sending IRCv3 message-tags (#1092, an#34)
 	+ Enable the znc.in/self-message CAP by default (#1123)
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 1c9f0cec..664ca9a4 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -282,7 +282,6 @@ static void server_init_1(IRC_SERVER_REC *server)
 		irc_cap_toggle(server, CAP_SASL, TRUE);
 	}
 
-	irc_cap_toggle(server, CAP_MAXLINE, TRUE);
 	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
 	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
 	irc_cap_toggle(server, CAP_SETNAME, TRUE);
@@ -647,24 +646,6 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
 	g_free(recoded);
 }
 
-static void cap_maxline(IRC_SERVER_REC *server)
-{
-	unsigned int maxline = 0;
-	gboolean parse_successful = FALSE;
-	const char *maxline_str;
-
-	maxline_str = g_hash_table_lookup(server->cap_supported, CAP_MAXLINE);
-	if (maxline_str != NULL) {
-		parse_successful = parse_uint(maxline_str, NULL, 10, &maxline);
-
-	}
-
-	if (parse_successful &&
-	    maxline >= MAX_IRC_MESSAGE_LEN + 2 /* 2 bytes for CR+LF */) {
-		server->max_message_len = maxline - 2;
-	}
-}
-
 void irc_server_send_action(IRC_SERVER_REC *server, const char *target, const char *data)
 {
 	char *recoded;
@@ -1226,7 +1207,6 @@ void irc_servers_init(void)
 	signal_add_first("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
 	signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit);
-	signal_add("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_add("event 670", (SIGNAL_FUNC) event_starttls);
 	signal_add("event 451", (SIGNAL_FUNC) event_registerfirst);
 	signal_add("server cap end", (SIGNAL_FUNC) event_capend);
@@ -1258,7 +1238,6 @@ void irc_servers_deinit(void)
 	signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
-	signal_remove("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_remove("event 670", (SIGNAL_FUNC) event_starttls);
 	signal_remove("event 451", (SIGNAL_FUNC) event_registerfirst);
 	signal_remove("server cap end", (SIGNAL_FUNC) event_capend);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 93fa02a4..903de773 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -15,7 +15,6 @@
 #define MAX_IRC_USER_TAGS_LEN 4094
 
 #define CAP_LS_VERSION "302"
-#define CAP_MAXLINE "oragono.io/maxline-2"
 #define CAP_MESSAGE_TAGS "message-tags"
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"

From 0f3e95892de7e7a360336fcc9739e770916a9156 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 8 Sep 2021 13:03:14 +0200
Subject: [PATCH 1310/1650] Merge pull request #35 from ailin-nemui/fixes

duplicate issue in NEWS

(cherry picked from commit d3e105a3963cbc693ac316ae884b000902999828)
---
 NEWS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 8be7531e..ced7bcd5 100644
--- a/NEWS
+++ b/NEWS
@@ -127,8 +127,7 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  join_extended_account, that theme writers need to take into
 	  account if desired.
 
-	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33,
-	  #1104, #1254)
+	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33)
 	+ Add support for IRCv3 account-notify (#1100, #1098, GL#33,
 	  #1105, #1131). Credit to oss-fuzz
 	  /SET show_account_notify to enable

From 949dc06af3a023436712ba5e2a1f90641fd56d23 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 15 Sep 2021 17:48:27 +0200
Subject: [PATCH 1311/1650] correctly store updated message levels e.g. from
 /hilight

---
 src/fe-text/textbuffer-formats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 20abc0df..50d6250a 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -265,7 +265,7 @@ static void sig_gui_print_text_finished(WINDOW_REC *window, TEXT_DEST_REC *dest)
 
 	info->meta = line_meta_create(dest->meta);
 
-	info->level |= MSGLEVEL_FORMAT;
+	info->level = dest->level | MSGLEVEL_FORMAT;
 
 	/* the line will be inserted into the view with textbuffer_view_insert_line by
 	   gui-printtext.c:view_add_eol */

From 515e493db392a9e6944551a156e1780d653cd208 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 15 Sep 2021 17:52:44 +0200
Subject: [PATCH 1312/1650] update news

---
 NEWS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index f4a7a199..1934dfbf 100644
--- a/NEWS
+++ b/NEWS
@@ -4,9 +4,10 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
+
 	* The display system now renders formats on the fly (#1079,
-	  #1188, #1191, #1192, #1204, #1205, #1209, an#13, an#14, an#28,
-	  an#29)
+	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
+	  an#14, an#28, an#29, an#36)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need

From 8b49cd012dc4af4040eb4ef03939e80072d40a5f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 15 Sep 2021 17:56:45 +0200
Subject: [PATCH 1313/1650] Merge pull request #36 from
 ailin-nemui/missing-hilights

correctly store updated message levels e.g. from /hilight

(cherry picked from commit ad8221835c90969a6ba87807b072ba9f4d63bd48)
---
 NEWS                             | 5 +++--
 src/fe-text/textbuffer-formats.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index ced7bcd5..b7c62b93 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,10 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
+
 	* The display system now renders formats on the fly (#1079,
-	  #1188, #1191, #1192, #1204, #1205, #1209, an#13, an#14, an#28,
-	  an#29)
+	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
+	  an#14, an#28, an#29, an#36)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 20abc0df..50d6250a 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -265,7 +265,7 @@ static void sig_gui_print_text_finished(WINDOW_REC *window, TEXT_DEST_REC *dest)
 
 	info->meta = line_meta_create(dest->meta);
 
-	info->level |= MSGLEVEL_FORMAT;
+	info->level = dest->level | MSGLEVEL_FORMAT;
 
 	/* the line will be inserted into the view with textbuffer_view_insert_line by
 	   gui-printtext.c:view_add_eol */

From bcea697e7c3eba1df2affdfd68f6c54f2bb0da06 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 19 Sep 2021 20:59:14 +0200
Subject: [PATCH 1314/1650] fix pedantic error in MSGLEVEL enum

reported by horgh
---
 src/core/levels.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/levels.h b/src/core/levels.h
index 04893b34..7f1aa931 100644
--- a/src/core/levels.h
+++ b/src/core/levels.h
@@ -42,7 +42,7 @@ enum {
 	MSGLEVEL_HIDDEN       = 0x10000000, /* Hidden from view */
 	MSGLEVEL_RESERVED1    = 0x20000000,
 	MSGLEVEL_RESERVED2    = 0x40000000,
-	MSGLEVEL_FORMAT       = 0x80000000  /* Format data */
+	MSGLEVEL_FORMAT       = (int)0x80000000  /* Format data */
 };
 /* clang-format on */
 

From df227eb0946aa4967613a26bba74fcaf96880a95 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 22 Sep 2021 10:50:20 +0200
Subject: [PATCH 1315/1650] update github actions ubuntu version to 18.04 and
 meson to <0.60.0

---
 .github/workflows/check.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 61de72ff..97cb3feb 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: prepare required software
         run: |
-          sudo apt install $apt_build_deps $apt_build_deps_autotools
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_autotools
       - uses: actions/checkout@main
       - name: make dist
         run: |
@@ -38,18 +38,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, ubuntu-latest]
+        os: [ubuntu-18.04, ubuntu-latest]
         builder: [meson, configure]
         compiler: [clang, gcc]
         flags: [regular]
         include:
-          - os: ubuntu-16.04
+          - os: ubuntu-18.04
             builder: meson
             meson_ver: ==0.49.2
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.59.0
+            meson_ver: <0.60.0
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK
@@ -64,7 +64,7 @@ jobs:
           meson_ver: ${{ matrix.meson_ver }}
           setuptools_ver: ${{ matrix.setuptools_ver }}
         run: |
-          sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
           eval "$get_pip_build_deps_${{ matrix.builder }}"
           curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
       - name: unpack archive

From 32a3f4463c435304717883f810d222c0f79492a9 Mon Sep 17 00:00:00 2001
From: bw1 <bw1@aol.at>
Date: Sun, 19 Sep 2021 19:56:14 +0200
Subject: [PATCH 1316/1650] update docs

+ version()
+ $abiversion
+ parse_special()
---
 docs/perl.txt         | 6 ++++++
 docs/special_vars.txt | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/docs/perl.txt b/docs/perl.txt
index 761b2f4d..964f4f72 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -205,6 +205,12 @@ Window::command(cmd)
 Windowitem::command(cmd)
   Send a command `cmd' (in current channel). The '/' char isn't needed.
 
+version() - return client release date and time (format YYYYMMDD.hhmm)
+
+parse_special(cmd, data="", flags=0)
+Server::parse_special(cmd, data="", flags=0)
+Windowitem::parse_special(cmd, data="", flags=0)
+  evaluate a string with special vars
 
  *** Themes
 
diff --git a/docs/special_vars.txt b/docs/special_vars.txt
index 36517f78..1101c8a6 100644
--- a/docs/special_vars.txt
+++ b/docs/special_vars.txt
@@ -94,6 +94,8 @@ $A .. $Z is important.
    $winname             window name
    $itemname            like $T, but use item's visible_name which may be
                         different (eg. $T = !12345chan, $itemname = !chan)
+   $abiversion          IRSSI_ABI_VERSION
+                         https://github.com/irssi/irssi/wiki/irssi_abi_version
 
 For example, assume you have the following alias:
 

From 6a83eddf84573acd0d489dc2eb18796699494a23 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 21 Sep 2021 22:40:14 +0200
Subject: [PATCH 1317/1650] run syncdocs.sh and syncscripts.sh

---
 docs/faq.html           |   4 +-
 docs/faq.txt            |   6 +-
 docs/startup-HOWTO.html |   4 +-
 docs/startup-HOWTO.txt  |   4 +-
 scripts/quitmsg.pl      |  27 +++-----
 scripts/scriptassist.pl | 139 +++++++++++++++++++++++++---------------
 6 files changed, 104 insertions(+), 80 deletions(-)

diff --git a/docs/faq.html b/docs/faq.html
index 7c17f45d..50b404a0 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -2,7 +2,7 @@
 <h1>Frequently Asked Questions</h1>
     <h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
 
-<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
+<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-256color or color_xterm (eg. <code>TERM=xterm-256color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
 
 <h3 id="q-how-do-i-easily-write-text-to-channel-that-starts-with--character">Q: How do I easily write text to channel that starts with ‘/’ character?</h3>
 
@@ -54,7 +54,7 @@
 
 <h3 id="q-will-there-be-detach-like-feature">Q: Will there be /DETACH-like feature?</h3>
 
-<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
+<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="https://sourceforge.net/projects/dtach/">dtach</a> can be used to do it just fine.</p>
 
 <h3 id="q-how-do-i-run-scripts-automatically-at-startup">Q: How do I run scripts automatically at startup?</h3>
 
diff --git a/docs/faq.txt b/docs/faq.txt
index 0d0b5f46..0fcc156a 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -4,8 +4,8 @@ Q: Why doesn’t irssi display colors even when ircii etc. displays them?
 A: They force ANSI colors even if terminal doesn’t support them. By default,
    irssi uses colors only if terminfo/termcap so says. The correct way to fix this
    would be to change your TERM environment to a value where colors work, like
-   xterm-color or color_xterm (eg. TERM=xterm-color irssi). If this doesn’t help,
-   then use the evil way of /SET term_force_colors ON.
+   xterm-256color or color_xterm (eg. TERM=xterm-256color irssi). If this doesn’t
+   help, then use the evil way of /SET term_force_colors ON.
 
 Q: How do I easily write text to channel that starts with ‘/’ character?
 A: / /text
@@ -119,6 +119,6 @@ A: Check [6]here
    [1] https://github.com/irssi-import/xirssi
    [2] https://tmux.github.io/
    [3] https://www.gnu.org/software/screen/screen.html
-   [4] http://dtach.sf.net/
+   [4] https://sourceforge.net/projects/dtach/
    [5] https://dgl.cx/irssi/hack-whois-in-current-window.pl
    [6] https://irssi.org/assets/irssi.wav
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index b0c68f1f..696dea4d 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -226,7 +226,7 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <p>And finally channels:</p>
 
-<div><div><pre><code>/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+<div><div><pre><code>/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
 /CHANNEL ADD -auto #secret IRCnet password
 </code></pre></div></div>
 
@@ -395,7 +395,7 @@ Ctrl-X                - set the next server in list active
 
 <p><code>/HELP bind</code> tells pretty much everything there is to know about keyboard bindings. However, there’s the problem of how to bind some non-standard keys. They might differ a bit with each terminal, so you’ll need to find out what exactly the keypress produces. Easiest way to check that would be to see what it prints in <code>cat</code>. Here’s an example for pressing F1 key:</p>
 
-<div><div><pre><code> [user@host] ~% cat
+<div><div><pre><code> [cras@hurina] ~% cat
  ^[OP
 </code></pre></div></div>
 
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index bff33108..90d278de 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -218,7 +218,7 @@ IRC network, other servers are automatically connected in same network if the
 
 And finally channels:
 
-/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
 /CHANNEL ADD -auto #secret IRCnet password
 
 -bots and -botcmd should be the only ones needing a bit of explaining. They’re
@@ -442,7 +442,7 @@ They might differ a bit with each terminal, so you’ll need to find out what
 exactly the keypress produces. Easiest way to check that would be to see what
 it prints in cat. Here’s an example for pressing F1 key:
 
- [user@host] ~% cat
+ [cras@hurina] ~% cat
  ^[OP
 
 So in irssi you would use /BIND ^[OP /ECHO F1 pressed. If you use multiple
diff --git a/scripts/quitmsg.pl b/scripts/quitmsg.pl
index e289468c..102d9aa5 100644
--- a/scripts/quitmsg.pl
+++ b/scripts/quitmsg.pl
@@ -6,36 +6,27 @@ use Irssi::Irc;
 use strict;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.00";
+$VERSION = "1.01";
 %IRSSI = (
     authors     => 'Timo Sirainen',
     name        => 'quitmsg',
     description => 'Random quit messages',
     license     => 'Public Domain',
-    changed	=> 'Sun Mar 10 23:18 EET 2002'
+    changed	=> 'Mon Jul 22 20:00 EET 2020'
 );
 
-my $quitfile = glob "~/.irssi/irssi.quit";
+my $quitfile = Irssi::get_irssi_dir() . "/irssi.quit";
 
 sub cmd_quit {
 	my ($data, $server, $channel) = @_;
 	return if ($data ne "");
+	
+	open (my $fh, "<", $quitfile) || return;
+	my @lines = <$fh>;
 
-	open (f, "<", $quitfile) || return;
-	my $lines = 0; while(<f>) { $lines++; };
-
-	my $line = int(rand($lines))+1;
-
-	my $quitmsg;
-	seek(f, 0, 0); $. = 0;
-	while(<f>) {
-		next if ($. != $line);
-
-		chomp;
-		$quitmsg = $_;
-		last;
-	}
-	close(f);
+	my $quitmsg = $lines[int(rand(@lines))];
+	chomp($quitmsg);
+	close($fh);
 
 	foreach my $server (Irssi::servers) {
 		$server->command("/disconnect ".$server->{tag}." $quitmsg");
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 536ef33a..cf02d57e 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2003020807';
+our $VERSION = '2020042700';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -23,12 +23,15 @@ use Irssi 20020324;
 use CPAN::Meta::YAML;
 use LWP::UserAgent;
 use POSIX;
+use version;
 
 # GnuPG is not always needed
 $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
+my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+
 sub show_help {
     my $help = "scriptassist $VERSION
 /scriptassist check
@@ -39,15 +42,15 @@ sub show_help {
     Search the script database
 /scriptassist info <scripts>
     Display information about <scripts>
-".#/scriptassist ratings <scripts>
-#    Retrieve the average ratings of the the scripts
-#/scriptassist top <num>
-#    Retrieve the first <num> top rated scripts
-"/scriptassist new <num>
+/scriptassist ratings <scripts|all>
+    Retrieve the average ratings of the the scripts
+/scriptassist top <num>
+    Retrieve the first <num> top rated scripts
+/scriptassist new <num>
     Display the newest <num> scripts
-".#/scriptassist rate <script> <stars>
-#    Rate the script with a number of stars ranging from 0-5
-"/scriptassist contact <script>
+/scriptassist rate <script>
+    Rate the script if you like it
+/scriptassist contact <script>
     Write an email to the author of the script
     (Requires OpenURL)
 /scriptassist cpan <module>
@@ -95,6 +98,7 @@ sub call_openurl {
 	$code->($url);
     } else {
         print CLIENTCRAP "%R>>%n Please install openurl.pl";
+        print CLIENTCRAP "%R>>%n    or open < $url > manually";
     }
 }
 
@@ -188,7 +192,7 @@ sub get_unknown {
     foreach (keys %$db) {
 	next unless defined $db->{$_}{commands};
 	foreach my $item (split / /, $db->{$_}{commands}) {
-	    return { $_ => $db->{$_} } if ($item =~ /^$cmd$/i);
+	    return { $_ => +{%{$db->{$_}}} } if ($item =~ /^$cmd$/i);
 	}
     }
     return undef;
@@ -264,47 +268,80 @@ sub script_info {
 		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
 	    }
 	}
-	if (defined $xml->{$plname}{depends}) {
-	    my $depends = $xml->{$plname}{depends};
-	    foreach my $dep (split(/ /, $depends)) {
-		$result{$sname}{depends}{$dep}{installed} = 1;
-	    }
-	}
+	# if (defined $xml->{$plname}{depends}) {
+	#     my $depends = $xml->{$plname}{depends};
+	#     foreach my $dep (split(/ /, $depends)) {
+	# 	$result{$sname}{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep });
+	#     }
+	# }
     }
     return \%result;
 }
 
+sub get_rate_url {
+    my ($src) = @_;
+    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
+    $ua->agent('ScriptAssist/'.$VERSION);
+    my $request = HTTP::Request->new('GET', $src);
+    my $response = $ua->request($request);
+    unless ($response->is_success) {
+	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
+	die("Fetching ratings location failed: $error");
+    }
+    my $votes_url;
+    for my $tag ($response->content() =~ /<script([^>]*)>/g) {
+	my $attr = " $tag ";
+	($votes_url = $1) =~ s/\.\w+$/.yml/
+	    if $attr =~ /\sasync\s/ && $attr =~ m{\ssrc="(https?://.*?/votes\.\w+)"\s};
+    }
+    unless ($votes_url) {
+	die("Fetching ratings failed: Could not find votes script\n");
+    }
+    $request = HTTP::Request->new('GET', $votes_url);
+    $response = $ua->request($request);
+    if (!$response->is_success) {
+	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
+	die("Fetching ratings failed: $error");
+    }
+    my $data = $response->content();
+    utf8::decode($data);
+    CPAN::Meta::YAML->read_string($data)->[0];
+}
+
 sub rate_script {
     my ($script, $stars) = @_;
-    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.2003020803);
-    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?&stars='.$stars.'&mode=rate&script='.$script);
-    my $response = $ua->request($request);
-    unless ($response->is_success() && $response->content() =~ /You already rated this script/) {
-	return 1;
-    } else {
-	return 0;
-    }
+    my $xml = get_scripts();
+    my $votes = get_rate_url(map { $_->{source} } values %$xml);
+    my ($sname, $plname, $pname) = get_names($script, $xml);
+    die "Script $script not found\n" unless $votes->{$plname};
+    return $votes->{$plname}{u}
 }
 
 sub get_ratings {
     my ($scripts, $limit) = @_;
-    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.2003020803);
-    my $script = join(',', @{$scripts});
-    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?script='.$script.'&sort=rating&limit='.$limit);
-    my $response = $ua->request($request);
-    my %result;
-    if ($response->is_success()) {
-	foreach (split /\n/, $response->content()) {
-	    if (/<tr><td><a href=".*?">(.*?)<\/a>/) {
-		my $entry = $1;
-		if (/"><\/td><td>([0-9.]+)<\/td><td>(.*?)<\/td><td>/) {
-		    $result{$entry} = [$1, $2];
-		}
-	    }
+    my $xml = get_scripts();
+    my $votes = get_rate_url(map { $_->{source} } values %$xml);
+    foreach (keys %{$votes}) {
+	if ($xml->{$_}) {
+	    $xml->{$_}{votes} = $votes->{$_}{v};
 	}
     }
+    my %result;
+    if (@{$scripts}) {
+	foreach (@{$scripts}) {
+	    my ($sname, $plname, $pname) = get_names($_, $xml);
+	    next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} ));
+	    $result{$plname} = [$xml->{$plname}{votes}];
+	}
+    } else {
+	my @keys = sort { $xml->{$b}{votes} <=> $xml->{$a}{votes}
+		  || $xml->{$b}{modified} cmp $xml->{$a}{modified} }
+	    grep { !$xml->{$_}{HIDDEN} && $xml->{$_}{votes} ne '' } keys %$xml;
+	foreach (splice @keys, 0, $limit) {
+	    $result{$_} = [$xml->{$_}{votes}];
+	}
+    }
+    die "No such script found\n" unless keys %result;
     return \%result;
 }
 
@@ -597,13 +634,8 @@ sub print_rate {
     my (%data) = @_;
     my $line;
     foreach my $script (sort keys(%data)) {
-	if ($data{$script}) {
-            $line .= "%go%n %9".$script."%9 has been rated";
-        } else {
-            $line .= "%ro%n %9".$script."%9 : Already rated this script";
-        }
+	call_openurl($data{$script});
     }
-    print CLIENTCRAP draw_box('ScriptAssist', $line, 'rating', 1) ;
 }
 
 sub print_ratings {
@@ -617,8 +649,7 @@ sub print_ratings {
 	    push @line, "%yo%n";
 	}
         push @line, "%9".$script."%9";
-	push @line, $data{$script}{rating};
-	push @line, "[".$data{$script}{votes}." votes]";
+	push @line, "[".(length $data{$script}{rating} ? $data{$script}{rating} : 'no')." votes]";
 	push @table, \@line;
     }
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'ratings', 1) ;
@@ -845,7 +876,8 @@ sub get_scripts {
 	}
 	$fetched = 1;
 	my $data = $response->content();
-	my ($src, $type);
+	my $src = $site;
+	my $type = '';
 	if ($site =~ /(.*\/).+\.(.+)/) {
 	    $src = $1;
 	    $type = $2;
@@ -1115,9 +1147,9 @@ sub cmd_scripassist {
     } elsif ($args[0] eq 'ratings' && defined $args[1]) {
 	shift @args;
 	bg_do("ratings ".join(' ', @args));
-    } elsif ($args[0] eq 'rate' && defined $args[1] && defined $args[2]) {
+    } elsif ($args[0] eq 'rate' && defined $args[1]) {
 	shift @args;
-	bg_do("rate ".join(' ', @args)) if ($args[2] >= 0 && $args[2] < 6);
+	bg_do("rate ".join(' ', @args));
     } elsif ($args[0] eq 'info' && defined $args[1]) {
 	shift @args;
 	bg_do("info ".join(' ', @args));
@@ -1158,6 +1190,7 @@ sub sig_command_script_load {
 sub sig_default_command {
     my ($cmd, $server) = @_;
     return unless Irssi::settings_get_bool("scriptassist_check_unknown_commands");
+    return if ($cmd =~ /^\d+$/ && $irssi_version >= v1.2.0 && Irssi::settings_get_bool("window_number_commands"));
     bg_do('unknown '.$cmd);
 }
 
@@ -1213,11 +1246,11 @@ foreach my $cmd ( ( 'check',
 		    'search',
 #		    '-h',
 		    'help',
-#		    'ratings',
-#		    'rate',
+		    'ratings',
+		    'rate',
 		    'info',
 #		    'echo',
-#		    'top',
+		    'top',
 		    'cpan',
 		    'autorun',
 		    'new' ) ) {

From 4943cc5e58f0b26b20c69f6d36856e05afc6d623 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 27 Sep 2021 22:19:43 +0200
Subject: [PATCH 1318/1650] fix /server modify port argument order

---
 src/fe-common/core/fe-server.c      | 10 +++++-----
 src/fe-common/core/module-formats.c |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 78e7202c..4a52cc3c 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -124,17 +124,17 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	port = old_port = -1;
 
-	if (*portstr != '\0')
-		port = add_port = atoi(portstr);
+	value = g_hash_table_lookup(optlist, "port");
+	if (value != NULL && *value != '\0')
+		port = add_port = atoi(value);
 	else if (g_hash_table_lookup(optlist, "tls") ||
 		 g_hash_table_lookup(optlist, "ssl"))
 		add_port = DEFAULT_SERVER_ADD_TLS_PORT;
 	else
 		add_port = DEFAULT_SERVER_ADD_PORT;
 
-	value = g_hash_table_lookup(optlist, "port");
-	if (value != NULL && *value != '\0')
-		old_port = atoi(value);
+	if (*portstr != '\0')
+		old_port = atoi(portstr);
 
 	chatnet = g_hash_table_lookup(optlist, "network");
 
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 0319ee11..faea034a 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -22,6 +22,7 @@
 #include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_core_formats[] = {
+	/* clang-format off */
 	{ MODULE_NAME, "Core", 0 },
 
 	/* ---- */
@@ -88,7 +89,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "server_reconnect_not_found", "Reconnection tag {server $0} not found", 1, { 0 } },
 	{ "setupserver_added", "Server {server $0} saved", 2, { 0, 1 } },
 	{ "setupserver_removed", "Server {server $0} removed", 2, { 0, 1 } },
-	{ "setupserver_not_found", "Server {server $0} not found", 2, { 0, 1 } },
+	{ "setupserver_not_found", "Server {server $0} {hilight $1} not found", 2, { 0, 1 } },
 	{ "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
 
 	/* ---- */
@@ -316,4 +317,5 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "tls_protocol_version", "Protocol: {hilight $0} ({hilight $1} bit, {hilight $2})", 3, { 0, 1, 0 } },
 
 	{ NULL, NULL, 0 }
+	/* clang-format on */
 };

From 2d9c27d6173f6a68804c9570fdda516533465a56 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 28 Sep 2021 13:27:56 +0200
Subject: [PATCH 1319/1650] fix wrong argument type in printformat

---
 src/fe-common/core/fe-server.c      | 14 ++++++++++----
 src/fe-common/core/module-formats.c |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 4a52cc3c..ab76c363 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -307,12 +307,14 @@ static void cmd_server_remove(const char *data)
 	SERVER_SETUP_REC *rec;
 	char *addr, *port, *chatnet;
 	void *free_arg;
+	int portnum;
 
 	if (!cmd_get_params(data, &free_arg, 3, &addr, &port, &chatnet))
 		return;
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	if (*port == '\0') {
+		portnum = DEFAULT_SERVER_ADD_PORT;
 		if (*chatnet == '\0')
 			rec = server_setup_find(addr, -1, NULL);
 		else
@@ -320,17 +322,21 @@ static void cmd_server_remove(const char *data)
 	}
 	else
 	{
+		portnum = atoi(port);
 		if (*chatnet == '\0')
-			rec = server_setup_find(addr, atoi(port), NULL);
+			rec = server_setup_find(addr, portnum, NULL);
 		else
-			rec = server_setup_find(addr, atoi(port), chatnet);
+			rec = server_setup_find(addr, portnum, chatnet);
 	}
 
 	if (rec == NULL)
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr, port);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr,
+		            portnum);
 	else {
+		portnum = rec->port;
 		server_setup_remove(rec);
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr, port);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr,
+		            portnum);
 	}
 
 	cmd_params_free(free_arg);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index faea034a..e22b5e78 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -88,7 +88,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "server_reconnect_removed", "Removed reconnection to server {server $0} port {hilight $1}", 3, { 0, 1, 0 } },
 	{ "server_reconnect_not_found", "Reconnection tag {server $0} not found", 1, { 0 } },
 	{ "setupserver_added", "Server {server $0} saved", 2, { 0, 1 } },
-	{ "setupserver_removed", "Server {server $0} removed", 2, { 0, 1 } },
+	{ "setupserver_removed", "Server {server $0} {hilight $1} removed", 2, { 0, 1 } },
 	{ "setupserver_not_found", "Server {server $0} {hilight $1} not found", 2, { 0, 1 } },
 	{ "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
 

From 0932bbed7b1f51a00cfee231632e67ab9118da75 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 21 Sep 2021 22:35:30 +0200
Subject: [PATCH 1320/1650] Merge pull request #37 from
 ailin-nemui/int-min-reached

fix pedantic error in MSGLEVEL enum

(cherry picked from commit b0fdbb144d5c5723269b2571761b0a073a392454)
---
 src/core/levels.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/levels.h b/src/core/levels.h
index 04893b34..7f1aa931 100644
--- a/src/core/levels.h
+++ b/src/core/levels.h
@@ -42,7 +42,7 @@ enum {
 	MSGLEVEL_HIDDEN       = 0x10000000, /* Hidden from view */
 	MSGLEVEL_RESERVED1    = 0x20000000,
 	MSGLEVEL_RESERVED2    = 0x40000000,
-	MSGLEVEL_FORMAT       = 0x80000000  /* Format data */
+	MSGLEVEL_FORMAT       = (int)0x80000000  /* Format data */
 };
 /* clang-format on */
 

From 117758fb9046a859ecfacaab7ab1a7a2e35377e6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 22 Sep 2021 11:25:32 +0200
Subject: [PATCH 1321/1650] Merge pull request #40 from ailin-nemui/gh-actions

update github actions ubuntu version to 18.04 and meson to <0.60.0

(cherry picked from commit db705278d2f766433d3c28f776241c4997efde70)
---
 .github/workflows/check.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 61de72ff..97cb3feb 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: prepare required software
         run: |
-          sudo apt install $apt_build_deps $apt_build_deps_autotools
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_autotools
       - uses: actions/checkout@main
       - name: make dist
         run: |
@@ -38,18 +38,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, ubuntu-latest]
+        os: [ubuntu-18.04, ubuntu-latest]
         builder: [meson, configure]
         compiler: [clang, gcc]
         flags: [regular]
         include:
-          - os: ubuntu-16.04
+          - os: ubuntu-18.04
             builder: meson
             meson_ver: ==0.49.2
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.59.0
+            meson_ver: <0.60.0
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK
@@ -64,7 +64,7 @@ jobs:
           meson_ver: ${{ matrix.meson_ver }}
           setuptools_ver: ${{ matrix.setuptools_ver }}
         run: |
-          sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
           eval "$get_pip_build_deps_${{ matrix.builder }}"
           curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
       - name: unpack archive

From 0ba449d8be26b047eea3b0b7e4ecdcba906f03f8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 22 Sep 2021 12:33:10 +0200
Subject: [PATCH 1322/1650] Merge pull request #39 from ailin-nemui/sync

run syncdocs.sh and syncscripts.sh

(cherry picked from commit 85a9dc146d803be344bf3806395ac294d6929c13)
---
 docs/faq.html           |   4 +-
 docs/faq.txt            |   6 +-
 docs/startup-HOWTO.html |   4 +-
 docs/startup-HOWTO.txt  |   4 +-
 scripts/quitmsg.pl      |  27 +++-----
 scripts/scriptassist.pl | 139 +++++++++++++++++++++++++---------------
 6 files changed, 104 insertions(+), 80 deletions(-)

diff --git a/docs/faq.html b/docs/faq.html
index 7c17f45d..50b404a0 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -2,7 +2,7 @@
 <h1>Frequently Asked Questions</h1>
     <h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
 
-<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
+<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-256color or color_xterm (eg. <code>TERM=xterm-256color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
 
 <h3 id="q-how-do-i-easily-write-text-to-channel-that-starts-with--character">Q: How do I easily write text to channel that starts with ‘/’ character?</h3>
 
@@ -54,7 +54,7 @@
 
 <h3 id="q-will-there-be-detach-like-feature">Q: Will there be /DETACH-like feature?</h3>
 
-<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
+<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="https://sourceforge.net/projects/dtach/">dtach</a> can be used to do it just fine.</p>
 
 <h3 id="q-how-do-i-run-scripts-automatically-at-startup">Q: How do I run scripts automatically at startup?</h3>
 
diff --git a/docs/faq.txt b/docs/faq.txt
index 0d0b5f46..0fcc156a 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -4,8 +4,8 @@ Q: Why doesn’t irssi display colors even when ircii etc. displays them?
 A: They force ANSI colors even if terminal doesn’t support them. By default,
    irssi uses colors only if terminfo/termcap so says. The correct way to fix this
    would be to change your TERM environment to a value where colors work, like
-   xterm-color or color_xterm (eg. TERM=xterm-color irssi). If this doesn’t help,
-   then use the evil way of /SET term_force_colors ON.
+   xterm-256color or color_xterm (eg. TERM=xterm-256color irssi). If this doesn’t
+   help, then use the evil way of /SET term_force_colors ON.
 
 Q: How do I easily write text to channel that starts with ‘/’ character?
 A: / /text
@@ -119,6 +119,6 @@ A: Check [6]here
    [1] https://github.com/irssi-import/xirssi
    [2] https://tmux.github.io/
    [3] https://www.gnu.org/software/screen/screen.html
-   [4] http://dtach.sf.net/
+   [4] https://sourceforge.net/projects/dtach/
    [5] https://dgl.cx/irssi/hack-whois-in-current-window.pl
    [6] https://irssi.org/assets/irssi.wav
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index b0c68f1f..696dea4d 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -226,7 +226,7 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <p>And finally channels:</p>
 
-<div><div><pre><code>/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+<div><div><pre><code>/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
 /CHANNEL ADD -auto #secret IRCnet password
 </code></pre></div></div>
 
@@ -395,7 +395,7 @@ Ctrl-X                - set the next server in list active
 
 <p><code>/HELP bind</code> tells pretty much everything there is to know about keyboard bindings. However, there’s the problem of how to bind some non-standard keys. They might differ a bit with each terminal, so you’ll need to find out what exactly the keypress produces. Easiest way to check that would be to see what it prints in <code>cat</code>. Here’s an example for pressing F1 key:</p>
 
-<div><div><pre><code> [user@host] ~% cat
+<div><div><pre><code> [cras@hurina] ~% cat
  ^[OP
 </code></pre></div></div>
 
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index bff33108..90d278de 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -218,7 +218,7 @@ IRC network, other servers are automatically connected in same network if the
 
 And finally channels:
 
-/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
 /CHANNEL ADD -auto #secret IRCnet password
 
 -bots and -botcmd should be the only ones needing a bit of explaining. They’re
@@ -442,7 +442,7 @@ They might differ a bit with each terminal, so you’ll need to find out what
 exactly the keypress produces. Easiest way to check that would be to see what
 it prints in cat. Here’s an example for pressing F1 key:
 
- [user@host] ~% cat
+ [cras@hurina] ~% cat
  ^[OP
 
 So in irssi you would use /BIND ^[OP /ECHO F1 pressed. If you use multiple
diff --git a/scripts/quitmsg.pl b/scripts/quitmsg.pl
index e289468c..102d9aa5 100644
--- a/scripts/quitmsg.pl
+++ b/scripts/quitmsg.pl
@@ -6,36 +6,27 @@ use Irssi::Irc;
 use strict;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.00";
+$VERSION = "1.01";
 %IRSSI = (
     authors     => 'Timo Sirainen',
     name        => 'quitmsg',
     description => 'Random quit messages',
     license     => 'Public Domain',
-    changed	=> 'Sun Mar 10 23:18 EET 2002'
+    changed	=> 'Mon Jul 22 20:00 EET 2020'
 );
 
-my $quitfile = glob "~/.irssi/irssi.quit";
+my $quitfile = Irssi::get_irssi_dir() . "/irssi.quit";
 
 sub cmd_quit {
 	my ($data, $server, $channel) = @_;
 	return if ($data ne "");
+	
+	open (my $fh, "<", $quitfile) || return;
+	my @lines = <$fh>;
 
-	open (f, "<", $quitfile) || return;
-	my $lines = 0; while(<f>) { $lines++; };
-
-	my $line = int(rand($lines))+1;
-
-	my $quitmsg;
-	seek(f, 0, 0); $. = 0;
-	while(<f>) {
-		next if ($. != $line);
-
-		chomp;
-		$quitmsg = $_;
-		last;
-	}
-	close(f);
+	my $quitmsg = $lines[int(rand(@lines))];
+	chomp($quitmsg);
+	close($fh);
 
 	foreach my $server (Irssi::servers) {
 		$server->command("/disconnect ".$server->{tag}." $quitmsg");
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 536ef33a..cf02d57e 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2003020807';
+our $VERSION = '2020042700';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -23,12 +23,15 @@ use Irssi 20020324;
 use CPAN::Meta::YAML;
 use LWP::UserAgent;
 use POSIX;
+use version;
 
 # GnuPG is not always needed
 $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
+my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+
 sub show_help {
     my $help = "scriptassist $VERSION
 /scriptassist check
@@ -39,15 +42,15 @@ sub show_help {
     Search the script database
 /scriptassist info <scripts>
     Display information about <scripts>
-".#/scriptassist ratings <scripts>
-#    Retrieve the average ratings of the the scripts
-#/scriptassist top <num>
-#    Retrieve the first <num> top rated scripts
-"/scriptassist new <num>
+/scriptassist ratings <scripts|all>
+    Retrieve the average ratings of the the scripts
+/scriptassist top <num>
+    Retrieve the first <num> top rated scripts
+/scriptassist new <num>
     Display the newest <num> scripts
-".#/scriptassist rate <script> <stars>
-#    Rate the script with a number of stars ranging from 0-5
-"/scriptassist contact <script>
+/scriptassist rate <script>
+    Rate the script if you like it
+/scriptassist contact <script>
     Write an email to the author of the script
     (Requires OpenURL)
 /scriptassist cpan <module>
@@ -95,6 +98,7 @@ sub call_openurl {
 	$code->($url);
     } else {
         print CLIENTCRAP "%R>>%n Please install openurl.pl";
+        print CLIENTCRAP "%R>>%n    or open < $url > manually";
     }
 }
 
@@ -188,7 +192,7 @@ sub get_unknown {
     foreach (keys %$db) {
 	next unless defined $db->{$_}{commands};
 	foreach my $item (split / /, $db->{$_}{commands}) {
-	    return { $_ => $db->{$_} } if ($item =~ /^$cmd$/i);
+	    return { $_ => +{%{$db->{$_}}} } if ($item =~ /^$cmd$/i);
 	}
     }
     return undef;
@@ -264,47 +268,80 @@ sub script_info {
 		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
 	    }
 	}
-	if (defined $xml->{$plname}{depends}) {
-	    my $depends = $xml->{$plname}{depends};
-	    foreach my $dep (split(/ /, $depends)) {
-		$result{$sname}{depends}{$dep}{installed} = 1;
-	    }
-	}
+	# if (defined $xml->{$plname}{depends}) {
+	#     my $depends = $xml->{$plname}{depends};
+	#     foreach my $dep (split(/ /, $depends)) {
+	# 	$result{$sname}{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep });
+	#     }
+	# }
     }
     return \%result;
 }
 
+sub get_rate_url {
+    my ($src) = @_;
+    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
+    $ua->agent('ScriptAssist/'.$VERSION);
+    my $request = HTTP::Request->new('GET', $src);
+    my $response = $ua->request($request);
+    unless ($response->is_success) {
+	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
+	die("Fetching ratings location failed: $error");
+    }
+    my $votes_url;
+    for my $tag ($response->content() =~ /<script([^>]*)>/g) {
+	my $attr = " $tag ";
+	($votes_url = $1) =~ s/\.\w+$/.yml/
+	    if $attr =~ /\sasync\s/ && $attr =~ m{\ssrc="(https?://.*?/votes\.\w+)"\s};
+    }
+    unless ($votes_url) {
+	die("Fetching ratings failed: Could not find votes script\n");
+    }
+    $request = HTTP::Request->new('GET', $votes_url);
+    $response = $ua->request($request);
+    if (!$response->is_success) {
+	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
+	die("Fetching ratings failed: $error");
+    }
+    my $data = $response->content();
+    utf8::decode($data);
+    CPAN::Meta::YAML->read_string($data)->[0];
+}
+
 sub rate_script {
     my ($script, $stars) = @_;
-    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.2003020803);
-    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?&stars='.$stars.'&mode=rate&script='.$script);
-    my $response = $ua->request($request);
-    unless ($response->is_success() && $response->content() =~ /You already rated this script/) {
-	return 1;
-    } else {
-	return 0;
-    }
+    my $xml = get_scripts();
+    my $votes = get_rate_url(map { $_->{source} } values %$xml);
+    my ($sname, $plname, $pname) = get_names($script, $xml);
+    die "Script $script not found\n" unless $votes->{$plname};
+    return $votes->{$plname}{u}
 }
 
 sub get_ratings {
     my ($scripts, $limit) = @_;
-    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.2003020803);
-    my $script = join(',', @{$scripts});
-    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?script='.$script.'&sort=rating&limit='.$limit);
-    my $response = $ua->request($request);
-    my %result;
-    if ($response->is_success()) {
-	foreach (split /\n/, $response->content()) {
-	    if (/<tr><td><a href=".*?">(.*?)<\/a>/) {
-		my $entry = $1;
-		if (/"><\/td><td>([0-9.]+)<\/td><td>(.*?)<\/td><td>/) {
-		    $result{$entry} = [$1, $2];
-		}
-	    }
+    my $xml = get_scripts();
+    my $votes = get_rate_url(map { $_->{source} } values %$xml);
+    foreach (keys %{$votes}) {
+	if ($xml->{$_}) {
+	    $xml->{$_}{votes} = $votes->{$_}{v};
 	}
     }
+    my %result;
+    if (@{$scripts}) {
+	foreach (@{$scripts}) {
+	    my ($sname, $plname, $pname) = get_names($_, $xml);
+	    next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} ));
+	    $result{$plname} = [$xml->{$plname}{votes}];
+	}
+    } else {
+	my @keys = sort { $xml->{$b}{votes} <=> $xml->{$a}{votes}
+		  || $xml->{$b}{modified} cmp $xml->{$a}{modified} }
+	    grep { !$xml->{$_}{HIDDEN} && $xml->{$_}{votes} ne '' } keys %$xml;
+	foreach (splice @keys, 0, $limit) {
+	    $result{$_} = [$xml->{$_}{votes}];
+	}
+    }
+    die "No such script found\n" unless keys %result;
     return \%result;
 }
 
@@ -597,13 +634,8 @@ sub print_rate {
     my (%data) = @_;
     my $line;
     foreach my $script (sort keys(%data)) {
-	if ($data{$script}) {
-            $line .= "%go%n %9".$script."%9 has been rated";
-        } else {
-            $line .= "%ro%n %9".$script."%9 : Already rated this script";
-        }
+	call_openurl($data{$script});
     }
-    print CLIENTCRAP draw_box('ScriptAssist', $line, 'rating', 1) ;
 }
 
 sub print_ratings {
@@ -617,8 +649,7 @@ sub print_ratings {
 	    push @line, "%yo%n";
 	}
         push @line, "%9".$script."%9";
-	push @line, $data{$script}{rating};
-	push @line, "[".$data{$script}{votes}." votes]";
+	push @line, "[".(length $data{$script}{rating} ? $data{$script}{rating} : 'no')." votes]";
 	push @table, \@line;
     }
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'ratings', 1) ;
@@ -845,7 +876,8 @@ sub get_scripts {
 	}
 	$fetched = 1;
 	my $data = $response->content();
-	my ($src, $type);
+	my $src = $site;
+	my $type = '';
 	if ($site =~ /(.*\/).+\.(.+)/) {
 	    $src = $1;
 	    $type = $2;
@@ -1115,9 +1147,9 @@ sub cmd_scripassist {
     } elsif ($args[0] eq 'ratings' && defined $args[1]) {
 	shift @args;
 	bg_do("ratings ".join(' ', @args));
-    } elsif ($args[0] eq 'rate' && defined $args[1] && defined $args[2]) {
+    } elsif ($args[0] eq 'rate' && defined $args[1]) {
 	shift @args;
-	bg_do("rate ".join(' ', @args)) if ($args[2] >= 0 && $args[2] < 6);
+	bg_do("rate ".join(' ', @args));
     } elsif ($args[0] eq 'info' && defined $args[1]) {
 	shift @args;
 	bg_do("info ".join(' ', @args));
@@ -1158,6 +1190,7 @@ sub sig_command_script_load {
 sub sig_default_command {
     my ($cmd, $server) = @_;
     return unless Irssi::settings_get_bool("scriptassist_check_unknown_commands");
+    return if ($cmd =~ /^\d+$/ && $irssi_version >= v1.2.0 && Irssi::settings_get_bool("window_number_commands"));
     bg_do('unknown '.$cmd);
 }
 
@@ -1213,11 +1246,11 @@ foreach my $cmd ( ( 'check',
 		    'search',
 #		    '-h',
 		    'help',
-#		    'ratings',
-#		    'rate',
+		    'ratings',
+		    'rate',
 		    'info',
 #		    'echo',
-#		    'top',
+		    'top',
 		    'cpan',
 		    'autorun',
 		    'new' ) ) {

From 5bff40593f4331466e27ac3a4c947654884325be Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 29 Sep 2021 18:59:09 +0200
Subject: [PATCH 1323/1650] Merge pull request #41 from ailin-nemui/ports

fix /server modify port argument order

(cherry picked from commit 235c5b03281a3ae5c7849921cebbf7d46d39a4fc)
---
 src/fe-common/core/fe-server.c      | 24 +++++++++++++++---------
 src/fe-common/core/module-formats.c |  6 ++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 78e7202c..ab76c363 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -124,17 +124,17 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	port = old_port = -1;
 
-	if (*portstr != '\0')
-		port = add_port = atoi(portstr);
+	value = g_hash_table_lookup(optlist, "port");
+	if (value != NULL && *value != '\0')
+		port = add_port = atoi(value);
 	else if (g_hash_table_lookup(optlist, "tls") ||
 		 g_hash_table_lookup(optlist, "ssl"))
 		add_port = DEFAULT_SERVER_ADD_TLS_PORT;
 	else
 		add_port = DEFAULT_SERVER_ADD_PORT;
 
-	value = g_hash_table_lookup(optlist, "port");
-	if (value != NULL && *value != '\0')
-		old_port = atoi(value);
+	if (*portstr != '\0')
+		old_port = atoi(portstr);
 
 	chatnet = g_hash_table_lookup(optlist, "network");
 
@@ -307,12 +307,14 @@ static void cmd_server_remove(const char *data)
 	SERVER_SETUP_REC *rec;
 	char *addr, *port, *chatnet;
 	void *free_arg;
+	int portnum;
 
 	if (!cmd_get_params(data, &free_arg, 3, &addr, &port, &chatnet))
 		return;
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	if (*port == '\0') {
+		portnum = DEFAULT_SERVER_ADD_PORT;
 		if (*chatnet == '\0')
 			rec = server_setup_find(addr, -1, NULL);
 		else
@@ -320,17 +322,21 @@ static void cmd_server_remove(const char *data)
 	}
 	else
 	{
+		portnum = atoi(port);
 		if (*chatnet == '\0')
-			rec = server_setup_find(addr, atoi(port), NULL);
+			rec = server_setup_find(addr, portnum, NULL);
 		else
-			rec = server_setup_find(addr, atoi(port), chatnet);
+			rec = server_setup_find(addr, portnum, chatnet);
 	}
 
 	if (rec == NULL)
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr, port);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr,
+		            portnum);
 	else {
+		portnum = rec->port;
 		server_setup_remove(rec);
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr, port);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr,
+		            portnum);
 	}
 
 	cmd_params_free(free_arg);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 0319ee11..e22b5e78 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -22,6 +22,7 @@
 #include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_core_formats[] = {
+	/* clang-format off */
 	{ MODULE_NAME, "Core", 0 },
 
 	/* ---- */
@@ -87,8 +88,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "server_reconnect_removed", "Removed reconnection to server {server $0} port {hilight $1}", 3, { 0, 1, 0 } },
 	{ "server_reconnect_not_found", "Reconnection tag {server $0} not found", 1, { 0 } },
 	{ "setupserver_added", "Server {server $0} saved", 2, { 0, 1 } },
-	{ "setupserver_removed", "Server {server $0} removed", 2, { 0, 1 } },
-	{ "setupserver_not_found", "Server {server $0} not found", 2, { 0, 1 } },
+	{ "setupserver_removed", "Server {server $0} {hilight $1} removed", 2, { 0, 1 } },
+	{ "setupserver_not_found", "Server {server $0} {hilight $1} not found", 2, { 0, 1 } },
 	{ "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
 
 	/* ---- */
@@ -316,4 +317,5 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "tls_protocol_version", "Protocol: {hilight $0} ({hilight $1} bit, {hilight $2})", 3, { 0, 1, 0 } },
 
 	{ NULL, NULL, 0 }
+	/* clang-format on */
 };

From 96d99534c349f6843ed65751be5f4e58cbac7349 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 29 Sep 2021 19:11:35 +0200
Subject: [PATCH 1324/1650] update NEWS

---
 NEWS | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index b7c62b93..801a490b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
+v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
 	* The display system now renders formats on the fly (#1079,
 	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
-	  an#14, an#28, an#29, an#36)
+	  an#14, an#28, an#29, an#36, an#37)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need
@@ -139,7 +139,6 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
 	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
-	+ Add support for IRCv3 account-notify.
 	+ Add support for IRCv3 server-time. /SET show_server_time to
 	  enable (#1108)
 	+ Add support for logging IRCv3 server-time.
@@ -239,12 +238,13 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	- Fix /SERVER ADD -matrix -network my_matrix_network
           (an#12). By Andrej Kacian
 	- Fix /SERVER ADD creating duplicated entries in the config
-          file (#1317, an#22)
+          file (#1317, an#22, an#41)
 	- Fix critical when SASL user is set and SASL password is
           empty (#1325, an#21)
-	- Misc fixes (#1106, #1141, #1272, #1297)
+	- Misc fixes (#1106, #1141, #1272, #1297, an#35)
 	- Fuzz fixes (#1116, #1117, #1119, #1125, #1126, an#20)
 	- Build system fixes (#1101, #1102, #1069, #1140, #1181, #1253)
+	- Sync docs and scripts (an#39)
 	- Text and Help updates
 	  - add -tls_* options to manual (#1029, #1030). By Jacob
             V. Rasmussen
@@ -260,9 +260,10 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  - Add documentation for escaping some characters (#1329,
             #1330, an#9). By Guntbert Reiter
 	  - Fix some typos (#1336, an#10). By Francis Mteo
+	  - Document $abiversion and parse_special (an#38). By bw1
 	- Infrastructure updates:
 	  - Support for Github Actions (#1039, #1103, #1160, #1212,
-            #1231, #1252, #1261)
+            #1231, #1252, #1261, an#40)
 	  - Run clang-format on pull requests (#1172, #1173, #1184,
             #1230, #1247, #1287)
 	  - Run abidiff on pull requests (#1179, #1195)

From 1d3cdfa2d28ca6423b6bf221b7ebc9897d3ae303 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 1 Oct 2021 13:42:57 +0200
Subject: [PATCH 1325/1650] Merge tag '1.3.0-pre6' into integrate/1.3.0

---
 NEWS | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 1934dfbf..e33f900d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,13 @@
 v1.4-head-an 2022-xx-xx  Ailin Nemui <Nei>
 
-v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
+v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
 	* The display system now renders formats on the fly (#1079,
 	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
-	  an#14, an#28, an#29, an#36)
+	  an#14, an#28, an#29, an#36, an#37)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need
@@ -141,7 +141,6 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
 	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
-	+ Add support for IRCv3 account-notify.
 	+ Add support for IRCv3 server-time. /SET show_server_time to
 	  enable (#1108)
 	+ Add support for logging IRCv3 server-time.
@@ -241,12 +240,13 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	- Fix /SERVER ADD -matrix -network my_matrix_network
           (an#12). By Andrej Kacian
 	- Fix /SERVER ADD creating duplicated entries in the config
-          file (#1317, an#22)
+          file (#1317, an#22, an#41)
 	- Fix critical when SASL user is set and SASL password is
           empty (#1325, an#21)
-	- Misc fixes (#1106, #1141, #1272, #1297)
+	- Misc fixes (#1106, #1141, #1272, #1297, an#35)
 	- Fuzz fixes (#1116, #1117, #1119, #1125, #1126, an#20)
 	- Build system fixes (#1101, #1102, #1069, #1140, #1181, #1253)
+	- Sync docs and scripts (an#39)
 	- Text and Help updates
 	  - add -tls_* options to manual (#1029, #1030). By Jacob
             V. Rasmussen
@@ -262,9 +262,10 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  - Add documentation for escaping some characters (#1329,
             #1330, an#9). By Guntbert Reiter
 	  - Fix some typos (#1336, an#10). By Francis Mteo
+	  - Document $abiversion and parse_special (an#38). By bw1
 	- Infrastructure updates:
 	  - Support for Github Actions (#1039, #1103, #1160, #1212,
-            #1231, #1252, #1261)
+            #1231, #1252, #1261, an#40)
 	  - Run clang-format on pull requests (#1172, #1173, #1184,
             #1230, #1247, #1287)
 	  - Run abidiff on pull requests (#1179, #1195)

From b878c7f07951dbc2605ca6cb8312f2ff0dd382d2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 9 Oct 2021 21:26:01 +0200
Subject: [PATCH 1326/1650] fix max_lag disconnect

---
 src/irc/core/lag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index 6af8524c..aef5e617 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -104,7 +104,7 @@ static int sig_check_lag(void)
 
 		if (rec->lag_sent != 0) {
 			/* waiting for lag reply */
-			if (max_lag > 1 && now - rec->lag_sent > max_lag * G_TIME_SPAN_SECOND) {
+			if (max_lag > 1 && now - (rec->lag_sent / G_TIME_SPAN_SECOND) > max_lag) {
 				/* too much lag, disconnect */
 				signal_emit("server lag disconnect", 1, rec);
 				rec->connection_lost = TRUE;

From db200f266bcb07f79af709cb8b2deff44ece21d2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Oct 2021 15:50:23 +0200
Subject: [PATCH 1327/1650] remove newline from "server outgoing modify"

---
 docs/signals.txt           |  2 +-
 src/irc/core/irc-servers.c | 25 ++++++++++++++++++++-----
 src/irc/core/irc.c         | 28 +++++++++++++++++++++-------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 6128084b..da72ef57 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -151,7 +151,7 @@ irc.c:
  "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
 
  "server incoming", SERVER_REC, char *data
- "server outgoing modify", SERVER_REC, GString *data
+ "server outgoing modify", SERVER_REC, GString *data, int crlf
 
 (for perl parser..)
  "redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 664ca9a4..82989534 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -718,6 +718,7 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 	GString *str;
 	long usecs;
 	char *cmd;
+	int crlf;
 
 	if (!IS_IRC_SERVER(server))
 		return 0;
@@ -741,15 +742,29 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 
 	/* send command */
 	str = g_string_new(cmd);
-	signal_emit("server outgoing modify", 2, server, str);
+
+	if (str->len > 2 && str->str[str->len - 2] == '\r')
+		crlf = 2;
+	else if (str->len > 1 && str->str[str->len - 1] == '\n')
+		crlf = 1;
+	else
+		crlf = 0;
+
+	if (crlf)
+		g_string_truncate(str, str->len - crlf);
+
+	signal_emit("server outgoing modify", 3, server, str, crlf);
 	if (str->len) {
+		if (crlf == 2)
+			g_string_append(str, "\r\n");
+		else if (crlf == 1)
+			g_string_append(str, "\n");
+
 		irc_server_send_data(server, str->str, str->len);
 
 		/* add to rawlog without [CR+]LF */
-		if (str->len > 2 && str->str[str->len - 2] == '\r')
-			str->str[str->len - 2] = '\0';
-		else if (str->str[str->len - 1] == '\n')
-			str->str[str->len - 1] = '\0';
+		if (crlf)
+			g_string_truncate(str, str->len - crlf);
 		rawlog_output(server->rawlog, str->str);
 		server_redirect_command(server, str->str, redirect);
 	}
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index c17e2470..62bc0bc8 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -115,20 +115,34 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 
 	if (!raw) {
 		/* Add CR+LF to command */
-		g_string_append_c(str, 13);
-		g_string_append_c(str, 10);
+		g_string_append(str, "\r\n");
 	}
 
 	if (irc_send_when == IRC_SEND_NOW) {
-		signal_emit("server outgoing modify", 2, server, str);
+		int crlf;
+
+		if (str->len > 2 && str->str[str->len - 2] == '\r')
+			crlf = 2;
+		else if (str->len > 1 && str->str[str->len - 1] == '\n')
+			crlf = 1;
+		else
+			crlf = 0;
+
+		if (crlf)
+			g_string_truncate(str, str->len - crlf);
+
+		signal_emit("server outgoing modify", 3, server, str, crlf);
 		if (str->len) {
+			if (crlf == 2)
+				g_string_append(str, "\r\n");
+			else if (crlf == 1)
+				g_string_append(str, "\n");
+
 			irc_server_send_data(server, str->str, str->len);
 
 			/* add to rawlog without [CR+]LF */
-			if (str->len > 2 && str->str[str->len - 2] == '\r')
-				str->str[str->len - 2] = '\0';
-			else if (str->str[str->len - 1] == '\n')
-				str->str[str->len - 1] = '\0';
+			if (crlf)
+				g_string_truncate(str, str->len - crlf);
 			rawlog_output(server->rawlog, str->str);
 			server_redirect_command(server, str->str, server->redirect_next);
 		}

From b22588a9ad030938663d95d2fa5715bb7d114dc7 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 10 Oct 2021 13:03:36 +0200
Subject: [PATCH 1328/1650] simplify duplicate code in outgoing modify

---
 src/irc/core/irc-servers.c | 65 ++++++++++++++++++++++----------------
 src/irc/core/irc-servers.h |  1 +
 src/irc/core/irc.c         | 28 +---------------
 3 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 82989534..f4ae9c6a 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -711,37 +711,12 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
 	}
 }
 
-static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
+void irc_server_send_and_redirect(IRC_SERVER_REC *server, GString *str, REDIRECT_REC *redirect)
 {
-	REDIRECT_REC *redirect;
-        GSList *link;
-	GString *str;
-	long usecs;
-	char *cmd;
 	int crlf;
 
-	if (!IS_IRC_SERVER(server))
-		return 0;
-
-	if (server->cmdcount == 0 && server->cmdqueue == NULL)
-		return 0;
-
-	if (now < server->wait_cmd)
-		return 1;
-
-	usecs = (now - server->last_cmd) / G_TIME_SPAN_MILLISECOND;
-	if (usecs < server->cmd_queue_speed)
-		return 1;
-
-	server->cmdcount--;
-	if (server->cmdqueue == NULL) return 1;
-
-        /* get command */
-	cmd = server->cmdqueue->data;
-        redirect = server->cmdqueue->next->data;
-
-	/* send command */
-	str = g_string_new(cmd);
+	g_return_if_fail(server != NULL);
+	g_return_if_fail(str != NULL);
 
 	if (str->len > 2 && str->str[str->len - 2] == '\r')
 		crlf = 2;
@@ -768,6 +743,40 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 		rawlog_output(server->rawlog, str->str);
 		server_redirect_command(server, str->str, redirect);
 	}
+}
+
+static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
+{
+	REDIRECT_REC *redirect;
+	GSList *link;
+	GString *str;
+	long usecs;
+	char *cmd;
+
+	if (!IS_IRC_SERVER(server))
+		return 0;
+
+	if (server->cmdcount == 0 && server->cmdqueue == NULL)
+		return 0;
+
+	if (now < server->wait_cmd)
+		return 1;
+
+	usecs = (now - server->last_cmd) / G_TIME_SPAN_MILLISECOND;
+	if (usecs < server->cmd_queue_speed)
+		return 1;
+
+	server->cmdcount--;
+	if (server->cmdqueue == NULL)
+		return 1;
+
+	/* get command */
+	cmd = server->cmdqueue->data;
+	redirect = server->cmdqueue->next->data;
+
+	/* send command */
+	str = g_string_new(cmd);
+	irc_server_send_and_redirect(server, str, redirect);
 	g_string_free(str, TRUE);
 
 	/* remove from queue */
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 903de773..6e78c4da 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -176,6 +176,7 @@ char **irc_server_split_action(IRC_SERVER_REC *server, const char *target,
 			       const char *data);
 void irc_server_send_away(IRC_SERVER_REC *server, const char *reason);
 void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len);
+void irc_server_send_and_redirect(IRC_SERVER_REC *server, GString *str, REDIRECT_REC *redirect);
 void irc_server_init_isupport(IRC_SERVER_REC *server);
 
 void irc_servers_start_cmd_timeout(void);
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 62bc0bc8..a52e9198 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -119,33 +119,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 	}
 
 	if (irc_send_when == IRC_SEND_NOW) {
-		int crlf;
-
-		if (str->len > 2 && str->str[str->len - 2] == '\r')
-			crlf = 2;
-		else if (str->len > 1 && str->str[str->len - 1] == '\n')
-			crlf = 1;
-		else
-			crlf = 0;
-
-		if (crlf)
-			g_string_truncate(str, str->len - crlf);
-
-		signal_emit("server outgoing modify", 3, server, str, crlf);
-		if (str->len) {
-			if (crlf == 2)
-				g_string_append(str, "\r\n");
-			else if (crlf == 1)
-				g_string_append(str, "\n");
-
-			irc_server_send_data(server, str->str, str->len);
-
-			/* add to rawlog without [CR+]LF */
-			if (crlf)
-				g_string_truncate(str, str->len - crlf);
-			rawlog_output(server->rawlog, str->str);
-			server_redirect_command(server, str->str, server->redirect_next);
-		}
+		irc_server_send_and_redirect(server, str, server->redirect_next);
 		g_string_free(str, TRUE);
 	} else if (irc_send_when == IRC_SEND_NEXT) {
 		/* add to queue */

From bec9e04714045bb837731190cc8b5fe92a163ced Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 10 Oct 2021 13:04:50 +0200
Subject: [PATCH 1329/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index d2dd2f7c..f7719e1f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 41
+#define IRSSI_ABI_VERSION 42
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 44298db8143d2da7fba6a641123425f91b97918f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Oct 2021 15:37:15 +0200
Subject: [PATCH 1330/1650] chghost news

---
 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 801a490b..f3726fb3 100644
--- a/NEWS
+++ b/NEWS
@@ -139,6 +139,13 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
 	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
+
+	  For servers with broken chghost implementation that fill the
+	  status window with host changed messages, one may add "quote
+	  cap req -chghost" to the -autosendcmd or, if the host change
+	  messages are entirely undesired, "/format -delete
+	  host_changed"
+
 	+ Add support for IRCv3 server-time. /SET show_server_time to
 	  enable (#1108)
 	+ Add support for logging IRCv3 server-time.

From 3bb8c619e231ada6ffa99d44f88917389cad00a3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 10 Oct 2021 12:45:21 +0200
Subject: [PATCH 1331/1650] Merge pull request #43 from
 ailin-nemui/server-outgoing

remove newline from "server outgoing modify"

(cherry picked from commit ea961623f575529ab2a94d7d394b399d29729b57)
---
 docs/signals.txt           |  2 +-
 src/irc/core/irc-servers.c | 25 ++++++++++++++++++++-----
 src/irc/core/irc.c         | 28 +++++++++++++++++++++-------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 6128084b..da72ef57 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -151,7 +151,7 @@ irc.c:
  "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
 
  "server incoming", SERVER_REC, char *data
- "server outgoing modify", SERVER_REC, GString *data
+ "server outgoing modify", SERVER_REC, GString *data, int crlf
 
 (for perl parser..)
  "redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 664ca9a4..82989534 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -718,6 +718,7 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 	GString *str;
 	long usecs;
 	char *cmd;
+	int crlf;
 
 	if (!IS_IRC_SERVER(server))
 		return 0;
@@ -741,15 +742,29 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 
 	/* send command */
 	str = g_string_new(cmd);
-	signal_emit("server outgoing modify", 2, server, str);
+
+	if (str->len > 2 && str->str[str->len - 2] == '\r')
+		crlf = 2;
+	else if (str->len > 1 && str->str[str->len - 1] == '\n')
+		crlf = 1;
+	else
+		crlf = 0;
+
+	if (crlf)
+		g_string_truncate(str, str->len - crlf);
+
+	signal_emit("server outgoing modify", 3, server, str, crlf);
 	if (str->len) {
+		if (crlf == 2)
+			g_string_append(str, "\r\n");
+		else if (crlf == 1)
+			g_string_append(str, "\n");
+
 		irc_server_send_data(server, str->str, str->len);
 
 		/* add to rawlog without [CR+]LF */
-		if (str->len > 2 && str->str[str->len - 2] == '\r')
-			str->str[str->len - 2] = '\0';
-		else if (str->str[str->len - 1] == '\n')
-			str->str[str->len - 1] = '\0';
+		if (crlf)
+			g_string_truncate(str, str->len - crlf);
 		rawlog_output(server->rawlog, str->str);
 		server_redirect_command(server, str->str, redirect);
 	}
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index c17e2470..62bc0bc8 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -115,20 +115,34 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 
 	if (!raw) {
 		/* Add CR+LF to command */
-		g_string_append_c(str, 13);
-		g_string_append_c(str, 10);
+		g_string_append(str, "\r\n");
 	}
 
 	if (irc_send_when == IRC_SEND_NOW) {
-		signal_emit("server outgoing modify", 2, server, str);
+		int crlf;
+
+		if (str->len > 2 && str->str[str->len - 2] == '\r')
+			crlf = 2;
+		else if (str->len > 1 && str->str[str->len - 1] == '\n')
+			crlf = 1;
+		else
+			crlf = 0;
+
+		if (crlf)
+			g_string_truncate(str, str->len - crlf);
+
+		signal_emit("server outgoing modify", 3, server, str, crlf);
 		if (str->len) {
+			if (crlf == 2)
+				g_string_append(str, "\r\n");
+			else if (crlf == 1)
+				g_string_append(str, "\n");
+
 			irc_server_send_data(server, str->str, str->len);
 
 			/* add to rawlog without [CR+]LF */
-			if (str->len > 2 && str->str[str->len - 2] == '\r')
-				str->str[str->len - 2] = '\0';
-			else if (str->str[str->len - 1] == '\n')
-				str->str[str->len - 1] = '\0';
+			if (crlf)
+				g_string_truncate(str, str->len - crlf);
 			rawlog_output(server->rawlog, str->str);
 			server_redirect_command(server, str->str, server->redirect_next);
 		}

From 23abfb912368e96c57797ac90298f5b194861a87 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 11 Oct 2021 22:08:14 +0200
Subject: [PATCH 1332/1650] Merge pull request #44 from ailin-nemui/lag

fix max_lag disconnect

(cherry picked from commit 6db881d8ef70b261b1f237188b53a1de76c6fadb)
---
 src/irc/core/lag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index 6af8524c..aef5e617 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -104,7 +104,7 @@ static int sig_check_lag(void)
 
 		if (rec->lag_sent != 0) {
 			/* waiting for lag reply */
-			if (max_lag > 1 && now - rec->lag_sent > max_lag * G_TIME_SPAN_SECOND) {
+			if (max_lag > 1 && now - (rec->lag_sent / G_TIME_SPAN_SECOND) > max_lag) {
 				/* too much lag, disconnect */
 				signal_emit("server lag disconnect", 1, rec);
 				rec->connection_lost = TRUE;

From 47f8582e68637b118a713a8115c7c54db3b2afb2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 11 Oct 2021 22:10:47 +0200
Subject: [PATCH 1333/1650] update NEWS

---
 NEWS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index f3726fb3..2e45ac1a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
+v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
@@ -187,7 +187,7 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	+ Allow -tls_ca{file,path} '' to unset an argument (#730,
 	  #1060, an#30)
 	+ Add a "server outgoing modify" signal to intercept outgoing
-	  messages (#1148, #1151, an#15). Original by
+	  messages (#1148, #1151, an#15, an#43). Original by
 	  JustAnotherArchivist
 	- remove some hard-coded 510 byte assumptions (#1086)
 	- Several fixes for error checks in SSL (#944, #1037, #943,
@@ -211,7 +211,7 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
           #891, #1129). By Dan Collins
 	- Fix /IGNORE not setting the right level in irc_op_public
           messages (#1280). Credit to oss-fuzz
-	- Fix GTimeVal deprecation (#1141, #1144, #1145)
+	- Fix GTimeVal deprecation (#1141, #1144, #1145, #1350, an#44)
 
 	  If multi-version compatibility is desired, module authors
 	  can find an example of backwards compatible code in

From 815ee7b2dd52ee728f753da642a038f32e092b76 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 11 Oct 2021 22:20:22 +0200
Subject: [PATCH 1334/1650] Merge tag '1.3.0-pre7' into integrate/1.3.0

---
 NEWS | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index e33f900d..49193369 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 v1.4-head-an 2022-xx-xx  Ailin Nemui <Nei>
 
-v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
+v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
@@ -141,6 +141,13 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
 	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
+
+	  For servers with broken chghost implementation that fill the
+	  status window with host changed messages, one may add "quote
+	  cap req -chghost" to the -autosendcmd or, if the host change
+	  messages are entirely undesired, "/format -delete
+	  host_changed"
+
 	+ Add support for IRCv3 server-time. /SET show_server_time to
 	  enable (#1108)
 	+ Add support for logging IRCv3 server-time.
@@ -182,7 +189,7 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	+ Allow -tls_ca{file,path} '' to unset an argument (#730,
 	  #1060, an#30)
 	+ Add a "server outgoing modify" signal to intercept outgoing
-	  messages (#1148, #1151, an#15). Original by
+	  messages (#1148, #1151, an#15, an#43). Original by
 	  JustAnotherArchivist
 	- remove some hard-coded 510 byte assumptions (#1086)
 	- Several fixes for error checks in SSL (#944, #1037, #943,
@@ -206,7 +213,7 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
           #891, #1129). By Dan Collins
 	- Fix /IGNORE not setting the right level in irc_op_public
           messages (#1280). Credit to oss-fuzz
-	- Fix GTimeVal deprecation (#1141, #1144, #1145)
+	- Fix GTimeVal deprecation (#1141, #1144, #1145, #1350, an#44)
 
 	  If multi-version compatibility is desired, module authors
 	  can find an example of backwards compatible code in

From 8f40b3ba7b45bbca504bf47f2c5a1f501845eaca Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 11 Oct 2021 22:54:53 +0200
Subject: [PATCH 1335/1650] add news ref

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 49193369..091c44fd 100644
--- a/NEWS
+++ b/NEWS
@@ -41,7 +41,7 @@ v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
 	      /SET show_names_on_join_limit -1
 
 	* -tls_verify is now enabled by default (#1170, an#18, #1309,
-           an#23)
+           an#23, #1343, #1351)
 
 	  This may cause an ugly display of notls_verify in the output
 	  of /SERVER LIST, even on plain-text connection, on old

From c5dc3fc2a0664b97e4c8f06d7b5ab756d77970ab Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Tue, 9 Nov 2021 21:18:40 +0100
Subject: [PATCH 1336/1650] fix stuck meta on dcc chat

---
 src/irc/dcc/dcc-chat.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 3f471eac..68da0e27 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -318,13 +318,17 @@ void dcc_chat_input(CHAT_DCC_REC *dcc)
 		}
 
 		if (ret > 0) {
+			SERVER_REC *server;
 			char *recoded;
 
 			dcc->transfd += ret;
 
-			recoded = recode_in(SERVER(dcc->server), str, dcc->nick);
+			server = SERVER(dcc->server);
+			recoded = recode_in(server, str, dcc->nick);
 			signal_emit("dcc chat message", 2, dcc, recoded);
 			g_free(recoded);
+			if (server != NULL)
+				server_meta_clear_all(server);
 		}
 	} while (ret > 0);
 }

From 2f99f3a5d3730c0296b65fc63a59f0a934d24207 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 10 Nov 2021 13:51:59 +0100
Subject: [PATCH 1337/1650] update news

---
 NEWS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 091c44fd..ee82f0a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,13 @@
 v1.4-head-an 2022-xx-xx  Ailin Nemui <Nei>
 
-v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
+v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
 	* The display system now renders formats on the fly (#1079,
-	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
-	  an#14, an#28, an#29, an#36, an#37)
+	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, #1355,
+	  an#13, an#14, an#28, an#29, an#36, an#37, an#49)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need

From bdadbb183f5ac53ff33c872a022580fc6ccb4e56 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 9 Nov 2021 14:48:54 +0100
Subject: [PATCH 1338/1650] Merge pull request #48 from ailin-nemui/news

add news ref

(cherry picked from commit b9f773ba6a8913eff2812da122a62528550b0534)
---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 2e45ac1a..84ab808a 100644
--- a/NEWS
+++ b/NEWS
@@ -39,7 +39,7 @@ v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
 	      /SET show_names_on_join_limit -1
 
 	* -tls_verify is now enabled by default (#1170, an#18, #1309,
-           an#23)
+           an#23, #1343, #1351)
 
 	  This may cause an ugly display of notls_verify in the output
 	  of /SERVER LIST, even on plain-text connection, on old

From eed9b32f9718ab516df66065c983fac742b8693d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 10 Nov 2021 14:12:47 +0100
Subject: [PATCH 1339/1650] Merge pull request #49 from ailin-nemui/dccmsgs

fix stuck meta on dcc chat

(cherry picked from commit a54a00c803067bfc669658f64aaac54dfe95c69b)
---
 NEWS                   | 6 +++---
 src/irc/dcc/dcc-chat.c | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 84ab808a..09514639 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
+v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
 	* The display system now renders formats on the fly (#1079,
-	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
-	  an#14, an#28, an#29, an#36, an#37)
+	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, #1355,
+	  an#13, an#14, an#28, an#29, an#36, an#37, an#49)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 3f471eac..68da0e27 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -318,13 +318,17 @@ void dcc_chat_input(CHAT_DCC_REC *dcc)
 		}
 
 		if (ret > 0) {
+			SERVER_REC *server;
 			char *recoded;
 
 			dcc->transfd += ret;
 
-			recoded = recode_in(SERVER(dcc->server), str, dcc->nick);
+			server = SERVER(dcc->server);
+			recoded = recode_in(server, str, dcc->nick);
 			signal_emit("dcc chat message", 2, dcc, recoded);
 			g_free(recoded);
+			if (server != NULL)
+				server_meta_clear_all(server);
 		}
 	} while (ret > 0);
 }

From 05063da9995f1d7b69f02a36a4f6d861dfbf891e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 11 Nov 2021 10:54:09 +0100
Subject: [PATCH 1340/1650] tag as 1.3.0-pre8

---
 configure.ac | 2 +-
 meson.build  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3a9e7bd6..66e9096a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3-head)
+AC_INIT(irssi, 1.3.0-pre8)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index bd192a92..4e2a7a89 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3-head',
+  version : '1.3.0-pre8',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From 608c7b09d7fb3f576ba66c34fe9342c1742a39e7 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 12 Nov 2021 09:24:12 +0100
Subject: [PATCH 1341/1650] Merge tag '1.3.0-pre8' into integrate/1.3.0


From 9b79749f6cb2857e57f8e20a8fa4f075a9001fd7 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Tue, 16 Nov 2021 18:50:49 +0100
Subject: [PATCH 1342/1650] Improve handling of GLib log messages

This patch introduces setting "glib_log_domains", which is
a space-separated list of log domain names, optionally prefixed
with a '-'. The list is parsed from left to right to determine
whether or not user wants to see message from a particular log
domain. Keywords 'all' or '*' are allowed as well.
Examples: "GLib-GIO", "all -GLib-GIO", "-*"

This patch also changes the default format for displaying GLib log
messages to include the log domain.
---
 src/fe-common/core/fe-common-core.c | 73 +++++++++++++++++++++++++++--
 src/fe-common/core/module-formats.c |  2 +-
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 1fcd5df1..a25c528c 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -165,6 +165,7 @@ void fe_common_core_init(void)
 	settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
 	g_get_charset(&str);
 	settings_add_str("lookandfeel", "term_charset", str);
+	settings_add_str("lookandfeel", "glib_log_domains", "all");
 	themes_init();
         theme_register(fecommon_core_formats);
 
@@ -254,9 +255,54 @@ void fe_common_core_deinit(void)
         signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 }
 
-void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *message)
+static gboolean glib_domain_wanted(const char *domain)
 {
-	const char *reason;
+	const char *domains;
+	char *c, *cur;
+	int len = 0;
+	int print_it = 0; /* -1 for exclude, 0 for undecided, 1 for include */
+	int incl;
+
+	/* Go through each item in glib_log_domains setting to determine whether
+	 * or not we want to print message from this domain */
+	domains = settings_get_str("glib_log_domains");
+	c = cur = (char *) domains;
+
+	do {
+		/* Advance through the string until we hit a space or the end */
+		while (*cur != '\0' && *cur != ' ') {
+			cur++;
+			len++;
+		}
+
+		/* Handle '-' prefix */
+		incl = 1;
+		if (*c == '-') {
+			incl = -1;
+			c++;
+			len--;
+		}
+
+		/* If we got a valid item, process it */
+		if (len > 0 && (!strncmp(domain, c, len) || !strncasecmp("all", c, len) ||
+		                !strncmp("*", c, len)))
+			print_it = incl;
+
+		/* Go past any spaces towards the next item */
+		while (*cur == ' ')
+			cur++;
+
+		/* Move on beyond the item we just handled */
+		c = cur;
+		len = 0;
+	} while (*c != '\0' && print_it != -1);
+
+	return (print_it == 1);
+}
+
+static void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *message)
+{
+	const char *reason, *domain;
 
 	switch (log_level) {
 	case G_LOG_LEVEL_WARNING:
@@ -265,16 +311,33 @@ void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *me
 	case G_LOG_LEVEL_CRITICAL:
                 reason = "critical";
 		break;
+	case G_LOG_LEVEL_DEBUG:
+		reason = "debug";
+		break;
+	case G_LOG_LEVEL_MESSAGE:
+		reason = "message";
+		break;
+	case G_LOG_LEVEL_INFO:
+		reason = "info";
+		break;
 	default:
 		reason = "error";
                 break;
 	}
 
+	/* If log_domain parameter is NULL, GLib means to tell us that this is
+	 * meant to be some nebulous "default" log domain name. */
+	domain = (log_domain ? log_domain : "default");
+
+	/* Only print the message if we decided to */
+	if (!glib_domain_wanted(domain))
+		return;
+
 	if (windows == NULL)
-		fprintf(stderr, "GLib %s: %s\n", reason, message);
+		fprintf(stderr, "GLib (%s) %s: %s\n", domain, reason, message);
 	else {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_GLIB_ERROR, reason, message);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_GLIB_ERROR, domain, reason,
+		            message);
 	}
 }
 
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index e22b5e78..8c10f420 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -288,7 +288,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "config_saved", "Saved configuration to file $0", 1, { 0 } },
 	{ "config_reloaded", "Reloaded configuration", 1, { 0 } },
 	{ "config_modified", "Configuration file was modified since irssi was last started - do you want to overwrite the possible changes?", 1, { 0 } },
-	{ "glib_error", "{error $0} $1", 2, { 0, 0 } },
+	{ "glib_error", "{error ($0) $1} $2", 3, { 0, 0, 0 } },
 	{ "overwrite_config", "Overwrite config (y/N)?", 0 },
 	{ "set_title", "[{hilight $0}]", 1, { 0 } },
 	{ "set_item", "$[-!32]0 %_$1", 2, { 0, 0 } },

From 9579105748d1a06df3e3d908ff2e79854fef8c12 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 17 Nov 2021 11:00:16 +0100
Subject: [PATCH 1343/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index f7719e1f..ac09a553 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 42
+#define IRSSI_ABI_VERSION 43
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 8088353ed023dcc144ee25359d373735e8f34a57 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 1 Dec 2021 22:50:06 +0100
Subject: [PATCH 1344/1650] fix help text wrt SERVER command

reported by Remco
---
 docs/help/in/server.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index f7d907f3..9a7bb550 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -51,10 +51,9 @@
     When using the ADD parameter on a server that already exists, the
     configuration will be merged with each other.
 
-    When using the command without any of the given parameters, it will
-    connect to the specified server; the server in the active window will be
-    disconnected unless you prepend the server with the '+' character; the same
-    method is applicable to the CONNECT parameter.
+    When using the CONNECT parameter, it will connect to the specified
+    server; the server in the active window will be disconnected
+    unless you prepend the server with the '+' character.
 
     Specify '-' as password to remove a server password
 

From 62eff3d2a765d90b0b43da49c76c2edb6ee6eaee Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 1 Dec 2021 23:34:20 +0100
Subject: [PATCH 1345/1650] fix help text wrt SERVER LIST command

---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 9a7bb550..84294af6 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -5,7 +5,7 @@
 
 %9Parameters:%9
 
-    LIST:               Displays the list of servers you are connected to.
+    LIST:               Displays the list of servers you have configured.
     CONNECT:            Connects to the given server.
     ADD:                Adds a server to your configuration.
     MODIFY:             Modifies a server in your configuration.

From 60cb9451b3a1da5a510ce83d937d93e791a7f5a1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 13 Dec 2021 15:32:30 +0100
Subject: [PATCH 1346/1650] keep own ops status on /upgrade

---
 src/irc/core/massjoin.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index b8b8912f..15a9a9a8 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -43,13 +43,6 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 
 	g_return_if_fail(data != NULL);
 
-	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
-		/* You joined, do not massjoin */
-		send_massjoin = FALSE;
-	} else {
-		send_massjoin = TRUE;
-	}
-
 	params = event_get_params(data, 3, &channel, &account, &realname);
 
 	ptr = strchr(channel, 7); /* ^G does something weird.. */
@@ -62,6 +55,19 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 		return;
 	}
 
+	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
+		/* do not overwrite our /UPGRADEd ownnick */
+		if (chanrec->session_rejoin) {
+			g_free(params);
+			return;
+		} else {
+			/* You joined, do not massjoin */
+			send_massjoin = FALSE;
+		}
+	} else {
+		send_massjoin = TRUE;
+	}
+
 	/* check that the nick isn't already in nicklist. seems to happen
 	   sometimes (server desyncs or something?) */
 	nickrec = nicklist_find(CHANNEL(chanrec), nick);

From bb1957bafbc740db0ebaf5b3d084945f636f2c9a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:51:43 +0100
Subject: [PATCH 1347/1650] Merge pull request #51 from ailin-nemui/help

fix help text wrt SERVER command

(cherry picked from commit d33fd0c5da2287f5496a4a78940490f0c4466428)
---
 docs/help/in/server.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index f7d907f3..9a7bb550 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -51,10 +51,9 @@
     When using the ADD parameter on a server that already exists, the
     configuration will be merged with each other.
 
-    When using the command without any of the given parameters, it will
-    connect to the specified server; the server in the active window will be
-    disconnected unless you prepend the server with the '+' character; the same
-    method is applicable to the CONNECT parameter.
+    When using the CONNECT parameter, it will connect to the specified
+    server; the server in the active window will be disconnected
+    unless you prepend the server with the '+' character.
 
     Specify '-' as password to remove a server password
 

From 6763be847f781c4e8bcaad6ab9973d05566f0a56 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Dec 2021 23:34:53 +0100
Subject: [PATCH 1348/1650] Merge pull request #52 from ailin-nemui/help

fix help text wrt SERVER LIST command

(cherry picked from commit 8281b103108820aa104c8e0fe5c33960838d2f99)
---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 9a7bb550..84294af6 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -5,7 +5,7 @@
 
 %9Parameters:%9
 
-    LIST:               Displays the list of servers you are connected to.
+    LIST:               Displays the list of servers you have configured.
     CONNECT:            Connects to the given server.
     ADD:                Adds a server to your configuration.
     MODIFY:             Modifies a server in your configuration.

From dbf9fc3dfcc1752003f7e167261b917d5b94aaf2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 17 Dec 2021 22:29:15 +0100
Subject: [PATCH 1349/1650] Merge pull request #53 from ailin-nemui/keepops

keep own ops status on /upgrade

(cherry picked from commit a2feef5e735d3bb3d5a4eecb05e813ba6bd2fe95)
---
 src/irc/core/massjoin.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index b8b8912f..15a9a9a8 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -43,13 +43,6 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 
 	g_return_if_fail(data != NULL);
 
-	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
-		/* You joined, do not massjoin */
-		send_massjoin = FALSE;
-	} else {
-		send_massjoin = TRUE;
-	}
-
 	params = event_get_params(data, 3, &channel, &account, &realname);
 
 	ptr = strchr(channel, 7); /* ^G does something weird.. */
@@ -62,6 +55,19 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 		return;
 	}
 
+	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
+		/* do not overwrite our /UPGRADEd ownnick */
+		if (chanrec->session_rejoin) {
+			g_free(params);
+			return;
+		} else {
+			/* You joined, do not massjoin */
+			send_massjoin = FALSE;
+		}
+	} else {
+		send_massjoin = TRUE;
+	}
+
 	/* check that the nick isn't already in nicklist. seems to happen
 	   sometimes (server desyncs or something?) */
 	nickrec = nicklist_find(CHANNEL(chanrec), nick);

From 85a6ade7e883b582afb230abd5afa302d0f42c49 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 17 Dec 2021 22:42:13 +0100
Subject: [PATCH 1350/1650] tag as 1.3.1-an

---
 NEWS                | 5 +++++
 configure.ac        | 2 +-
 meson.build         | 2 +-
 src/core/expandos.c | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 09514639..649f3669 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
+	- Minor help fixes (an#51, an#52)
+	- Fix regression where own channel status was forgotten after
+          /UPGRADE (#1357, an#53)
+
 v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
diff --git a/configure.ac b/configure.ac
index 66e9096a..bf5f6c18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.0-pre8)
+AC_INIT(irssi, 1.3.1-an)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 4e2a7a89..79f3b58b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.0-pre8',
+  version : '1.3.1-an',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/src/core/expandos.c b/src/core/expandos.c
index da84b568..0f317e51 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -322,7 +322,7 @@ static char *expando_last_invite(SERVER_REC *server, void *item, int *free_ret)
 /* client version text string */
 static char *expando_version(SERVER_REC *server, void *item, int *free_ret)
 {
-	return PACKAGE_VERSION "-an";
+	return PACKAGE_VERSION;
 }
 
 /* current value of CMDCHARS */

From d4ad71c831d3e43aa4ca634c59148f42fb953535 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 17 Dec 2021 22:46:50 +0100
Subject: [PATCH 1351/1650] Merge tag '1.3.1-an' into integrate/1.3.1-an

---
 NEWS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index ee82f0a5..fd095500 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 v1.4-head-an 2022-xx-xx  Ailin Nemui <Nei>
 
+v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
+	- Minor help fixes (an#51, an#52)
+	- Fix regression where own channel status was forgotten after
+          /UPGRADE (#1357, an#53)
+
 v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed

From 3e4d7ded774c677378ab78f0ec24b9cb21002e66 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sun, 26 Dec 2021 01:13:57 +0100
Subject: [PATCH 1352/1650] use chantypes instead of # for irc channel defaults

---
 src/irc/core/irc-channels.c | 31 +++++++++++++++++++++----------
 src/irc/core/irc-servers.c  |  5 +++--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index 6d38c560..b0fba9b1 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -63,6 +63,20 @@ IRC_CHANNEL_REC *irc_channel_create(IRC_SERVER_REC *server, const char *name,
 #define get_join_key(key) \
 	(((key) == NULL || *(key) == '\0') ? "x" : (key))
 
+static char *force_channel_name(IRC_SERVER_REC *server, const char *name)
+{
+	char *chantypes;
+
+	if (server_ischannel(SERVER(server), name))
+		return g_strdup(name);
+
+	chantypes = g_hash_table_lookup(server->isupport, "chantypes");
+	if (chantypes == NULL || *chantypes == '\0')
+		chantypes = "#";
+
+	return g_strdup_printf("%c%s", *chantypes, name);
+}
+
 static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 			      int automatic)
 {
@@ -99,8 +113,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 	tmp = chanlist;
 	for (;; tmp++) {
 		if (*tmp !=  NULL) {
-			channel = server_ischannel(SERVER(server), *tmp) ? g_strdup(*tmp) :
-			g_strdup_printf("#%s", *tmp);
+			channel = force_channel_name(server, *tmp);
 
 			chanrec = irc_channel_find(server, channel);
 			if (chanrec == NULL) {
@@ -170,17 +183,14 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 }
 
 /* function for finding IRC channels - adds support for !channels */
-static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
-					    const char *channel)
+static CHANNEL_REC *irc_channel_find_server(IRC_SERVER_REC *server, const char *channel)
 {
 	GSList *tmp;
 	char *fmt_channel;
 
 	/* if 'channel' has no leading # this lookup is going to fail, add a
 	 * octothorpe in front of it to handle this case. */
-	fmt_channel = server_ischannel(SERVER(server), channel) ?
-	    g_strdup(channel) :
-	    g_strdup_printf("#%s", channel);
+	fmt_channel = force_channel_name(server, channel);
 
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *rec = tmp->data;
@@ -189,12 +199,12 @@ static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
                         continue;
 
 		/* check both !ABCDEchannel and !channel */
-		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->name) == 0) {
+		if (server->nick_comp_func(fmt_channel, rec->name) == 0) {
 			g_free(fmt_channel);
 			return rec;
 		}
 
-		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->visible_name) == 0) {
+		if (server->nick_comp_func(fmt_channel, rec->visible_name) == 0) {
 			g_free(fmt_channel);
 			return rec;
 		}
@@ -210,7 +220,8 @@ static void sig_server_connected(SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
-	server->channel_find_func = irc_channel_find_server;
+	server->channel_find_func =
+	    (CHANNEL_REC * (*) (SERVER_REC *, const char *) ) irc_channel_find_server;
 	server->channels_join = (void (*) (SERVER_REC *, const char *, int))
 		irc_channels_join;
 }
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index f4ae9c6a..92c9d5f1 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -84,10 +84,11 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
 	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg == NULL)
+	if (statusmsg == NULL && strchr(chantypes, '@') == NULL)
 		statusmsg = "@";
 
-	data += strspn(data, statusmsg);
+	if (statusmsg != NULL)
+		data += strspn(data, statusmsg);
 
 	/* strchr(3) considers the trailing NUL as part of the string, make sure
 	 * we didn't advance too much. */

From d4e3655f1f33de09d4a58c51ce1ade9d593bfa69 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 30 Dec 2021 23:25:23 +0100
Subject: [PATCH 1353/1650] update news

---
 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index fd095500..e002f958 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,8 @@ v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
           /UPGRADE (#1357, an#53)
 
 v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
-	* /SET resolve_reverse_lookup setting was removed (#1135)
+	* /SET resolve_reverse_lookup setting was removed (#1034,
+          #1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 

From 937786b731d8ef62e243355cabf92b66605c1d69 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 13 Jan 2022 19:38:36 +0100
Subject: [PATCH 1354/1650] fix crash in Perl's $view->set_bookmark

reported on the freebsd issue tracker https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254237#c13
---
 src/perl/textui/TextBufferView.xs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/perl/textui/TextBufferView.xs b/src/perl/textui/TextBufferView.xs
index 43aba4e6..e4cfe674 100644
--- a/src/perl/textui/TextBufferView.xs
+++ b/src/perl/textui/TextBufferView.xs
@@ -49,14 +49,14 @@ textbuffer_view_scroll_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_scroll_line(view, line->line);
+	textbuffer_view_scroll_line(view, Line(line));
 
 Irssi::TextUI::LineCache
 textbuffer_view_get_line_cache(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	RETVAL = textbuffer_view_get_line_cache(view, line->line);
+	RETVAL = textbuffer_view_get_line_cache(view, Line(line));
 OUTPUT:
 	RETVAL
 
@@ -65,7 +65,7 @@ textbuffer_view_remove_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_remove_line(view, line->line);
+	textbuffer_view_remove_line(view, Line(line));
 
 void
 textbuffer_view_remove_all_lines(view)
@@ -82,7 +82,7 @@ textbuffer_view_set_bookmark(view, name, line)
 	char *name
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_set_bookmark(view, name, line->line);
+	textbuffer_view_set_bookmark(view, name, Line(line));
 
 void
 textbuffer_view_set_bookmark_bottom(view, name)

From c96a8d9fae80384be56e2a87e7d967066919fb90 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 30 Dec 2021 23:23:53 +0100
Subject: [PATCH 1355/1650] Merge pull request #54 from ailin-nemui/chantypes

use chantypes instead of # for irc channel defaults

(cherry picked from commit f7fd4d72e488081f180fc1f4cc8bb269e50a9067)
---
 src/irc/core/irc-channels.c | 31 +++++++++++++++++++++----------
 src/irc/core/irc-servers.c  |  5 +++--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index 6d38c560..b0fba9b1 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -63,6 +63,20 @@ IRC_CHANNEL_REC *irc_channel_create(IRC_SERVER_REC *server, const char *name,
 #define get_join_key(key) \
 	(((key) == NULL || *(key) == '\0') ? "x" : (key))
 
+static char *force_channel_name(IRC_SERVER_REC *server, const char *name)
+{
+	char *chantypes;
+
+	if (server_ischannel(SERVER(server), name))
+		return g_strdup(name);
+
+	chantypes = g_hash_table_lookup(server->isupport, "chantypes");
+	if (chantypes == NULL || *chantypes == '\0')
+		chantypes = "#";
+
+	return g_strdup_printf("%c%s", *chantypes, name);
+}
+
 static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 			      int automatic)
 {
@@ -99,8 +113,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 	tmp = chanlist;
 	for (;; tmp++) {
 		if (*tmp !=  NULL) {
-			channel = server_ischannel(SERVER(server), *tmp) ? g_strdup(*tmp) :
-			g_strdup_printf("#%s", *tmp);
+			channel = force_channel_name(server, *tmp);
 
 			chanrec = irc_channel_find(server, channel);
 			if (chanrec == NULL) {
@@ -170,17 +183,14 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 }
 
 /* function for finding IRC channels - adds support for !channels */
-static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
-					    const char *channel)
+static CHANNEL_REC *irc_channel_find_server(IRC_SERVER_REC *server, const char *channel)
 {
 	GSList *tmp;
 	char *fmt_channel;
 
 	/* if 'channel' has no leading # this lookup is going to fail, add a
 	 * octothorpe in front of it to handle this case. */
-	fmt_channel = server_ischannel(SERVER(server), channel) ?
-	    g_strdup(channel) :
-	    g_strdup_printf("#%s", channel);
+	fmt_channel = force_channel_name(server, channel);
 
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *rec = tmp->data;
@@ -189,12 +199,12 @@ static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
                         continue;
 
 		/* check both !ABCDEchannel and !channel */
-		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->name) == 0) {
+		if (server->nick_comp_func(fmt_channel, rec->name) == 0) {
 			g_free(fmt_channel);
 			return rec;
 		}
 
-		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->visible_name) == 0) {
+		if (server->nick_comp_func(fmt_channel, rec->visible_name) == 0) {
 			g_free(fmt_channel);
 			return rec;
 		}
@@ -210,7 +220,8 @@ static void sig_server_connected(SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
-	server->channel_find_func = irc_channel_find_server;
+	server->channel_find_func =
+	    (CHANNEL_REC * (*) (SERVER_REC *, const char *) ) irc_channel_find_server;
 	server->channels_join = (void (*) (SERVER_REC *, const char *, int))
 		irc_channels_join;
 }
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 82989534..092eb7af 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -84,10 +84,11 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
 	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg == NULL)
+	if (statusmsg == NULL && strchr(chantypes, '@') == NULL)
 		statusmsg = "@";
 
-	data += strspn(data, statusmsg);
+	if (statusmsg != NULL)
+		data += strspn(data, statusmsg);
 
 	/* strchr(3) considers the trailing NUL as part of the string, make sure
 	 * we didn't advance too much. */

From 3603d47990480d4899a79f2bae815996975ce068 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 14 Jan 2022 11:29:25 +0100
Subject: [PATCH 1356/1650] Merge pull request #56 from
 ailin-nemui/line-bookmark

fix crash in Perl's $view->set_bookmark

(cherry picked from commit 95e3fea62236b606b9c9e4d0c4231c75589ef71f)
---
 NEWS                              | 3 ++-
 src/perl/textui/TextBufferView.xs | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 649f3669..0a49cc3a 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@ v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
           /UPGRADE (#1357, an#53)
 
 v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
-	* /SET resolve_reverse_lookup setting was removed (#1135)
+	* /SET resolve_reverse_lookup setting was removed (#1034,
+          #1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
diff --git a/src/perl/textui/TextBufferView.xs b/src/perl/textui/TextBufferView.xs
index 43aba4e6..e4cfe674 100644
--- a/src/perl/textui/TextBufferView.xs
+++ b/src/perl/textui/TextBufferView.xs
@@ -49,14 +49,14 @@ textbuffer_view_scroll_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_scroll_line(view, line->line);
+	textbuffer_view_scroll_line(view, Line(line));
 
 Irssi::TextUI::LineCache
 textbuffer_view_get_line_cache(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	RETVAL = textbuffer_view_get_line_cache(view, line->line);
+	RETVAL = textbuffer_view_get_line_cache(view, Line(line));
 OUTPUT:
 	RETVAL
 
@@ -65,7 +65,7 @@ textbuffer_view_remove_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_remove_line(view, line->line);
+	textbuffer_view_remove_line(view, Line(line));
 
 void
 textbuffer_view_remove_all_lines(view)
@@ -82,7 +82,7 @@ textbuffer_view_set_bookmark(view, name, line)
 	char *name
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_set_bookmark(view, name, line->line);
+	textbuffer_view_set_bookmark(view, name, Line(line));
 
 void
 textbuffer_view_set_bookmark_bottom(view, name)

From b60b0f0ff94acae339cf36b611f03e318362b006 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 14 Jan 2022 13:18:41 +0100
Subject: [PATCH 1357/1650] tag as 1.3.2-an

---
 NEWS         | 6 ++++++
 configure.ac | 2 +-
 meson.build  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 0a49cc3a..5464ad05 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+v1.3.2-an 2022-01-14  Ailin Nemui <Nei>
+	- CHANTYPES take precedence over (missing) STATUSMSG in /join
+          (#1358, an#54)
+	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
+          an#56)
+
 v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
 	- Minor help fixes (an#51, an#52)
 	- Fix regression where own channel status was forgotten after
diff --git a/configure.ac b/configure.ac
index bf5f6c18..87dcbc32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.1-an)
+AC_INIT(irssi, 1.3.2-an)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 79f3b58b..64dd04cf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.1-an',
+  version : '1.3.2-an',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From c0123a1487dfd33f0e0dead3f205653ad63a55a4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 14 Jan 2022 13:40:42 +0100
Subject: [PATCH 1358/1650] Merge tag '1.3.2-an' into integrate/1.3.2-an

---
 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index e002f958..b8865f28 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 v1.4-head-an 2022-xx-xx  Ailin Nemui <Nei>
 
+v1.3.2-an 2022-01-14  Ailin Nemui <Nei>
+	- CHANTYPES take precedence over (missing) STATUSMSG in /join
+          (#1358, an#54)
+	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
+          an#56)
+
 v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
 	- Minor help fixes (an#51, an#52)
 	- Fix regression where own channel status was forgotten after

From 29e36a8fb0ff74a666dd49b605a9ae62d869ba41 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Thu, 31 Mar 2011 02:44:33 +0200
Subject: [PATCH 1359/1650] Make window left/right skip windows that are
 already visible in other mainwins

---
 src/fe-text/mainwindows.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 711daf0a..be2cb100 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1642,7 +1642,8 @@ static int window_refnum_left(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) ||
+                 is_window_visible(window));
 
         return refnum;
 }
@@ -1664,7 +1665,8 @@ static int window_refnum_right(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) ||
+                 is_window_visible(window));
 
         return refnum;
 }

From 7b22f41ec50d1bd9fa8e1cf71ee0a6ce8da54533 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 19 Jan 2022 20:49:56 +0100
Subject: [PATCH 1360/1650] formatting

---
 src/fe-text/mainwindows.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index be2cb100..fae7ced8 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1642,10 +1642,9 @@ static int window_refnum_left(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky) ||
-                 is_window_visible(window));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) || is_window_visible(window));
 
-        return refnum;
+	return refnum;
 }
 
 static int window_refnum_right(int refnum, int wrap)
@@ -1665,10 +1664,9 @@ static int window_refnum_right(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky) ||
-                 is_window_visible(window));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) || is_window_visible(window));
 
-        return refnum;
+	return refnum;
 }
 
 /* SYNTAX: WINDOW LEFT [-directional] */

From 4846e4f31948e7c46efcd390d74d07a3dd2ef09c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sat, 5 Feb 2022 22:31:24 +0100
Subject: [PATCH 1361/1650] Add "paste event" signal

---
 docs/signals.txt             |   1 +
 src/common.h                 |   2 +-
 src/fe-text/gui-readline.c   | 192 +++++++++++++++++++++++++++++++++--
 src/fe-text/module-formats.c |   8 +-
 src/fe-text/module-formats.h |  23 +++--
 5 files changed, 201 insertions(+), 25 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index da72ef57..314c4dc9 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -351,6 +351,7 @@ Text FE
 
 gui-readline.c:
  "gui key pressed", int key
+ "paste event", char *paste
 
 gui-printtext.c:
  "beep"
diff --git a/src/common.h b/src/common.h
index ac09a553..7f8604f3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 43
+#define IRSSI_ABI_VERSION 44
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index f848ba1b..6f65c044 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -81,6 +81,8 @@ static int previous_yank_preceded;
 static const unichar bp_start[] = { 0x1b, '[', '2', '0', '0', '~' };
 static const unichar bp_end[]   = { 0x1b, '[', '2', '0', '1', '~' };
 
+#define BRACKETED_PASTE_TIMEOUT (5 * 1000) // ms
+
 static void sig_input(void);
 
 void input_listen_init(int handle)
@@ -330,7 +332,7 @@ static void paste_send(void)
 	g_string_free(str, TRUE);
 }
 
-static void paste_flush(int send)
+static void paste_flush(void (*send)(void))
 {
 	if (paste_prompt) {
 		gui_entry_set_text(active_entry, paste_entry);
@@ -338,8 +340,8 @@ static void paste_flush(int send)
 		g_free_and_null(paste_entry);
 	}
 
-	if (send)
-		paste_send();
+	if (send != NULL)
+		send();
 	g_array_set_size(paste_buffer, 0);
 
 	/* re-add anything that may have been after the bracketed paste end */
@@ -358,6 +360,128 @@ static void paste_flush(int send)
 	gui_entry_redraw(active_entry);
 }
 
+static void paste_print_line(const char *str)
+{
+	printformat_window(active_win, MSGLEVEL_CLIENTCRAP, TXT_PASTE_CONTENT, str);
+}
+
+static void paste_print(void)
+{
+	GArray *garr;
+	unichar *arr;
+	GString *str;
+	char out[10];
+	unsigned int i;
+	gboolean free_garr;
+
+	if (paste_join_multiline) {
+		garr = g_array_copy(paste_buffer);
+		paste_buffer_join_lines(garr);
+		free_garr = TRUE;
+	} else {
+		garr = paste_buffer;
+		free_garr = FALSE;
+	}
+
+	arr = &g_array_index(garr, unichar, 0);
+
+	str = g_string_new(NULL);
+	for (i = 0; i < garr->len; i++) {
+		if (isnewline(arr[i])) {
+			paste_print_line(str->str);
+			g_string_truncate(str, 0);
+		} else if (active_entry->utf8) {
+			out[g_unichar_to_utf8(arr[i], out)] = '\0';
+			g_string_append(str, out);
+		} else if (term_type == TERM_TYPE_BIG5) {
+			if (arr[i] > 0xff)
+				g_string_append_c(str, (arr[i] >> 8) & 0xff);
+			g_string_append_c(str, arr[i] & 0xff);
+		} else {
+			g_string_append_c(str, arr[i]);
+		}
+	}
+
+	if (str->len)
+		paste_print_line(str->str);
+
+	g_string_free(str, TRUE);
+	if (free_garr)
+		g_array_free(garr, TRUE);
+}
+
+static void paste_event(void)
+{
+	GArray *garr;
+	unichar *arr;
+	GString *str;
+	char out[10];
+	unsigned int i;
+	gboolean free_garr;
+
+	if (paste_join_multiline) {
+		garr = g_array_copy(paste_buffer);
+		paste_buffer_join_lines(garr);
+		free_garr = TRUE;
+	} else {
+		garr = paste_buffer;
+		free_garr = FALSE;
+	}
+
+	arr = &g_array_index(garr, unichar, 0);
+	str = g_string_new(NULL);
+	for (i = 0; i < garr->len; i++) {
+		if (isnewline(arr[i])) {
+			g_string_append_c(str, '\n');
+		} else if (active_entry->utf8) {
+			out[g_unichar_to_utf8(arr[i], out)] = '\0';
+			g_string_append(str, out);
+		} else if (term_type == TERM_TYPE_BIG5) {
+			if (arr[i] > 0xff)
+				g_string_append_c(str, (arr[i] >> 8) & 0xff);
+			g_string_append_c(str, arr[i] & 0xff);
+		} else {
+			g_string_append_c(str, arr[i]);
+		}
+	}
+
+	if (signal_emit("paste event", 1, str->str)) {
+		paste_flush(NULL);
+	}
+
+	g_string_free(str, TRUE);
+	if (free_garr)
+		g_array_free(garr, TRUE);
+}
+
+static void paste_insert_edit(void)
+{
+	unichar *arr;
+	unsigned int i;
+
+	if (paste_join_multiline)
+		paste_buffer_join_lines(paste_buffer);
+
+	arr = &g_array_index(paste_buffer, unichar, 0);
+	for (i = 0; i < paste_buffer->len; i++) {
+		if (isnewline(arr[i])) {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, 'n');
+		} else if (arr[i] == 9) {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, 't');
+		} else if (arr[i] == 27) {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, 'e');
+		} else if (arr[i] == '\\') {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, '\\');
+		} else {
+			gui_entry_insert_char(active_entry, arr[i]);
+		}
+	}
+}
+
 static void insert_paste_prompt(void)
 {
 	char *str;
@@ -747,7 +871,7 @@ static gboolean paste_timeout(gpointer data)
 				active_win->active != NULL)
 		insert_paste_prompt();
 	else
-		paste_flush(TRUE);
+		paste_flush(paste_send);
 	paste_timeout_id = -1;
 	return FALSE;
 }
@@ -777,12 +901,14 @@ static void paste_bracketed_end(int i, gboolean rest)
 	}
 
 	/* decide what to do with the buffer */
+	if (paste_timeout_id != -1)
+		g_source_remove(paste_timeout_id);
 	paste_timeout(NULL);
 
 	paste_bracketed_mode = FALSE;
 }
 
-static void paste_bracketed_middle()
+static void paste_bracketed_middle(void)
 {
 	int i;
 	int marklen = G_N_ELEMENTS(bp_end);
@@ -830,8 +956,10 @@ static void sig_input(void)
 		term_gets(buffer, &line_count);
 		key = g_array_index(buffer, unichar, 0);
 		/* Either Ctrl-k or Ctrl-c is pressed */
-		if (key == 11 || key == 3)
-			paste_flush(key == 11);
+		if (key < 32 && key != 13 /* CR */ && key != 10 /* LF */ && key != 27 /* Esc */) {
+			key_pressed(keyboard, "paste");
+			signal_emit("gui key pressed", 1, GINT_TO_POINTER(key));
+		}
 		g_array_free(buffer, TRUE);
 	} else {
 		term_gets(paste_buffer, &paste_line_count);
@@ -869,7 +997,37 @@ static void sig_input(void)
 
 static void key_paste_start(void)
 {
-	paste_bracketed_mode = TRUE;
+	if (paste_use_bracketed_mode) {
+		paste_bracketed_mode = TRUE;
+		if (paste_timeout_id != -1)
+			g_source_remove(paste_timeout_id);
+		paste_timeout_id = g_timeout_add(BRACKETED_PASTE_TIMEOUT, paste_timeout, NULL);
+	}
+}
+
+static void key_paste_cancel(void)
+{
+	paste_flush(NULL);
+}
+
+static void key_paste_print(void)
+{
+	paste_print();
+}
+
+static void key_paste_send(void)
+{
+	paste_flush(paste_send);
+}
+
+static void key_paste_edit(void)
+{
+	paste_flush(paste_insert_edit);
+}
+
+static void key_paste_event(void)
+{
+	paste_event();
 }
 
 time_t get_idle_time(void)
@@ -1136,6 +1294,8 @@ static void setup_changed(void)
 	term_set_appkey_mode(settings_get_bool("term_appkey_mode"));
 	/* Enable the bracketed paste mode on demand */
 	term_set_bracketed_paste_mode(paste_use_bracketed_mode);
+	if (!paste_use_bracketed_mode)
+		paste_bracketed_mode = FALSE;
 }
 
 void gui_readline_init(void)
@@ -1235,7 +1395,13 @@ void gui_readline_init(void)
 
 	key_bind("key", NULL, "meta-O-M", "return", (SIGNAL_FUNC) key_combo);
 
-	key_bind("paste_start", "Bracketed paste start", "meta2-200~", "paste_start", (SIGNAL_FUNC) key_paste_start);
+	/* clang-format off */
+	key_bind("paste_start", "Bracketed paste start", "^[[200~", "paste_start", (SIGNAL_FUNC) key_paste_start);
+	key_bind("paste_cancel", "Cancel paste", "paste-^C", NULL, (SIGNAL_FUNC) key_paste_cancel);
+	key_bind("paste_print", "Print paste to screen", "paste-^P", NULL, (SIGNAL_FUNC) key_paste_print);
+	key_bind("paste_send", "Send paste to target", "paste-^K", NULL, (SIGNAL_FUNC) key_paste_send);
+	key_bind("paste_edit", "Insert paste to input line", "paste-^E", NULL, (SIGNAL_FUNC) key_paste_edit);
+	key_bind("paste_event", "Send paste to event", "paste-^U", NULL, (SIGNAL_FUNC) key_paste_event);
 
 	/* cursor movement */
 	key_bind("backward_character", "Move the cursor a character backward", "left", NULL, (SIGNAL_FUNC) key_backward_character);
@@ -1307,8 +1473,9 @@ void gui_readline_init(void)
         /* inserting special input characters to line.. */
 	key_bind("escape_char", "Insert the next character exactly as-is to input line", NULL, NULL, (SIGNAL_FUNC) key_escape);
 	key_bind("insert_text", "Append text to line", NULL, NULL, (SIGNAL_FUNC) key_insert_text);
+	/* clang-format on */
 
-        /* autoreplaces */
+	/* autoreplaces */
 	key_bind("multi", NULL, "return", "check_replaces;send_line", NULL);
 	key_bind("multi", NULL, "space", "check_replaces;insert_text  ", NULL);
 
@@ -1338,6 +1505,11 @@ void gui_readline_deinit(void)
         key_configure_freeze();
 
 	key_unbind("paste_start", (SIGNAL_FUNC) key_paste_start);
+	key_unbind("paste_cancel", (SIGNAL_FUNC) key_paste_cancel);
+	key_unbind("paste_print", (SIGNAL_FUNC) key_paste_print);
+	key_unbind("paste_send", (SIGNAL_FUNC) key_paste_send);
+	key_unbind("paste_edit", (SIGNAL_FUNC) key_paste_edit);
+	key_unbind("paste_event", (SIGNAL_FUNC) key_paste_event);
 
 	key_unbind("backward_character", (SIGNAL_FUNC) key_backward_character);
 	key_unbind("forward_character", (SIGNAL_FUNC) key_forward_character);
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e9d4fab9..bb7eacee 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -21,8 +21,8 @@
 #include "module.h"
 #include <irssi/src/fe-common/core/formats.h>
 
-FORMAT_REC gui_text_formats[] =
-{
+FORMAT_REC gui_text_formats[] = {
+	/* clang-format off */
 	{ MODULE_NAME, "Text user interface", 0 },
 
 	/* ---- */
@@ -77,8 +77,9 @@ FORMAT_REC gui_text_formats[] =
 	/* ---- */
 	{ NULL, "Pasting", 0 },
 
-	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.", 2, { 1, 0 } },
+	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel. Ctrl-P to print the paste content, Ctrl-E to insert the paste in the input line, Ctrl-U to pass the paste to a signal handler.", 2, { 1, 0 } },
 	{ "paste_prompt", "Hit Ctrl-K to paste, Ctrl-C to abort?", 0 },
+	{ "paste_content", "%_>%_ $0", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Welcome", 0 },
@@ -98,4 +99,5 @@ FORMAT_REC gui_text_formats[] =
 	{ "welcome_init_settings", "The following settings were initialized", 0 },
 
 	{ NULL, NULL, 0 }
+	/* clang-format on */
 };
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index 59c877b8..5392705f 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -5,8 +5,8 @@ enum {
 
 	TXT_FILL_1,
 
-        TXT_LASTLOG_TOO_LONG,
-        TXT_LASTLOG_COUNT,
+	TXT_LASTLOG_TOO_LONG,
+	TXT_LASTLOG_COUNT,
 	TXT_LASTLOG_START,
 	TXT_LASTLOG_END,
 	TXT_LASTLOG_SEPARATOR,
@@ -14,18 +14,18 @@ enum {
 
 	TXT_FILL_2,
 
-        TXT_REFNUM_NOT_FOUND,
-        TXT_WINDOW_TOO_SMALL,
-        TXT_CANT_HIDE_LAST,
+	TXT_REFNUM_NOT_FOUND,
+	TXT_WINDOW_TOO_SMALL,
+	TXT_CANT_HIDE_LAST,
 	TXT_CANT_HIDE_STICKY_WINDOWS,
-        TXT_CANT_SHOW_STICKY_WINDOWS,
-        TXT_WINDOW_NOT_STICKY,
-        TXT_WINDOW_SET_STICKY,
+	TXT_CANT_SHOW_STICKY_WINDOWS,
+	TXT_WINDOW_NOT_STICKY,
+	TXT_WINDOW_SET_STICKY,
 	TXT_WINDOW_UNSET_STICKY,
 	TXT_WINDOW_INFO_STICKY,
-        TXT_WINDOW_INFO_SCROLL,
-        TXT_WINDOW_SCROLL,
-        TXT_WINDOW_SCROLL_UNKNOWN,
+	TXT_WINDOW_INFO_SCROLL,
+	TXT_WINDOW_SCROLL,
+	TXT_WINDOW_SCROLL_UNKNOWN,
 	TXT_WINDOW_HIDELEVEL,
 
 	TXT_FILL_3,
@@ -53,6 +53,7 @@ enum {
 
 	TXT_PASTE_WARNING,
 	TXT_PASTE_PROMPT,
+	TXT_PASTE_CONTENT,
 
 	TXT_FILL_5, /* Welcome */
 

From 5f29b35fbef7f5f2d51b6b677f49c4a2a476a266 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sat, 5 Feb 2022 22:31:42 +0100
Subject: [PATCH 1362/1650] fix crash when accessing settings during shutdown

---
 src/core/settings.c                 | 1 +
 src/fe-common/core/fe-common-core.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 28f953ba..1e7ef2ee 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -928,6 +928,7 @@ void settings_deinit(void)
 
 	g_hash_table_foreach(settings, (GHFunc) settings_hash_free, NULL);
 	g_hash_table_destroy(settings);
+	settings = NULL;
 
 	if (mainconfig != NULL) config_close(mainconfig);
 }
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index a25c528c..9724354f 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -57,6 +57,7 @@ static int autocon_port;
 static int no_autoconnect;
 static char *cmdline_nick;
 static char *cmdline_hostname;
+GLogFunc logger_old;
 
 void fe_core_log_init(void);
 void fe_core_log_deinit(void);
@@ -253,6 +254,8 @@ void fe_common_core_deinit(void)
         signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("channel created", (SIGNAL_FUNC) sig_channel_created);
         signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
+
+	g_log_set_default_handler(logger_old, NULL);
 }
 
 static gboolean glib_domain_wanted(const char *domain)
@@ -521,7 +524,7 @@ void fe_common_core_finish_init(void)
 	signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed);
 
         /* _after_ windows are created.. */
-	g_log_set_default_handler((GLogFunc) i_log_func, NULL);
+	logger_old = g_log_set_default_handler((GLogFunc) i_log_func, NULL);
 
 	if (setup_changed)
                 signal_emit("setup changed", 0);

From 17f185d8333c2d9f0d635a66d8b2ee498c576f09 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sat, 5 Feb 2022 23:01:55 +0100
Subject: [PATCH 1363/1650] add setting to ignore first newline

---
 src/fe-text/gui-readline.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 6f65c044..563f1e2e 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -69,6 +69,7 @@ static GArray *paste_buffer_rest;
 static char *paste_old_prompt;
 static int paste_prompt, paste_line_count;
 static int paste_join_multiline;
+static int paste_ignore_first_nl;
 static int paste_timeout_id;
 static int paste_use_bracketed_mode;
 static int paste_bracketed_mode;
@@ -853,6 +854,17 @@ static gboolean paste_timeout(gpointer data)
 	int split_lines;
 	paste_was_bracketed_mode = paste_bracketed_mode;
 
+	if (paste_ignore_first_nl && paste_line_count == 1) {
+		unichar last_char;
+
+		last_char = g_array_index(paste_buffer, unichar, paste_buffer->len - 1);
+
+		if (isnewline(last_char)) {
+			g_array_set_size(paste_buffer, paste_buffer->len - 1);
+			paste_line_count--;
+		}
+	}
+
 	/* number of lines after splitting extra-long messages */
 	split_lines = paste_buffer->len / LINE_SPLIT_LIMIT;
 
@@ -1289,6 +1301,7 @@ static void setup_changed(void)
 
 	paste_verify_line_count = settings_get_int("paste_verify_line_count");
 	paste_join_multiline = settings_get_bool("paste_join_multiline");
+	paste_ignore_first_nl = settings_get_bool("paste_ignore_first_nl");
 	paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
 
 	term_set_appkey_mode(settings_get_bool("term_appkey_mode"));
@@ -1324,7 +1337,8 @@ void gui_readline_init(void)
 	   keycodes. this must be larger to allow them to work. */
 	settings_add_int("misc", "paste_verify_line_count", 5);
 	settings_add_bool("misc", "paste_join_multiline", TRUE);
-        setup_changed();
+	settings_add_bool("misc", "paste_ignore_first_nl", FALSE);
+	setup_changed();
 
 	keyboard = keyboard_create(NULL);
         key_configure_freeze();

From 5cd13d6ea2889954faf78aa6e7040c686487126d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sat, 5 Feb 2022 23:24:52 +0100
Subject: [PATCH 1364/1650] compatibility code for old GLib

---
 src/fe-text/gui-readline.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 563f1e2e..3b440672 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -84,6 +84,23 @@ static const unichar bp_end[]   = { 0x1b, '[', '2', '0', '1', '~' };
 
 #define BRACKETED_PASTE_TIMEOUT (5 * 1000) // ms
 
+#if GLIB_CHECK_VERSION(2, 62, 0)
+/* nothing */
+#else
+/* compatibility code for old GLib */
+GArray *g_array_copy(GArray *array)
+{
+	GArray *out;
+	guint elt_size;
+
+	elt_size = g_array_get_element_size(array);
+	out = g_array_sized_new(FALSE, FALSE, elt_size, array->len);
+	memcpy(out->data, array->data, array->len * elt_size);
+
+	return out;
+}
+#endif
+
 static void sig_input(void);
 
 void input_listen_init(int handle)

From d4ed3460fc811354a6f3072dfd4bc70fc517316b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sun, 6 Feb 2022 00:41:13 +0100
Subject: [PATCH 1365/1650] fix some stupidness

---
 src/fe-text/gui-readline.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 3b440672..8ebf7436 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -1036,27 +1036,37 @@ static void key_paste_start(void)
 
 static void key_paste_cancel(void)
 {
-	paste_flush(NULL);
+	if (paste_prompt) {
+		paste_flush(NULL);
+	}
 }
 
 static void key_paste_print(void)
 {
-	paste_print();
+	if (paste_prompt) {
+		paste_print();
+	}
 }
 
 static void key_paste_send(void)
 {
-	paste_flush(paste_send);
+	if (paste_prompt) {
+		paste_flush(paste_send);
+	}
 }
 
 static void key_paste_edit(void)
 {
-	paste_flush(paste_insert_edit);
+	if (paste_prompt) {
+		paste_flush(paste_insert_edit);
+	}
 }
 
 static void key_paste_event(void)
 {
-	paste_event();
+	if (paste_prompt) {
+		paste_event();
+	}
 }
 
 time_t get_idle_time(void)

From f47154d1a9d48cb524d8ef178ccf2c814d028389 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sun, 6 Feb 2022 01:47:55 +0100
Subject: [PATCH 1366/1650] support multiple scripts

---
 docs/signals.txt           | 2 +-
 src/fe-text/gui-readline.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 314c4dc9..81a1e3fa 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -351,7 +351,7 @@ Text FE
 
 gui-readline.c:
  "gui key pressed", int key
- "paste event", char *paste
+ "paste event", char *paste, char *arg
 
 gui-printtext.c:
  "beep"
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 8ebf7436..8e1b66ff 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -428,7 +428,7 @@ static void paste_print(void)
 		g_array_free(garr, TRUE);
 }
 
-static void paste_event(void)
+static void paste_event(const char *arg)
 {
 	GArray *garr;
 	unichar *arr;
@@ -463,7 +463,7 @@ static void paste_event(void)
 		}
 	}
 
-	if (signal_emit("paste event", 1, str->str)) {
+	if (signal_emit("paste event", 2, str->str, arg)) {
 		paste_flush(NULL);
 	}
 
@@ -1062,10 +1062,10 @@ static void key_paste_edit(void)
 	}
 }
 
-static void key_paste_event(void)
+static void key_paste_event(const char *arg)
 {
 	if (paste_prompt) {
-		paste_event();
+		paste_event(arg);
 	}
 }
 

From cdda5ab759b0e19fc619873c1ead15709f970c65 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 19 Jan 2022 13:09:49 +0100
Subject: [PATCH 1367/1650] Make actlist separator a setting

---
 src/fe-text/statusbar-items.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 47b31103..8f479fa1 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -75,13 +75,14 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 	GString *str;
 	GString *format;
 	GList *tmp;
-        char *ret, *name, *value;
+        char *ret, *name, *value, *separator;
         int is_det;
 	int add_name = settings_get_bool("actlist_names");
 	int pref_name = settings_get_bool("actlist_prefer_window_name");
 
 	str = g_string_new(NULL);
 	format = g_string_new(NULL);
+	separator = settings_get_str("actlist_separator");
 
 	theme = window != NULL && window->active != NULL &&
 		window->active->theme != NULL ?
@@ -96,7 +97,8 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 
                 /* comma separator */
 		if (str->len > 0) {
-			value = theme_format_expand(theme, "{sb_act_sep ,}");
+                        g_string_printf(format, "{sb_act_sep %s}", strlen(separator) > 0 ? separator : ",");
+			value = theme_format_expand(theme, format->str);
 			g_string_append(str, value);
 			g_free(value);
 		}
@@ -462,6 +464,7 @@ void statusbar_items_init(void)
 	settings_add_time("misc", "lag_min_show", "1sec");
 	settings_add_choice("lookandfeel", "actlist_sort", 0, "refnum;recent;level;level,recent");
 	settings_add_bool("lookandfeel", "actlist_names", FALSE);
+	settings_add_str("lookandfeel", "actlist_separator", ",");
 	settings_add_bool("lookandfeel", "actlist_prefer_window_name", FALSE);
 
 	statusbar_item_register("window", NULL, item_window_active);

From de626250b59a1acdab41d4b96a7840536e60aadc Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Wed, 19 Jan 2022 18:01:30 +0100
Subject: [PATCH 1368/1650] Added statusbar_items_redraw code

---
 src/fe-text/statusbar-items.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 8f479fa1..560e159f 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -33,6 +33,7 @@
 
 static GList *activity_list;
 static guint8 actlist_sort;
+static char *actlist_separator;
 static GSList *more_visible; /* list of MAIN_WINDOW_RECs which have --more-- */
 static GHashTable *input_entries;
 static int last_lag, last_lag_unknown, lag_timeout_tag;
@@ -75,14 +76,13 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 	GString *str;
 	GString *format;
 	GList *tmp;
-        char *ret, *name, *value, *separator;
+        char *ret, *name, *value;
         int is_det;
 	int add_name = settings_get_bool("actlist_names");
 	int pref_name = settings_get_bool("actlist_prefer_window_name");
 
 	str = g_string_new(NULL);
 	format = g_string_new(NULL);
-	separator = settings_get_str("actlist_separator");
 
 	theme = window != NULL && window->active != NULL &&
 		window->active->theme != NULL ?
@@ -97,7 +97,7 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 
                 /* comma separator */
 		if (str->len > 0) {
-                        g_string_printf(format, "{sb_act_sep %s}", strlen(separator) > 0 ? separator : ",");
+                        g_string_printf(format, "{sb_act_sep %s}", strlen(actlist_separator) > 0 ? actlist_separator : ",");
 			value = theme_format_expand(theme, format->str);
 			g_string_append(str, value);
 			g_free(value);
@@ -457,6 +457,11 @@ static void read_settings(void)
 		gui_entry_set_utf8(active_entry, term_type == TERM_TYPE_UTF8);
 
 	actlist_sort = settings_get_choice("actlist_sort");
+
+	if(g_strcmp0(actlist_separator, settings_get_str("actlist_separator")) != 0) {
+		actlist_separator = settings_get_str("actlist_separator");
+		statusbar_items_redraw("act");
+	}
 }
 
 void statusbar_items_init(void)

From d6b55c6d43ef3c20d1ac889e3c8934ed6e5b4976 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 31 Jan 2022 10:36:57 +0100
Subject: [PATCH 1369/1650] Make redrawing of item actually work

---
 src/fe-text/statusbar-items.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 560e159f..5a2a4ed1 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -453,13 +453,16 @@ static void item_input(SBAR_ITEM_REC *item, int get_size_only)
 
 static void read_settings(void)
 {
+	const char *sep;
 	if (active_entry != NULL)
 		gui_entry_set_utf8(active_entry, term_type == TERM_TYPE_UTF8);
 
 	actlist_sort = settings_get_choice("actlist_sort");
 
-	if(g_strcmp0(actlist_separator, settings_get_str("actlist_separator")) != 0) {
-		actlist_separator = settings_get_str("actlist_separator");
+	sep = settings_get_str("actlist_separator");
+	if(g_strcmp0(actlist_separator, sep) != 0) {
+		g_free(actlist_separator);
+		actlist_separator = g_strdup(sep);
 		statusbar_items_redraw("act");
 	}
 }

From d65205506033212c0a9439e7b9e4809e3793aa0e Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 19 Jan 2022 21:10:07 +0100
Subject: [PATCH 1370/1650] Add empty_kill_clears_cutbuffer option

Adapted revert of 13524b1f76bb.
---
 src/fe-text/gui-entry.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 25965495..406c3fc1 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 #include <irssi/src/core/utf8.h>
 #include <irssi/src/fe-common/core/formats.h>
 
@@ -772,11 +773,13 @@ static GUI_ENTRY_CUTBUFFER_REC *get_cutbuffer_rec(GUI_ENTRY_REC *entry, CUTBUFFE
 
 void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
+	gboolean clear_enabled;
 	size_t i, w = 0;
 
         g_return_if_fail(entry != NULL);
+	clear_enabled = settings_get_bool("empty_kill_clears_cutbuffer");
 
-	if (size == 0 || entry->pos < size)
+	if (entry->pos < size || (size == 0 && !clear_enabled))
 		return;
 
 	if (update_cutbuffer != CUTBUFFER_UPDATE_NOOP) {
@@ -818,7 +821,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 
 			case CUTBUFFER_UPDATE_REPLACE:
 				/* put erased text to cutbuffer */
-				if (tmp->cutbuffer_len < size) {
+				if (tmp->cutbuffer_len < size || tmp->cutbuffer == NULL) {
 					g_free(tmp->cutbuffer);
 					tmp->cutbuffer = g_new(unichar, size+1);
 				}
@@ -834,6 +837,11 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 		}
 	}
 
+	if (size == 0 && clear_enabled) {
+		/* we just wanted to clear the cutbuffer */
+		return;
+	}
+
 	if (entry->utf8)
 		while (entry->pos > size + w && i_wcwidth(entry->text[entry->pos - size - w]) == 0)
 			w++;
@@ -1498,6 +1506,7 @@ void gui_entry_set_text_and_extents(GUI_ENTRY_REC *entry, GSList *list)
 
 void gui_entry_init(void)
 {
+	settings_add_bool("lookandfeel", "empty_kill_clears_cutbuffer", FALSE);
 }
 
 void gui_entry_deinit(void)

From 75e56297fcdbbe9820d3cac5b093045703d9e8e9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sun, 6 Feb 2022 02:25:19 +0100
Subject: [PATCH 1371/1650] fix intentation

---
 src/fe-text/gui-entry.c | 66 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 406c3fc1..b4013537 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -795,45 +795,45 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 		tmpcutbuffer = tmp->cutbuffer;
 		entry->append_next_kill = TRUE;
 		switch (update_cutbuffer) {
-			case CUTBUFFER_UPDATE_APPEND:
-				tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-				memcpy(tmp->cutbuffer, tmpcutbuffer,
-				       tmp->cutbuffer_len * sizeof(unichar));
-				memcpy(tmp->cutbuffer + tmp->cutbuffer_len,
-				       entry->text + entry->pos - size, size * sizeof(unichar));
+		case CUTBUFFER_UPDATE_APPEND:
+			tmp->cutbuffer = g_new(unichar, cutbuffer_new_size + 1);
+			memcpy(tmp->cutbuffer, tmpcutbuffer, tmp->cutbuffer_len * sizeof(unichar));
+			memcpy(tmp->cutbuffer + tmp->cutbuffer_len, entry->text + entry->pos - size,
+			       size * sizeof(unichar));
 
-				tmp->cutbuffer_len = cutbuffer_new_size;
-				tmp->cutbuffer[cutbuffer_new_size] = '\0';
-				g_free(tmpcutbuffer);
-				break;
+			tmp->cutbuffer_len = cutbuffer_new_size;
+			tmp->cutbuffer[cutbuffer_new_size] = '\0';
+			g_free(tmpcutbuffer);
+			break;
 
-			case CUTBUFFER_UPDATE_PREPEND:
-				tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-				memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
-				       size * sizeof(unichar));
-				memcpy(tmp->cutbuffer + size, tmpcutbuffer,
-				       tmp->cutbuffer_len * sizeof(unichar));
+		case CUTBUFFER_UPDATE_PREPEND:
+			tmp->cutbuffer = g_new(unichar, cutbuffer_new_size + 1);
+			memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
+			       size * sizeof(unichar));
+			memcpy(tmp->cutbuffer + size, tmpcutbuffer,
+			       tmp->cutbuffer_len * sizeof(unichar));
 
-				tmp->cutbuffer_len = cutbuffer_new_size;
-				tmp->cutbuffer[cutbuffer_new_size] = '\0';
-				g_free(tmpcutbuffer);
-				break;
+			tmp->cutbuffer_len = cutbuffer_new_size;
+			tmp->cutbuffer[cutbuffer_new_size] = '\0';
+			g_free(tmpcutbuffer);
+			break;
 
-			case CUTBUFFER_UPDATE_REPLACE:
-				/* put erased text to cutbuffer */
-				if (tmp->cutbuffer_len < size || tmp->cutbuffer == NULL) {
-					g_free(tmp->cutbuffer);
-					tmp->cutbuffer = g_new(unichar, size+1);
-				}
+		case CUTBUFFER_UPDATE_REPLACE:
+			/* put erased text to cutbuffer */
+			if (tmp->cutbuffer_len < size || tmp->cutbuffer == NULL) {
+				g_free(tmp->cutbuffer);
+				tmp->cutbuffer = g_new(unichar, size + 1);
+			}
 
-				tmp->cutbuffer_len = size;
-				tmp->cutbuffer[size] = '\0';
-				memcpy(tmp->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar));
-				break;
+			tmp->cutbuffer_len = size;
+			tmp->cutbuffer[size] = '\0';
+			memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
+			       size * sizeof(unichar));
+			break;
 
-			case CUTBUFFER_UPDATE_NOOP:
-				/* cannot happen, handled in "if" */
-				break;
+		case CUTBUFFER_UPDATE_NOOP:
+			/* cannot happen, handled in "if" */
+			break;
 		}
 	}
 

From 089cab715f62897f5905629198dcbdc58871b85b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sun, 6 Feb 2022 02:27:36 +0100
Subject: [PATCH 1372/1650] fix formatting

---
 src/fe-text/statusbar-items.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 5a2a4ed1..638827fd 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -97,7 +97,8 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 
                 /* comma separator */
 		if (str->len > 0) {
-                        g_string_printf(format, "{sb_act_sep %s}", strlen(actlist_separator) > 0 ? actlist_separator : ",");
+			g_string_printf(format, "{sb_act_sep %s}",
+			                strlen(actlist_separator) > 0 ? actlist_separator : ",");
 			value = theme_format_expand(theme, format->str);
 			g_string_append(str, value);
 			g_free(value);
@@ -460,7 +461,7 @@ static void read_settings(void)
 	actlist_sort = settings_get_choice("actlist_sort");
 
 	sep = settings_get_str("actlist_separator");
-	if(g_strcmp0(actlist_separator, sep) != 0) {
+	if (g_strcmp0(actlist_separator, sep) != 0) {
 		g_free(actlist_separator);
 		actlist_separator = g_strdup(sep);
 		statusbar_items_redraw("act");

From 32ab41625ffb2e203a24ee24f321437980dd774a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sun, 6 Feb 2022 09:50:38 +0100
Subject: [PATCH 1373/1650] simplify code

---
 src/fe-text/statusbar-items.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 638827fd..6e7cf8a5 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -97,8 +97,7 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 
                 /* comma separator */
 		if (str->len > 0) {
-			g_string_printf(format, "{sb_act_sep %s}",
-			                strlen(actlist_separator) > 0 ? actlist_separator : ",");
+			g_string_printf(format, "{sb_act_sep %s}", actlist_separator);
 			value = theme_format_expand(theme, format->str);
 			g_string_append(str, value);
 			g_free(value);

From e5d02bd57b05bdc05ed4c38adcf7548d7d5048b2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Sun, 6 Feb 2022 14:22:56 +0100
Subject: [PATCH 1374/1650] simplify

---
 src/fe-text/gui-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index b4013537..5050c800 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -837,7 +837,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 		}
 	}
 
-	if (size == 0 && clear_enabled) {
+	if (size == 0) {
 		/* we just wanted to clear the cutbuffer */
 		return;
 	}

From 76d140650a42419f212f8e6520e3a63639916054 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Mon, 7 Feb 2022 16:44:14 +0100
Subject: [PATCH 1375/1650] add settings*choice functions to perl

---
 src/perl/common/Settings.xs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs
index 2da23400..0f172411 100644
--- a/src/perl/common/Settings.xs
+++ b/src/perl/common/Settings.xs
@@ -104,6 +104,10 @@ int
 settings_get_size(key)
        char *key
 
+int
+settings_get_choice(key)
+	char *key
+
 void
 settings_set_str(key, value)
 	char *key
@@ -134,6 +138,11 @@ settings_set_size(key, value)
 	char *key
 	char *value
 
+int
+settings_set_choice(key, value)
+	char *key
+	char *value
+
 void
 settings_add_str(section, key, def)
 	char *section
@@ -188,6 +197,16 @@ CODE:
         perl_settings_add(key);
 	settings_add_size_module(MODULE_NAME"/scripts", section, key, def);
 
+void
+settings_add_choice(section, key, def, choices)
+	char *section
+	char *key
+	int def
+	char *choices
+CODE:
+	perl_settings_add(key);
+	settings_add_choice_module(MODULE_NAME "/scripts", section, key, def, choices);
+
 void
 settings_remove(key)
 	char *key

From 82f8ee57c317017d74950884f8264ae47f58361a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Sat, 27 Mar 2021 11:05:54 +0100
Subject: [PATCH 1376/1650] autoload the IRC module

---
 src/core/core.c                          |  2 +-
 src/fe-common/irc/dcc/meson.build        |  4 +++-
 src/fe-common/irc/fe-common-irc.c        |  6 ++++++
 src/fe-common/irc/irc-modules.c          |  2 ++
 src/fe-common/irc/meson.build            |  4 +++-
 src/fe-common/irc/notifylist/meson.build |  4 +++-
 src/fe-none/irssi.c                      | 26 ++++++++++++++++++++++++
 src/fe-none/meson.build                  |  1 -
 src/fe-text/irssi.c                      | 10 +++++++++
 src/fe-text/meson.build                  |  4 ----
 src/irc/core/meson.build                 |  4 +++-
 src/irc/dcc/meson.build                  |  4 +++-
 src/irc/flood/meson.build                |  4 +++-
 src/irc/irc.c                            |  2 ++
 src/irc/meson.build                      | 14 -------------
 src/irc/notifylist/meson.build           |  4 +++-
 tests/irc/flood/meson.build              |  3 ++-
 17 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/src/core/core.c b/src/core/core.c
index cbe3eb7c..7953654b 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -269,7 +269,7 @@ void core_init(void)
 	settings_add_str("misc", "ignore_signals", "");
 	settings_add_bool("misc", "override_coredump_limit", FALSE);
 	settings_add_bool("misc", "quit_on_hup", FALSE);
-	settings_add_str("misc", "autoload_modules", "perl otr");
+	settings_add_str("misc", "autoload_modules", "irc dcc flood notifylist perl otr");
 
 #ifdef HAVE_SYS_RESOURCE_H
 	getrlimit(RLIMIT_CORE, &orig_core_rlimit);
diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
index 296b1d61..013299a0 100644
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libfe_irc_dcc_a = static_library('fe_irc_dcc',
+libfe_irc_dcc_a = shared_module('fe_irc_dcc',
   files(
     'fe-dcc-chat-messages.c',
     'fe-dcc-chat.c',
@@ -12,6 +12,8 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
   c_args : [
     def_helpdir,
     def_sysconfdir,
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index a36d3caa..4658970b 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -30,8 +30,10 @@
 #include <irssi/src/fe-common/irc/fe-irc-server.h>
 #include <irssi/src/fe-common/irc/fe-irc-channels.h>
 
+#ifdef HAVE_STATIC_IRC
 void fe_irc_modules_init(void);
 void fe_irc_modules_deinit(void);
+#endif
 
 void fe_irc_queries_init(void);
 void fe_irc_queries_deinit(void);
@@ -104,12 +106,16 @@ void fe_common_irc_init(void)
 	settings_check();
 	module_register("irc", "fe-common");
 
+#ifdef HAVE_STATIC_IRC
 	fe_irc_modules_init();
+#endif
 }
 
 void fe_common_irc_deinit(void)
 {
+#ifdef HAVE_STATIC_IRC
 	fe_irc_modules_deinit();
+#endif
 
 	fe_irc_channels_deinit();
 	fe_irc_queries_deinit();
diff --git a/src/fe-common/irc/irc-modules.c b/src/fe-common/irc/irc-modules.c
index 3bf1f327..b8c17d3b 100644
--- a/src/fe-common/irc/irc-modules.c
+++ b/src/fe-common/irc/irc-modules.c
@@ -1,4 +1,6 @@
+#ifdef HAVE_STATIC_IRC
 void fe_irc_dcc_init(void);void fe_irc_notifylist_init(void);
 void fe_irc_notifylist_deinit(void);void fe_irc_dcc_deinit(void);
 void fe_irc_modules_init(void) {  fe_irc_dcc_init(); fe_irc_notifylist_init(); }
 void fe_irc_modules_deinit(void) { fe_irc_notifylist_deinit(); fe_irc_dcc_deinit();  }
+#endif
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index 1789133c..38903043 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libfe_common_irc_a = static_library('fe_common_irc',
+libfe_common_irc_a = shared_module('fe_common_irc',
   files(
     'fe-cap.c',
     'fe-common-irc.c',
@@ -25,6 +25,8 @@ libfe_common_irc_a = static_library('fe_common_irc',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
   c_args : [
     def_helpdir,
     def_themesdir,
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
index 2e66c786..76e63b82 100644
--- a/src/fe-common/irc/notifylist/meson.build
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -1,12 +1,14 @@
 # this file is part of irssi
 
-libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
+libfe_irc_notifylist_a = shared_module('fe_irc_notifylist',
   files(
     'fe-notifylist.c',
     'module-formats.c',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
   c_args : [
     def_helpdir,
     def_sysconfdir,
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index 6a02ff6a..b33a4c5c 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -23,6 +23,7 @@
 #include <irssi/src/core/modules-load.h>
 #include <irssi/src/core/args.h>
 #include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 #include <irssi/src/core/core.h>
 
 #ifdef HAVE_STATIC_PERL
@@ -30,8 +31,10 @@ void perl_core_init(void);
 void perl_core_deinit(void);
 #endif
 
+#ifdef HAVE_STATIC_IRC
 void irc_init(void);
 void irc_deinit(void);
+#endif
 
 static GMainLoop *main_loop;
 static char *autoload_module;
@@ -47,13 +50,32 @@ static void sig_reload(void)
 	reload = TRUE;
 }
 
+static void autoload_modules(void)
+{
+	char **list, **module;
+	list = g_strsplit_set(settings_get_str("autoload_modules"), " ,", -1);
+	for (module = list; *module != NULL; module++) {
+		char *tmp;
+		if ((tmp = strchr(*module, ':')) != NULL) {
+			*tmp = '\0';
+			tmp++;
+			module_load_sub(*module, tmp, NULL);
+		} else {
+			module_load(*module, NULL);
+		}
+	}
+	g_strfreev(list);
+}
+
 void noui_init(void)
 {
 	srand(time(NULL));
 
 	irssi_gui = IRSSI_GUI_NONE;
 	core_init();
+#ifdef HAVE_STATIC_IRC
 	irc_init();
+#endif
 
 	module_register("core", "fe-none");
 
@@ -64,6 +86,8 @@ void noui_init(void)
         perl_core_init();
 #endif
 
+	autoload_modules();
+
 	signal_emit("irssi init finished", 0);
 }
 
@@ -75,7 +99,9 @@ void noui_deinit(void)
 
 	signal_remove("reload", (SIGNAL_FUNC) sig_reload);
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
+#ifdef HAVE_STATIC_IRC
 	irc_deinit();
+#endif
 	core_deinit();
 }
 
diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build
index 58df15f6..8f6b797d 100644
--- a/src/fe-none/meson.build
+++ b/src/fe-none/meson.build
@@ -10,7 +10,6 @@ executable('botti',
   link_with : [
     libconfig_a,
     libcore_a,
-    libirc_a,
   ],
   install : true,
   dependencies : dep
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index fbaa303a..34341c9b 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -59,11 +59,13 @@ void otr_core_init(void);
 void otr_core_deinit(void);
 #endif
 
+#ifdef HAVE_STATIC_IRC
 void irc_init(void);
 void irc_deinit(void);
 
 void fe_common_irc_init(void);
 void fe_common_irc_deinit(void);
+#endif
 
 void gui_expandos_init(void);
 void gui_expandos_deinit(void);
@@ -168,9 +170,13 @@ static void textui_init(void)
 
 	irssi_gui = IRSSI_GUI_TEXT;
 	core_init();
+#ifdef HAVE_STATIC_IRC
 	irc_init();
+#endif
 	fe_common_core_init();
+#ifdef HAVE_STATIC_IRC
 	fe_common_irc_init();
+#endif
 
 	theme_register(gui_text_formats);
 	signal_add("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
@@ -301,9 +307,13 @@ static void textui_deinit(void)
 
 	theme_unregister();
 
+#ifdef HAVE_STATIC_IRC
 	fe_common_irc_deinit();
+#endif
 	fe_common_core_deinit();
+#ifdef HAVE_STATIC_IRC
 	irc_deinit();
+#endif
 	core_deinit();
 }
 
diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 4da98809..24a86ca3 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -35,10 +35,6 @@ executable('irssi',
     libconfig_a,
     libcore_a,
     libfe_common_core_a,
-    libirc_a,
-    libfe_common_irc_a,
-    libfe_irc_dcc_a,
-    libfe_irc_notifylist_a,
     ],
   install : true,
   install_rpath : get_option('prefix') / get_option('libdir'),
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index e6cc89c7..b409e0f6 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_core_a = static_library('irc_core',
+libirc_core_a = shared_module('irc_core',
   files(
     'bans.c',
     'channel-events.c',
@@ -33,6 +33,8 @@ libirc_core_a = static_library('irc_core',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
   c_args : [
     def_moduledir,
     def_sysconfdir,
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
index 0c3d706a..a2a9b92d 100644
--- a/src/irc/dcc/meson.build
+++ b/src/irc/dcc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_dcc_a = static_library('irc_dcc',
+libirc_dcc_a = shared_module('irc_dcc',
   files(
     'dcc-autoget.c',
     'dcc-chat.c',
@@ -13,6 +13,8 @@ libirc_dcc_a = static_library('irc_dcc',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
   dependencies : dep)
 
 install_headers(
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
index 75107db1..fe4d8a6d 100644
--- a/src/irc/flood/meson.build
+++ b/src/irc/flood/meson.build
@@ -1,12 +1,14 @@
 # this file is part of irssi
 
-libirc_flood_a = static_library('irc_flood',
+libirc_flood_a = shared_module('irc_flood',
   files(
     'autoignore.c',
     'flood.c',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
   dependencies : dep)
 
 install_headers(
diff --git a/src/irc/irc.c b/src/irc/irc.c
index 250a6fb4..5780a965 100644
--- a/src/irc/irc.c
+++ b/src/irc/irc.c
@@ -1,5 +1,7 @@
+#ifdef HAVE_STATIC_IRC
 void irc_core_init(void); void irc_core_deinit(void);
 void irc_dcc_init(void);void irc_flood_init(void);void irc_notifylist_init(void);
 void irc_notifylist_deinit(void);void irc_flood_deinit(void);void irc_dcc_deinit(void);
 void irc_init(void) { irc_core_init();  irc_dcc_init(); irc_flood_init(); irc_notifylist_init(); }
 void irc_deinit(void) { irc_notifylist_deinit(); irc_flood_deinit(); irc_dcc_deinit();  irc_core_deinit(); }
+#endif
diff --git a/src/irc/meson.build b/src/irc/meson.build
index 72abc3ce..13bfc493 100644
--- a/src/irc/meson.build
+++ b/src/irc/meson.build
@@ -5,20 +5,6 @@ subdir('dcc')
 subdir('flood')
 subdir('notifylist')
 
-libirc_a = static_library('irc',
-  files(
-    'irc.c',
-  ),
-  link_with : [
-    libirc_core_a,
-    libirc_dcc_a,
-    libirc_flood_a,
-    libirc_notifylist_a,
-  ],
-  include_directories : rootinc,
-  implicit_include_directories : false,
-)
-
 if want_proxy
   subdir('proxy')
 endif
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
index f00ea321..87190ce7 100644
--- a/src/irc/notifylist/meson.build
+++ b/src/irc/notifylist/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_notifylist_a = static_library('irc_notifylist',
+libirc_notifylist_a = shared_module('irc_notifylist',
   files(
     'notify-commands.c',
     'notify-ison.c',
@@ -10,6 +10,8 @@ libirc_notifylist_a = static_library('irc_notifylist',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  install : true,
+  install_dir : moduledir,
   dependencies : dep)
 
 install_headers(
diff --git a/tests/irc/flood/meson.build b/tests/irc/flood/meson.build
index e9d0a2bc..78556331 100644
--- a/tests/irc/flood/meson.build
+++ b/tests/irc/flood/meson.build
@@ -6,7 +6,8 @@ test_test_796 = executable('test-796',
     libconfig_a,
     libcore_a,
     libfe_common_core_a,
-    libirc_a,
+    libirc_core_a,
+    libirc_flood_a,
     libfe_common_irc_a,
     libfe_irc_dcc_a,
     libfe_irc_notifylist_a,

From bee057ff21e5e2ae47d6f44371306f436533d3fd Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 1 Oct 2021 22:57:54 +0200
Subject: [PATCH 1377/1650] fix something

---
 src/core/chat-protocols.c | 43 ++++++++++++++++++++-----------------
 src/core/chat-protocols.h |  2 ++
 src/core/chatnets.c       | 45 +++++++++++++++++++++++++++++++++------
 src/core/chatnets.h       |  2 ++
 src/core/servers-setup.c  |  6 ++++++
 src/perl/perl-common.c    |  4 ++++
 6 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/src/core/chat-protocols.c b/src/core/chat-protocols.c
index c53b01b3..83d7ee88 100644
--- a/src/core/chat-protocols.c
+++ b/src/core/chat-protocols.c
@@ -47,7 +47,7 @@ int chat_protocol_lookup(const char *name)
 	g_return_val_if_fail(name != NULL, -1);
 
 	rec = chat_protocol_find(name);
-	return rec == NULL ? -1 : rec->id;
+	return rec == NULL ? -1 : rec->not_initialized ? CHAT_PROTOCOL_NOT_INITIALIZED : rec->id;
 }
 
 CHAT_PROTOCOL_REC *chat_protocol_find(const char *name)
@@ -99,6 +99,22 @@ CHAT_PROTOCOL_REC *chat_protocol_find_net(GHashTable *optlist)
 	return NULL;
 }
 
+static void chat_protocol_destroy(CHAT_PROTOCOL_REC *rec)
+{
+	g_return_if_fail(rec != NULL);
+
+	chat_protocols = g_slist_remove(chat_protocols, rec);
+
+	if (default_proto == rec) {
+		chat_protocol_set_default(chat_protocols == NULL ? NULL : chat_protocols->data);
+	}
+
+	signal_emit("chat protocol destroyed", 1, rec);
+
+	g_free(rec->name);
+	g_free(rec);
+}
+
 /* Register new chat protocol. */
 CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec)
 {
@@ -108,7 +124,11 @@ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec)
 	g_return_val_if_fail(rec != NULL, NULL);
 
 	newrec = chat_protocol_find(rec->name);
-        created = newrec == NULL;
+	if (newrec != NULL && newrec->not_initialized) {
+		chat_protocol_destroy(newrec);
+		newrec = NULL;
+	}
+	created = newrec == NULL;
 	if (newrec == NULL) {
 		newrec = g_new0(CHAT_PROTOCOL_REC, 1);
 		chat_protocols = g_slist_append(chat_protocols, newrec);
@@ -131,23 +151,6 @@ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec)
         return newrec;
 }
 
-static void chat_protocol_destroy(CHAT_PROTOCOL_REC *rec)
-{
-	g_return_if_fail(rec != NULL);
-
-	chat_protocols = g_slist_remove(chat_protocols, rec);
-
-	if (default_proto == rec) {
-		chat_protocol_set_default(chat_protocols == NULL ? NULL :
-					  chat_protocols->data);
-	}
-
-	signal_emit("chat protocol destroyed", 1, rec);
-
-	g_free(rec->name);
-	g_free(rec);
-}
-
 /* Unregister chat protocol. */
 void chat_protocol_unregister(const char *name)
 {
@@ -218,8 +221,10 @@ CHAT_PROTOCOL_REC *chat_protocol_get_unknown(const char *name)
 	rec->create_chatnet = create_chatnet;
         rec->create_server_setup = create_server_setup;
         rec->create_channel_setup = create_channel_setup;
+	/*
 	rec->create_server_connect = create_server_connect;
 	rec->destroy_server_connect = destroy_server_connect;
+	*/
 
 	newrec = chat_protocol_register(rec);
 	g_free(rec);
diff --git a/src/core/chat-protocols.h b/src/core/chat-protocols.h
index ab7327bd..2a51c8c4 100644
--- a/src/core/chat-protocols.h
+++ b/src/core/chat-protocols.h
@@ -35,6 +35,8 @@ void *chat_protocol_check_cast(void *object, int type_pos, const char *id);
 	((object) == NULL ? chat_protocol_get_default() : \
 	chat_protocol_find_id((object)->chat_type))
 
+#define CHAT_PROTOCOL_NOT_INITIALIZED -2
+
 /* Register new chat protocol. */
 CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec);
 
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index 2d49a6df..4e880a10 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -24,12 +24,13 @@
 #include <irssi/src/core/special-vars.h>
 #include <irssi/src/lib-config/iconfig.h>
 #include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.h>
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/chatnets.h>
 #include <irssi/src/core/servers.h>
 
-GSList *chatnets; /* list of available chat networks */
+GSList *chatnets, *chatnets_unavailable; /* list of available chat networks */
 
 static void chatnet_config_save(CHATNET_REC *chatnet)
 {
@@ -60,8 +61,9 @@ static void chatnet_config_remove(CHATNET_REC *chatnet)
 void chatnet_create(CHATNET_REC *chatnet)
 {
 	g_return_if_fail(chatnet != NULL);
+	g_return_if_fail(!CHAT_PROTOCOL(chatnet)->not_initialized);
 
-        chatnet->type = module_get_uniq_id("CHATNET", 0);
+	chatnet->type = module_get_uniq_id("CHATNET", 0);
 	if (g_slist_find(chatnets, chatnet) == NULL)
 		chatnets = g_slist_append(chatnets, chatnet);
 
@@ -112,6 +114,21 @@ CHATNET_REC *chatnet_find(const char *name)
 	return NULL;
 }
 
+gboolean chatnet_find_unavailable(const char *name)
+{
+	CHAT_PROTOCOL_REC *proto;
+
+	if (i_slist_find_icase_string(chatnets_unavailable, name) != NULL)
+		return TRUE;
+
+	proto = CHAT_PROTOCOL(chatnet_find(name));
+
+	if (proto == NULL || proto->not_initialized)
+		return TRUE;
+
+	return FALSE;
+}
+
 static void sig_connected(SERVER_REC *server)
 {
 	CHATNET_REC *rec;
@@ -136,14 +153,22 @@ static void chatnet_read(CONFIG_NODE *node)
 		return;
 
 	type = config_node_get_str(node, "type", NULL);
-	proto = type == NULL ? NULL : chat_protocol_find(type);
-	if (proto == NULL) {
-		proto = type == NULL ? chat_protocol_get_default() :
-			chat_protocol_get_unknown(type);
+	if (type == NULL) {
+		proto = chat_protocol_get_default();
+	} else {
+		proto = chat_protocol_find(type);
 	}
 
-	if (type == NULL)
+	if (proto == NULL) {
+		/* protocol not loaded */
+		if (i_slist_find_icase_string(chatnets_unavailable, node->key) == NULL)
+			chatnets_unavailable =
+			    g_slist_append(chatnets_unavailable, g_strdup(node->key));
+
+		return;
+	} else if (type == NULL) {
 		iconfig_node_set_str(node, "type", proto->name);
+	}
 
 	rec = proto->create_chatnet();
 	rec->type = module_get_uniq_id("CHATNET", 0);
@@ -167,6 +192,12 @@ static void read_chatnets(void)
 	while (chatnets != NULL)
                 chatnet_destroy(chatnets->data);
 
+	while (chatnets_unavailable != NULL) {
+		char *name = chatnets_unavailable->data;
+		chatnets_unavailable = g_slist_remove(chatnets_unavailable, name);
+		g_free(name);
+	}
+
 	node = iconfig_node_traverse("chatnets", FALSE);
 	if (node != NULL) {
 		tmp = config_node_first(node->value);
diff --git a/src/core/chatnets.h b/src/core/chatnets.h
index 6f36fe33..accdd0ad 100644
--- a/src/core/chatnets.h
+++ b/src/core/chatnets.h
@@ -25,6 +25,8 @@ void chatnet_destroy(CHATNET_REC *chatnet);
 
 /* Find the chat network by name */
 CHATNET_REC *chatnet_find(const char *name);
+/* Check if this chatnet is unavailable because the protocol is not loaded */
+gboolean chatnet_find_unavailable(const char *name);
 
 void chatnets_init(void);
 void chatnets_deinit(void);
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 82e5f6be..440f5593 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -305,6 +305,8 @@ static SERVER_CONNECT_REC *create_addr_conn(int chat_type, const char *address,
 	proto = chat_type >= 0 ? chat_protocol_find_id(chat_type) :
                 chat_protocol_get_default();
 
+	g_return_val_if_fail(proto != NULL, NULL);
+
 	conn = proto->create_server_connect();
 	server_connect_ref(conn);
 
@@ -469,6 +471,10 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 	chatnetrec = chatnet == NULL ? NULL : chatnet_find(chatnet);
 	if (chatnetrec == NULL && chatnet != NULL) {
                 /* chat network not found, create it. */
+		if (chatnet_find_unavailable(chatnet)) {
+			/* no protocols loaded, skip loading servers */
+			return NULL;
+		}
 		chatnetrec = chat_protocol_get_default()->create_chatnet();
 		chatnetrec->chat_type = chat_protocol_get_default()->id;
 		chatnetrec->name = g_strdup(chatnet);
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 7eaab8eb..d9d00035 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -583,6 +583,10 @@ static void perl_register_protocol(CHAT_PROTOCOL_REC *rec)
         SV *sv;
 
 	chat_type = chat_protocol_lookup(rec->name);
+	if (chat_type == CHAT_PROTOCOL_NOT_INITIALIZED) {
+		return;
+	}
+
 	g_return_if_fail(chat_type >= 0);
 
 	name = g_ascii_strdown(rec->name,-1);

From 3760fcd1cac7bc970ff19679a0b0a648860700a1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 1 Oct 2021 23:56:28 +0200
Subject: [PATCH 1378/1650] load config on chat protocol cre

---
 src/core/channels-setup.c |  6 ++----
 src/core/chatnets.c       |  6 ++----
 src/core/core.c           | 13 +++++++++++++
 src/core/servers-setup.c  |  6 ++----
 src/irc/core/irc-core.c   |  7 ++++---
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index c72f057c..5e2930ad 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -227,8 +227,7 @@ void channels_setup_init(void)
         setupchannels = NULL;
 	source_host_ok = FALSE;
 
-        signal_add("setup reread", (SIGNAL_FUNC) channels_read_config);
-        signal_add("irssi init read settings", (SIGNAL_FUNC) channels_read_config);
+	signal_add("setup reread channels", (SIGNAL_FUNC) channels_read_config);
 }
 
 void channels_setup_deinit(void)
@@ -236,6 +235,5 @@ void channels_setup_deinit(void)
 	while (setupchannels != NULL)
 		channel_setup_destroy(setupchannels->data);
 
-        signal_remove("setup reread", (SIGNAL_FUNC) channels_read_config);
-        signal_remove("irssi init read settings", (SIGNAL_FUNC) channels_read_config);
+	signal_remove("setup reread channels", (SIGNAL_FUNC) channels_read_config);
 }
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index 4e880a10..770c7595 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -211,8 +211,7 @@ void chatnets_init(void)
 	chatnets = NULL;
 
 	signal_add_first("event connected", (SIGNAL_FUNC) sig_connected);
-	signal_add("setup reread", (SIGNAL_FUNC) read_chatnets);
-        signal_add_first("irssi init read settings", (SIGNAL_FUNC) read_chatnets);
+	signal_add("setup reread chatnets", (SIGNAL_FUNC) read_chatnets);
 }
 
 void chatnets_deinit(void)
@@ -220,6 +219,5 @@ void chatnets_deinit(void)
 	module_uniq_destroy("CHATNET");
 
 	signal_remove("event connected", (SIGNAL_FUNC) sig_connected);
-	signal_remove("setup reread", (SIGNAL_FUNC) read_chatnets);
-        signal_remove("irssi init read settings", (SIGNAL_FUNC) read_chatnets);
+	signal_remove("setup reread chatnets", (SIGNAL_FUNC) read_chatnets);
 }
diff --git a/src/core/core.c b/src/core/core.c
index 7953654b..e9af84f7 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -223,6 +223,13 @@ static void sig_irssi_init_finished(void)
         irssi_init_finished = TRUE;
 }
 
+static void reread_setup(void)
+{
+	signal_emit("setup reread chatnets", 0);
+	signal_emit("setup reread servers", 0);
+	signal_emit("setup reread channels", 0);
+}
+
 void core_init(void)
 {
 	dialog_type_queue = NULL;
@@ -276,6 +283,9 @@ void core_init(void)
 #endif
 	read_settings();
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_add("setup reread", (SIGNAL_FUNC) reread_setup);
+	signal_add("irssi init read settings", (SIGNAL_FUNC) reread_setup);
+	signal_add_last("chat protocol created", (SIGNAL_FUNC) reread_setup);
 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);
 
 	settings_check();
@@ -288,6 +298,9 @@ void core_deinit(void)
 	module_uniq_destroy("WINDOW ITEM TYPE");
 
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+	signal_remove("setup reread", (SIGNAL_FUNC) reread_setup);
+	signal_remove("irssi init read settings", (SIGNAL_FUNC) reread_setup);
+	signal_remove("chat protocol created", (SIGNAL_FUNC) reread_setup);
 	signal_remove("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);
 
 	wcwidth_wrapper_deinit();
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 440f5593..5fbad79e 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -765,8 +765,7 @@ void servers_setup_init(void)
 	read_settings();
 
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
-	signal_add("setup reread", (SIGNAL_FUNC) read_servers);
-        signal_add("irssi init read settings", (SIGNAL_FUNC) read_servers);
+	signal_add("setup reread servers", (SIGNAL_FUNC) read_servers);
 }
 
 void servers_setup_deinit(void)
@@ -779,8 +778,7 @@ void servers_setup_deinit(void)
 		server_setup_destroy(setupservers->data);
 
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
-	signal_remove("setup reread", (SIGNAL_FUNC) read_servers);
-        signal_remove("irssi init read settings", (SIGNAL_FUNC) read_servers);
+	signal_remove("setup reread servers", (SIGNAL_FUNC) read_servers);
 
 	module_uniq_destroy("SERVER SETUP");
 }
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index d1a0f72e..725ae28a 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -106,9 +106,6 @@ void irc_core_init(void)
 		(QUERY_REC *(*) (const char *, const char *, int))
                 irc_query_create;
 
-	chat_protocol_register(rec);
-        g_free(rec);
-
         irc_session_init();
 	irc_chatnets_init();
 	irc_servers_init();
@@ -125,6 +122,10 @@ void irc_core_init(void)
 	sasl_init();
 
 	settings_check();
+
+	chat_protocol_register(rec);
+	g_free(rec);
+
 	module_register("irc", "core");
 }
 

From f4938a28046c35b63c7aa523a04d8d8dcedf4e0c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@localhost.localdomain>
Date: Mon, 7 Feb 2022 13:31:26 +0100
Subject: [PATCH 1379/1650] remove unused function

---
 src/core/chat-protocols.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/core/chat-protocols.c b/src/core/chat-protocols.c
index 83d7ee88..1a6ecbb3 100644
--- a/src/core/chat-protocols.c
+++ b/src/core/chat-protocols.c
@@ -194,15 +194,6 @@ static CHANNEL_SETUP_REC *create_channel_setup(void)
         return g_new0(CHANNEL_SETUP_REC, 1);
 }
 
-static SERVER_CONNECT_REC *create_server_connect(void)
-{
-        return g_new0(SERVER_CONNECT_REC, 1);
-}
-
-static void destroy_server_connect(SERVER_CONNECT_REC *conn)
-{
-}
-
 /* Return "unknown chat protocol" record. Used when protocol name is
    specified but it isn't registered yet. */
 CHAT_PROTOCOL_REC *chat_protocol_get_unknown(const char *name)

From 89bcff606f46a1d44f4e976e370dadc5e2840cf7 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 14 Feb 2022 16:54:58 +0100
Subject: [PATCH 1380/1650] fix meson deprecations

---
 src/fe-common/irc/dcc/meson.build        | 8 +++++---
 src/fe-common/irc/meson.build            | 8 +++++---
 src/fe-common/irc/notifylist/meson.build | 8 +++++---
 src/irc/core/meson.build                 | 8 +++++---
 src/irc/dcc/meson.build                  | 2 +-
 src/irc/flood/meson.build                | 6 ++++--
 src/irc/notifylist/meson.build           | 2 +-
 src/perl/common/meson.build              | 2 +-
 src/perl/irc/meson.build                 | 2 +-
 src/perl/meson.build                     | 6 +++---
 src/perl/textui/meson.build              | 2 +-
 src/perl/ui/meson.build                  | 2 +-
 12 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
index 013299a0..ce2c8458 100644
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libfe_irc_dcc_a = shared_module('fe_irc_dcc',
+libfe_irc_dcc_a = static_library('fe_irc_dcc',
   files(
     'fe-dcc-chat-messages.c',
     'fe-dcc-chat.c',
@@ -12,13 +12,15 @@ libfe_irc_dcc_a = shared_module('fe_irc_dcc',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
-  install : true,
-  install_dir : moduledir,
   c_args : [
     def_helpdir,
     def_sysconfdir,
   ],
   dependencies : dep)
+shared_module('fe_irc_dcc',
+  install : true,
+  install_dir : moduledir,
+  link_whole : libfe_irc_dcc_a)
 
 install_headers(
   files(
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index 38903043..b1f54a46 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libfe_common_irc_a = shared_module('fe_common_irc',
+libfe_common_irc_a = static_library('fe_common_irc',
   files(
     'fe-cap.c',
     'fe-common-irc.c',
@@ -25,13 +25,15 @@ libfe_common_irc_a = shared_module('fe_common_irc',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
-  install : true,
-  install_dir : moduledir,
   c_args : [
     def_helpdir,
     def_themesdir,
   ],
   dependencies : dep)
+shared_module('fe_common_irc',
+  install : true,
+  install_dir : moduledir,
+  link_whole : libfe_common_irc_a)
 
 install_headers(
   files(
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
index 76e63b82..2917a59d 100644
--- a/src/fe-common/irc/notifylist/meson.build
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -1,19 +1,21 @@
 # this file is part of irssi
 
-libfe_irc_notifylist_a = shared_module('fe_irc_notifylist',
+libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
   files(
     'fe-notifylist.c',
     'module-formats.c',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
-  install : true,
-  install_dir : moduledir,
   c_args : [
     def_helpdir,
     def_sysconfdir,
   ],
   dependencies : dep)
+shared_module('fe_irc_notifylist',
+  install : true,
+  install_dir : moduledir,
+  link_whole : libfe_irc_notifylist_a)
 
 install_headers(
   files(
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index b409e0f6..a5ad7b7e 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_core_a = shared_module('irc_core',
+libirc_core_a = static_library('irc_core',
   files(
     'bans.c',
     'channel-events.c',
@@ -33,13 +33,15 @@ libirc_core_a = shared_module('irc_core',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
-  install : true,
-  install_dir : moduledir,
   c_args : [
     def_moduledir,
     def_sysconfdir,
   ],
   dependencies : dep)
+shared_module('irc_core',
+  install : true,
+  install_dir : moduledir,
+  link_whole : libirc_core_a)
 
 install_headers(
   files(
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
index a2a9b92d..70f0a9b8 100644
--- a/src/irc/dcc/meson.build
+++ b/src/irc/dcc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_dcc_a = shared_module('irc_dcc',
+shared_module('irc_dcc',
   files(
     'dcc-autoget.c',
     'dcc-chat.c',
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
index fe4d8a6d..f0f05494 100644
--- a/src/irc/flood/meson.build
+++ b/src/irc/flood/meson.build
@@ -1,15 +1,17 @@
 # this file is part of irssi
 
-libirc_flood_a = shared_module('irc_flood',
+libirc_flood_a = static_library('irc_flood',
   files(
     'autoignore.c',
     'flood.c',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  dependencies : dep)
+shared_module('irc_flood',
   install : true,
   install_dir : moduledir,
-  dependencies : dep)
+  link_whole : libirc_flood_a)
 
 install_headers(
   files('module.h'),
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
index 87190ce7..648906de 100644
--- a/src/irc/notifylist/meson.build
+++ b/src/irc/notifylist/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_notifylist_a = shared_module('irc_notifylist',
+shared_module('irc_notifylist',
   files(
     'notify-commands.c',
     'notify-ison.c',
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
index f2a69bc9..d3c98a88 100644
--- a/src/perl/common/meson.build
+++ b/src/perl/common/meson.build
@@ -1,5 +1,5 @@
 
-libperl_Irssi_a = shared_module('Irssi',
+shared_module('Irssi',
   [ xsubpp.process(
     files(
       'Channel.xs',
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index 0a8fd9f9..401ec707 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -1,4 +1,4 @@
-libperl_Irssi_Irc_a = shared_module('Irc',
+shared_module('Irc',
   [ xsubpp.process(
     files(
       'Channel.xs',
diff --git a/src/perl/meson.build b/src/perl/meson.build
index d81173d9..f685fb0d 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -17,7 +17,7 @@ irssi_core_pl_h = custom_target('irssi-core.pl.h',
 # required as of Meson 0.58.0
 generated_files_inc = include_directories('.')
 
-libperl_core_a = shared_module('perl_core',
+libperl_core_sm = shared_module('perl_core',
   files(
     'perl-common.c',
     'perl-core.c',
@@ -44,10 +44,10 @@ libperl_core_a = shared_module('perl_core',
 
 dl_cross_perl_core = []
 if need_dl_cross_link
-  dl_cross_perl_core += libperl_core_a
+  dl_cross_perl_core += libperl_core_sm
 endif
 
-libfe_perl_a = shared_module('fe_perl',
+shared_module('fe_perl',
   files(
     'module-formats.c',
     'perl-fe.c',
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
index 1705fa36..e0b83dd3 100644
--- a/src/perl/textui/meson.build
+++ b/src/perl/textui/meson.build
@@ -1,4 +1,4 @@
-libperl_Irssi_TextUI_a = shared_module('TextUI',
+shared_module('TextUI',
   [ xsubpp.process(
     files(
       'Statusbar.xs',
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
index 14bc7699..f9b8b41c 100644
--- a/src/perl/ui/meson.build
+++ b/src/perl/ui/meson.build
@@ -1,4 +1,4 @@
-libperl_Irssi_UI_a = shared_module('UI',
+shared_module('UI',
   [ xsubpp.process(
     files(
       'Formats.xs',

From 2e6c376342aa8f9e2dd57dc77999a80808d341d1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 16 Feb 2022 20:27:32 +0100
Subject: [PATCH 1381/1650] add android cross link deps

---
 src/fe-common/irc/dcc/meson.build        | 1 +
 src/fe-common/irc/meson.build            | 1 +
 src/fe-common/irc/notifylist/meson.build | 1 +
 src/irc/core/meson.build                 | 7 ++++++-
 src/irc/dcc/meson.build                  | 8 +++++++-
 src/irc/flood/meson.build                | 1 +
 src/irc/notifylist/meson.build           | 8 +++++++-
 src/perl/irc/meson.build                 | 2 +-
 8 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
index ce2c8458..50806e81 100644
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@@ -20,6 +20,7 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
 shared_module('fe_irc_dcc',
   install : true,
   install_dir : moduledir,
+  link_with : dl_cross_irc_dcc,
   link_whole : libfe_irc_dcc_a)
 
 install_headers(
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index b1f54a46..aff70f71 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -33,6 +33,7 @@ libfe_common_irc_a = static_library('fe_common_irc',
 shared_module('fe_common_irc',
   install : true,
   install_dir : moduledir,
+  link_with : dl_cross_irc_core,
   link_whole : libfe_common_irc_a)
 
 install_headers(
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
index 2917a59d..1d42e147 100644
--- a/src/fe-common/irc/notifylist/meson.build
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -15,6 +15,7 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
 shared_module('fe_irc_notifylist',
   install : true,
   install_dir : moduledir,
+  link_with : dl_cross_irc_notifylist,
   link_whole : libfe_irc_notifylist_a)
 
 install_headers(
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index a5ad7b7e..b8c1bad9 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -38,11 +38,16 @@ libirc_core_a = static_library('irc_core',
     def_sysconfdir,
   ],
   dependencies : dep)
-shared_module('irc_core',
+libirc_core_sm = shared_module('irc_core',
   install : true,
   install_dir : moduledir,
   link_whole : libirc_core_a)
 
+dl_cross_irc_core = []
+if need_dl_cross_link
+  dl_cross_irc_core += libirc_core_sm
+endif
+
 install_headers(
   files(
     'bans.h',
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
index 70f0a9b8..9c7e33d5 100644
--- a/src/irc/dcc/meson.build
+++ b/src/irc/dcc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-shared_module('irc_dcc',
+libirc_dcc_sm = shared_module('irc_dcc',
   files(
     'dcc-autoget.c',
     'dcc-chat.c',
@@ -15,8 +15,14 @@ shared_module('irc_dcc',
   implicit_include_directories : false,
   install : true,
   install_dir : moduledir,
+  link_with : dl_cross_irc_core,
   dependencies : dep)
 
+dl_cross_irc_dcc = []
+if need_dl_cross_link
+  dl_cross_irc_dcc += libirc_dcc_sm
+endif
+
 install_headers(
   files(
     'dcc-chat.h',
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
index f0f05494..3c763beb 100644
--- a/src/irc/flood/meson.build
+++ b/src/irc/flood/meson.build
@@ -11,6 +11,7 @@ libirc_flood_a = static_library('irc_flood',
 shared_module('irc_flood',
   install : true,
   install_dir : moduledir,
+  link_with : dl_cross_irc_core,
   link_whole : libirc_flood_a)
 
 install_headers(
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
index 648906de..ab664d16 100644
--- a/src/irc/notifylist/meson.build
+++ b/src/irc/notifylist/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-shared_module('irc_notifylist',
+libirc_notifylist_sm = shared_module('irc_notifylist',
   files(
     'notify-commands.c',
     'notify-ison.c',
@@ -12,8 +12,14 @@ shared_module('irc_notifylist',
   implicit_include_directories : false,
   install : true,
   install_dir : moduledir,
+  link_with : dl_cross_irc_core,
   dependencies : dep)
 
+dl_cross_irc_notifylist = []
+if need_dl_cross_link
+  dl_cross_irc_notifylist += libirc_notifylist_sm
+endif
+
 install_headers(
   files(
     'module.h',
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index 401ec707..b65856ff 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -26,7 +26,7 @@ shared_module('Irc',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
-  link_with : dl_cross_perl_core,
+  link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist,
 )
 
 install_headers(

From ef2c55fc18d86656be20caffaf470700c6fe7eda Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 15 Feb 2022 17:37:49 +0100
Subject: [PATCH 1382/1650] fix irc module in fuzzer

---
 src/fe-fuzz/irc/core/meson.build | 2 +-
 src/fe-fuzz/meson.build          | 2 +-
 src/fe-fuzz/server.c             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fe-fuzz/irc/core/meson.build b/src/fe-fuzz/irc/core/meson.build
index 6a47e07d..730c9240 100644
--- a/src/fe-fuzz/irc/core/meson.build
+++ b/src/fe-fuzz/irc/core/meson.build
@@ -9,7 +9,7 @@ executable('event-get-params-fuzz',
   link_with : [
     libconfig_a,
     libcore_a,
-    libirc_a,
+    libirc_core_a,
     libfuzzer_fe_common_core_a,
   ],
   link_args : [fuzzer_lib],
diff --git a/src/fe-fuzz/meson.build b/src/fe-fuzz/meson.build
index 7fac025d..5ab19651 100644
--- a/src/fe-fuzz/meson.build
+++ b/src/fe-fuzz/meson.build
@@ -32,7 +32,7 @@ executable('server-fuzz',
     libconfig_a,
     libcore_a,
     libfuzzer_fe_common_core_a,
-    libirc_a,
+    libirc_core_a,
     libfe_common_irc_a,
     libfe_irc_dcc_a,
     libfe_irc_notifylist_a,
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index b74a29b9..c91a5bcd 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -43,9 +43,9 @@
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/fe-fuzz/null-logger.h>
 
-/* irc.c */
-void irc_init(void);
-void irc_deinit(void);
+/* irc-core.c */
+void irc_core_init(void);
+void irc_core_deinit(void);
 
 /* irc-session.c */
 void irc_session_init(void);
@@ -153,7 +153,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 	core_preinit((*argv)[0]);
 	core_init();
 	irssi_ssl_init();
-	irc_init();
+	irc_core_init();
 	fe_common_core_init();
 	fe_common_irc_init();
 	signal_add("event 001", (SIGNAL_FUNC) event_connected);

From 1f8e1672955d882635293cb3db637213b8180128 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 16 Feb 2022 22:38:38 +0100
Subject: [PATCH 1383/1650] test termux pkg

---
 .github/workflows/termuxpkg.yml | 94 +++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 .github/workflows/termuxpkg.yml

diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
new file mode 100644
index 00000000..f46915e8
--- /dev/null
+++ b/.github/workflows/termuxpkg.yml
@@ -0,0 +1,94 @@
+on:
+  push:
+    branches:
+     - master
+  pull_request:
+name: Build Irssi Termux package
+jobs:
+  termux-package:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout termux-packages
+        uses: actions/checkout@main
+        with:
+          repository: termux/termux-packages
+      - name: checkout irssi
+        uses: actions/checkout@main
+        with:
+          path: src.irssi.git
+      - name: download termux docker container
+        uses: docker://termux/package-builder:latest
+      - name: build perl package
+        run: |
+          ./scripts/run-docker.sh ./build-package.sh -i perl
+      - name: create irssi build receipe
+        run: |
+          mkdir packages/irssi-an
+          cat << 'BUILD_SH' > packages/irssi-an/build.sh
+          TERMUX_PKG_HOMEPAGE=https://ailin-nemui.github.io/irssi/
+          TERMUX_PKG_DESCRIPTION="Terminal based IRC client"
+          TERMUX_PKG_LICENSE="GPL-2.0"
+          TERMUX_PKG_MAINTAINER="@ailin-nemui"
+          TERMUX_PKG_VERSION=@VERSION@
+          TERMUX_PKG_REVISION=@REVISION@
+          TERMUX_PKG_SRCURL=file:///home/builder/termux-packages/src.irssi.git
+          TERMUX_PKG_AUTO_UPDATE=true
+          TERMUX_PKG_DEPENDS="glib, libandroid-glob, libiconv, libotr, ncurses, openssl, perl, utf8proc"
+          TERMUX_PKG_BREAKS="irssi"
+          TERMUX_PKG_REPLACES="irssi"
+          TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+          -Denable-true-color=yes
+          -Dfhs-prefix=$TERMUX_PREFIX
+          "
+
+          termux_step_configure_meson() {
+              termux_setup_meson
+
+              local perl_version=$(. $TERMUX_SCRIPTDIR/packages/perl/build.sh; echo $TERMUX_PKG_VERSION)
+              local perl_srcdir=$TERMUX_TOPDIR/perl/src
+
+              sed -i "/\\[binaries\\]/a\\
+          perl = ['$perl_srcdir/miniperl', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '-I$TERMUX_PREFIX/lib/perl5/$perl_version']" \
+                  $TERMUX_MESON_CROSSFILE
+
+              CC=gcc CXX=g++ CFLAGS= CXXFLAGS= CPPFLAGS= LDFLAGS= $TERMUX_MESON \
+                $TERMUX_PKG_SRCDIR \
+                $TERMUX_PKG_BUILDDIR \
+                --cross-file $TERMUX_MESON_CROSSFILE \
+                --prefix $TERMUX_PREFIX \
+                --libdir lib \
+                --buildtype minsize \
+                --strip \
+                $TERMUX_PKG_EXTRA_CONFIGURE_ARGS
+          }
+
+          termux_step_post_configure() {
+              sed -i "s:-I$TERMUX_PREFIX/:-isystem$TERMUX_PREFIX/:g" $TERMUX_PKG_BUILDDIR/build.ninja
+          }
+
+
+          termux_step_pre_configure() {
+              LDFLAGS+=" -landroid-glob"
+
+              # Make build log less noisy.
+              CFLAGS+=" -Wno-compound-token-split-by-macro"
+
+              # Make sure that perl stuff is reinstalled.
+              rm -rf $TERMUX_PREFIX/lib/irssi/perl
+          }
+
+          BUILD_SH
+          version=$(awk '/^v/ { $0=$1; gsub(/^v/,""); gsub(/-head/,"dev"); gsub(/-/,""); print; exit }' src.irssi.git/NEWS)
+          version=$version+g$(git -C src.irssi.git rev-parse --short HEAD)
+          sed -i \
+              -e "s:@VERSION@:$version:" \
+              -e "s:@REVISION@:$GITHUB_RUN_NUMBER:" \
+              packages/irssi-an/build.sh
+          git -C src.irssi.git tag v$version
+      - name: build irssi package
+        run: |
+          ./scripts/run-docker.sh ./build-package.sh -I irssi-an
+      - uses: actions/upload-artifact@v2
+        with:
+          name: irssi-termux-pkg
+          path: output/irssi-an*.deb

From b335e5526d423bfe5b718a37e92d3e3f0c734ddc Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 16 Feb 2022 23:34:19 +0100
Subject: [PATCH 1384/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 7f8604f3..ad5c88bb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 44
+#define IRSSI_ABI_VERSION 45
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From bfcafa76c043063b07c547af595553908d9e4108 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 19 Feb 2022 00:27:02 +0100
Subject: [PATCH 1385/1650] spelling fixes

by lintian / dwfreed
---
 src/otr/otr-formats.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c
index d4d273d1..af4d8aad 100644
--- a/src/otr/otr-formats.c
+++ b/src/otr/otr-formats.c
@@ -23,6 +23,7 @@
 #include <irssi/src/otr/otr-formats.h>
 
 FORMAT_REC fe_otr_formats[] = {
+	/* clang-format off */
 	{ MODULE_NAME, "Core", 0 },
 
 	/* Status bar format. */
@@ -73,7 +74,7 @@ FORMAT_REC fe_otr_formats[] = {
 	{ "otr_keys_unavailable", "{error No OTR keys available}", 0},
 
 	{ "otr_msg_encryption_ended", "{hilight $0} has closed the connection to you", 1, { 0 }},
-	{ "otr_msg_encryption_error", "{error An error occured when encrypting your message}", 0},
+	{ "otr_msg_encryption_error", "{error An error occurred when encrypting your message}", 0},
 	{ "otr_msg_encryption_required", "Encryptioned is required", 0},
 	{ "otr_msg_error", "Error in private conversation: {error $0}", 1, { 0 }},
 	{ "otr_msg_general_error", "General Error: {error $0}", 1, { 0 }},
@@ -101,8 +102,9 @@ FORMAT_REC fe_otr_formats[] = {
 	{ "otr_smp_failure", "Authentication with {hilight $0} failed", 1, { 0 }},
 	{ "otr_smp_in_progress", "{hilight $0} replied to your auth request", 1, { 0 }},
 	{ "otr_smp_secret_question", "{hilight $0} wants to authenticate. Use /otr auth <secret> to complete", 1, { 0 }},
-	{ "otr_smp_success", "Authentication with {hilight $0} succesful", 1, { 0 }},
+	{ "otr_smp_success", "Authentication with {hilight $0} successful", 1, { 0 }},
 
 	/* Last element. */
 	{ NULL, NULL, 0 }
+	/* clang-format on */
 };

From 9b73d152fe471bc2ec620a07116bf6207857d4e5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 19 Feb 2022 00:34:06 +0100
Subject: [PATCH 1386/1650] use gint64 define

---
 src/fe-common/irc/fe-ctcp.c | 5 ++++-
 src/irc/core/irc-commands.c | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index c73399be..14893966 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -128,7 +128,10 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
 
 	g_return_if_fail(data != NULL);
 
-	if (sscanf(data, "%ld %ld", &tv, &tv2) < 1) {
+	if (sscanf(data,
+	           "%" G_GINT64_FORMAT " "
+	           "%" G_GINT64_FORMAT,
+	           &tv, &tv2) < 1) {
 		char *tmp = g_strconcat("PING ", data, NULL);
 		ctcp_default_reply(server, tmp, nick, addr, target);
 		g_free(tmp);
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index cba909c1..5f234c54 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -544,7 +544,10 @@ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 
 	tv = g_get_real_time();
 
-	str = g_strdup_printf("%s PING %ld %ld", data, tv / G_TIME_SPAN_SECOND, tv % G_TIME_SPAN_SECOND);
+	str = g_strdup_printf("%s PING "
+	                      "%" G_GINT64_FORMAT " "
+	                      "%" G_GINT64_FORMAT,
+	                      data, tv / G_TIME_SPAN_SECOND, tv % G_TIME_SPAN_SECOND);
 	signal_emit("command ctcp", 3, str, server, item);
 	g_free(str);
 }

From b8736225cf11a40c8d585425a1ea9b47a3b706b6 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 18 Feb 2022 20:50:37 +0100
Subject: [PATCH 1387/1650] good-bye and thanks, autotools

---
 .github/workflows/check.yml              |  29 +-
 .gitignore                               |   3 +
 INSTALL                                  |  58 +-
 MANIFEST.in                              |  25 +
 Makefile.am                              |  35 -
 autogen.sh                               |  67 --
 configure.ac                             | 821 -----------------------
 docs/Makefile.am                         |  21 -
 docs/help/Makefile.am.gen                |  13 -
 docs/help/in/Makefile.am.gen             |   5 -
 irssi-1.pc.in                            |  20 -
 m4/glib-2.0.m4                           | 208 ------
 m4/glibtests.m4                          |  28 -
 m4/libgcrypt.m4                          | 143 ----
 m4/libotr.m4                             | 134 ----
 m4/pkg.m4                                | 275 --------
 scripts/Makefile.am                      |  18 -
 scripts/examples/Makefile.am             |   8 -
 src/Makefile.am                          |  27 -
 src/core/Makefile.am                     | 122 ----
 src/fe-common/Makefile.am                |   3 -
 src/fe-common/core/Makefile.am           |  73 --
 src/fe-common/irc/Makefile.am            |  42 --
 src/fe-common/irc/dcc/Makefile.am        |  24 -
 src/fe-common/irc/notifylist/Makefile.am |  18 -
 src/fe-fuzz/Makefile.am                  |  40 --
 src/fe-fuzz/fe-common/Makefile.am        |   3 -
 src/fe-fuzz/fe-common/core/Makefile.am   |  33 -
 src/fe-fuzz/irc/Makefile.am              |   3 -
 src/fe-fuzz/irc/core/Makefile.am         |  33 -
 src/fe-none/Makefile.am                  |  21 -
 src/fe-text/Makefile.am                  |  75 ---
 src/irc/Makefile.am                      |  11 -
 src/irc/core/Makefile.am                 |  62 --
 src/irc/dcc/Makefile.am                  |  30 -
 src/irc/flood/Makefile.am                |  15 -
 src/irc/notifylist/Makefile.am           |  20 -
 src/irc/proxy/Makefile.am                |  28 -
 src/lib-config/Makefile.am               |  18 -
 src/otr/Makefile.am                      |  40 --
 src/perl/Makefile.am                     | 170 -----
 src/perl/Makefile_silent.pm              |  76 ---
 src/perl/common/Makefile.PL.in           |   7 -
 src/perl/irc/Makefile.PL.in              |   8 -
 src/perl/textui/Makefile.PL.in           |   8 -
 src/perl/ui/Makefile.PL.in               |   8 -
 tests/Makefile.am                        |   7 -
 tests/fe-common/Makefile.am              |   3 -
 tests/fe-common/core/Makefile.am         |  27 -
 tests/fe-text/Makefile.am                |  38 --
 tests/irc/Makefile.am                    |   5 -
 tests/irc/core/Makefile.am               |  31 -
 tests/irc/flood/Makefile.am              |  37 -
 themes/Makefile.am                       |   6 -
 utils/Makefile.am                        |   6 -
 utils/check-perl-hash.sh                 |   3 +
 utils/file2header.sh                     |   2 +-
 utils/glib-tap.mk                        | 134 ----
 utils/irssi-version.sh                   |  16 +-
 utils/make-dist.sh                       |  61 ++
 utils/syncdocs.sh                        |   2 +-
 utils/syncscripts.sh                     |   2 +-
 utils/tap-driver.sh                      | 652 ------------------
 utils/tap-test                           |  23 -
 64 files changed, 118 insertions(+), 3866 deletions(-)
 create mode 100644 MANIFEST.in
 delete mode 100644 Makefile.am
 delete mode 100755 autogen.sh
 delete mode 100644 configure.ac
 delete mode 100644 docs/Makefile.am
 delete mode 100644 docs/help/Makefile.am.gen
 delete mode 100644 docs/help/in/Makefile.am.gen
 delete mode 100644 irssi-1.pc.in
 delete mode 100644 m4/glib-2.0.m4
 delete mode 100644 m4/glibtests.m4
 delete mode 100644 m4/libgcrypt.m4
 delete mode 100644 m4/libotr.m4
 delete mode 100644 m4/pkg.m4
 delete mode 100644 scripts/Makefile.am
 delete mode 100644 scripts/examples/Makefile.am
 delete mode 100644 src/Makefile.am
 delete mode 100644 src/core/Makefile.am
 delete mode 100644 src/fe-common/Makefile.am
 delete mode 100644 src/fe-common/core/Makefile.am
 delete mode 100644 src/fe-common/irc/Makefile.am
 delete mode 100644 src/fe-common/irc/dcc/Makefile.am
 delete mode 100644 src/fe-common/irc/notifylist/Makefile.am
 delete mode 100644 src/fe-fuzz/Makefile.am
 delete mode 100644 src/fe-fuzz/fe-common/Makefile.am
 delete mode 100644 src/fe-fuzz/fe-common/core/Makefile.am
 delete mode 100644 src/fe-fuzz/irc/Makefile.am
 delete mode 100644 src/fe-fuzz/irc/core/Makefile.am
 delete mode 100644 src/fe-none/Makefile.am
 delete mode 100644 src/fe-text/Makefile.am
 delete mode 100644 src/irc/Makefile.am
 delete mode 100644 src/irc/core/Makefile.am
 delete mode 100644 src/irc/dcc/Makefile.am
 delete mode 100644 src/irc/flood/Makefile.am
 delete mode 100644 src/irc/notifylist/Makefile.am
 delete mode 100644 src/irc/proxy/Makefile.am
 delete mode 100644 src/lib-config/Makefile.am
 delete mode 100644 src/otr/Makefile.am
 delete mode 100644 src/perl/Makefile.am
 delete mode 100644 src/perl/Makefile_silent.pm
 delete mode 100644 src/perl/common/Makefile.PL.in
 delete mode 100644 src/perl/irc/Makefile.PL.in
 delete mode 100644 src/perl/textui/Makefile.PL.in
 delete mode 100644 src/perl/ui/Makefile.PL.in
 delete mode 100644 tests/Makefile.am
 delete mode 100644 tests/fe-common/Makefile.am
 delete mode 100644 tests/fe-common/core/Makefile.am
 delete mode 100644 tests/fe-text/Makefile.am
 delete mode 100644 tests/irc/Makefile.am
 delete mode 100644 tests/irc/core/Makefile.am
 delete mode 100644 tests/irc/flood/Makefile.am
 delete mode 100644 themes/Makefile.am
 delete mode 100644 utils/Makefile.am
 create mode 100755 utils/check-perl-hash.sh
 delete mode 100644 utils/glib-tap.mk
 create mode 100755 utils/make-dist.sh
 delete mode 100755 utils/tap-driver.sh
 delete mode 100755 utils/tap-test

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 97cb3feb..13c13286 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -7,10 +7,8 @@ name: Check Irssi
 env:
   apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
   apt_build_deps_meson: ninja-build
-  apt_build_deps_autotools: autoconf automake libtool
   get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel; pip3 install meson${meson_ver}
   build_options_meson: -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes
-  build_options_configure: --with-proxy=module --with-bot --with-perl=module --with-otr=module
   prefix: ~/irssi-build
 jobs:
   dist:
@@ -18,13 +16,11 @@ jobs:
     steps:
       - name: prepare required software
         run: |
-          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_autotools
+          sudo apt update && sudo apt install $apt_build_deps
       - uses: actions/checkout@main
       - name: make dist
         run: |
-          # make dist
-          ./autogen.sh $build_options_configure
-          make dist
+          ./utils/make-dist.sh
       - uses: actions/upload-artifact@v2
         with:
           path: irssi-*.tar.gz
@@ -39,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, ubuntu-latest]
-        builder: [meson, configure]
+        builder: [meson]
         compiler: [clang, gcc]
         flags: [regular]
         include:
@@ -49,7 +45,7 @@ jobs:
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.60.0
+            meson_ver: <0.61.2
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK
@@ -77,23 +73,6 @@ jobs:
           ninja -C Build
           ninja -C Build install
         if: ${{ matrix.builder == 'meson' }}
-      - name: build and install with Makefile
-        run: |
-          # make install
-          cd irssi-*/
-          mkdir Build
-          cd Build
-          ../configure $build_options_configure --prefix=${prefix/\~/~} --enable-always-build-tests
-          make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
-          make install
-        if: ${{ matrix.builder == 'configure' }}
-      - name: run tests with Makefile
-        run: |
-          # make check
-          cd irssi-*/Build
-          make -C tests -sk check
-          find -name test-suite.log -exec cat {} +
-        if: ${{ matrix.builder == 'configure' }}
       - name: run tests with Meson
         run: |
           # ninja test
diff --git a/.gitignore b/.gitignore
index 217ce3a8..ea2cd7ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,6 @@ src/fe-fuzz/oom-*
 Build
 subprojects/*
 !subprojects/*.wrap
+Irssi-Dist
+setup.cfg
+*.egg-info
diff --git a/INSTALL b/INSTALL
index 3dbe2ebd..47cce53f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,21 +17,12 @@ For most people, this should work just fine:
  su
  ninja -C Build install
  
-For the moment, autotools is also supported:
+meson options
 
- ./autogen.sh     (for people who just cloned the repository)
- ./configure      (if this script already exists, skip ./autogen.sh)
- make
- su
- make install     (not _really_ required except for perl support)
-
-configure options
-
-  These options can be given to meson or ./configure.
-  The first syntax is for meson, the 2nd for ./configure
+  These options can be given to meson.
   
   For a complete list of options, run
-   meson configure   /   ./configure --help
+   meson configure
 
   --prefix
 
@@ -39,33 +30,28 @@ configure options
   YES, you can install Irssi WITHOUT ROOT permissions
   by using --prefix=/home/dir
 
-  -Dwith-proxy=yes   /   --with-proxy
+  -Dwith-proxy=yes
 
   Build the Irssi proxy (see startup-HOWTO).
 
-  -Dwith-perl=[yes|no]   /   --with-perl=[yes|no|module]
+  -Dwith-perl=[yes|no]
 
   Enable Perl support
   yes    enable builtin (default)
   no     disable
-  module enable as module
 
-  -Dwith-perl-lib=[site|vendor|DIR]   /   --with-perl-lib=[site|vendor|DIR]
+  -Dwith-perl-lib=[site|vendor|DIR]
 
   Specify installation dir for Perl libraries
   site   install in dir for site-specific modules (default)
   vendor install in dir for vendor-specific modules
   DIR    install in DIR
 
-  [N/A]   /   --with-socks
-
-  Build with socks library
-
-  -Dwith-bot=yes   /   --with-bot
+  -Dwith-bot=yes
 
   Build irssi-bot
 
-  -Dwithout-textui=yes   /   --without-textui
+  -Dwithout-textui=yes
 
   Build without text frontend
 
@@ -82,31 +68,18 @@ the -Dc_args and -Dc_link_args options variable, eg.:
 Perl support generates most of the problems. There's quite a many
 things that can go wrong:
 
- - Compiling fails if you compile irssi with GCC in a system that has
-   perl compiled with some other C compiler. Very common problem with
-   non-Linux/BSD systems. You'll need to edit src/perl/*/Makefile files
-   and remove the parameters that gcc doesn't like. Mostly you'll just
-   need to keep the -I and -D parameters and add -fPIC.
  - If there's any weird crashing at startup, you might have older irssi's
    perl libraries installed somewhere, and you should remove those.
- - Dynamic libraries don't want to work with some systems, so if your
-   system complains about some missing symbol in Irssi.so file, configure
-   irssi with --with-perl-staticlib option (NOT same as --with-perl=static).
- - If configure complains that it doesn't find some perl stuff, you're
+ - If meson complains that it doesn't find some perl stuff, you're
    probably missing libperl.so or libperl.a. In debian, you'll need to do
    apt-get install libperl-dev
- - For unprivileged home directory installations, you probably do not want 
-   to specify --with-perl-lib=(site|vendor). Instead, you can use the 
-   default perl installation target (below the irssi prefix). If you are
-   using local::lib you can also choose to install there by specifying
-   --with-perl-lib=$PERL_LOCAL_LIB_ROOT/lib/perl5
 
 You can verify that the perl module is loaded and working with "/LOAD"
 command. It should print something like:
 
 Module               Type    Submodules
 ...
-perl                 static  core fe
+perl                 dynamic fe core
 
 
  System specific notes
@@ -134,13 +107,4 @@ would call:
 
 Getting perl scripting to work needs a few things:
 
- - configure with --with-perl-staticlib
-
- - libperl.dll is required in linking and running irssi, it's normally
-   located somewhere around /usr/lib/perl5/5.6.1/cygwin/CORE/libperl5_6_1.dll
-   copy it to eg. /usr/bin/libperl.dll
-
- - -DUSEIMPORTLIB is needed to be defined while compiling src/perl directory.
-   It doesn't hurt to be defined everywhere, so configure irssi with:
-
-     CFLAGS='-DUSEIMPORTLIB' ./configure --with-perl-staticlib
+ - TODO
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..d03cbf21
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,25 @@
+global-include meson.build
+
+recursive-include src *.c *.h meson.build
+recursive-include src/perl *.c *.h *.xs *.pm *.pl typemap meson.build
+recursive-include tests *.c meson.build
+
+include meson_options.txt
+
+include subprojects/*.wrap
+prune subprojects/*/
+
+include utils/*.pl utils/*.sh
+exclude utils/make-dist.sh
+
+include irssi.conf
+include themes/*.theme
+include docs/*.1 docs/*.txt docs/*.html
+include docs/help/in/[a-z]*.in
+include scripts/*.pl scripts/examples/*.pl
+
+include NEWS
+
+prune Build
+prune dist
+prune *.egg-info
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 74f81303..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-# create default-config.h
-BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
-CLEANFILES = default-config.h default-theme.h
-
-@MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
-
-default-config.h: $(srcdir)/irssi.conf
-	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
-
-default-theme.h: $(srcdir)/themes/default.theme
-	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h
-
-irssi-version.h:
-	VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) | \
-		cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) >$@
-
-SUBDIRS = src tests docs scripts themes utils
-
-confdir = $(sysconfdir)
-conf_DATA = irssi.conf
-
-pkgconfig_DATA = irssi-1.pc
-
-pkginclude_HEADERS = irssi-config.h irssi-version.h
-
-EXTRA_DIST = \
-	ChangeLog \
-	autogen.sh \
-	README.md \
-	$(conf_DATA) \
-	irssi-icon.png \
-	meson.build \
-	meson_options.txt
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 17f60f89..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-PKG_NAME="Irssi"
-
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-mydir=`pwd`
-
-if test ! -f "$srcdir"/configure.ac; then
-    echo -n "**Error**: Directory \`$srcdir' does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-fi
-
-cd "$srcdir"
-
-# create help files
-echo "Creating help files..."
-perl utils/syntax.pl
-
-echo "Creating ChangeLog..."
-git log > ChangeLog
-if test "$?" -ne 0; then
-    echo "**Error**: ${PKG_NAME} Autogen must be run in a git clone, cannot proceed."
-    exit 1
-fi
-
-files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
-cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
-
-files=`echo $files|sed 's/\.in//g'`
-cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
-
-if test x$NOCONFIGURE = x && test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-rm -f aclocal.m4
-echo "Running autoreconf ..."
-autoreconf -i || exit $?
-
-# make sure perl hashes have correct length
-find src/perl -name '*.c' -o -name '*.xs' -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }'
-
-cd "$mydir"
-
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
-  echo Running "$srcdir"/configure $conf_flags "$@" ...
-  "$srcdir"/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
-  echo Skipping configure process.
-fi
-
-if grep -q '==\|\[\[' "$srcdir"/build-aux/test-driver; then
-    echo
-    echo "************************************************************************"
-    echo "**Warning**: your build is not portable, please do not make dist"
-    echo "             see https://bugzilla.opensuse.org/show_bug.cgi?id=1076146"
-    echo "************************************************************************"
-fi
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index a51edf3c..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,821 +0,0 @@
-AC_INIT(irssi, 1.4-head-an)
-AC_CONFIG_SRCDIR([src])
-AC_CONFIG_AUX_DIR(build-aux)
-AC_PREREQ(2.50)
-
-AC_CONFIG_HEADERS([irssi-config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects nostdinc])
-
-AM_SILENT_RULES([yes])
-
-AM_MAINTAINER_MODE
-
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_LIBTOOL
-
-AC_PATH_PROG(sedpath, sed)
-AC_PATH_PROG(perlpath, perl)
-
-PKG_INSTALLDIR
-
-AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h)
-
-# check posix headers..
-AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/utsname.h)
-
-AC_SYS_LARGEFILE
-
-AC_ARG_WITH(socks,
-[  --with-socks            Build with socks support],
-	if test x$withval = xno; then
-		want_socks=no
-	else
-		want_socks=yes
-	fi,
-	want_socks=no)
-
-AC_ARG_WITH(textui,
-[  --without-textui        Build without text frontend],
-	if test x$withval = xno; then
-		want_textui=no
-	else
-		want_textui=yes
-	fi,
-	want_textui=yes)
-
-AC_ARG_WITH(bot,
-[  --with-bot              Build irssi-bot],
-	if test x$withval = xno; then
-		want_irssibot=no
-	else
-		want_irssibot=yes
-	fi,
-	want_irssibot=no)
-
-AC_ARG_WITH(fuzzer,
-[  --with-fuzzer           Build irssi-fuzzer],
-	if test x$withval = xno; then
-		want_irssifuzzer=no
-	else
-		want_irssifuzzer=yes
-	fi,
-	want_irssifuzzer=no)
-
-AC_ARG_WITH(fuzzer-lib,
-[  --with-fuzzer-lib       Specify path to fuzzer library],
-	fuzzerlibpath="$withval")
-
-AC_ARG_WITH(proxy,
-[  --with-proxy            Build irssi-proxy],
-	if test x$withval = xno; then
-		want_irssiproxy=no
-	else
-		want_irssiproxy=yes
-	fi,
-	want_irssiproxy=no)
-
-AC_ARG_WITH(modules,
-[  --with-modules          Specify what modules to build in binary],
-	if test x$withval != xyes -a x$withval != xno; then
-		build_modules="$withval"
-	fi)
-
-if test "x$prefix" != "xNONE"; then
-	prefix=`eval echo $prefix`
-	PERL_MM_PARAMS="INSTALLDIRS=perl INSTALL_BASE=$prefix"
-	perl_set_use_lib=yes
-
-	perl_prefix_note=yes
-fi
-
-AC_ARG_WITH(perl-staticlib,
-[  --with-perl-staticlib   Specify that we want to link perl libraries
-                          statically in irssi, default is no],
-	if test x$withval = xno; then
-		want_staticperllib=no
-	else
-		want_staticperllib=yes
-	fi,
-	want_staticperllib=no)
-
-
-AC_ARG_WITH(perl-lib,
-[  --with-perl-lib=[perl|site|vendor|DIR]  Specify where to install the
-                          Perl libraries for irssi, default is site],
-	if test "x$withval" = xyes; then
-		want_perl=yes
-	elif test "x$withval" = xno; then
-		want_perl=no
-	elif test "x$withval" = xperl; then
-		want_perl=yes
-		perl_prefix_note=no
-		PERL_MM_PARAMS="INSTALLDIRS=perl"
-		perl_set_use_lib=no
-	elif test "x$withval" = xsite; then
-		want_perl=yes
-		perl_prefix_note=no
-		PERL_MM_PARAMS=""
-		perl_set_use_lib=no
-	elif test "x$withval" = xvendor; then
-		want_perl=yes
-		perl_prefix_note=no
-		if test -z "`$perlpath -v|grep '5\.0'`"; then
-			PERL_MM_PARAMS="INSTALLDIRS=vendor"
-		else
-			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`"
-		fi
-		perl_set_use_lib=no
-	else
-		want_perl=yes
-		perl_prefix_note=no
-		PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
-		perl_set_use_lib=yes
-	fi,
-	want_perl=yes)
-
-AC_ARG_WITH(perl,
-[  --with-perl[=yes|no|module]  Build with Perl support - also specifies
-                          if it should be built into main irssi binary
-                          (static, default) or as module],
-	if test x$withval = xyes; then
-		want_perl=static
-	elif test x$withval = xstatic; then
-		want_perl=static
-	elif test x$withval = xmodule; then
-		want_perl=module
-	else
-		want_perl=no
-	fi,
-	want_perl=static)
-
-AC_ARG_WITH(otr,
-[  --with-otr[=yes|no|static]   Build with OTR support - also specifies
-                                if it should be built into the main irssi
-                                binary (static) or as a module (default)],
-	if test x$withval = xyes; then
-		want_otr=module
-	elif test x$withval = xstatic; then
-		want_otr=static
-	elif test x$withval = xmodule; then
-		want_otr=module
-	else
-		want_otr=no
-	fi,
-	want_otr=no)
-
-AC_ARG_ENABLE(true-color,
-[  --enable-true-color     Build with true color support in terminal],
-	if test x$enableval = xno ; then
-		want_truecolor=no
-	else
-		want_truecolor=yes
-	fi,
-	want_truecolor=no)
-
-AC_ARG_ENABLE(gregex,
-[  --disable-gregex        Build without GRegex (fall back to regex.h)],
-	if test x$enableval = xno ; then
-		want_gregex=no
-	else
-		want_gregex=yes
-	fi,
-	want_gregex=yes)
-
-AC_ARG_ENABLE(utf8proc,
-[  --disable-utf8proc        Build without Julia's utf8proc],
-	if test x$enableval = xno ; then
-		want_utf8proc=no
-	else
-		want_utf8proc=yes
-	fi,
-	want_utf8proc=yes)
-
-AC_ARG_WITH(capsicum,
-[  --with-capsicum         Build with Capsicum support],
-	if test x$withval = xno; then
-		want_capsicum=no
-	else
-		want_capsicum=yes
-	fi,
-	want_capsicum=yes)
-
-dnl **
-dnl ** just some generic stuff...
-dnl **
-
-dnl * OS specific options
-case "$host_os" in
-  hpux*)
-    CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
-    ;;
-  *)
-    ;;
-esac
-
-
-AC_SEARCH_LIBS([socket], [network socket])
-
-AC_SEARCH_LIBS([inet_addr], [nsl])
-
-dnl * gcc specific options
-if test "x$ac_cv_prog_gcc" = "xyes"; then
-  CFLAGS="$CFLAGS -Wall"
-fi
-
-AC_CHECK_TYPE(socklen_t, ,
-	[AC_DEFINE([socklen_t], [int], [Define to 'int' if <sys/socket.h> doesn't define.])], [
-AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-])
-
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(off_t)
-
-if test $ac_cv_sizeof_off_t = 8; then
-  offt_64bit=yes
-else
-  offt_64bit=no
-fi
-
-dnl **
-dnl ** check for socks
-dnl **
-
-if test "x$want_socks" = "xyes"; then
-	AC_CHECK_LIB(socks, connect, [
-		AC_DEFINE(HAVE_SOCKS,, Build with socks support)
-		LIBS="$LIBS -lsocks"
-		AC_CHECK_HEADER(socks.h, [
-			AC_DEFINE(HAVE_SOCKS_H)
-			CFLAGS="$CFLAGS -DSOCKS"
-			AC_MSG_RESULT(["socks5 library found, building with it"])
-		], [
-			AC_MSG_RESULT(["socks4 library found, building with it"])
-			CFLAGS="$CFLAGS -Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dgetpeername=Rgetpeername -Dbind=Rbind -Daccept=Raccept -Dlisten=Rlisten -Dselect=Rselect"
-		])
-	])
-fi
-
-dnl **
-dnl ** fe-text checks
-dnl **
-
-for try in 1 2; do
-  if test $try = 1; then
-    glib_modules=gmodule
-  else
-    echo "*** trying without -lgmodule"
-    glib_modules=
-  fi
-  AM_PATH_GLIB_2_0(2.32.0,,, $glib_modules)
-  if test "$GLIB_LIBS"; then
-    if test $glib_modules = gmodule; then
-      AC_DEFINE(HAVE_GMODULE)
-      have_gmodule=yes
-    fi
-    break
-  fi
-done
-
-if test -z "$GLIB_LIBS"; then
-  echo
-  echo "*** If you don't have GLIB, you can get it from ftp://ftp.gtk.org/pub/glib/"
-  echo "*** We recommend you get the latest stable GLIB 2 version."
-  echo "*** Compile and install it, and make sure pkg-config finds it,"
-  echo "*** by adding the path where the .pc file is located to PKG_CONFIG_PATH"
-  echo -n "*** Or alternatively install your distribution's package"
-  if test -f /etc/debian_version; then
-    echo :
-    echo "*** sudo apt-get install libglib2.0-dev"
-  elif test -f /etc/redhat-release; then
-    echo " (glib2-devel)"
-  else
-    echo .
-  fi
-  echo
-
-  AC_ERROR([GLIB is required to build irssi.])
-fi
-
-LIBS="$LIBS $GLIB_LIBS"
-
-GLIB_TESTS
-
-dnl **
-dnl ** OpenSSL checks
-dnl **
-PKG_CHECK_MODULES([OPENSSL], [openssl], [
-	CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
-	LIBS="$LIBS $OPENSSL_LIBS"
-], [
-	AC_CHECK_LIB([ssl], [SSL_library_init], [
-		LIBS="$LIBS -lssl -lcrypto"
-	], [
-		AC_MSG_ERROR([The OpenSSL library was not found])
-	])
-])
-
-dnl **
-dnl ** utf8proc
-dnl **
-if test "x$want_utf8proc" != "xno"; then
-	AC_CHECK_HEADER([utf8proc.h], [
-		AC_CHECK_LIB([utf8proc], [utf8proc_version], [
-			want_utf8proc=yes
-			AC_DEFINE(HAVE_LIBUTF8PROC,, [Define to 1 if you have the `utf8proc' library (-lutf8proc).])
-			LIBS="$LIBS -lutf8proc"
-		], [
-			want_utf8proc="no, library not found"
-		])
-	], [
-		want_utf8proc="no, library header not found"
-	])
-fi
-
-dnl **
-dnl ** curses checks
-dnl **
-
-if test "x$want_textui" != "xno"; then
-
-	TEXTUI_NO_LIBS="$LIBS"
-	LIBS=
-	AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses terminfo], [want_textui=yes], [
-		AC_ERROR(Terminfo not found - install libncurses-dev or ncurses-devel package)
-		want_textui="no, Terminfo not found"
-	])
-
-	TEXTUI_LIBS="$LIBS"
-	AC_SUBST(TEXTUI_LIBS)
-	LIBS="$TEXTUI_NO_LIBS"
-
-	AC_CHECK_HEADER([term.h], [
-		AC_DEFINE(HAVE_TERM_H, [], [Define to 1 if you have the `term.h' header.])
-	])
-
-fi
-
-dnl **
-dnl ** irssifuzzer checks
-dnl **
-
-if test "$want_irssifuzzer" != "no"; then
-	dnl * we need to build with -fsanitize-coverage=trace-pc-guard
-	dnl * otherwise fuzzer won't be very successful at finding bugs :)
-	if test -z "$SANFLAGS"; then
-		SANFLAGS="-g -fsanitize=address -fsanitize-coverage=trace-pc-guard"
-	fi
-	CFLAGS="$CFLAGS $SANFLAGS"
-	CXXFLAGS="$CXXFLAGS $SANFLAGS"
-
-	AC_MSG_CHECKING(for fuzzer library)
-
-	if test -z "$fuzzerlibpath"; then
-		AC_MSG_RESULT([not found, building without fuzzer front end])
-		want_irssifuzzer=no
-	else
-		FUZZER_LIBS="$fuzzerlibpath"
-		AC_SUBST(FUZZER_LIBS)
-	fi
-fi
-
-dnl **
-dnl ** perl checks
-dnl **
-
-if test "$want_perl" != "no"; then
-	AC_MSG_CHECKING(for working Perl support)
-
-	if test -z "$perlpath"; then
-		perl_check_error="perl binary not found"
-	else
-		PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
-	fi
-
-	if test "x$ac_cv_prog_gcc" = "xyes" -a -z "`echo $host_os|grep 'bsd\|linux'`"; then
-		dnl * several systems have Perl compiled with native compiler
-		dnl * but irssi is being compiled with GCC. Here we try to
-		dnl * fix those command line options a bit so GCC won't
-		dnl * complain about them. Normally there's only few options
-		dnl * that we want to keep:
-		dnl * -Ddefine -Uundef -I/path -fopt -mopt -iwithsysroot
-		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIifm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
-
-		PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
-		AC_SUBST(PERL_EXTRA_OPTS)
-	fi
-
-	if test -z "$PERL_CFLAGS"; then
-		if test -n "$perl_check_error"; then
-			perl_check_error="Error getting perl CFLAGS"
-		fi
-		AC_MSG_RESULT([not found, building without Perl])
-		want_perl=no
-	else
-		PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null`
-
-		dnl * remove all database stuffs
-		dnl * nsl is already in ldflags
-		dnl * libc is of course linked without needing -lc
-		dnl * -rdynamic must not be in LIBADD line
-		for word in -ldb -ldbm -lndbm -lgdbm -lc -rdynamic; do
-		  PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e "s/$word //" -e "s/$word$//"`
-		done
-
-		case "$host_os" in
-		  linux*)
-		    PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-lposix //' -e 's/-lposix$//'`
-		    ;;
-		  hpux*)
-		    if test "x$ac_cv_prog_gcc" = "xyes"; then
-		      PERL_CFLAGS=`echo $PERL_CFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'`
-		      PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'`
-		    fi
-		    ;;
-		  *)
-		    ;;
-		esac
-
-		dnl * check that perl's ldflags actually work
-		echo "#include <EXTERN.h>" > conftest.c
-		echo "#include <perl.h>" >> conftest.c
-		echo "int main(){perl_alloc(); return 0;}" >> conftest.c
-		$CC $CFLAGS $PERL_CFLAGS conftest.c -o conftest $LDFLAGS $PERL_LDFLAGS 2> perl.error.tmp > /dev/null
-		if test ! -s conftest -a "x$ignore_perl_errors" = "x"; then
-			perl_check_error="Error linking with perl libraries: $PERL_LDFLAGS: `cat perl.error.tmp`"
-			AC_MSG_RESULT([error linking with perl libraries, building without Perl])
-			want_perl=no
-		fi
-
-		rm -f perl.error.tmp
-	fi
-
-	if test "x$want_perl" != "xno"; then
-		AC_MSG_RESULT(ok)
-
-		if test "x$want_perl" = "xstatic"; then
-			dnl * building with static perl support
-			dnl * all PERL_LDFLAGS linking is done in fe-text
-			PERL_LINK_FLAGS="$PERL_LDFLAGS"
-			PERL_LINK_LIBS="../perl/libperl_core_static.la"
-			PERL_FE_LINK_LIBS="../perl/libfe_perl_static.la"
-			PERL_LDFLAGS=
-			AC_DEFINE(HAVE_STATIC_PERL)
-
-			dnl * build only static library of perl module
-			perl_module_lib=
-			perl_module_fe_lib=
-			perl_static_lib=libperl_core_static.la
-			perl_static_fe_lib=libfe_perl_static.la
-		else
-			dnl * build dynamic library of perl module
-			perl_module_lib=libperl_core.la
-			perl_module_fe_lib=libfe_perl.la
-			perl_static_lib=
-			perl_static_fe_lib=
-		fi
-
-		if test "x$want_staticperllib" = "xyes"; then
-			PERL_MM_PARAMS="$PERL_MM_PARAMS LINKTYPE=static"
-			PERL_LINK_LIBS="$PERL_LINK_LIBS ../perl/common/blib/arch/auto/Irssi/Irssi.a ../perl/irc/blib/arch/auto/Irssi/Irc/Irc.a ../perl/ui/blib/arch/auto/Irssi/UI/UI.a ../perl/textui/blib/arch/auto/Irssi/TextUI/TextUI.a"
-			PERL_STATIC_LIBS=1
-		else
-			PERL_STATIC_LIBS=0
-		fi
-
-		# remove any prefix from PERL_MM_OPT
-		PERL_MM_OPT=`perl -MText::ParseWords -e 'sub qu{$_=shift;s{^(.*?)=(.*)$}{($a,$b)=($1,$2);$b=~s/"/\\\\"/g;qq{$a="$b"}}ge if /@<:@\s"@:>@/;$_} local $,=" "; print map qu($_), grep !/^(INSTALL_BASE|PREFIX)=/, shellwords(@ARGV)' "$PERL_MM_OPT"`
-		# figure out the correct @INC path - we'll need to do this
-		# through MakeMaker since it's difficult to get it right
-		# otherwise.
-		$perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null
-		echo 'show-INSTALLDIRS:' >> Makefile.test
-		echo '	@echo $(INSTALLDIRS)' >> Makefile.test
-		perl_INSTALLDIRS=`$am_make -s -f Makefile.test show-INSTALLDIRS`
-		if test "x$perl_INSTALLDIRS" = "xsite"; then
-			perl_library_dir="site default"
-			perl_INSTALL_VAR=INSTALLSITEARCH
-		elif test "x$perl_INSTALLDIRS" = "xvendor"; then
-			perl_library_dir="vendor default"
-			perl_INSTALL_VAR=INSTALLVENDORARCH
-		else
-			perl_library_dir="module default"
-			perl_INSTALL_VAR=INSTALLARCHLIB
-		fi
-		echo 'show-ARCHLIB:' >> Makefile.test
-		echo '	@echo $('"$perl_INSTALL_VAR"')' >> Makefile.test
-		perl_use_lib=`$am_make -s -f Makefile.test show-ARCHLIB`
-		rm -f Makefile.test
-		if test "x$perl_set_use_lib" = "xyes"; then
-			if $perlpath -e 'exit ! grep $_ eq $ARGV@<:@0@:>@, grep /^\//, @INC' "$perl_use_lib"; then
-				perl_library_dir="other path in @INC"
-				perl_set_use_lib=no
-			else
-				perl_library_dir="prepends to @INC with /set perl_use_lib"
-				PERL_USE_LIB="$perl_use_lib"
-			fi
-		fi
-
-		AC_SUBST(perl_module_lib)
-		AC_SUBST(perl_static_lib)
-		AC_SUBST(perl_module_fe_lib)
-		AC_SUBST(perl_static_fe_lib)
-
-		AC_SUBST(PERL_LINK_FLAGS)
-		AC_SUBST(PERL_LINK_LIBS)
-		AC_SUBST(PERL_FE_LINK_LIBS)
-
-		AC_SUBST(PERL_LDFLAGS)
-		AC_SUBST(PERL_CFLAGS)
-
-		AC_SUBST(PERL_USE_LIB)
-		AC_SUBST(PERL_MM_OPT)
-		AC_SUBST(PERL_MM_PARAMS)
-		AC_SUBST(PERL_STATIC_LIBS)
-	fi
-fi
-
-dnl **
-dnl ** check for capsicum
-dnl **
-
-if test "x$want_capsicum" = "xyes"; then
-	AC_CHECK_LIB(c, cap_enter, [
-		AC_CHECK_LIB(nv, nvlist_create, [
-			AC_DEFINE(HAVE_CAPSICUM,, Build with Capsicum support)
-			LIBS="$LIBS -lnv"
-		], [
-			want_capsicum="no, nvlist_create not found"
-		])
-	], [
-		want_capsicum="no, cap_enter not found"
-	])
-fi
-
-dnl **
-dnl ** OTR checks
-dnl **
-
-have_otr=no
-if test "x$want_otr" != "xno"; then
-	AM_PATH_LIBGCRYPT(1:1.2.0, [], [AC_ERROR(libgcrypt 1.2.0 or newer is required.)])
-	AM_PATH_LIBOTR(4.1.0, [], [AC_ERROR([libotr 4.1.0 or newer is required.])])
-
-	OTR_CFLAGS="$LIBOTR_CFLAGS $LIBGCRYPT_CFLAGS"
-	OTR_LDFLAGS="$LIBOTR_LIBS $LIBGCRYPT_LIBS"
-
-	AC_SUBST(otr_module_lib)
-	AC_SUBST(otr_static_lib)
-
-	if test "x$want_otr" != "xno"; then
-		if test "x$want_otr" = "xstatic"; then
-			otr_module_lib=
-			otr_static_lib=libotr_core_static.la
-
-			OTR_LINK_LIBS="../otr/libotr_core_static.la"
-			OTR_LINK_FLAGS="$OTR_LDFLAGS"
-
-			AC_DEFINE(HAVE_STATIC_OTR)
-		else
-			otr_module_lib=libotr_core.la
-			otr_static_lib=
-		fi
-	fi
-
-	AC_SUBST(otr_module_lib)
-	AC_SUBST(otr_static_lib)
-
-	AC_SUBST(OTR_CFLAGS)
-	AC_SUBST(OTR_LDFLAGS)
-
-	AC_SUBST(OTR_LINK_LIBS)
-	AC_SUBST(OTR_LINK_FLAGS)
-
-	have_otr=yes
-fi
-
-dnl ** check what we want to build
-AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
-AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
-AM_CONDITIONAL(BUILD_IRSSIFUZZER, test "$want_irssifuzzer" = "yes")
-AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
-AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
-AM_CONDITIONAL(HAVE_CAPSICUM, test "x$want_capsicum" = "xyes")
-AM_CONDITIONAL(USE_GREGEX, test "x$want_gregex" = "xyes")
-AM_CONDITIONAL(HAVE_OTR, test "x$have_otr" != "xno")
-
-# move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
-PROG_LIBS=$LIBS
-LIBS=
-AC_SUBST(PROG_LIBS)
-
-dnl **
-dnl ** Keep all the libraries here so each frontend doesn't need to
-dnl ** keep track of them all
-dnl **
-dnl ** (these could be made configurable)
-
-CHAT_MODULES="irc"
-irc_MODULES="dcc flood notifylist"
-if test -n "$build_modules"; then
-	irc_MODULES="$irc_MODULES $build_modules"
-fi
-
-dnl ****************************************
-
-AC_SUBST(CHAT_MODULES)
-AC_SUBST(irc_MODULES)
-
-CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a"
-FE_COMMON_LIBS=""
-
-CHAT_LIBS=""
-for c in $CHAT_MODULES; do
-	CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a"
-	if test -f $srcdir/src/fe-common/$c/module.h; then
-		FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a "
-	fi
-	for s in `eval echo \\$${c}_MODULES`; do
-		CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a"
-		if test -f $srcdir/src/fe-common/$c/$s/module.h; then
-			FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a "
-		fi
-	done
-done
-
-FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
-
-dnl ** common libraries needed by frontends
-COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS"
-COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS"
-AC_SUBST(COMMON_NOUI_LIBS)
-AC_SUBST(COMMON_LIBS)
-
-if test "x$want_truecolor" = "xyes"; then
-	AC_DEFINE([TERM_TRUECOLOR], [], [true color support in terminal])
-else
-	want_truecolor=no
-fi
-
-if test "x$want_gregex" = "xyes"; then
-	AC_DEFINE([USE_GREGEX], [], [use GRegex for regular expressions])
-else
-	want_gregex=no
-fi
-
-AC_DEFINE([FHS_PREFIX], [""], [Alternate filesystem prefix for Termux])
-AH_TEMPLATE(HAVE_GMODULE)
-AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
-AH_TEMPLATE(HAVE_STATIC_PERL)
-AH_TEMPLATE(HAVE_STATIC_OTR)
-AH_TEMPLATE(PRIuUOFF_T, [printf()-format for uoff_t, eg. "u" or "lu" or "llu"])
-AH_TEMPLATE(UOFF_T_INT, [What type should be used for uoff_t])
-AH_TEMPLATE(UOFF_T_LONG)
-AH_TEMPLATE(UOFF_T_LONG_LONG)
-
-AC_CONFIG_FILES([
-Makefile
-src/Makefile
-src/core/Makefile
-src/irc/Makefile
-src/irc/core/Makefile
-src/irc/dcc/Makefile
-src/irc/notifylist/Makefile
-src/irc/proxy/Makefile
-src/irc/flood/Makefile
-src/fe-common/Makefile
-src/fe-common/core/Makefile
-src/fe-common/irc/Makefile
-src/fe-common/irc/dcc/Makefile
-src/fe-common/irc/notifylist/Makefile
-src/fe-fuzz/Makefile
-src/fe-fuzz/irc/Makefile
-src/fe-fuzz/irc/core/Makefile
-src/fe-fuzz/fe-common/Makefile
-src/fe-fuzz/fe-common/core/Makefile
-src/fe-none/Makefile
-src/fe-text/Makefile
-src/lib-config/Makefile
-src/perl/Makefile
-src/perl/common/Makefile.PL
-src/perl/irc/Makefile.PL
-src/perl/ui/Makefile.PL
-src/perl/textui/Makefile.PL
-src/otr/Makefile
-scripts/Makefile
-scripts/examples/Makefile
-tests/Makefile
-tests/fe-common/Makefile
-tests/fe-common/core/Makefile
-tests/fe-text/Makefile
-tests/irc/Makefile
-tests/irc/core/Makefile
-tests/irc/flood/Makefile
-docs/Makefile
-docs/help/Makefile
-docs/help/in/Makefile
-utils/Makefile
-themes/Makefile
-irssi-1.pc
-])
-
-dnl ** make the paths like include headers later
-AC_CONFIG_LINKS([irssi/irssi-config.h:irssi-config.h])
-AC_LINK_FILES([$srcdir/src],[irssi/src])
-
-AC_OUTPUT
-$LN_S ../irssi-version.h irssi/irssi-version.h
-
-dnl ** for building from objdir
-old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir
-if test "x$old_dir" != "x$whole_dir"; then
-	$LN_S $srcdir/irssi-version.h irssi-version.h
-	if test "x$want_perl" != "xno"; then
-		subdirfiles=""
-		for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do
-			subdirfiles=`echo $subdirfiles $i/typemap $i/*.h $i/*.pm $i/*.xs`
-		done
-		for file in $whole_dir/src/perl/module.h $subdirfiles; do
-			link=`echo $file|$sedpath "s?$whole_dir/??"`
-			rm -f $link
-			$LN_S $file $link
-		done
-	fi
-fi
-
-echo
-
-echo "Building text frontend ........... : $want_textui"
-echo "Building irssi bot ............... : $want_irssibot"
-echo "Building irssi proxy ............. : $want_irssiproxy"
-if test "x$have_gmodule" = "xyes"; then
-	echo "Building with module support ..... : yes"
-else
-	echo "Building with module support : NO!! /LOAD will not work!"
-	echo " - You're missing gmodule (comes with glib) for some reason,"
-	echo "   or it doesn't work in your system."
-fi
-
-if test "x$want_perl" = "xstatic"; then
-	echo "Building with Perl support ....... : static (in irssi binary)"
-elif test "x$want_perl" = "xmodule"; then
-	echo "Building with Perl support ....... : module"
-else
-	if test -z "$perl_check_error"; then
-		echo "Building with Perl support ....... : no"
-	else
-		echo "Building with Perl support ....... : NO!"
-		echo " - $perl_check_error"
-                if test -f /etc/debian_version; then
-                  echo " - Try: sudo apt-get install libperl-dev"
-                elif test -f /etc/redhat-release; then
-                  echo " - Try installing perl-devel"
-                fi
-	fi
-fi
-
-if test "x$want_perl" != "xno" -a "x$perl_mod_error" != "x"; then
-	echo " - NOTE: Perl support will be compiled statically to irssi, not as"
-	echo "   a module as requested. Reason:"
-	echo "   $perl_mod_error"
-
-	if test -f /etc/debian_version; then
-		echo " - Try: sudo apt-get install libperl-dev"
-	fi
-fi
-
-if test "x$want_perl" != "xno"; then
-	echo "Perl library directory ........... : ($perl_library_dir - $perl_use_lib)"
-	if test "x$perl_prefix_note" = "xyes"; then
-		echo "  - NOTE: This was automatically set to the same directory you gave with"
-		echo "  --prefix. If you want the perl libraries to install to their 'correct'"
-		echo "  path, you'll need to give --with-perl-lib=site option to configure."
-		echo "  Anyway, installing perl to this directory should work just as well."
-	fi
-fi
-echo "Install prefix ................... : $prefix"
-
-echo
-
-echo "Building with 64bit DCC support .. : $offt_64bit"
-echo "Building with true color support.. : $want_truecolor"
-echo "Building with GRegex ............. : $want_gregex"
-echo "Building with Capsicum ........... : $want_capsicum"
-echo "Building with utf8proc ........... : $want_utf8proc"
-if test "x$want_otr" = "xstatic"; then
-	echo "Building with OTR support ........ : static (in irssi binary)"
-elif test "x$want_otr" = "xmodule"; then
-	echo "Building with OTR support ........ : module"
-else
-	echo "Building with OTR support ........ : no"
-fi
-
-
-echo
-echo "If there are any problems, read the INSTALL file."
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 05ebb319..00000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-man_MANS = \
-	irssi.1
-
-doc_DATA = \
-	capsicum.txt \
-	design.html \
-	design.txt \
-	formats.txt \
-	manual.txt \
-	faq.html \
-	faq.txt \
-	perl.txt \
-	signals.txt \
-	special_vars.txt \
-	startup-HOWTO.html \
-	startup-HOWTO.txt
-
-EXTRA_DIST = $(doc_DATA) $(man_MANS) \
-	meson.build
-
-SUBDIRS = help
diff --git a/docs/help/Makefile.am.gen b/docs/help/Makefile.am.gen
deleted file mode 100644
index 917abe64..00000000
--- a/docs/help/Makefile.am.gen
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
-
-helpdir = $(datadir)/irssi/help
-
-help_DATA = \
-@HELPFILES@
-
-EXTRA_DIST = \
-	Makefile.am.gen \
-	$(help_DATA) \
-	meson.build
-
-SUBDIRS = in
diff --git a/docs/help/in/Makefile.am.gen b/docs/help/in/Makefile.am.gen
deleted file mode 100644
index 9b0f2aaa..00000000
--- a/docs/help/in/Makefile.am.gen
+++ /dev/null
@@ -1,5 +0,0 @@
-# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
-
-EXTRA_DIST = \
-	Makefile.am.gen \
-@HELPFILES@
diff --git a/irssi-1.pc.in b/irssi-1.pc.in
deleted file mode 100644
index a1c00f5c..00000000
--- a/irssi-1.pc.in
+++ /dev/null
@@ -1,20 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-prog_libs="@PROG_LIBS@"
-common_libs="@COMMON_LIBS@"
-
-perl_link_libs="@PERL_LINK_LIBS@"
-perl_fe_link_libs="@PERL_FE_LINK_LIBS@"
-perl_link_flags="@PERL_LINK_FLAGS@"
-
-chat_modules="@CHAT_MODULES@"
-irc_modules="@irc_MODULES@"
-
-Name: Irssi
-Description: Irssi chat client
-Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @OPENSSL_CFLAGS@
-Requires: glib-2.0
\ No newline at end of file
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
deleted file mode 100644
index 5b7c84c0..00000000
--- a/m4/glib-2.0.m4
+++ /dev/null
@@ -1,208 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export) 
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  PKG_PROG_PKG_CONFIG([0.7])
-
-  no_glib=""
-
-  if test "x$PKG_CONFIG" = x ; then
-    no_glib=yes
-    PKG_CONFIG=no
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test "x$PKG_CONFIG" != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  rm -f conf.glibtest
-])
diff --git a/m4/glibtests.m4 b/m4/glibtests.m4
deleted file mode 100644
index 7d5920a4..00000000
--- a/m4/glibtests.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl GLIB_TESTS
-dnl
-
-AC_DEFUN([GLIB_TESTS],
-[
-  AC_ARG_ENABLE(installed-tests,
-                AS_HELP_STRING([--enable-installed-tests],
-                               [Enable installation of some test cases]),
-                [case ${enableval} in
-                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
-                  no)  ENABLE_INSTALLED_TESTS="" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
-                 esac])
-  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
-  AC_ARG_ENABLE(always-build-tests,
-                AS_HELP_STRING([--enable-always-build-tests],
-                               [Enable always building tests during 'make all']),
-                [case ${enableval} in
-                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
-                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
-                 esac])
-  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
-  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
-    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
-  fi
-])
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
deleted file mode 100644
index c67cfece..00000000
--- a/m4/libgcrypt.m4
+++ /dev/null
@@ -1,143 +0,0 @@
-# libgcrypt.m4 - Autoconf macros to detect libgcrypt
-# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Last-changed: 2014-10-02
-
-
-dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
-dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
-dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
-dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
-dnl this features allows to prevent build against newer versions of libgcrypt
-dnl with a changed API.
-dnl
-dnl If a prefix option is not used, the config script is first
-dnl searched in $SYSROOT/bin and then along $PATH.  If the used
-dnl config script does not match the host specification the script
-dnl is added to the gpg_config_script_warn variable.
-dnl
-AC_DEFUN([AM_PATH_LIBGCRYPT],
-[ AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_ARG_WITH(libgcrypt-prefix,
-            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
-                           [prefix where LIBGCRYPT is installed (optional)]),
-     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
-  if test x"${LIBGCRYPT_CONFIG}" = x ; then
-     if test x"${libgcrypt_config_prefix}" != x ; then
-        LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
-     else
-       case "${SYSROOT}" in
-         /*)
-           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
-             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
-           fi
-           ;;
-         '')
-           ;;
-          *)
-           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
-           ;;
-       esac
-     fi
-  fi
-
-  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
-  tmp=ifelse([$1], ,1:1.2.0,$1)
-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-  else
-     req_libgcrypt_api=0
-     min_libgcrypt_version="$tmp"
-  fi
-
-  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
-  ok=no
-  if test "$LIBGCRYPT_CONFIG" != "no" ; then
-    req_major=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-    req_minor=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    req_micro=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
-    major=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-    minor=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-    micro=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-    if test "$major" -gt "$req_major"; then
-        ok=yes
-    else
-        if test "$major" -eq "$req_major"; then
-            if test "$minor" -gt "$req_minor"; then
-               ok=yes
-            else
-               if test "$minor" -eq "$req_minor"; then
-                   if test "$micro" -ge "$req_micro"; then
-                     ok=yes
-                   fi
-               fi
-            fi
-        fi
-    fi
-  fi
-  if test $ok = yes; then
-    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
-  else
-    AC_MSG_RESULT(no)
-  fi
-  if test $ok = yes; then
-     # If we have a recent libgcrypt, we should also check that the
-     # API is compatible
-     if test "$req_libgcrypt_api" -gt 0 ; then
-        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
-           AC_MSG_CHECKING([LIBGCRYPT API version])
-           if test "$req_libgcrypt_api" -eq "$tmp" ; then
-             AC_MSG_RESULT([okay])
-           else
-             ok=no
-             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
-           fi
-        fi
-     fi
-  fi
-  if test $ok = yes; then
-    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
-    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-    ifelse([$2], , :, [$2])
-    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
-    if test x"$libgcrypt_config_host" != xnone ; then
-      if test x"$libgcrypt_config_host" != x"$host" ; then
-  AC_MSG_WARN([[
-***
-*** The config script $LIBGCRYPT_CONFIG was
-*** built for $libgcrypt_config_host and thus may not match the
-*** used host $host.
-*** You may want to use the configure option --with-libgcrypt-prefix
-*** to specify a matching config script or use \$SYSROOT.
-***]])
-        gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
-      fi
-    fi
-  else
-    LIBGCRYPT_CFLAGS=""
-    LIBGCRYPT_LIBS=""
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBGCRYPT_CFLAGS)
-  AC_SUBST(LIBGCRYPT_LIBS)
-])
diff --git a/m4/libotr.m4 b/m4/libotr.m4
deleted file mode 100644
index 80b25f86..00000000
--- a/m4/libotr.m4
+++ /dev/null
@@ -1,134 +0,0 @@
-dnl
-dnl  Off-the-Record Messaging library
-dnl  Copyright (C) 2004-2007  Ian Goldberg, Chris Alexander, Nikita Borisov
-dnl                           <otr@cypherpunks.ca>
-dnl
-dnl  This library is free software; you can redistribute it and/or
-dnl  modify it under the terms of version 2.1 of the GNU Lesser General
-dnl  Public License as published by the Free Software Foundation.
-dnl
-dnl  This library is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl  Lesser General Public License for more details.
-dnl
-dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with this library; if not, write to the Free Software
-dnl  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-dnl
-
-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
-dnl enables arguments --with-libotr-prefix=
-dnl                   --with-libotr-inc-prefix=
-dnl
-dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
-dnl
-dnl Adapted from alsa.m4, originally by
-dnl      Richard Boulton <richard-alsa@tartarus.org>
-dnl      Christopher Lansdown <lansdoct@cs.alfred.edu>
-dnl      Jaroslav Kysela <perex@suse.cz>
-
-AC_DEFUN([AM_PATH_LIBOTR],
-[dnl Save the original CFLAGS, LDFLAGS, and LIBS
-libotr_save_CFLAGS="$CFLAGS"
-libotr_save_LDFLAGS="$LDFLAGS"
-libotr_save_LIBS="$LIBS"
-libotr_found=yes
-
-dnl
-dnl Get the cflags and libraries for libotr
-dnl
-AC_ARG_WITH(libotr-prefix,
-[  --with-libotr-prefix=PFX  Prefix where libotr is installed(optional)],
-[libotr_prefix="$withval"], [libotr_prefix=""])
-
-AC_ARG_WITH(libotr-inc-prefix,
-[  --with-libotr-inc-prefix=PFX  Prefix where libotr includes are (optional)],
-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
-
-dnl Add any special include directories
-AC_MSG_CHECKING(for libotr CFLAGS)
-if test "$libotr_inc_prefix" != "" ; then
-	LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
-	CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
-fi
-AC_MSG_RESULT($LIBOTR_CFLAGS)
-
-dnl add any special lib dirs
-AC_MSG_CHECKING(for libotr LIBS)
-if test "$libotr_prefix" != "" ; then
-	LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
-	LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
-fi
-
-dnl add the libotr library
-LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
-LIBS="$LIBOTR_LIBS $LIBS"
-AC_MSG_RESULT($LIBOTR_LIBS)
-
-dnl Check for a working version of libotr that is of the right version.
-min_libotr_version=ifelse([$1], ,3.0.0,$1)
-no_libotr=""
-    libotr_min_major_version=`echo $min_libotr_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    libotr_min_minor_version=`echo $min_libotr_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    libotr_min_sub_version=`echo $min_libotr_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
-
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <libotr/version.h>
-], [
-#  if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
-#    error not present
-#  else
-
-#    if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
-       exit(0);
-#    else
-#      if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
-#        error not present
-#      endif
-
-#      if(OTRL_VERSION_SUB < $libotr_min_sub_version)
-#        error not present
-#      endif
-#    endif
-#  endif
-exit(0);
-],
-  [AC_MSG_RESULT(found.)],
-  [AC_MSG_RESULT(not present.)
-   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
-   libotr_found=no]
-)
-AC_LANG_RESTORE
-
-dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
-AC_CHECK_LIB([otr], [otrl_message_receiving],,
-	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
-	 libotr_found=no],
-	 $LIBGCRYPT_LIBS
-)
-
-LDFLAGS="$libotr_save_LDFLAGS"
-LIBS="$libotr_save_LIBS"
-
-if test "x$libotr_found" = "xyes" ; then
-   ifelse([$2], , :, [$2])
-else
-   LIBOTR_CFLAGS=""
-   LIBOTR_LIBS=""
-   ifelse([$3], , :, [$3])
-fi
-
-dnl That should be it.  Now just export our symbols:
-AC_SUBST(LIBOTR_CFLAGS)
-AC_SUBST(LIBOTR_LIBS)
-])
-
diff --git a/m4/pkg.m4 b/m4/pkg.m4
deleted file mode 100644
index 13a88901..00000000
--- a/m4/pkg.m4
+++ /dev/null
@@ -1,275 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
-
-dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
-
-dnl PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef([PKG_PREREQ],
-dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-])dnl PKG_PREREQ
-
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
-dnl Since: 0.16
-dnl
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])dnl PKG_PROG_PKG_CONFIG
-
-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl have to call PKG_CHECK_EXISTS manually
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])dnl _PKG_CONFIG
-
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
-
-
-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $2])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-        AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])dnl PKG_CHECK_MODULES
-
-
-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl ---------------------------------------------------------------------
-dnl Since: 0.29
-dnl
-dnl Checks for existence of MODULES and gathers its build flags with
-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-dnl and VARIABLE-PREFIX_LIBS from --libs.
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-dnl configure.ac.
-AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-_save_PKG_CONFIG=$PKG_CONFIG
-PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES($@)
-PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-])dnl PKG_CHECK_MODULES_STATIC
-
-
-dnl PKG_INSTALLDIR([DIRECTORY])
-dnl -------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable pkgconfigdir as the location where a module
-dnl should install pkg-config .pc files. By default the directory is
-dnl $libdir/pkgconfig, but the default can be changed by passing
-dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-dnl parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_INSTALLDIR
-
-
-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-dnl --------------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-dnl module should install arch-independent pkg-config .pc files. By
-dnl default the directory is $datadir/pkgconfig, but the default can be
-dnl changed by passing DIRECTORY. The user can override through the
-dnl --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_NOARCH_INSTALLDIR
-
-
-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------
-dnl Since: 0.28
-dnl
-dnl Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])dnl PKG_CHECK_VAR
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 42b3ea7b..00000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = examples
-
-scriptdir = $(datadir)/irssi/scripts
-
-script_DATA = \
-	autoop.pl \
-	autorejoin.pl \
-	buf.pl \
-	dns.pl \
-	kills.pl \
-	mail.pl \
-	mlock.pl \
-	quitmsg.pl \
-	scriptassist.pl \
-	usercount.pl
-
-EXTRA_DIST = $(script_DATA) \
-	meson.build
diff --git a/scripts/examples/Makefile.am b/scripts/examples/Makefile.am
deleted file mode 100644
index c8d8c8e0..00000000
--- a/scripts/examples/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-scriptdir = $(datadir)/irssi/scripts
-
-script_DATA = \
-	command.pl \
-	msg-event.pl \
-	redirect.pl
-
-EXTRA_DIST = $(script_DATA)
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 83fb562f..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-if BUILD_TEXTUI
-TEXTUI=fe-text
-endif
-
-if BUILD_IRSSIBOT
-BOTUI=fe-none
-endif
-
-if BUILD_IRSSIFUZZER
-FUZZERUI=fe-fuzz
-endif
-
-if HAVE_PERL
-PERLDIR=perl
-endif
-
-if HAVE_OTR
-OTRDIR=otr
-endif
-
-pkginc_srcdir=$(pkgincludedir)/src
-pkginc_src_HEADERS = \
-	common.h
-
-SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(OTRDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI)
-
-EXTRA_DIST = meson.build
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
deleted file mode 100644
index 493c42b2..00000000
--- a/src/core/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-noinst_LIBRARIES = libcore.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DMODULEDIR=\""$(libdir)/irssi/modules"\"
-
-if USE_GREGEX
-regex_impl=iregex-gregex.c
-else
-regex_impl=iregex-regexh.c
-endif
-
-libcore_a_SOURCES = \
-	args.c \
-	channels.c \
-	channels-setup.c \
-	commands.c \
-	chat-commands.c \
-	chat-protocols.c \
-	chatnets.c \
-	core.c \
-	expandos.c \
-        ignore.c \
-        levels.c \
-	line-split.c \
-	log.c \
-	log-away.c \
-	masks.c \
-	misc.c \
-	modules.c \
-	modules-load.c \
-	net-disconnect.c \
-	net-nonblock.c \
-	net-sendbuffer.c \
-	network.c \
-	network-openssl.c \
-	nicklist.c \
-	nickmatch-cache.c \
-	pidwait.c \
-	queries.c \
-	rawlog.c \
-	recode.c \
-	refstrings.c \
-	servers.c \
-	servers-reconnect.c \
-	servers-setup.c \
-	session.c \
-	settings.c \
-	signals.c \
-	special-vars.c \
-	utf8.c \
-	$(regex_impl) \
-	wcwidth.c \
-	wcwidth-wrapper.c \
-	tls.c \
-	write-buffer.c
-
-if HAVE_CAPSICUM
-libcore_a_SOURCES += \
-	capsicum.c
-endif
-
-structure_headers = \
-	channel-rec.h \
-	channel-setup-rec.h \
-	chatnet-rec.h \
-	query-rec.h \
-	server-rec.h \
-	server-setup-rec.h \
-	server-connect-rec.h \
-	window-item-rec.h
-
-pkginc_coredir=$(pkgincludedir)/src/core
-pkginc_core_HEADERS = \
-	args.h \
-	capsicum.h \
-	channels.h \
-	channels-setup.h \
-	commands.h \
-	chat-protocols.h \
-	chatnets.h \
-	core.h \
-	expandos.h \
-        ignore.h \
-        levels.h \
-	line-split.h \
-	log.h \
-	masks.h \
-	misc.h \
-	module.h \
-	modules.h \
-	modules-load.h \
-	net-disconnect.h \
-	net-nonblock.h \
-	net-sendbuffer.h \
-	network.h \
-	network-openssl.h \
-	nick-rec.h \
-	nicklist.h \
-	nickmatch-cache.h \
-	pidwait.h \
-	queries.h \
-	rawlog.h \
-	recode.h \
-	refstrings.h \
-	servers.h \
-	servers-reconnect.h \
-	servers-setup.h \
-	session.h \
-	settings.h \
-	signals.h \
-	special-vars.h \
-	utf8.h \
-	iregex.h \
-	window-item-def.h \
-	tls.h \
-	write-buffer.h \
-	$(structure_headers)
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-common/Makefile.am b/src/fe-common/Makefile.am
deleted file mode 100644
index f4b78b34..00000000
--- a/src/fe-common/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = core irc
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
deleted file mode 100644
index 01e934e0..00000000
--- a/src/fe-common/core/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-noinst_LIBRARIES = libfe_common_core.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	-DHELPDIR=\""$(datadir)/irssi/help"\" \
-	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
-
-libfe_common_core_a_SOURCES = \
-	chat-completion.c \
-	command-history.c \
-	completion.c \
-	fe-channels.c \
-	fe-common-core.c \
-	fe-core-commands.c \
-	fe-exec.c \
-	fe-expandos.c \
-	fe-help.c \
-	fe-ignore.c \
-	fe-ignore-messages.c \
-	fe-log.c \
-	fe-messages.c \
-	fe-modules.c \
-	fe-queries.c \
-	fe-server.c \
-	fe-settings.c \
-	fe-tls.c \
-	formats.c \
-	hilight-text.c \
-	keyboard.c \
-	module-formats.c \
-	printtext.c \
-	fe-recode.c \
-	themes.c \
-	window-activity.c \
-	window-commands.c \
-	window-items.c \
-	windows-layout.c \
-	fe-windows.c
-
-if HAVE_CAPSICUM
-libfe_common_core_a_SOURCES += \
-	fe-capsicum.c
-endif
-
-pkginc_fe_common_coredir=$(pkgincludedir)/src/fe-common/core
-pkginc_fe_common_core_HEADERS = \
-	command-history.h \
-	chat-completion.h \
-	completion.h \
-	fe-capsicum.h \
-	fe-channels.h \
-	fe-common-core.h \
-	fe-core-commands.h \
-	fe-exec.h \
-	fe-messages.h \
-	fe-queries.h \
-	fe-settings.h \
-	fe-tls.h \
-	formats.h \
-	hilight-text.h \
-	keyboard.h \
-	module-formats.h \
-	module.h \
-	printtext.h \
-	fe-recode.h \
-	themes.h \
-	window-activity.h \
-	window-items.h \
-	windows-layout.h \
-	fe-windows.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
deleted file mode 100644
index 8a04bee4..00000000
--- a/src/fe-common/irc/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-SUBDIRS = dcc notifylist
-
-noinst_LIBRARIES = libfe_common_irc.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	-DHELPDIR=\""$(datadir)/irssi/help"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\"
-
-real_sources = \
-	fe-irc-channels.c \
-	fe-irc-commands.c \
-	fe-irc-messages.c \
-	fe-irc-queries.c \
-	fe-irc-server.c \
-	fe-ircnet.c \
-	fe-ctcp.c \
-	fe-events.c \
-	fe-events-numeric.c \
-	fe-modes.c \
-	fe-netjoin.c \
-	fe-netsplit.c \
-	fe-common-irc.c \
-	fe-whois.c \
-	fe-sasl.c \
-	fe-cap.c \
-	irc-completion.c \
-	module-formats.c 
-
-libfe_common_irc_a_SOURCES = \
-	$(real_sources) \
-        irc-modules.c
-
-pkginc_fe_common_ircdir=$(pkgincludedir)/src/fe-common/irc
-pkginc_fe_common_irc_HEADERS = \
-	fe-irc-server.h \
-	fe-irc-channels.h \
-	module.h \
-	module-formats.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
deleted file mode 100644
index feee349d..00000000
--- a/src/fe-common/irc/dcc/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-noinst_LIBRARIES = libfe_irc_dcc.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	-DHELPDIR=\""$(datadir)/irssi/help"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\"
-
-libfe_irc_dcc_a_SOURCES = \
-	fe-dcc.c \
-	fe-dcc-chat.c \
-	fe-dcc-chat-messages.c \
-	fe-dcc-get.c \
-	fe-dcc-send.c \
-	module-formats.c \
-	fe-dcc-server.c
-
-pkginc_fe_common_irc_dccdir=$(pkgincludedir)/src/fe-common/irc/dcc
-pkginc_fe_common_irc_dcc_HEADERS = \
-	module.h \
-	module-formats.h \
-	fe-dcc.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
deleted file mode 100644
index 5eecb5fb..00000000
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-noinst_LIBRARIES = libfe_irc_notifylist.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	-DHELPDIR=\""$(datadir)/irssi/help"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\"
-
-libfe_irc_notifylist_a_SOURCES = \
-	fe-notifylist.c \
-	module-formats.c
-
-pkginc_fe_common_irc_notifylistdir=$(pkgincludedir)/src/fe-common/irc/notifylist
-pkginc_fe_common_irc_notifylist_HEADERS = \
-	module.h \
-	module-formats.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
deleted file mode 100644
index 3efa83b6..00000000
--- a/src/fe-fuzz/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-SUBDIRS = irc fe-common
-
-bin_PROGRAMS = irssi-fuzz server-fuzz
-
-# Force link with CXX for libfuzzer support
-CCLD=$(CXX) $(CXXFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-irssi_fuzz_DEPENDENCIES = @COMMON_LIBS@
-
-irssi_fuzz_LDADD = \
-	@COMMON_LIBS@ \
-	@PROG_LIBS@ \
-	$(FUZZER_LIBS)
-
-irssi_fuzz_SOURCES = \
-        irssi.c \
-        null-logger.c \
-	../fe-text/module-formats.c
-
-server_fuzz_DEPENDENCIES = @COMMON_LIBS@
-
-server_fuzz_LDADD = \
-	@COMMON_LIBS@ \
-	@PROG_LIBS@ \
-	$(FUZZER_LIBS)
-
-server_fuzz_SOURCES = \
-	server.c \
-        null-logger.c \
-	../fe-text/module-formats.c
-
-noinst_HEADERS = \
-        null-logger.h \
-	../fe-text/module-formats.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/fe-common/Makefile.am b/src/fe-fuzz/fe-common/Makefile.am
deleted file mode 100644
index 74f13119..00000000
--- a/src/fe-fuzz/fe-common/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = core
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
deleted file mode 100644
index 8f6ae477..00000000
--- a/src/fe-fuzz/fe-common/core/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-bin_PROGRAMS = theme-load-fuzz
-
-# Force link with CXX for libfuzzer support
-CCLD=$(CXX) $(CXXFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-LDADD = \
-	../../../irc/libirc.a \
-	../../../irc/core/libirc_core.a \
-	../../../irc/dcc/libirc_dcc.a \
-	../../../irc/flood/libirc_flood.a \
-	../../../irc/notifylist/libirc_notifylist.a \
-	../../../fe-common/core/libfe_common_core.a \
-	../../../fe-common/irc/libfe_common_irc.a \
-	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
-	../../../fe-common/irc/notifylist/libfe_irc_notifylist.a \
-	../../../core/libcore.a \
-	../../../lib-config/libirssi_config.a \
-	@PROG_LIBS@ \
-	$(FUZZER_LIBS)
-
-theme_load_fuzz_SOURCES = \
-        ../../null-logger.c \
-        theme-load.c \
-	$(top_srcdir)/src/fe-text/module-formats.c
-
-noinst_HEADERS = \
-	$(top_srcdir)/src/fe-text/module-formats.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/irc/Makefile.am b/src/fe-fuzz/irc/Makefile.am
deleted file mode 100644
index 74f13119..00000000
--- a/src/fe-fuzz/irc/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = core
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
deleted file mode 100644
index 9221e29e..00000000
--- a/src/fe-fuzz/irc/core/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-bin_PROGRAMS = event-get-params-fuzz
-
-# Force link with CXX for libfuzzer support
-CCLD=$(CXX) $(CXXFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-LDADD = \
-	../../../irc/libirc.a \
-	../../../irc/core/libirc_core.a \
-	../../../irc/dcc/libirc_dcc.a \
-	../../../irc/flood/libirc_flood.a \
-	../../../irc/notifylist/libirc_notifylist.a \
-	../../../fe-common/core/libfe_common_core.a \
-	../../../fe-common/irc/libfe_common_irc.a \
-	../../../fe-common/irc/dcc/libfe_irc_dcc.a \
-	../../../fe-common/irc/notifylist/libfe_irc_notifylist.a \
-	../../../core/libcore.a \
-	../../../lib-config/libirssi_config.a \
-	@PROG_LIBS@ \
-	$(FUZZER_LIBS)
-
-event_get_params_fuzz_SOURCES = \
-        ../../null-logger.c \
-        event-get-params.c \
-	$(top_srcdir)/src/fe-text/module-formats.c
-
-noinst_HEADERS = \
-	$(top_srcdir)/src/fe-text/module-formats.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
deleted file mode 100644
index bbcd63f8..00000000
--- a/src/fe-none/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-bin_PROGRAMS = botti
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-botti_DEPENDENCIES = @COMMON_NOUI_LIBS@
-
-botti_LDADD = \
-	@COMMON_NOUI_LIBS@ \
-	@PERL_LINK_LIBS@ \
-	@PERL_LINK_FLAGS@ \
-	@PROG_LIBS@
-
-botti_SOURCES = \
-        irssi.c
-
-noinst_HEADERS = \
-	module.h
-
-EXTRA_DIST = meson.build
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
deleted file mode 100644
index d97cbfa5..00000000
--- a/src/fe-text/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-bin_PROGRAMS = irssi
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-irssi_DEPENDENCIES = \
-	@COMMON_LIBS@ \
-	@PERL_LINK_LIBS@ \
-	@PERL_FE_LINK_LIBS@ \
-	@OTR_LINK_LIBS@
-
-irssi_LDFLAGS = -export-dynamic
-
-irssi_LDADD = \
-	@COMMON_LIBS@ \
-	@PERL_LINK_LIBS@ \
-	@PERL_FE_LINK_LIBS@ \
-	@OTR_LINK_LIBS@ \
-	@OTR_LINK_FLAGS@ \
-	@PERL_LINK_FLAGS@ \
-	@PROG_LIBS@ \
-	@TEXTUI_LIBS@
-
-terminfo_sources = \
-        term-terminfo.c \
-        terminfo-core.c
-
-use_term_sources = $(terminfo_sources)
-
-irssi_SOURCES = \
-        gui-entry.c \
-	gui-expandos.c \
-        gui-printtext.c \
-        gui-readline.c \
-        gui-windows.c \
-	lastlog.c \
-        mainwindows.c \
-        mainwindow-activity.c \
-        mainwindows-layout.c \
-        statusbar.c \
-        statusbar-config.c \
-        statusbar-items.c \
-        term.c \
-	$(use_term_sources) \
-        textbuffer.c \
-        textbuffer-commands.c \
-        textbuffer-view.c \
-        textbuffer-formats.c \
-        irssi.c \
-	module-formats.c
-
-pkginc_fe_textdir=$(pkgincludedir)/src/fe-text
-pkginc_fe_text_HEADERS = \
-	gui-printtext.h \
-	gui-windows.h \
-	mainwindows.h \
-	statusbar.h \
-	statusbar-item.h \
-	term.h \
-	textbuffer.h \
-	textbuffer-view.h \
-	textbuffer-formats.h
-
-noinst_HEADERS = \
-	gui-entry.h \
-	gui-readline.h \
-	statusbar-config.h \
-	terminfo-core.h \
-	module.h \
-	module-formats.h
-
-EXTRA_DIST = \
-	$(terminfo_sources) \
-	meson.build
diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
deleted file mode 100644
index a271a891..00000000
--- a/src/irc/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-if BUILD_IRSSIPROXY
-PROXY=proxy
-endif
-
-SUBDIRS = core dcc flood notifylist $(PROXY)
-
-noinst_LIBRARIES = libirc.a
-
-libirc_a_SOURCES = irc.c
-
-EXTRA_DIST = meson.build
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
deleted file mode 100644
index 5881481b..00000000
--- a/src/irc/core/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-noinst_LIBRARIES = libirc_core.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	$(GLIB_CFLAGS)
-
-libirc_core_a_SOURCES = \
-	bans.c \
-        ctcp.c \
-        channels-query.c \
-        channel-events.c \
-        channel-rejoin.c \
-        irc.c \
-        irc-core.c \
-        irc-channels.c \
-        irc-channels-setup.c \
-	irc-chatnets.c \
-        irc-commands.c \
-        irc-expandos.c \
-        irc-masks.c \
-        irc-nicklist.c \
-        irc-queries.c \
-        irc-servers.c \
-        irc-servers-reconnect.c \
-        irc-servers-setup.c \
-        irc-session.c \
-        irc-cap.c \
-        sasl.c \
-        lag.c \
-        massjoin.c \
-        modes.c \
-        mode-lists.c \
-        netsplit.c \
-        servers-idle.c \
-        servers-redirect.c
-
-pkginc_irc_coredir=$(pkgincludedir)/src/irc/core
-pkginc_irc_core_HEADERS = \
-	bans.h \
-        ctcp.h \
-	channel-events.h \
-        channel-rejoin.h \
-        irc.h \
-        irc-channels.h \
-	irc-chatnets.h \
-	irc-commands.h \
-        irc-masks.h \
-        irc-nicklist.h \
-        irc-queries.h \
-        irc-servers.h \
-        irc-servers-setup.h \
-        irc-cap.h \
-        sasl.h \
-        modes.h \
-        mode-lists.h \
-	module.h \
-        netsplit.h \
-        servers-idle.h \
-        servers-redirect.h
-
-EXTRA_DIST = meson.build
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
deleted file mode 100644
index c5592f7f..00000000
--- a/src/irc/dcc/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-noinst_LIBRARIES = libirc_dcc.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-libirc_dcc_a_SOURCES = \
-	dcc.c \
-	dcc-chat.c \
-	dcc-get.c \
-	dcc-send.c \
-	dcc-resume.c \
-	dcc-autoget.c \
-	dcc-queue.c \
-	dcc-server.c
-
-pkginc_irc_dccdir=$(pkgincludedir)/src/irc/dcc
-pkginc_irc_dcc_HEADERS = \
-	dcc-rec.h \
-	dcc-file-rec.h \
-	dcc.h \
-	dcc-file.h \
-	dcc-chat.h \
-	dcc-get.h \
-	dcc-send.h \
-	dcc-queue.h \
-	module.h \
-	dcc-server.h
-
-EXTRA_DIST = meson.build
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
deleted file mode 100644
index 4b37cede..00000000
--- a/src/irc/flood/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-noinst_LIBRARIES = libirc_flood.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-libirc_flood_a_SOURCES = \
-	autoignore.c \
-	flood.c
-
-pkginc_irc_flooddir=$(pkgincludedir)/src/irc/flood
-pkginc_irc_flood_HEADERS = \
-	module.h
-
-EXTRA_DIST = meson.build
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
deleted file mode 100644
index 3f913d58..00000000
--- a/src/irc/notifylist/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-noinst_LIBRARIES = libirc_notifylist.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-libirc_notifylist_a_SOURCES = \
-	notifylist.c \
-	notify-commands.c \
-	notify-ison.c \
-	notify-setup.c \
-	notify-whois.c
-
-pkginc_irc_notifylistdir=$(pkgincludedir)/src/irc/notifylist
-pkginc_irc_notifylist_HEADERS = \
-	notifylist.h \
-	notify-setup.h \
-	module.h
-
-EXTRA_DIST = meson.build
diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am
deleted file mode 100644
index 437a6dc0..00000000
--- a/src/irc/proxy/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-moduledir = $(libdir)/irssi/modules
-module_LTLIBRARIES = libirc_proxy.la
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-libirc_proxy.a:
-	rm -f libirc_proxy.a
-	$(LN_S) .libs/libirc_proxy.a libirc_proxy.a
-
-libirc_proxy_la_LDFLAGS = -module -avoid-version
-
-libirc_proxy_la_DEPENDENCIES = libirc_proxy.a
-
-libirc_proxy_la_SOURCES = \
-	proxy.c \
-	dump.c \
-	listen.c
-
-noinst_HEADERS = \
-	module.h \
-	proxy.h
-
-clean-generic:
-	rm -f libirc_proxy.a
-
-EXTRA_DIST = meson.build
diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am
deleted file mode 100644
index cd319edb..00000000
--- a/src/lib-config/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-noinst_LIBRARIES = libirssi_config.a
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-libirssi_config_a_SOURCES = \
-	get.c \
-	set.c \
-	parse.c \
-	write.c
-
-pkginc_lib_configdir=$(pkgincludedir)/src/lib-config
-pkginc_lib_config_HEADERS = \
-	iconfig.h \
-	module.h
-
-EXTRA_DIST = meson.build
diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am
deleted file mode 100644
index b9b82d9a..00000000
--- a/src/otr/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-moduledir = $(libdir)/irssi/modules
-
-module_LTLIBRARIES = $(otr_module_lib)
-noinst_LTLIBRARIES = $(otr_static_lib)
-
-EXTRA_LTLIBRARIES = \
-	libotr_core.la \
-	libotr_core_static.la
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	$(OTR_CFLAGS)
-
-libotr_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
-libotr_core_la_LIBADD = $(OTR_LDFLAGS)
-
-otr_sources = \
-	key.c \
-	otr-module.c \
-	otr-formats.c \
-	otr-ops.c \
-	otr-fe.c \
-	otr.c
-
-libotr_core_la_SOURCES = \
-	$(otr_sources)
-
-libotr_core_static_la_SOURCES = \
-	$(otr_sources)
-
-noinst_HEADERS = \
-	irssi-otr.h \
-	key.h \
-	module.h \
-	otr-formats.h \
-	otr-fe.h \
-	otr.h
-
-EXTRA_DIST = meson.build
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
deleted file mode 100644
index ca81d3c6..00000000
--- a/src/perl/Makefile.am
+++ /dev/null
@@ -1,170 +0,0 @@
-moduledir = $(libdir)/irssi/modules
-
-perl_dirs = common irc ui textui
-
-module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib)
-noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib)
-EXTRA_LTLIBRARIES = \
-	libperl_core.la libfe_perl.la \
-	libperl_core_static.la libfe_perl_static.la
-
-libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
-libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
-
-perl-core.lo: irssi-core.pl.h
-perl-signals.lo: perl-signals-list.h
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	-I$(builddir) \
-	$(GLIB_CFLAGS) \
-	-DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \
-	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
-	-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
-	$(PERL_CFLAGS)
-
-perl_sources = \
-	perl-core.c \
-	perl-common.c \
-	perl-signals.c \
-	perl-sources.c
-
-perl_fe_sources = \
-	module-formats.c \
-	perl-fe.c
-
-noinst_HEADERS = \
-	module.h \
-	module-fe.h \
-	module-formats.h \
-	perl-core.h \
-	perl-common.h \
-	perl-signals.h \
-	perl-sources.h
-
-libperl_core_la_SOURCES = \
-	$(perl_sources)
-
-libperl_core_static_la_SOURCES = \
-	$(perl_sources)
-
-libfe_perl_la_SOURCES = \
-	$(perl_fe_sources)
-
-libfe_perl_static_la_SOURCES = \
-	$(perl_fe_sources)
-
-perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl
-	cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals-list.h
-
-irssi-core.pl.h: irssi-core.pl
-	$(top_srcdir)/utils/file2header.sh $(srcdir)/irssi-core.pl irssi_core_code > irssi-core.pl.h
-
-common_sources = \
-	common/Irssi.xs \
-	common/Irssi.pm \
-	common/Channel.xs \
-	common/Core.xs \
-	common/Expando.xs \
-	common/Ignore.xs \
-	common/Log.xs \
-	common/Masks.xs \
-	common/Query.xs \
-	common/Rawlog.xs \
-	common/Server.xs \
-	common/Settings.xs \
-	common/Makefile.PL.in \
-	common/typemap \
-	common/module.h
-
-irc_sources = \
-	irc/Irc.xs \
-	irc/Irc.pm \
-	irc/Dcc.xs \
-	irc/Channel.xs \
-	irc/Ctcp.xs \
-	irc/Query.xs \
-	irc/Server.xs \
-	irc/Modes.xs \
-	irc/Netsplit.xs \
-	irc/Notifylist.xs \
-	irc/Client.xs \
-	irc/Makefile.PL.in \
-	irc/typemap \
-	irc/module.h
-
-ui_sources = \
-	ui/UI.xs \
-	ui/UI.pm \
-	ui/Formats.xs \
-	ui/Themes.xs \
-	ui/Window.xs \
-	ui/Makefile.PL.in \
-	ui/typemap \
-	ui/module.h
-
-textui_sources = \
-	textui/TextUI.xs \
-	textui/TextUI.pm \
-	textui/TextBuffer.xs \
-	textui/TextBufferView.xs \
-	textui/Statusbar.xs \
-	textui/Makefile.PL.in \
-	textui/wrapper_buffer_line.h \
-	textui/typemap \
-	textui/module.h
-
-EXTRA_DIST = \
-	get-signals.pl \
-	irssi-core.pl \
-	Makefile_silent.pm \
-	$(common_sources) \
-	$(irc_sources) \
-	$(ui_sources) \
-	$(textui_sources) \
-	meson.build \
-	common/meson.build \
-	irc/meson.build \
-	ui/meson.build \
-	textui/meson.build
-
-am_v_pl__show_gen = $(am__v_pl__show_gen_$(V))
-am_v_pl__hide_gen = $(am__v_pl__hide_gen_$(V))
-am__v_pl__show_gen_ = $(am__v_pl__show_gen_$(AM_DEFAULT_VERBOSITY))
-am__v_pl__hide_gen_ = $(am__v_pl__hide_gen_$(AM_DEFAULT_VERBOSITY))
-am__v_pl__show_gen_0 = echo "  GEN     " $$dir ;
-am__v_pl__hide_gen_0 = > /dev/null
-am__v_pl__show_gen_1 = 
-am__v_pl__hide_gen_1 = 
-
-all-local:
-	$(AM_V_GEN)for dir in $(perl_dirs); do \
-	  cd $$dir && \
-	  if [ ! -f Makefile ]; then \
-	    $(am_v_pl__show_gen)$(perlpath) Makefile.PL $(PERL_MM_PARAMS) $(am_v_pl__hide_gen); \
-	  fi && \
-	  ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
-	   $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
-	  cd ..; \
-	done
-
-install-exec-local:
-	for dir in $(perl_dirs); do \
-	  cd $$dir && $(MAKE) install && cd ..; \
-	done
-
-clean-generic:
-	for dir in $(perl_dirs); do \
-	  cd $$dir; \
-	  $(MAKE) clean; \
-	  cd ..; \
-	done
-
-distclean-generic:
-	for dir in $(perl_dirs); do \
-	  cd $$dir; \
-	  $(MAKE) realclean; rm -f Makefile.PL Makefile; \
-	  cd ..; \
-	done
-
-libperl_core_la_LIBADD = $(PERL_LDFLAGS)
diff --git a/src/perl/Makefile_silent.pm b/src/perl/Makefile_silent.pm
deleted file mode 100644
index b5d71d66..00000000
--- a/src/perl/Makefile_silent.pm
+++ /dev/null
@@ -1,76 +0,0 @@
-push @ExtUtils::MakeMaker::Overridable, qw(pm_to_blib);
-my $verb = $AM_DEFAULT_VERBOSITY;
-{ package MY;
-    sub _center {
-	my $z = shift;
-	(length $z == 2 ? "  $z   " : length $z == 4 ? " $z  " : " $z ").'   '
-    }
-    sub _silent_cmd {
-	my $z = shift;
-	$z =~ s{\t(?:- ?)?\K(?=\$\((?|(CC)CMD|(XS)UBPPRUN|(LD|MV|CHMOD)|(RM)_R?F|(CP)_NONEMPTY|FULL_(AR)\)))}{\$(PL_AM_V_$1)}g;
-	$z
-    }
-    sub c_o { _silent_cmd(shift->SUPER::c_o(@_)) }
-    sub xs_c { _silent_cmd(shift->SUPER::xs_c(@_)) }
-    sub xs_o { _silent_cmd(shift->SUPER::xs_o(@_)) }
-    sub dynamic_lib { _silent_cmd(shift->SUPER::dynamic_lib(@_)) }
-    sub static_lib { _silent_cmd(shift->SUPER::static_lib(@_)) }
-    sub dynamic_bs {
-	my $ret = shift->SUPER::dynamic_bs(@_);
-	$ret =~ s{Running Mkbootstrap for}{\$(PL_AM_V_BS_Text)}g;
-	_silent_cmd($ret)
-    }
-    sub pm_to_blib {
-	my $ret = shift->SUPER::pm_to_blib(@_);
-	$ret =~ s{^(\t(?:- ?)?)(?:\$\(NOECHO\) ?)?(.*-e ['"]pm_to_blib(.*\\\n)*.*)$}{$1\$(PL_AM_V_BLIB)$2\$(PL_AM_V_BLIB_Hide)}mg;
-	$ret
-    }
-    sub post_constants {
-	my $ret = shift->SUPER::post_constants(@_);
-	my @terse = qw(cc xs ld chmod cp ar blib);
-	my @silent = qw(mv rm);
-	my @special = qw(BLIB_Hide);
-
-	#default verbosity from command line parameter
-	$ret .= "
-AM_DEFAULT_VERBOSITY = @{[$verb ? 1 : 0]}
-";
-	#default options forward
-	$ret .= "
-PL_AM_V_${_} = \$(pl_am__v_${_}_\$(V))
-pl_am__v_${_}_ = \$(pl_am__v_${_}_\$(AM_DEFAULT_VERBOSITY))
-" for @special, map uc, @terse, @silent;
-
-	#quoted plain text needs extra quotes
-	$ret .= "
-PL_AM_V_BS_Text = \"\$(pl_am__v_BS_Text_\$(V))\"
-pl_am__v_BS_Text_ = \$(pl_am__v_BS_Text_\$(AM_DEFAULT_VERBOSITY))
-"
-	#hide pm_to_blib output
-. "
-pl_am__v_BLIB_Hide_0 = \$(DEV_NULL)
-pl_am__v_BLIB_Hide_1 = 
-"
-	#text for Mkbootstrap
-. "
-pl_am__v_BS_Text_0 = \"@{[_center('BS')]}\"
-pl_am__v_BS_Text_1 = \"Running Mkbootstrap for\"
-";
-	#"terse" output
-	$ret .= "
-pl_am__v_${_}_0 = \$(NOECHO)echo \"@{[_center($_)]}\" \$\@;
-" for map uc, @terse;
-
-	#no output
-	$ret .= "
-pl_am__v_${_}_0 = \$(NOECHO)
-" for map uc, @silent;
-
-	#in verbose mode the "terse" echo expands to nothing
-	$ret .= "
-pl_am__v_${_}_1 = 
-" for map uc, @terse, @silent;
-	$ret
-    }
-}
-1;
diff --git a/src/perl/common/Makefile.PL.in b/src/perl/common/Makefile.PL.in
deleted file mode 100644
index 2b087d08..00000000
--- a/src/perl/common/Makefile.PL.in
+++ /dev/null
@@ -1,7 +0,0 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
-
-WriteMakefile('NAME' => 'Irssi',
-              'LIBS' => '',
-	      'OBJECT' => '$(O_FILES)',
-              'INC' => '-I../../.. @GLIB_CFLAGS@',
-	      'VERSION_FROM' => '@srcdir@/Irssi.pm');
diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in
deleted file mode 100644
index 561308c7..00000000
--- a/src/perl/irc/Makefile.PL.in
+++ /dev/null
@@ -1,8 +0,0 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
-
-WriteMakefile('NAME' => 'Irssi::Irc',
-              'LIBS' => '',
-	      'OBJECT' => '$(O_FILES)',
-              'TYPEMAPS' => ['../common/typemap'],
-              'INC' => '-I../../.. @GLIB_CFLAGS@',
-	      'VERSION_FROM' => '@srcdir@/Irc.pm');
diff --git a/src/perl/textui/Makefile.PL.in b/src/perl/textui/Makefile.PL.in
deleted file mode 100644
index 2b0a148a..00000000
--- a/src/perl/textui/Makefile.PL.in
+++ /dev/null
@@ -1,8 +0,0 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
-
-WriteMakefile('NAME' => 'Irssi::TextUI',
-              'LIBS' => '',
-	      'OBJECT' => '$(O_FILES)',
-              'TYPEMAPS' => ['../common/typemap', '../ui/typemap'],
-              'INC' => '-I../../.. @GLIB_CFLAGS@',
-	      'VERSION_FROM' => '@srcdir@/TextUI.pm');
diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in
deleted file mode 100644
index 9507e74d..00000000
--- a/src/perl/ui/Makefile.PL.in
+++ /dev/null
@@ -1,8 +0,0 @@
-use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm";
-
-WriteMakefile('NAME' => 'Irssi::UI',
-              'LIBS' => '',
-	      'OBJECT' => '$(O_FILES)',
-              'TYPEMAPS' => ['../common/typemap'],
-              'INC' => '-I../../.. @GLIB_CFLAGS@',
-	      'VERSION_FROM' => '@srcdir@/UI.pm');
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 0799ee3f..00000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if BUILD_TEXTUI
-TEXTUI=fe-text
-endif
-
-SUBDIRS = fe-common irc $(TEXTUI)
-
-EXTRA_DIST = meson.build
diff --git a/tests/fe-common/Makefile.am b/tests/fe-common/Makefile.am
deleted file mode 100644
index 74f13119..00000000
--- a/tests/fe-common/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = core
-
-EXTRA_DIST = meson.build
diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am
deleted file mode 100644
index 15287601..00000000
--- a/tests/fe-common/core/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-include $(top_srcdir)/utils/glib-tap.mk
-
-PACKAGE_STRING=fe-common/core
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-test_programs = test-formats
-
-test_formats_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-test_formats_DEPENDENCIES = \
-	../../../src/core/libcore.a \
-	../../../src/lib-config/libirssi_config.a
-
-test_formats_LDADD = \
-	../../../src/fe-common/core/libfe_common_core.a \
-	../../../src/core/libcore.a \
-	../../../src/lib-config/libirssi_config.a \
-	@PROG_LIBS@
-
-test_formats_SOURCES = \
-	test-formats.c
-
-EXTRA_DIST += meson.build
diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am
deleted file mode 100644
index a0e1d0f5..00000000
--- a/tests/fe-text/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-include $(top_srcdir)/utils/glib-tap.mk
-
-PACKAGE_STRING=fe-text
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-test_programs = test-paste-join-multiline
-
-test_paste_join_multiline_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-# test_paste_join_multiline_DEPENDENCIES =
-
-test_paste_join_multiline_LDADD = \
-        ../../src/fe-common/core/libfe_common_core.a \
-        ../../src/core/libcore.a \
-        ../../src/lib-config/libirssi_config.a \
-	@PROG_LIBS@ \
-	@TEXTUI_LIBS@
-
-
-test_paste_join_multiline_SOURCES = \
-	../../src/fe-text/gui-entry.c \
-	../../src/fe-text/mainwindows.c \
-	../../src/fe-text/term-terminfo.c \
-	../../src/fe-text/terminfo-core.c \
-	../../src/fe-text/term.c \
-	../../src/fe-text/textbuffer-formats.c \
-	../../src/fe-text/textbuffer-view.c \
-	../../src/fe-text/textbuffer.c \
-	../../src/fe-text/gui-windows.c \
-	../../src/fe-text/gui-printtext.c \
-	mock-irssi.c \
-	test-paste-join-multiline.c
-
-EXTRA_DIST += meson.build
diff --git a/tests/irc/Makefile.am b/tests/irc/Makefile.am
deleted file mode 100644
index 88adb5b9..00000000
--- a/tests/irc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = \
-	core \
-	flood
-
-EXTRA_DIST = meson.build
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
deleted file mode 100644
index 503989a9..00000000
--- a/tests/irc/core/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-include $(top_srcdir)/utils/glib-tap.mk
-
-PACKAGE_STRING=irc/core
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	$(GLIB_CFLAGS)
-
-test_programs = test-channel-events test-irc
-
-CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-DEPENDENCIES = \
-	../../../src/core/libcore.a \
-	../../../src/lib-config/libirssi_config.a
-
-LDADD = \
-	../../../src/irc/core/libirc_core.a \
-	../../../src/core/libcore.a \
-	../../../src/lib-config/libirssi_config.a \
-	@PROG_LIBS@
-
-test_channel_events_SOURCES = \
-	test-channel-events.c
-
-test_irc_SOURCES = \
-	test-irc.c
-
-EXTRA_DIST += meson.build
diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
deleted file mode 100644
index 6c4eec84..00000000
--- a/tests/irc/flood/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-include $(top_srcdir)/utils/glib-tap.mk
-
-PACKAGE_STRING=irc/flood
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	$(GLIB_CFLAGS)
-
-test_programs = \
-	test-796
-
-test_796_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-test_796_DEPENDENCIES = \
-	../../../src/core/libcore.a \
-	../../../src/lib-config/libirssi_config.a
-
-test_796_LDADD = \
-	../../../src/irc/libirc.a \
-	../../../src/fe-common/irc/libfe_common_irc.a \
-	../../../src/fe-common/irc/dcc/libfe_irc_dcc.a \
-	../../../src/fe-common/irc/notifylist/libfe_irc_notifylist.a \
-	../../../src/irc/dcc/libirc_dcc.a \
-	../../../src/irc/notifylist/libirc_notifylist.a \
-	../../../src/irc/flood/libirc_flood.a \
-	../../../src/irc/core/libirc_core.a \
-	../../../src/fe-common/core/libfe_common_core.a \
-	../../../src/core/libcore.a \
-	../../../src/lib-config/libirssi_config.a \
-	@PROG_LIBS@
-
-test_796_SOURCES = \
-	test-796.c
-
-EXTRA_DIST += meson.build
diff --git a/themes/Makefile.am b/themes/Makefile.am
deleted file mode 100644
index c8814532..00000000
--- a/themes/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-themedir = $(datadir)/irssi/themes
-theme_DATA = default.theme colorless.theme
-
-EXTRA_DIST = \
-	$(theme_DATA) \
-	meson.build
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index 8af5c8f7..00000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = \
-	file2header.sh \
-	irssi-version.sh \
-	syntax.pl \
-	tap-driver.sh \
-	tap-test
diff --git a/utils/check-perl-hash.sh b/utils/check-perl-hash.sh
new file mode 100755
index 00000000..208257e9
--- /dev/null
+++ b/utils/check-perl-hash.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# make sure perl hashes have correct length
+find src/perl \( -name '*.c' -o -name '*.xs' \) -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }'
diff --git a/utils/file2header.sh b/utils/file2header.sh
index f25ae13b..174d3d13 100755
--- a/utils/file2header.sh
+++ b/utils/file2header.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 echo "const char *$2 ="
-cat $1|sed 's/\\/\\\\/g'|sed 's/"/\\"/g'|sed 's/^/\"/'|sed 's/$/\\n\"/'
+sed 's/\\/\\\\/g;s/"/\\"/g;s/^/\"/;s/$/\\n\"/' "$1"
 echo ";"
diff --git a/utils/glib-tap.mk b/utils/glib-tap.mk
deleted file mode 100644
index 582f6d29..00000000
--- a/utils/glib-tap.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-# GLIB - Library of useful C routines
-
-TESTS_ENVIRONMENT= \
-	G_TEST_SRCDIR="$(abs_srcdir)" 		\
-	G_TEST_BUILDDIR="$(abs_builddir)" 	\
-	G_DEBUG=gc-friendly 			\
-	MALLOC_CHECK_=2 			\
-	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/utils/tap-driver.sh
-LOG_COMPILER = $(top_srcdir)/utils/tap-test
-
-NULL =
-
-# initialize variables for unconditional += appending
-BUILT_SOURCES =
-BUILT_EXTRA_DIST =
-CLEANFILES = *.log *.trs
-DISTCLEANFILES =
-MAINTAINERCLEANFILES =
-EXTRA_DIST =
-TESTS =
-
-installed_test_LTLIBRARIES =
-installed_test_PROGRAMS =
-installed_test_SCRIPTS =
-nobase_installed_test_DATA =
-
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-noinst_SCRIPTS =
-noinst_DATA =
-
-check_LTLIBRARIES =
-check_PROGRAMS =
-check_SCRIPTS =
-check_DATA =
-
-# We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
-# will belong in exactly one of the following variables.
-#
-# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
-#
-#   test_programs, test_scripts, test_data, test_ltlibraries
-#
-# The above are used to list files that are involved in both uninstalled and installed testing.  The
-# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
-# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
-# installed in the same way as it appears in the package layout.
-#
-# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
-# like so:
-#
-#   installed_test_programs, uninstalled_test_programs
-#   installed_test_scripts, uninstalled_test_scripts
-#   installed_test_data, uninstalled_test_data
-#   installed_test_ltlibraries, uninstalled_test_ltlibraries
-#
-# Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
-# that should not themselves be run as testcases (but exist to be used from other testcases):
-#
-#   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
-#   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
-#
-# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
-# file automatically end up in the tarball.
-#
-#   dist_test_scripts, dist_test_data, dist_test_extra_scripts
-#   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
-#   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
-#
-# Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
-# standard automake convention of not disting programs scripts or data by default.
-#
-# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
-# variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
-# gtester.  That's a bit strange for scripts, but it's possible.
-
-TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
-         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
-
-# Note: build even the installed-only targets during 'make check' to ensure that they still work.
-# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
-# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
-# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
-all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
-                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
-all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
-                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
-all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
-                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
-all_test_scripts     += $(all_dist_test_scripts)
-EXTRA_DIST           += $(all_dist_test_scripts)
-all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
-all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
-all_test_data        += $(all_dist_test_data)
-EXTRA_DIST           += $(all_dist_test_data)
-all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
-
-if ENABLE_ALWAYS_BUILD_TESTS
-noinst_LTLIBRARIES += $(all_test_ltlibs)
-noinst_PROGRAMS += $(all_test_programs)
-noinst_SCRIPTS += $(all_test_scripts)
-noinst_DATA += $(all_test_data)
-else
-check_LTLIBRARIES += $(all_test_ltlibs)
-check_PROGRAMS += $(all_test_programs)
-check_SCRIPTS += $(all_test_scripts)
-check_DATA += $(all_test_data)
-endif
-
-if ENABLE_INSTALLED_TESTS
-installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
-                          $(test_extra_programs) $(installed_test_extra_programs)
-installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
-                          $(test_extra_scripts) $(test_installed_extra_scripts)
-installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
-                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
-nobase_installed_test_DATA += $(test_data) $(installed_test_data)
-nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
-installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
-installed_testcases = $(test_programs) $(installed_test_programs) \
-                      $(test_scripts) $(installed_test_scripts) \
-                      $(dist_test_scripts) $(dist_installed_test_scripts)
-
-installed_test_meta_DATA = $(installed_testcases:=.test)
-
-%.test: %$(EXEEXT) Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session' >> $@.tmp; \
-	echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
-	mv $@.tmp $@)
-
-CLEANFILES += $(installed_test_meta_DATA)
-endif
diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index b096fd90..aa3b6442 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
 
-DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null`
+DATE=$(GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null)
 
-VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
-VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`
+VERSION_DATE=$(echo "$DATE" | cut -f 1 -d ' ' | tr -d -)
+VERSION_TIME=$(echo "$DATE" | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}')
 
 if test -z "$VERSION_DATE"; then
-    DATE=`grep '^v' $1/NEWS | head -1`
-    VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
+    DATE=$(grep '^v' "$1"/NEWS | head -1)
+    VERSION_DATE=$(echo "$DATE" | cut -f 2 -d ' ' | tr -d -)
     case $VERSION_DATE in
 	*xx)
-	    VERSION_DATE=`date +%Y%m%d`
+	    VERSION_DATE=$(date +%Y%m%d)
 	;;
     esac
-    VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '`
-    VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null`
+    VERSION_TIME=$(echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' ')
+    VERSION_TIME=$(printf %d%d%02d $VERSION_TIME 2>/dev/null)
 fi
 
 echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
diff --git a/utils/make-dist.sh b/utils/make-dist.sh
new file mode 100755
index 00000000..d156255a
--- /dev/null
+++ b/utils/make-dist.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Run this to create a distribution tarball from a git checkout
+
+set -e
+
+PKG_NAME="Irssi"
+
+repo_root="$(git rev-parse --show-toplevel)"
+dist_tmp="$repo_root/${PKG_NAME}-Dist"
+
+if [ -z "$repo_root" ]; then
+    echo "**Error**: ${PKG_NAME} make-dist.sh must be run in a git clone, cannot proceed."
+    exit 1
+fi
+
+if [ ! -f "$repo_root"/irssi.conf ]; then
+    echo -n "**Error**: Directory \`$repo_root' does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+fi
+
+cd "$repo_root"
+./utils/check-perl-hash.sh
+
+rm -fr "$dist_tmp"
+git clone --no-local "$repo_root" "$dist_tmp"
+cd "$dist_tmp"
+if [ ! -f meson.build ]; then
+    echo "**Error**: ${PKG_NAME} make-dist.sh could not find meson.build, cannot proceed."
+    exit 1
+fi
+
+name=$(perl -0777 -n -e "m{project\\(\\s*'(.*?)'}s and print \$1 and exit" meson.build)
+version=$(perl -0777 -n -e "m{project\\(.*?,\\s*version\\s*:\\s*'(.*?)'}s and print \$1 and exit" meson.build)
+if [ -z "$name" ] || [ -z "$version" ]; then
+    echo "**Error**: ${PKG_NAME} make-dist.sh could not find either name or version, cannot proceed."
+    exit 1
+fi
+
+cat <<SETUP_CFG >setup.cfg
+[metadata]
+name = $name
+version = $version
+url = https://ailin-nemui.github.io/irssi/
+maintainer = Ailin Nemui
+license = GNU General Public License v2 or later (GPLv2+)
+
+SETUP_CFG
+python3 -c 'from setuptools import *;setup()' sdist --formats=tar
+
+tar --delete --file "dist/$name-$version.tar" \
+    "$name-$version/setup.cfg" \
+    "$name-$version/$name.egg-info" \
+    "$name-$version/PKG-INFO"
+
+xz -k "dist/$name-$version.tar"
+gzip -k "dist/$name-$version.tar"
+
+mv -v dist/*.tar.* "$repo_root"
+cd "$repo_root"
+# rm -fr "$dist_tmp"
diff --git a/utils/syncdocs.sh b/utils/syncdocs.sh
index fb88393b..77ac93bf 100755
--- a/utils/syncdocs.sh
+++ b/utils/syncdocs.sh
@@ -19,7 +19,7 @@ srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 srcdir="$srcdir"/..
 
-if test ! -f "$srcdir"/configure.ac; then
+if test ! -f "$srcdir"/irssi.conf; then
     echo -n "**Error**: Directory \`$srcdir' does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/utils/syncscripts.sh b/utils/syncscripts.sh
index 533b77cc..5df1d036 100755
--- a/utils/syncscripts.sh
+++ b/utils/syncscripts.sh
@@ -9,7 +9,7 @@ srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 srcdir="$srcdir"/..
 
-if test ! -f "$srcdir"/configure.ac; then
+if test ! -f "$srcdir"/irssi.conf; then
     echo -n "**Error**: Directory \`$srcdir' does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/utils/tap-driver.sh b/utils/tap-driver.sh
deleted file mode 100755
index 19aa531d..00000000
--- a/utils/tap-driver.sh
+++ /dev/null
@@ -1,652 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-scriptversion=2011-12-27.17; # UTC
-
-# Make unconditional expansion of undefined variables an error.  This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-me=tap-driver.sh
-
-fatal ()
-{
-  echo "$me: fatal: $*" >&2
-  exit 1
-}
-
-usage_error ()
-{
-  echo "$me: $*" >&2
-  print_usage >&2
-  exit 2
-}
-
-print_usage ()
-{
-  cat <<END
-Usage:
-  tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
-                [--expect-failure={yes|no}] [--color-tests={yes|no}]
-                [--enable-hard-errors={yes|no}] [--ignore-exit]
-                [--diagnostic-string=STRING] [--merge|--no-merge]
-                [--comments|--no-comments] [--] TEST-COMMAND
-The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
-END
-}
-
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
-test_name= # Used for reporting.
-log_file=  # Where to save the result and output of the test script.
-trs_file=  # Where to save the metadata of the test run.
-expect_failure=0
-color_tests=0
-merge=0
-ignore_exit=0
-comments=0
-diag_string='#'
-while test $# -gt 0; do
-  case $1 in
-  --help) print_usage; exit $?;;
-  --version) echo "$me $scriptversion"; exit $?;;
-  --test-name) test_name=$2; shift;;
-  --log-file) log_file=$2; shift;;
-  --trs-file) trs_file=$2; shift;;
-  --color-tests) color_tests=$2; shift;;
-  --expect-failure) expect_failure=$2; shift;;
-  --enable-hard-errors) shift;; # No-op.
-  --merge) merge=1;;
-  --no-merge) merge=0;;
-  --ignore-exit) ignore_exit=1;;
-  --comments) comments=1;;
-  --no-comments) comments=0;;
-  --diagnostic-string) diag_string=$2; shift;;
-  --) shift; break;;
-  -*) usage_error "invalid option: '$1'";;
-  esac
-  shift
-done
-
-test $# -gt 0 || usage_error "missing test command"
-
-case $expect_failure in
-  yes) expect_failure=1;;
-    *) expect_failure=0;;
-esac
-
-if test $color_tests = yes; then
-  init_colors='
-    color_map["red"]="" # Red.
-    color_map["grn"]="" # Green.
-    color_map["lgn"]="" # Light green.
-    color_map["blu"]="" # Blue.
-    color_map["mgn"]="" # Magenta.
-    color_map["std"]=""     # No color.
-    color_for_result["ERROR"] = "mgn"
-    color_for_result["PASS"]  = "grn"
-    color_for_result["XPASS"] = "red"
-    color_for_result["FAIL"]  = "red"
-    color_for_result["XFAIL"] = "lgn"
-    color_for_result["SKIP"]  = "blu"'
-else
-  init_colors=''
-fi
-
-# :; is there to work around a bug in bash 3.2 (and earlier) which
-# does not always set '$?' properly on redirection failure.
-# See the Autoconf manual for more details.
-:;{
-  (
-    # Ignore common signals (in this subshell only!), to avoid potential
-    # problems with Korn shells.  Some Korn shells are known to propagate
-    # to themselves signals that have killed a child process they were
-    # waiting for; this is done at least for SIGINT (and usually only for
-    # it, in truth).  Without the `trap' below, such a behaviour could
-    # cause a premature exit in the current subshell, e.g., in case the
-    # test command it runs gets terminated by a SIGINT.  Thus, the awk
-    # script we are piping into would never seen the exit status it
-    # expects on its last input line (which is displayed below by the
-    # last `echo $?' statement), and would thus die reporting an internal
-    # error.
-    # For more information, see the Autoconf manual and the threads:
-    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
-    # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
-    trap : 1 3 2 13 15
-    if test $merge -gt 0; then
-      exec 2>&1
-    else
-      exec 2>&3
-    fi
-    "$@"
-    echo $?
-  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
-        -v me="$me" \
-        -v test_script_name="$test_name" \
-        -v log_file="$log_file" \
-        -v trs_file="$trs_file" \
-        -v expect_failure="$expect_failure" \
-        -v merge="$merge" \
-        -v ignore_exit="$ignore_exit" \
-        -v comments="$comments" \
-        -v diag_string="$diag_string" \
-'
-# FIXME: the usages of "cat >&3" below could be optimized when using
-# FIXME: GNU awk, and/on on systems that supports /dev/fd/.
-
-# Implementation note: in what follows, `result_obj` will be an
-# associative array that (partly) simulates a TAP result object
-# from the `TAP::Parser` perl module.
-
-## ----------- ##
-##  FUNCTIONS  ##
-## ----------- ##
-
-function fatal(msg)
-{
-  print me ": " msg | "cat >&2"
-  exit 1
-}
-
-function abort(where)
-{
-  fatal("internal error " where)
-}
-
-# Convert a boolean to a "yes"/"no" string.
-function yn(bool)
-{
-  return bool ? "yes" : "no";
-}
-
-function add_test_result(result)
-{
-  if (!test_results_index)
-    test_results_index = 0
-  test_results_list[test_results_index] = result
-  test_results_index += 1
-  test_results_seen[result] = 1;
-}
-
-# Whether the test script should be re-run by "make recheck".
-function must_recheck()
-{
-  for (k in test_results_seen)
-    if (k != "XFAIL" && k != "PASS" && k != "SKIP")
-      return 1
-  return 0
-}
-
-# Whether the content of the log file associated to this test should
-# be copied into the "global" test-suite.log.
-function copy_in_global_log()
-{
-  for (k in test_results_seen)
-    if (k != "PASS")
-      return 1
-  return 0
-}
-
-# FIXME: this can certainly be improved ...
-function get_global_test_result()
-{
-    if ("ERROR" in test_results_seen)
-      return "ERROR"
-    if ("FAIL" in test_results_seen || "XPASS" in test_results_seen)
-      return "FAIL"
-    all_skipped = 1
-    for (k in test_results_seen)
-      if (k != "SKIP")
-        all_skipped = 0
-    if (all_skipped)
-      return "SKIP"
-    return "PASS";
-}
-
-function stringify_result_obj(result_obj)
-{
-  if (result_obj["is_unplanned"] || result_obj["number"] != testno)
-    return "ERROR"
-
-  if (plan_seen == LATE_PLAN)
-    return "ERROR"
-
-  if (result_obj["directive"] == "TODO")
-    return result_obj["is_ok"] ? "XPASS" : "XFAIL"
-
-  if (result_obj["directive"] == "SKIP")
-    return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL;
-
-  if (length(result_obj["directive"]))
-      abort("in function stringify_result_obj()")
-
-  return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL
-}
-
-function decorate_result(result)
-{
-  color_name = color_for_result[result]
-  if (color_name)
-    return color_map[color_name] "" result "" color_map["std"]
-  # If we are not using colorized output, or if we do not know how
-  # to colorize the given result, we should return it unchanged.
-  return result
-}
-
-function report(result, details)
-{
-  if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/)
-    {
-      msg = ": " test_script_name
-      add_test_result(result)
-    }
-  else if (result == "#")
-    {
-      msg = " " test_script_name ":"
-    }
-  else
-    {
-      abort("in function report()")
-    }
-  if (length(details))
-    msg = msg " " details
-  # Output on console might be colorized.
-  print decorate_result(result) msg
-  # Log the result in the log file too, to help debugging (this is
-  # especially true when said result is a TAP error or "Bail out!").
-  print result msg | "cat >&3";
-}
-
-function testsuite_error(error_message)
-{
-  report("ERROR", "- " error_message)
-}
-
-function handle_tap_result()
-{
-  details = result_obj["number"];
-  if (length(result_obj["description"]))
-    details = details " " result_obj["description"]
-
-  if (plan_seen == LATE_PLAN)
-    {
-      details = details " # AFTER LATE PLAN";
-    }
-  else if (result_obj["is_unplanned"])
-    {
-       details = details " # UNPLANNED";
-    }
-  else if (result_obj["number"] != testno)
-    {
-       details = sprintf("%s # OUT-OF-ORDER (expecting %d)",
-                         details, testno);
-    }
-  else if (result_obj["directive"])
-    {
-      details = details " # " result_obj["directive"];
-      if (length(result_obj["explanation"]))
-        details = details " " result_obj["explanation"]
-    }
-
-  report(stringify_result_obj(result_obj), details)
-}
-
-# `skip_reason` should be empty whenever planned > 0.
-function handle_tap_plan(planned, skip_reason)
-{
-  planned += 0 # Avoid getting confused if, say, `planned` is "00"
-  if (length(skip_reason) && planned > 0)
-    abort("in function handle_tap_plan()")
-  if (plan_seen)
-    {
-      # Error, only one plan per stream is acceptable.
-      testsuite_error("multiple test plans")
-      return;
-    }
-  planned_tests = planned
-  # The TAP plan can come before or after *all* the TAP results; we speak
-  # respectively of an "early" or a "late" plan.  If we see the plan line
-  # after at least one TAP result has been seen, assume we have a late
-  # plan; in this case, any further test result seen after the plan will
-  # be flagged as an error.
-  plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN)
-  # If testno > 0, we have an error ("too many tests run") that will be
-  # automatically dealt with later, so do not worry about it here.  If
-  # $plan_seen is true, we have an error due to a repeated plan, and that
-  # has already been dealt with above.  Otherwise, we have a valid "plan
-  # with SKIP" specification, and should report it as a particular kind
-  # of SKIP result.
-  if (planned == 0 && testno == 0)
-    {
-      if (length(skip_reason))
-        skip_reason = "- "  skip_reason;
-      report("SKIP", skip_reason);
-    }
-}
-
-function extract_tap_comment(line)
-{
-  if (index(line, diag_string) == 1)
-    {
-      # Strip leading `diag_string` from `line`.
-      line = substr(line, length(diag_string) + 1)
-      # And strip any leading and trailing whitespace left.
-      sub("^[ \t]*", "", line)
-      sub("[ \t]*$", "", line)
-      # Return what is left (if any).
-      return line;
-    }
-  return "";
-}
-
-# When this function is called, we know that line is a TAP result line,
-# so that it matches the (perl) RE "^(not )?ok\b".
-function setup_result_obj(line)
-{
-  # Get the result, and remove it from the line.
-  result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
-  sub("^(not )?ok[ \t]*", "", line)
-
-  # If the result has an explicit number, get it and strip it; otherwise,
-  # automatically assing the next progresive number to it.
-  if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
-    {
-      match(line, "^[0-9]+")
-      # The final `+ 0` is to normalize numbers with leading zeros.
-      result_obj["number"] = substr(line, 1, RLENGTH) + 0
-      line = substr(line, RLENGTH + 1)
-    }
-  else
-    {
-      result_obj["number"] = testno
-    }
-
-  if (plan_seen == LATE_PLAN)
-    # No further test results are acceptable after a "late" TAP plan
-    # has been seen.
-    result_obj["is_unplanned"] = 1
-  else if (plan_seen && testno > planned_tests)
-    result_obj["is_unplanned"] = 1
-  else
-    result_obj["is_unplanned"] = 0
-
-  # Strip trailing and leading whitespace.
-  sub("^[ \t]*", "", line)
-  sub("[ \t]*$", "", line)
-
-  # This will have to be corrected if we have a "TODO"/"SKIP" directive.
-  result_obj["description"] = line
-  result_obj["directive"] = ""
-  result_obj["explanation"] = ""
-
-  if (index(line, "#") == 0)
-    return # No possible directive, nothing more to do.
-
-  # Directives are case-insensitive.
-  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
-
-  # See whether we have the directive, and if yes, where.
-  pos = match(line, rx "$")
-  if (!pos)
-    pos = match(line, rx "[^a-zA-Z0-9_]")
-
-  # If there was no TAP directive, we have nothing more to do.
-  if (!pos)
-    return
-
-  # Let`s now see if the TAP directive has been escaped.  For example:
-  #  escaped:     ok \# SKIP
-  #  not escaped: ok \\# SKIP
-  #  escaped:     ok \\\\\# SKIP
-  #  not escaped: ok \ # SKIP
-  if (substr(line, pos, 1) == "#")
-    {
-      bslash_count = 0
-      for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--)
-        bslash_count += 1
-      if (bslash_count % 2)
-        return # Directive was escaped.
-    }
-
-  # Strip the directive and its explanation (if any) from the test
-  # description.
-  result_obj["description"] = substr(line, 1, pos - 1)
-  # Now remove the test description from the line, that has been dealt
-  # with already.
-  line = substr(line, pos)
-  # Strip the directive, and save its value (normalized to upper case).
-  sub("^[ \t]*#[ \t]*", "", line)
-  result_obj["directive"] = toupper(substr(line, 1, 4))
-  line = substr(line, 5)
-  # Now get the explanation for the directive (if any), with leading
-  # and trailing whitespace removed.
-  sub("^[ \t]*", "", line)
-  sub("[ \t]*$", "", line)
-  result_obj["explanation"] = line
-}
-
-function get_test_exit_message(status)
-{
-  if (status == 0)
-    return ""
-  if (status !~ /^[1-9][0-9]*$/)
-    abort("getting exit status")
-  if (status < 127)
-    exit_details = ""
-  else if (status == 127)
-    exit_details = " (command not found?)"
-  else if (status >= 128 && status <= 255)
-    exit_details = sprintf(" (terminated by signal %d?)", status - 128)
-  else if (status > 256 && status <= 384)
-    # We used to report an "abnormal termination" here, but some Korn
-    # shells, when a child process die due to signal number n, can leave
-    # in $? an exit status of 256+n instead of the more standard 128+n.
-    # Apparently, both behaviours are allowed by POSIX (2008), so be
-    # prepared to handle them both.  See also Austing Group report ID
-    # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
-    exit_details = sprintf(" (terminated by signal %d?)", status - 256)
-  else
-    # Never seen in practice.
-    exit_details = " (abnormal termination)"
-  return sprintf("exited with status %d%s", status, exit_details)
-}
-
-function write_test_results()
-{
-  print ":global-test-result: " get_global_test_result() > trs_file
-  print ":recheck: "  yn(must_recheck()) > trs_file
-  print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
-  for (i = 0; i < test_results_index; i += 1)
-    print ":test-result: " test_results_list[i] > trs_file
-  close(trs_file);
-}
-
-BEGIN {
-
-## ------- ##
-##  SETUP  ##
-## ------- ##
-
-'"$init_colors"'
-
-# Properly initialized once the TAP plan is seen.
-planned_tests = 0
-
-COOKED_PASS = expect_failure ? "XPASS": "PASS";
-COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
-
-# Enumeration-like constants to remember which kind of plan (if any)
-# has been seen.  It is important that NO_PLAN evaluates "false" as
-# a boolean.
-NO_PLAN = 0
-EARLY_PLAN = 1
-LATE_PLAN = 2
-
-testno = 0     # Number of test results seen so far.
-bailed_out = 0 # Whether a "Bail out!" directive has been seen.
-
-# Whether the TAP plan has been seen or not, and if yes, which kind
-# it is ("early" is seen before any test result, "late" otherwise).
-plan_seen = NO_PLAN
-
-## --------- ##
-##  PARSING  ##
-## --------- ##
-
-is_first_read = 1
-
-while (1)
-  {
-    # Involutions required so that we are able to read the exit status
-    # from the last input line.
-    st = getline
-    if (st < 0) # I/O error.
-      fatal("I/O error while reading from input stream")
-    else if (st == 0) # End-of-input
-      {
-        if (is_first_read)
-          abort("in input loop: only one input line")
-        break
-      }
-    if (is_first_read)
-      {
-        is_first_read = 0
-        nextline = $0
-        continue
-      }
-    else
-      {
-        curline = nextline
-        nextline = $0
-        $0 = curline
-      }
-    # Copy any input line verbatim into the log file.
-    print | "cat >&3"
-    # Parsing of TAP input should stop after a "Bail out!" directive.
-    if (bailed_out)
-      continue
-
-    # TAP test result.
-    if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
-      {
-        testno += 1
-        setup_result_obj($0)
-        handle_tap_result()
-      }
-    # TAP plan (normal or "SKIP" without explanation).
-    else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
-      {
-        # The next two lines will put the number of planned tests in $0.
-        sub("^1\\.\\.", "")
-        sub("[^0-9]*$", "")
-        handle_tap_plan($0, "")
-        continue
-      }
-    # TAP "SKIP" plan, with an explanation.
-    else if ($0 ~ /^1\.\.0+[ \t]*#/)
-      {
-        # The next lines will put the skip explanation in $0, stripping
-        # any leading and trailing whitespace.  This is a little more
-        # tricky in truth, since we want to also strip a potential leading
-        # "SKIP" string from the message.
-        sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
-        sub("[ \t]*$", "");
-        handle_tap_plan(0, $0)
-      }
-    # "Bail out!" magic.
-    # Older versions of prove and TAP::Harness (e.g., 3.17) did not
-    # recognize a "Bail out!" directive when preceded by leading
-    # whitespace, but more modern versions (e.g., 3.23) do.  So we
-    # emulate the latter, "more modern" behaviour.
-    else if ($0 ~ /^[ \t]*Bail out!/)
-      {
-        bailed_out = 1
-        # Get the bailout message (if any), with leading and trailing
-        # whitespace stripped.  The message remains stored in `$0`.
-        sub("^[ \t]*Bail out![ \t]*", "");
-        sub("[ \t]*$", "");
-        # Format the error message for the
-        bailout_message = "Bail out!"
-        if (length($0))
-          bailout_message = bailout_message " " $0
-        testsuite_error(bailout_message)
-      }
-    # Maybe we have too look for dianogtic comments too.
-    else if (comments != 0)
-      {
-        comment = extract_tap_comment($0);
-        if (length(comment))
-          report("#", comment);
-      }
-  }
-
-## -------- ##
-##  FINISH  ##
-## -------- ##
-
-# A "Bail out!" directive should cause us to ignore any following TAP
-# error, as well as a non-zero exit status from the TAP producer.
-if (!bailed_out)
-  {
-    if (!plan_seen)
-      {
-        testsuite_error("missing test plan")
-      }
-    else if (planned_tests != testno)
-      {
-        bad_amount = testno > planned_tests ? "many" : "few"
-        testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
-                                bad_amount, planned_tests, testno))
-      }
-    if (!ignore_exit)
-      {
-        # Fetch exit status from the last line.
-        exit_message = get_test_exit_message(nextline)
-        if (exit_message)
-          testsuite_error(exit_message)
-      }
-  }
-
-write_test_results()
-
-exit 0
-
-} # End of "BEGIN" block.
-'
-
-# TODO: document that we consume the file descriptor 3 :-(
-} 3>"$log_file"
-
-test $? -eq 0 || fatal "I/O or internal error"
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/utils/tap-test b/utils/tap-test
deleted file mode 100755
index b3ef8b04..00000000
--- a/utils/tap-test
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-# run a GTest in tap mode. The test binary is passed as $1
-
-t="$1"; shift
-if ${PKG_CONFIG:-pkg-config} --atleast-version 2.40 glib-2.0; then
-exec "$t" -k --tap "$@"
-else # GTest does not support tap yet
-    (((("$t" "$@"; echo $? >&3) | ${AM_TAP_AWK:-awk} '
-{
-    if (/: /) {
-        i++
-        ok = /: OK/
-        sub(/:/, " #")
-        print (ok ? "ok " : "not ok ") i " " $0
-    } else {
-        print "# " $0
-    }
-} END {
-    print 1 ".." i
-}
-' >&4) 3>&1) | (read xs; exit $xs)) 4>&1
-fi

From e692f85f4a388d8bcaec9d3c5e475fc7cb5a6271 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 19 Feb 2022 00:20:00 +0100
Subject: [PATCH 1388/1650] remove install_rpath

reported by dwfreed / Unit193
---
 src/fe-text/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 24a86ca3..312cb85d 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -37,7 +37,6 @@ executable('irssi',
     libfe_common_core_a,
     ],
   install : true,
-  install_rpath : get_option('prefix') / get_option('libdir'),
   dependencies : dep
   + textui_dep
 )

From b34f16e9df5cbcdd488175a7e4a1ab8e605d3a53 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 19 Feb 2022 21:51:12 +0100
Subject: [PATCH 1389/1650] remove enable-true-color compile time switch

---
 .github/workflows/termuxpkg.yml | 1 -
 meson.build                     | 4 +---
 meson_options.txt               | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
index f46915e8..cbf7d3b2 100644
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@@ -37,7 +37,6 @@ jobs:
           TERMUX_PKG_BREAKS="irssi"
           TERMUX_PKG_REPLACES="irssi"
           TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-          -Denable-true-color=yes
           -Dfhs-prefix=$TERMUX_PREFIX
           "
 
diff --git a/meson.build b/meson.build
index 31bdfa9f..f2a15ee1 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,6 @@ want_fuzzer         = get_option('with-fuzzer') == 'yes'
 fuzzer_lib          = get_option('with-fuzzer-lib')
 fuzzer_link_language = get_option('fuzzer-link-language')
 want_proxy          = get_option('with-proxy') == 'yes'
-want_truecolor      = get_option('enable-true-color') == 'yes'
 want_gregex         = get_option('disable-gregex') != 'yes'
 
 require_capsicum    = get_option('with-capsicum') == 'yes'
@@ -521,7 +520,7 @@ conf = configuration_data()
 conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support')
 conf.set('HAVE_GMODULE', true)
 conf.set('HAVE_SOCKS', false, description : 'Build with socks support')
-conf.set('TERM_TRUECOLOR', want_truecolor, description : 'true color support in terminal')
+conf.set('TERM_TRUECOLOR', true)
 conf.set('USE_GREGEX', want_gregex, description : 'use GRegex for regular expressions')
 conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.')
 conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix'))
@@ -627,7 +626,6 @@ if have_perl
 endif
 message('Install prefix ................... : ' + get_option('prefix'))
 message('')
-message('Building with true color support.. : ' + want_truecolor.to_string('yes', 'no'))
 message('Building with GRegex ............. : ' + want_gregex.to_string('yes', 'no'))
 message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no'))
 message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no'))
diff --git a/meson_options.txt b/meson_options.txt
index 1013166d..617de554 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,6 @@ option('with-proxy',        type : 'combo',  description : 'Build irssi-proxy',
 option('with-perl-lib',     type : 'string', description : 'Specify where to install the Perl libraries for Irssi')
 option('with-perl',         type : 'combo',  description : 'Build with Perl support',                     choices : ['auto', 'yes', 'no'])
 option('with-otr',          type : 'combo',  description : 'Build with OTR support',                      choices : ['auto', 'yes', 'no'])
-option('enable-true-color', type : 'combo',  description : 'Build with true color support in terminal',   choices : ['no', 'yes'])
 option('disable-gregex',    type : 'combo',  description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes'])
 option('disable-utf8proc',  type : 'combo',  description : 'Build without Julia\'s utf8proc',             choices : ['auto', 'yes', 'no'])
 option('with-capsicum',     type : 'combo',  description : 'Build with Capsicum support',                 choices : ['auto', 'yes', 'no'])

From 0682cbed3cb5dd0412209e6ed142112044ebc429 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 19 Feb 2022 21:53:51 +0100
Subject: [PATCH 1390/1650] remove TERM_TRUECOLOR define

---
 src/fe-common/core/formats.c  | 43 ++---------------------------------
 src/fe-common/core/formats.h  |  2 --
 src/fe-text/gui-entry.c       |  4 ----
 src/fe-text/gui-printtext.c   |  2 --
 src/fe-text/term-terminfo.c   |  8 -------
 src/fe-text/term.c            |  8 -------
 src/fe-text/term.h            |  5 ----
 src/fe-text/textbuffer-view.c | 10 --------
 src/fe-text/textbuffer-view.h |  2 --
 9 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index b660b616..cc8455eb 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -142,7 +142,6 @@ static void format_ext_color_unexpand(GString *out, gboolean bg, int base, char
 	g_string_append_c(out, ext_color_al[value % 36]);
 }
 
-#ifdef TERM_TRUECOLOR
 void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *flags)
 {
 	unsigned int color;
@@ -191,12 +190,10 @@ static void format_24bit_color_unexpand(GString *out, int off, const char **ptr)
 	g_string_append_c(out, rgbx[3] & 0x1 ? 'z' : 'Z');
 	g_string_append_printf(out, "%06X", color);
 }
-#endif
 
 void format_24bit_color(GString *out, int bg, unsigned int color)
 {
 	unsigned char rgb[] = { color >> 16, color >> 8, color };
-#ifdef TERM_TRUECOLOR
 	unsigned char x = bg ? 0x1 : 0;
 	unsigned int i;
 	g_string_append_c(out, 4);
@@ -210,9 +207,6 @@ void format_24bit_color(GString *out, int bg, unsigned int color)
 		}
 	}
 	g_string_append_c(out, 0x20 + x);
-#else /* !TERM_TRUECOLOR */
-	format_ext_color(out, bg, color_24bit_256(rgb));
-#endif /* TERM_TRUECOLOR */
 }
 
 int format_expand_styles(GString *out, const char **format, int *flags)
@@ -668,11 +662,9 @@ char *format_string_unexpand(const char *text, int flags)
 			case FORMAT_COLOR_EXT3_BG:
 				format_ext_color_unexpand(out, TRUE, 0xb0, *++text);
 				break;
-#ifdef TERM_TRUECOLOR
 			case FORMAT_COLOR_24:
 				format_24bit_color_unexpand(out, 1, &text);
 				break;
-#endif
 			case FORMAT_STYLE_BLINK:
 				format_flag_unexpand(out, 'F');
 				break;
@@ -1057,13 +1049,6 @@ void format_newline(TEXT_DEST_REC *dest)
 	               GINT_TO_POINTER(-1), GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), "", dest);
 }
 
-#ifndef TERM_TRUECOLOR
-inline static int color_24bit_256_int(unsigned int color)
-{
-	unsigned char rgb[] = { color >> 16, color >> 8, color };
-	return color_24bit_256(rgb);
-}
-#endif /* !TERM_TRUECOLOR */
 
 /* parse ANSI color string */
 static const char *get_ansi_color(THEME_REC *theme, const char *str,
@@ -1191,7 +1176,7 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 				}
 
 				if (i == -1) break;
-#ifdef TERM_TRUECOLOR
+
 				if (num == 38) {
 					flags |= GUI_PRINT_FLAG_COLOR_24_FG;
 					fg = num2;
@@ -1199,15 +1184,6 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 					flags |= GUI_PRINT_FLAG_COLOR_24_BG;
 					bg = num2;
 				}
-#else /* !TERM_TRUECOLOR */
-				if (num == 38) {
-					flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
-					fg = color_24bit_256_int(num2);
-				} else if (num == 48) {
-					flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
-					bg = color_24bit_256_int(num2);
-				}
-#endif
 
 				break;
 			case 5:
@@ -1332,7 +1308,6 @@ int strip_real_length(const char *str, int len,
 			/* We expect 4 to indicate an internal Irssi color code. However 4
 			 * also means hex color, an alternative to mIRC color codes. We
 			 * don't support those. */
-#ifdef TERM_TRUECOLOR
 			if (str[1] == FORMAT_COLOR_24 && str[2] != '\0') {
 				if (str[3] == '\0') str++;
 				else if (str[4] == '\0') str += 2;
@@ -1344,9 +1319,7 @@ int strip_real_length(const char *str, int len,
 						*last_color_len = 6;
 					str+=4;
 				}
-			} else
-#endif
-			if (str[1] < FORMAT_STYLE_SPECIAL && str[2] != '\0') {
+			} else if (str[1] < FORMAT_STYLE_SPECIAL && str[2] != '\0') {
 				if (last_color_pos != NULL)
 					*last_color_pos = (int) (str-start);
 				if (last_color_len != NULL)
@@ -1395,14 +1368,12 @@ char *strip_codes(const char *input)
 
 			/* irssi color */
 			if (p[2] != '\0') {
-#ifdef TERM_TRUECOLOR
 				if (p[1] == FORMAT_COLOR_24) {
 					if (p[3] == '\0') p += 2;
 					else if (p[4] == '\0') p += 3;
 					else if (p[5] == '\0') p += 4;
 					else p += 5;
 				} else
-#endif /* TERM_TRUECOLOR */
 				p += 2;
 				continue;
 			}
@@ -1550,11 +1521,9 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 				bgcolor = 0xb0 + *++ptr - FORMAT_COLOR_NOCHANGE;
 				flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
 				break;
-#ifdef TERM_TRUECOLOR
 			case FORMAT_COLOR_24:
 				unformat_24bit_color(&ptr, 1, &fgcolor, &bgcolor, &flags);
 				break;
-#endif
 			default:
 				if (*ptr != FORMAT_COLOR_NOCHANGE) {
 					flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
@@ -1637,13 +1606,11 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags,
 	    (flags & GUI_PRINT_FLAG_COLOR_24_FG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_FG)) {
 		*last_fg = fg;
 
-#ifdef TERM_TRUECOLOR
 		if (flags & GUI_PRINT_FLAG_COLOR_24_FG) {
 			*last_flags |= GUI_PRINT_FLAG_COLOR_24_FG;
 			format_24bit_color(out, 0, fg);
 		} else {
 			*last_flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
-#endif
 			if (fg < 0) {
 				g_string_append_c(out, 4);
 				g_string_append_c(out, (char) -1);
@@ -1651,20 +1618,16 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags,
 			} else {
 				format_ext_color(out, 0, fg);
 			}
-#ifdef TERM_TRUECOLOR
 		}
-#endif
 	}
 	if (bg != *last_bg ||
 	    (flags & GUI_PRINT_FLAG_COLOR_24_BG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_BG)) {
 		*last_bg = bg;
-#ifdef TERM_TRUECOLOR
 		if (flags & GUI_PRINT_FLAG_COLOR_24_BG) {
 			*last_flags |= GUI_PRINT_FLAG_COLOR_24_BG;
 			format_24bit_color(out, 1, bg);
 		} else {
 			*last_flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
-#endif
 			if (bg < 0) {
 				g_string_append_c(out, 4);
 				g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
@@ -1672,9 +1635,7 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags,
 			} else {
 				format_ext_color(out, 1, bg);
 			}
-#ifdef TERM_TRUECOLOR
 		}
-#endif
 	}
 
 	if ((flags & GUI_PRINT_FLAG_UNDERLINE) != (*last_flags & GUI_PRINT_FLAG_UNDERLINE)) {
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 5666c73b..79b90ded 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -158,9 +158,7 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 #define FORMAT_COLOR_EXT1_BG	('0'-5)
 #define FORMAT_COLOR_EXT2_BG	('0'-9)
 #define FORMAT_COLOR_EXT3_BG	('0'-10)
-#ifdef TERM_TRUECOLOR
 #define FORMAT_COLOR_24	('0'-13)
-#endif
 
 #define FORMAT_STYLE_SPECIAL	0x60
 #define FORMAT_STYLE_BLINK	(0x01 + FORMAT_STYLE_SPECIAL)
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 5050c800..ad362f20 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -300,7 +300,6 @@ static char *text_effects_only(const char *p)
 
 			/* irssi color */
 			if (p[2] != '\0') {
-#ifdef TERM_TRUECOLOR
 				if (p[1] == FORMAT_COLOR_24) {
 					if (p[3] == '\0') p += 2;
 					else if (p[4] == '\0') p += 3;
@@ -310,12 +309,9 @@ static char *text_effects_only(const char *p)
 						p += 5;
 					}
 				} else {
-#endif /* TERM_TRUECOLOR */
 					g_string_append_len(str, p, 3);
 					p += 2;
-#ifdef TERM_TRUECOLOR
 				}
-#endif /* TERM_TRUECOLOR */
 				continue;
 			}
 		}
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index d317456b..2091b5a3 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -245,9 +245,7 @@ void gui_printtext_get_colors(int *flags, int *fg, int *bg, int *attr)
 	if (*flags & GUI_PRINT_FLAG_MIRC_COLOR) {
 		/* mirc colors - extended colours proposal */
 		gboolean use_24_map = FALSE;
-#ifdef TERM_TRUECOLOR
 		use_24_map = settings_get_bool("colors_ansi_24bit");
-#endif
 		if (*bg >= 0) {
 			if (use_24_map && mirc_colors24[*bg % 100] != -1) {
 				*bg = mirc_colors24[*bg % 100];
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 78496a64..5e9ead8a 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -339,33 +339,25 @@ static int termctl_set_color_24bit(int bg, unsigned int lc)
 #define COLOR_BLACK24 COLOR_RESET - 1
 
 /* Change active color */
-#ifdef TERM_TRUECOLOR
 void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigned int bgcol24)
-#else
-void term_set_color(TERM_WINDOW *window, int col)
-#endif
 {
 	int set_normal;
 
 	unsigned int fg, bg;
-#ifdef TERM_TRUECOLOR
 	if (col & ATTR_FGCOLOR24) {
 		if (fgcol24)
 			fg = fgcol24 << 8;
 		else
 			fg = COLOR_BLACK24;
 	} else
-#endif
 		fg = (col & FG_MASK);
 
-#ifdef TERM_TRUECOLOR
 	if (col & ATTR_BGCOLOR24) {
 		if (bgcol24)
 			bg = bgcol24 << 8;
 		else
 			bg = COLOR_BLACK24;
 	} else
-#endif
 		bg = ((col & BG_MASK) >> BG_SHIFT);
 
 	if (!term_use_colors && bg > 0)
diff --git a/src/fe-text/term.c b/src/fe-text/term.c
index 1d5c2bef..5587fe20 100644
--- a/src/fe-text/term.c
+++ b/src/fe-text/term.c
@@ -150,12 +150,8 @@ static void read_settings(void)
 	term_use_colors = settings_get_bool("colors") &&
 		(force_colors || term_has_colors());
 
-#ifdef TERM_TRUECOLOR
 	term_use_colors24 = settings_get_bool("colors_ansi_24bit") &&
 		(force_colors || term_has_colors());
-#else
-	term_use_colors24 = FALSE;
-#endif
 
 	if (term_use_colors != old_colors || term_use_colors24 != old_colors24)
 		irssi_redraw();
@@ -173,12 +169,8 @@ void term_common_init(void)
 
 	force_colors = FALSE;
 	term_use_colors = term_has_colors() && settings_get_bool("colors");
-#ifdef TERM_TRUECOLOR
 	settings_add_bool("lookandfeel", "colors_ansi_24bit", FALSE);
 	term_use_colors24 = term_has_colors() && settings_get_bool("colors_ansi_24bit");
-#else
-	term_use_colors24 = FALSE;
-#endif
         read_settings();
 
 	if (g_get_charset(&dummy)) {
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index 7758fea3..601b12c6 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -72,13 +72,8 @@ void term_window_clear(TERM_WINDOW *window);
 /* Scroll window up/down */
 void term_window_scroll(TERM_WINDOW *window, int count);
 
-#ifdef TERM_TRUECOLOR
 #define term_set_color(window, col) term_set_color2(window, (col) &~(ATTR_FGCOLOR24|ATTR_BGCOLOR24), UINT_MAX, UINT_MAX)
 void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigned int bgcol24);
-#else
-#define term_set_color2(window, col, unused1, unused2) term_set_color(window, col)
-void term_set_color(TERM_WINDOW *window, int col);
-#endif
 
 void term_move(TERM_WINDOW *window, int x, int y);
 void term_addch(TERM_WINDOW *window, char chr);
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 79f3522c..0c89f600 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -118,7 +118,6 @@ static void textbuffer_cache_unref(TEXT_BUFFER_CACHE_REC *cache)
 #define FGATTR (ATTR_NOCOLORS | ATTR_RESETFG | FG_MASK | ATTR_FGCOLOR24)
 #define BGATTR (ATTR_NOCOLORS | ATTR_RESETBG | BG_MASK | ATTR_BGCOLOR24)
 
-#ifdef TERM_TRUECOLOR
 static void unformat_24bit_line_color(const unsigned char **ptr, int off, int *flags, unsigned int *fg, unsigned int *bg)
 {
 	unsigned int color;
@@ -145,7 +144,6 @@ static void unformat_24bit_line_color(const unsigned char **ptr, int off, int *f
 		*fg = color;
 	}
 }
-#endif
 
 static inline unichar read_unichar(const unsigned char *data, const unsigned char **next, int *width)
 {
@@ -215,11 +213,9 @@ static inline void unformat(const unsigned char **ptr, int *color, unsigned int
 		break;
 #undef SET_COLOR_EXT_BG_BITS
 #undef SET_COLOR_EXT_FG_BITS
-#ifdef TERM_TRUECOLOR
 	case FORMAT_COLOR_24:
 		unformat_24bit_line_color(ptr, 1, color, fg24, bg24);
 		break;
-#endif
 	default:
 		if (**ptr != FORMAT_COLOR_NOCHANGE) {
 			if (**ptr == (unsigned char) 0xff) {
@@ -289,10 +285,8 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 
 				sub->start = ++ptr;
 				sub->color = color;
-#ifdef TERM_TRUECOLOR
 				sub->fg24 = fg24;
 				sub->bg24 = bg24;
-#endif
 
 				lines = g_slist_append(lines, sub);
 				linecount++;
@@ -360,10 +354,8 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 				sub->indent = xpos;
 				sub->indent_func = indent_func;
 				sub->color = color;
-#ifdef TERM_TRUECOLOR
 				sub->fg24 = fg24;
 				sub->bg24 = bg24;
-#endif
 
 				lines = g_slist_append(lines, sub);
 				linecount++;
@@ -502,10 +494,8 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 				if (indent_func == NULL || cache->lines[subline-1].continues)
 					xpos = cache->lines[subline-1].indent;
 				color = cache->lines[subline-1].color;
-#ifdef TERM_TRUECOLOR
 				fg24 = cache->lines[subline-1].fg24;
 				bg24 = cache->lines[subline-1].bg24;
-#endif
 			} else {
 				indent_func = NULL;
 			}
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index 4e5ed82f..cdd3cbe5 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -15,9 +15,7 @@ typedef struct {
 	int indent;
         INDENT_FUNC indent_func;
 	int color;
-#ifdef TERM_TRUECOLOR
 	unsigned int fg24, bg24;
-#endif
 
 	/* first word in line belong to the end of the last word in
 	   previous line */

From 9b768abfd7d2fbc57bf756947c9b35bc774839ad Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 19 Feb 2022 23:17:49 +0100
Subject: [PATCH 1391/1650] update screenshot

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 21fa14e8..7c35f794 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ there are third party [ICB](https://github.com/jperkin/irssi-icb),
 [Quassel](https://github.com/phhusson/quassel-irssi) protocol modules
 available.
 
-![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
+![irssi](https://user-images.githubusercontent.com/5665186/154820868-50c35841-04f4-4f4c-8df9-dd5aa4bbcde8.png)
 
 ## [Download information](https://ailin-nemui.github.io/irssi/Getting.html)
 

From 10caed057a63ccc0bcadf9e26572bd4d16b352f1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 20 Feb 2022 15:53:52 +0100
Subject: [PATCH 1392/1650] add -silent switch in syntax comment and respect it
 without args

---
 src/fe-common/core/fe-modules.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index 01b603f5..955b9a9e 100644
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@@ -164,7 +164,7 @@ static void module_prefixes_free(char **list)
         g_free(list);
 }
 
-/* SYNTAX: LOAD <module> [<submodule>] */
+/* SYNTAX: LOAD [-silent] <module> [<submodule>] */
 static void cmd_load(const char *data)
 {
         char *rootmodule, *submodule;
@@ -181,9 +181,11 @@ static void cmd_load(const char *data)
 
 	silent = g_hash_table_lookup(optlist, "silent") != NULL;
 
-	if (*rootmodule == '\0')
-		cmd_load_list();
-	else {
+	if (*rootmodule == '\0') {
+		if (!silent) {
+			cmd_load_list();
+		}
+	} else {
 		if (silent) {
 			signal_add_first("module error", (SIGNAL_FUNC) signal_stop);
 			signal_add_first("module loaded", (SIGNAL_FUNC) signal_stop);

From 883510a3fdd1793a148a9ab26c7621bb8e6badc4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 20 Feb 2022 17:33:36 +0100
Subject: [PATCH 1393/1650] remove deprecated defines

- PERL_STATIC_LIBS (was not tested anymore)
- HAVE_GMODULE (always required)
- HAVE_STATIC_IRC
- HAVE_STATIC_PERL
- HAVE_SOCKS (was not working properly)
- USE_GREGEX (we use it)
---
 docs/startup-HOWTO.html           |  8 +--
 docs/startup-HOWTO.txt            |  9 +--
 meson.build                       |  5 +-
 meson_options.txt                 |  1 -
 src/common.h                      |  4 +-
 src/core/iregex-regexh.c          | 99 -------------------------------
 src/core/iregex.h                 | 10 ----
 src/core/meson.build              |  8 +--
 src/core/modules-load.c           | 13 ----
 src/core/modules.h                | 10 +---
 src/core/network.h                | 12 ++--
 src/fe-common/core/fe-modules.c   | 21 -------
 src/fe-common/irc/fe-common-irc.c | 13 ----
 src/fe-common/irc/irc-modules.c   |  6 --
 src/fe-common/irc/meson.build     |  2 -
 src/fe-none/irssi.c               | 27 ---------
 src/fe-text/irssi.c               | 55 -----------------
 src/irc/dcc/dcc-queue.h           |  4 +-
 src/irc/irc.c                     |  7 ---
 src/perl/irssi-core.pl            |  6 +-
 src/perl/meson.build              |  1 -
 src/perl/perl-core.c              | 37 +-----------
 22 files changed, 20 insertions(+), 338 deletions(-)
 delete mode 100644 src/core/iregex-regexh.c
 delete mode 100644 src/fe-common/irc/irc-modules.c
 delete mode 100644 src/irc/irc.c

diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 696dea4d..787094d0 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -515,12 +515,12 @@ Ctrl-X                - set the next server in list active
 
 <p><strong>SOCKS</strong></p>
 
-<p>Irssi can be compiled with socks support (<code>--with-socks</code> option to configure), which requires “dante” and routes all connections through the proxy specified in the system-wide /etc/socks.conf. This method is known to have issues in Mac OS X.</p>
+<p>Using <a href="https://github.com/rofl0r/proxychains-ng">proxychains-ng</a> is recommended for using irssi with a socks proxy.</p>
+
+<p>Irssi does not support socks proxy natively.</p>
 
 <p>Note that <code>/SET proxy</code> settings don’t have anything to do with socks.</p>
 
-<p>Using <a href="https://github.com/rofl0r/proxychains-ng">proxychains-ng</a> is recommended over recompiling irssi.</p>
-
 <p><strong>Others</strong></p>
 
 <p>IRC bouncers usually work like IRC servers, and want a password. You can give it with:</p>
@@ -683,4 +683,4 @@ Ctrl-X                - set the next server in list active
 /STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
 </code></pre></div></div>
 
-<p>For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: <code>/STATUSBAR window ADD -before act mail</code>.</p>
\ No newline at end of file
+<p>For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: <code>/STATUSBAR window ADD -before act mail</code>.</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 90d278de..5cc86af3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -578,15 +578,12 @@ Irssi proxy works fine with other IRC clients as well.
 
 SOCKS
 
-Irssi can be compiled with socks support (--with-socks option to configure),
-which requires “dante” and routes all connections through the proxy specified
-in the system-wide /etc/socks.conf. This method is known to have issues in Mac
-OS X.
+Using [4]proxychains-ng is recommended for using irssi with a socks proxy.
+
+Irssi does not support socks proxy natively.
 
 Note that /SET proxy settings don’t have anything to do with socks.
 
-Using [4]proxychains-ng is recommended over recompiling irssi.
-
 Others
 
 IRC bouncers usually work like IRC servers, and want a password. You can give
diff --git a/meson.build b/meson.build
index f2a15ee1..f8362723 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,6 @@ want_fuzzer         = get_option('with-fuzzer') == 'yes'
 fuzzer_lib          = get_option('with-fuzzer-lib')
 fuzzer_link_language = get_option('fuzzer-link-language')
 want_proxy          = get_option('with-proxy') == 'yes'
-want_gregex         = get_option('disable-gregex') != 'yes'
 
 require_capsicum    = get_option('with-capsicum') == 'yes'
 want_capsicum       = get_option('with-capsicum') != 'no'
@@ -519,9 +518,8 @@ conf = configuration_data()
 
 conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support')
 conf.set('HAVE_GMODULE', true)
-conf.set('HAVE_SOCKS', false, description : 'Build with socks support')
 conf.set('TERM_TRUECOLOR', true)
-conf.set('USE_GREGEX', want_gregex, description : 'use GRegex for regular expressions')
+conf.set('USE_GREGEX', true)
 conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.')
 conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix'))
 
@@ -626,7 +624,6 @@ if have_perl
 endif
 message('Install prefix ................... : ' + get_option('prefix'))
 message('')
-message('Building with GRegex ............. : ' + want_gregex.to_string('yes', 'no'))
 message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no'))
 message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no'))
 message('Building with OTR support ........ : ' + have_otr.to_string('yes', 'no'))
diff --git a/meson_options.txt b/meson_options.txt
index 617de554..a5b4ffbb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,6 @@ option('with-proxy',        type : 'combo',  description : 'Build irssi-proxy',
 option('with-perl-lib',     type : 'string', description : 'Specify where to install the Perl libraries for Irssi')
 option('with-perl',         type : 'combo',  description : 'Build with Perl support',                     choices : ['auto', 'yes', 'no'])
 option('with-otr',          type : 'combo',  description : 'Build with OTR support',                      choices : ['auto', 'yes', 'no'])
-option('disable-gregex',    type : 'combo',  description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes'])
 option('disable-utf8proc',  type : 'combo',  description : 'Build without Julia\'s utf8proc',             choices : ['auto', 'yes', 'no'])
 option('with-capsicum',     type : 'combo',  description : 'Build with Capsicum support',                 choices : ['auto', 'yes', 'no'])
 option('static-dependency', type : 'combo',  description : 'Request static dependencies',                 choices : ['no', 'yes'])
diff --git a/src/common.h b/src/common.h
index ad5c88bb..d63ec3cf 100644
--- a/src/common.h
+++ b/src/common.h
@@ -37,9 +37,7 @@
 #include <fcntl.h>
 
 #include <glib.h>
-#ifdef HAVE_GMODULE
-#  include <gmodule.h>
-#endif
+#include <gmodule.h>
 
 typedef guint64 uoff_t;
 #define PRIuUOFF_T G_GUINT64_FORMAT
diff --git a/src/core/iregex-regexh.c b/src/core/iregex-regexh.c
deleted file mode 100644
index aae8ecdf..00000000
--- a/src/core/iregex-regexh.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include <irssi/src/core/iregex.h>
-
-Regex *
-i_regex_new (const gchar *pattern,
-             GRegexCompileFlags compile_options,
-             GRegexMatchFlags match_options,
-             GError **error)
-{
-	Regex *regex;
-	char *errbuf;
-	int cflags;
-	int errcode, errbuf_len;
-
-	regex = g_new0(Regex, 1);
-	cflags = REG_EXTENDED;
-	if (compile_options & G_REGEX_CASELESS)
-		cflags |= REG_ICASE;
-	if (compile_options & G_REGEX_MULTILINE)
-		cflags |= REG_NEWLINE;
-	if (match_options & G_REGEX_MATCH_NOTBOL)
-		cflags |= REG_NOTBOL;
-	if (match_options & G_REGEX_MATCH_NOTEOL)
-		cflags |= REG_NOTEOL;
-
-	errcode = regcomp(regex, pattern, cflags);
-	if (errcode != 0) {
-		errbuf_len = regerror(errcode, regex, 0, 0);
-		errbuf = g_malloc(errbuf_len);
-		regerror(errcode, regex, errbuf, errbuf_len);
-		g_set_error(error, G_REGEX_ERROR, errcode, "%s", errbuf);
-		g_free(errbuf);
-		g_free(regex);
-		return NULL;
-	} else {
-		return regex;
-	}
-}
-
-void
-i_regex_unref (Regex *regex)
-{
-	regfree(regex);
-	g_free(regex);
-}
-
-gboolean
-i_regex_match (const Regex *regex,
-               const gchar *string,
-               GRegexMatchFlags match_options,
-               MatchInfo **match_info)
-{
-	int groups;
-	int eflags;
-
-	g_return_val_if_fail(regex != NULL, FALSE);
-
-	if (match_info != NULL) {
-		groups = 1 + regex->re_nsub;
-		*match_info = g_new0(MatchInfo, groups);
-	} else {
-		groups = 0;
-	}
-
-	eflags = 0;
-	if (match_options & G_REGEX_MATCH_NOTBOL)
-		eflags |= REG_NOTBOL;
-	if (match_options & G_REGEX_MATCH_NOTEOL)
-		eflags |= REG_NOTEOL;
-
-	return regexec(regex, string, groups, groups ? *match_info : NULL, eflags) == 0;
-}
-
-gboolean
-i_match_info_fetch_pos (const MatchInfo *match_info,
-                        gint match_num,
-                        gint *start_pos,
-                        gint *end_pos)
-{
-	if (start_pos != NULL)
-		*start_pos = match_info[match_num].rm_so;
-	if (end_pos != NULL)
-		*end_pos = match_info[match_num].rm_eo;
-
-	return TRUE;
-}
-
-gboolean
-i_match_info_matches (const MatchInfo *match_info)
-{
-	g_return_val_if_fail(match_info != NULL, FALSE);
-
-	return match_info[0].rm_so != -1;
-}
-
-void
-i_match_info_free (MatchInfo *match_info)
-{
-	g_free(match_info);
-}
diff --git a/src/core/iregex.h b/src/core/iregex.h
index 53263944..68156e02 100644
--- a/src/core/iregex.h
+++ b/src/core/iregex.h
@@ -3,20 +3,10 @@
 
 #include <irssi/src/common.h>
 
-#ifdef USE_GREGEX
-
 #include <glib.h>
 typedef	GRegex Regex;
 typedef	struct _MatchInfo MatchInfo;
 
-#else
-
-#include <regex.h>
-typedef	regex_t Regex;
-typedef regmatch_t MatchInfo;
-
-#endif
-
 gboolean
 i_match_info_matches (const MatchInfo *match_info);
 
diff --git a/src/core/meson.build b/src/core/meson.build
index c0e9b90e..56b6ec77 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -1,11 +1,5 @@
 # this file is part of irssi
 
-if want_gregex
-  regex_impl = files('iregex-gregex.c')
-else
-  regex_impl = files('iregex-regexh.c')
-endif
-
 if have_capsicum
   core_capsicum_source = files('capsicum.c')
 else
@@ -24,6 +18,7 @@ libcore_a = static_library('core',
     'core.c',
     'expandos.c',
     'ignore.c',
+    'iregex-gregex.c',
     'levels.c',
     'line-split.c',
     'log-away.c',
@@ -58,7 +53,6 @@ libcore_a = static_library('core',
     'write-buffer.c',
   )
   + core_capsicum_source
-  + regex_impl
   + [
     default_config_h,
     irssi_version_h,
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index a3598c65..be1bb385 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -27,8 +27,6 @@
 #include <irssi/src/core/commands.h>
 #include <irssi/src/core/misc.h>
 
-#ifdef HAVE_GMODULE
-
 /* Returns the module name without path, "lib" prefix or ".so" suffix */
 static char *module_get_name(const char *path, int *start, int *end)
 {
@@ -395,15 +393,6 @@ static void module_file_deinit_gmodule(MODULE_FILE_REC *file)
 	g_module_close(file->gmodule);
 }
 
-#else /* !HAVE_GMODULE - modules are not supported */
-
-int module_load(const char *path, char **prefixes)
-{
-        return FALSE;
-}
-
-#endif
-
 void module_file_unload(MODULE_FILE_REC *file)
 {
 	MODULE_REC *root;
@@ -414,10 +403,8 @@ void module_file_unload(MODULE_FILE_REC *file)
         if (file->initialized)
 		signal_emit("module unloaded", 2, file->root, file);
 
-#ifdef HAVE_GMODULE
 	if (file->gmodule != NULL)
                 module_file_deinit_gmodule(file);
-#endif
 
 	g_free(file->name);
 	g_free(file->defined_module_name);
diff --git a/src/core/modules.h b/src/core/modules.h
index 1e707c0c..b1ccbae4 100644
--- a/src/core/modules.h
+++ b/src/core/modules.h
@@ -16,13 +16,7 @@
 #define MODULE_DATA(rec) \
 	g_hash_table_lookup((rec)->module_data, MODULE_NAME)
 
-
-#ifdef HAVE_GMODULE
-#  define MODULE_IS_STATIC(rec) \
-        ((rec)->gmodule == NULL)
-#else
-#  define MODULE_IS_STATIC(rec) TRUE
-#endif
+#define MODULE_IS_STATIC(rec) ((rec)->gmodule == NULL)
 
 #define MODULE_ABICHECK(fn_modulename) \
 void fn_modulename ## _abicheck(int *version)	\
@@ -45,9 +39,7 @@ typedef struct {
         char *defined_module_name;
 	void (*module_deinit) (void);
 
-#ifdef HAVE_GMODULE
 	GModule *gmodule; /* static, if NULL */
-#endif
 	unsigned int initialized:1;
 } MODULE_FILE_REC;
 
diff --git a/src/core/network.h b/src/core/network.h
index 0747f018..5cd85ccc 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -1,15 +1,11 @@
 #ifndef IRSSI_CORE_NETWORK_H
 #define IRSSI_CORE_NETWORK_H
 
-#ifdef HAVE_SOCKS_H
-#include <socks.h>
-#endif
-
 #include <sys/types.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <netdb.h>
-#  include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
 
 #ifndef AF_INET6
 #  ifdef PF_INET6
diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index 01b603f5..1f9e35b7 100644
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@@ -29,8 +29,6 @@
 
 #include <irssi/src/fe-common/core/printtext.h>
 
-#ifdef HAVE_GMODULE
-
 static void sig_module_error(void *number, const char *data,
 			     const char *rootmodule, const char *submodule)
 {
@@ -271,22 +269,3 @@ void fe_modules_deinit(void)
 	command_unbind("load", (SIGNAL_FUNC) cmd_load);
 	command_unbind("unload", (SIGNAL_FUNC) cmd_unload);
 }
-
-#else /* !HAVE_GMODULE */
-
-static void cmd_load(const char *data)
-{
-	printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
-		  "Dynamic modules loading not supported");
-}
-
-void fe_modules_init(void)
-{
-	command_bind("load", NULL, (SIGNAL_FUNC) cmd_load);
-}
-
-void fe_modules_deinit(void)
-{
-	command_unbind("load", (SIGNAL_FUNC) cmd_load);
-}
-#endif
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index 4658970b..5f097ec2 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -30,11 +30,6 @@
 #include <irssi/src/fe-common/irc/fe-irc-server.h>
 #include <irssi/src/fe-common/irc/fe-irc-channels.h>
 
-#ifdef HAVE_STATIC_IRC
-void fe_irc_modules_init(void);
-void fe_irc_modules_deinit(void);
-#endif
-
 void fe_irc_queries_init(void);
 void fe_irc_queries_deinit(void);
 
@@ -105,18 +100,10 @@ void fe_common_irc_init(void)
 
 	settings_check();
 	module_register("irc", "fe-common");
-
-#ifdef HAVE_STATIC_IRC
-	fe_irc_modules_init();
-#endif
 }
 
 void fe_common_irc_deinit(void)
 {
-#ifdef HAVE_STATIC_IRC
-	fe_irc_modules_deinit();
-#endif
-
 	fe_irc_channels_deinit();
 	fe_irc_queries_deinit();
 	fe_irc_messages_deinit();
diff --git a/src/fe-common/irc/irc-modules.c b/src/fe-common/irc/irc-modules.c
deleted file mode 100644
index b8c17d3b..00000000
--- a/src/fe-common/irc/irc-modules.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef HAVE_STATIC_IRC
-void fe_irc_dcc_init(void);void fe_irc_notifylist_init(void);
-void fe_irc_notifylist_deinit(void);void fe_irc_dcc_deinit(void);
-void fe_irc_modules_init(void) {  fe_irc_dcc_init(); fe_irc_notifylist_init(); }
-void fe_irc_modules_deinit(void) { fe_irc_notifylist_deinit(); fe_irc_dcc_deinit();  }
-#endif
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index aff70f71..5af5528a 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -20,8 +20,6 @@ libfe_common_irc_a = static_library('fe_common_irc',
     'fe-whois.c',
     'irc-completion.c',
     'module-formats.c',
-
-    'irc-modules.c',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index b33a4c5c..f2724443 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -26,16 +26,6 @@
 #include <irssi/src/core/settings.h>
 #include <irssi/src/core/core.h>
 
-#ifdef HAVE_STATIC_PERL
-void perl_core_init(void);
-void perl_core_deinit(void);
-#endif
-
-#ifdef HAVE_STATIC_IRC
-void irc_init(void);
-void irc_deinit(void);
-#endif
-
 static GMainLoop *main_loop;
 static char *autoload_module;
 static int reload;
@@ -73,19 +63,12 @@ void noui_init(void)
 
 	irssi_gui = IRSSI_GUI_NONE;
 	core_init();
-#ifdef HAVE_STATIC_IRC
-	irc_init();
-#endif
 
 	module_register("core", "fe-none");
 
 	signal_add("reload", (SIGNAL_FUNC) sig_reload);
 	signal_add("gui exit", (SIGNAL_FUNC) sig_exit);
 
-#ifdef HAVE_STATIC_PERL
-        perl_core_init();
-#endif
-
 	autoload_modules();
 
 	signal_emit("irssi init finished", 0);
@@ -93,15 +76,8 @@ void noui_init(void)
 
 void noui_deinit(void)
 {
-#ifdef HAVE_STATIC_PERL
-        perl_core_deinit();
-#endif
-
 	signal_remove("reload", (SIGNAL_FUNC) sig_reload);
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
-#ifdef HAVE_STATIC_IRC
-	irc_deinit();
-#endif
 	core_deinit();
 }
 
@@ -118,9 +94,6 @@ int main(int argc, char **argv)
 	args_execute(argc, argv);
 	core_preinit(argv[0]);
 
-#ifdef HAVE_SOCKS
-	SOCKSinit(argv[0]);
-#endif
 	noui_init();
 
 	if (autoload_module == NULL)
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 34341c9b..76bc5dfd 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -46,27 +46,6 @@
 #include <signal.h>
 #include <locale.h>
 
-#ifdef HAVE_STATIC_PERL
-void perl_core_init(void);
-void perl_core_deinit(void);
-
-void fe_perl_init(void);
-void fe_perl_deinit(void);
-#endif
-
-#ifdef HAVE_STATIC_OTR
-void otr_core_init(void);
-void otr_core_deinit(void);
-#endif
-
-#ifdef HAVE_STATIC_IRC
-void irc_init(void);
-void irc_deinit(void);
-
-void fe_common_irc_init(void);
-void fe_common_irc_deinit(void);
-#endif
-
 void gui_expandos_init(void);
 void gui_expandos_deinit(void);
 
@@ -170,13 +149,7 @@ static void textui_init(void)
 
 	irssi_gui = IRSSI_GUI_TEXT;
 	core_init();
-#ifdef HAVE_STATIC_IRC
-	irc_init();
-#endif
 	fe_common_core_init();
-#ifdef HAVE_STATIC_IRC
-	fe_common_irc_init();
-#endif
 
 	theme_register(gui_text_formats);
 	signal_add("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
@@ -222,15 +195,6 @@ static void textui_finish_init(void)
 
 	module_register("core", "fe-text");
 
-#ifdef HAVE_STATIC_PERL
-	perl_core_init();
-	fe_perl_init();
-#endif
-
-#ifdef HAVE_STATIC_OTR
-	otr_core_init();
-#endif
-
 	dirty_check();
 
 	/* Temporarily raise the fatal level to abort on config errors. */
@@ -273,15 +237,6 @@ static void textui_deinit(void)
 	while (modules != NULL)
 		module_unload(modules->data);
 
-#ifdef HAVE_STATIC_PERL
-	perl_core_deinit();
-	fe_perl_deinit();
-#endif
-
-#ifdef HAVE_STATIC_OTR
-	otr_core_deinit();
-#endif
-
 	dirty_check(); /* one last time to print any quit messages */
 	signal_remove("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed);
 	signal_remove("module autoload", (SIGNAL_FUNC) sig_autoload_modules);
@@ -307,13 +262,7 @@ static void textui_deinit(void)
 
 	theme_unregister();
 
-#ifdef HAVE_STATIC_IRC
-	fe_common_irc_deinit();
-#endif
 	fe_common_core_deinit();
-#ifdef HAVE_STATIC_IRC
-	irc_deinit();
-#endif
 	core_deinit();
 }
 
@@ -354,10 +303,6 @@ int main(int argc, char **argv)
 
 	check_files();
 
-#ifdef HAVE_SOCKS
-	SOCKSinit(argv[0]);
-#endif
-
 	/* setlocale() must be called at the beginning before any calls that
 	   affect it, especially regexps seem to break if they're generated
 	   before this call.
diff --git a/src/irc/dcc/dcc-queue.h b/src/irc/dcc/dcc-queue.h
index 1ab4ecbf..08dcee38 100644
--- a/src/irc/dcc/dcc-queue.h
+++ b/src/irc/dcc/dcc-queue.h
@@ -1,5 +1,5 @@
-#ifndef IRSSI_IRC_DCC_DCC_QUEUE_H_
-#define IRSSI_IRC_DCC_DCC_QUEUE_H_
+#ifndef IRSSI_IRC_DCC_DCC_QUEUE_H
+#define IRSSI_IRC_DCC_DCC_QUEUE_H
 
 #include <irssi/src/irc/dcc/dcc-chat.h>
 
diff --git a/src/irc/irc.c b/src/irc/irc.c
deleted file mode 100644
index 5780a965..00000000
--- a/src/irc/irc.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifdef HAVE_STATIC_IRC
-void irc_core_init(void); void irc_core_deinit(void);
-void irc_dcc_init(void);void irc_flood_init(void);void irc_notifylist_init(void);
-void irc_notifylist_deinit(void);void irc_flood_deinit(void);void irc_dcc_deinit(void);
-void irc_init(void) { irc_core_init();  irc_dcc_init(); irc_flood_init(); irc_notifylist_init(); }
-void irc_deinit(void) { irc_notifylist_deinit(); irc_flood_deinit(); irc_dcc_deinit();  irc_core_deinit(); }
-#endif
diff --git a/src/perl/irssi-core.pl b/src/perl/irssi-core.pl
index 46066a38..cf987b31 100644
--- a/src/perl/irssi-core.pl
+++ b/src/perl/irssi-core.pl
@@ -1,9 +1,7 @@
 # NOTE: this is printed through printf()-like function,
 # so no extra percent characters.
 
-# %%d : must be first - 1 if perl libraries are to be linked 
-#       statically with irssi binary, 0 if not
-# %%s : must be second - use Irssi; use Irssi::Irc; etc..
+# %%s : use Irssi; use Irssi::Irc; etc..
 package Irssi::Core;
 
 use Symbol;
@@ -15,7 +13,7 @@ $SIG{__WARN__} = sub {
 };
 
 sub is_static {
-  return %d;
+  return 0;
 }
 
 sub destroy {
diff --git a/src/perl/meson.build b/src/perl/meson.build
index f685fb0d..ad996acf 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -30,7 +30,6 @@ libperl_core_sm = shared_module('perl_core',
   c_args : [
     def_scriptdir,
     def_perl_use_lib,
-    '-D' + 'PERL_STATIC_LIBS' + '=' + 0.to_string(),
   ],
   include_directories : [ rootinc ] + [ generated_files_inc ],
   implicit_include_directories : false,
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 24f0218c..79d5c13c 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -77,31 +77,10 @@ static void perl_script_destroy(PERL_SCRIPT_REC *script)
 
 extern void boot_DynaLoader(pTHX_ CV* cv);
 
-#if PERL_STATIC_LIBS == 1
-extern void boot_Irssi(pTHX_ CV *cv);
-
-XS(boot_Irssi_Core)
-{
-	dXSARGS;
-	PERL_UNUSED_VAR(items);
-
-	irssi_callXS(boot_Irssi, cv, mark);
-        irssi_boot(Irc);
-        irssi_boot(UI);
-        irssi_boot(TextUI);
-	/* Make sure to keep this in line with perl_scripts_deinit below. */
-	XSRETURN_YES;
-}
-#endif
-
 static void xs_init(pTHX)
 {
 	dXSUB_SYS;
 
-#if PERL_STATIC_LIBS == 1
-	newXS("Irssi::Core::boot_Irssi_Core", boot_Irssi_Core, __FILE__);
-#endif
-
 	/* boot the dynaloader too, if we want to use some
 	   other dynamic modules.. */
 	newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__);
@@ -120,14 +99,11 @@ void perl_scripts_init(void)
 	perl_construct(my_perl);
 
 	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args)-1, perl_args, NULL);
-#if PERL_STATIC_LIBS == 1
-	perl_eval_pv("Irssi::Core::->boot_Irssi_Core(0.9);", TRUE);
-#endif
 
         perl_common_start();
 
 	use_code = perl_get_use_list();
-        code = g_strdup_printf(irssi_core_code, PERL_STATIC_LIBS, use_code);
+	code = g_strdup_printf(irssi_core_code, use_code);
 	perl_eval_pv(code, TRUE);
 
 	g_free(code);
@@ -153,17 +129,6 @@ void perl_scripts_deinit(void)
 	/* Unload all perl libraries loaded with dynaloader */
 	perl_eval_pv("foreach my $lib (@DynaLoader::dl_modules) { if ($lib =~ /^Irssi\\b/) { $lib .= '::deinit();'; eval $lib; } }", TRUE);
 
-#if PERL_STATIC_LIBS == 1
-	/* If perl is statically built we should manually deinit the modules
-	   which are booted in boot_Irssi_Core above */
-	perl_eval_pv("foreach my $lib (qw("
-		"Irssi" " "
-		"Irssi::Irc" " "
-		"Irssi::UI" " "
-		"Irssi::TextUI"
-		")) { eval $lib . '::deinit();'; }", TRUE);
-#endif
-
 	/* We could unload all libraries .. but this crashes with some
 	   libraries, probably because we don't call some deinit function..
 	   Anyway, this would free some memory with /SCRIPT RESET, but it

From c0929e3aafdc3f50cb3d3b2b394e2e74280aa347 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 20 Feb 2022 18:06:55 +0100
Subject: [PATCH 1394/1650] Add some missing files to make-dist

---
 MANIFEST.in        | 16 +++++++++++++---
 utils/make-dist.sh | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index d03cbf21..2cff9eba 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,12 +2,13 @@ global-include meson.build
 
 recursive-include src *.c *.h meson.build
 recursive-include src/perl *.c *.h *.xs *.pm *.pl typemap meson.build
+recursive-include src/fe-fuzz *.c *.h *.txt meson.build
 recursive-include tests *.c meson.build
 
 include meson_options.txt
 
 include subprojects/*.wrap
-prune subprojects/*/
+# prune subprojects/*
 
 include utils/*.pl utils/*.sh
 exclude utils/make-dist.sh
@@ -17,9 +18,18 @@ include themes/*.theme
 include docs/*.1 docs/*.txt docs/*.html
 include docs/help/in/[a-z]*.in
 include scripts/*.pl scripts/examples/*.pl
+include irssi-icon.png
 
 include NEWS
+include INSTALL
+include TODO
+include ChangeLog
 
-prune Build
-prune dist
+include .clang-format
+
+# prune Build
+# prune dist
 prune *.egg-info
+
+# ignore fuzz-support/fuzz.diff
+# ignore utils/clang-format-xs/*
diff --git a/utils/make-dist.sh b/utils/make-dist.sh
index d156255a..f1e4e4af 100755
--- a/utils/make-dist.sh
+++ b/utils/make-dist.sh
@@ -22,8 +22,15 @@ fi
 cd "$repo_root"
 ./utils/check-perl-hash.sh
 
+if [ -f pyproject.toml ] || [ -f setup.cfg ]; then
+    echo "**Error**: ${PKG_NAME} make-dist.sh cannot be run in Dist directory, cannot proceed."
+    exit 1
+fi
+
+
 rm -fr "$dist_tmp"
-git clone --no-local "$repo_root" "$dist_tmp"
+echo "Cloning to \`$dist_tmp'..."
+git clone --quiet --no-local "$repo_root" "$dist_tmp"
 cd "$dist_tmp"
 if [ ! -f meson.build ]; then
     echo "**Error**: ${PKG_NAME} make-dist.sh could not find meson.build, cannot proceed."
@@ -37,22 +44,48 @@ if [ -z "$name" ] || [ -z "$version" ]; then
     exit 1
 fi
 
+git log > ChangeLog
+
+cat <<PYPROJECT_TOML >pyproject.toml
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+PYPROJECT_TOML
+
 cat <<SETUP_CFG >setup.cfg
 [metadata]
 name = $name
 version = $version
 url = https://ailin-nemui.github.io/irssi/
 maintainer = Ailin Nemui
+maintainer_email = @
 license = GNU General Public License v2 or later (GPLv2+)
 
+[check-manifest]
+ignore =
+    pyproject.toml
+$(perl -a -l -n -e '$F[0] eq "#" and $F[1] eq "ignore" and print "    @F[2..$#F]"' MANIFEST.in)
+
 SETUP_CFG
-python3 -c 'from setuptools import *;setup()' sdist --formats=tar
+
+if command -v check-manifest >/dev/null; then
+    echo "Checking MANIFEST.in..."
+    check-manifest --ignore ChangeLog
+else
+    echo "**Warning**: check-manifest not found, did not check MANIFEST.in"
+fi
+
+echo "Creating sdist..."
+python3 -W ignore -c 'from setuptools import *;setup()' --quiet sdist --formats=tar
 
 tar --delete --file "dist/$name-$version.tar" \
     "$name-$version/setup.cfg" \
+    "$name-$version/pyproject.toml" \
     "$name-$version/$name.egg-info" \
     "$name-$version/PKG-INFO"
 
+echo "Zipping..."
 xz -k "dist/$name-$version.tar"
 gzip -k "dist/$name-$version.tar"
 

From bb4859d3d5281aded651260d1b4679056163529b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 11 Mar 2022 08:51:48 +0100
Subject: [PATCH 1395/1650] simplify termux github workflow

---
 .github/workflows/termuxpkg.yml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
index cbf7d3b2..de7ebbb3 100644
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@@ -36,36 +36,17 @@ jobs:
           TERMUX_PKG_DEPENDS="glib, libandroid-glob, libiconv, libotr, ncurses, openssl, perl, utf8proc"
           TERMUX_PKG_BREAKS="irssi"
           TERMUX_PKG_REPLACES="irssi"
+          TERMUX_MESON_PERL_CROSS_FILE=$TERMUX_PKG_TMPDIR/meson-miniperl-cross-$TERMUX_ARCH.txt
           TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
           -Dfhs-prefix=$TERMUX_PREFIX
+          --cross-file $TERMUX_MESON_PERL_CROSS_FILE
           "
 
-          termux_step_configure_meson() {
-              termux_setup_meson
-
-              local perl_version=$(. $TERMUX_SCRIPTDIR/packages/perl/build.sh; echo $TERMUX_PKG_VERSION)
-              local perl_srcdir=$TERMUX_TOPDIR/perl/src
-
-              sed -i "/\\[binaries\\]/a\\
-          perl = ['$perl_srcdir/miniperl', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '-I$TERMUX_PREFIX/lib/perl5/$perl_version']" \
-                  $TERMUX_MESON_CROSSFILE
-
-              CC=gcc CXX=g++ CFLAGS= CXXFLAGS= CPPFLAGS= LDFLAGS= $TERMUX_MESON \
-                $TERMUX_PKG_SRCDIR \
-                $TERMUX_PKG_BUILDDIR \
-                --cross-file $TERMUX_MESON_CROSSFILE \
-                --prefix $TERMUX_PREFIX \
-                --libdir lib \
-                --buildtype minsize \
-                --strip \
-                $TERMUX_PKG_EXTRA_CONFIGURE_ARGS
-          }
-
           termux_step_post_configure() {
+              # Make build log less noisy.
               sed -i "s:-I$TERMUX_PREFIX/:-isystem$TERMUX_PREFIX/:g" $TERMUX_PKG_BUILDDIR/build.ninja
           }
 
-
           termux_step_pre_configure() {
               LDFLAGS+=" -landroid-glob"
 
@@ -74,6 +55,14 @@ jobs:
 
               # Make sure that perl stuff is reinstalled.
               rm -rf $TERMUX_PREFIX/lib/irssi/perl
+
+              local perl_version=$(. $TERMUX_SCRIPTDIR/packages/perl/build.sh; echo $TERMUX_PKG_VERSION)
+              local perl_srcdir=$TERMUX_TOPDIR/perl/src
+
+              cat <<MESON_PERL_CROSS >$TERMUX_MESON_PERL_CROSS_FILE
+          [binaries]
+          perl = ['$perl_srcdir/miniperl', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '-I$TERMUX_PREFIX/lib/perl5/$perl_version']
+          MESON_PERL_CROSS
           }
 
           BUILD_SH

From 8fa2d01a7fb6971993852ea87786c4b7eadf1edc Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 11 Mar 2022 08:56:35 +0100
Subject: [PATCH 1396/1650] fix scroll_page_count settings with .

---
 src/fe-text/gui-readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 8e1b66ff..88ea254b 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -163,7 +163,7 @@ static int get_scroll_count(void)
 	else if (count < 1)
                 count = 1.0/count;
 
-	if (*str == '/') {
+	if (*str == '/' || *str == '.') {
 		count = (active_mainwin->height-active_mainwin->statusbar_lines)/count;
 	}
 	return (int)count;

From 82dd5501843e8311c8017522ddb6971e25dcb79d Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Tue, 8 Mar 2022 16:20:22 +0100
Subject: [PATCH 1397/1650] Clarify the help

---
 docs/help/in/ignore.in         | 4 ++++
 src/fe-common/core/fe-ignore.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 0fbf970d..433490e1 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -14,6 +14,8 @@
     -network:     Ignores only on a specific network.
     -channels:    Ignores only on specific channels.
     -time:        The timeout to automatically remove the ignore.
+                  Accepts units specified in days, hours, minutes, seconds,
+                  milliseconds, or no unit for seconds.
 
     The mask, channels and levels to ignore; if no argument is provided, the
     list of ignores will be displayed.
@@ -44,6 +46,8 @@
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
     /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS
+    /IGNORE -time 5days christmas PUBLICS
+    /IGNORE -time 300 mike PUBLICS
 
 %9See also:%9 ACCEPT, SILENCE, UNIGNORE
 
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 276169df..a3aef880 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -115,9 +115,9 @@ static void cmd_ignore_show(void)
 }
 
 /* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-                  [-network <network>] [-channels <channel>] [-time <secs>] <mask> [<levels>]
+                  [-network <network>] [-channels <channel>] [-time <str>] <mask> [<levels>]
            IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-	          [-network <network>] [-time <secs>] <channels> [<levels>] */
+	          [-network <network>] [-time <str>] <channels> [<levels>] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_ignore(const char *data)
 {

From 344398dd2ad96e5407e408683e51ffd962018437 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Tue, 8 Mar 2022 21:09:52 +0100
Subject: [PATCH 1398/1650] Update SYNTAX

---
 src/fe-common/core/fe-ignore.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index a3aef880..b3ba40f2 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -115,9 +115,9 @@ static void cmd_ignore_show(void)
 }
 
 /* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-                  [-network <network>] [-channels <channel>] [-time <str>] <mask> [<levels>]
+                  [-network <network>] [-channels <channel>] [-time <time>] <mask> [<levels>]
            IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-	          [-network <network>] [-time <str>] <channels> [<levels>] */
+	          [-network <network>] [-time <time>] <channels> [<levels>] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_ignore(const char *data)
 {

From 0c49ba0bda6f8d69bd276e22382c7c4e6d7e43a5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 11 Mar 2022 09:06:37 +0100
Subject: [PATCH 1399/1650] fix clang-format

---
 src/fe-common/core/fe-ignore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index b3ba40f2..3594b6f6 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -117,7 +117,7 @@ static void cmd_ignore_show(void)
 /* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
                   [-network <network>] [-channels <channel>] [-time <time>] <mask> [<levels>]
            IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-	          [-network <network>] [-time <time>] <channels> [<levels>] */
+                  [-network <network>] [-time <time>] <channels> [<levels>] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_ignore(const char *data)
 {

From 884cabd55d7d9658669971a682b3725c29ccea78 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 16 Mar 2022 00:02:29 +0100
Subject: [PATCH 1400/1650] restore irc bound queries

---
 src/fe-common/irc/fe-irc-queries.c | 35 +++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c
index 7a13542a..22aaa145 100644
--- a/src/fe-common/irc/fe-irc-queries.c
+++ b/src/fe-common/irc/fe-irc-queries.c
@@ -24,6 +24,11 @@
 #include <irssi/src/core/servers.h>
 #include <irssi/src/core/queries.h>
 #include <irssi/src/core/nicklist.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-queries.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+
+int query_type;
 
 static QUERY_REC *query_find_address(SERVER_REC *server, const char *address)
 {
@@ -88,14 +93,42 @@ static void event_privmsg(SERVER_REC *server, const char *data,
 	}
 }
 
+static void sig_window_bound_query(SERVER_REC *server)
+{
+	GSList *wtmp, *btmp, *bounds;
+
+	if (!IS_IRC_SERVER(server))
+		return;
+
+	for (wtmp = windows; wtmp != NULL; wtmp = wtmp->next) {
+		WINDOW_REC *win = wtmp->data;
+		bounds = g_slist_copy(win->bound_items);
+
+		for (btmp = bounds; btmp != NULL; btmp = btmp->next) {
+			WINDOW_BIND_REC *bound = btmp->data;
+
+			if (bound->type == query_type &&
+			    g_strcmp0(server->tag, bound->servertag) == 0) {
+				irc_query_create(bound->servertag, bound->name, TRUE);
+			}
+		}
+
+		g_slist_free(bounds);
+	}
+}
+
 void fe_irc_queries_init(void)
 {
-        settings_add_bool("lookandfeel", "query_track_nick_changes", TRUE);
+	query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY");
 
+	settings_add_bool("lookandfeel", "query_track_nick_changes", TRUE);
+
+	signal_add("server connected", sig_window_bound_query);
 	signal_add_first("event privmsg", (SIGNAL_FUNC) event_privmsg);
 }
 
 void fe_irc_queries_deinit(void)
 {
+	signal_remove("server connected", sig_window_bound_query);
 	signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
 }

From 8381e13e4ce593433131cbd8ee5410a225f30456 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 16 Mar 2022 00:07:06 +0100
Subject: [PATCH 1401/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index d63ec3cf..4b86d225 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 45
+#define IRSSI_ABI_VERSION 46
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From cfd421a948ef66aa18851ce73052a96817ef54ef Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 18 Mar 2022 22:00:42 +0100
Subject: [PATCH 1402/1650] update meson requirement, add check for built files

---
 .github/workflows/check.yml |  4 ++--
 INSTALL                     |  2 +-
 README.md                   |  2 +-
 meson.build                 | 33 +++++++++++++++++++--------------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 13c13286..23a06b48 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -41,11 +41,11 @@ jobs:
         include:
           - os: ubuntu-18.04
             builder: meson
-            meson_ver: ==0.49.2
+            meson_ver: ==0.53.2
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.61.2
+            meson_ver: <0.63.0
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK
diff --git a/INSTALL b/INSTALL
index 47cce53f..c2e05416 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@
 
 To compile Irssi you need:
 
-- meson-0.49 build system with ninja-1.5 or greater
+- meson-0.53 build system with ninja-1.8 or greater
 - glib-2.32 or greater
 - openssl (for ssl support)
 - perl-5.6 or greater (for Perl support)
diff --git a/README.md b/README.md
index 7c35f794..0aecac19 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ available.
 
 #### Development source installation
 
-[Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49
+[Ninja](https://ninja-build.org/) 1.8 and [Meson](https://mesonbuild.com/) 0.53
 
 ```
 git clone https://github.com/ailin-nemui/irssi
diff --git a/meson.build b/meson.build
index f8362723..a0a5a648 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('irssi', 'c',
   version : '1.4-head-an',
-  meson_version : '>=0.49',
+  meson_version : '>=0.53',
   default_options : ['warning_level=1'])
 
 ############################
@@ -53,12 +53,17 @@ want_static_dependency = get_option('static-dependency') == 'yes'
 
 package_version     = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version()
 
+fs = import('fs')
+if fs.exists('config.status') or fs.exists('irssi-version.h') or fs.exists('default-config.h') or fs.exists('default-theme.h') or fs.exists('src/perl/irssi-core.pl.h') or fs.exists('src/perl/perl-signals-list.h') or fs.exists('irssi-config.h')
+  error('this tree has been configured with autotools, cannot proceed')
+endif
+
 chat_modules = ['irc']
 
-run_command('mkdir', meson.current_build_dir() / incdir)
-run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir)
+run_command('mkdir', meson.current_build_dir() / incdir, check : false)
+run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir, check : false)
+run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir, check : false)
+run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir, check : false)
 
 def_moduledir  = '-D' + 'MODULEDIR'  + '="' + (get_option('prefix') / moduledir) + '"'
 def_sysconfdir = '-D' + 'SYSCONFDIR' + '="' + (get_option('prefix') / get_option('sysconfdir')) + '"'
@@ -78,7 +83,7 @@ if meson.is_cross_build()
 else
   cross_perl = build_perl
 endif
-run_command(build_perl, files('utils/syntax.pl'))
+run_command(build_perl, files('utils/syntax.pl'), check : true)
 
 ###################
 # irssi-version.h #
@@ -331,7 +336,7 @@ if want_perl
   #### ccopts ####
   perl_ccopts = meson.get_cross_property('perl_ccopts', false)
   if perl_ccopts == false
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts')
+    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts', check : true)
     perl_ccopts = res.stdout().strip().split()
   endif
   foreach fl : perl_ccopts
@@ -345,7 +350,7 @@ if want_perl
   #### ldopts ####
   perl_ldopts = meson.get_cross_property('perl_ldopts', false)
   if perl_ldopts == false
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts')
+    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts', check : true)
     perl_ldopts = res.stdout().strip().split()
   endif
   skip_libs = ['-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic']
@@ -362,7 +367,7 @@ if want_perl
 
   perl_version = meson.get_cross_property('perl_version', false)
   if perl_version == false
-    perl_version = run_command(cross_perl, '-V::version:').stdout().split('\'')[1]
+    perl_version = run_command(cross_perl, '-V::version:', check : true).stdout().split('\'')[1]
   endif
   perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
     version : perl_version)
@@ -386,7 +391,7 @@ int main()
   else
     xsubpp_file_c = meson.get_cross_property('perl_xsubpp', false)
     if xsubpp_file_c == false
-      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
+      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r', check : true).stdout()
     endif
     xsubpp = generator(build_perl,
       output : '@BASENAME@.c',
@@ -396,7 +401,7 @@ int main()
     xsubpp_file = files(xsubpp_file_c)
 
     if with_perl_lib == 'module'
-      perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}').stdout()
+      perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}', check : true).stdout()
       if perl_install_base == ''
         with_perl_lib = ''
       endif
@@ -415,12 +420,12 @@ int main()
       if with_perl_lib in ['site', 'vendor']
         perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', false)
         if perlmoddir == false
-          perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1]
+          perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:', check : true).stdout().split('\'')[1]
         endif
       elif with_perl_lib == 'module'
         perl_archname = meson.get_cross_property('perl_archname', false)
         if perl_archname == false
-          perl_archname = run_command(cross_perl, '-V::archname:').stdout().split('\'')[1]
+          perl_archname = run_command(cross_perl, '-V::archname:', check : true).stdout().split('\'')[1]
         endif
         perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
       endif
@@ -441,7 +446,7 @@ int main()
     if set_perl_use_lib
       perl_inc = meson.get_cross_property('perl_inc', false)
       if perl_inc == false
-        set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0
+        set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib, check : false).returncode() != 0
       else
         set_perl_use_lib = not perl_inc.contains(perl_use_lib)
       endif

From 0bd7fc459c7c9c6f217537fba59524a3cec93d21 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 21 Feb 2022 16:50:10 +0100
Subject: [PATCH 1403/1650] revert branding

---
 NEWS                         |  2 +-
 README.md                    | 24 ++++++++++++------------
 configure.ac                 |  2 +-
 meson.build                  |  2 +-
 src/fe-text/module-formats.c |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index 5464ad05..c81398b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v1.3.2-an 2022-01-14  Ailin Nemui <Nei>
+v1.3.2 2022-xx-xx The Irssi team <staff@irssi.org>
 	- CHANTYPES take precedence over (missing) STATUSMSG in /join
           (#1358, an#54)
 	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
diff --git a/README.md b/README.md
index 21fa14e8..475caeaa 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Neırssi
+# [Irssi](https://irssi.org)
 
-![Build Status](https://github.com/ailin-nemui/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
+![Build Status](https://github.com/irssi/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
 
-Neırssi is a modular text mode chat client mostly compatible with
-[Irssi](https://irssi.org). It comes with IRC support built in, and
-there are third party [ICB](https://github.com/jperkin/irssi-icb),
+Irssi is a modular text mode chat client. It comes with IRC support
+built in, and there are third party
+[ICB](https://github.com/jperkin/irssi-icb),
 [SILC](http://www.silcnet.org/),
 [XMPP](http://cybione.org/~irssi-xmpp/) (Jabber),
 [PSYC](http://about.psyc.eu/Irssyc) and
@@ -13,14 +13,14 @@ available.
 
 ![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
 
-## [Download information](https://ailin-nemui.github.io/irssi/Getting.html)
+## [Download information](https://irssi.org/download/)
 
 #### Development source installation
 
 [Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49
 
 ```
-git clone https://github.com/ailin-nemui/irssi
+git clone https://github.com/irssi/irssi
 cd irssi
 meson Build
 ninja -C Build && sudo ninja -C Build install
@@ -28,7 +28,7 @@ ninja -C Build && sudo ninja -C Build install
 
 #### Release source installation
 
-* Download [release](https://github.com/ailin-nemui/irssi/releases)
+* Download [release](https://github.com/irssi/irssi/releases)
 * Verify signature
 ```
 tar xJf irssi-*.tar.xz
@@ -46,17 +46,17 @@ ninja -C Build && sudo ninja -C Build install
 
 #### See the [INSTALL](INSTALL) file for details
 
-## Documentation
+## [Documentation](https://irssi.org/documentation/)
 
-* [New users guide](https://ailin-nemui.github.io/irssi/New-users.html)
+* [Frequently Asked Questions](https://irssi.org/documentation/faq)
+* [Startup How-To](https://irssi.org/documentation/startup)
 * Check the built-in `/HELP`, it has all the details on command syntax
-* Other random Irssi documentation on https://irssi.org/documentation/
 
 ## [Themes](https://irssi-import.github.io/themes/)
 
 ## [Scripts](https://scripts.irssi.org/)
 
-## [Modules](https://ailin-nemui.github.io/irssi/Modules.html)
+## [Modules](https://irssi.org/modules/)
 
 ## [Security information](https://irssi.org/security/)
 
diff --git a/configure.ac b/configure.ac
index 87dcbc32..c91bde95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.2-an)
+AC_INIT(irssi, 1.3.2)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 64dd04cf..58052054 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.2-an',
+  version : '1.3.2',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e9d4fab9..e9111c2d 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -84,7 +84,7 @@ FORMAT_REC gui_text_formats[] =
 	{ NULL, "Welcome", 0 },
 
 	{ "irssi_banner",
-	  "Neırssi v$J", 0 },
+	  "Irssi v$J", 0 },
 	{ "welcome_firsttime",
 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
 	  "Hi there! If this is your first time using Irssi, you%:"

From 7360944900586b0e0b6e79e581f797a4065ed31b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 19 Apr 2022 10:52:27 +0200
Subject: [PATCH 1404/1650] add new PUBNOTICES level

separating private notices and channel notices
---
 docs/help/in/levels.in               |  3 +-
 src/common.h                         |  2 +-
 src/core/levels.c                    |  3 ++
 src/core/levels.h                    | 39 ++++++++++---------
 src/fe-common/core/fe-queries.c      |  2 +-
 src/fe-common/core/formats.c         |  8 ++--
 src/fe-common/core/window-activity.c |  2 +-
 src/fe-common/irc/fe-irc-messages.c  | 58 +++++++++++++++++-----------
 src/fe-common/irc/module-formats.c   |  4 +-
 src/fe-text/meson.build              |  6 ++-
 src/perl/common/Core.xs              |  7 ++++
 themes/default.theme                 |  1 +
 12 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/docs/help/in/levels.in b/docs/help/in/levels.in
index 99f3070a..63c899cc 100644
--- a/docs/help/in/levels.in
+++ b/docs/help/in/levels.in
@@ -20,9 +20,10 @@
         MODES           A channel mode is modified.
         MSGS            Private messages.
         NICKS           A nickname changes to another nickname.
-        NOTICES         Notices sent from a nickname.
+        NOTICES         Private notices.
         PARTS           A nickname leaves a channel.
         PUBLIC          Public messages in a channel.
+        PUBNOTICES      Public notices in a channel.
         QUITS           A nickname disconnects from IRC.
         SNOTES          Notices sent from a server.
         TOPICS          A channel topic is modified.
diff --git a/src/common.h b/src/common.h
index 4b86d225..6b757ec3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 46
+#define IRSSI_ABI_VERSION 47
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/core/levels.c b/src/core/levels.c
index e62bc68c..0c5e5a12 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -23,10 +23,12 @@
 
 /* the order of these levels must match the bits in levels.h */
 static const char *levels[] = {
+	/* clang-format off */
 	"CRAP",
 	"MSGS",
 	"PUBLICS",
 	"NOTICES",
+	"PUBNOTICES",
 	"SNOTES",
 	"CTCPS",
 	"ACTIONS",
@@ -46,6 +48,7 @@ static const char *levels[] = {
 	"CLIENTERRORS",
 	"HILIGHTS",
 	NULL
+	/* clang-format on */
 };
 
 int level_get(const char *level)
diff --git a/src/core/levels.h b/src/core/levels.h
index 7f1aa931..35cf064c 100644
--- a/src/core/levels.h
+++ b/src/core/levels.h
@@ -13,26 +13,27 @@ enum {
 	MSGLEVEL_MSGS         = 0x0000002,
 	MSGLEVEL_PUBLIC       = 0x0000004,
 	MSGLEVEL_NOTICES      = 0x0000008,
-	MSGLEVEL_SNOTES       = 0x0000010,
-	MSGLEVEL_CTCPS        = 0x0000020,
-	MSGLEVEL_ACTIONS      = 0x0000040,
-	MSGLEVEL_JOINS        = 0x0000080,
-	MSGLEVEL_PARTS        = 0x0000100,
-	MSGLEVEL_QUITS        = 0x0000200,
-	MSGLEVEL_KICKS        = 0x0000400,
-	MSGLEVEL_MODES        = 0x0000800,
-	MSGLEVEL_TOPICS       = 0x0001000,
-	MSGLEVEL_WALLOPS      = 0x0002000,
-	MSGLEVEL_INVITES      = 0x0004000,
-	MSGLEVEL_NICKS        = 0x0008000,
-	MSGLEVEL_DCC          = 0x0010000,
-	MSGLEVEL_DCCMSGS      = 0x0020000,
-	MSGLEVEL_CLIENTNOTICE = 0x0040000,
-	MSGLEVEL_CLIENTCRAP   = 0x0080000,
-	MSGLEVEL_CLIENTERROR  = 0x0100000,
-	MSGLEVEL_HILIGHT      = 0x0200000,
+	MSGLEVEL_PUBNOTICES   = 0x0000010,
+	MSGLEVEL_SNOTES       = 0x0000020,
+	MSGLEVEL_CTCPS        = 0x0000040,
+	MSGLEVEL_ACTIONS      = 0x0000080,
+	MSGLEVEL_JOINS        = 0x0000100,
+	MSGLEVEL_PARTS        = 0x0000200,
+	MSGLEVEL_QUITS        = 0x0000400,
+	MSGLEVEL_KICKS        = 0x0000800,
+	MSGLEVEL_MODES        = 0x0001000,
+	MSGLEVEL_TOPICS       = 0x0002000,
+	MSGLEVEL_WALLOPS      = 0x0004000,
+	MSGLEVEL_INVITES      = 0x0008000,
+	MSGLEVEL_NICKS        = 0x0010000,
+	MSGLEVEL_DCC          = 0x0020000,
+	MSGLEVEL_DCCMSGS      = 0x0040000,
+	MSGLEVEL_CLIENTNOTICE = 0x0080000,
+	MSGLEVEL_CLIENTCRAP   = 0x0100000,
+	MSGLEVEL_CLIENTERROR  = 0x0200000,
+	MSGLEVEL_HILIGHT      = 0x0400000,
 
-	MSGLEVEL_ALL          = 0x03fffff,
+	MSGLEVEL_ALL          = 0x07fffff,
 
 	MSGLEVEL_NOHILIGHT    = 0x1000000, /* Don't highlight this message */
 	MSGLEVEL_NO_ACT       = 0x2000000, /* Don't trigger channel activity */
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 77f07474..dce53804 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -355,7 +355,7 @@ static void read_settings(void)
 
 void fe_queries_init(void)
 {
-	settings_add_level("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS");
+	settings_add_level("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS NOTICES");
 	settings_add_bool("lookandfeel", "autocreate_own_query", TRUE);
 	settings_add_time("lookandfeel", "autoclose_query", "0");
 
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index cc8455eb..4b26ca81 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -921,10 +921,10 @@ char *format_add_lineend(const char *text, const char *linestart)
 #define LINE_START_IRSSI_LEVEL \
 	(MSGLEVEL_CLIENTERROR | MSGLEVEL_CLIENTNOTICE)
 
-#define NOT_LINE_START_LEVEL \
-	(MSGLEVEL_NEVER | MSGLEVEL_LASTLOG | MSGLEVEL_CLIENTCRAP | \
-	MSGLEVEL_MSGS | MSGLEVEL_PUBLIC | MSGLEVEL_DCC | MSGLEVEL_DCCMSGS | \
-	MSGLEVEL_ACTIONS | MSGLEVEL_NOTICES | MSGLEVEL_SNOTES | MSGLEVEL_CTCPS)
+#define NOT_LINE_START_LEVEL                                                                       \
+	(MSGLEVEL_NEVER | MSGLEVEL_LASTLOG | MSGLEVEL_CLIENTCRAP | MSGLEVEL_MSGS |                 \
+	 MSGLEVEL_PUBLIC | MSGLEVEL_DCC | MSGLEVEL_DCCMSGS | MSGLEVEL_ACTIONS | MSGLEVEL_NOTICES | \
+	 MSGLEVEL_PUBNOTICES | MSGLEVEL_SNOTES | MSGLEVEL_CTCPS)
 
 /* return the "-!- " text at the start of the line */
 char *format_get_level_tag(THEME_REC *theme, TEXT_DEST_REC *dest)
diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 7a2903fd..2884c3eb 100644
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@@ -143,7 +143,7 @@ void window_activity_init(void)
 {
 	settings_add_str("lookandfeel", "activity_hide_targets", "");
 	settings_add_level("lookandfeel", "activity_hide_level", "");
-	settings_add_level("lookandfeel", "activity_msg_level", "PUBLIC");
+	settings_add_level("lookandfeel", "activity_msg_level", "PUBLIC NOTICES");
 	settings_add_level("lookandfeel", "activity_hilight_level", "MSGS DCCMSGS");
 	signal_window_hilight_check = signal_get_uniq_id("window hilight check");
 
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 2e71b34f..8a4094a9 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -269,13 +269,22 @@ static char *notice_channel_context(SERVER_REC *server, const char *msg)
 
 static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, const char *target)
 {
-	char *channel;
+	gboolean is_public;
+	const char *cleantarget;
+	char *context_channel;
+
+	cleantarget = fe_channel_skip_prefix(server, target);
+	is_public = server_ischannel(SERVER(server), cleantarget);
 	/* check if this is a cnotice */
-	channel = notice_channel_context((SERVER_REC *) server, msg);
-	printformat(server, channel != NULL ? channel : fe_channel_skip_prefix(server, target),
-	            MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, IRCTXT_OWN_NOTICE,
-	            target, msg);
-	g_free(channel);
+	context_channel = is_public ? NULL : notice_channel_context((SERVER_REC *) server, msg);
+
+	printformat(
+	    server, context_channel != NULL ? context_channel : cleantarget,
+	    (is_public || context_channel != NULL ? MSGLEVEL_PUBNOTICES : MSGLEVEL_NOTICES) |
+	        MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
+	    IRCTXT_OWN_NOTICE, target, msg);
+
+	g_free(context_channel);
 }
 
 static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
@@ -283,7 +292,9 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 				   const char *target)
 {
 	const char *oldtarget;
-	int level = MSGLEVEL_NOTICES;
+	char *context_channel;
+	int level;
+	gboolean is_public;
 
 	oldtarget = target;
 	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
@@ -299,29 +310,32 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
                 return;
 	}
 
-	if (ignore_check_plus(server, nick, address,
-			 server_ischannel(SERVER(server), target) ? target : NULL,
-			      msg, &level, TRUE))
+	is_public = server_ischannel(SERVER(server), target);
+	/* check if this is a cnotice */
+	context_channel = is_public ? NULL : notice_channel_context(server, msg);
+	level = (is_public || context_channel != NULL) ? MSGLEVEL_PUBNOTICES : MSGLEVEL_NOTICES;
+
+	if (ignore_check_plus(server, nick, address, is_public ? target : context_channel, msg,
+	                      &level, TRUE)) {
+		g_free(context_channel);
 		return;
+	}
 
-	if (server_ischannel(SERVER(server), target)) {
+	if (is_public) {
 		/* notice in some channel */
-		printformat(server, target, level,
-			    IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
+		char *nickmode;
+		nickmode = channel_get_nickmode(channel_find(server, target), nick);
+		printformat(server, target, level, IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg,
+		            nickmode);
 	} else {
-		char *channel;
-		/* check if this is a cnotice */
-		channel = notice_channel_context(server, msg);
-
-		if (channel == NULL) {
+		if (context_channel == NULL) {
 			/* private notice */
 			privmsg_get_query(SERVER(server), nick, FALSE, MSGLEVEL_NOTICES);
 		}
-		printformat(server, channel == NULL ? nick : channel, level, IRCTXT_NOTICE_PRIVATE,
-		            nick, address, msg);
-
-		g_free(channel);
+		printformat(server, context_channel == NULL ? nick : context_channel, level,
+		            IRCTXT_NOTICE_PRIVATE, nick, address, msg);
 	}
+	g_free(context_channel);
 }
 
 static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd,
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 1a96cbce..12a94463 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -137,8 +137,8 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ NULL, "Received messages", 0 },
 
 	{ "notice_server", "{servernotice $0}$1", 2, { 0, 0 } },
-	{ "notice_public", "{notice $0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
-	{ "notice_private", "{notice $0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
+	{ "notice_public", "{pubnotice $3 $0}$2", 4, { 0, 0, 0, 0 } },
+	{ "notice_private", "{notice $0}$2", 3, { 0, 0, 0 } },
 	{ "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } },
 	{ "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } },
 	{ "action_public", "{pubaction $0}$1", 2, { 0, 0 } },
diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 312cb85d..94990c82 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -27,7 +27,11 @@ executable('irssi',
     'textbuffer-view.c',
     'textbuffer.c',
   )
-  + [ irssi_version_h ],
+  + [
+    irssi_version_h,
+    default_config_h,
+    default_theme_h,
+  ],
   include_directories : rootinc,
   implicit_include_directories : false,
   export_dynamic : true,
diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index 9e582a70..94a8398a 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -322,6 +322,13 @@ CODE:
 OUTPUT:
 	RETVAL
 
+int
+MSGLEVEL_PUBNOTICES()
+CODE:
+	RETVAL = MSGLEVEL_PUBNOTICES;
+OUTPUT:
+	RETVAL
+
 int
 MSGLEVEL_SNOTES()
 CODE:
diff --git a/themes/default.theme b/themes/default.theme
index 79b1af55..a08caefa 100644
--- a/themes/default.theme
+++ b/themes/default.theme
@@ -202,6 +202,7 @@ abstracts = {
   # notices
   ownnotice = "[%r$0%K(%R$1-%K)]%n ";
   notice = "%K-%M$*%K-%n ";
+  pubnotice = "%K-%M$0$1-%K-%n %|";
   pubnotice_channel = "%K:%m$*";
   pvtnotice_host = "%K(%m$*%K)";
   servernotice = "%g!$*%n ";

From 3a3301e19ba1a81a2653f1f3b062415eef684ca2 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Fri, 1 Apr 2022 15:52:54 +0200
Subject: [PATCH 1405/1650] Format RPL_HELPSTART/RPL_HELPTXT/RPL_ENDOFHELP

They are typical replies when using the HELP command.
---
 src/fe-common/irc/fe-events-numeric.c | 51 +++++++++++++++++++++++++++
 src/fe-common/irc/module-formats.c    |  3 ++
 src/fe-common/irc/module-formats.h    |  7 ++--
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index f78289c0..efe0cfa8 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -554,6 +554,54 @@ static void event_489(IRC_SERVER_REC *server, const char *data, const char *nick
 	g_free(params);
 }
 
+static void event_help(IRC_SERVER_REC *server, int formatnum, const char *data) {
+	/* Common handling for umerics 704 (RPL_HELPSTART), 705 (RPL_HELPTXT),
+	 * and 706 (RPL_ENDOFHELP); sent as a reply to HELP or HELPOP command.
+	 */
+	char *params, *topic, *help_text;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 3, NULL, &topic, &help_text);
+
+	g_return_if_fail(help_text != NULL);
+
+	if (help_text[0] == '\0') {
+		/* Empty lines can be used by servers for styling; and we need to replace
+		 * them with something non-empty or they would be dropped when displayed.
+		 */
+		help_text = " ";
+	}
+
+	printformat(server, NULL, MSGLEVEL_CRAP, formatnum,
+			topic, help_text);
+	g_free(params);
+}
+
+static void event_helpstart(IRC_SERVER_REC *server, const char *data,
+		      const char *nick)
+{
+	/* Numeric 704 (RPL_HELPSTART) sent as a reply to HELP or HELPOP command.
+	 */
+	event_help(server, IRCTXT_HELP_START, data);
+}
+
+static void event_helptxt(IRC_SERVER_REC *server, const char *data,
+		      const char *nick)
+{
+	/* Numeric 705 (RPL_HELPTXT), sent as a reply to HELP or HELPOP command.
+	 */
+	event_help(server, IRCTXT_HELP_TXT, data);
+}
+
+static void event_endofhelp(IRC_SERVER_REC *server, const char *data,
+		      const char *nick)
+{
+	/* Numeric 706 (RPL_ENDOFHELP), sent as a reply to HELP or HELPOP command.
+	 */
+	event_help(server, IRCTXT_END_OF_HELP, data);
+}
+
 static void event_target_too_fast(IRC_SERVER_REC *server, const char *data,
 		      const char *nick)
 {
@@ -713,6 +761,9 @@ void fe_events_numeric_init(void)
 	signal_add("event 372", (SIGNAL_FUNC) event_motd);
 	signal_add("event 422", (SIGNAL_FUNC) event_motd);
 	signal_add("event 439", (SIGNAL_FUNC) event_target_too_fast);
+	signal_add("event 704", (SIGNAL_FUNC) event_helpstart);
+	signal_add("event 705", (SIGNAL_FUNC) event_helptxt);
+	signal_add("event 706", (SIGNAL_FUNC) event_endofhelp);
 	signal_add("event 707", (SIGNAL_FUNC) event_target_too_fast);
 
         signal_add("default event numeric", (SIGNAL_FUNC) event_numeric);
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 12a94463..baf9e5a4 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -89,6 +89,9 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
+	{ "irctxt_help_start", "$1", 2, { 0, 0 } },
+	{ "irctxt_help_txt", "$1", 2, { 0, 0 } },
+	{ "irctxt_end_of_help", "$1", 2, { 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Nick", 0 },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 5abd04a4..21bf4594 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -66,6 +66,9 @@ enum {
 	IRCTXT_INVITELIST_LONG,
 	IRCTXT_NO_SUCH_CHANNEL,
 	IRCTXT_CHANNEL_SYNCED,
+	IRCTXT_HELP_START,
+	IRCTXT_HELP_TXT,
+	IRCTXT_END_OF_HELP,
 
 	IRCTXT_FILL_4,
 
@@ -89,7 +92,7 @@ enum {
 	IRCTXT_WHOIS_OPER,
 	IRCTXT_WHOIS_MODES,
 	IRCTXT_WHOIS_REALHOST,
-        IRCTXT_WHOIS_USERMODE,
+	IRCTXT_WHOIS_USERMODE,
 	IRCTXT_WHOIS_CHANNELS,
 	IRCTXT_WHOIS_AWAY,
 	IRCTXT_WHOIS_SPECIAL,
@@ -143,7 +146,7 @@ enum {
 	IRCTXT_SILENCED,
 	IRCTXT_UNSILENCED,
 	IRCTXT_SILENCE_LINE,
-        IRCTXT_ASK_OPER_PASS,
+	IRCTXT_ASK_OPER_PASS,
 	IRCTXT_ACCEPT_LIST
 };
 /* clang-format on */

From 1415ef5389bbe14f515dec1939ffd4a487029e19 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Wed, 6 Apr 2022 09:19:03 +0200
Subject: [PATCH 1406/1650] Add ERR_HELPNOTFOUND

---
 src/fe-common/irc/fe-events-numeric.c | 9 +++++++++
 src/fe-common/irc/module-formats.c    | 1 +
 src/fe-common/irc/module-formats.h    | 1 +
 3 files changed, 11 insertions(+)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index efe0cfa8..63d11970 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -578,6 +578,14 @@ static void event_help(IRC_SERVER_REC *server, int formatnum, const char *data)
 	g_free(params);
 }
 
+static void event_helpnotfound(IRC_SERVER_REC *server, const char *data,
+		      const char *nick)
+{
+	/* Numeric 524 (ERR_HELPNOTFOUND) sent as a reply to HELP or HELPOP command.
+	 */
+	event_help(server, IRCTXT_HELP_NOT_FOUND, data);
+}
+
 static void event_helpstart(IRC_SERVER_REC *server, const char *data,
 		      const char *nick)
 {
@@ -761,6 +769,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 372", (SIGNAL_FUNC) event_motd);
 	signal_add("event 422", (SIGNAL_FUNC) event_motd);
 	signal_add("event 439", (SIGNAL_FUNC) event_target_too_fast);
+	signal_add("event 524", (SIGNAL_FUNC) event_helpnotfound);
 	signal_add("event 704", (SIGNAL_FUNC) event_helpstart);
 	signal_add("event 705", (SIGNAL_FUNC) event_helptxt);
 	signal_add("event 706", (SIGNAL_FUNC) event_endofhelp);
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index baf9e5a4..131676c5 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -89,6 +89,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
+	{ "irctxt_help_not_found", "$1", 2, { 0, 0 } },
 	{ "irctxt_help_start", "$1", 2, { 0, 0 } },
 	{ "irctxt_help_txt", "$1", 2, { 0, 0 } },
 	{ "irctxt_end_of_help", "$1", 2, { 0, 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 21bf4594..d2e7c1e2 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -66,6 +66,7 @@ enum {
 	IRCTXT_INVITELIST_LONG,
 	IRCTXT_NO_SUCH_CHANNEL,
 	IRCTXT_CHANNEL_SYNCED,
+	IRCTXT_HELP_NOT_FOUND,
 	IRCTXT_HELP_START,
 	IRCTXT_HELP_TXT,
 	IRCTXT_END_OF_HELP,

From 41b3895ce3ca798c3a110ab84131ddb2756d42a6 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Wed, 6 Apr 2022 09:19:15 +0200
Subject: [PATCH 1407/1650] Free signals

---
 src/fe-common/irc/fe-events-numeric.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 63d11970..b1c226c9 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -868,6 +868,10 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 372", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 422", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 439", (SIGNAL_FUNC) event_target_too_fast);
+	signal_remove("event 524", (SIGNAL_FUNC) event_helpnotfound);
+	signal_remove("event 704", (SIGNAL_FUNC) event_helpstart);
+	signal_remove("event 705", (SIGNAL_FUNC) event_helptxt);
+	signal_remove("event 706", (SIGNAL_FUNC) event_endofhelp);
 	signal_remove("event 707", (SIGNAL_FUNC) event_target_too_fast);
 
         signal_remove("default event numeric", (SIGNAL_FUNC) event_numeric);

From 48571389c7dd652eecd34a38d97bbd89a352ce80 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Wed, 20 Apr 2022 22:42:21 +0200
Subject: [PATCH 1408/1650] Revert "Add ERR_HELPNOTFOUND"

This reverts commit 91439c099e1bbf848dac03f67a3239fcc4c1f771;
because it adds handling for numeric 524, which conflicts with
ERR_QUARANTINED and ERR_OPERSPVERIFY.
---
 src/fe-common/irc/fe-events-numeric.c | 10 ----------
 src/fe-common/irc/module-formats.c    |  1 -
 src/fe-common/irc/module-formats.h    |  1 -
 3 files changed, 12 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index b1c226c9..90d87b46 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -578,14 +578,6 @@ static void event_help(IRC_SERVER_REC *server, int formatnum, const char *data)
 	g_free(params);
 }
 
-static void event_helpnotfound(IRC_SERVER_REC *server, const char *data,
-		      const char *nick)
-{
-	/* Numeric 524 (ERR_HELPNOTFOUND) sent as a reply to HELP or HELPOP command.
-	 */
-	event_help(server, IRCTXT_HELP_NOT_FOUND, data);
-}
-
 static void event_helpstart(IRC_SERVER_REC *server, const char *data,
 		      const char *nick)
 {
@@ -769,7 +761,6 @@ void fe_events_numeric_init(void)
 	signal_add("event 372", (SIGNAL_FUNC) event_motd);
 	signal_add("event 422", (SIGNAL_FUNC) event_motd);
 	signal_add("event 439", (SIGNAL_FUNC) event_target_too_fast);
-	signal_add("event 524", (SIGNAL_FUNC) event_helpnotfound);
 	signal_add("event 704", (SIGNAL_FUNC) event_helpstart);
 	signal_add("event 705", (SIGNAL_FUNC) event_helptxt);
 	signal_add("event 706", (SIGNAL_FUNC) event_endofhelp);
@@ -868,7 +859,6 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 372", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 422", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 439", (SIGNAL_FUNC) event_target_too_fast);
-	signal_remove("event 524", (SIGNAL_FUNC) event_helpnotfound);
 	signal_remove("event 704", (SIGNAL_FUNC) event_helpstart);
 	signal_remove("event 705", (SIGNAL_FUNC) event_helptxt);
 	signal_remove("event 706", (SIGNAL_FUNC) event_endofhelp);
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 131676c5..baf9e5a4 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -89,7 +89,6 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
-	{ "irctxt_help_not_found", "$1", 2, { 0, 0 } },
 	{ "irctxt_help_start", "$1", 2, { 0, 0 } },
 	{ "irctxt_help_txt", "$1", 2, { 0, 0 } },
 	{ "irctxt_end_of_help", "$1", 2, { 0, 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index d2e7c1e2..21bf4594 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -66,7 +66,6 @@ enum {
 	IRCTXT_INVITELIST_LONG,
 	IRCTXT_NO_SUCH_CHANNEL,
 	IRCTXT_CHANNEL_SYNCED,
-	IRCTXT_HELP_NOT_FOUND,
 	IRCTXT_HELP_START,
 	IRCTXT_HELP_TXT,
 	IRCTXT_END_OF_HELP,

From f684c1886791a3f3f9b3d03b13a8091af3a27aac Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Wed, 20 Apr 2022 23:00:33 +0200
Subject: [PATCH 1409/1650] s/irctxt_/server_/

---
 src/fe-common/irc/module-formats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index baf9e5a4..9432c5f9 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -89,9 +89,9 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
-	{ "irctxt_help_start", "$1", 2, { 0, 0 } },
-	{ "irctxt_help_txt", "$1", 2, { 0, 0 } },
-	{ "irctxt_end_of_help", "$1", 2, { 0, 0 } },
+	{ "server_help_start", "$1", 2, { 0, 0 } },
+	{ "server_help_txt", "$1", 2, { 0, 0 } },
+	{ "server_end_of_help", "$1", 2, { 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Nick", 0 },

From ba16d71e9fa01cea5f2442c9635dedfee8b73a13 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 21 Apr 2022 13:18:50 +0200
Subject: [PATCH 1410/1650] add SERVER_ to constants

---
 src/fe-common/irc/fe-events-numeric.c | 6 +++---
 src/fe-common/irc/module-formats.h    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 90d87b46..f643b949 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -583,7 +583,7 @@ static void event_helpstart(IRC_SERVER_REC *server, const char *data,
 {
 	/* Numeric 704 (RPL_HELPSTART) sent as a reply to HELP or HELPOP command.
 	 */
-	event_help(server, IRCTXT_HELP_START, data);
+	event_help(server, IRCTXT_SERVER_HELP_START, data);
 }
 
 static void event_helptxt(IRC_SERVER_REC *server, const char *data,
@@ -591,7 +591,7 @@ static void event_helptxt(IRC_SERVER_REC *server, const char *data,
 {
 	/* Numeric 705 (RPL_HELPTXT), sent as a reply to HELP or HELPOP command.
 	 */
-	event_help(server, IRCTXT_HELP_TXT, data);
+	event_help(server, IRCTXT_SERVER_HELP_TXT, data);
 }
 
 static void event_endofhelp(IRC_SERVER_REC *server, const char *data,
@@ -599,7 +599,7 @@ static void event_endofhelp(IRC_SERVER_REC *server, const char *data,
 {
 	/* Numeric 706 (RPL_ENDOFHELP), sent as a reply to HELP or HELPOP command.
 	 */
-	event_help(server, IRCTXT_END_OF_HELP, data);
+	event_help(server, IRCTXT_SERVER_END_OF_HELP, data);
 }
 
 static void event_target_too_fast(IRC_SERVER_REC *server, const char *data,
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 21bf4594..a9d29cb0 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -66,9 +66,9 @@ enum {
 	IRCTXT_INVITELIST_LONG,
 	IRCTXT_NO_SUCH_CHANNEL,
 	IRCTXT_CHANNEL_SYNCED,
-	IRCTXT_HELP_START,
-	IRCTXT_HELP_TXT,
-	IRCTXT_END_OF_HELP,
+	IRCTXT_SERVER_HELP_START,
+	IRCTXT_SERVER_HELP_TXT,
+	IRCTXT_SERVER_END_OF_HELP,
 
 	IRCTXT_FILL_4,
 

From 4f1e5f35a32b6e86cd0ef100b6a8fbd1b70b0355 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 21 Apr 2022 14:01:42 +0200
Subject: [PATCH 1411/1650] fix formatting

---
 src/fe-common/irc/fe-events-numeric.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index f643b949..34ba3fe7 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -554,7 +554,8 @@ static void event_489(IRC_SERVER_REC *server, const char *data, const char *nick
 	g_free(params);
 }
 
-static void event_help(IRC_SERVER_REC *server, int formatnum, const char *data) {
+static void event_help(IRC_SERVER_REC *server, int formatnum, const char *data)
+{
 	/* Common handling for umerics 704 (RPL_HELPSTART), 705 (RPL_HELPTXT),
 	 * and 706 (RPL_ENDOFHELP); sent as a reply to HELP or HELPOP command.
 	 */
@@ -573,29 +574,25 @@ static void event_help(IRC_SERVER_REC *server, int formatnum, const char *data)
 		help_text = " ";
 	}
 
-	printformat(server, NULL, MSGLEVEL_CRAP, formatnum,
-			topic, help_text);
+	printformat(server, NULL, MSGLEVEL_CRAP, formatnum, topic, help_text);
 	g_free(params);
 }
 
-static void event_helpstart(IRC_SERVER_REC *server, const char *data,
-		      const char *nick)
+static void event_helpstart(IRC_SERVER_REC *server, const char *data, const char *nick)
 {
 	/* Numeric 704 (RPL_HELPSTART) sent as a reply to HELP or HELPOP command.
 	 */
 	event_help(server, IRCTXT_SERVER_HELP_START, data);
 }
 
-static void event_helptxt(IRC_SERVER_REC *server, const char *data,
-		      const char *nick)
+static void event_helptxt(IRC_SERVER_REC *server, const char *data, const char *nick)
 {
 	/* Numeric 705 (RPL_HELPTXT), sent as a reply to HELP or HELPOP command.
 	 */
 	event_help(server, IRCTXT_SERVER_HELP_TXT, data);
 }
 
-static void event_endofhelp(IRC_SERVER_REC *server, const char *data,
-		      const char *nick)
+static void event_endofhelp(IRC_SERVER_REC *server, const char *data, const char *nick)
 {
 	/* Numeric 706 (RPL_ENDOFHELP), sent as a reply to HELP or HELPOP command.
 	 */

From 49479f151cae6d282d588a62d590696048b0912c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 21 Apr 2022 22:18:33 +0200
Subject: [PATCH 1412/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 6b757ec3..a6dfd3b9 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 47
+#define IRSSI_ABI_VERSION 48
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 37e65ba16887becc1fe3b8b59a7b457758c6cdab Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 24 Apr 2022 15:40:20 +0200
Subject: [PATCH 1413/1650] new SHELP default alias

---
 irssi.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/irssi.conf b/irssi.conf
index 21c3ba4c..010520fd 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -147,6 +147,7 @@ aliases = {
   SAY         = "MSG *";
   SB          = "SCROLLBACK";
   SBAR        = "STATUSBAR";
+  SHELP       = "QUOTE HELP";
   SIGNOFF     = "QUIT";
   SV          = "MSG * Irssi $J ($V) - https://irssi.org";
   T           = "TOPIC"; 

From 2f700bebc7dcd89ad893f1b4a288987419daeec9 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sun, 24 Apr 2022 20:07:30 +0000
Subject: [PATCH 1414/1650] NEWS: remove 2 lines that would be confusing

---
 NEWS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/NEWS b/NEWS
index c81398b2..5b2040e8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,12 +4,10 @@ v1.3.2 2022-xx-xx The Irssi team <staff@irssi.org>
 	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
           an#56)
 
-v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
 	- Minor help fixes (an#51, an#52)
 	- Fix regression where own channel status was forgotten after
           /UPGRADE (#1357, an#53)
 
-v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1034,
           #1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed

From 6d2cfc24b7e1a254d5cdb0202a55d58973c9da33 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sun, 24 Apr 2022 20:40:01 +0000
Subject: [PATCH 1415/1650] Clean up remaining branding reverts

---
 README.md                    | 4 ++--
 src/fe-text/module-formats.c | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 475caeaa..ea4b817b 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ ninja -C Build && sudo ninja -C Build install
 #### Release source installation
 
 * Download [release](https://github.com/irssi/irssi/releases)
-* Verify signature
+* [Verify](https://irssi.org/download/#release-sources) signature
 ```
 tar xJf irssi-*.tar.xz
 cd irssi-*
@@ -62,7 +62,7 @@ ninja -C Build && sudo ninja -C Build install
 
 Please report security issues to staff@irssi.org. Thanks!
 
-## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / Contributing
+## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / [Contributing](https://irssi.org/development/)
 
 Check the GitHub issues if it is already listed in there; if not, open
 an issue on GitHub or send a mail to [staff@irssi.org](mailto:staff@irssi.org).
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e9111c2d..7cdc5654 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -84,7 +84,11 @@ FORMAT_REC gui_text_formats[] =
 	{ NULL, "Welcome", 0 },
 
 	{ "irssi_banner",
-	  "Irssi v$J", 0 },
+	  " ___           _%:"
+	  "|_ _|_ _ _____(_)%:"
+	  " | || '_(_-<_-< |%:"
+	  "|___|_| /__/__/_|%:"
+	  "Irssi v$J - https://irssi.org", 0 },
 	{ "welcome_firsttime",
 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
 	  "Hi there! If this is your first time using Irssi, you%:"

From 9f71a391c3e1c61eb71be22fe4226b783dc03096 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 18 May 2022 15:44:08 +0200
Subject: [PATCH 1416/1650] test OBS workflow

---
 .obs/workflows.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .obs/workflows.yml

diff --git a/.obs/workflows.yml b/.obs/workflows.yml
new file mode 100644
index 00000000..de815226
--- /dev/null
+++ b/.obs/workflows.yml
@@ -0,0 +1,13 @@
+workflow:
+  steps:
+    - branch_package:
+        source_project: home:ailin_nemui:irssi-git-an
+        source_package: irssi-git-an
+        target_project: home:ailin_nemui:CI
+    - set_flags:
+        flags:
+          - type: publish
+            status: enable
+            project: home:ailin_nemui:CI
+  filters:
+    event: pull_request

From 5b340d7d2bac0e1f400121cb019bda0a8b378bd9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 19 May 2022 14:54:15 +0200
Subject: [PATCH 1417/1650] stop IRC names when using /names

---
 src/fe-common/core/fe-channels.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 2d4e9ece..220737b7 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -646,7 +646,7 @@ void fe_channels_init(void)
 	command_bind("channel modify", NULL, (SIGNAL_FUNC) cmd_channel_modify);
 	command_bind("channel remove", NULL, (SIGNAL_FUNC) cmd_channel_remove);
 	command_bind("channel list", NULL, (SIGNAL_FUNC) cmd_channel_list);
-	command_bind("names", NULL, (SIGNAL_FUNC) cmd_names);
+	command_bind_first("names", NULL, (SIGNAL_FUNC) cmd_names);
 	command_bind("cycle", NULL, (SIGNAL_FUNC) cmd_cycle);
 
 	command_set_options("channel add", "auto noauto -bots -botcmd");

From 66e3b0e578320947f618df92dc17976099c83664 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 18 May 2022 09:29:27 +0200
Subject: [PATCH 1418/1650] avoid memory leak in ignore cache

#1373
---
 src/common.h                      |  2 +-
 src/core/ignore.c                 |  7 ++++++-
 src/core/nickmatch-cache.c        | 12 +++++++-----
 src/core/nickmatch-cache.h        |  3 ++-
 src/fe-common/core/hilight-text.c |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/common.h b/src/common.h
index a6dfd3b9..1d4fd207 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 48
+#define IRSSI_ABI_VERSION 49
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/core/ignore.c b/src/core/ignore.c
index 0bc12ed3..da892c1e 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -490,6 +490,11 @@ static void read_ignores(void)
 	nickmatch_rebuild(nickmatch);
 }
 
+static void free_cache_matches(GSList *matches)
+{
+	g_slist_free(matches);
+}
+
 static void ignore_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 			      NICK_REC *nick)
 {
@@ -520,7 +525,7 @@ static void ignore_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 void ignore_init(void)
 {
 	ignores = NULL;
-	nickmatch = nickmatch_init(ignore_nick_cache);
+	nickmatch = nickmatch_init(ignore_nick_cache, (GDestroyNotify) free_cache_matches);
 	time_tag = g_timeout_add(1000, (GSourceFunc) unignore_timeout, NULL);
 
         read_ignores();
diff --git a/src/core/nickmatch-cache.c b/src/core/nickmatch-cache.c
index cae6620d..c8fc1157 100644
--- a/src/core/nickmatch-cache.c
+++ b/src/core/nickmatch-cache.c
@@ -28,12 +28,13 @@
 
 static GSList *lists;
 
-NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func)
+NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func, GDestroyNotify value_destroy_func)
 {
 	NICKMATCH_REC *rec;
 
 	rec = g_new0(NICKMATCH_REC, 1);
 	rec->func = func;
+	rec->value_destroy_func = value_destroy_func;
 
 	lists = g_slist_append(lists, rec);
         return rec;
@@ -43,8 +44,9 @@ void nickmatch_deinit(NICKMATCH_REC *rec)
 {
 	lists = g_slist_remove(lists, rec);
 
-        g_hash_table_destroy(rec->nicks);
-        g_free(rec);
+	if (rec->nicks != NULL)
+		g_hash_table_destroy(rec->nicks);
+	g_free(rec);
 }
 
 static void nickmatch_check_channel(CHANNEL_REC *channel, NICKMATCH_REC *rec)
@@ -65,8 +67,8 @@ void nickmatch_rebuild(NICKMATCH_REC *rec)
 	if (rec->nicks != NULL)
 		g_hash_table_destroy(rec->nicks);
 
-	rec->nicks = g_hash_table_new((GHashFunc) g_direct_hash,
-				      (GCompareFunc) g_direct_equal);
+	rec->nicks = g_hash_table_new_full((GHashFunc) g_direct_hash, (GCompareFunc) g_direct_equal,
+	                                   NULL, (GDestroyNotify) rec->value_destroy_func);
 
 	g_slist_foreach(channels, (GFunc) nickmatch_check_channel, rec);
 }
diff --git a/src/core/nickmatch-cache.h b/src/core/nickmatch-cache.h
index ff58d853..bae99c1d 100644
--- a/src/core/nickmatch-cache.h
+++ b/src/core/nickmatch-cache.h
@@ -7,9 +7,10 @@ typedef void (*NICKMATCH_REBUILD_FUNC) (GHashTable *list,
 typedef struct {
         GHashTable *nicks;
 	NICKMATCH_REBUILD_FUNC func;
+	GDestroyNotify value_destroy_func;
 } NICKMATCH_REC;
 
-NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func);
+NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func, GDestroyNotify value_destroy_func);
 void nickmatch_deinit(NICKMATCH_REC *rec);
 
 /* Calls rebuild function for all nicks in all channels.
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index d308bd04..66e2dfd3 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -793,7 +793,7 @@ void hilight_text_init(void)
 
 	read_settings();
 
-	nickmatch = nickmatch_init(hilight_nick_cache);
+	nickmatch = nickmatch_init(hilight_nick_cache, NULL);
 	read_hilight_config();
 
 	signal_add_first("print text", (SIGNAL_FUNC) sig_print_text);

From ff0e76bbb9473bd560a5028b07d7b4755387a9c5 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 10 Oct 2021 22:16:46 +0200
Subject: [PATCH 1419/1650] Merge pull request #45 from
 ailin-nemui/server-outgoing

simplify duplicate code in outgoing modify

(cherry picked from commit f5d74bd81bbe6cb39588e6d0ad9276ad8f7ac02a)
---
 src/common.h               |  2 +-
 src/irc/core/irc-servers.c | 65 ++++++++++++++++++++++----------------
 src/irc/core/irc-servers.h |  1 +
 src/irc/core/irc.c         | 28 +---------------
 4 files changed, 40 insertions(+), 56 deletions(-)

diff --git a/src/common.h b/src/common.h
index d2dd2f7c..f7719e1f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 41
+#define IRSSI_ABI_VERSION 42
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 092eb7af..92c9d5f1 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -712,37 +712,12 @@ void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
 	}
 }
 
-static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
+void irc_server_send_and_redirect(IRC_SERVER_REC *server, GString *str, REDIRECT_REC *redirect)
 {
-	REDIRECT_REC *redirect;
-        GSList *link;
-	GString *str;
-	long usecs;
-	char *cmd;
 	int crlf;
 
-	if (!IS_IRC_SERVER(server))
-		return 0;
-
-	if (server->cmdcount == 0 && server->cmdqueue == NULL)
-		return 0;
-
-	if (now < server->wait_cmd)
-		return 1;
-
-	usecs = (now - server->last_cmd) / G_TIME_SPAN_MILLISECOND;
-	if (usecs < server->cmd_queue_speed)
-		return 1;
-
-	server->cmdcount--;
-	if (server->cmdqueue == NULL) return 1;
-
-        /* get command */
-	cmd = server->cmdqueue->data;
-        redirect = server->cmdqueue->next->data;
-
-	/* send command */
-	str = g_string_new(cmd);
+	g_return_if_fail(server != NULL);
+	g_return_if_fail(str != NULL);
 
 	if (str->len > 2 && str->str[str->len - 2] == '\r')
 		crlf = 2;
@@ -769,6 +744,40 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 		rawlog_output(server->rawlog, str->str);
 		server_redirect_command(server, str->str, redirect);
 	}
+}
+
+static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
+{
+	REDIRECT_REC *redirect;
+	GSList *link;
+	GString *str;
+	long usecs;
+	char *cmd;
+
+	if (!IS_IRC_SERVER(server))
+		return 0;
+
+	if (server->cmdcount == 0 && server->cmdqueue == NULL)
+		return 0;
+
+	if (now < server->wait_cmd)
+		return 1;
+
+	usecs = (now - server->last_cmd) / G_TIME_SPAN_MILLISECOND;
+	if (usecs < server->cmd_queue_speed)
+		return 1;
+
+	server->cmdcount--;
+	if (server->cmdqueue == NULL)
+		return 1;
+
+	/* get command */
+	cmd = server->cmdqueue->data;
+	redirect = server->cmdqueue->next->data;
+
+	/* send command */
+	str = g_string_new(cmd);
+	irc_server_send_and_redirect(server, str, redirect);
 	g_string_free(str, TRUE);
 
 	/* remove from queue */
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 903de773..6e78c4da 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -176,6 +176,7 @@ char **irc_server_split_action(IRC_SERVER_REC *server, const char *target,
 			       const char *data);
 void irc_server_send_away(IRC_SERVER_REC *server, const char *reason);
 void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len);
+void irc_server_send_and_redirect(IRC_SERVER_REC *server, GString *str, REDIRECT_REC *redirect);
 void irc_server_init_isupport(IRC_SERVER_REC *server);
 
 void irc_servers_start_cmd_timeout(void);
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 62bc0bc8..a52e9198 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -119,33 +119,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 	}
 
 	if (irc_send_when == IRC_SEND_NOW) {
-		int crlf;
-
-		if (str->len > 2 && str->str[str->len - 2] == '\r')
-			crlf = 2;
-		else if (str->len > 1 && str->str[str->len - 1] == '\n')
-			crlf = 1;
-		else
-			crlf = 0;
-
-		if (crlf)
-			g_string_truncate(str, str->len - crlf);
-
-		signal_emit("server outgoing modify", 3, server, str, crlf);
-		if (str->len) {
-			if (crlf == 2)
-				g_string_append(str, "\r\n");
-			else if (crlf == 1)
-				g_string_append(str, "\n");
-
-			irc_server_send_data(server, str->str, str->len);
-
-			/* add to rawlog without [CR+]LF */
-			if (crlf)
-				g_string_truncate(str, str->len - crlf);
-			rawlog_output(server->rawlog, str->str);
-			server_redirect_command(server, str->str, server->redirect_next);
-		}
+		irc_server_send_and_redirect(server, str, server->redirect_next);
 		g_string_free(str, TRUE);
 	} else if (irc_send_when == IRC_SEND_NEXT) {
 		/* add to queue */

From 27046adabeff832175d8f267775d757b98904970 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 6 Feb 2022 01:11:41 +0100
Subject: [PATCH 1420/1650] Merge pull request #59 from ailin-nemui/ilog-domain

fix crash when accessing settings during shutdown

(cherry picked from commit cc411a1be009b9c6eac9811abeff10d8bab0efc8)
---
 src/core/settings.c                 | 1 +
 src/fe-common/core/fe-common-core.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index 28f953ba..1e7ef2ee 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -928,6 +928,7 @@ void settings_deinit(void)
 
 	g_hash_table_foreach(settings, (GHFunc) settings_hash_free, NULL);
 	g_hash_table_destroy(settings);
+	settings = NULL;
 
 	if (mainconfig != NULL) config_close(mainconfig);
 }
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 1fcd5df1..6a929719 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -57,6 +57,7 @@ static int autocon_port;
 static int no_autoconnect;
 static char *cmdline_nick;
 static char *cmdline_hostname;
+GLogFunc logger_old;
 
 void fe_core_log_init(void);
 void fe_core_log_deinit(void);
@@ -252,6 +253,8 @@ void fe_common_core_deinit(void)
         signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("channel created", (SIGNAL_FUNC) sig_channel_created);
         signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
+
+	g_log_set_default_handler(logger_old, NULL);
 }
 
 void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *message)
@@ -458,7 +461,7 @@ void fe_common_core_finish_init(void)
 	signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed);
 
         /* _after_ windows are created.. */
-	g_log_set_default_handler((GLogFunc) i_log_func, NULL);
+	logger_old = g_log_set_default_handler((GLogFunc) i_log_func, NULL);
 
 	if (setup_changed)
                 signal_emit("setup changed", 0);

From 26c4cd8bbf096ecf23a86d3ed24940b716408f87 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 17 Nov 2021 11:17:59 +0100
Subject: [PATCH 1421/1650] Merge pull request #50 from ailin-nemui/gliblog

Improve handling of GLib log messages

(cherry picked from commit 0e3f6aa4a25cc8f3d526c86cd985315683028c41)
---
 src/common.h                        |  2 +-
 src/fe-common/core/fe-common-core.c | 73 +++++++++++++++++++++++++++--
 src/fe-common/core/module-formats.c |  2 +-
 3 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/src/common.h b/src/common.h
index f7719e1f..ac09a553 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 42
+#define IRSSI_ABI_VERSION 43
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 6a929719..9724354f 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -166,6 +166,7 @@ void fe_common_core_init(void)
 	settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
 	g_get_charset(&str);
 	settings_add_str("lookandfeel", "term_charset", str);
+	settings_add_str("lookandfeel", "glib_log_domains", "all");
 	themes_init();
         theme_register(fecommon_core_formats);
 
@@ -257,9 +258,54 @@ void fe_common_core_deinit(void)
 	g_log_set_default_handler(logger_old, NULL);
 }
 
-void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *message)
+static gboolean glib_domain_wanted(const char *domain)
 {
-	const char *reason;
+	const char *domains;
+	char *c, *cur;
+	int len = 0;
+	int print_it = 0; /* -1 for exclude, 0 for undecided, 1 for include */
+	int incl;
+
+	/* Go through each item in glib_log_domains setting to determine whether
+	 * or not we want to print message from this domain */
+	domains = settings_get_str("glib_log_domains");
+	c = cur = (char *) domains;
+
+	do {
+		/* Advance through the string until we hit a space or the end */
+		while (*cur != '\0' && *cur != ' ') {
+			cur++;
+			len++;
+		}
+
+		/* Handle '-' prefix */
+		incl = 1;
+		if (*c == '-') {
+			incl = -1;
+			c++;
+			len--;
+		}
+
+		/* If we got a valid item, process it */
+		if (len > 0 && (!strncmp(domain, c, len) || !strncasecmp("all", c, len) ||
+		                !strncmp("*", c, len)))
+			print_it = incl;
+
+		/* Go past any spaces towards the next item */
+		while (*cur == ' ')
+			cur++;
+
+		/* Move on beyond the item we just handled */
+		c = cur;
+		len = 0;
+	} while (*c != '\0' && print_it != -1);
+
+	return (print_it == 1);
+}
+
+static void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *message)
+{
+	const char *reason, *domain;
 
 	switch (log_level) {
 	case G_LOG_LEVEL_WARNING:
@@ -268,16 +314,33 @@ void i_log_func(const char *log_domain, GLogLevelFlags log_level, const char *me
 	case G_LOG_LEVEL_CRITICAL:
                 reason = "critical";
 		break;
+	case G_LOG_LEVEL_DEBUG:
+		reason = "debug";
+		break;
+	case G_LOG_LEVEL_MESSAGE:
+		reason = "message";
+		break;
+	case G_LOG_LEVEL_INFO:
+		reason = "info";
+		break;
 	default:
 		reason = "error";
                 break;
 	}
 
+	/* If log_domain parameter is NULL, GLib means to tell us that this is
+	 * meant to be some nebulous "default" log domain name. */
+	domain = (log_domain ? log_domain : "default");
+
+	/* Only print the message if we decided to */
+	if (!glib_domain_wanted(domain))
+		return;
+
 	if (windows == NULL)
-		fprintf(stderr, "GLib %s: %s\n", reason, message);
+		fprintf(stderr, "GLib (%s) %s: %s\n", domain, reason, message);
 	else {
-		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-			    TXT_GLIB_ERROR, reason, message);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_GLIB_ERROR, domain, reason,
+		            message);
 	}
 }
 
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index e22b5e78..8c10f420 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -288,7 +288,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "config_saved", "Saved configuration to file $0", 1, { 0 } },
 	{ "config_reloaded", "Reloaded configuration", 1, { 0 } },
 	{ "config_modified", "Configuration file was modified since irssi was last started - do you want to overwrite the possible changes?", 1, { 0 } },
-	{ "glib_error", "{error $0} $1", 2, { 0, 0 } },
+	{ "glib_error", "{error ($0) $1} $2", 3, { 0, 0, 0 } },
 	{ "overwrite_config", "Overwrite config (y/N)?", 0 },
 	{ "set_title", "[{hilight $0}]", 1, { 0 } },
 	{ "set_item", "$[-!32]0 %_$1", 2, { 0, 0 } },

From baf2a43da2d1bde46f0b34867e2b129a91d32567 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 31 Jan 2022 10:47:31 +0100
Subject: [PATCH 1422/1650] Merge pull request #57 from
 ailin-nemui/lr-skip-visible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make window left/right skip windows that are already visible in other…

(cherry picked from commit 53187de6a20f772c81cfe568c6696043405a3fd0)
---
 src/fe-text/mainwindows.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 711daf0a..fae7ced8 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1642,9 +1642,9 @@ static int window_refnum_left(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) || is_window_visible(window));
 
-        return refnum;
+	return refnum;
 }
 
 static int window_refnum_right(int refnum, int wrap)
@@ -1664,9 +1664,9 @@ static int window_refnum_right(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) || is_window_visible(window));
 
-        return refnum;
+	return refnum;
 }
 
 /* SYNTAX: WINDOW LEFT [-directional] */

From 5997b2654b88c34ffb923005dd0efd184a9178ee Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 6 Feb 2022 16:33:20 +0100
Subject: [PATCH 1423/1650] Merge pull request #58 from
 ailin-nemui/erase-cutbuffer

Add empty_kill_clears_cutbuffer option

(cherry picked from commit 27008bf447f29eec39fae081113f9d4574ce5e0b)
---
 src/fe-text/gui-entry.c | 77 +++++++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 25965495..5050c800 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 #include <irssi/src/core/utf8.h>
 #include <irssi/src/fe-common/core/formats.h>
 
@@ -772,11 +773,13 @@ static GUI_ENTRY_CUTBUFFER_REC *get_cutbuffer_rec(GUI_ENTRY_REC *entry, CUTBUFFE
 
 void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer)
 {
+	gboolean clear_enabled;
 	size_t i, w = 0;
 
         g_return_if_fail(entry != NULL);
+	clear_enabled = settings_get_bool("empty_kill_clears_cutbuffer");
 
-	if (size == 0 || entry->pos < size)
+	if (entry->pos < size || (size == 0 && !clear_enabled))
 		return;
 
 	if (update_cutbuffer != CUTBUFFER_UPDATE_NOOP) {
@@ -792,48 +795,53 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 		tmpcutbuffer = tmp->cutbuffer;
 		entry->append_next_kill = TRUE;
 		switch (update_cutbuffer) {
-			case CUTBUFFER_UPDATE_APPEND:
-				tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-				memcpy(tmp->cutbuffer, tmpcutbuffer,
-				       tmp->cutbuffer_len * sizeof(unichar));
-				memcpy(tmp->cutbuffer + tmp->cutbuffer_len,
-				       entry->text + entry->pos - size, size * sizeof(unichar));
+		case CUTBUFFER_UPDATE_APPEND:
+			tmp->cutbuffer = g_new(unichar, cutbuffer_new_size + 1);
+			memcpy(tmp->cutbuffer, tmpcutbuffer, tmp->cutbuffer_len * sizeof(unichar));
+			memcpy(tmp->cutbuffer + tmp->cutbuffer_len, entry->text + entry->pos - size,
+			       size * sizeof(unichar));
 
-				tmp->cutbuffer_len = cutbuffer_new_size;
-				tmp->cutbuffer[cutbuffer_new_size] = '\0';
-				g_free(tmpcutbuffer);
-				break;
+			tmp->cutbuffer_len = cutbuffer_new_size;
+			tmp->cutbuffer[cutbuffer_new_size] = '\0';
+			g_free(tmpcutbuffer);
+			break;
 
-			case CUTBUFFER_UPDATE_PREPEND:
-				tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
-				memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
-				       size * sizeof(unichar));
-				memcpy(tmp->cutbuffer + size, tmpcutbuffer,
-				       tmp->cutbuffer_len * sizeof(unichar));
+		case CUTBUFFER_UPDATE_PREPEND:
+			tmp->cutbuffer = g_new(unichar, cutbuffer_new_size + 1);
+			memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
+			       size * sizeof(unichar));
+			memcpy(tmp->cutbuffer + size, tmpcutbuffer,
+			       tmp->cutbuffer_len * sizeof(unichar));
 
-				tmp->cutbuffer_len = cutbuffer_new_size;
-				tmp->cutbuffer[cutbuffer_new_size] = '\0';
-				g_free(tmpcutbuffer);
-				break;
+			tmp->cutbuffer_len = cutbuffer_new_size;
+			tmp->cutbuffer[cutbuffer_new_size] = '\0';
+			g_free(tmpcutbuffer);
+			break;
 
-			case CUTBUFFER_UPDATE_REPLACE:
-				/* put erased text to cutbuffer */
-				if (tmp->cutbuffer_len < size) {
-					g_free(tmp->cutbuffer);
-					tmp->cutbuffer = g_new(unichar, size+1);
-				}
+		case CUTBUFFER_UPDATE_REPLACE:
+			/* put erased text to cutbuffer */
+			if (tmp->cutbuffer_len < size || tmp->cutbuffer == NULL) {
+				g_free(tmp->cutbuffer);
+				tmp->cutbuffer = g_new(unichar, size + 1);
+			}
 
-				tmp->cutbuffer_len = size;
-				tmp->cutbuffer[size] = '\0';
-				memcpy(tmp->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar));
-				break;
+			tmp->cutbuffer_len = size;
+			tmp->cutbuffer[size] = '\0';
+			memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
+			       size * sizeof(unichar));
+			break;
 
-			case CUTBUFFER_UPDATE_NOOP:
-				/* cannot happen, handled in "if" */
-				break;
+		case CUTBUFFER_UPDATE_NOOP:
+			/* cannot happen, handled in "if" */
+			break;
 		}
 	}
 
+	if (size == 0) {
+		/* we just wanted to clear the cutbuffer */
+		return;
+	}
+
 	if (entry->utf8)
 		while (entry->pos > size + w && i_wcwidth(entry->text[entry->pos - size - w]) == 0)
 			w++;
@@ -1498,6 +1506,7 @@ void gui_entry_set_text_and_extents(GUI_ENTRY_REC *entry, GSList *list)
 
 void gui_entry_init(void)
 {
+	settings_add_bool("lookandfeel", "empty_kill_clears_cutbuffer", FALSE);
 }
 
 void gui_entry_deinit(void)

From dc15cc3969b2fa84bfc80f5623e46496d98cecd2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 6 Feb 2022 14:38:57 +0100
Subject: [PATCH 1424/1650] Merge pull request #61 from
 ailin-nemui/actlist_separator

Actlist separator

(cherry picked from commit d523ceacf0335c5da151fc51600f3623b0297338)
---
 src/fe-text/statusbar-items.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 47b31103..6e7cf8a5 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -33,6 +33,7 @@
 
 static GList *activity_list;
 static guint8 actlist_sort;
+static char *actlist_separator;
 static GSList *more_visible; /* list of MAIN_WINDOW_RECs which have --more-- */
 static GHashTable *input_entries;
 static int last_lag, last_lag_unknown, lag_timeout_tag;
@@ -96,7 +97,8 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
 
                 /* comma separator */
 		if (str->len > 0) {
-			value = theme_format_expand(theme, "{sb_act_sep ,}");
+			g_string_printf(format, "{sb_act_sep %s}", actlist_separator);
+			value = theme_format_expand(theme, format->str);
 			g_string_append(str, value);
 			g_free(value);
 		}
@@ -451,10 +453,18 @@ static void item_input(SBAR_ITEM_REC *item, int get_size_only)
 
 static void read_settings(void)
 {
+	const char *sep;
 	if (active_entry != NULL)
 		gui_entry_set_utf8(active_entry, term_type == TERM_TYPE_UTF8);
 
 	actlist_sort = settings_get_choice("actlist_sort");
+
+	sep = settings_get_str("actlist_separator");
+	if (g_strcmp0(actlist_separator, sep) != 0) {
+		g_free(actlist_separator);
+		actlist_separator = g_strdup(sep);
+		statusbar_items_redraw("act");
+	}
 }
 
 void statusbar_items_init(void)
@@ -462,6 +472,7 @@ void statusbar_items_init(void)
 	settings_add_time("misc", "lag_min_show", "1sec");
 	settings_add_choice("lookandfeel", "actlist_sort", 0, "refnum;recent;level;level,recent");
 	settings_add_bool("lookandfeel", "actlist_names", FALSE);
+	settings_add_str("lookandfeel", "actlist_separator", ",");
 	settings_add_bool("lookandfeel", "actlist_prefer_window_name", FALSE);
 
 	statusbar_item_register("window", NULL, item_window_active);

From 44ad0fce90b913a5e50f54073b26edf321104f47 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 11 Feb 2022 14:17:49 +0100
Subject: [PATCH 1425/1650] Merge pull request #60 from ailin-nemui/paste

Add "paste event" signal

(cherry picked from commit 738931762b1c1c2cc442df00b8e9cd5adc027f05)
---
 docs/signals.txt             |   1 +
 src/common.h                 |   2 +-
 src/fe-text/gui-readline.c   | 235 +++++++++++++++++++++++++++++++++--
 src/fe-text/module-formats.c |   8 +-
 src/fe-text/module-formats.h |  23 ++--
 src/perl/common/Settings.xs  |  19 +++
 6 files changed, 262 insertions(+), 26 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index da72ef57..81a1e3fa 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -351,6 +351,7 @@ Text FE
 
 gui-readline.c:
  "gui key pressed", int key
+ "paste event", char *paste, char *arg
 
 gui-printtext.c:
  "beep"
diff --git a/src/common.h b/src/common.h
index ac09a553..7f8604f3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 43
+#define IRSSI_ABI_VERSION 44
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index f848ba1b..8e1b66ff 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -69,6 +69,7 @@ static GArray *paste_buffer_rest;
 static char *paste_old_prompt;
 static int paste_prompt, paste_line_count;
 static int paste_join_multiline;
+static int paste_ignore_first_nl;
 static int paste_timeout_id;
 static int paste_use_bracketed_mode;
 static int paste_bracketed_mode;
@@ -81,6 +82,25 @@ static int previous_yank_preceded;
 static const unichar bp_start[] = { 0x1b, '[', '2', '0', '0', '~' };
 static const unichar bp_end[]   = { 0x1b, '[', '2', '0', '1', '~' };
 
+#define BRACKETED_PASTE_TIMEOUT (5 * 1000) // ms
+
+#if GLIB_CHECK_VERSION(2, 62, 0)
+/* nothing */
+#else
+/* compatibility code for old GLib */
+GArray *g_array_copy(GArray *array)
+{
+	GArray *out;
+	guint elt_size;
+
+	elt_size = g_array_get_element_size(array);
+	out = g_array_sized_new(FALSE, FALSE, elt_size, array->len);
+	memcpy(out->data, array->data, array->len * elt_size);
+
+	return out;
+}
+#endif
+
 static void sig_input(void);
 
 void input_listen_init(int handle)
@@ -330,7 +350,7 @@ static void paste_send(void)
 	g_string_free(str, TRUE);
 }
 
-static void paste_flush(int send)
+static void paste_flush(void (*send)(void))
 {
 	if (paste_prompt) {
 		gui_entry_set_text(active_entry, paste_entry);
@@ -338,8 +358,8 @@ static void paste_flush(int send)
 		g_free_and_null(paste_entry);
 	}
 
-	if (send)
-		paste_send();
+	if (send != NULL)
+		send();
 	g_array_set_size(paste_buffer, 0);
 
 	/* re-add anything that may have been after the bracketed paste end */
@@ -358,6 +378,128 @@ static void paste_flush(int send)
 	gui_entry_redraw(active_entry);
 }
 
+static void paste_print_line(const char *str)
+{
+	printformat_window(active_win, MSGLEVEL_CLIENTCRAP, TXT_PASTE_CONTENT, str);
+}
+
+static void paste_print(void)
+{
+	GArray *garr;
+	unichar *arr;
+	GString *str;
+	char out[10];
+	unsigned int i;
+	gboolean free_garr;
+
+	if (paste_join_multiline) {
+		garr = g_array_copy(paste_buffer);
+		paste_buffer_join_lines(garr);
+		free_garr = TRUE;
+	} else {
+		garr = paste_buffer;
+		free_garr = FALSE;
+	}
+
+	arr = &g_array_index(garr, unichar, 0);
+
+	str = g_string_new(NULL);
+	for (i = 0; i < garr->len; i++) {
+		if (isnewline(arr[i])) {
+			paste_print_line(str->str);
+			g_string_truncate(str, 0);
+		} else if (active_entry->utf8) {
+			out[g_unichar_to_utf8(arr[i], out)] = '\0';
+			g_string_append(str, out);
+		} else if (term_type == TERM_TYPE_BIG5) {
+			if (arr[i] > 0xff)
+				g_string_append_c(str, (arr[i] >> 8) & 0xff);
+			g_string_append_c(str, arr[i] & 0xff);
+		} else {
+			g_string_append_c(str, arr[i]);
+		}
+	}
+
+	if (str->len)
+		paste_print_line(str->str);
+
+	g_string_free(str, TRUE);
+	if (free_garr)
+		g_array_free(garr, TRUE);
+}
+
+static void paste_event(const char *arg)
+{
+	GArray *garr;
+	unichar *arr;
+	GString *str;
+	char out[10];
+	unsigned int i;
+	gboolean free_garr;
+
+	if (paste_join_multiline) {
+		garr = g_array_copy(paste_buffer);
+		paste_buffer_join_lines(garr);
+		free_garr = TRUE;
+	} else {
+		garr = paste_buffer;
+		free_garr = FALSE;
+	}
+
+	arr = &g_array_index(garr, unichar, 0);
+	str = g_string_new(NULL);
+	for (i = 0; i < garr->len; i++) {
+		if (isnewline(arr[i])) {
+			g_string_append_c(str, '\n');
+		} else if (active_entry->utf8) {
+			out[g_unichar_to_utf8(arr[i], out)] = '\0';
+			g_string_append(str, out);
+		} else if (term_type == TERM_TYPE_BIG5) {
+			if (arr[i] > 0xff)
+				g_string_append_c(str, (arr[i] >> 8) & 0xff);
+			g_string_append_c(str, arr[i] & 0xff);
+		} else {
+			g_string_append_c(str, arr[i]);
+		}
+	}
+
+	if (signal_emit("paste event", 2, str->str, arg)) {
+		paste_flush(NULL);
+	}
+
+	g_string_free(str, TRUE);
+	if (free_garr)
+		g_array_free(garr, TRUE);
+}
+
+static void paste_insert_edit(void)
+{
+	unichar *arr;
+	unsigned int i;
+
+	if (paste_join_multiline)
+		paste_buffer_join_lines(paste_buffer);
+
+	arr = &g_array_index(paste_buffer, unichar, 0);
+	for (i = 0; i < paste_buffer->len; i++) {
+		if (isnewline(arr[i])) {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, 'n');
+		} else if (arr[i] == 9) {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, 't');
+		} else if (arr[i] == 27) {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, 'e');
+		} else if (arr[i] == '\\') {
+			gui_entry_insert_char(active_entry, '\\');
+			gui_entry_insert_char(active_entry, '\\');
+		} else {
+			gui_entry_insert_char(active_entry, arr[i]);
+		}
+	}
+}
+
 static void insert_paste_prompt(void)
 {
 	char *str;
@@ -729,6 +871,17 @@ static gboolean paste_timeout(gpointer data)
 	int split_lines;
 	paste_was_bracketed_mode = paste_bracketed_mode;
 
+	if (paste_ignore_first_nl && paste_line_count == 1) {
+		unichar last_char;
+
+		last_char = g_array_index(paste_buffer, unichar, paste_buffer->len - 1);
+
+		if (isnewline(last_char)) {
+			g_array_set_size(paste_buffer, paste_buffer->len - 1);
+			paste_line_count--;
+		}
+	}
+
 	/* number of lines after splitting extra-long messages */
 	split_lines = paste_buffer->len / LINE_SPLIT_LIMIT;
 
@@ -747,7 +900,7 @@ static gboolean paste_timeout(gpointer data)
 				active_win->active != NULL)
 		insert_paste_prompt();
 	else
-		paste_flush(TRUE);
+		paste_flush(paste_send);
 	paste_timeout_id = -1;
 	return FALSE;
 }
@@ -777,12 +930,14 @@ static void paste_bracketed_end(int i, gboolean rest)
 	}
 
 	/* decide what to do with the buffer */
+	if (paste_timeout_id != -1)
+		g_source_remove(paste_timeout_id);
 	paste_timeout(NULL);
 
 	paste_bracketed_mode = FALSE;
 }
 
-static void paste_bracketed_middle()
+static void paste_bracketed_middle(void)
 {
 	int i;
 	int marklen = G_N_ELEMENTS(bp_end);
@@ -830,8 +985,10 @@ static void sig_input(void)
 		term_gets(buffer, &line_count);
 		key = g_array_index(buffer, unichar, 0);
 		/* Either Ctrl-k or Ctrl-c is pressed */
-		if (key == 11 || key == 3)
-			paste_flush(key == 11);
+		if (key < 32 && key != 13 /* CR */ && key != 10 /* LF */ && key != 27 /* Esc */) {
+			key_pressed(keyboard, "paste");
+			signal_emit("gui key pressed", 1, GINT_TO_POINTER(key));
+		}
 		g_array_free(buffer, TRUE);
 	} else {
 		term_gets(paste_buffer, &paste_line_count);
@@ -869,7 +1026,47 @@ static void sig_input(void)
 
 static void key_paste_start(void)
 {
-	paste_bracketed_mode = TRUE;
+	if (paste_use_bracketed_mode) {
+		paste_bracketed_mode = TRUE;
+		if (paste_timeout_id != -1)
+			g_source_remove(paste_timeout_id);
+		paste_timeout_id = g_timeout_add(BRACKETED_PASTE_TIMEOUT, paste_timeout, NULL);
+	}
+}
+
+static void key_paste_cancel(void)
+{
+	if (paste_prompt) {
+		paste_flush(NULL);
+	}
+}
+
+static void key_paste_print(void)
+{
+	if (paste_prompt) {
+		paste_print();
+	}
+}
+
+static void key_paste_send(void)
+{
+	if (paste_prompt) {
+		paste_flush(paste_send);
+	}
+}
+
+static void key_paste_edit(void)
+{
+	if (paste_prompt) {
+		paste_flush(paste_insert_edit);
+	}
+}
+
+static void key_paste_event(const char *arg)
+{
+	if (paste_prompt) {
+		paste_event(arg);
+	}
 }
 
 time_t get_idle_time(void)
@@ -1131,11 +1328,14 @@ static void setup_changed(void)
 
 	paste_verify_line_count = settings_get_int("paste_verify_line_count");
 	paste_join_multiline = settings_get_bool("paste_join_multiline");
+	paste_ignore_first_nl = settings_get_bool("paste_ignore_first_nl");
 	paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
 
 	term_set_appkey_mode(settings_get_bool("term_appkey_mode"));
 	/* Enable the bracketed paste mode on demand */
 	term_set_bracketed_paste_mode(paste_use_bracketed_mode);
+	if (!paste_use_bracketed_mode)
+		paste_bracketed_mode = FALSE;
 }
 
 void gui_readline_init(void)
@@ -1164,7 +1364,8 @@ void gui_readline_init(void)
 	   keycodes. this must be larger to allow them to work. */
 	settings_add_int("misc", "paste_verify_line_count", 5);
 	settings_add_bool("misc", "paste_join_multiline", TRUE);
-        setup_changed();
+	settings_add_bool("misc", "paste_ignore_first_nl", FALSE);
+	setup_changed();
 
 	keyboard = keyboard_create(NULL);
         key_configure_freeze();
@@ -1235,7 +1436,13 @@ void gui_readline_init(void)
 
 	key_bind("key", NULL, "meta-O-M", "return", (SIGNAL_FUNC) key_combo);
 
-	key_bind("paste_start", "Bracketed paste start", "meta2-200~", "paste_start", (SIGNAL_FUNC) key_paste_start);
+	/* clang-format off */
+	key_bind("paste_start", "Bracketed paste start", "^[[200~", "paste_start", (SIGNAL_FUNC) key_paste_start);
+	key_bind("paste_cancel", "Cancel paste", "paste-^C", NULL, (SIGNAL_FUNC) key_paste_cancel);
+	key_bind("paste_print", "Print paste to screen", "paste-^P", NULL, (SIGNAL_FUNC) key_paste_print);
+	key_bind("paste_send", "Send paste to target", "paste-^K", NULL, (SIGNAL_FUNC) key_paste_send);
+	key_bind("paste_edit", "Insert paste to input line", "paste-^E", NULL, (SIGNAL_FUNC) key_paste_edit);
+	key_bind("paste_event", "Send paste to event", "paste-^U", NULL, (SIGNAL_FUNC) key_paste_event);
 
 	/* cursor movement */
 	key_bind("backward_character", "Move the cursor a character backward", "left", NULL, (SIGNAL_FUNC) key_backward_character);
@@ -1307,8 +1514,9 @@ void gui_readline_init(void)
         /* inserting special input characters to line.. */
 	key_bind("escape_char", "Insert the next character exactly as-is to input line", NULL, NULL, (SIGNAL_FUNC) key_escape);
 	key_bind("insert_text", "Append text to line", NULL, NULL, (SIGNAL_FUNC) key_insert_text);
+	/* clang-format on */
 
-        /* autoreplaces */
+	/* autoreplaces */
 	key_bind("multi", NULL, "return", "check_replaces;send_line", NULL);
 	key_bind("multi", NULL, "space", "check_replaces;insert_text  ", NULL);
 
@@ -1338,6 +1546,11 @@ void gui_readline_deinit(void)
         key_configure_freeze();
 
 	key_unbind("paste_start", (SIGNAL_FUNC) key_paste_start);
+	key_unbind("paste_cancel", (SIGNAL_FUNC) key_paste_cancel);
+	key_unbind("paste_print", (SIGNAL_FUNC) key_paste_print);
+	key_unbind("paste_send", (SIGNAL_FUNC) key_paste_send);
+	key_unbind("paste_edit", (SIGNAL_FUNC) key_paste_edit);
+	key_unbind("paste_event", (SIGNAL_FUNC) key_paste_event);
 
 	key_unbind("backward_character", (SIGNAL_FUNC) key_backward_character);
 	key_unbind("forward_character", (SIGNAL_FUNC) key_forward_character);
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e9d4fab9..bb7eacee 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -21,8 +21,8 @@
 #include "module.h"
 #include <irssi/src/fe-common/core/formats.h>
 
-FORMAT_REC gui_text_formats[] =
-{
+FORMAT_REC gui_text_formats[] = {
+	/* clang-format off */
 	{ MODULE_NAME, "Text user interface", 0 },
 
 	/* ---- */
@@ -77,8 +77,9 @@ FORMAT_REC gui_text_formats[] =
 	/* ---- */
 	{ NULL, "Pasting", 0 },
 
-	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.", 2, { 1, 0 } },
+	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel. Ctrl-P to print the paste content, Ctrl-E to insert the paste in the input line, Ctrl-U to pass the paste to a signal handler.", 2, { 1, 0 } },
 	{ "paste_prompt", "Hit Ctrl-K to paste, Ctrl-C to abort?", 0 },
+	{ "paste_content", "%_>%_ $0", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Welcome", 0 },
@@ -98,4 +99,5 @@ FORMAT_REC gui_text_formats[] =
 	{ "welcome_init_settings", "The following settings were initialized", 0 },
 
 	{ NULL, NULL, 0 }
+	/* clang-format on */
 };
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index 59c877b8..5392705f 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -5,8 +5,8 @@ enum {
 
 	TXT_FILL_1,
 
-        TXT_LASTLOG_TOO_LONG,
-        TXT_LASTLOG_COUNT,
+	TXT_LASTLOG_TOO_LONG,
+	TXT_LASTLOG_COUNT,
 	TXT_LASTLOG_START,
 	TXT_LASTLOG_END,
 	TXT_LASTLOG_SEPARATOR,
@@ -14,18 +14,18 @@ enum {
 
 	TXT_FILL_2,
 
-        TXT_REFNUM_NOT_FOUND,
-        TXT_WINDOW_TOO_SMALL,
-        TXT_CANT_HIDE_LAST,
+	TXT_REFNUM_NOT_FOUND,
+	TXT_WINDOW_TOO_SMALL,
+	TXT_CANT_HIDE_LAST,
 	TXT_CANT_HIDE_STICKY_WINDOWS,
-        TXT_CANT_SHOW_STICKY_WINDOWS,
-        TXT_WINDOW_NOT_STICKY,
-        TXT_WINDOW_SET_STICKY,
+	TXT_CANT_SHOW_STICKY_WINDOWS,
+	TXT_WINDOW_NOT_STICKY,
+	TXT_WINDOW_SET_STICKY,
 	TXT_WINDOW_UNSET_STICKY,
 	TXT_WINDOW_INFO_STICKY,
-        TXT_WINDOW_INFO_SCROLL,
-        TXT_WINDOW_SCROLL,
-        TXT_WINDOW_SCROLL_UNKNOWN,
+	TXT_WINDOW_INFO_SCROLL,
+	TXT_WINDOW_SCROLL,
+	TXT_WINDOW_SCROLL_UNKNOWN,
 	TXT_WINDOW_HIDELEVEL,
 
 	TXT_FILL_3,
@@ -53,6 +53,7 @@ enum {
 
 	TXT_PASTE_WARNING,
 	TXT_PASTE_PROMPT,
+	TXT_PASTE_CONTENT,
 
 	TXT_FILL_5, /* Welcome */
 
diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs
index 2da23400..0f172411 100644
--- a/src/perl/common/Settings.xs
+++ b/src/perl/common/Settings.xs
@@ -104,6 +104,10 @@ int
 settings_get_size(key)
        char *key
 
+int
+settings_get_choice(key)
+	char *key
+
 void
 settings_set_str(key, value)
 	char *key
@@ -134,6 +138,11 @@ settings_set_size(key, value)
 	char *key
 	char *value
 
+int
+settings_set_choice(key, value)
+	char *key
+	char *value
+
 void
 settings_add_str(section, key, def)
 	char *section
@@ -188,6 +197,16 @@ CODE:
         perl_settings_add(key);
 	settings_add_size_module(MODULE_NAME"/scripts", section, key, def);
 
+void
+settings_add_choice(section, key, def, choices)
+	char *section
+	char *key
+	int def
+	char *choices
+CODE:
+	perl_settings_add(key);
+	settings_add_choice_module(MODULE_NAME "/scripts", section, key, def, choices);
+
 void
 settings_remove(key)
 	char *key

From 45b6df790213071ccb129c7f9645a7264c88a74e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 19 Feb 2022 10:58:05 +0100
Subject: [PATCH 1426/1650] Merge pull request #67 from ailin-nemui/spelling

spelling fixes

(cherry picked from commit 7ec61c4ec0be3fbbdca30c2587c8464e093d7b9a)
---
 src/otr/otr-formats.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c
index d4d273d1..af4d8aad 100644
--- a/src/otr/otr-formats.c
+++ b/src/otr/otr-formats.c
@@ -23,6 +23,7 @@
 #include <irssi/src/otr/otr-formats.h>
 
 FORMAT_REC fe_otr_formats[] = {
+	/* clang-format off */
 	{ MODULE_NAME, "Core", 0 },
 
 	/* Status bar format. */
@@ -73,7 +74,7 @@ FORMAT_REC fe_otr_formats[] = {
 	{ "otr_keys_unavailable", "{error No OTR keys available}", 0},
 
 	{ "otr_msg_encryption_ended", "{hilight $0} has closed the connection to you", 1, { 0 }},
-	{ "otr_msg_encryption_error", "{error An error occured when encrypting your message}", 0},
+	{ "otr_msg_encryption_error", "{error An error occurred when encrypting your message}", 0},
 	{ "otr_msg_encryption_required", "Encryptioned is required", 0},
 	{ "otr_msg_error", "Error in private conversation: {error $0}", 1, { 0 }},
 	{ "otr_msg_general_error", "General Error: {error $0}", 1, { 0 }},
@@ -101,8 +102,9 @@ FORMAT_REC fe_otr_formats[] = {
 	{ "otr_smp_failure", "Authentication with {hilight $0} failed", 1, { 0 }},
 	{ "otr_smp_in_progress", "{hilight $0} replied to your auth request", 1, { 0 }},
 	{ "otr_smp_secret_question", "{hilight $0} wants to authenticate. Use /otr auth <secret> to complete", 1, { 0 }},
-	{ "otr_smp_success", "Authentication with {hilight $0} succesful", 1, { 0 }},
+	{ "otr_smp_success", "Authentication with {hilight $0} successful", 1, { 0 }},
 
 	/* Last element. */
 	{ NULL, NULL, 0 }
+	/* clang-format on */
 };

From aa54da381199b2c7c417c6e151228bf07956e5f0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 19 Feb 2022 11:00:34 +0100
Subject: [PATCH 1427/1650] Merge pull request #68 from ailin-nemui/gint64fmt

use gint64 define

(cherry picked from commit cf6bc311723d130a507a8a6c927c479dbf124299)
---
 src/fe-common/irc/fe-ctcp.c | 5 ++++-
 src/irc/core/irc-commands.c | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index c73399be..14893966 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -128,7 +128,10 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
 
 	g_return_if_fail(data != NULL);
 
-	if (sscanf(data, "%ld %ld", &tv, &tv2) < 1) {
+	if (sscanf(data,
+	           "%" G_GINT64_FORMAT " "
+	           "%" G_GINT64_FORMAT,
+	           &tv, &tv2) < 1) {
 		char *tmp = g_strconcat("PING ", data, NULL);
 		ctcp_default_reply(server, tmp, nick, addr, target);
 		g_free(tmp);
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index cba909c1..5f234c54 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -544,7 +544,10 @@ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 
 	tv = g_get_real_time();
 
-	str = g_strdup_printf("%s PING %ld %ld", data, tv / G_TIME_SPAN_SECOND, tv % G_TIME_SPAN_SECOND);
+	str = g_strdup_printf("%s PING "
+	                      "%" G_GINT64_FORMAT " "
+	                      "%" G_GINT64_FORMAT,
+	                      data, tv / G_TIME_SPAN_SECOND, tv % G_TIME_SPAN_SECOND);
 	signal_emit("command ctcp", 3, str, server, item);
 	g_free(str);
 }

From 8530917397f1f50ff7c785c4f0d62b070a005f68 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 19 Feb 2022 23:24:58 +0100
Subject: [PATCH 1428/1650] Merge pull request #70 from
 ailin-nemui/update-screenshot

update screenshot

(cherry picked from commit 854c88da03a277162c4f8ac98f001cea53640529)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 21fa14e8..7c35f794 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ there are third party [ICB](https://github.com/jperkin/irssi-icb),
 [Quassel](https://github.com/phhusson/quassel-irssi) protocol modules
 available.
 
-![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
+![irssi](https://user-images.githubusercontent.com/5665186/154820868-50c35841-04f4-4f4c-8df9-dd5aa4bbcde8.png)
 
 ## [Download information](https://ailin-nemui.github.io/irssi/Getting.html)
 

From 3e9a270562442682b712c980f3ae8b57b1008ff6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 20 Feb 2022 16:29:21 +0100
Subject: [PATCH 1429/1650] Merge pull request #72 from
 ailin-nemui/load-silent-doc

add -silent switch in syntax comment and respect it without args

(cherry picked from commit 06a7dcad991c83e9df92f6765164bcfef6c34108)
---
 src/fe-common/core/fe-modules.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index 01b603f5..955b9a9e 100644
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@@ -164,7 +164,7 @@ static void module_prefixes_free(char **list)
         g_free(list);
 }
 
-/* SYNTAX: LOAD <module> [<submodule>] */
+/* SYNTAX: LOAD [-silent] <module> [<submodule>] */
 static void cmd_load(const char *data)
 {
         char *rootmodule, *submodule;
@@ -181,9 +181,11 @@ static void cmd_load(const char *data)
 
 	silent = g_hash_table_lookup(optlist, "silent") != NULL;
 
-	if (*rootmodule == '\0')
-		cmd_load_list();
-	else {
+	if (*rootmodule == '\0') {
+		if (!silent) {
+			cmd_load_list();
+		}
+	} else {
 		if (silent) {
 			signal_add_first("module error", (SIGNAL_FUNC) signal_stop);
 			signal_add_first("module loaded", (SIGNAL_FUNC) signal_stop);

From 1598c88cfd85ac01ab26d5e9fd9a8391a1c4accb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 11 Mar 2022 12:09:26 +0100
Subject: [PATCH 1430/1650] Merge pull request #77 from
 ailin-nemui/fix_ignore_help

Clarify the help for /ignore -time

(cherry picked from commit c62505386f19fd1a2310883f32535f36966f2803)
---
 docs/help/in/ignore.in         | 4 ++++
 src/fe-common/core/fe-ignore.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 0fbf970d..433490e1 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -14,6 +14,8 @@
     -network:     Ignores only on a specific network.
     -channels:    Ignores only on specific channels.
     -time:        The timeout to automatically remove the ignore.
+                  Accepts units specified in days, hours, minutes, seconds,
+                  milliseconds, or no unit for seconds.
 
     The mask, channels and levels to ignore; if no argument is provided, the
     list of ignores will be displayed.
@@ -44,6 +46,8 @@
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
     /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS
+    /IGNORE -time 5days christmas PUBLICS
+    /IGNORE -time 300 mike PUBLICS
 
 %9See also:%9 ACCEPT, SILENCE, UNIGNORE
 
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 276169df..3594b6f6 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -115,9 +115,9 @@ static void cmd_ignore_show(void)
 }
 
 /* SYNTAX: IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-                  [-network <network>] [-channels <channel>] [-time <secs>] <mask> [<levels>]
+                  [-network <network>] [-channels <channel>] [-time <time>] <mask> [<levels>]
            IGNORE [-regexp | -full] [-pattern <pattern>] [-except] [-replies]
-	          [-network <network>] [-time <secs>] <channels> [<levels>] */
+                  [-network <network>] [-time <time>] <channels> [<levels>] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_ignore(const char *data)
 {

From afed542bfbe481dff03c51cd0763366f30107670 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:02:17 +0200
Subject: [PATCH 1431/1650] Merge pull request #82 from
 ailin-nemui/progval-help

Format RPL_HELPSTART/RPL_HELPTXT/RPL_ENDOFHELP

(cherry picked from commit b446d06b9dd5e2c4d7d279da52c5e499d463d8e6)
---
 src/common.h                          |  2 +-
 src/fe-common/irc/fe-events-numeric.c | 51 +++++++++++++++++++++++++++
 src/fe-common/irc/module-formats.c    |  3 ++
 src/fe-common/irc/module-formats.h    |  7 ++--
 4 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/common.h b/src/common.h
index 7f8604f3..ad5c88bb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 44
+#define IRSSI_ABI_VERSION 45
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index f78289c0..34ba3fe7 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -554,6 +554,51 @@ static void event_489(IRC_SERVER_REC *server, const char *data, const char *nick
 	g_free(params);
 }
 
+static void event_help(IRC_SERVER_REC *server, int formatnum, const char *data)
+{
+	/* Common handling for umerics 704 (RPL_HELPSTART), 705 (RPL_HELPTXT),
+	 * and 706 (RPL_ENDOFHELP); sent as a reply to HELP or HELPOP command.
+	 */
+	char *params, *topic, *help_text;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 3, NULL, &topic, &help_text);
+
+	g_return_if_fail(help_text != NULL);
+
+	if (help_text[0] == '\0') {
+		/* Empty lines can be used by servers for styling; and we need to replace
+		 * them with something non-empty or they would be dropped when displayed.
+		 */
+		help_text = " ";
+	}
+
+	printformat(server, NULL, MSGLEVEL_CRAP, formatnum, topic, help_text);
+	g_free(params);
+}
+
+static void event_helpstart(IRC_SERVER_REC *server, const char *data, const char *nick)
+{
+	/* Numeric 704 (RPL_HELPSTART) sent as a reply to HELP or HELPOP command.
+	 */
+	event_help(server, IRCTXT_SERVER_HELP_START, data);
+}
+
+static void event_helptxt(IRC_SERVER_REC *server, const char *data, const char *nick)
+{
+	/* Numeric 705 (RPL_HELPTXT), sent as a reply to HELP or HELPOP command.
+	 */
+	event_help(server, IRCTXT_SERVER_HELP_TXT, data);
+}
+
+static void event_endofhelp(IRC_SERVER_REC *server, const char *data, const char *nick)
+{
+	/* Numeric 706 (RPL_ENDOFHELP), sent as a reply to HELP or HELPOP command.
+	 */
+	event_help(server, IRCTXT_SERVER_END_OF_HELP, data);
+}
+
 static void event_target_too_fast(IRC_SERVER_REC *server, const char *data,
 		      const char *nick)
 {
@@ -713,6 +758,9 @@ void fe_events_numeric_init(void)
 	signal_add("event 372", (SIGNAL_FUNC) event_motd);
 	signal_add("event 422", (SIGNAL_FUNC) event_motd);
 	signal_add("event 439", (SIGNAL_FUNC) event_target_too_fast);
+	signal_add("event 704", (SIGNAL_FUNC) event_helpstart);
+	signal_add("event 705", (SIGNAL_FUNC) event_helptxt);
+	signal_add("event 706", (SIGNAL_FUNC) event_endofhelp);
 	signal_add("event 707", (SIGNAL_FUNC) event_target_too_fast);
 
         signal_add("default event numeric", (SIGNAL_FUNC) event_numeric);
@@ -808,6 +856,9 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 372", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 422", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 439", (SIGNAL_FUNC) event_target_too_fast);
+	signal_remove("event 704", (SIGNAL_FUNC) event_helpstart);
+	signal_remove("event 705", (SIGNAL_FUNC) event_helptxt);
+	signal_remove("event 706", (SIGNAL_FUNC) event_endofhelp);
 	signal_remove("event 707", (SIGNAL_FUNC) event_target_too_fast);
 
         signal_remove("default event numeric", (SIGNAL_FUNC) event_numeric);
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 1a96cbce..0adb2680 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -89,6 +89,9 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
+	{ "server_help_start", "$1", 2, { 0, 0 } },
+	{ "server_help_txt", "$1", 2, { 0, 0 } },
+	{ "server_end_of_help", "$1", 2, { 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Nick", 0 },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 5abd04a4..a9d29cb0 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -66,6 +66,9 @@ enum {
 	IRCTXT_INVITELIST_LONG,
 	IRCTXT_NO_SUCH_CHANNEL,
 	IRCTXT_CHANNEL_SYNCED,
+	IRCTXT_SERVER_HELP_START,
+	IRCTXT_SERVER_HELP_TXT,
+	IRCTXT_SERVER_END_OF_HELP,
 
 	IRCTXT_FILL_4,
 
@@ -89,7 +92,7 @@ enum {
 	IRCTXT_WHOIS_OPER,
 	IRCTXT_WHOIS_MODES,
 	IRCTXT_WHOIS_REALHOST,
-        IRCTXT_WHOIS_USERMODE,
+	IRCTXT_WHOIS_USERMODE,
 	IRCTXT_WHOIS_CHANNELS,
 	IRCTXT_WHOIS_AWAY,
 	IRCTXT_WHOIS_SPECIAL,
@@ -143,7 +146,7 @@ enum {
 	IRCTXT_SILENCED,
 	IRCTXT_UNSILENCED,
 	IRCTXT_SILENCE_LINE,
-        IRCTXT_ASK_OPER_PASS,
+	IRCTXT_ASK_OPER_PASS,
 	IRCTXT_ACCEPT_LIST
 };
 /* clang-format on */

From d193ca1784a1f6ebfe4b023b295c01ea9a18010a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 24 Apr 2022 15:40:54 +0200
Subject: [PATCH 1432/1650] Merge pull request #83 from ailin-nemui/shelp

new SHELP default alias

(cherry picked from commit 4cec2d98c5cd5d70f8694759de577da4e230830f)
---
 irssi.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/irssi.conf b/irssi.conf
index 21c3ba4c..010520fd 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -147,6 +147,7 @@ aliases = {
   SAY         = "MSG *";
   SB          = "SCROLLBACK";
   SBAR        = "STATUSBAR";
+  SHELP       = "QUOTE HELP";
   SIGNOFF     = "QUIT";
   SV          = "MSG * Irssi $J ($V) - https://irssi.org";
   T           = "TOPIC"; 

From d6bc4cf5b719ac0956102133ac95ed65b1f0c12c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 11 Mar 2022 12:11:18 +0100
Subject: [PATCH 1433/1650] Merge pull request #76 from
 ailin-nemui/scroll_page_count

fix scroll_page_count settings with .

(cherry picked from commit 84a98d0e0843b33c030798778e6b537a9d6141b2)
---
 src/fe-text/gui-readline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 8e1b66ff..88ea254b 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -163,7 +163,7 @@ static int get_scroll_count(void)
 	else if (count < 1)
                 count = 1.0/count;
 
-	if (*str == '/') {
+	if (*str == '/' || *str == '.') {
 		count = (active_mainwin->height-active_mainwin->statusbar_lines)/count;
 	}
 	return (int)count;

From 84de64d6dac3e746e2ff528ad75dae4fd48743c0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 26 May 2022 00:20:13 +0200
Subject: [PATCH 1434/1650] Merge pull request #84 from ailin-nemui/ignore-leak

avoid memory leak in ignore cache

(cherry picked from commit af5feb16be3390340434f5c1838684c3bd9eb91a)
---
 src/common.h                      |  2 +-
 src/core/ignore.c                 |  7 ++++++-
 src/core/nickmatch-cache.c        | 12 +++++++-----
 src/core/nickmatch-cache.h        |  3 ++-
 src/fe-common/core/hilight-text.c |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/common.h b/src/common.h
index ad5c88bb..7271c149 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 45
+#define IRSSI_ABI_VERSION 46
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/core/ignore.c b/src/core/ignore.c
index 0bc12ed3..da892c1e 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -490,6 +490,11 @@ static void read_ignores(void)
 	nickmatch_rebuild(nickmatch);
 }
 
+static void free_cache_matches(GSList *matches)
+{
+	g_slist_free(matches);
+}
+
 static void ignore_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 			      NICK_REC *nick)
 {
@@ -520,7 +525,7 @@ static void ignore_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 void ignore_init(void)
 {
 	ignores = NULL;
-	nickmatch = nickmatch_init(ignore_nick_cache);
+	nickmatch = nickmatch_init(ignore_nick_cache, (GDestroyNotify) free_cache_matches);
 	time_tag = g_timeout_add(1000, (GSourceFunc) unignore_timeout, NULL);
 
         read_ignores();
diff --git a/src/core/nickmatch-cache.c b/src/core/nickmatch-cache.c
index cae6620d..c8fc1157 100644
--- a/src/core/nickmatch-cache.c
+++ b/src/core/nickmatch-cache.c
@@ -28,12 +28,13 @@
 
 static GSList *lists;
 
-NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func)
+NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func, GDestroyNotify value_destroy_func)
 {
 	NICKMATCH_REC *rec;
 
 	rec = g_new0(NICKMATCH_REC, 1);
 	rec->func = func;
+	rec->value_destroy_func = value_destroy_func;
 
 	lists = g_slist_append(lists, rec);
         return rec;
@@ -43,8 +44,9 @@ void nickmatch_deinit(NICKMATCH_REC *rec)
 {
 	lists = g_slist_remove(lists, rec);
 
-        g_hash_table_destroy(rec->nicks);
-        g_free(rec);
+	if (rec->nicks != NULL)
+		g_hash_table_destroy(rec->nicks);
+	g_free(rec);
 }
 
 static void nickmatch_check_channel(CHANNEL_REC *channel, NICKMATCH_REC *rec)
@@ -65,8 +67,8 @@ void nickmatch_rebuild(NICKMATCH_REC *rec)
 	if (rec->nicks != NULL)
 		g_hash_table_destroy(rec->nicks);
 
-	rec->nicks = g_hash_table_new((GHashFunc) g_direct_hash,
-				      (GCompareFunc) g_direct_equal);
+	rec->nicks = g_hash_table_new_full((GHashFunc) g_direct_hash, (GCompareFunc) g_direct_equal,
+	                                   NULL, (GDestroyNotify) rec->value_destroy_func);
 
 	g_slist_foreach(channels, (GFunc) nickmatch_check_channel, rec);
 }
diff --git a/src/core/nickmatch-cache.h b/src/core/nickmatch-cache.h
index ff58d853..bae99c1d 100644
--- a/src/core/nickmatch-cache.h
+++ b/src/core/nickmatch-cache.h
@@ -7,9 +7,10 @@ typedef void (*NICKMATCH_REBUILD_FUNC) (GHashTable *list,
 typedef struct {
         GHashTable *nicks;
 	NICKMATCH_REBUILD_FUNC func;
+	GDestroyNotify value_destroy_func;
 } NICKMATCH_REC;
 
-NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func);
+NICKMATCH_REC *nickmatch_init(NICKMATCH_REBUILD_FUNC func, GDestroyNotify value_destroy_func);
 void nickmatch_deinit(NICKMATCH_REC *rec);
 
 /* Calls rebuild function for all nicks in all channels.
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index d308bd04..66e2dfd3 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -793,7 +793,7 @@ void hilight_text_init(void)
 
 	read_settings();
 
-	nickmatch = nickmatch_init(hilight_nick_cache);
+	nickmatch = nickmatch_init(hilight_nick_cache, NULL);
 	read_hilight_config();
 
 	signal_add_first("print text", (SIGNAL_FUNC) sig_print_text);

From cbb155e73c0b63323befd7eb4a4dfa27d7e8c495 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 19 Feb 2022 00:20:00 +0100
Subject: [PATCH 1435/1650] remove install_rpath

reported by dwfreed / Unit193

(cherry picked from commit e692f85f4a388d8bcaec9d3c5e475fc7cb5a6271)
---
 src/fe-text/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 4da98809..3ceeda12 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -41,7 +41,6 @@ executable('irssi',
     libfe_irc_notifylist_a,
     ],
   install : true,
-  install_rpath : get_option('prefix') / get_option('libdir'),
   dependencies : dep
   + textui_dep
 )

From 612fdb9c2dd9d420a6e16399afadbbc02b357527 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 29 May 2022 20:46:17 +0200
Subject: [PATCH 1436/1650] tag as 1.4.0-an

---
 NEWS                   | 20 ++++++++++++++++++++
 configure.ac           |  2 +-
 meson.build            |  2 +-
 utils/irssi-version.sh |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 5464ad05..ba1a750b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+v1.4.0-an 2022-05-31  Ailin Nemui <Nei>
+	* Format the output of /QUOTE HELP (#1371, an#82). By Val
+	  Lorentz. Add /SHELP as default alias (an#83)
+	+ GLib log message filter: /SET glib_log_domains (an#50,
+	  an#59). By Andrej Kacian
+	+ An option to clear the cutbuffer:
+	  /SET empty_kill_clears_cutbuffer (an#58). By Mikael
+	  Magnusson
+	+ Scriptable pastebin (an#60)
+	+ Configurable actlist separator: /SET actlist_separator
+	  (#1364, an#61)
+	- Fix window left/right not skipping visible windows
+	  (an#57). By Mikael Magnusson
+	- Fix wrong printf-format on OpenBSD (an#66, an#68). Reported
+	  by Aaron Bieber
+	- Fix erroneous output produced by autoload_modules (an#72)
+	- Fix scroll_page_count setting with `.' (#1365, an#76)
+	- Fix memory leak in /IGNORE (#1373, an#84). Found by Jookia
+	- Misc fixes (an#45, an#67, an#70, #1368, an#77)
+
 v1.3.2-an 2022-01-14  Ailin Nemui <Nei>
 	- CHANTYPES take precedence over (missing) STATUSMSG in /join
           (#1358, an#54)
diff --git a/configure.ac b/configure.ac
index 87dcbc32..fba52295 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.2-an)
+AC_INIT(irssi, 1.4.0-an)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 64dd04cf..a563a90e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.2-an',
+  version : '1.4.0-an',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index b096fd90..75c62835 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -14,7 +14,7 @@ if test -z "$VERSION_DATE"; then
 	;;
     esac
     VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '`
-    VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null`
+    VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null | cut -c 1-4`
 fi
 
 echo "#define IRSSI_VERSION_DATE $VERSION_DATE"

From 7207a26d1eafc708926598b7046687e6d88e5f77 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 31 May 2022 10:25:01 +0200
Subject: [PATCH 1437/1650] revert branding

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4e1bb88d..ea4b817b 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ built in, and there are third party
 [Quassel](https://github.com/phhusson/quassel-irssi) protocol modules
 available.
 
-![irssi](https://user-images.githubusercontent.com/5665186/154820868-50c35841-04f4-4f4c-8df9-dd5aa4bbcde8.png)
+![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
 
 ## [Download information](https://irssi.org/download/)
 

From a39bc0601c5aa13c1fe6da0031cd02b6a1fa3c1f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 31 May 2022 21:09:39 +0200
Subject: [PATCH 1438/1650] fix missing len in g_array_copy

---
 src/fe-text/gui-readline.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 88ea254b..a53e4151 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -96,6 +96,7 @@ GArray *g_array_copy(GArray *array)
 	elt_size = g_array_get_element_size(array);
 	out = g_array_sized_new(FALSE, FALSE, elt_size, array->len);
 	memcpy(out->data, array->data, array->len * elt_size);
+	out->len = array->len;
 
 	return out;
 }

From 580b05a7f312231315db72ed6f8b4695e4c2ef65 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Jun 2022 18:38:15 +0200
Subject: [PATCH 1439/1650] Merge pull request #88 from ailin-nemui/arraycopy

fix missing len in g_array_copy

(cherry picked from commit 47b0661e9689d870f6ad499259368a7860880f2f)
---
 src/fe-text/gui-readline.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 88ea254b..a53e4151 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -96,6 +96,7 @@ GArray *g_array_copy(GArray *array)
 	elt_size = g_array_get_element_size(array);
 	out = g_array_sized_new(FALSE, FALSE, elt_size, array->len);
 	memcpy(out->data, array->data, array->len * elt_size);
+	out->len = array->len;
 
 	return out;
 }

From 0e0bc17992251f32ba43990e41c52b36ad344515 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 6 Jun 2022 12:08:49 +0200
Subject: [PATCH 1440/1650] tag as 1.4.1

---
 NEWS                   |  5 +++--
 configure.ac           |  2 +-
 meson.build            |  2 +-
 utils/irssi-version.sh | 39 ++++++++++++++++++++-------------------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 95f2c385..501ef0ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
-v1.4.0 2022-xx-xx The Irssi team <staff@irssi.org>
+v1.4.1 2022-06-12 The Irssi team <staff@irssi.org>
+	! Note: botti no longer compiles; get in touch if you use it
 	* Format the output of /QUOTE HELP (#1371, an#82). By Val
 	  Lorentz. Add /SHELP as default alias (an#83)
 	+ GLib log message filter: /SET glib_log_domains (an#50,
@@ -6,7 +7,7 @@ v1.4.0 2022-xx-xx The Irssi team <staff@irssi.org>
 	+ An option to clear the cutbuffer:
 	  /SET empty_kill_clears_cutbuffer (an#58). By Mikael
 	  Magnusson
-	+ Scriptable pastebin (an#60)
+	+ Scriptable pastebin (an#60, an#88)
 	+ Configurable actlist separator: /SET actlist_separator
 	  (#1364, an#61)
 	- Fix window left/right not skipping visible windows
diff --git a/configure.ac b/configure.ac
index d0de185b..f03569eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.4.0)
+AC_INIT(irssi, 1.4.1)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 59a26f3c..71dacead 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.4.0',
+  version : '1.4.1',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 75c62835..0d82147f 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -1,30 +1,31 @@
 #!/bin/sh
 
-DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null`
-
-VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
-VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`
-
-if test -z "$VERSION_DATE"; then
-    DATE=`grep '^v' $1/NEWS | head -1`
-    VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
-    case $VERSION_DATE in
-	*xx)
-	    VERSION_DATE=`date +%Y%m%d`
-	;;
-    esac
-    VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '`
-    VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null | cut -c 1-4`
-fi
-
-echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
-echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
+DATE=`grep '^v' $1/NEWS | head -1`
+VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
+case $VERSION_DATE in
+  *xx)
+    VERSION_DATE=`date +%Y%m%d`
+    ;;
+esac
+VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '`
+VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null | cut -c 1-4`
 
 if echo "${VERSION}" | grep -q -- -head; then
   # -head version, get extra details from git if we can
+  DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null`
+
+  VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
+
+  if test -z "$VERSION_DATE"; then
+    VERSION_DATE=`date +%Y%m%d`
+  fi
+
   git_version=$(GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null)
   if [ $? = 0 ]; then
     echo "#undef PACKAGE_VERSION"
     echo "#define PACKAGE_VERSION \"${git_version}\""
   fi
 fi
+
+echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
+echo "#define IRSSI_VERSION_TIME $VERSION_TIME"

From f2c5e6076698ed19beb2b606b90c237b3bb5c641 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 6 Jun 2022 21:47:19 +0200
Subject: [PATCH 1441/1650] revert branding

---
 NEWS                         |  2 +-
 README.md                    | 24 ++++++++++++------------
 src/fe-text/module-formats.c |  6 +++++-
 utils/make-dist.sh           |  4 ++--
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index 3f591c80..d7074e75 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v1.5-head-an 2022-xx-xx  The Irssi team <staff@irssi.org>
+v1.5-head 202x-xx-xx  The Irssi team <staff@irssi.org>
 
 v1.4.1 2022-06-12 The Irssi team <staff@irssi.org>
 	! Note: botti no longer compiles; get in touch if you use it
diff --git a/README.md b/README.md
index a88ab927..963fbfca 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Neırssi
+# [Irssi](https://irssi.org)
 
-![Build Status](https://github.com/ailin-nemui/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
+![Build Status](https://github.com/irssi/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
 
-Neırssi is a modular text mode chat client mostly compatible with
-[Irssi](https://irssi.org). It comes with IRC support built in, and
-there are third party [ICB](https://github.com/jperkin/irssi-icb),
+Irssi is a modular text mode chat client. It comes with IRC support
+built in, and there are third party
+[ICB](https://github.com/jperkin/irssi-icb),
 [SILC](http://www.silcnet.org/),
 [XMPP](http://cybione.org/~irssi-xmpp/) (Jabber),
 [PSYC](http://about.psyc.eu/Irssyc) and
@@ -13,14 +13,14 @@ available.
 
 ![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
 
-## [Download information](https://ailin-nemui.github.io/irssi/Getting.html)
+## [Download information](https://irssi.org/download/)
 
 #### Development source installation
 
 [Ninja](https://ninja-build.org/) 1.8 and [Meson](https://mesonbuild.com/) 0.53
 
 ```
-git clone https://github.com/ailin-nemui/irssi
+git clone https://github.com/irssi/irssi
 cd irssi
 meson Build
 ninja -C Build && sudo ninja -C Build install
@@ -28,7 +28,7 @@ ninja -C Build && sudo ninja -C Build install
 
 #### Release source installation
 
-* Download [release](https://github.com/ailin-nemui/irssi/releases)
+* Download [release](https://github.com/irssi/irssi/releases)
 * Verify signature
 ```
 tar xJf irssi-*.tar.xz
@@ -46,17 +46,17 @@ ninja -C Build && sudo ninja -C Build install
 
 #### See the [INSTALL](INSTALL) file for details
 
-## Documentation
+## [Documentation](https://irssi.org/documentation/)
 
-* [New users guide](https://ailin-nemui.github.io/irssi/New-users.html)
+* [New users guide](https://irssi.org/New-users/)
+* [Questions and Answers](https://irssi.org/documentation/qna/)
 * Check the built-in `/HELP`, it has all the details on command syntax
-* Other random Irssi documentation on https://irssi.org/documentation/
 
 ## [Themes](https://irssi-import.github.io/themes/)
 
 ## [Scripts](https://scripts.irssi.org/)
 
-## [Modules](https://ailin-nemui.github.io/irssi/Modules.html)
+## [Modules](https://irssi.org/modules/)
 
 ## [Security information](https://irssi.org/security/)
 
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index bb7eacee..6c2ba0a9 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -85,7 +85,11 @@ FORMAT_REC gui_text_formats[] = {
 	{ NULL, "Welcome", 0 },
 
 	{ "irssi_banner",
-	  "Neırssi v$J", 0 },
+	  " ___           _%:"
+	  "|_ _|_ _ _____(_)%:"
+	  " | || '_(_-<_-< |%:"
+	  "|___|_| /__/__/_|%:"
+	  "Irssi v$J - https://irssi.org", 0 },
 	{ "welcome_firsttime",
 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
 	  "Hi there! If this is your first time using Irssi, you%:"
diff --git a/utils/make-dist.sh b/utils/make-dist.sh
index f1e4e4af..3ea56599 100755
--- a/utils/make-dist.sh
+++ b/utils/make-dist.sh
@@ -57,8 +57,8 @@ cat <<SETUP_CFG >setup.cfg
 [metadata]
 name = $name
 version = $version
-url = https://ailin-nemui.github.io/irssi/
-maintainer = Ailin Nemui
+url = https://irssi.org/
+maintainer = The Irssi team
 maintainer_email = @
 license = GNU General Public License v2 or later (GPLv2+)
 

From de46fee864818c8174aa63342378f18fb686ea72 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 11 Jun 2022 15:10:08 +0200
Subject: [PATCH 1442/1650] update website

---
 .github/workflows/trigger-pages.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/trigger-pages.yml

diff --git a/.github/workflows/trigger-pages.yml b/.github/workflows/trigger-pages.yml
new file mode 100644
index 00000000..e0d4b8ed
--- /dev/null
+++ b/.github/workflows/trigger-pages.yml
@@ -0,0 +1,20 @@
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  rebuild-pages:
+    if: github.repository == 'irssi/irssi'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.PAT_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: 'irssi.github.io',
+              workflow_id: 'pages.yml',
+              ref: 'main'
+            })
\ No newline at end of file

From ac35fe010e9eba1a256b36495311bba60e5c0054 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 11 Jun 2022 22:54:56 +0200
Subject: [PATCH 1443/1650] fix yet another meson regression

broken by meson 0.60.0
---
 meson.build | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/meson.build b/meson.build
index e736a212..4250ff0c 100644
--- a/meson.build
+++ b/meson.build
@@ -58,6 +58,9 @@ if fs.exists('config.status') or fs.exists('irssi-version.h') or fs.exists('defa
   error('this tree has been configured with autotools, cannot proceed')
 endif
 
+UNSET = '=INVALID='
+UNSET_ARR = [UNSET]
+
 chat_modules = ['irc']
 
 run_command('mkdir', meson.current_build_dir() / incdir, check : false)
@@ -334,8 +337,8 @@ if want_perl
   perl_rpath = ''
 
   #### ccopts ####
-  perl_ccopts = meson.get_cross_property('perl_ccopts', false)
-  if perl_ccopts == false
+  perl_ccopts = meson.get_cross_property('perl_ccopts', UNSET_ARR)
+  if perl_ccopts == UNSET_ARR
     res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts', check : true)
     perl_ccopts = res.stdout().strip().split()
   endif
@@ -348,8 +351,8 @@ if want_perl
   perl_cflags += cc.get_supported_arguments('-fPIC')
 
   #### ldopts ####
-  perl_ldopts = meson.get_cross_property('perl_ldopts', false)
-  if perl_ldopts == false
+  perl_ldopts = meson.get_cross_property('perl_ldopts', UNSET_ARR)
+  if perl_ldopts == UNSET_ARR
     res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts', check : true)
     perl_ldopts = res.stdout().strip().split()
   endif
@@ -365,8 +368,8 @@ if want_perl
     endif
   endforeach
 
-  perl_version = meson.get_cross_property('perl_version', false)
-  if perl_version == false
+  perl_version = meson.get_cross_property('perl_version', UNSET)
+  if perl_version == UNSET
     perl_version = run_command(cross_perl, '-V::version:', check : true).stdout().split('\'')[1]
   endif
   perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
@@ -389,8 +392,8 @@ int main()
       warning('error linking with perl libraries')
     endif
   else
-    xsubpp_file_c = meson.get_cross_property('perl_xsubpp', false)
-    if xsubpp_file_c == false
+    xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
+    if xsubpp_file_c == UNSET
       xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r', check : true).stdout()
     endif
     xsubpp = generator(build_perl,
@@ -418,13 +421,13 @@ int main()
       set_perl_use_lib = false
       perl_library_dir = with_perl_lib + ' default'
       if with_perl_lib in ['site', 'vendor']
-        perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', false)
-        if perlmoddir == false
+        perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', UNSET)
+        if perlmoddir == UNSET
           perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:', check : true).stdout().split('\'')[1]
         endif
       elif with_perl_lib == 'module'
-        perl_archname = meson.get_cross_property('perl_archname', false)
-        if perl_archname == false
+        perl_archname = meson.get_cross_property('perl_archname', UNSET)
+        if perl_archname == UNSET
           perl_archname = run_command(cross_perl, '-V::archname:', check : true).stdout().split('\'')[1]
         endif
         perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
@@ -444,8 +447,8 @@ int main()
 
     perl_use_lib = get_option('prefix') / perlmoddir
     if set_perl_use_lib
-      perl_inc = meson.get_cross_property('perl_inc', false)
-      if perl_inc == false
+      perl_inc = meson.get_cross_property('perl_inc', UNSET_ARR)
+      if perl_inc == UNSET_ARR
         set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib, check : false).returncode() != 0
       else
         set_perl_use_lib = not perl_inc.contains(perl_use_lib)

From 88745d2941f2cfa86d260e068c5e50b60c0baddb Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 12 Jun 2022 12:34:33 +0200
Subject: [PATCH 1444/1650] run syncscripts.sh

---
 scripts/scriptassist.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index cf02d57e..5cad3838 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2020042700';
+our $VERSION = '2022053100';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -30,7 +30,7 @@ $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
-my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r);
 
 sub show_help {
     my $help = "scriptassist $VERSION

From 34d45ac678e2e75133df83bc6d666c9a71829fd3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 12 Jun 2022 16:51:09 +0200
Subject: [PATCH 1445/1650] add irssimoduledir to irssi-1.pc

for module authors to know where to install to
---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e736a212..55e08be5 100644
--- a/meson.build
+++ b/meson.build
@@ -589,7 +589,8 @@ pc.generate(filebase : 'irssi-1',
   name : 'Irssi',
   description : 'Irssi chat client',
   version : package_version,
-  requires : pc_requires)
+  requires : pc_requires,
+  variables : ['irssimoduledir=${libdir}' / incdir / 'modules'])
 
 ###########
 # irssi.1 #

From 528632bba2257cd9532417163f0952275a25da1f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 12 Jun 2022 17:13:28 +0200
Subject: [PATCH 1446/1650] use -isystem instead of -I for include directories

limits warnings to our own code
---
 meson.build | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index 4250ff0c..e93fb9ce 100644
--- a/meson.build
+++ b/meson.build
@@ -174,7 +174,7 @@ message('*** Or alternatively install your distribution\'s package')
 message('*** On Debian: sudo apt-get install libglib2.0-dev')
 message('*** On Redhat: dnf install glib2-devel')
 if not require_glib_internal
-  glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency)
+  glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency, include_type : 'system')
 else
   glib_dep = dependency('', required : false)
 endif
@@ -256,9 +256,9 @@ if not glib_dep.found()
     dependencies : glib_internal_dependencies,
     sources : glib_internal_build_t,
     compile_args : [
-      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
-      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
-      '-I' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
+      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
+      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
+      '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
     ],
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
   )
@@ -271,12 +271,12 @@ if not glib_dep.found()
   gmodule_dep = declare_dependency(sources : glib_internal_build_t,
     dependencies : libdl_dep,
     compile_args : [
-      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
+      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
     ],
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
   )
 else
-  gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency)
+  gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency, include_type : 'system')
 endif
 dep += glib_dep
 dep += gmodule_dep
@@ -285,7 +285,7 @@ if glib_internal and want_static_dependency and want_fuzzer
   openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled'])
   openssl_dep = openssl_proj.get_variable('openssl_dep')
 else
-  openssl_dep = dependency('openssl', static : want_static_dependency)
+  openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system')
 endif
 dep += openssl_dep
 
@@ -344,6 +344,9 @@ if want_perl
   endif
   foreach fl : perl_ccopts
     if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m')
+      if fl.startswith('-I')
+        fl = '-isystem' + fl.split('-I')[1]
+      endif
       perl_cflags += fl
     endif
   endforeach
@@ -475,8 +478,8 @@ endif
 
 have_otr = false
 if want_otr
-  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency)
-  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency)
+  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency, include_type : 'system')
+  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency, include_type : 'system')
   if libgcrypt.found() and libotr.found()
     dep += libgcrypt
     dep += libotr

From 279fa4e5b875a4e777c5ec844891ae2adfefca19 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 12 Jun 2022 17:18:53 +0200
Subject: [PATCH 1447/1650] remove relevant code from termux receipe

---
 .github/workflows/termuxpkg.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
index de7ebbb3..af62f94d 100644
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@@ -42,11 +42,6 @@ jobs:
           --cross-file $TERMUX_MESON_PERL_CROSS_FILE
           "
 
-          termux_step_post_configure() {
-              # Make build log less noisy.
-              sed -i "s:-I$TERMUX_PREFIX/:-isystem$TERMUX_PREFIX/:g" $TERMUX_PKG_BUILDDIR/build.ninja
-          }
-
           termux_step_pre_configure() {
               LDFLAGS+=" -landroid-glob"
 

From ae8ec99d5c64d9d29f11c4f0e622fff0ae0f1b5e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 00:14:35 +0200
Subject: [PATCH 1448/1650] fix scrollback redraw not updating linecount

---
 src/fe-text/textbuffer-commands.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index f30eab0e..6ed7c39c 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -393,6 +393,7 @@ static void cmd_scrollback_redraw(void)
 
 	term_refresh_freeze();
 	textbuffer_view_reset_cache(gui->view);
+	textbuffer_view_resize(gui->view, gui->view->width, gui->view->height);
 	gui_window_redraw(active_win);
 	term_refresh_thaw();
 }

From 67aa2baf62d09da7c7d53fc0e52772af7d2430c2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 00:15:13 +0200
Subject: [PATCH 1449/1650] fix memory leak when updating single line

---
 src/fe-text/textbuffer-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 0c89f600..eb7db164 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -419,7 +419,7 @@ static void view_remove_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 
 	cache = g_hash_table_lookup(view->cache->line_cache, line);
 	if (cache != NULL) {
-                g_free(cache);
+		line_cache_destroy(NULL, cache);
 		g_hash_table_remove(view->cache->line_cache, line);
 	}
 }

From 04b914dcb09aab11f764d55079a939194ec010fc Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 00:17:05 +0200
Subject: [PATCH 1450/1650] fix visible lines expiring from cache

---
 src/fe-text/textbuffer-view.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index eb7db164..a28df7b5 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -1494,12 +1494,18 @@ static int line_cache_check_remove(void *key, LINE_CACHE_REC *cache,
 static int sig_check_linecache(void)
 {
 	GSList *tmp, *caches;
-        time_t now;
+	time_t now;
 
-        now = time(NULL); caches = NULL;
+	now = time(NULL);
+	caches = NULL;
 	for (tmp = views; tmp != NULL; tmp = tmp->next) {
 		TEXT_BUFFER_VIEW_REC *rec = tmp->data;
 
+		if (rec->window != NULL) {
+			/* keep visible lines mapped */
+			view_get_lines_height(rec, rec->startline, rec->subline, NULL);
+		}
+
 		if (g_slist_find(caches, rec->cache) != NULL)
 			continue;
 
@@ -1509,7 +1515,7 @@ static int sig_check_linecache(void)
 					    &now);
 	}
 
-        g_slist_free(caches);
+	g_slist_free(caches);
 	return 1;
 }
 

From 891ef5df10dc87541ef8f711953903be9cad31ea Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 02:44:33 +0200
Subject: [PATCH 1451/1650] default to hash channels

---
 src/irc/core/irc-channels.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index b0fba9b1..24f57f8d 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -71,7 +71,7 @@ static char *force_channel_name(IRC_SERVER_REC *server, const char *name)
 		return g_strdup(name);
 
 	chantypes = g_hash_table_lookup(server->isupport, "chantypes");
-	if (chantypes == NULL || *chantypes == '\0')
+	if (chantypes == NULL || *chantypes == '\0' || strchr(chantypes, '#') != NULL)
 		chantypes = "#";
 
 	return g_strdup_printf("%c%s", *chantypes, name);

From 48edd6f5fa75b2394782f5c6d211a1e3018b4852 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 00:45:58 +0200
Subject: [PATCH 1452/1650] fix recount of lines after window set

---
 src/fe-text/textbuffer-view.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index a28df7b5..561a1ea3 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -1464,8 +1464,10 @@ void textbuffer_view_set_window(TEXT_BUFFER_VIEW_REC *view,
 
 	if (view->window != window) {
 		view->window = window;
-                if (window != NULL)
+		if (window != NULL) {
+			textbuffer_view_resize(view, view->width, view->height);
 			view->dirty = TRUE;
+		}
 	}
 }
 

From b028b8e19d3161f48c7c83a0d7e7b83e6fb5f029 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 08:59:27 +0200
Subject: [PATCH 1453/1650] fix recount of lines after scroll

---
 src/fe-text/textbuffer-view.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 561a1ea3..7d007e40 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -1023,13 +1023,17 @@ void textbuffer_view_clear(TEXT_BUFFER_VIEW_REC *view)
 /* Scroll the view up/down */
 void textbuffer_view_scroll(TEXT_BUFFER_VIEW_REC *view, int lines)
 {
-	int count;
+	int count, ypos;
 
-        g_return_if_fail(view != NULL);
+	g_return_if_fail(view != NULL);
+
+	count = view_scroll(view, &view->startline, &view->subline, lines, TRUE);
+
+	ypos = view->ypos + (lines < 0 ? count : -count);
+	textbuffer_view_init_ypos(view);
+	if (ypos != view->ypos)
+		textbuffer_view_resize(view, view->width, view->height);
 
-	count = view_scroll(view, &view->startline, &view->subline,
-			    lines, TRUE);
-	view->ypos += lines < 0 ? count : -count;
 	view->bottom = view_is_bottom(view);
         if (view->bottom) view->more_text = FALSE;
 

From 453e65bbfe0c3bec9b5bb56c53b306aa1628c09d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 00:48:07 +0200
Subject: [PATCH 1454/1650] misc cleanup

---
 src/fe-text/textbuffer-view.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 7d007e40..ee474785 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -394,10 +394,9 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 
 	if (rec->count > 1) {
 		for (pos = 0; lines != NULL; pos++) {
-			void *data = lines->data;
+			LINE_CACHE_SUB_REC *data = lines->data;
 
-			memcpy(&rec->lines[pos], data,
-			       sizeof(LINE_CACHE_SUB_REC));
+			memcpy(&rec->lines[pos], data, sizeof(LINE_CACHE_SUB_REC));
 
 			lines = g_slist_remove(lines, data);
 			g_free(data);
@@ -430,7 +429,7 @@ static void view_update_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	view_remove_cache(view, line, update_counter);
 
 	if (view->buffer->cur_line == line)
-		view->cache->last_linecount = view_get_linecount(view, line);
+		view_get_linecount(view, line);
 }
 
 void textbuffer_view_reset_cache(TEXT_BUFFER_VIEW_REC *view)
@@ -459,6 +458,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	unichar chr;
 	int xpos, color, drawcount, first, need_move, need_clrtoeol, char_width;
 	unsigned int fg24, bg24;
+	fg24 = bg24 = UINT_MAX;
 
 	if (view->dirty) /* don't bother drawing anything - redraw is coming */
 		return 0;
@@ -757,7 +757,6 @@ static void view_unregister_indent_func(TEXT_BUFFER_VIEW_REC *view,
 	/* recreate cache so it won't contain references
 	   to the indent function */
 	textbuffer_view_reset_cache(view);
-	view->cache = textbuffer_cache_get(view->siblings, view->width);
 }
 
 void textbuffer_views_unregister_indent_func(INDENT_FUNC indent_func)
@@ -1073,10 +1072,10 @@ LINE_CACHE_REC *textbuffer_view_get_line_cache(TEXT_BUFFER_VIEW_REC *view,
 	cache = g_hash_table_lookup(view->cache->line_cache, line);
 	if (cache == NULL)
 		cache = view_update_line_cache(view, line);
-        else
+	else
 		cache->last_access = time(NULL);
 
-        return cache;
+	return cache;
 }
 
 static void view_insert_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
@@ -1257,12 +1256,13 @@ static void view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	view_bookmarks_check(view, line);
 
 	if (view->buffer->cur_line == line) {
-                /* the last line is being removed */
+		/* the last line is being removed */
 		LINE_REC *prevline;
 
-		prevline = view->buffer->first_line == line ? NULL :
-			textbuffer_line_last(view->buffer)->prev;
-		view->cache->last_linecount = prevline == NULL ? 0 :
+		prevline = view->buffer->first_line == line ?
+		               NULL :
+		               textbuffer_line_last(view->buffer)->prev;
+		if (prevline != NULL)
 			view_get_linecount(view, prevline);
 	}
 

From 4dc3eb10481c96be09feec93a09194b146d3aceb Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 13 Jun 2022 01:51:03 +0200
Subject: [PATCH 1455/1650] update clang-format

---
 .github/workflows/clangformat.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index 59beb928..9076edc2 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -2,10 +2,10 @@ on: [pull_request]
 name: clang-format
 jobs:
   check-clang-format:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: install clang-format
-        run: sudo apt install clang-format-11
+        run: sudo apt install clang-format-14
       - uses: actions/checkout@main
       - name: fetch target ref
         run:
@@ -20,7 +20,7 @@ jobs:
       - name: run git-clang-format and Check if no changes are needed
         run:
           |
-            CLANG_FORMAT=clang-format-11 git-clang-format-11 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
+            CLANG_FORMAT=clang-format-14 git-clang-format-14 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
             cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
       - uses: actions/upload-artifact@v1
         if: failure()

From f135339e273d78ead530001af77674191a07b317 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 30 Jun 2022 23:13:48 +0200
Subject: [PATCH 1456/1650] minor rendering fix in eval help

---
 docs/help/in/eval.in | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/help/in/eval.in b/docs/help/in/eval.in
index b0c904b4..c53c6248 100644
--- a/docs/help/in/eval.in
+++ b/docs/help/in/eval.in
@@ -10,18 +10,22 @@
 %9Description:%9
 
     Evaluates the given commands and executes them; you can use internal
-    variables and separate multiple commands by using the ';' character.
-    If the command contains a string with '$', '\' or ';' those characters 
+    variables and separate multiple commands by using the `;' character.
+    If the command contains a string with `$', `\' or `;' those characters
     need to be escaped:
-        '$' -> '$$'
-        '\' -> '\\' (or even '\\\\', depending on where they are used)
-        ';' -> '\;'
+
+        `$' -> `$$'
+        `\' -> `\\' (or even `\\\\', depending on where they are used)
+        `;' -> `\;'
 
 %9Examples:%9
 
     /EVAL echo I am connected to ${S} on ${chatnet} as ${N}
     /EVAL echo My user privileges are +${usermode}; echo Let's party!
-    to print '1;2$3\4': /EVAL echo 1\;2$$3\\4       
+
+    to print `1;2$3\4':
+
+    /EVAL echo 1\;2$$3\\4
 
 %9References:%9
 

From 3fec4d894f1af4d4d67d56746ce874ec3643132b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 2 Jul 2022 13:48:55 +0200
Subject: [PATCH 1457/1650] use less time on termux pkg

hard-code the values instead of building perl
---
 .github/workflows/termuxpkg.yml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
index af62f94d..fa0c0fcb 100644
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@@ -18,17 +18,14 @@ jobs:
           path: src.irssi.git
       - name: download termux docker container
         uses: docker://termux/package-builder:latest
-      - name: build perl package
-        run: |
-          ./scripts/run-docker.sh ./build-package.sh -i perl
       - name: create irssi build receipe
         run: |
           mkdir packages/irssi-an
           cat << 'BUILD_SH' > packages/irssi-an/build.sh
-          TERMUX_PKG_HOMEPAGE=https://ailin-nemui.github.io/irssi/
+          TERMUX_PKG_HOMEPAGE=https://irssi.org/
           TERMUX_PKG_DESCRIPTION="Terminal based IRC client"
           TERMUX_PKG_LICENSE="GPL-2.0"
-          TERMUX_PKG_MAINTAINER="@ailin-nemui"
+          TERMUX_PKG_MAINTAINER="@irssi"
           TERMUX_PKG_VERSION=@VERSION@
           TERMUX_PKG_REVISION=@REVISION@
           TERMUX_PKG_SRCURL=file:///home/builder/termux-packages/src.irssi.git
@@ -36,7 +33,7 @@ jobs:
           TERMUX_PKG_DEPENDS="glib, libandroid-glob, libiconv, libotr, ncurses, openssl, perl, utf8proc"
           TERMUX_PKG_BREAKS="irssi"
           TERMUX_PKG_REPLACES="irssi"
-          TERMUX_MESON_PERL_CROSS_FILE=$TERMUX_PKG_TMPDIR/meson-miniperl-cross-$TERMUX_ARCH.txt
+          TERMUX_MESON_PERL_CROSS_FILE=$TERMUX_PKG_TMPDIR/meson-perl-cross-$TERMUX_ARCH.txt
           TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
           -Dfhs-prefix=$TERMUX_PREFIX
           --cross-file $TERMUX_MESON_PERL_CROSS_FILE
@@ -48,15 +45,17 @@ jobs:
               # Make build log less noisy.
               CFLAGS+=" -Wno-compound-token-split-by-macro"
 
-              # Make sure that perl stuff is reinstalled.
-              rm -rf $TERMUX_PREFIX/lib/irssi/perl
-
               local perl_version=$(. $TERMUX_SCRIPTDIR/packages/perl/build.sh; echo $TERMUX_PKG_VERSION)
-              local perl_srcdir=$TERMUX_TOPDIR/perl/src
 
-              cat <<MESON_PERL_CROSS >$TERMUX_MESON_PERL_CROSS_FILE
-          [binaries]
-          perl = ['$perl_srcdir/miniperl', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '-I$TERMUX_PREFIX/lib/perl5/$perl_version']
+              cat << MESON_PERL_CROSS >$TERMUX_MESON_PERL_CROSS_FILE
+          [properties]
+          perl_version = '$perl_version'
+          perl_ccopts = ['-I$TERMUX_PREFIX/include', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE']
+          perl_ldopts = ['-Wl,-E', '-I$TERMUX_PREFIX/include', '-L$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE', '-lperl', '-lm', '-ldl']
+          perl_archname = '${TERMUX_ARCH}-android'
+          perl_installsitearch = '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android'
+          perl_installvendorarch = ''
+          perl_inc = ['$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version', '$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/$perl_version']
           MESON_PERL_CROSS
           }
 
@@ -68,9 +67,12 @@ jobs:
               -e "s:@REVISION@:$GITHUB_RUN_NUMBER:" \
               packages/irssi-an/build.sh
           git -C src.irssi.git tag v$version
+      - name: prepare output folder
+        run: |
+          install -m a+rwx -d output
       - name: build irssi package
         run: |
-          ./scripts/run-docker.sh ./build-package.sh -I irssi-an
+          sudo ./scripts/run-docker.sh ./build-package.sh -I irssi-an
       - uses: actions/upload-artifact@v2
         with:
           name: irssi-termux-pkg

From 3404d822c83546b031d47a99e37ae65b887bec94 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 18 Jun 2022 12:43:01 +0200
Subject: [PATCH 1458/1650] Merge pull request #1384 from
 ailin-nemui/meson-system-includes

use -isystem instead of -I for include directories

(cherry picked from commit 593afc2e40fee9714a44f87f58718f327b68247f)
---
 meson.build | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index 71dacead..d9eb935f 100644
--- a/meson.build
+++ b/meson.build
@@ -168,7 +168,7 @@ message('*** Or alternatively install your distribution\'s package')
 message('*** On Debian: sudo apt-get install libglib2.0-dev')
 message('*** On Redhat: dnf install glib2-devel')
 if not require_glib_internal
-  glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency)
+  glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency, include_type : 'system')
 else
   glib_dep = dependency('', required : false)
 endif
@@ -250,9 +250,9 @@ if not glib_dep.found()
     dependencies : glib_internal_dependencies,
     sources : glib_internal_build_t,
     compile_args : [
-      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
-      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
-      '-I' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
+      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
+      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
+      '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
     ],
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
   )
@@ -265,12 +265,12 @@ if not glib_dep.found()
   gmodule_dep = declare_dependency(sources : glib_internal_build_t,
     dependencies : libdl_dep,
     compile_args : [
-      '-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
+      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
     ],
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
   )
 else
-  gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency)
+  gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency, include_type : 'system')
 endif
 dep += glib_dep
 dep += gmodule_dep
@@ -279,7 +279,7 @@ if glib_internal and want_static_dependency and want_fuzzer
   openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled'])
   openssl_dep = openssl_proj.get_variable('openssl_dep')
 else
-  openssl_dep = dependency('openssl', static : want_static_dependency)
+  openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system')
 endif
 dep += openssl_dep
 
@@ -338,6 +338,9 @@ if want_perl
   endif
   foreach fl : perl_ccopts
     if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m')
+      if fl.startswith('-I')
+        fl = '-isystem' + fl.split('-I')[1]
+      endif
       perl_cflags += fl
     endif
   endforeach
@@ -469,8 +472,8 @@ endif
 
 have_otr = false
 if want_otr
-  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency)
-  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency)
+  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency, include_type : 'system')
+  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency, include_type : 'system')
   if libgcrypt.found() and libotr.found()
     dep += libgcrypt
     dep += libotr

From f17fb682573985656fa26bf10370b9e1d88e3bdf Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 18 Jun 2022 12:42:47 +0200
Subject: [PATCH 1459/1650] Merge pull request #1387 from
 ailin-nemui/textbufferview

Textbufferview

(cherry picked from commit 783dd375339c1c98be36e277d47afdd6918d6160)
---
 .github/workflows/clangformat.yml |  6 ++--
 src/fe-text/textbuffer-commands.c |  1 +
 src/fe-text/textbuffer-view.c     | 54 +++++++++++++++++++------------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index 59beb928..9076edc2 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -2,10 +2,10 @@ on: [pull_request]
 name: clang-format
 jobs:
   check-clang-format:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: install clang-format
-        run: sudo apt install clang-format-11
+        run: sudo apt install clang-format-14
       - uses: actions/checkout@main
       - name: fetch target ref
         run:
@@ -20,7 +20,7 @@ jobs:
       - name: run git-clang-format and Check if no changes are needed
         run:
           |
-            CLANG_FORMAT=clang-format-11 git-clang-format-11 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
+            CLANG_FORMAT=clang-format-14 git-clang-format-14 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
             cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
       - uses: actions/upload-artifact@v1
         if: failure()
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index f30eab0e..6ed7c39c 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -393,6 +393,7 @@ static void cmd_scrollback_redraw(void)
 
 	term_refresh_freeze();
 	textbuffer_view_reset_cache(gui->view);
+	textbuffer_view_resize(gui->view, gui->view->width, gui->view->height);
 	gui_window_redraw(active_win);
 	term_refresh_thaw();
 }
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index 79f3522c..2cc6ce6d 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -402,10 +402,9 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
 
 	if (rec->count > 1) {
 		for (pos = 0; lines != NULL; pos++) {
-			void *data = lines->data;
+			LINE_CACHE_SUB_REC *data = lines->data;
 
-			memcpy(&rec->lines[pos], data,
-			       sizeof(LINE_CACHE_SUB_REC));
+			memcpy(&rec->lines[pos], data, sizeof(LINE_CACHE_SUB_REC));
 
 			lines = g_slist_remove(lines, data);
 			g_free(data);
@@ -427,7 +426,7 @@ static void view_remove_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 
 	cache = g_hash_table_lookup(view->cache->line_cache, line);
 	if (cache != NULL) {
-                g_free(cache);
+		line_cache_destroy(NULL, cache);
 		g_hash_table_remove(view->cache->line_cache, line);
 	}
 }
@@ -438,7 +437,7 @@ static void view_update_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	view_remove_cache(view, line, update_counter);
 
 	if (view->buffer->cur_line == line)
-		view->cache->last_linecount = view_get_linecount(view, line);
+		view_get_linecount(view, line);
 }
 
 void textbuffer_view_reset_cache(TEXT_BUFFER_VIEW_REC *view)
@@ -467,6 +466,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	unichar chr;
 	int xpos, color, drawcount, first, need_move, need_clrtoeol, char_width;
 	unsigned int fg24, bg24;
+	fg24 = bg24 = UINT_MAX;
 
 	if (view->dirty) /* don't bother drawing anything - redraw is coming */
 		return 0;
@@ -767,7 +767,6 @@ static void view_unregister_indent_func(TEXT_BUFFER_VIEW_REC *view,
 	/* recreate cache so it won't contain references
 	   to the indent function */
 	textbuffer_view_reset_cache(view);
-	view->cache = textbuffer_cache_get(view->siblings, view->width);
 }
 
 void textbuffer_views_unregister_indent_func(INDENT_FUNC indent_func)
@@ -1033,13 +1032,17 @@ void textbuffer_view_clear(TEXT_BUFFER_VIEW_REC *view)
 /* Scroll the view up/down */
 void textbuffer_view_scroll(TEXT_BUFFER_VIEW_REC *view, int lines)
 {
-	int count;
+	int count, ypos;
 
-        g_return_if_fail(view != NULL);
+	g_return_if_fail(view != NULL);
+
+	count = view_scroll(view, &view->startline, &view->subline, lines, TRUE);
+
+	ypos = view->ypos + (lines < 0 ? count : -count);
+	textbuffer_view_init_ypos(view);
+	if (ypos != view->ypos)
+		textbuffer_view_resize(view, view->width, view->height);
 
-	count = view_scroll(view, &view->startline, &view->subline,
-			    lines, TRUE);
-	view->ypos += lines < 0 ? count : -count;
 	view->bottom = view_is_bottom(view);
         if (view->bottom) view->more_text = FALSE;
 
@@ -1079,10 +1082,10 @@ LINE_CACHE_REC *textbuffer_view_get_line_cache(TEXT_BUFFER_VIEW_REC *view,
 	cache = g_hash_table_lookup(view->cache->line_cache, line);
 	if (cache == NULL)
 		cache = view_update_line_cache(view, line);
-        else
+	else
 		cache->last_access = time(NULL);
 
-        return cache;
+	return cache;
 }
 
 static void view_insert_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
@@ -1263,12 +1266,13 @@ static void view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
 	view_bookmarks_check(view, line);
 
 	if (view->buffer->cur_line == line) {
-                /* the last line is being removed */
+		/* the last line is being removed */
 		LINE_REC *prevline;
 
-		prevline = view->buffer->first_line == line ? NULL :
-			textbuffer_line_last(view->buffer)->prev;
-		view->cache->last_linecount = prevline == NULL ? 0 :
+		prevline = view->buffer->first_line == line ?
+		               NULL :
+		               textbuffer_line_last(view->buffer)->prev;
+		if (prevline != NULL)
 			view_get_linecount(view, prevline);
 	}
 
@@ -1474,8 +1478,10 @@ void textbuffer_view_set_window(TEXT_BUFFER_VIEW_REC *view,
 
 	if (view->window != window) {
 		view->window = window;
-                if (window != NULL)
+		if (window != NULL) {
+			textbuffer_view_resize(view, view->width, view->height);
 			view->dirty = TRUE;
+		}
 	}
 }
 
@@ -1504,12 +1510,18 @@ static int line_cache_check_remove(void *key, LINE_CACHE_REC *cache,
 static int sig_check_linecache(void)
 {
 	GSList *tmp, *caches;
-        time_t now;
+	time_t now;
 
-        now = time(NULL); caches = NULL;
+	now = time(NULL);
+	caches = NULL;
 	for (tmp = views; tmp != NULL; tmp = tmp->next) {
 		TEXT_BUFFER_VIEW_REC *rec = tmp->data;
 
+		if (rec->window != NULL) {
+			/* keep visible lines mapped */
+			view_get_lines_height(rec, rec->startline, rec->subline, NULL);
+		}
+
 		if (g_slist_find(caches, rec->cache) != NULL)
 			continue;
 
@@ -1519,7 +1531,7 @@ static int sig_check_linecache(void)
 					    &now);
 	}
 
-        g_slist_free(caches);
+	g_slist_free(caches);
 	return 1;
 }
 

From c6a7f02042f63d01a38e8d522cff8f5d951afd51 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 12 Jun 2022 18:10:50 +0200
Subject: [PATCH 1460/1650] Merge pull request #1383 from
 ailin-nemui/pc-moduledir

add irssimoduledir to irssi-1.pc

(cherry picked from commit 545d97f8d601e9c1692abba6075bb44a0b4db07c)
---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index d9eb935f..a928991e 100644
--- a/meson.build
+++ b/meson.build
@@ -590,7 +590,8 @@ pc.generate(filebase : 'irssi-1',
   name : 'Irssi',
   description : 'Irssi chat client',
   version : package_version,
-  requires : pc_requires)
+  requires : pc_requires,
+  variables : ['irssimoduledir=${libdir}' / incdir / 'modules'])
 
 ###########
 # irssi.1 #

From 730c3c1a12f782b92d710883f52a106e37f148e4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 12 Jun 2022 05:33:41 +0200
Subject: [PATCH 1461/1650] Merge pull request #1377 from ailin-nemui/meson

fix yet another meson regression

(cherry picked from commit 07aa061b6d51a7c246047053e734a2fba8e31a83)
---
 meson.build | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/meson.build b/meson.build
index a928991e..9aa3b8c9 100644
--- a/meson.build
+++ b/meson.build
@@ -55,6 +55,9 @@ want_static_dependency = get_option('static-dependency') == 'yes'
 
 package_version     = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version()
 
+UNSET = '=INVALID='
+UNSET_ARR = [UNSET]
+
 chat_modules = ['irc']
 
 run_command('mkdir', meson.current_build_dir() / incdir)
@@ -331,8 +334,8 @@ if want_perl
   perl_rpath = ''
 
   #### ccopts ####
-  perl_ccopts = meson.get_cross_property('perl_ccopts', false)
-  if perl_ccopts == false
+  perl_ccopts = meson.get_cross_property('perl_ccopts', UNSET_ARR)
+  if perl_ccopts == UNSET_ARR
     res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts')
     perl_ccopts = res.stdout().strip().split()
   endif
@@ -348,8 +351,8 @@ if want_perl
   perl_cflags += cc.get_supported_arguments('-fPIC')
 
   #### ldopts ####
-  perl_ldopts = meson.get_cross_property('perl_ldopts', false)
-  if perl_ldopts == false
+  perl_ldopts = meson.get_cross_property('perl_ldopts', UNSET_ARR)
+  if perl_ldopts == UNSET_ARR
     res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts')
     perl_ldopts = res.stdout().strip().split()
   endif
@@ -365,8 +368,8 @@ if want_perl
     endif
   endforeach
 
-  perl_version = meson.get_cross_property('perl_version', false)
-  if perl_version == false
+  perl_version = meson.get_cross_property('perl_version', UNSET)
+  if perl_version == UNSET
     perl_version = run_command(cross_perl, '-V::version:').stdout().split('\'')[1]
   endif
   perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
@@ -389,8 +392,8 @@ int main()
       warning('error linking with perl libraries')
     endif
   else
-    xsubpp_file_c = meson.get_cross_property('perl_xsubpp', false)
-    if xsubpp_file_c == false
+    xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
+    if xsubpp_file_c == UNSET
       xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
     endif
     xsubpp = generator(build_perl,
@@ -418,13 +421,13 @@ int main()
       set_perl_use_lib = false
       perl_library_dir = with_perl_lib + ' default'
       if with_perl_lib in ['site', 'vendor']
-        perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', false)
-        if perlmoddir == false
+        perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', UNSET)
+        if perlmoddir == UNSET
           perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1]
         endif
       elif with_perl_lib == 'module'
-        perl_archname = meson.get_cross_property('perl_archname', false)
-        if perl_archname == false
+        perl_archname = meson.get_cross_property('perl_archname', UNSET)
+        if perl_archname == UNSET
           perl_archname = run_command(cross_perl, '-V::archname:').stdout().split('\'')[1]
         endif
         perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
@@ -444,8 +447,8 @@ int main()
 
     perl_use_lib = get_option('prefix') / perlmoddir
     if set_perl_use_lib
-      perl_inc = meson.get_cross_property('perl_inc', false)
-      if perl_inc == false
+      perl_inc = meson.get_cross_property('perl_inc', UNSET_ARR)
+      if perl_inc == UNSET_ARR
         set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0
       else
         set_perl_use_lib = not perl_inc.contains(perl_use_lib)

From 1b6b92ffff6950ee28c1b7936f53d83988843ed4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 13 Jun 2022 07:39:29 +0200
Subject: [PATCH 1462/1650] Merge pull request #1388 from
 ailin-nemui/default-hash-chan

default to hash channels

(cherry picked from commit a5f5ea7d79274fcf547ef81f019b0c38c6863051)
---
 src/irc/core/irc-channels.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index b0fba9b1..24f57f8d 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -71,7 +71,7 @@ static char *force_channel_name(IRC_SERVER_REC *server, const char *name)
 		return g_strdup(name);
 
 	chantypes = g_hash_table_lookup(server->isupport, "chantypes");
-	if (chantypes == NULL || *chantypes == '\0')
+	if (chantypes == NULL || *chantypes == '\0' || strchr(chantypes, '#') != NULL)
 		chantypes = "#";
 
 	return g_strdup_printf("%c%s", *chantypes, name);

From 7fe7de3c2e990d71c94da87f7bf9280e8a6ddcde Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 12 Jul 2022 20:48:53 +0200
Subject: [PATCH 1463/1650] get line texts before printing lastlog

---
 src/fe-text/lastlog.c | 99 +++++++++++++++++++++++++------------------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index 54321832..b93b8361 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -87,17 +87,20 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 {
 	WINDOW_REC *window;
         LINE_REC *startline;
-	GList *list, *tmp;
-	GString *line;
-        char *str;
+	TEXT_BUFFER_VIEW_REC *view;
+	TEXT_BUFFER_REC *buffer;
+	GSList *texts, *tmp;
+	GList *list, *tmp2;
+	char *str;
 	int level, before, after, len, date = FALSE;
 
         level = cmd_options_get_level("lastlog", optlist);
 	if (level == -1) return; /* error in options */
         if (level == 0) level = MSGLEVEL_ALL;
 
+	view = WINDOW_GUI(active_win)->view;
 	if (g_hash_table_lookup(optlist, "clear") != NULL) {
-		textbuffer_view_remove_lines_by_level(WINDOW_GUI(active_win)->view, MSGLEVEL_LASTLOG);
+		textbuffer_view_remove_lines_by_level(view, MSGLEVEL_LASTLOG);
 		if (*searchtext == '\0')
                         return;
 	}
@@ -117,14 +120,14 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 	}
 
 	if (g_hash_table_lookup(optlist, "new") != NULL)
-		startline = textbuffer_view_get_bookmark(WINDOW_GUI(window)->view, "lastlog_last_check");
+		startline = textbuffer_view_get_bookmark(view, "lastlog_last_check");
 	else if (g_hash_table_lookup(optlist, "away") != NULL)
-		startline = textbuffer_view_get_bookmark(WINDOW_GUI(window)->view, "lastlog_last_away");
+		startline = textbuffer_view_get_bookmark(view, "lastlog_last_away");
 	else
 		startline = NULL;
 
 	if (startline == NULL)
-                startline = textbuffer_view_get_lines(WINDOW_GUI(window)->view);
+		startline = textbuffer_view_get_lines(view);
 
 	str = g_hash_table_lookup(optlist, "#");
 	if (str != NULL) {
@@ -143,22 +146,21 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 	if (g_hash_table_lookup(optlist, "date") != NULL)
 		date = TRUE;
 
-	list = textbuffer_find_text(WINDOW_GUI(window)->view->buffer, startline,
-				    level, MSGLEVEL_LASTLOG,
-				    searchtext, before, after,
-				    g_hash_table_lookup(optlist, "regexp") != NULL,
-				    g_hash_table_lookup(optlist, "word") != NULL,
-				    g_hash_table_lookup(optlist, "case") != NULL);
+	buffer = view->buffer;
+	list = textbuffer_find_text(buffer, startline, level, MSGLEVEL_LASTLOG, searchtext, before,
+	                            after, g_hash_table_lookup(optlist, "regexp") != NULL,
+	                            g_hash_table_lookup(optlist, "word") != NULL,
+	                            g_hash_table_lookup(optlist, "case") != NULL);
 
-        len = g_list_length(list);
+	len = g_list_length(list);
 	if (count <= 0)
-		tmp = list;
+		tmp2 = list;
 	else {
 		int pos = len-count-start;
 		if (pos < 0) pos = 0;
 
-		tmp = pos > len ? NULL : g_list_nth(list, pos);
-		len = g_list_length(tmp);
+		tmp2 = pos > len ? NULL : g_list_nth(list, pos);
+		len = g_list_length(tmp2);
 	}
 
 	if (g_hash_table_lookup(optlist, "count") != NULL) {
@@ -177,29 +179,21 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 		return;
 	}
 
-	if (fhandle == NULL && g_hash_table_lookup(optlist, "-") == NULL)
-		printformat(NULL, NULL, MSGLEVEL_LASTLOG, TXT_LASTLOG_START);
-
-	line = g_string_new(NULL);
-        while (tmp != NULL && (count < 0 || count > 0)) {
-		LINE_REC *rec = tmp->data;
+	/* collect the line texts */
+	texts = NULL;
+	for (; tmp2 != NULL && (count < 0 || count > 0); tmp2 = tmp2->next) {
+		GString *line;
+		LINE_REC *rec = tmp2->data;
 
 		if (rec == NULL) {
-			if (tmp->next == NULL)
-                                break;
-			if (fhandle != NULL) {
-				fwrite("--\n", 3, 1, fhandle);
-			} else {
-				printformat_window(active_win,
-						   MSGLEVEL_LASTLOG,
-						   TXT_LASTLOG_SEPARATOR);
-			}
-                        tmp = tmp->next;
+			if (tmp2->next == NULL)
+				break;
+			texts = g_slist_prepend(texts, NULL);
 			continue;
 		}
 
-                /* get the line text */
-		textbuffer_line2text(WINDOW_GUI(window)->view->buffer, rec, fhandle == NULL, line);
+		line = g_string_new(NULL);
+		textbuffer_line2text(buffer, rec, fhandle == NULL, line);
 		if (!settings_get_bool("timestamps")) {
 			struct tm *tm = localtime(&rec->info.time);
                         char timestamp[10];
@@ -213,7 +207,31 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 		if (date == TRUE)
 			prepend_date(window, rec, line);
 
-                /* write to file/window */
+		texts = g_slist_prepend(texts, line);
+
+		count--;
+	}
+	texts = g_slist_reverse(texts);
+
+	if (fhandle == NULL && g_hash_table_lookup(optlist, "-") == NULL)
+		printformat(NULL, NULL, MSGLEVEL_LASTLOG, TXT_LASTLOG_START);
+
+	for (tmp = texts; tmp != NULL; tmp = tmp->next) {
+		GString *line = tmp->data;
+
+		if (line == NULL) {
+			if (tmp->next == NULL)
+				break;
+			if (fhandle != NULL) {
+				fwrite("--\n", 3, 1, fhandle);
+			} else {
+				printformat_window(active_win, MSGLEVEL_LASTLOG,
+				                   TXT_LASTLOG_SEPARATOR);
+			}
+			continue;
+		}
+
+		/* write to file/window */
 		if (fhandle != NULL) {
 			fwrite(line->str, line->len, 1, fhandle);
 			fputc('\n', fhandle);
@@ -221,18 +239,15 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 			printtext_window(active_win, MSGLEVEL_LASTLOG,
 					 "%s", line->str);
 		}
-
-		count--;
-		tmp = tmp->next;
+		g_string_free(line, TRUE);
 	}
-        g_string_free(line, TRUE);
 
 	if (fhandle == NULL && g_hash_table_lookup(optlist, "-") == NULL)
 		printformat(NULL, NULL, MSGLEVEL_LASTLOG, TXT_LASTLOG_END);
 
-	textbuffer_view_set_bookmark_bottom(WINDOW_GUI(window)->view,
-					    "lastlog_last_check");
+	textbuffer_view_set_bookmark_bottom(view, "lastlog_last_check");
 
+	g_slist_free(texts);
 	g_list_free(list);
 }
 

From 476774662add0af498a392bb96d6a797582d774b Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 13 Jul 2022 19:10:50 +0200
Subject: [PATCH 1464/1650] Merge pull request #1398 from
 ailin-nemui/lastlog-crash

get line texts before printing lastlog

(cherry picked from commit a57cc1c55e7a3e9d76964ccf0697431b9f521dc5)
---
 src/fe-text/lastlog.c | 99 +++++++++++++++++++++++++------------------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index 54321832..b93b8361 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -87,17 +87,20 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 {
 	WINDOW_REC *window;
         LINE_REC *startline;
-	GList *list, *tmp;
-	GString *line;
-        char *str;
+	TEXT_BUFFER_VIEW_REC *view;
+	TEXT_BUFFER_REC *buffer;
+	GSList *texts, *tmp;
+	GList *list, *tmp2;
+	char *str;
 	int level, before, after, len, date = FALSE;
 
         level = cmd_options_get_level("lastlog", optlist);
 	if (level == -1) return; /* error in options */
         if (level == 0) level = MSGLEVEL_ALL;
 
+	view = WINDOW_GUI(active_win)->view;
 	if (g_hash_table_lookup(optlist, "clear") != NULL) {
-		textbuffer_view_remove_lines_by_level(WINDOW_GUI(active_win)->view, MSGLEVEL_LASTLOG);
+		textbuffer_view_remove_lines_by_level(view, MSGLEVEL_LASTLOG);
 		if (*searchtext == '\0')
                         return;
 	}
@@ -117,14 +120,14 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 	}
 
 	if (g_hash_table_lookup(optlist, "new") != NULL)
-		startline = textbuffer_view_get_bookmark(WINDOW_GUI(window)->view, "lastlog_last_check");
+		startline = textbuffer_view_get_bookmark(view, "lastlog_last_check");
 	else if (g_hash_table_lookup(optlist, "away") != NULL)
-		startline = textbuffer_view_get_bookmark(WINDOW_GUI(window)->view, "lastlog_last_away");
+		startline = textbuffer_view_get_bookmark(view, "lastlog_last_away");
 	else
 		startline = NULL;
 
 	if (startline == NULL)
-                startline = textbuffer_view_get_lines(WINDOW_GUI(window)->view);
+		startline = textbuffer_view_get_lines(view);
 
 	str = g_hash_table_lookup(optlist, "#");
 	if (str != NULL) {
@@ -143,22 +146,21 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 	if (g_hash_table_lookup(optlist, "date") != NULL)
 		date = TRUE;
 
-	list = textbuffer_find_text(WINDOW_GUI(window)->view->buffer, startline,
-				    level, MSGLEVEL_LASTLOG,
-				    searchtext, before, after,
-				    g_hash_table_lookup(optlist, "regexp") != NULL,
-				    g_hash_table_lookup(optlist, "word") != NULL,
-				    g_hash_table_lookup(optlist, "case") != NULL);
+	buffer = view->buffer;
+	list = textbuffer_find_text(buffer, startline, level, MSGLEVEL_LASTLOG, searchtext, before,
+	                            after, g_hash_table_lookup(optlist, "regexp") != NULL,
+	                            g_hash_table_lookup(optlist, "word") != NULL,
+	                            g_hash_table_lookup(optlist, "case") != NULL);
 
-        len = g_list_length(list);
+	len = g_list_length(list);
 	if (count <= 0)
-		tmp = list;
+		tmp2 = list;
 	else {
 		int pos = len-count-start;
 		if (pos < 0) pos = 0;
 
-		tmp = pos > len ? NULL : g_list_nth(list, pos);
-		len = g_list_length(tmp);
+		tmp2 = pos > len ? NULL : g_list_nth(list, pos);
+		len = g_list_length(tmp2);
 	}
 
 	if (g_hash_table_lookup(optlist, "count") != NULL) {
@@ -177,29 +179,21 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 		return;
 	}
 
-	if (fhandle == NULL && g_hash_table_lookup(optlist, "-") == NULL)
-		printformat(NULL, NULL, MSGLEVEL_LASTLOG, TXT_LASTLOG_START);
-
-	line = g_string_new(NULL);
-        while (tmp != NULL && (count < 0 || count > 0)) {
-		LINE_REC *rec = tmp->data;
+	/* collect the line texts */
+	texts = NULL;
+	for (; tmp2 != NULL && (count < 0 || count > 0); tmp2 = tmp2->next) {
+		GString *line;
+		LINE_REC *rec = tmp2->data;
 
 		if (rec == NULL) {
-			if (tmp->next == NULL)
-                                break;
-			if (fhandle != NULL) {
-				fwrite("--\n", 3, 1, fhandle);
-			} else {
-				printformat_window(active_win,
-						   MSGLEVEL_LASTLOG,
-						   TXT_LASTLOG_SEPARATOR);
-			}
-                        tmp = tmp->next;
+			if (tmp2->next == NULL)
+				break;
+			texts = g_slist_prepend(texts, NULL);
 			continue;
 		}
 
-                /* get the line text */
-		textbuffer_line2text(WINDOW_GUI(window)->view->buffer, rec, fhandle == NULL, line);
+		line = g_string_new(NULL);
+		textbuffer_line2text(buffer, rec, fhandle == NULL, line);
 		if (!settings_get_bool("timestamps")) {
 			struct tm *tm = localtime(&rec->info.time);
                         char timestamp[10];
@@ -213,7 +207,31 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 		if (date == TRUE)
 			prepend_date(window, rec, line);
 
-                /* write to file/window */
+		texts = g_slist_prepend(texts, line);
+
+		count--;
+	}
+	texts = g_slist_reverse(texts);
+
+	if (fhandle == NULL && g_hash_table_lookup(optlist, "-") == NULL)
+		printformat(NULL, NULL, MSGLEVEL_LASTLOG, TXT_LASTLOG_START);
+
+	for (tmp = texts; tmp != NULL; tmp = tmp->next) {
+		GString *line = tmp->data;
+
+		if (line == NULL) {
+			if (tmp->next == NULL)
+				break;
+			if (fhandle != NULL) {
+				fwrite("--\n", 3, 1, fhandle);
+			} else {
+				printformat_window(active_win, MSGLEVEL_LASTLOG,
+				                   TXT_LASTLOG_SEPARATOR);
+			}
+			continue;
+		}
+
+		/* write to file/window */
 		if (fhandle != NULL) {
 			fwrite(line->str, line->len, 1, fhandle);
 			fputc('\n', fhandle);
@@ -221,18 +239,15 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 			printtext_window(active_win, MSGLEVEL_LASTLOG,
 					 "%s", line->str);
 		}
-
-		count--;
-		tmp = tmp->next;
+		g_string_free(line, TRUE);
 	}
-        g_string_free(line, TRUE);
 
 	if (fhandle == NULL && g_hash_table_lookup(optlist, "-") == NULL)
 		printformat(NULL, NULL, MSGLEVEL_LASTLOG, TXT_LASTLOG_END);
 
-	textbuffer_view_set_bookmark_bottom(WINDOW_GUI(window)->view,
-					    "lastlog_last_check");
+	textbuffer_view_set_bookmark_bottom(view, "lastlog_last_check");
 
+	g_slist_free(texts);
 	g_list_free(list);
 }
 

From bc805f9bcdbba0814ebf94ff6c91c2666a73dbbe Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 13 Jul 2022 20:08:52 +0200
Subject: [PATCH 1465/1650] tag as 1.4.2

---
 NEWS         | 38 ++++++++++++++++++++++++++------------
 configure.ac |  2 +-
 meson.build  |  2 +-
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 501ef0ba..97c57e44 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,18 @@
-v1.4.1 2022-06-12 The Irssi team <staff@irssi.org>
+v1.4.2 2022-07-17  The Irssi team <staff@irssi.org>
+	* Add irssimoduledir to irssi-1.pc in the Meson build (#1383,
+          #1378)
+	- Use -isystem includes, limiting warnings to Irssi
+          code. Fixes compilation with Perl 5.36 (#1381,
+          gentoo#851522, #1384)
+	- Fix missing lines when changing dynamic textbuffer contents
+          (#1382, #1387). Reported by externalserver15
+	- Fix Perl cross compilation with Meson 0.60.0 (#1377)
+	- Fix default channel prefix used for /JOIN to default to `#'
+          (#1385, #1388)
+	- Fix crash in /LASTLOG by getting line texts before printing
+          (#1367, #1398)
+
+v1.4.1 2022-06-12  The Irssi team <staff@irssi.org>
 	! Note: botti no longer compiles; get in touch if you use it
 	* Format the output of /QUOTE HELP (#1371, an#82). By Val
 	  Lorentz. Add /SHELP as default alias (an#83)
@@ -306,7 +320,7 @@ v1.4.1 2022-06-12 The Irssi team <staff@irssi.org>
 	  - Run abidiff on pull requests (#1179, #1195)
 	  - Test CI-Fuzz (#1279, #1304, an#17)
 
-v1.2.3 2021-04-11 The Irssi team <staff@irssi.org>
+v1.2.3 2021-04-11  The Irssi team <staff@irssi.org>
 	- Fix the compilation of utf8proc (#1021)
 	- Fix wrong call to free. By Zero King (#1076)
 	- Fix a colour reset in true colour themes when encountering
@@ -344,13 +358,13 @@ v1.2.3 2021-04-11 The Irssi team <staff@irssi.org>
 	- Fix memory leak when receiving bogus SASL authentication
           data. Found and fixed by Sergey Valentey (#1293)
 
-v1.2.2 2019-08-29 The Irssi team <staff@irssi.org>
+v1.2.2 2019-08-29  The Irssi team <staff@irssi.org>
 	- Fix a use after free issue when receiving IRCv3 CAP
           information from the server (GL#34, GL!35)
 	- Fix a crash during startup when windows weren't fully
           initialised yet (#1114, bdo#935813)
 
-v1.2.1 2019-06-29 The Irssi team <staff@irssi.org>
+v1.2.1 2019-06-29  The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.1.3
 	- Fix a test on big endian machines (#1014)
 	- Fix the compile time conditionality of wcwidth
@@ -361,17 +375,17 @@ v1.2.1 2019-06-29 The Irssi team <staff@irssi.org>
           encoding) in the input prompt was broken (#1018,
           #1057). Initial patch by Артём Курашов
 
-v1.1.3 2019-06-29 The Irssi team <staff@irssi.org>
+v1.1.3 2019-06-29  The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.0.8
 	- Fix regression of #779 where autolog_ignore_targets would
           not matching itemless windows anymore (#1012, #1013)
 
-v1.0.8 2019-06-29 The Irssi team <staff@irssi.org>
+v1.0.8 2019-06-29  The Irssi team <staff@irssi.org>
 	- Fix a use after free issue when sending the SASL login on
           (automatic and manual) reconnects (#1055, #1058). Reported
           by ilbelkyr
 
-v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
+v1.2.0 2019-02-11  The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.1.2
 	* Improved the /STATUSBAR commands (#858)
 	* /SET no longer shows `=' between setting and value (#886)
@@ -459,7 +473,7 @@ v1.2.0 2019-02-11 The Irssi team <staff@irssi.org>
 	- Misc fixes (#840, #839, #843, #953, #962). Tests (#806,
           #875, #905, #964, #1011). Fuzzing (#929).
 
-v1.1.2 2019-01-09 The Irssi team <staff@irssi.org>
+v1.1.2 2019-01-09  The Irssi team <staff@irssi.org>
 	- Fix the resetting of window hiddenlevel (#861)
 	- Fix clearing of hidelevel in layout (#951)
 	- Fix accessing unallocated text when checking entry position
@@ -478,14 +492,14 @@ v1.1.2 2019-01-09 The Irssi team <staff@irssi.org>
 	- Fix Perl detection on MacOS. By Dominyk Tiller (#927)
 	- Misc fixes. By Jaroslav Škarvada (#981, #982)
 
-v1.1.1 2018-02-15 The Irssi team <staff@irssi.org>
+v1.1.1 2018-02-15  The Irssi team <staff@irssi.org>
 	! Contains all changes from 1.0.7
 	- Restore compatibility with OpenSSL < 1.0.2 (#820, #831)
 	- Fix test compilation on some platforms (#815, #816)
 	- Fix portability and backwards compatibility of test runner
           (#818, #845)
 
-v1.0.7 2018-02-15 The Irssi team <staff@irssi.org>
+v1.0.7 2018-02-15  The Irssi team <staff@irssi.org>
 	- Prevent use after free error during the execution of some
 	  commands. Found by Joseph Bisch (GL#17, GL!24).
 	- Revert netsplit print optimisation due to crashes (#465, #809,
@@ -504,7 +518,7 @@ v1.0.7 2018-02-15 The Irssi team <staff@irssi.org>
           resize (GL#25, GL#29, #836).
 	- Minor help correction. By William Jackson (#834).
 
-v1.1.0 2018-01-15 The Irssi team <staff@irssi.org>
+v1.1.0 2018-01-15  The Irssi team <staff@irssi.org>
 	! Warning. Irssi is broken and will crash with OpenSSL < 1.0.2
           due to openssl/openssl commit
           5b4b9ce976fce09a7a92e2f25b91a1635cb840fe
@@ -586,7 +600,7 @@ v1.1.0 2018-01-15 The Irssi team <staff@irssi.org>
 	  #738)
 	- Fix space issue in glib-2.0.m4 (#621)
 
-v1.0.6 2018-01-07 The Irssi team <staff@irssi.org>
+v1.0.6 2018-01-07  The Irssi team <staff@irssi.org>
 	! Note: Code and aliases using `$($'-like constructs are no
           longer supported due to issue GL#18. Sorry about the
           inconvenience.
diff --git a/configure.ac b/configure.ac
index f03569eb..d8969cc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.4.1)
+AC_INIT(irssi, 1.4.2)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 9aa3b8c9..240c5344 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.4.1',
+  version : '1.4.2',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From 252656cad4933b7482480eaab63db0b16d942d51 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 24 Jul 2022 19:31:52 +0200
Subject: [PATCH 1466/1650] fix crash when loading server without chatnet

---
 src/core/servers-setup.c | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 5fbad79e..b3bb18f7 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -448,6 +448,7 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 {
 	SERVER_SETUP_REC *rec;
 	CHATNET_REC *chatnetrec;
+	CHAT_PROTOCOL_REC *proto;
 	char *server, *chatnet, *family;
 	int port;
 	char *value = NULL;
@@ -468,27 +469,40 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 
 	rec = NULL;
 
-	chatnetrec = chatnet == NULL ? NULL : chatnet_find(chatnet);
-	if (chatnetrec == NULL && chatnet != NULL) {
-                /* chat network not found, create it. */
-		if (chatnet_find_unavailable(chatnet)) {
+	if (chatnet != NULL) {
+		chatnetrec = chatnet_find(chatnet);
+		if (chatnetrec != NULL) {
+			proto = CHAT_PROTOCOL(chatnetrec);
+		} else {
+			/* chat network not found, create it. */
+			if (chatnet_find_unavailable(chatnet)) {
+				/* no protocols loaded, skip loading servers */
+				return NULL;
+			}
+			proto = chat_protocol_get_default();
+			chatnetrec = proto->create_chatnet();
+			chatnetrec->chat_type = chat_protocol_get_default()->id;
+			chatnetrec->name = g_strdup(chatnet);
+			chatnet_create(chatnetrec);
+		}
+	} else {
+		chatnetrec = NULL;
+		proto = chat_protocol_get_default();
+		if (proto == NULL) {
 			/* no protocols loaded, skip loading servers */
 			return NULL;
 		}
-		chatnetrec = chat_protocol_get_default()->create_chatnet();
-		chatnetrec->chat_type = chat_protocol_get_default()->id;
-		chatnetrec->name = g_strdup(chatnet);
-		chatnet_create(chatnetrec);
 	}
 
 	family = config_node_get_str(node, "family", "");
 
-	rec = CHAT_PROTOCOL(chatnetrec)->create_server_setup();
+	rec = proto->create_server_setup();
 	rec->type = module_get_uniq_id("SERVER SETUP", 0);
-        rec->chat_type = CHAT_PROTOCOL(chatnetrec)->id;
+	rec->chat_type = proto->id;
 	rec->chatnet = chatnetrec == NULL ? NULL : g_strdup(chatnetrec->name);
-	rec->family = g_ascii_strcasecmp(family, "inet6") == 0 ? AF_INET6 :
-		(g_ascii_strcasecmp(family, "inet") == 0 ? AF_INET : 0);
+	rec->family = g_ascii_strcasecmp(family, "inet6") == 0 ?
+	                  AF_INET6 :
+	                  (g_ascii_strcasecmp(family, "inet") == 0 ? AF_INET : 0);
 	rec->address = g_strdup(server);
 	rec->password = g_strdup(config_node_get_str(node, "password", NULL));
 

From a237321b33a4455f3454ffb0adf99da3e128c7e0 Mon Sep 17 00:00:00 2001
From: Andreas Lundin <lunde@dreamhosted.se>
Date: Tue, 19 Jul 2022 16:29:03 +0200
Subject: [PATCH 1467/1650] re-write SIGTERM handling

Exit safely on SIGTERM by emitting "gui exit" from the main loops of
fe-text and fe-none rather than from the signal handler itself.

Based on feedback from Nei and dwfreed.
---
 src/common.h        |  2 +-
 src/core/core.c     | 17 +++++++++++++++--
 src/core/core.h     |  1 +
 src/core/settings.c | 14 --------------
 src/fe-none/irssi.c | 12 ++++++++++--
 src/fe-text/irssi.c |  5 +++++
 6 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/common.h b/src/common.h
index 1d4fd207..e51c24db 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 49
+#define IRSSI_ABI_VERSION 50
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/core/core.c b/src/core/core.c
index e9af84f7..5d72ca0a 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -68,6 +68,7 @@ void wcwidth_wrapper_deinit(void);
 int irssi_gui;
 int irssi_init_finished;
 int sighup_received;
+int sigterm_received;
 time_t client_start_time;
 
 static char *irssi_dir, *irssi_config_file;
@@ -89,6 +90,11 @@ static void sig_hup(int signo)
 	sighup_received = TRUE;
 }
 
+static void sig_term(int signo)
+{
+	sigterm_received = TRUE;
+}
+
 static void read_settings(void)
 {
 	static int signals[] = {
@@ -113,8 +119,15 @@ static void read_settings(void)
 	sigaction(SIGHUP, &act, NULL);
 
 	for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
-		act.sa_handler = find_substr(ignores, signames[n]) ?
-			SIG_IGN : SIG_DFL;
+		if (find_substr(ignores, signames[n])) {
+			act.sa_handler = SIG_IGN;
+		} else {
+			/* set default handlers */
+			if (signals[n] == SIGTERM)
+				act.sa_handler = sig_term;
+			else
+				act.sa_handler = SIG_DFL;
+		}
 		sigaction(signals[n], &act, NULL);
 	}
 
diff --git a/src/core/core.h b/src/core/core.h
index 3c544753..62c54b22 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -14,6 +14,7 @@
 extern int irssi_gui;
 extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is sent */
 extern int sighup_received; /* TRUE after received SIGHUP. */
+extern int sigterm_received; /* TRUE after received SIGTERM. */
 extern time_t client_start_time;
 
 void core_preinit(const char *path);
diff --git a/src/core/settings.c b/src/core/settings.c
index 1e7ef2ee..065c8fed 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -673,18 +673,6 @@ GSList *settings_get_sorted(void)
 	return list;
 }
 
-void sig_term(int n)
-{
-	/* if we get SIGTERM after this, just die instead of coming back here. */
-	signal(SIGTERM, SIG_DFL);
-
-	/* quit from all servers too.. */
-	signal_emit("command quit", 1, "");
-
-	/* and die */
-	raise(SIGTERM);
-}
-
 /* Yes, this is my own stupid checksum generator, some "real" algorithm
    would be nice but would just take more space without much real benefit */
 static unsigned int file_checksum(const char *fname)
@@ -805,8 +793,6 @@ static void init_configfile(void)
 		signal_emit("gui dialog", 2, "error", str);
                 g_free(str);
 	}
-
-	signal(SIGTERM, sig_term);
 }
 
 int settings_reread(const char *fname)
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index f2724443..c442bd7f 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -29,10 +29,11 @@
 static GMainLoop *main_loop;
 static char *autoload_module;
 static int reload;
+static int quitting;
 
 static void sig_exit(void)
 {
-	g_main_loop_quit(main_loop);
+	quitting = TRUE;
 }
 
 static void sig_reload(void)
@@ -103,7 +104,14 @@ int main(int argc, char **argv)
 		reload = FALSE;
 		module_load(autoload_module, NULL);
 		main_loop = g_main_loop_new(NULL, TRUE);
-		g_main_loop_run(main_loop);
+		while (!quitting && !reload) {
+			if (sigterm_received) {
+				sigterm_received = FALSE;
+				signal_emit("gui exit", 0);
+			}
+
+			g_main_context_iteration(NULL, TRUE);
+		}
 		g_main_loop_unref(main_loop);
 	}
 	while (reload);
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 76bc5dfd..9952f748 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -331,6 +331,11 @@ int main(int argc, char **argv)
 	/* Does the same as g_main_run(main_loop), except we
 	   can call our dirty-checker after each iteration */
 	while (!quitting) {
+		if (sigterm_received) {
+			sigterm_received = FALSE;
+			signal_emit("gui exit", 0);
+		}
+
 		if (sighup_received) {
 			sighup_received = FALSE;
 

From 7baefc3315e9dc11c8a3a787a3b6c6888c2b590a Mon Sep 17 00:00:00 2001
From: Guido Falsi <mad@madpilot.net>
Date: Fri, 19 Aug 2022 10:32:47 +0200
Subject: [PATCH 1468/1650] Fix libnv detection on recent FreeBSD

On recent FreeBSD systems it is required to include the sys/nv.h file, otherwise symbols are missing.

Reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265397

Patch suggested by: Kristof Provost <kp@freebsd.org>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index ac6924b0..9b54bc01 100644
--- a/meson.build
+++ b/meson.build
@@ -495,7 +495,7 @@ have_capsicum = false
 if want_capsicum
   if cc.has_function('cap_enter', dependencies : cc.find_library('c'))
     libnv = cc.find_library('nv', required : require_capsicum)
-    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv)
+    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv, prefix : '#include <sys/nv.h>')
     if nvlist_create_found
       dep += libnv
       have_capsicum = true

From 03edebd54c839a27d003525764d6d4f777506fb7 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:03:21 +0200
Subject: [PATCH 1469/1650] /connect: Add help for -nocap

---
 docs/help/in/connect.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index d4375eec..4c6acc90 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -17,6 +17,7 @@
     -tls_ciphers:       TLS cipher suite preference lists.
     -tls_pinned_cert:   Pinned x509 certificate fingerprint.
     -tls_pinned_pubkey: Pinned public key fingerprint.
+    -nocap:             Disable CAPREQ during connect
     -noproxy:           Ignores the global proxy configuration.
     -network:           The network this connection belongs to.
     -host:              The hostname you would like to connect from.

From fe77b7e06fc16782dc0250e806e0c0169eff71a0 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:07:05 +0200
Subject: [PATCH 1470/1650] Update /server syntax line

---
 src/fe-common/irc/fe-irc-server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index fbd70404..4aad7ee0 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -51,7 +51,7 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 	return target;
 }
 
-/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>]
+/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-cap | -nocap] [-tls_cert <cert>] [-tls_pkey <pkey>]
                              [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
                              [-tls_capath <capath>] [-tls_ciphers <list>] [-tls | -notls]
                              [-starttls | -nostarttls | -disallow_starttls | -nodisallow_starttls]

From 07041c37d457780ccf6bc5931f92b65e91ba7dc7 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:15:11 +0200
Subject: [PATCH 1471/1650] Add -nocap to /connect and /server connect syntax

---
 src/core/chat-commands.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index dd8dbe75..2f5c4b42 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -114,8 +114,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
                    [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>]
                    [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>]
                    [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-tls | -notls]
-                   [-starttls | -disallow_starttls] [-noproxy] [-network <network>]
-                   [-host <hostname>] [-rawlog <file>]
+                   [-nocap] [-starttls | -disallow_starttls] [-noproxy]
+                   [-network <network>] [-host <hostname>] [-rawlog <file>]
                    <address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_connect(const char *data)
@@ -215,7 +215,7 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] 
 		  [-tls_capath <capath>]
 		  [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
-		  [-!] [-noautosendcmd]
+		  [-!] [-noautosendcmd] [-nocap]
 		  [-noproxy] [-network <network>] [-host <hostname>]
 		  [-rawlog <file>]
 		  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */

From d448ca3341ccc0c50c2f68ade05ae0a99618e171 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:17:34 +0200
Subject: [PATCH 1472/1650] /server: Add help for -cap/-nocap

---
 docs/help/in/server.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 84294af6..47b2d524 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -28,6 +28,8 @@
     -tls_pinned_pubkey: Pinned public key fingerprint.
     -auto:              Automatically connects to the server on startup.
     -noauto:            Doesn't connect to the server on startup.
+    -cap:               Enable CAPREQ for server.
+    -nocap:             Disable CAPREQ for server.
     -network:           The network the server belongs to.
     -host:              The hostname you would like to connect from.
     -cmdspeed:          Specifies the minimum amount of time, expressed in

From de2bf6707f37c17ced26f865de3a5748a933240d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:55:02 +0200
Subject: [PATCH 1473/1650] fix clang-format

---
 src/core/chat-commands.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 2f5c4b42..a88a27ab 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -211,14 +211,14 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }
 
-/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] 
-		  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] 
-		  [-tls_capath <capath>]
-		  [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
-		  [-!] [-noautosendcmd] [-nocap]
-		  [-noproxy] [-network <network>] [-host <hostname>]
-		  [-rawlog <file>]
-		  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+                  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
+                  [-tls_capath <capath>] [-tls_ciphers <list>]
+                  [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
+                  [-!] [-noautosendcmd] [-nocap]
+                  [-noproxy] [-network <network>] [-host <hostname>]
+                  [-rawlog <file>]
+                  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_server_connect(const char *data, SERVER_REC *server)
 {

From 093dcd423f425232f3466d47c44e716042089fce Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 22 Sep 2022 22:25:02 +0200
Subject: [PATCH 1474/1650] no infinite loops please

---
 src/fe-text/mainwindows.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index fae7ced8..26b94248 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1629,6 +1629,7 @@ static int window_refnum_left(int refnum, int wrap)
 {
         MAIN_WINDOW_REC *find_sticky;
 	WINDOW_REC *window;
+	int start_refnum = refnum;
 
 	window = window_find_refnum(refnum);
 	g_return_val_if_fail(window != NULL, -1);
@@ -1638,7 +1639,7 @@ static int window_refnum_left(int refnum, int wrap)
 
 	do {
 		refnum = window_refnum_prev(refnum, wrap);
-		if (refnum < 0)
+		if (refnum < 0 || refnum == start_refnum)
 			break;
 
 		window = window_find_refnum(refnum);
@@ -1651,6 +1652,7 @@ static int window_refnum_right(int refnum, int wrap)
 {
         MAIN_WINDOW_REC *find_sticky;
 	WINDOW_REC *window;
+	int start_refnum = refnum;
 
 	window = window_find_refnum(refnum);
 	g_return_val_if_fail(window != NULL, -1);
@@ -1660,7 +1662,7 @@ static int window_refnum_right(int refnum, int wrap)
 
 	do {
 		refnum = window_refnum_next(refnum, wrap);
-		if (refnum < 0)
+		if (refnum < 0 || refnum == start_refnum)
 			break;
 
 		window = window_find_refnum(refnum);

From c2457c7d94eb74a137c59cb7e42b8a128095f169 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 14 Oct 2022 20:59:45 +0200
Subject: [PATCH 1475/1650] move irc server functions to object creation time

---
 src/irc/core/irc-servers.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 92c9d5f1..29f63c21 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -79,11 +79,11 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 	if (*data == '\0')
 		return FALSE;
 
-	chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
+	chantypes = g_hash_table_lookup(irc_server->isupport, "CHANTYPES");
 	if (chantypes == NULL)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
-	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
+	statusmsg = g_hash_table_lookup(irc_server->isupport, "STATUSMSG");
 	if (statusmsg == NULL && strchr(chantypes, '@') == NULL)
 		statusmsg = "@";
 
@@ -296,11 +296,12 @@ static void server_init_1(IRC_SERVER_REC *server)
 		irc_cap_toggle(server, CAP_STARTTLS, TRUE);
 	}
 
-	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
-
 	/* set the standards */
-	g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
-	g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
+	if (!g_hash_table_contains(server->isupport, "CHANMODES"))
+		g_hash_table_insert(server->isupport, g_strdup("CHANMODES"),
+		                    g_strdup("beI,k,l,imnpst"));
+	if (!g_hash_table_contains(server->isupport, "PREFIX"))
+		g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
 
 	server->cmdcount = 0;
 
@@ -466,7 +467,16 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 
 	modes_server_init(server);
 
-        server_connect_init((SERVER_REC *) server);
+	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
+
+	server->isnickflag = isnickflag_func;
+	server->ischannel = ischannel_func;
+	server->split_message = split_message;
+	server->send_message = send_message;
+	server->query_find_func = (QUERY_REC * (*) (SERVER_REC *, const char *) ) irc_query_find;
+	server->nick_comp_func = irc_nickcmp_rfc1459;
+
+	server_connect_init((SERVER_REC *) server);
 	return (SERVER_REC *) server;
 }
 
@@ -556,14 +566,6 @@ static void sig_connected(IRC_SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
-	server->isnickflag = isnickflag_func;
-	server->ischannel = ischannel_func;
-	server->split_message = split_message;
-	server->send_message = send_message;
-	server->query_find_func =
-		(QUERY_REC *(*)(SERVER_REC *, const char *)) irc_query_find;
-	server->nick_comp_func = irc_nickcmp_rfc1459;
-
 	server->splits = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 	if (!server->session_reconnect)

From 833f41179d22374ce64a32f7a0bd7990c8f9184b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 14 Oct 2022 21:37:09 +0200
Subject: [PATCH 1476/1650] enable saving of -disallow_starttls

---
 src/irc/core/irc-servers-setup.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index e9e38504..c1603a48 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -220,9 +220,11 @@ static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
 		iconfig_node_set_int(node, "cmd_queue_speed", rec->cmd_queue_speed);
 	if (rec->max_query_chans > 0)
 		iconfig_node_set_int(node, "max_query_chans", rec->max_query_chans);
-	if (rec->starttls != STARTTLS_NOTSET)
-		iconfig_node_set_bool(node, "starttls", rec->starttls);
-	else
+	if (rec->starttls == STARTTLS_DISALLOW)
+		iconfig_node_set_bool(node, "starttls", FALSE);
+	else if (rec->starttls == STARTTLS_ENABLED)
+		iconfig_node_set_bool(node, "starttls", TRUE);
+	else if (rec->starttls == STARTTLS_NOTSET)
 		iconfig_node_set_str(node, "starttls", NULL);
 	if (rec->no_cap)
 		iconfig_node_set_bool(node, "no_cap", TRUE);

From be5f917f07e6c4d4de643d307048281e87717a67 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 30 Jun 2022 23:25:35 +0200
Subject: [PATCH 1477/1650] Merge pull request #1393 from ailin-nemui/eval-help

minor rendering fix in eval help

(cherry picked from commit 0bf18beed75e0423c7848908ebc4ba6f39cc96c7)
---
 docs/help/in/eval.in | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/help/in/eval.in b/docs/help/in/eval.in
index b0c904b4..c53c6248 100644
--- a/docs/help/in/eval.in
+++ b/docs/help/in/eval.in
@@ -10,18 +10,22 @@
 %9Description:%9
 
     Evaluates the given commands and executes them; you can use internal
-    variables and separate multiple commands by using the ';' character.
-    If the command contains a string with '$', '\' or ';' those characters 
+    variables and separate multiple commands by using the `;' character.
+    If the command contains a string with `$', `\' or `;' those characters
     need to be escaped:
-        '$' -> '$$'
-        '\' -> '\\' (or even '\\\\', depending on where they are used)
-        ';' -> '\;'
+
+        `$' -> `$$'
+        `\' -> `\\' (or even `\\\\', depending on where they are used)
+        `;' -> `\;'
 
 %9Examples:%9
 
     /EVAL echo I am connected to ${S} on ${chatnet} as ${N}
     /EVAL echo My user privileges are +${usermode}; echo Let's party!
-    to print '1;2$3\4': /EVAL echo 1\;2$$3\\4       
+
+    to print `1;2$3\4':
+
+    /EVAL echo 1\;2$$3\\4
 
 %9References:%9
 

From f51bc42429a7a8026a5205dc7f0fa0400564208d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 12 Jun 2022 18:11:05 +0200
Subject: [PATCH 1478/1650] Merge pull request #1380 from
 ailin-nemui/scriptassist

run syncscripts.sh

(cherry picked from commit 68823eb6af68d941e94327170d6f5261568b6899)
---
 scripts/scriptassist.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index cf02d57e..5cad3838 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2020042700';
+our $VERSION = '2022053100';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -30,7 +30,7 @@ $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
-my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r);
 
 sub show_help {
     my $help = "scriptassist $VERSION

From c01b35b062278258c5431955d1ed39bcf870cda9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 19 Aug 2022 10:42:05 +0200
Subject: [PATCH 1479/1650] Merge pull request #1407 from
 madpilot78/Fix_libnv_detection

Fix libnv detection on recent FreeBSD

(cherry picked from commit f32d0ab51a5569ad908cefa3b033a7fb367240e7)
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 240c5344..0758aa63 100644
--- a/meson.build
+++ b/meson.build
@@ -492,7 +492,7 @@ have_capsicum = false
 if want_capsicum
   if cc.has_function('cap_enter', dependencies : cc.find_library('c'))
     libnv = cc.find_library('nv', required : require_capsicum)
-    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv)
+    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv, prefix : '#include <sys/nv.h>')
     if nvlist_create_found
       dep += libnv
       have_capsicum = true

From 2c18da3cc60e6a8320138b7671d5660c3ae708dd Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:51:43 +0200
Subject: [PATCH 1480/1650] Merge pull request #1411 from
 irssi/vague666-patch-1

/connect: Add help for -nocap

(cherry picked from commit 38b18bd84da03f127e0ed51154923576bf22ae6f)
---
 docs/help/in/connect.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index d4375eec..4c6acc90 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -17,6 +17,7 @@
     -tls_ciphers:       TLS cipher suite preference lists.
     -tls_pinned_cert:   Pinned x509 certificate fingerprint.
     -tls_pinned_pubkey: Pinned public key fingerprint.
+    -nocap:             Disable CAPREQ during connect
     -noproxy:           Ignores the global proxy configuration.
     -network:           The network this connection belongs to.
     -host:              The hostname you would like to connect from.

From 23419e586699bf653d1ca81bd3fe45f9b8730344 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:51:57 +0200
Subject: [PATCH 1481/1650] Merge pull request #1415 from
 irssi/vague666-patch-5

/server: Add help for -cap/-nocap

(cherry picked from commit f76d41953f94bab519dec99c38d0b7fdb8bca1f4)
---
 docs/help/in/server.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 84294af6..47b2d524 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -28,6 +28,8 @@
     -tls_pinned_pubkey: Pinned public key fingerprint.
     -auto:              Automatically connects to the server on startup.
     -noauto:            Doesn't connect to the server on startup.
+    -cap:               Enable CAPREQ for server.
+    -nocap:             Disable CAPREQ for server.
     -network:           The network the server belongs to.
     -host:              The hostname you would like to connect from.
     -cmdspeed:          Specifies the minimum amount of time, expressed in

From 277923aaac5c6e65d5b9686ee3d9e4968858141a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:52:30 +0200
Subject: [PATCH 1482/1650] Merge pull request #1413 from
 irssi/vague666-patch-3

Update /server syntax line

(cherry picked from commit 238d7cfd08d14115762d78b11c567c850133f72a)
---
 src/fe-common/irc/fe-irc-server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index fbd70404..4aad7ee0 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -51,7 +51,7 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 	return target;
 }
 
-/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-tls_cert <cert>] [-tls_pkey <pkey>]
+/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-cap | -nocap] [-tls_cert <cert>] [-tls_pkey <pkey>]
                              [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
                              [-tls_capath <capath>] [-tls_ciphers <list>] [-tls | -notls]
                              [-starttls | -nostarttls | -disallow_starttls | -nodisallow_starttls]

From 26f9750ad174a2cfd228f5498dd0f35b2e6e6df6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 14 Sep 2022 09:24:35 +0200
Subject: [PATCH 1483/1650] Merge pull request #1414 from
 irssi/vague666-patch-4

Add -nocap to /connect and /server connect syntax

(cherry picked from commit 55913ade1350a4c1087b0238ac863e0bab081fd7)
---
 src/core/chat-commands.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index dd8dbe75..a88a27ab 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -114,8 +114,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
                    [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>]
                    [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>]
                    [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-tls | -notls]
-                   [-starttls | -disallow_starttls] [-noproxy] [-network <network>]
-                   [-host <hostname>] [-rawlog <file>]
+                   [-nocap] [-starttls | -disallow_starttls] [-noproxy]
+                   [-network <network>] [-host <hostname>] [-rawlog <file>]
                    <address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_connect(const char *data)
@@ -211,14 +211,14 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }
 
-/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] 
-		  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] 
-		  [-tls_capath <capath>]
-		  [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
-		  [-!] [-noautosendcmd]
-		  [-noproxy] [-network <network>] [-host <hostname>]
-		  [-rawlog <file>]
-		  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+                  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
+                  [-tls_capath <capath>] [-tls_ciphers <list>]
+                  [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
+                  [-!] [-noautosendcmd] [-nocap]
+                  [-noproxy] [-network <network>] [-host <hostname>]
+                  [-rawlog <file>]
+                  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_server_connect(const char *data, SERVER_REC *server)
 {

From 93a94308bd8fcc871291afb94026640f6e28a08e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 15 Oct 2022 08:52:20 +0200
Subject: [PATCH 1484/1650] Merge pull request #1417 from ailin-nemui/loop

do not freeze on alt+left/right

(cherry picked from commit 0c97433c7c41e50744da1c2ceaf19131e96fdf18)
---
 src/fe-text/mainwindows.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index fae7ced8..26b94248 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1629,6 +1629,7 @@ static int window_refnum_left(int refnum, int wrap)
 {
         MAIN_WINDOW_REC *find_sticky;
 	WINDOW_REC *window;
+	int start_refnum = refnum;
 
 	window = window_find_refnum(refnum);
 	g_return_val_if_fail(window != NULL, -1);
@@ -1638,7 +1639,7 @@ static int window_refnum_left(int refnum, int wrap)
 
 	do {
 		refnum = window_refnum_prev(refnum, wrap);
-		if (refnum < 0)
+		if (refnum < 0 || refnum == start_refnum)
 			break;
 
 		window = window_find_refnum(refnum);
@@ -1651,6 +1652,7 @@ static int window_refnum_right(int refnum, int wrap)
 {
         MAIN_WINDOW_REC *find_sticky;
 	WINDOW_REC *window;
+	int start_refnum = refnum;
 
 	window = window_find_refnum(refnum);
 	g_return_val_if_fail(window != NULL, -1);
@@ -1660,7 +1662,7 @@ static int window_refnum_right(int refnum, int wrap)
 
 	do {
 		refnum = window_refnum_next(refnum, wrap);
-		if (refnum < 0)
+		if (refnum < 0 || refnum == start_refnum)
 			break;
 
 		window = window_find_refnum(refnum);

From 9a95edc69a4a20e5f215c2f887022ea7beacc1c7 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 15 Oct 2022 08:52:32 +0200
Subject: [PATCH 1485/1650] Merge pull request #1419 from
 ailin-nemui/init-irc-funcs

move irc server functions to object creation time

(cherry picked from commit a661e2fb35d4683871a374805daf8a20935f313f)
---
 src/irc/core/irc-servers.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 92c9d5f1..29f63c21 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -79,11 +79,11 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 	if (*data == '\0')
 		return FALSE;
 
-	chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
+	chantypes = g_hash_table_lookup(irc_server->isupport, "CHANTYPES");
 	if (chantypes == NULL)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
-	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
+	statusmsg = g_hash_table_lookup(irc_server->isupport, "STATUSMSG");
 	if (statusmsg == NULL && strchr(chantypes, '@') == NULL)
 		statusmsg = "@";
 
@@ -296,11 +296,12 @@ static void server_init_1(IRC_SERVER_REC *server)
 		irc_cap_toggle(server, CAP_STARTTLS, TRUE);
 	}
 
-	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
-
 	/* set the standards */
-	g_hash_table_insert(server->isupport, g_strdup("CHANMODES"), g_strdup("beI,k,l,imnpst"));
-	g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
+	if (!g_hash_table_contains(server->isupport, "CHANMODES"))
+		g_hash_table_insert(server->isupport, g_strdup("CHANMODES"),
+		                    g_strdup("beI,k,l,imnpst"));
+	if (!g_hash_table_contains(server->isupport, "PREFIX"))
+		g_hash_table_insert(server->isupport, g_strdup("PREFIX"), g_strdup("(ohv)@%+"));
 
 	server->cmdcount = 0;
 
@@ -466,7 +467,16 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 
 	modes_server_init(server);
 
-        server_connect_init((SERVER_REC *) server);
+	server->isupport = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
+
+	server->isnickflag = isnickflag_func;
+	server->ischannel = ischannel_func;
+	server->split_message = split_message;
+	server->send_message = send_message;
+	server->query_find_func = (QUERY_REC * (*) (SERVER_REC *, const char *) ) irc_query_find;
+	server->nick_comp_func = irc_nickcmp_rfc1459;
+
+	server_connect_init((SERVER_REC *) server);
 	return (SERVER_REC *) server;
 }
 
@@ -556,14 +566,6 @@ static void sig_connected(IRC_SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
-	server->isnickflag = isnickflag_func;
-	server->ischannel = ischannel_func;
-	server->split_message = split_message;
-	server->send_message = send_message;
-	server->query_find_func =
-		(QUERY_REC *(*)(SERVER_REC *, const char *)) irc_query_find;
-	server->nick_comp_func = irc_nickcmp_rfc1459;
-
 	server->splits = g_hash_table_new((GHashFunc) i_istr_hash, (GCompareFunc) i_istr_equal);
 
 	if (!server->session_reconnect)

From f9f6341c20d9e12241d357058a469cb82520dcb9 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 15 Oct 2022 08:52:40 +0200
Subject: [PATCH 1486/1650] Merge pull request #1420 from
 ailin-nemui/starttls-config

enable saving of -disallow_starttls

(cherry picked from commit afba1480562bba77b127322eb55a3a768a1e98b4)
---
 src/irc/core/irc-servers-setup.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index e9e38504..c1603a48 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -220,9 +220,11 @@ static void sig_server_setup_saved(IRC_SERVER_SETUP_REC *rec,
 		iconfig_node_set_int(node, "cmd_queue_speed", rec->cmd_queue_speed);
 	if (rec->max_query_chans > 0)
 		iconfig_node_set_int(node, "max_query_chans", rec->max_query_chans);
-	if (rec->starttls != STARTTLS_NOTSET)
-		iconfig_node_set_bool(node, "starttls", rec->starttls);
-	else
+	if (rec->starttls == STARTTLS_DISALLOW)
+		iconfig_node_set_bool(node, "starttls", FALSE);
+	else if (rec->starttls == STARTTLS_ENABLED)
+		iconfig_node_set_bool(node, "starttls", TRUE);
+	else if (rec->starttls == STARTTLS_NOTSET)
 		iconfig_node_set_str(node, "starttls", NULL);
 	if (rec->no_cap)
 		iconfig_node_set_bool(node, "no_cap", TRUE);

From c99c8b444da5b2a2ff53e86de02e924e3b728993 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 29 Oct 2022 12:13:46 +0200
Subject: [PATCH 1487/1650] tag as 1.4.3

---
 NEWS         | 9 +++++++++
 configure.ac | 2 +-
 meson.build  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 97c57e44..06960d6e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+v1.4.3 2022-10-31  The Irssi team <staff@irssi.org>
+	- Fix freeze on Alt+arrows (#1416, #1417)
+	- Fix crash on /upgrade (#1399, #1419)
+	- Fix saving of -disallow_starttls (#1401, #1420)
+	- Fix libnv detection on FreeBSD (freebsd#265397, #1407). By
+	  Guido Falsi and Kristof Provost
+	- Minor help and script fixes (#1380, #1393, #1411, #1413,
+	  #1414, #1415)
+
 v1.4.2 2022-07-17  The Irssi team <staff@irssi.org>
 	* Add irssimoduledir to irssi-1.pc in the Meson build (#1383,
           #1378)
diff --git a/configure.ac b/configure.ac
index d8969cc2..e67c5b25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.4.2)
+AC_INIT(irssi, 1.4.3)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 0758aa63..5038b752 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.4.2',
+  version : '1.4.3',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From 7d20ea92aee9801b7ccbdb0ce7b78256c4fae05e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 13 Nov 2022 11:35:41 +0100
Subject: [PATCH 1488/1650] fix lastlog -window

---
 src/fe-text/lastlog.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index b93b8361..89ee30a9 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -118,6 +118,7 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 			return;
 		}
 	}
+	view = WINDOW_GUI(window)->view;
 
 	if (g_hash_table_lookup(optlist, "new") != NULL)
 		startline = textbuffer_view_get_bookmark(view, "lastlog_last_check");

From 261a7ce76efcea36031a7d6ada4bb55d8c7452b8 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 27 Nov 2022 17:14:19 +0100
Subject: [PATCH 1489/1650] add (hide)level flip command

---
 docs/help/in/window.in               | 4 ++++
 src/core/levels.c                    | 8 +++++---
 src/fe-common/core/window-commands.c | 2 +-
 src/fe-text/textbuffer-commands.c    | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index 9a7a7b10..23316911 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -42,6 +42,7 @@
     LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
     RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
     STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.
+    HIDELEVEL:    %|Changes the levels of text lines that should be hidden from view, or query the current hidden level.
     MOVE LEFT:    %|Move the window to the numerically previous location inside the current sticky group.
     MOVE RIGHT:   %|Move the window to the numerically next location inside the current sticky group.
     MOVE UP:      %|Move the current window to the sticky group of the previous split window. If no sticky group remains, the split window collapses.
@@ -52,6 +53,8 @@
 
    %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 
+   %|LEVEL and HIDELEVEL modify the currently set level. Without arguments, the current level is displayed. Levels listed starting with `+' are added to the current levels. Levels listed starting with `-' are removed from the current levels. To clear the levels, start the new level setting with `NONE'. Levels listed starting with `^' are either removed or added from the current setting, depending on whether they were previously set or not (since Irssi 1.5). Levels listed as is are also added to the current levels. Afterwards, the new level setting is displayed.
+
 %9Description:%9
 
     Manipulates the window layout and positioning attributes.
@@ -68,6 +71,7 @@
     /WINDOW LOG OFF
     /WINDOW LOG ON ~/logs/debug.log
     /WINDOW LEVEL -ALL +NOTICES
+    /WINDOW HIDELEVEL ^JOINS ^PARTS ^QUITS
     /WINDOW LOGFILE ~/logs/notices.log
 
 %9See also:%9 JOIN, LEVELS, LOG, QUERY
diff --git a/src/core/levels.c b/src/core/levels.c
index 0c5e5a12..d4dafba2 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -184,13 +184,15 @@ int combine_level(int dest, const char *src)
 
 	list = g_strsplit(src, " ", -1);
 	for (item = list; *item != NULL; item++) {
-		itemname = *item + (**item == '+' || **item == '-' ? 1 : 0);
+		itemname = *item + (**item == '+' || **item == '-' || **item == '^' ? 1 : 0);
 		itemlevel = level_get(itemname);
 
-		if (g_strcmp0(itemname, "NONE") == 0)
-                        dest = 0;
+		if (g_ascii_strcasecmp(itemname, "NONE") == 0)
+			dest = 0;
 		else if (**item == '-')
 			dest &= ~(itemlevel);
+		else if (**item == '^')
+			dest ^= itemlevel;
 		else
 			dest |= itemlevel;
 	}
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 7c542d37..6669ba43 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -400,7 +400,7 @@ static void cmd_window_previous(void)
 	window_set_active(window_find_refnum(num));
 }
 
-/* SYNTAX: WINDOW LEVEL [<level>] */
+/* SYNTAX: WINDOW LEVEL [<levels>] */
 static void cmd_window_level(const char *data)
 {
 	char *level;
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 6ed7c39c..3d1d963b 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -93,7 +93,7 @@ static void cmd_window_scroll(const char *data)
 				   gui->scroll : settings_get_bool("scroll"));
 }
 
-/* SYNTAX: WINDOW HIDELEVEL [<level>] */
+/* SYNTAX: WINDOW HIDELEVEL [<levels>] */
 static void cmd_window_hidelevel(const char *data)
 {
 	GUI_WINDOW_REC *gui;

From 119d3203e1430f00bc2335ffa400bed50c431b14 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 18 May 2022 09:28:46 +0200
Subject: [PATCH 1490/1650] remove ported sections from manual and add links

---
 docs/manual.txt | 137 ++++++++++--------------------------------------
 1 file changed, 29 insertions(+), 108 deletions(-)

diff --git a/docs/manual.txt b/docs/manual.txt
index 5f0eac51..d55e362e 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -18,16 +18,16 @@
 	9. Text highlighting
 	10. Ignoring
 	11. Logging
+	12. Commands
+	14. Last log (currently text version only)
+	15. Word completion
+	16. Recode
+	18. Key bindings (text version)
+	19. Perl scripting
 
 	( not written yet: )
-	12. Commands
 	13. Themes
-	14. Last log (currently text version only)
-	15. Nick and word completion
-	16. Recode
 	17. Windowing system (text version)
-	18. Keyboard (text version)
-	19. Perl scripting
 
 
 
@@ -141,44 +141,7 @@
 	--hostname -h		Specify what host name to use
 
 
- 2. Message levels
-
-
-	Message levels (or in short, levels) are used almost everywhere.
-	They describe what kind of messages we're dealing with. Here's a
-	list of them all:
-
-	CRAP            - Can be almost anything
-	MSGS            - Private messages
-	PUBLIC          - Public messages in channel
-	NOTICES         - Notices
-	SNOTES          - Server notices
-	CTCPS           - CTCP messages
-	ACTIONS         - Actions (/me) - usually ORed with PUBLIC or MSGS
-	JOINS           - Someone joins a channel
-	PARTS           - Someone parts a channel
-	QUITS           - Someone quits IRC
-	KICKS           - Someone gets kicked from channel
-	MODES           - Channel mode is changed
-	TOPICS          - Channel topic is changed
-	WALLOPS         - Wallop is received
-	INVITES         - Invite is received
-	NICKS           - Someone changes nick
-	DCC             - DCC related messages
-	DCCMSGS         - DCC chat messages
-	CLIENTNOTICES   - Irssi's notices
-	CLIENTERRORS    - Irssi's error messages
-	CLIENTCRAP      - Some other messages from Irssi
-
-	And a few special ones that could be included with the
-	levels above:
-
-	HILIGHT         - Text is highlighted
-	NOHILIGHT       - Don't check highlighting for this message
-	NO_ACT          - Don't trigger channel activity when printing
-	                  this message
-	NEVER           - Never ignore or log this message
-
+ 2. Message levels <https://irssi.org/documentation/help/levels/>
 
  3. Flood protection
 
@@ -252,47 +215,12 @@
 	Currently only messages, notices and ctcps are checked for
 	flooding.
 
-	/SET flood_max_msgs = <count>, default is 4
-	/SET flood_timecheck = <seconds>, default is 5 seconds
+	/SET flood_max_msgs <count>, default is 4
+	/SET flood_timecheck <seconds>, default is 5 seconds
 	If either of these is 0, the flood checking is disabled.
 
 
- 4. Configuration
-
- 4.1 Configuration files
-
-	The configuration is saved to ~/.irssi/config file. You can edit
-	it with text editor if you want, you can also add comments to it
-	and they stay there even if /SAVE is used. Comments are the lines
-	starting with # character. Any errors in config file are displayed
-	at startup.
-
-	Irssi uses it's own config library for handling the config file.
-	The format is pretty much the same as in libPropList and should be
-	easily understandable.
-
-	You can reload the config file on the fly with /RELOAD command, you
-	can also read a different config file with /RELOAD <filename>.
-
-	If you change any settings, they aren't saved to file until you use
-	/SAVE. You can save the config file to different place with
-	/SAVE <filename>.
-
- 4.2 Settings
-
-	You can view or change the settings with /SET command.
-
-	/SET without any arguments displays all the settings.
-	/SET <key> displays settings which key (partly) matches <key>
-	/SET <key> <value> sets <key> to <value>
-
-	Boolean settings accepts only values ON, OFF and TOGGLE. You can
-	also use /TOGGLE command to change them, so /TOGGLE <key> behaves
-	like /SET <key> TOGGLE. /TOGGLE also accepts arguments ON and OFF
-	when /TOGGLE behaves exactly like /SET.
-
-	Remember that changes are not saved until you use /SAVE!
-
+ 4. Configuration <https://irssi.org/documentation/manual/configuration/>
 
  5. Servers
 
@@ -367,11 +295,11 @@
 	you setup the server using /SERVER ADD (see next section). If the
 	settings can't be found there either, Irssi will use the defaults:
 
-	/SET default_nick = <nick>, defaults to user_name
-	/SET alternate_nick = <nick>, defaults to <default_nick>_
-	/SET user_name = <user>, defaults to your login name
-	/SET real_name = <name>, taken from /etc/passwd by default
-	/SET hostname = <host>, what host name to use when connecting
+	/SET default_nick <nick>, defaults to user_name
+	/SET alternate_nick <nick>, defaults to <default_nick>_
+	/SET user_name <user>, defaults to your login name
+	/SET real_name <name>, taken from /etc/passwd by default
+	/SET hostname <host>, what host name to use when connecting
 	/SET skip_motd ON|OFF|TOGGLE - Don't show server's MOTD
 
 	NOTE: /CONNECT is also a command for IRC operators to connect IRC
@@ -792,13 +720,7 @@
 	/SET massjoin_max_joins <count>.
 
 
- 7. IRC commands and features (FIXME)
-
- 7.x Basic commands
-
- 7.x IRC operator commands
-
- 7.x Away features
+ 7. IRC commands and features <https://irssi.org/documentation/help/>
 
  8. Notify list
 
@@ -846,9 +768,9 @@
 
 	/HILIGHT without any arguments displays list of the hilights.
 
-If <color> is a
-	number, Irssi will treat it as a MIRC color code. You can also use
-	bolds (^B), underlines (^_) etc. as <color> if you like.
+	If <color> is a number, Irssi will treat it as a MIRC color
+	code. You can also use bolds (^B), underlines (^_) etc. as
+	<color> if you like.
 
 
  10. Ignoring
@@ -993,29 +915,24 @@ If <color> is a
 
 	You can disable this feature by setting awaylog_level to NONE.
 
- 12. Commands
+ 12. Commands <https://irssi.org/documentation/manual/commands/>
 
-	Any char in the `cmdchars' setting can begin a command. The
-	syntax for a command is the following:
+ 13. Themes
 
-	<CMDCHAR>[<CMDCHAR>][^]<DATA>
+ 14. Last log <https://irssi.org/documentation/help/lastlog/>
 
-	If <CMDCHAR> is repeated two times, alias expansion is
-	disabled, enabled otherwise. If `^' is present, command output
-	is disabled. If <DATA> begins with a space, command lookup is
-	inhibited and the data is sent to the active window item
-	(useful to send a line that begins with <CMDCHAR>).
+ 15. Word completion <https://irssi.org/documentation/help/completion/>
 
  16. Recode
 
-	irssi supports selective encoding of incoming/outgoing messages
+	Irssi supports selective encoding of incoming/outgoing messages
 	through the recode system. All incoming/outgoing messages can be
 	optionally converted to/from the charset specified by the
 	`term_charset' variable (which defaults to the locale encoding and
 	should _not_ be changed in most cases), by setting the `recode'
 	variable to 'ON'.
 	Since there is no way in IRC to know the encoding associated to a
-	message, for incoming messages irssi uses the following algorithm:
+	message, for incoming messages Irssi uses the following algorithm:
 
 	if `recode_autodetect_utf8' is 'ON' and the message is valid UTF-8 the
 	encoding is assumed to be UTF-8.
@@ -1032,5 +949,9 @@ If <color> is a
 	iconv specific extension to peform transliteration (locale dependent)
 	when a character is not representable in the destination encoding.
 
+ 18. Key bindings <https://irssi.org/documentation/help/bind_-list/>
+
+ 19. Scripting <https://irssi.org/documentation/scripting/>
+
 .. no, the docs end here, I got bored of writing these after a few days and 
 haven't touched these since then.

From 41071247f2f69bb4a6b9534750e00b8f1fb54783 Mon Sep 17 00:00:00 2001
From: Jimmie Tyrrell <jimmie@subpixel.net>
Date: Wed, 26 Oct 2022 14:30:11 -0700
Subject: [PATCH 1491/1650] Add parameter LIST to STATUSBAR documentation

This command was not outlined in the documentation. `/STATUSBAR LIST` is an integral part of statusbar management and should be included.
---
 docs/help/in/statusbar.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index fd764537..a5626d46 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -35,8 +35,10 @@
                   quoted (e.g. -priority "-1")
     -alignment:   Display the item on the right side.
 
-    Where statusbar refers to the name of the statusbar; if no argument is
-    given, the entire list of statusbars will be displayed.
+    Where statusbar refers to the name of the statusbar; if no
+    argument is given, or `LIST` is given, the entire list of
+    statusbars along with a quick overview of their properties will be
+    displayed.
 
 %9Description:%9
 

From 8d7449d26f55e22592ecd51e7d6e11edaa2868f4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 4 Jan 2021 09:15:01 +0100
Subject: [PATCH 1492/1650] add list_of_lists to config and more error messages

---
 src/lib-config/iconfig.h | 2 ++
 src/lib-config/parse.c   | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/lib-config/iconfig.h b/src/lib-config/iconfig.h
index 92662d8d..bb1e7f47 100644
--- a/src/lib-config/iconfig.h
+++ b/src/lib-config/iconfig.h
@@ -62,6 +62,8 @@ struct _CONFIG_REC {
 	GIOChannel *handle;
 	int tmp_indent_level; /* indentation position */
 	int tmp_last_lf; /* last character was a line feed */
+
+	int list_of_lists : 1; /* list of lists allowed */
 };
 
 /* Open configuration. The file is created if it doesn't exist, unless
diff --git a/src/lib-config/parse.c b/src/lib-config/parse.c
index e4ff1abb..91a78781 100644
--- a/src/lib-config/parse.c
+++ b/src/lib-config/parse.c
@@ -170,8 +170,10 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node)
 
 	case '{':
 		/* block */
-		if (key == NULL && node->type != NODE_TYPE_LIST)
+		if (key == NULL && node->type != NODE_TYPE_LIST) {
+			g_scanner_error(rec->scanner, "Missing key");
 			return G_TOKEN_ERROR;
+		}
 
 		newnode = config_node_section(rec, node, key, NODE_TYPE_BLOCK);
 		config_parse_loop(rec, newnode, (GTokenType) '}');
@@ -186,8 +188,11 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node)
 
 	case '(':
 		/* list */
-		if (key == NULL)
+		if (key == NULL && !rec->list_of_lists) {
+			g_scanner_error(rec->scanner, "List of lists not allowed");
 			return G_TOKEN_ERROR;
+		}
+
 		newnode = config_node_section(rec, node, key, NODE_TYPE_LIST);
 		config_parse_loop(rec, newnode, (GTokenType) ')');
 		g_free_not_null(key);

From 7f4bf738a301213b96f12d55d9d512f5b29ade09 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 24 Jul 2022 19:30:19 +0200
Subject: [PATCH 1493/1650] add missing news reference

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6ce7ca54..f4dcb35f 100644
--- a/NEWS
+++ b/NEWS
@@ -114,7 +114,7 @@ v1.4.1 2022-06-12  The Irssi team <staff@irssi.org>
 
 	* Channel sync requests (WHO, MODE) are now sent "later" than
           user commands. This should improve responsiveness to user
-          commands in the autojoin phase (an#26, an#32, an#33)
+          commands in the autojoin phase (#1300, an#26, an#32, an#33)
 	* Irssi is now using full paths in #include directives and
           consequently does not add all directories to the include
           path anymore (#1040)

From 1453f46fcf325ba0116548d996f8d19f1b382782 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 18 Dec 2022 16:34:15 +0100
Subject: [PATCH 1494/1650] add timezone to g_date_time_new_from_iso8601 call

---
 src/fe-common/core/fe-log.c      | 5 ++++-
 src/fe-text/textbuffer-formats.c | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 984b3548..25dc025c 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -57,6 +57,7 @@ static int skip_next_printtext;
 static char *log_theme_name;
 
 static char **autolog_ignore_targets;
+static GTimeZone *utc;
 
 static char *log_colorizer_strip(const char *str)
 {
@@ -542,7 +543,7 @@ static void log_line(TEXT_DEST_REC *dest, const char *text)
 		char *val;
 		if ((val = g_hash_table_lookup(dest->meta, "time")) != NULL) {
 			GDateTime *time;
-			if ((time = g_date_time_new_from_iso8601(val, NULL)) != NULL) {
+			if ((time = g_date_time_new_from_iso8601(val, utc)) != NULL) {
 				t = g_date_time_to_unix(time);
 				g_date_time_unref(time);
 			}
@@ -744,6 +745,7 @@ void fe_log_init(void)
 {
 	autoremove_tag = g_timeout_add(60000, (GSourceFunc) sig_autoremove, NULL);
 	skip_next_printtext = FALSE;
+	utc = g_time_zone_new_utc();
 
 	settings_add_bool("log", "awaylog_colors", TRUE);
         settings_add_bool("log", "autolog", FALSE);
@@ -811,6 +813,7 @@ void fe_log_deinit(void)
 	if (autolog_ignore_targets != NULL)
 		g_strfreev(autolog_ignore_targets);
 
+	g_time_zone_unref(utc);
 	g_free_not_null(autolog_path);
 	g_free_not_null(log_theme_name);
 }
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 50d6250a..1de8c120 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -18,6 +18,7 @@ TEXT_BUFFER_REC *color_buf;
 gboolean scrollback_format;
 gboolean show_server_time;
 int signal_gui_render_line_text;
+GTimeZone *utc;
 
 static void collector_free(GSList **collector)
 {
@@ -125,7 +126,7 @@ static LINE_INFO_META_REC *line_meta_create(GHashTable *meta_hash)
 	while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) {
 		if (g_strcmp0("time", key) == 0) {
 			GDateTime *time;
-			if ((time = g_date_time_new_from_iso8601(val, NULL)) != NULL) {
+			if ((time = g_date_time_new_from_iso8601(val, utc)) != NULL) {
 				meta->server_time = g_date_time_to_unix(time);
 				g_date_time_unref(time);
 			}
@@ -446,6 +447,7 @@ static void read_settings(void)
 void textbuffer_formats_init(void)
 {
 	signal_gui_render_line_text = signal_get_uniq_id("gui render line text");
+	utc = g_time_zone_new_utc();
 
 	settings_add_bool("lookandfeel", "scrollback_format", TRUE);
 	settings_add_bool("lookandfeel", "show_server_time", FALSE);
@@ -463,4 +465,6 @@ void textbuffer_formats_deinit(void)
 	signal_remove("print format", (SIGNAL_FUNC) sig_print_format);
 	signal_remove("print noformat", (SIGNAL_FUNC) sig_print_noformat);
 	signal_remove("gui print text finished", (SIGNAL_FUNC) sig_gui_print_text_finished);
+
+	g_time_zone_unref(utc);
 }

From e7fb82db89607400c739b981735995a11544011b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 18 Dec 2022 17:05:35 +0100
Subject: [PATCH 1495/1650] update glib version to fix timezone assertion bug

---
 meson.build           | 11 ++++++++---
 subprojects/glib.wrap |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index 9b54bc01..75676b45 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,8 @@ project('irssi', 'c',
 ############################
 ############################
 
-glib_internal_version = 'glib-2.58.3' # keep this in sync with subprojects/glib.wrap
+glib_internal_version = 'glib-2.74.3' # keep this in sync with subprojects/glib.wrap
+glib_pcre2_internal_version = 'pcre2-10.40'
 cc = meson.get_compiler('c')
 rootinc = include_directories('.')
 dep = []
@@ -238,7 +239,7 @@ if not glib_dep.found()
   glib_internal_configure_t = custom_target('glib-internal-configure',
     command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
       '--buildtype=' + get_option('buildtype'),
-      '-Dlibmount=false', '-Dselinux=false', '-Ddefault_library=static', '-Dinternal_pcre=true',
+      '-Dlibmount=disabled', '-Dselinux=disabled', '-Ddefault_library=static', '-Dforce_fallback_for=pcre2',
       glib_internal_configure_args,
       (meson.current_build_dir() / 'build-subprojects' / 'glib'),
       (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
@@ -247,6 +248,7 @@ if not glib_dep.found()
     depends : glib_internal_download_t,)
   glib_internal_build_t = custom_target('glib-internal-build',
     command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
+      'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
       'glib' / 'libglib-2.0.a',
       'gmodule' / 'libgmodule-2.0.a'],
     console : true,
@@ -260,7 +262,10 @@ if not glib_dep.found()
       '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
       '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
     ],
-    link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
+    link_args : [
+      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
+      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a',
+    ],
   )
   built_src += glib_internal_build_t
   libdl_dep = []
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index 5cb40b0e..5e50e9a5 100644
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -1,6 +1,6 @@
 [wrap-file]
 # make sure to update the glib_internal_version in meson.build
-directory = glib-2.58.3
-source_url = https://download.gnome.org/sources/glib/2.58/glib-2.58.3.tar.xz
-source_filename = glib-2.58.3.tar.xz
-source_hash = 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+directory = glib-2.74.3
+source_url = https://download.gnome.org/sources/glib/2.74/glib-2.74.3.tar.xz
+source_filename = glib-2.74.3.tar.xz
+source_hash = e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb

From 19be330489f2cea8248510fab6012cdcaa69765a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 18 Dec 2022 21:11:54 +0100
Subject: [PATCH 1496/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index e51c24db..96886f6b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 50
+#define IRSSI_ABI_VERSION 51
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From a83f94484c43b292a458b5b44377ae9c1d069cba Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 18 Dec 2022 21:53:27 +0100
Subject: [PATCH 1497/1650] correct statusbar help text

---
 docs/help/in/statusbar.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index a5626d46..ac57ca5f 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -10,7 +10,7 @@
     RESET:        Restores the default statusbar configuration.
     ADDITEM:      Adds an item to the specified statusbar. It can be set to
                   appear before/after another item and left/right aligned
-                  to a specified position on the screen.
+                  on the screen.
     MODIFYITEM:   Changes an item position inside a bar.
     REMOVEITEM:   Removes an item from the specified statusbar.
     INFO:         List the current details and items of the specified
@@ -18,15 +18,16 @@
 
     -disable:     Removes a statusbar from the list.
     -type:        Sets the type of statusbar, for each split window or only
-                  for the current root screen.
+                  once at the root (very top or bottom) of the screen.
     -placement:   Sets the placement of the statusbar, either at the top or
-                  the bottom of the screen.
+                  the bottom of the screen or split window.
     -position:    Sets the position of the statusbar. Represented as a
-                  number, with 0 implying the first position.
-    -visible:     Sets the visibility of the statusbar or item. If set to
-                  always it is visible on all screens, otherwise if set to
-                  inactive or active then it is only visible on inactive
-                  or active screens, respectively.
+                  number, with smaller numbers implying a position further
+                  to the top.
+    -visible:     Sets the visibility of the statusbar. If set to always,
+                  it is visible on all split windows, otherwise if set to
+                  inactive or active then it is only visible on inactive or
+                  active split windows, respectively.
     -before:      This item is added before the other item.
     -after:       This item is added after the other item.
     -priority:    When the statusbar items overflow, the item with the

From 6dfcde5acd9fcc299ff065a094d9361c7e43f534 Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sun, 18 Dec 2022 10:01:32 -0800
Subject: [PATCH 1498/1650] Fix indentation issues in fe-log.c

---
 src/fe-common/core/fe-log.c | 140 +++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 76 deletions(-)

diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 984b3548..1b22cbe5 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -60,15 +60,15 @@ static char **autolog_ignore_targets;
 
 static char *log_colorizer_strip(const char *str)
 {
-        return strip_codes(str);
+	return strip_codes(str);
 }
 
 static void log_add_targets(LOG_REC *log, const char *targets, const char *tag)
 {
 	char **tmp, **items;
 
-        g_return_if_fail(log != NULL);
-        g_return_if_fail(targets != NULL);
+	g_return_if_fail(log != NULL);
+	g_return_if_fail(targets != NULL);
 
 	items = g_strsplit(targets, " ", -1);
 
@@ -83,18 +83,18 @@ static void log_add_targets(LOG_REC *log, const char *targets, const char *tag)
 		    <fname> [<levels>] */
 static void cmd_log_open(const char *data)
 {
-        SERVER_REC *server;
-        GHashTable *optlist;
+	SERVER_REC *server;
+	GHashTable *optlist;
 	char *targetarg, *fname, *levels, *servertag;
 	void *free_arg;
 	char window[MAX_INT_STRLEN];
 	LOG_REC *log;
 	int level;
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_STRIP_TRAILING_WS, "log open", &optlist, 
-			    &fname, &levels))
+	if (!cmd_get_params(data, &free_arg,
+	                    2 | PARAM_FLAG_GETREST | PARAM_FLAG_UNKNOWN_OPTIONS |
+	                        PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
+	                    "log open", &optlist, &fname, &levels))
 		return;
 	if (*fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
@@ -112,8 +112,7 @@ static void cmd_log_open(const char *data)
 			ltoa(window, active_win->refnum);
 			targetarg = window;
 		}
-		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, targetarg,
-			     servertag);
+		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, targetarg, servertag);
 	} else {
 		targetarg = g_hash_table_lookup(optlist, "targets");
 		if (targetarg != NULL && *targetarg != '\0')
@@ -133,14 +132,13 @@ static void cmd_log_open(const char *data)
 	if (log->handle == -1 && g_hash_table_lookup(optlist, "noopen") == NULL) {
 		/* start logging */
 		if (log_start_logging(log)) {
-			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-				    TXT_LOG_OPENED, fname);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_OPENED, fname);
 		} else {
 			log_close(log);
 		}
 	}
 
-        cmd_params_free(free_arg);
+	cmd_params_free(free_arg);
 }
 
 static LOG_REC *log_find_from_data(const char *data)
@@ -209,7 +207,7 @@ static char *log_items_get_list(LOG_REC *log)
 	for (tmp = log->items; tmp != NULL; tmp = tmp->next) {
 		rec = tmp->data;
 
-                g_string_append_printf(str, "%s, ", rec->name);
+		g_string_append_printf(str, "%s, ", rec->name);
 	}
 	g_string_truncate(str, str->len-2);
 	if(rec->servertag != NULL)
@@ -231,13 +229,11 @@ static void cmd_log_list(void)
 		LOG_REC *rec = tmp->data;
 
 		levelstr = bits2level(rec->level);
-		items = rec->items == NULL ? NULL :
-                        log_items_get_list(rec);
+		items = rec->items == NULL ? NULL : log_items_get_list(rec);
 
-		printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_LOG_LIST,
-			    index, rec->fname, items != NULL ? items : "",
-			    levelstr, rec->autoopen ? " -autoopen" : "",
-			    rec->handle != -1 ? " active" : "");
+		printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_LOG_LIST, index, rec->fname,
+		            items != NULL ? items : "", levelstr, rec->autoopen ? " -autoopen" : "",
+		            rec->handle != -1 ? " active" : "");
 
 		g_free_not_null(items);
 		g_free(levelstr);
@@ -253,8 +249,8 @@ static void cmd_log(const char *data, SERVER_REC *server, void *item)
 		command_runsub("log", data, server, item);
 }
 
-static LOG_REC *logs_find_item(int type, const char *item,
-			       const char *servertag, LOG_ITEM_REC **ret_item)
+static LOG_REC *logs_find_item(int type, const char *item, const char *servertag,
+                               LOG_ITEM_REC **ret_item)
 {
 	LOG_ITEM_REC *logitem;
 	GSList *tmp;
@@ -284,17 +280,17 @@ static void cmd_window_log(const char *data)
 	if (!cmd_get_params(data, &free_arg, 2, &set, &fname))
 		return;
 
-        ltoa(window, active_win->refnum);
+	ltoa(window, active_win->refnum);
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, window, NULL, NULL);
 
-        open_log = close_log = FALSE;
+	open_log = close_log = FALSE;
 	if (g_ascii_strcasecmp(set, "ON") == 0)
 		open_log = TRUE;
 	else if (g_ascii_strcasecmp(set, "OFF") == 0) {
 		close_log = TRUE;
 	} else if (g_ascii_strcasecmp(set, "TOGGLE") == 0) {
-                open_log = log == NULL;
-                close_log = log != NULL;
+		open_log = log == NULL;
+		close_log = log != NULL;
 	} else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_NOT_TOGGLE);
 		cmd_params_free(free_arg);
@@ -309,7 +305,7 @@ static void cmd_window_log(const char *data)
 					active_win->name != NULL ? "" : window);
 		log = log_create_rec(fname, MSGLEVEL_ALL);
 		log->colorizer = log_colorizer_strip;
-                log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
+		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
 		log_update(log);
 		g_free(fname);
 	}
@@ -322,7 +318,7 @@ static void cmd_window_log(const char *data)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_CLOSED, log->fname);
 	}
 
-        cmd_params_free(free_arg);
+	cmd_params_free(free_arg);
 }
 
 /* Create log file entry to window, but don't start logging */
@@ -332,7 +328,7 @@ static void cmd_window_logfile(const char *data)
 	LOG_REC *log;
 	char window[MAX_INT_STRLEN];
 
-        ltoa(window, active_win->refnum);
+	ltoa(window, active_win->refnum);
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, window, NULL, NULL);
 
 	if (log != NULL) {
@@ -355,7 +351,7 @@ static void sig_window_refnum_changed(WINDOW_REC *window, gpointer old_refnum)
 	LOG_REC *log;
 	LOG_ITEM_REC *item;
 
-        ltoa(winnum, GPOINTER_TO_INT(old_refnum));
+	ltoa(winnum, GPOINTER_TO_INT(old_refnum));
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, winnum, NULL, &item);
 
 	if (log != NULL) {
@@ -368,7 +364,7 @@ static void sig_window_refnum_changed(WINDOW_REC *window, gpointer old_refnum)
 
 static void sig_server_disconnected(SERVER_REC *server)
 {
-        LOG_ITEM_REC *logitem;
+	LOG_ITEM_REC *logitem;
 	GSList *tmp, *next;
 
 	for (tmp = logs; tmp != NULL; tmp = next) {
@@ -376,13 +372,13 @@ static void sig_server_disconnected(SERVER_REC *server)
 		next = tmp->next;
 
 		if (!log->temp || log->items == NULL)
-                        continue;
+			continue;
 
 		logitem = log->items->data;
-		if (logitem->type == LOG_ITEM_TARGET &&
-		    logitem->servertag != NULL &&
+		if (logitem->type == LOG_ITEM_TARGET && logitem->servertag != NULL &&
 		    g_ascii_strcasecmp(logitem->servertag, server->tag) == 0 &&
-		    server_ischannel(server, logitem->name)) /* kludge again.. so we won't close dcc chats */
+		    server_ischannel(
+		        server, logitem->name)) /* kludge again.. so we won't close dcc chats */
 			log_close(log);
 	}
 }
@@ -414,15 +410,14 @@ static char *escape_target(const char *target)
 			*p++ = *target;
 		}
 
-                target++;
+		target++;
 	}
 	*p = '\0';
 
-        return str;
+	return str;
 }
 
-static void autolog_open(SERVER_REC *server, const char *server_tag,
-			 const char *target)
+static void autolog_open(SERVER_REC *server, const char *server_tag, const char *target)
 {
 	LOG_REC *log;
 	char *fname, *dir, *fixed_target, *params;
@@ -443,17 +438,16 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
 	if (CHAT_PROTOCOL(server)->case_insensitive)
 		ascii_strdown(fixed_target);
 
-        /* $0 = target, $1 = server tag */
-        params = g_strconcat(fixed_target, " ", server_tag, NULL);
+	/* $0 = target, $1 = server tag */
+	params = g_strconcat(fixed_target, " ", server_tag, NULL);
 	g_free(fixed_target);
 
-	fname = parse_special_string(autolog_path, server, NULL,
-				     params, NULL, 0);
+	fname = parse_special_string(autolog_path, server, NULL, params, NULL, 0);
 	g_free(params);
 
 	if (log_find(fname) == NULL) {
 		log = log_create_rec(fname, autolog_level);
-                if (!settings_get_bool("autolog_colors"))
+		if (!settings_get_bool("autolog_colors"))
 			log->colorizer = log_colorizer_strip;
 		log_item_add(log, LOG_ITEM_TARGET, target, server_tag);
 
@@ -484,8 +478,8 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 	   we're parting the channel with /WINDOW CLOSE.. Maybe a small
 	   timeout would be nice instead of immediately closing the log file
 	   after "window item destroyed" */
-	if (level == MSGLEVEL_PARTS ||
-	    (autolog_level & level) == 0 || target == NULL || *target == '\0')
+	if (level == MSGLEVEL_PARTS || (autolog_level & level) == 0 || target == NULL ||
+	    *target == '\0')
 		return;
 
 	deftarget = server ? server->nick : "unknown";
@@ -495,8 +489,7 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 		&& channel_setup_find(target, server_tag) == NULL)
 		return;
 
-	if (autolog_ignore_targets != NULL &&
-	    strarray_find_dest(autolog_ignore_targets, dest))
+	if (autolog_ignore_targets != NULL && strarray_find_dest(autolog_ignore_targets, dest))
 		return;
 
 	if (target != NULL)
@@ -512,8 +505,7 @@ static void log_single_line(WINDOW_REC *window, const char *server_tag, const ch
 	if (window != NULL) {
 		/* save to log created with /WINDOW LOG */
 		ltoa(windownum, window->refnum);
-		log = logs_find_item(LOG_ITEM_WINDOW_REFNUM,
-				     windownum, NULL, NULL);
+		log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, windownum, NULL, NULL);
 		if (log != NULL)
 			log_write_rec(log, text, level, t);
 	}
@@ -553,8 +545,7 @@ static void log_line(TEXT_DEST_REC *dest, const char *text)
 	g_strfreev(lines);
 }
 
-static void sig_printtext(TEXT_DEST_REC *dest, const char *text,
-			  const char *stripped)
+static void sig_printtext(TEXT_DEST_REC *dest, const char *text, const char *stripped)
 {
 	if (skip_next_printtext) {
 		skip_next_printtext = FALSE;
@@ -564,8 +555,8 @@ static void sig_printtext(TEXT_DEST_REC *dest, const char *text,
 	log_line(dest, text);
 }
 
-static void sig_print_format(THEME_REC *theme, const char *module,
-			     TEXT_DEST_REC *dest, void *formatnum, char **args)
+static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC *dest,
+                             void *formatnum, char **args)
 {
 	char *str, *linestart, *tmp;
 
@@ -579,14 +570,14 @@ static void sig_print_format(THEME_REC *theme, const char *module,
 	if (theme == log_theme)
 		return;
 
-	str = format_get_text_theme_charargs(log_theme, module, dest,
-					     GPOINTER_TO_INT(formatnum), args);
+	str = format_get_text_theme_charargs(log_theme, module, dest, GPOINTER_TO_INT(formatnum),
+	                                     args);
 	if (str != NULL && *str != '\0') {
 		skip_next_printtext = TRUE;
 
 		/* add the line start format */
 		linestart = format_get_level_tag(log_theme, dest);
-                tmp = str;
+		tmp = str;
 		str = format_add_linestart(tmp, linestart);
 		g_free_not_null(linestart);
 		g_free(tmp);
@@ -605,14 +596,14 @@ static int sig_autoremove(void)
 	GSList *tmp, *next;
 	time_t removetime;
 
-        removetime = time(NULL)-AUTOLOG_INACTIVITY_CLOSE;
+	removetime = time(NULL) - AUTOLOG_INACTIVITY_CLOSE;
 	for (tmp = logs; tmp != NULL; tmp = next) {
 		LOG_REC *log = tmp->data;
 
 		next = tmp->next;
 
 		if (!log->temp || log->last > removetime || log->items == NULL)
-                        continue;
+			continue;
 
 		/* Close only logs with private messages */
 		logitem = log->items->data;
@@ -620,8 +611,8 @@ static int sig_autoremove(void)
 			continue;
 
 		server = server_find_tag(logitem->servertag);
-		if (logitem->type == LOG_ITEM_TARGET &&
-		    server != NULL && !server_ischannel(server, logitem->name))
+		if (logitem->type == LOG_ITEM_TARGET && server != NULL &&
+		    !server_ischannel(server, logitem->name))
 			log_close(log);
 	}
 	return 1;
@@ -632,43 +623,40 @@ static void sig_window_item_remove(WINDOW_REC *window, WI_ITEM_REC *item)
 	LOG_REC *log;
 
 	log = logs_find_item(LOG_ITEM_TARGET, item->visible_name,
-			     item->server == NULL ? NULL :
-			     item->server->tag, NULL);
+	                     item->server == NULL ? NULL : item->server->tag, NULL);
 	if (log != NULL && log->temp)
 		log_close(log);
 }
 
 static void sig_log_locked(LOG_REC *log)
 {
-	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-		    TXT_LOG_LOCKED, log->real_fname);
+	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_LOG_LOCKED, log->real_fname);
 }
 
 static void sig_log_create_failed(LOG_REC *log)
 {
-	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-		    TXT_LOG_CREATE_FAILED,
-		    log->real_fname, g_strerror(errno));
+	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_LOG_CREATE_FAILED, log->real_fname,
+	            g_strerror(errno));
 }
 
 static void sig_log_new(LOG_REC *log)
 {
 	if (!settings_get_bool("awaylog_colors") &&
 	    g_strcmp0(log->fname, settings_get_str("awaylog_file")) == 0)
-                log->colorizer = log_colorizer_strip;
+		log->colorizer = log_colorizer_strip;
 }
 
 static void sig_log_config_read(LOG_REC *log, CONFIG_NODE *node)
 {
-        if (!config_node_get_bool(node, "colors", FALSE))
+	if (!config_node_get_bool(node, "colors", FALSE))
 		log->colorizer = log_colorizer_strip;
 }
 
 static void sig_log_config_save(LOG_REC *log, CONFIG_NODE *node)
 {
-        if (log->colorizer == NULL)
+	if (log->colorizer == NULL)
 		iconfig_node_set_bool(node, "colors", TRUE);
-        else
+	else
 		iconfig_node_set_str(node, "colors", NULL);
 }
 
@@ -685,7 +673,7 @@ static void sig_awaylog_show(LOG_REC *log, gpointer pmsgs, gpointer pfilepos)
 	else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->real_fname, msgs);
 
-                str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
+		str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
 		signal_emit("command cat", 1, str);
 		g_free(str);
 	}
@@ -746,13 +734,13 @@ void fe_log_init(void)
 	skip_next_printtext = FALSE;
 
 	settings_add_bool("log", "awaylog_colors", TRUE);
-        settings_add_bool("log", "autolog", FALSE);
+	settings_add_bool("log", "autolog", FALSE);
 	settings_add_bool("log", "autolog_colors", FALSE);
 	settings_add_bool("log", "autolog_only_saved_channels", FALSE);
 	settings_add_choice("log", "log_server_time", 2, "off;on;auto");
 	settings_add_str("log", "autolog_path", "~/irclogs/$tag/$0.log");
 	settings_add_level("log", "autolog_level", "all -crap -clientcrap -ctcps");
-        settings_add_str("log", "log_theme", "");
+	settings_add_str("log", "log_theme", "");
 	settings_add_str("log", "autolog_ignore_targets", "");
 
 	autolog_level = 0;

From 3415718ea727766e82981655ab26c27db96ae09f Mon Sep 17 00:00:00 2001
From: Will Storey <will@summercat.com>
Date: Sun, 18 Dec 2022 10:19:13 -0800
Subject: [PATCH 1499/1650] Check a logfile parameter is given

Previously this continued with an empty filename, resulting in a broken
config file.

Fixes #1392.
---
 src/fe-common/core/fe-log.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 1b22cbe5..164036c1 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -327,21 +327,34 @@ static void cmd_window_logfile(const char *data)
 {
 	LOG_REC *log;
 	char window[MAX_INT_STRLEN];
+	void *free_arg;
+	char *fname;
+
+	if (!cmd_get_params(data, &free_arg, 1, &fname)) {
+		return;
+	}
+
+	if (!fname || strlen(fname) == 0) {
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
 
 	ltoa(window, active_win->refnum);
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, window, NULL, NULL);
 
 	if (log != NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWLOG_FILE_LOGGING);
+		cmd_params_free(free_arg);
 		return;
 	}
 
-	log = log_create_rec(data, MSGLEVEL_ALL);
+	log = log_create_rec(fname, MSGLEVEL_ALL);
 	log->colorizer = log_colorizer_strip;
 	log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
 	log_update(log);
 
 	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWLOG_FILE, data);
+
+	cmd_params_free(free_arg);
 }
 
 /* window's refnum changed - update the logs to log the new window refnum */

From f852cc4eb3c7e0cafe9fd5f66aa2dde75627e94c Mon Sep 17 00:00:00 2001
From: "Sven \"qoreQyaS\" Grewe" <git@gucke.net>
Date: Sun, 25 Dec 2022 16:09:27 +0100
Subject: [PATCH 1500/1650] Lang-Fix: Use more general messages

* Changed the messages for /window level and /window immortal to a more
  general tone.
  Executing both commands without parameter show the current state but
  the old messages indicate a change of state.

Signed-off-by: Sven "qoreQyaS" Grewe <git@gucke.net>
---
 src/fe-common/core/module-formats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 8c10f420..c4d9be96 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -39,9 +39,9 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "set_server_sticky", "Window's server set sticky", 1, { 0 } },
 	{ "unset_server_sticky", "Window's server isn't sticky anymore", 0 },
 	{ "window_name_not_unique", "Window names must be unique", 1, { 0 } },
-	{ "window_level", "Window level is now $0", 1, { 0 } },
-	{ "window_set_immortal", "Window is now immortal", 0 },
-	{ "window_unset_immortal", "Window isn't immortal anymore", 0 },
+	{ "window_level", "Window level is $0", 1, { 0 } },
+	{ "window_set_immortal", "Window is immortal", 0 },
+	{ "window_unset_immortal", "Window isn't immortal", 0 },
 	{ "window_immortal_error", "Window is immortal, if you really want to close it, say /WINDOW IMMORTAL OFF", 0 },
 	{ "windowlist_header", "%#Ref  Name                 Active item     Server          Level", 0 },
 	{ "windowlist_line", "%#$[4]0 %|$[20]1 $[15]2 $[15]3 $4", 5, { 1, 0, 0, 0, 0 } },

From c65bf6899f7dc7fff560dbcf96075157997ef91c Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Thu, 19 Jan 2023 22:41:19 +0100
Subject: [PATCH 1501/1650] Expose location of signals.txt via pkg-config

Adds "signalsfile" variable to installed irssi-1.pc.
---
 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 75676b45..7d37e7eb 100644
--- a/meson.build
+++ b/meson.build
@@ -601,7 +601,10 @@ pc.generate(filebase : 'irssi-1',
   description : 'Irssi chat client',
   version : package_version,
   requires : pc_requires,
-  variables : ['irssimoduledir=${libdir}' / incdir / 'modules'])
+  variables : [
+    'irssimoduledir=${libdir}' / incdir / 'modules',
+    'signalsfile=${prefix}' / docdir / 'signals.txt'
+  ])
 
 ###########
 # irssi.1 #

From 6bab6e2c06a143364caaf06873cc5d4a6641207c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 21 Jan 2023 16:38:40 +0100
Subject: [PATCH 1502/1650] update termux package to git+

https://github.com/termux/termux-packages/commit/20bd0f0dc099aa390778f832f0201d50814b54ee
---
 .github/workflows/termuxpkg.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
index fa0c0fcb..db31326e 100644
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@@ -28,7 +28,7 @@ jobs:
           TERMUX_PKG_MAINTAINER="@irssi"
           TERMUX_PKG_VERSION=@VERSION@
           TERMUX_PKG_REVISION=@REVISION@
-          TERMUX_PKG_SRCURL=file:///home/builder/termux-packages/src.irssi.git
+          TERMUX_PKG_SRCURL=git+file:///home/builder/termux-packages/src.irssi.git
           TERMUX_PKG_AUTO_UPDATE=true
           TERMUX_PKG_DEPENDS="glib, libandroid-glob, libiconv, libotr, ncurses, openssl, perl, utf8proc"
           TERMUX_PKG_BREAKS="irssi"

From 274868d5604731ebeb0041c641a4d52f3be3f75e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 22 Jan 2023 16:33:40 +0100
Subject: [PATCH 1503/1650] chores: update for github workflows deprecations

---
 .github/workflows/abicheck.yml  | 14 +++++++-------
 .github/workflows/check.yml     |  4 ++--
 .github/workflows/termuxpkg.yml |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 4e14353d..d21d55cd 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -36,8 +36,8 @@ jobs:
           base_abi=$(getabidef base$prefix)
           echo base abi : $base_abi
           ./base$prefix/bin/irssi --version
-          echo "::set-output name=base_abi::$base_abi"
-      - uses: actions/upload-artifact@v2
+          echo base_abi=$base_abi >> $GITHUB_OUTPUT
+      - uses: actions/upload-artifact@v3
         with:
           name: base.inst
           path: base
@@ -70,8 +70,8 @@ jobs:
           merge_abi=$(getabidef merge$prefix)
           echo merge abi : $merge_abi
           ./merge$prefix/bin/irssi --version
-          echo "::set-output name=merge_abi::$merge_abi"
-      - uses: actions/upload-artifact@v2
+          echo merge_abi=$merge_abi >> $GITHUB_OUTPUT
+      - uses: actions/upload-artifact@v3
         with:
           name: merge.inst
           path: merge
@@ -89,12 +89,12 @@ jobs:
         run: |
           sudo apt install abigail-tools
       - name: fetch base build
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: base.inst
           path: base
       - name: fetch merge build
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: merge.inst
           path: merge
@@ -103,7 +103,7 @@ jobs:
           abipkgdiff -l base merge >abipkgdiff.out && diff_ret=0 || diff_ret=$?
           echo "diff_ret=$diff_ret" >> $GITHUB_ENV
           cat abipkgdiff.out
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: abipkgdiff.out
       - run: |
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 23a06b48..33582968 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -21,7 +21,7 @@ jobs:
       - name: make dist
         run: |
           ./utils/make-dist.sh
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: irssi-*.tar.gz
           retention-days: 1
@@ -51,7 +51,7 @@ jobs:
             flags: meson-latest FAILURE-OK
     steps:
       - name: fetch dist
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
       - name: set PATH
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
index fa0c0fcb..25c79baf 100644
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@@ -73,7 +73,7 @@ jobs:
       - name: build irssi package
         run: |
           sudo ./scripts/run-docker.sh ./build-package.sh -I irssi-an
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: irssi-termux-pkg
           path: output/irssi-an*.deb

From b91a56c2cdcb52536b06f80a4073677ac532e4fc Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 28 Jan 2023 19:31:10 +0100
Subject: [PATCH 1504/1650] Support receiving monospace

0x11 (decimal 17) is used to denote monospace by a number of clients
according to https://modern.ircdocs.horse/formatting.html
---
 src/fe-common/core/formats.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 4b26ca81..33f80e14 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1279,7 +1279,7 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
 
 #define IS_COLOR_CODE(c) \
 	((c) == 2 || (c) == 3 || (c) == 4 || (c) == 6 || (c) == 7 || \
-	(c) == 15 || (c) == 22 || (c) == 27 || (c) == 29 || (c) == 31)
+	(c) == 15 || (c) == 17 || (c) == 22 || (c) == 27 || (c) == 29 || (c) == 31)
 
 /* Return how many characters in `str' must be skipped before `len'
    characters of text is skipped. */
@@ -1554,6 +1554,10 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 			bgcolor = -1;
 			flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE;
 			break;
+		case 17:
+			if (!hide_text_style)
+				flags ^= GUI_PRINT_FLAG_MONOSPACE;
+			break;
 		case 22:
 			/* reverse */
 			if (!hide_text_style)

From 9a29bf1022bf15bbe93e6185737c6c8b184f562e Mon Sep 17 00:00:00 2001
From: jesopo <github@lolnerd.net>
Date: Thu, 9 Feb 2023 17:18:52 +0000
Subject: [PATCH 1505/1650] switch to prefering ipv6 by default

---
 src/core/servers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/servers.c b/src/core/servers.c
index 30fc6844..65829c10 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -764,7 +764,7 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto)
 
 void servers_init(void)
 {
-	settings_add_bool("server", "resolve_prefer_ipv6", FALSE);
+	settings_add_bool("server", "resolve_prefer_ipv6", TRUE);
 	lookup_servers = servers = NULL;
 
 	signal_add("chat protocol deinit", (SIGNAL_FUNC) sig_chat_protocol_deinit);

From fcbe19eb8ce5efcbe4a4ead37a3aae28529fbb93 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 12 Feb 2023 10:35:12 +0100
Subject: [PATCH 1506/1650] fix signals file

---
 meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 7d37e7eb..337a15da 100644
--- a/meson.build
+++ b/meson.build
@@ -596,6 +596,12 @@ pc_requires = []
 if not glib_internal
   pc_requires += glib_dep
 endif
+signalsfile = docdir / 'signals.txt'
+if signalsfile.startswith('/')
+  signalsfile = signalsfile.replace(get_option('prefix'), '${prefix}')
+else
+  signalsfile = '${prefix}' / signalsfile
+endif
 pc.generate(filebase : 'irssi-1',
   name : 'Irssi',
   description : 'Irssi chat client',
@@ -603,7 +609,7 @@ pc.generate(filebase : 'irssi-1',
   requires : pc_requires,
   variables : [
     'irssimoduledir=${libdir}' / incdir / 'modules',
-    'signalsfile=${prefix}' / docdir / 'signals.txt'
+    'signalsfile=' + signalsfile
   ])
 
 ###########

From 25273898bfc167a1661a905ab1118911ae9f7fb4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 12 Feb 2023 16:31:23 +0100
Subject: [PATCH 1507/1650] still didn't work

---
 meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 337a15da..c1698466 100644
--- a/meson.build
+++ b/meson.build
@@ -598,7 +598,12 @@ if not glib_internal
 endif
 signalsfile = docdir / 'signals.txt'
 if signalsfile.startswith('/')
-  signalsfile = signalsfile.replace(get_option('prefix'), '${prefix}')
+  signalsfile = signalsfile.split(get_option('prefix'))
+  if signalsfile[0] == ''
+    signalsfile = '${prefix}' + signalsfile[1]
+  else
+    signalsfile = signalsfile[0]
+  endif
 else
   signalsfile = '${prefix}' / signalsfile
 endif

From 7d3640ce2ead15a7afe7d5f68deb82376d9a1b84 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 25 Feb 2023 20:44:12 +0100
Subject: [PATCH 1508/1650] fix crash on connect in startup

fixes #1449

does not completely fix the issue (connect still does not work, error message is misleading)
---
 src/core/servers-setup.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index b3bb18f7..ff3d6584 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -305,6 +305,11 @@ static SERVER_CONNECT_REC *create_addr_conn(int chat_type, const char *address,
 	proto = chat_type >= 0 ? chat_protocol_find_id(chat_type) :
                 chat_protocol_get_default();
 
+	if (proto == NULL) {
+		signal_stop();
+		return NULL;
+	}
+
 	g_return_val_if_fail(proto != NULL, NULL);
 
 	conn = proto->create_server_connect();

From 0334de0a055bf6f608b723c9058ac76dba804ec4 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:00:37 +0100
Subject: [PATCH 1509/1650] Update levels.in

Make it more clear what NOHILIGHT can be used for
---
 docs/help/in/levels.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/help/in/levels.in b/docs/help/in/levels.in
index 63c899cc..3c61263d 100644
--- a/docs/help/in/levels.in
+++ b/docs/help/in/levels.in
@@ -36,6 +36,7 @@
         HIDDEN          Hides the message when window HIDELEVEL includes HIDDEN.
         NO_ACT          Doesn't trigger any activity in the statusbar.
         NOHILIGHT       The text is not highlighted.
+                        Suppresses hilights when used with /ignore.
 
     When using levels from Irssi scripts, you need to prepend the level with
     'MSGLEVEL_'; for example 'CRAP' becomes 'MSGLEVEL_CRAP'.

From 82bfd3abfeb8887af6856507cb580516fd0e9d1e Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:04:39 +0100
Subject: [PATCH 1510/1650] Update ignore.in

Add NOHILIGHT description to help
---
 docs/help/in/ignore.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 433490e1..351c0411 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -29,6 +29,8 @@
     because it is allowed in addition to other ignores for the same target.
     The special level 'HIDDEN' can be used to hide matching messages that can
     later be revealed using /WINDOW HIDELEVEL -HIDDEN
+    The special level 'NOHILIGHT' can be used to supress hilights without actually
+    ignoring the message.
 
 %9Examples:%9
 

From 3057c9e9208ed8d7f9490d1b4a801734be89e938 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Tue, 7 Mar 2023 20:42:59 +0100
Subject: [PATCH 1511/1650] Fix logic in how actions are printed for other
 protocols

This causes subsequent window_item_set_active() check, further
down in the same function, to evaluate correctly, and getting
the action message printed using correct format.
---
 src/fe-common/irc/fe-irc-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 8a4094a9..201e7ffa 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -208,7 +208,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 		return;
 
 	if (server_ischannel(SERVER(server), target)) {
-		item = irc_channel_find(server, target);
+		item = channel_find(SERVER(server), target);
 	} else {
 		own = (!g_strcmp0(nick, server->nick));
 		item = privmsg_get_query(SERVER(server), own ? target : nick, FALSE, level);

From 5153bb3ff5f6c68eb1fb66fb1b8e6695fec32d12 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Tue, 21 Mar 2023 09:44:01 +0100
Subject: [PATCH 1512/1650] Update ignore.in

Fix typo
---
 docs/help/in/ignore.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 351c0411..26dd63bb 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -29,7 +29,7 @@
     because it is allowed in addition to other ignores for the same target.
     The special level 'HIDDEN' can be used to hide matching messages that can
     later be revealed using /WINDOW HIDELEVEL -HIDDEN
-    The special level 'NOHILIGHT' can be used to supress hilights without actually
+    The special level 'NOHILIGHT' can be used to suppress hilights without actually
     ignoring the message.
 
 %9Examples:%9

From 2db9dfbb4604fc528295021fb7cf85cfcdcb9201 Mon Sep 17 00:00:00 2001
From: David Schultz <me@zpld.me>
Date: Sun, 26 Mar 2023 16:34:24 -0500
Subject: [PATCH 1513/1650] properly format listmodes and their timestamps

---
 src/fe-common/irc/fe-events-numeric.c | 52 ++++++++++++++++++---------
 src/fe-common/irc/module-formats.c    |  8 +++--
 src/fe-common/irc/module-formats.h    |  2 ++
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 34ba3fe7..0051d3bf 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -143,15 +143,13 @@ static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 	IRC_CHANNEL_REC *chanrec;
 	BAN_REC *banrec;
 	const char *channel;
-	char *params, *ban, *setby, *tims;
-	long secs;
+	char *params, *ban, *setby, *tims, *timestr;
 
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 5, NULL, &channel,
 				  &ban, &setby, &tims);
-	secs = *tims == '\0' ? 0 :
-		(long) (time(NULL) - atol(tims));
+	timestr = my_asctime((time_t) atol(tims));
 
 	chanrec = irc_channel_find(server, channel);
 	banrec = chanrec == NULL ? NULL : banlist_find(chanrec->banlist, ban);
@@ -160,29 +158,49 @@ static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 	printformat(server, channel, MSGLEVEL_CRAP,
 		    *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
 		    banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec)+1,
-		    channel, ban, setby, secs);
+		    channel, ban, setby, timestr);
 
+	g_free(timestr);
 	g_free(params);
 }
 
 static void event_eban_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *ban, *setby, *tims;
-	long secs;
+	char *params, *ban, *setby, *tims, *timestr;
 
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 5, NULL, &channel,
 				  &ban, &setby, &tims);
-	secs = *tims == '\0' ? 0 :
-		(long) (time(NULL) - atol(tims));
+	timestr = my_asctime((time_t) atol(tims));
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
 		    *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG,
-		    channel, ban, setby, secs);
+		    channel, ban, setby, timestr);
 
+	g_free(timestr);
+	g_free(params);
+}
+
+static void event_quiet_list(IRC_SERVER_REC *server, const char *data)
+{
+	const char *channel;
+	char *params, *ban, *setby, *tims, *timestr;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 6, NULL, &channel,
+				  NULL, &ban, &setby, &tims);
+	timestr = my_asctime((time_t) atol(tims));
+
+	channel = get_visible_target(server, channel);
+	printformat(server, channel, MSGLEVEL_CRAP,
+		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
+		    channel, ban, setby, timestr);
+
+	g_free(timestr);
 	g_free(params);
 }
 
@@ -214,20 +232,20 @@ static void event_accept_list(IRC_SERVER_REC *server, const char *data)
 static void event_invite_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *invite, *setby, *tims;
-	long secs;
+	char *params, *invite, *setby, *tims, *timestr;
 
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 5, NULL, &channel, &invite,
 			&setby, &tims);
-	secs = *tims == '\0' ? 0 :
-		(long) (time(NULL) - atol(tims));
+	timestr = my_asctime((time_t) atol(tims));
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
 		    *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG,
-		    channel, invite, setby, secs);
+		    channel, invite, setby, timestr);
+
+	g_free(timestr);
 	g_free(params);
 }
 
@@ -727,6 +745,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 281", (SIGNAL_FUNC) event_accept_list);
 	signal_add("event 367", (SIGNAL_FUNC) event_ban_list);
 	signal_add("event 348", (SIGNAL_FUNC) event_eban_list);
+	signal_add("event 728", (SIGNAL_FUNC) event_quiet_list);
 	signal_add("event 346", (SIGNAL_FUNC) event_invite_list);
 	signal_add("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_add("event 332", (SIGNAL_FUNC) event_topic_get);
@@ -804,7 +823,6 @@ void fe_events_numeric_init(void)
 	signal_add("event 506", (SIGNAL_FUNC) event_target_received); /* cannot send (+R) */
 	signal_add("event 716", (SIGNAL_FUNC) event_target_received); /* cannot /msg (+g) */
 	signal_add("event 717", (SIGNAL_FUNC) event_target_received); /* +g notified */
-	signal_add("event 728", (SIGNAL_FUNC) event_target_received); /* quiet (or other) list */
 	signal_add("event 729", (SIGNAL_FUNC) event_target_received); /* end of quiet (or other) list */
 	/* clang-format on */
 }
@@ -825,6 +843,7 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 281", (SIGNAL_FUNC) event_accept_list);
 	signal_remove("event 367", (SIGNAL_FUNC) event_ban_list);
 	signal_remove("event 348", (SIGNAL_FUNC) event_eban_list);
+	signal_remove("event 728", (SIGNAL_FUNC) event_quiet_list);
 	signal_remove("event 346", (SIGNAL_FUNC) event_invite_list);
 	signal_remove("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_remove("event 332", (SIGNAL_FUNC) event_topic_get);
@@ -898,6 +917,5 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 506", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 716", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 717", (SIGNAL_FUNC) event_target_received);
-	signal_remove("event 728", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 729", (SIGNAL_FUNC) event_target_received);
 }
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 9432c5f9..2cd87e04 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -81,12 +81,14 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "bantype", "Ban type changed to {channel $0}", 1, { 0 } },
 	{ "no_bans", "No bans in channel {channel $0}", 1, { 0 } },
 	{ "banlist", "$0 - {channel $1}: ban {ban $2}", 3, { 1, 0, 0 } },
-        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, $4 secs ago}", 5, { 1, 0, 0, 0, 1 } },
+        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, on $4}", 5, { 1, 0, 0, 0, 0 } },
+	{ "quietlist", "{channel $0}: quiet {ban $1}", 2, { 0, 0 } },
+        { "quietlist_long", "{channel $0}: quiet {ban $1} {comment by {nick $2}, on $3}", 4, { 0, 0, 0, 0 } },
 	{ "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } },
-        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
+        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, on $3}", 4, { 0, 0, 0, 0 } },
 	{ "no_invitelist", "Invite list is empty in channel {channel $0}", 1, { 0 } },
 	{ "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } },
-	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
+	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, on $3}", 4, { 0, 0, 0, 0 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
 	{ "server_help_start", "$1", 2, { 0, 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index a9d29cb0..722f8d40 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -59,6 +59,8 @@ enum {
 	IRCTXT_NO_BANS,
 	IRCTXT_BANLIST,
 	IRCTXT_BANLIST_LONG,
+	IRCTXT_QUIETLIST,
+	IRCTXT_QUIETLIST_LONG,
 	IRCTXT_EBANLIST,
 	IRCTXT_EBANLIST_LONG,
 	IRCTXT_NO_INVITELIST,

From c554a45738712219c066897b09a44d99afeb4240 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 26 Mar 2023 23:36:41 +0200
Subject: [PATCH 1514/1650] fix stale special collector use after free

reported by ednash and investigated by @dwfreed
---
 src/fe-text/textbuffer-formats.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 1de8c120..bbf9f229 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -214,7 +214,6 @@ static void sig_print_noformat(TEXT_DEST_REC *dest, const char *text)
 	if (!scrollback_format)
 		return;
 
-	special_push_collector(NULL);
 	info = store_lineinfo_tmp(dest);
 
 	info->format = format_rec_new(NULL, NULL, 2, (const char *[]){ NULL, text });

From 556f580f672bd9587475cef737209699189120c7 Mon Sep 17 00:00:00 2001
From: David Schultz <me@zpld.me>
Date: Sun, 26 Mar 2023 19:27:48 -0500
Subject: [PATCH 1515/1650] add support for ircd-hybrid quiet lists

---
 src/fe-common/irc/fe-events-numeric.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 0051d3bf..be01d8c3 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -204,6 +204,26 @@ static void event_quiet_list(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
+static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data)
+{
+	const char *channel;
+	char *params, *ban, *setby, *tims, *timestr;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 5, NULL, &channel,
+				  &ban, &setby, &tims);
+	timestr = my_asctime((time_t) atol(tims));
+
+	channel = get_visible_target(server, channel);
+	printformat(server, channel, MSGLEVEL_CRAP,
+		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
+		    channel, ban, setby, timestr);
+
+	g_free(timestr);
+	g_free(params);
+}
+
 static void event_silence_list(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *nick, *mask;
@@ -746,6 +766,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 367", (SIGNAL_FUNC) event_ban_list);
 	signal_add("event 348", (SIGNAL_FUNC) event_eban_list);
 	signal_add("event 728", (SIGNAL_FUNC) event_quiet_list);
+	signal_add("event 344", (SIGNAL_FUNC) event_hybrid_quiet_list); /* used by ircd-hybrid */
 	signal_add("event 346", (SIGNAL_FUNC) event_invite_list);
 	signal_add("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_add("event 332", (SIGNAL_FUNC) event_topic_get);
@@ -804,8 +825,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 470", (SIGNAL_FUNC) event_received);
 	signal_add("event 479", (SIGNAL_FUNC) event_received);
 
-	signal_add("event 344", (SIGNAL_FUNC) event_target_received); /* reop list */
-	signal_add("event 345", (SIGNAL_FUNC) event_target_received); /* end of reop list */
+	signal_add("event 345", (SIGNAL_FUNC) event_target_received); /* end of reop list/hybrid quiet list */
 	signal_add("event 347", (SIGNAL_FUNC) event_target_received); /* end of invite exception list */
 	signal_add("event 349", (SIGNAL_FUNC) event_target_received); /* end of ban exception list */
 	signal_add("event 368", (SIGNAL_FUNC) event_target_received); /* end of ban list */
@@ -844,6 +864,7 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 367", (SIGNAL_FUNC) event_ban_list);
 	signal_remove("event 348", (SIGNAL_FUNC) event_eban_list);
 	signal_remove("event 728", (SIGNAL_FUNC) event_quiet_list);
+	signal_remove("event 344", (SIGNAL_FUNC) event_hybrid_quiet_list);
 	signal_remove("event 346", (SIGNAL_FUNC) event_invite_list);
 	signal_remove("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_remove("event 332", (SIGNAL_FUNC) event_topic_get);
@@ -898,7 +919,6 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 470", (SIGNAL_FUNC) event_received);
 	signal_remove("event 479", (SIGNAL_FUNC) event_received);
 
-	signal_remove("event 344", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 345", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 347", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 349", (SIGNAL_FUNC) event_target_received);

From 9324ff9f68ab9a3a9c4dd97a1d5c8fa3b4342d4f Mon Sep 17 00:00:00 2001
From: David Schultz <me@zpld.me>
Date: Mon, 27 Mar 2023 11:04:53 -0500
Subject: [PATCH 1516/1650] this should work for everyone

---
 src/fe-common/irc/fe-events-numeric.c | 47 +++++++++++++++------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index be01d8c3..6b4540ab 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -204,26 +204,6 @@ static void event_quiet_list(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data)
-{
-	const char *channel;
-	char *params, *ban, *setby, *tims, *timestr;
-
-	g_return_if_fail(data != NULL);
-
-	params = event_get_params(data, 5, NULL, &channel,
-				  &ban, &setby, &tims);
-	timestr = my_asctime((time_t) atol(tims));
-
-	channel = get_visible_target(server, channel);
-	printformat(server, channel, MSGLEVEL_CRAP,
-		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
-		    channel, ban, setby, timestr);
-
-	g_free(timestr);
-	g_free(params);
-}
-
 static void event_silence_list(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *nick, *mask;
@@ -733,6 +713,33 @@ static void event_target_received(IRC_SERVER_REC *server, const char *data,
         print_event_received(server, data, nick, TRUE);
 }
 
+static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data)
+{
+	const char *channel;
+	char *params, *ban, *setby, *tims, *timestr;
+
+	g_return_if_fail(data != NULL);
+
+	params = event_get_params(data, 5, NULL, &channel,
+				  &ban, &setby, &tims);
+
+	if (*tims == '\0') {
+		/* probably not a quiet list */
+		event_target_received(server, data, NULL);
+		return;
+	}
+	channel = get_visible_target(server, channel);
+
+	timestr = my_asctime((time_t) atol(tims));
+
+	printformat(server, channel, MSGLEVEL_CRAP,
+		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
+		    channel, ban, setby, timestr);
+
+	g_free(timestr);
+	g_free(params);
+}
+
 static void event_motd(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {

From f21df708b0aeea03a33a63cd5680e85eb7083260 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 27 Mar 2023 22:59:49 +0200
Subject: [PATCH 1517/1650] up version

---
 configure.ac | 2 +-
 meson.build  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e67c5b25..5c5ba3c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.4.3)
+AC_INIT(irssi, 1.4.4)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 5038b752..6bbfbced 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.4.3',
+  version : '1.4.4',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From f32701b906816124e2eb00fc38d53ab79bb8ccab Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 18 Dec 2022 12:18:13 +0100
Subject: [PATCH 1518/1650] Merge pull request #1421 from j1mmie/patch-1

Add parameter LIST to STATUSBAR documentation

(cherry picked from commit b988b2925bf7310a3d7fefeb9b861866afae0d29)
---
 docs/help/in/statusbar.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index fd764537..a5626d46 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -35,8 +35,10 @@
                   quoted (e.g. -priority "-1")
     -alignment:   Display the item on the right side.
 
-    Where statusbar refers to the name of the statusbar; if no argument is
-    given, the entire list of statusbars will be displayed.
+    Where statusbar refers to the name of the statusbar; if no
+    argument is given, or `LIST` is given, the entire list of
+    statusbars along with a quick overview of their properties will be
+    displayed.
 
 %9Description:%9
 

From 1426ae87b1be4f9e4ca490ddb202cbd759b92aa3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 26 Nov 2022 15:09:50 +0100
Subject: [PATCH 1519/1650] Merge pull request #1424 from ailin-nemui/lastlog

fix lastlog -window

(cherry picked from commit 6e3745f42386f5d4147803e4af50b163fef3e901)
---
 src/fe-text/lastlog.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index b93b8361..89ee30a9 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -118,6 +118,7 @@ static void show_lastlog(const char *searchtext, GHashTable *optlist,
 			return;
 		}
 	}
+	view = WINDOW_GUI(window)->view;
 
 	if (g_hash_table_lookup(optlist, "new") != NULL)
 		startline = textbuffer_view_get_bookmark(view, "lastlog_last_check");

From 8f79457769881f8fe9730b02766e4ad68056398d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 29 Nov 2022 20:05:52 +0100
Subject: [PATCH 1520/1650] Merge pull request #1428 from
 ailin-nemui/flip-level

add (hide)level flip command

(cherry picked from commit 88cc48651dcfe9121ff60464c92b4318a6c1ca31)
---
 docs/help/in/window.in               | 4 ++++
 src/core/levels.c                    | 8 +++++---
 src/fe-common/core/window-commands.c | 2 +-
 src/fe-text/textbuffer-commands.c    | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index 9a7a7b10..23316911 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -42,6 +42,7 @@
     LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
     RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
     STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.
+    HIDELEVEL:    %|Changes the levels of text lines that should be hidden from view, or query the current hidden level.
     MOVE LEFT:    %|Move the window to the numerically previous location inside the current sticky group.
     MOVE RIGHT:   %|Move the window to the numerically next location inside the current sticky group.
     MOVE UP:      %|Move the current window to the sticky group of the previous split window. If no sticky group remains, the split window collapses.
@@ -52,6 +53,8 @@
 
    %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 
+   %|LEVEL and HIDELEVEL modify the currently set level. Without arguments, the current level is displayed. Levels listed starting with `+' are added to the current levels. Levels listed starting with `-' are removed from the current levels. To clear the levels, start the new level setting with `NONE'. Levels listed starting with `^' are either removed or added from the current setting, depending on whether they were previously set or not (since Irssi 1.5). Levels listed as is are also added to the current levels. Afterwards, the new level setting is displayed.
+
 %9Description:%9
 
     Manipulates the window layout and positioning attributes.
@@ -68,6 +71,7 @@
     /WINDOW LOG OFF
     /WINDOW LOG ON ~/logs/debug.log
     /WINDOW LEVEL -ALL +NOTICES
+    /WINDOW HIDELEVEL ^JOINS ^PARTS ^QUITS
     /WINDOW LOGFILE ~/logs/notices.log
 
 %9See also:%9 JOIN, LEVELS, LOG, QUERY
diff --git a/src/core/levels.c b/src/core/levels.c
index e62bc68c..62d7a00a 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -181,13 +181,15 @@ int combine_level(int dest, const char *src)
 
 	list = g_strsplit(src, " ", -1);
 	for (item = list; *item != NULL; item++) {
-		itemname = *item + (**item == '+' || **item == '-' ? 1 : 0);
+		itemname = *item + (**item == '+' || **item == '-' || **item == '^' ? 1 : 0);
 		itemlevel = level_get(itemname);
 
-		if (g_strcmp0(itemname, "NONE") == 0)
-                        dest = 0;
+		if (g_ascii_strcasecmp(itemname, "NONE") == 0)
+			dest = 0;
 		else if (**item == '-')
 			dest &= ~(itemlevel);
+		else if (**item == '^')
+			dest ^= itemlevel;
 		else
 			dest |= itemlevel;
 	}
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 7c542d37..6669ba43 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -400,7 +400,7 @@ static void cmd_window_previous(void)
 	window_set_active(window_find_refnum(num));
 }
 
-/* SYNTAX: WINDOW LEVEL [<level>] */
+/* SYNTAX: WINDOW LEVEL [<levels>] */
 static void cmd_window_level(const char *data)
 {
 	char *level;
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 6ed7c39c..3d1d963b 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -93,7 +93,7 @@ static void cmd_window_scroll(const char *data)
 				   gui->scroll : settings_get_bool("scroll"));
 }
 
-/* SYNTAX: WINDOW HIDELEVEL [<level>] */
+/* SYNTAX: WINDOW HIDELEVEL [<levels>] */
 static void cmd_window_hidelevel(const char *data)
 {
 	GUI_WINDOW_REC *gui;

From 8a8fb7740854097b2b300958f532f7e92853f557 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 18 Dec 2022 12:14:22 +0100
Subject: [PATCH 1521/1650] Merge pull request #1429 from
 ailin-nemui/docs-revamp

remove ported sections from manual and add links

(cherry picked from commit 42f83fc130caa4349646ea967ffafa4de4006024)
---
 docs/manual.txt | 137 ++++++++++--------------------------------------
 1 file changed, 29 insertions(+), 108 deletions(-)

diff --git a/docs/manual.txt b/docs/manual.txt
index 5f0eac51..d55e362e 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -18,16 +18,16 @@
 	9. Text highlighting
 	10. Ignoring
 	11. Logging
+	12. Commands
+	14. Last log (currently text version only)
+	15. Word completion
+	16. Recode
+	18. Key bindings (text version)
+	19. Perl scripting
 
 	( not written yet: )
-	12. Commands
 	13. Themes
-	14. Last log (currently text version only)
-	15. Nick and word completion
-	16. Recode
 	17. Windowing system (text version)
-	18. Keyboard (text version)
-	19. Perl scripting
 
 
 
@@ -141,44 +141,7 @@
 	--hostname -h		Specify what host name to use
 
 
- 2. Message levels
-
-
-	Message levels (or in short, levels) are used almost everywhere.
-	They describe what kind of messages we're dealing with. Here's a
-	list of them all:
-
-	CRAP            - Can be almost anything
-	MSGS            - Private messages
-	PUBLIC          - Public messages in channel
-	NOTICES         - Notices
-	SNOTES          - Server notices
-	CTCPS           - CTCP messages
-	ACTIONS         - Actions (/me) - usually ORed with PUBLIC or MSGS
-	JOINS           - Someone joins a channel
-	PARTS           - Someone parts a channel
-	QUITS           - Someone quits IRC
-	KICKS           - Someone gets kicked from channel
-	MODES           - Channel mode is changed
-	TOPICS          - Channel topic is changed
-	WALLOPS         - Wallop is received
-	INVITES         - Invite is received
-	NICKS           - Someone changes nick
-	DCC             - DCC related messages
-	DCCMSGS         - DCC chat messages
-	CLIENTNOTICES   - Irssi's notices
-	CLIENTERRORS    - Irssi's error messages
-	CLIENTCRAP      - Some other messages from Irssi
-
-	And a few special ones that could be included with the
-	levels above:
-
-	HILIGHT         - Text is highlighted
-	NOHILIGHT       - Don't check highlighting for this message
-	NO_ACT          - Don't trigger channel activity when printing
-	                  this message
-	NEVER           - Never ignore or log this message
-
+ 2. Message levels <https://irssi.org/documentation/help/levels/>
 
  3. Flood protection
 
@@ -252,47 +215,12 @@
 	Currently only messages, notices and ctcps are checked for
 	flooding.
 
-	/SET flood_max_msgs = <count>, default is 4
-	/SET flood_timecheck = <seconds>, default is 5 seconds
+	/SET flood_max_msgs <count>, default is 4
+	/SET flood_timecheck <seconds>, default is 5 seconds
 	If either of these is 0, the flood checking is disabled.
 
 
- 4. Configuration
-
- 4.1 Configuration files
-
-	The configuration is saved to ~/.irssi/config file. You can edit
-	it with text editor if you want, you can also add comments to it
-	and they stay there even if /SAVE is used. Comments are the lines
-	starting with # character. Any errors in config file are displayed
-	at startup.
-
-	Irssi uses it's own config library for handling the config file.
-	The format is pretty much the same as in libPropList and should be
-	easily understandable.
-
-	You can reload the config file on the fly with /RELOAD command, you
-	can also read a different config file with /RELOAD <filename>.
-
-	If you change any settings, they aren't saved to file until you use
-	/SAVE. You can save the config file to different place with
-	/SAVE <filename>.
-
- 4.2 Settings
-
-	You can view or change the settings with /SET command.
-
-	/SET without any arguments displays all the settings.
-	/SET <key> displays settings which key (partly) matches <key>
-	/SET <key> <value> sets <key> to <value>
-
-	Boolean settings accepts only values ON, OFF and TOGGLE. You can
-	also use /TOGGLE command to change them, so /TOGGLE <key> behaves
-	like /SET <key> TOGGLE. /TOGGLE also accepts arguments ON and OFF
-	when /TOGGLE behaves exactly like /SET.
-
-	Remember that changes are not saved until you use /SAVE!
-
+ 4. Configuration <https://irssi.org/documentation/manual/configuration/>
 
  5. Servers
 
@@ -367,11 +295,11 @@
 	you setup the server using /SERVER ADD (see next section). If the
 	settings can't be found there either, Irssi will use the defaults:
 
-	/SET default_nick = <nick>, defaults to user_name
-	/SET alternate_nick = <nick>, defaults to <default_nick>_
-	/SET user_name = <user>, defaults to your login name
-	/SET real_name = <name>, taken from /etc/passwd by default
-	/SET hostname = <host>, what host name to use when connecting
+	/SET default_nick <nick>, defaults to user_name
+	/SET alternate_nick <nick>, defaults to <default_nick>_
+	/SET user_name <user>, defaults to your login name
+	/SET real_name <name>, taken from /etc/passwd by default
+	/SET hostname <host>, what host name to use when connecting
 	/SET skip_motd ON|OFF|TOGGLE - Don't show server's MOTD
 
 	NOTE: /CONNECT is also a command for IRC operators to connect IRC
@@ -792,13 +720,7 @@
 	/SET massjoin_max_joins <count>.
 
 
- 7. IRC commands and features (FIXME)
-
- 7.x Basic commands
-
- 7.x IRC operator commands
-
- 7.x Away features
+ 7. IRC commands and features <https://irssi.org/documentation/help/>
 
  8. Notify list
 
@@ -846,9 +768,9 @@
 
 	/HILIGHT without any arguments displays list of the hilights.
 
-If <color> is a
-	number, Irssi will treat it as a MIRC color code. You can also use
-	bolds (^B), underlines (^_) etc. as <color> if you like.
+	If <color> is a number, Irssi will treat it as a MIRC color
+	code. You can also use bolds (^B), underlines (^_) etc. as
+	<color> if you like.
 
 
  10. Ignoring
@@ -993,29 +915,24 @@ If <color> is a
 
 	You can disable this feature by setting awaylog_level to NONE.
 
- 12. Commands
+ 12. Commands <https://irssi.org/documentation/manual/commands/>
 
-	Any char in the `cmdchars' setting can begin a command. The
-	syntax for a command is the following:
+ 13. Themes
 
-	<CMDCHAR>[<CMDCHAR>][^]<DATA>
+ 14. Last log <https://irssi.org/documentation/help/lastlog/>
 
-	If <CMDCHAR> is repeated two times, alias expansion is
-	disabled, enabled otherwise. If `^' is present, command output
-	is disabled. If <DATA> begins with a space, command lookup is
-	inhibited and the data is sent to the active window item
-	(useful to send a line that begins with <CMDCHAR>).
+ 15. Word completion <https://irssi.org/documentation/help/completion/>
 
  16. Recode
 
-	irssi supports selective encoding of incoming/outgoing messages
+	Irssi supports selective encoding of incoming/outgoing messages
 	through the recode system. All incoming/outgoing messages can be
 	optionally converted to/from the charset specified by the
 	`term_charset' variable (which defaults to the locale encoding and
 	should _not_ be changed in most cases), by setting the `recode'
 	variable to 'ON'.
 	Since there is no way in IRC to know the encoding associated to a
-	message, for incoming messages irssi uses the following algorithm:
+	message, for incoming messages Irssi uses the following algorithm:
 
 	if `recode_autodetect_utf8' is 'ON' and the message is valid UTF-8 the
 	encoding is assumed to be UTF-8.
@@ -1032,5 +949,9 @@ If <color> is a
 	iconv specific extension to peform transliteration (locale dependent)
 	when a character is not representable in the destination encoding.
 
+ 18. Key bindings <https://irssi.org/documentation/help/bind_-list/>
+
+ 19. Scripting <https://irssi.org/documentation/scripting/>
+
 .. no, the docs end here, I got bored of writing these after a few days and 
 haven't touched these since then.

From f422b9861390240bb2b8e2eac6d9dd8a2016cd4e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 18 Dec 2022 12:27:29 +0100
Subject: [PATCH 1522/1650] Merge pull request #1431 from
 ailin-nemui/missing-news

add missing news reference

(cherry picked from commit f8500320cf0c14556d62c03ebb9e502793b4dd90)
---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 06960d6e..af46e8fc 100644
--- a/NEWS
+++ b/NEWS
@@ -112,7 +112,7 @@ v1.4.1 2022-06-12  The Irssi team <staff@irssi.org>
 
 	* Channel sync requests (WHO, MODE) are now sent "later" than
           user commands. This should improve responsiveness to user
-          commands in the autojoin phase (an#26, an#32, an#33)
+          commands in the autojoin phase (#1300, an#26, an#32, an#33)
 	* Irssi is now using full paths in #include directives and
           consequently does not add all directories to the include
           path anymore (#1040)

From 473cf8ca3fd57d97f6035c3ddaf848f1b386bc83 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 23 Dec 2022 10:34:56 +0100
Subject: [PATCH 1523/1650] Merge pull request #1432 from
 horgh/horgh/win-logfile

Check window logfile parameter

(cherry picked from commit 6f5026fd494948b03264d18095638dbecdb1a525)
---
 src/fe-common/core/fe-log.c | 155 ++++++++++++++++++------------------
 1 file changed, 78 insertions(+), 77 deletions(-)

diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 984b3548..164036c1 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -60,15 +60,15 @@ static char **autolog_ignore_targets;
 
 static char *log_colorizer_strip(const char *str)
 {
-        return strip_codes(str);
+	return strip_codes(str);
 }
 
 static void log_add_targets(LOG_REC *log, const char *targets, const char *tag)
 {
 	char **tmp, **items;
 
-        g_return_if_fail(log != NULL);
-        g_return_if_fail(targets != NULL);
+	g_return_if_fail(log != NULL);
+	g_return_if_fail(targets != NULL);
 
 	items = g_strsplit(targets, " ", -1);
 
@@ -83,18 +83,18 @@ static void log_add_targets(LOG_REC *log, const char *targets, const char *tag)
 		    <fname> [<levels>] */
 static void cmd_log_open(const char *data)
 {
-        SERVER_REC *server;
-        GHashTable *optlist;
+	SERVER_REC *server;
+	GHashTable *optlist;
 	char *targetarg, *fname, *levels, *servertag;
 	void *free_arg;
 	char window[MAX_INT_STRLEN];
 	LOG_REC *log;
 	int level;
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
-			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS |
-			    PARAM_FLAG_STRIP_TRAILING_WS, "log open", &optlist, 
-			    &fname, &levels))
+	if (!cmd_get_params(data, &free_arg,
+	                    2 | PARAM_FLAG_GETREST | PARAM_FLAG_UNKNOWN_OPTIONS |
+	                        PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
+	                    "log open", &optlist, &fname, &levels))
 		return;
 	if (*fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
@@ -112,8 +112,7 @@ static void cmd_log_open(const char *data)
 			ltoa(window, active_win->refnum);
 			targetarg = window;
 		}
-		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, targetarg,
-			     servertag);
+		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, targetarg, servertag);
 	} else {
 		targetarg = g_hash_table_lookup(optlist, "targets");
 		if (targetarg != NULL && *targetarg != '\0')
@@ -133,14 +132,13 @@ static void cmd_log_open(const char *data)
 	if (log->handle == -1 && g_hash_table_lookup(optlist, "noopen") == NULL) {
 		/* start logging */
 		if (log_start_logging(log)) {
-			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-				    TXT_LOG_OPENED, fname);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_OPENED, fname);
 		} else {
 			log_close(log);
 		}
 	}
 
-        cmd_params_free(free_arg);
+	cmd_params_free(free_arg);
 }
 
 static LOG_REC *log_find_from_data(const char *data)
@@ -209,7 +207,7 @@ static char *log_items_get_list(LOG_REC *log)
 	for (tmp = log->items; tmp != NULL; tmp = tmp->next) {
 		rec = tmp->data;
 
-                g_string_append_printf(str, "%s, ", rec->name);
+		g_string_append_printf(str, "%s, ", rec->name);
 	}
 	g_string_truncate(str, str->len-2);
 	if(rec->servertag != NULL)
@@ -231,13 +229,11 @@ static void cmd_log_list(void)
 		LOG_REC *rec = tmp->data;
 
 		levelstr = bits2level(rec->level);
-		items = rec->items == NULL ? NULL :
-                        log_items_get_list(rec);
+		items = rec->items == NULL ? NULL : log_items_get_list(rec);
 
-		printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_LOG_LIST,
-			    index, rec->fname, items != NULL ? items : "",
-			    levelstr, rec->autoopen ? " -autoopen" : "",
-			    rec->handle != -1 ? " active" : "");
+		printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_LOG_LIST, index, rec->fname,
+		            items != NULL ? items : "", levelstr, rec->autoopen ? " -autoopen" : "",
+		            rec->handle != -1 ? " active" : "");
 
 		g_free_not_null(items);
 		g_free(levelstr);
@@ -253,8 +249,8 @@ static void cmd_log(const char *data, SERVER_REC *server, void *item)
 		command_runsub("log", data, server, item);
 }
 
-static LOG_REC *logs_find_item(int type, const char *item,
-			       const char *servertag, LOG_ITEM_REC **ret_item)
+static LOG_REC *logs_find_item(int type, const char *item, const char *servertag,
+                               LOG_ITEM_REC **ret_item)
 {
 	LOG_ITEM_REC *logitem;
 	GSList *tmp;
@@ -284,17 +280,17 @@ static void cmd_window_log(const char *data)
 	if (!cmd_get_params(data, &free_arg, 2, &set, &fname))
 		return;
 
-        ltoa(window, active_win->refnum);
+	ltoa(window, active_win->refnum);
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, window, NULL, NULL);
 
-        open_log = close_log = FALSE;
+	open_log = close_log = FALSE;
 	if (g_ascii_strcasecmp(set, "ON") == 0)
 		open_log = TRUE;
 	else if (g_ascii_strcasecmp(set, "OFF") == 0) {
 		close_log = TRUE;
 	} else if (g_ascii_strcasecmp(set, "TOGGLE") == 0) {
-                open_log = log == NULL;
-                close_log = log != NULL;
+		open_log = log == NULL;
+		close_log = log != NULL;
 	} else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_NOT_TOGGLE);
 		cmd_params_free(free_arg);
@@ -309,7 +305,7 @@ static void cmd_window_log(const char *data)
 					active_win->name != NULL ? "" : window);
 		log = log_create_rec(fname, MSGLEVEL_ALL);
 		log->colorizer = log_colorizer_strip;
-                log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
+		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
 		log_update(log);
 		g_free(fname);
 	}
@@ -322,7 +318,7 @@ static void cmd_window_log(const char *data)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_CLOSED, log->fname);
 	}
 
-        cmd_params_free(free_arg);
+	cmd_params_free(free_arg);
 }
 
 /* Create log file entry to window, but don't start logging */
@@ -331,21 +327,34 @@ static void cmd_window_logfile(const char *data)
 {
 	LOG_REC *log;
 	char window[MAX_INT_STRLEN];
+	void *free_arg;
+	char *fname;
 
-        ltoa(window, active_win->refnum);
+	if (!cmd_get_params(data, &free_arg, 1, &fname)) {
+		return;
+	}
+
+	if (!fname || strlen(fname) == 0) {
+		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+	}
+
+	ltoa(window, active_win->refnum);
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, window, NULL, NULL);
 
 	if (log != NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWLOG_FILE_LOGGING);
+		cmd_params_free(free_arg);
 		return;
 	}
 
-	log = log_create_rec(data, MSGLEVEL_ALL);
+	log = log_create_rec(fname, MSGLEVEL_ALL);
 	log->colorizer = log_colorizer_strip;
 	log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
 	log_update(log);
 
 	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWLOG_FILE, data);
+
+	cmd_params_free(free_arg);
 }
 
 /* window's refnum changed - update the logs to log the new window refnum */
@@ -355,7 +364,7 @@ static void sig_window_refnum_changed(WINDOW_REC *window, gpointer old_refnum)
 	LOG_REC *log;
 	LOG_ITEM_REC *item;
 
-        ltoa(winnum, GPOINTER_TO_INT(old_refnum));
+	ltoa(winnum, GPOINTER_TO_INT(old_refnum));
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, winnum, NULL, &item);
 
 	if (log != NULL) {
@@ -368,7 +377,7 @@ static void sig_window_refnum_changed(WINDOW_REC *window, gpointer old_refnum)
 
 static void sig_server_disconnected(SERVER_REC *server)
 {
-        LOG_ITEM_REC *logitem;
+	LOG_ITEM_REC *logitem;
 	GSList *tmp, *next;
 
 	for (tmp = logs; tmp != NULL; tmp = next) {
@@ -376,13 +385,13 @@ static void sig_server_disconnected(SERVER_REC *server)
 		next = tmp->next;
 
 		if (!log->temp || log->items == NULL)
-                        continue;
+			continue;
 
 		logitem = log->items->data;
-		if (logitem->type == LOG_ITEM_TARGET &&
-		    logitem->servertag != NULL &&
+		if (logitem->type == LOG_ITEM_TARGET && logitem->servertag != NULL &&
 		    g_ascii_strcasecmp(logitem->servertag, server->tag) == 0 &&
-		    server_ischannel(server, logitem->name)) /* kludge again.. so we won't close dcc chats */
+		    server_ischannel(
+		        server, logitem->name)) /* kludge again.. so we won't close dcc chats */
 			log_close(log);
 	}
 }
@@ -414,15 +423,14 @@ static char *escape_target(const char *target)
 			*p++ = *target;
 		}
 
-                target++;
+		target++;
 	}
 	*p = '\0';
 
-        return str;
+	return str;
 }
 
-static void autolog_open(SERVER_REC *server, const char *server_tag,
-			 const char *target)
+static void autolog_open(SERVER_REC *server, const char *server_tag, const char *target)
 {
 	LOG_REC *log;
 	char *fname, *dir, *fixed_target, *params;
@@ -443,17 +451,16 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
 	if (CHAT_PROTOCOL(server)->case_insensitive)
 		ascii_strdown(fixed_target);
 
-        /* $0 = target, $1 = server tag */
-        params = g_strconcat(fixed_target, " ", server_tag, NULL);
+	/* $0 = target, $1 = server tag */
+	params = g_strconcat(fixed_target, " ", server_tag, NULL);
 	g_free(fixed_target);
 
-	fname = parse_special_string(autolog_path, server, NULL,
-				     params, NULL, 0);
+	fname = parse_special_string(autolog_path, server, NULL, params, NULL, 0);
 	g_free(params);
 
 	if (log_find(fname) == NULL) {
 		log = log_create_rec(fname, autolog_level);
-                if (!settings_get_bool("autolog_colors"))
+		if (!settings_get_bool("autolog_colors"))
 			log->colorizer = log_colorizer_strip;
 		log_item_add(log, LOG_ITEM_TARGET, target, server_tag);
 
@@ -484,8 +491,8 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 	   we're parting the channel with /WINDOW CLOSE.. Maybe a small
 	   timeout would be nice instead of immediately closing the log file
 	   after "window item destroyed" */
-	if (level == MSGLEVEL_PARTS ||
-	    (autolog_level & level) == 0 || target == NULL || *target == '\0')
+	if (level == MSGLEVEL_PARTS || (autolog_level & level) == 0 || target == NULL ||
+	    *target == '\0')
 		return;
 
 	deftarget = server ? server->nick : "unknown";
@@ -495,8 +502,7 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 		&& channel_setup_find(target, server_tag) == NULL)
 		return;
 
-	if (autolog_ignore_targets != NULL &&
-	    strarray_find_dest(autolog_ignore_targets, dest))
+	if (autolog_ignore_targets != NULL && strarray_find_dest(autolog_ignore_targets, dest))
 		return;
 
 	if (target != NULL)
@@ -512,8 +518,7 @@ static void log_single_line(WINDOW_REC *window, const char *server_tag, const ch
 	if (window != NULL) {
 		/* save to log created with /WINDOW LOG */
 		ltoa(windownum, window->refnum);
-		log = logs_find_item(LOG_ITEM_WINDOW_REFNUM,
-				     windownum, NULL, NULL);
+		log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, windownum, NULL, NULL);
 		if (log != NULL)
 			log_write_rec(log, text, level, t);
 	}
@@ -553,8 +558,7 @@ static void log_line(TEXT_DEST_REC *dest, const char *text)
 	g_strfreev(lines);
 }
 
-static void sig_printtext(TEXT_DEST_REC *dest, const char *text,
-			  const char *stripped)
+static void sig_printtext(TEXT_DEST_REC *dest, const char *text, const char *stripped)
 {
 	if (skip_next_printtext) {
 		skip_next_printtext = FALSE;
@@ -564,8 +568,8 @@ static void sig_printtext(TEXT_DEST_REC *dest, const char *text,
 	log_line(dest, text);
 }
 
-static void sig_print_format(THEME_REC *theme, const char *module,
-			     TEXT_DEST_REC *dest, void *formatnum, char **args)
+static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC *dest,
+                             void *formatnum, char **args)
 {
 	char *str, *linestart, *tmp;
 
@@ -579,14 +583,14 @@ static void sig_print_format(THEME_REC *theme, const char *module,
 	if (theme == log_theme)
 		return;
 
-	str = format_get_text_theme_charargs(log_theme, module, dest,
-					     GPOINTER_TO_INT(formatnum), args);
+	str = format_get_text_theme_charargs(log_theme, module, dest, GPOINTER_TO_INT(formatnum),
+	                                     args);
 	if (str != NULL && *str != '\0') {
 		skip_next_printtext = TRUE;
 
 		/* add the line start format */
 		linestart = format_get_level_tag(log_theme, dest);
-                tmp = str;
+		tmp = str;
 		str = format_add_linestart(tmp, linestart);
 		g_free_not_null(linestart);
 		g_free(tmp);
@@ -605,14 +609,14 @@ static int sig_autoremove(void)
 	GSList *tmp, *next;
 	time_t removetime;
 
-        removetime = time(NULL)-AUTOLOG_INACTIVITY_CLOSE;
+	removetime = time(NULL) - AUTOLOG_INACTIVITY_CLOSE;
 	for (tmp = logs; tmp != NULL; tmp = next) {
 		LOG_REC *log = tmp->data;
 
 		next = tmp->next;
 
 		if (!log->temp || log->last > removetime || log->items == NULL)
-                        continue;
+			continue;
 
 		/* Close only logs with private messages */
 		logitem = log->items->data;
@@ -620,8 +624,8 @@ static int sig_autoremove(void)
 			continue;
 
 		server = server_find_tag(logitem->servertag);
-		if (logitem->type == LOG_ITEM_TARGET &&
-		    server != NULL && !server_ischannel(server, logitem->name))
+		if (logitem->type == LOG_ITEM_TARGET && server != NULL &&
+		    !server_ischannel(server, logitem->name))
 			log_close(log);
 	}
 	return 1;
@@ -632,43 +636,40 @@ static void sig_window_item_remove(WINDOW_REC *window, WI_ITEM_REC *item)
 	LOG_REC *log;
 
 	log = logs_find_item(LOG_ITEM_TARGET, item->visible_name,
-			     item->server == NULL ? NULL :
-			     item->server->tag, NULL);
+	                     item->server == NULL ? NULL : item->server->tag, NULL);
 	if (log != NULL && log->temp)
 		log_close(log);
 }
 
 static void sig_log_locked(LOG_REC *log)
 {
-	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-		    TXT_LOG_LOCKED, log->real_fname);
+	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_LOG_LOCKED, log->real_fname);
 }
 
 static void sig_log_create_failed(LOG_REC *log)
 {
-	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
-		    TXT_LOG_CREATE_FAILED,
-		    log->real_fname, g_strerror(errno));
+	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_LOG_CREATE_FAILED, log->real_fname,
+	            g_strerror(errno));
 }
 
 static void sig_log_new(LOG_REC *log)
 {
 	if (!settings_get_bool("awaylog_colors") &&
 	    g_strcmp0(log->fname, settings_get_str("awaylog_file")) == 0)
-                log->colorizer = log_colorizer_strip;
+		log->colorizer = log_colorizer_strip;
 }
 
 static void sig_log_config_read(LOG_REC *log, CONFIG_NODE *node)
 {
-        if (!config_node_get_bool(node, "colors", FALSE))
+	if (!config_node_get_bool(node, "colors", FALSE))
 		log->colorizer = log_colorizer_strip;
 }
 
 static void sig_log_config_save(LOG_REC *log, CONFIG_NODE *node)
 {
-        if (log->colorizer == NULL)
+	if (log->colorizer == NULL)
 		iconfig_node_set_bool(node, "colors", TRUE);
-        else
+	else
 		iconfig_node_set_str(node, "colors", NULL);
 }
 
@@ -685,7 +686,7 @@ static void sig_awaylog_show(LOG_REC *log, gpointer pmsgs, gpointer pfilepos)
 	else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->real_fname, msgs);
 
-                str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
+		str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
 		signal_emit("command cat", 1, str);
 		g_free(str);
 	}
@@ -746,13 +747,13 @@ void fe_log_init(void)
 	skip_next_printtext = FALSE;
 
 	settings_add_bool("log", "awaylog_colors", TRUE);
-        settings_add_bool("log", "autolog", FALSE);
+	settings_add_bool("log", "autolog", FALSE);
 	settings_add_bool("log", "autolog_colors", FALSE);
 	settings_add_bool("log", "autolog_only_saved_channels", FALSE);
 	settings_add_choice("log", "log_server_time", 2, "off;on;auto");
 	settings_add_str("log", "autolog_path", "~/irclogs/$tag/$0.log");
 	settings_add_level("log", "autolog_level", "all -crap -clientcrap -ctcps");
-        settings_add_str("log", "log_theme", "");
+	settings_add_str("log", "log_theme", "");
 	settings_add_str("log", "autolog_ignore_targets", "");
 
 	autolog_level = 0;

From af8e40b744a30b80f8f4749d4e3dcfccc39763e6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 18 Dec 2022 21:53:34 +0100
Subject: [PATCH 1524/1650] Merge pull request #1434 from
 irssi/ailin-nemui/statusbar-help

correct statusbar help text

(cherry picked from commit 7445ad1f1538986b5be26af9cd658aecaa7887f6)
---
 docs/help/in/statusbar.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/help/in/statusbar.in b/docs/help/in/statusbar.in
index a5626d46..ac57ca5f 100644
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@@ -10,7 +10,7 @@
     RESET:        Restores the default statusbar configuration.
     ADDITEM:      Adds an item to the specified statusbar. It can be set to
                   appear before/after another item and left/right aligned
-                  to a specified position on the screen.
+                  on the screen.
     MODIFYITEM:   Changes an item position inside a bar.
     REMOVEITEM:   Removes an item from the specified statusbar.
     INFO:         List the current details and items of the specified
@@ -18,15 +18,16 @@
 
     -disable:     Removes a statusbar from the list.
     -type:        Sets the type of statusbar, for each split window or only
-                  for the current root screen.
+                  once at the root (very top or bottom) of the screen.
     -placement:   Sets the placement of the statusbar, either at the top or
-                  the bottom of the screen.
+                  the bottom of the screen or split window.
     -position:    Sets the position of the statusbar. Represented as a
-                  number, with 0 implying the first position.
-    -visible:     Sets the visibility of the statusbar or item. If set to
-                  always it is visible on all screens, otherwise if set to
-                  inactive or active then it is only visible on inactive
-                  or active screens, respectively.
+                  number, with smaller numbers implying a position further
+                  to the top.
+    -visible:     Sets the visibility of the statusbar. If set to always,
+                  it is visible on all split windows, otherwise if set to
+                  inactive or active then it is only visible on inactive or
+                  active split windows, respectively.
     -before:      This item is added before the other item.
     -after:       This item is added after the other item.
     -priority:    When the statusbar items overflow, the item with the

From 0438c7f0b2def0ae5d7e1dd56f980a472fa6e6a8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 25 Dec 2022 17:51:32 +0100
Subject: [PATCH 1525/1650] Merge pull request #1438 from qoreQyaS/master

Lang-Fix: Use more general messages
(cherry picked from commit 162dc256be8f47de2491c0587e28ab21805f348a)
---
 src/fe-common/core/module-formats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 8c10f420..c4d9be96 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -39,9 +39,9 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "set_server_sticky", "Window's server set sticky", 1, { 0 } },
 	{ "unset_server_sticky", "Window's server isn't sticky anymore", 0 },
 	{ "window_name_not_unique", "Window names must be unique", 1, { 0 } },
-	{ "window_level", "Window level is now $0", 1, { 0 } },
-	{ "window_set_immortal", "Window is now immortal", 0 },
-	{ "window_unset_immortal", "Window isn't immortal anymore", 0 },
+	{ "window_level", "Window level is $0", 1, { 0 } },
+	{ "window_set_immortal", "Window is immortal", 0 },
+	{ "window_unset_immortal", "Window isn't immortal", 0 },
 	{ "window_immortal_error", "Window is immortal, if you really want to close it, say /WINDOW IMMORTAL OFF", 0 },
 	{ "windowlist_header", "%#Ref  Name                 Active item     Server          Level", 0 },
 	{ "windowlist_line", "%#$[4]0 %|$[20]1 $[15]2 $[15]3 $4", 5, { 1, 0, 0, 0, 0 } },

From 2f0a16556950e71cc79a72ee8ce4b966ab8f711e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 21 Jan 2023 16:48:36 +0100
Subject: [PATCH 1526/1650] Merge pull request #1439 from irssi/from-codeberg

Sync

(cherry picked from commit de43e9e067be52c7773a25d5016e2ab7da585c78)
---
 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 6bbfbced..fe8d4b21 100644
--- a/meson.build
+++ b/meson.build
@@ -594,7 +594,10 @@ pc.generate(filebase : 'irssi-1',
   description : 'Irssi chat client',
   version : package_version,
   requires : pc_requires,
-  variables : ['irssimoduledir=${libdir}' / incdir / 'modules'])
+  variables : [
+    'irssimoduledir=${libdir}' / incdir / 'modules',
+    'signalsfile=${prefix}' / docdir / 'signals.txt'
+  ])
 
 ###########
 # irssi.1 #

From 377824ae7fd064ff21d8602ab007de6147b9717c Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 2 Feb 2023 17:03:53 +0100
Subject: [PATCH 1527/1650] Merge pull request #1442 from lheckemann/master

Support receiving monospace

(cherry picked from commit c06be88d8f107f1890402a266735bc0659dd6021)
---
 src/fe-common/core/formats.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index b660b616..0c8b3088 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1303,7 +1303,7 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
 
 #define IS_COLOR_CODE(c) \
 	((c) == 2 || (c) == 3 || (c) == 4 || (c) == 6 || (c) == 7 || \
-	(c) == 15 || (c) == 22 || (c) == 27 || (c) == 29 || (c) == 31)
+	(c) == 15 || (c) == 17 || (c) == 22 || (c) == 27 || (c) == 29 || (c) == 31)
 
 /* Return how many characters in `str' must be skipped before `len'
    characters of text is skipped. */
@@ -1585,6 +1585,10 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 			bgcolor = -1;
 			flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE;
 			break;
+		case 17:
+			if (!hide_text_style)
+				flags ^= GUI_PRINT_FLAG_MONOSPACE;
+			break;
 		case 22:
 			/* reverse */
 			if (!hide_text_style)

From 82618ce25dc1b616c3307ae3b6a6b7f7e630e605 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 12 Feb 2023 13:51:44 +0000
Subject: [PATCH 1528/1650] Merge pull request #1446 from
 ailin-nemui/signalsfile-fix

fix signals file

(cherry picked from commit 2ac1f01b9486725cf9f7c20595b4912188104e04)
---
 meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index fe8d4b21..c4aad2fa 100644
--- a/meson.build
+++ b/meson.build
@@ -589,6 +589,12 @@ pc_requires = []
 if not glib_internal
   pc_requires += glib_dep
 endif
+signalsfile = docdir / 'signals.txt'
+if signalsfile.startswith('/')
+  signalsfile = signalsfile.replace(get_option('prefix'), '${prefix}')
+else
+  signalsfile = '${prefix}' / signalsfile
+endif
 pc.generate(filebase : 'irssi-1',
   name : 'Irssi',
   description : 'Irssi chat client',
@@ -596,7 +602,7 @@ pc.generate(filebase : 'irssi-1',
   requires : pc_requires,
   variables : [
     'irssimoduledir=${libdir}' / incdir / 'modules',
-    'signalsfile=${prefix}' / docdir / 'signals.txt'
+    'signalsfile=' + signalsfile
   ])
 
 ###########

From 75fd59608431cce4b306cbcc059b3cb7b061c3c6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 13 Feb 2023 08:51:33 +0000
Subject: [PATCH 1529/1650] Merge pull request #1447 from
 ailin-nemui/signalsfile-fix

fix signalsfile some more

(cherry picked from commit c1fd4b17f53f7627cacb63f478af627bec1581c9)
---
 meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index c4aad2fa..1a8c23f3 100644
--- a/meson.build
+++ b/meson.build
@@ -591,7 +591,12 @@ if not glib_internal
 endif
 signalsfile = docdir / 'signals.txt'
 if signalsfile.startswith('/')
-  signalsfile = signalsfile.replace(get_option('prefix'), '${prefix}')
+  signalsfile = signalsfile.split(get_option('prefix'))
+  if signalsfile[0] == ''
+    signalsfile = '${prefix}' + signalsfile[1]
+  else
+    signalsfile = signalsfile[0]
+  endif
 else
   signalsfile = '${prefix}' / signalsfile
 endif

From d1319b422bf90e261843ea59c05258ac39974aca Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:31:56 +0000
Subject: [PATCH 1530/1650] Merge pull request #1452 from
 irssi/vague666-levels-in-update

Update levels.in

(cherry picked from commit 1c9990acab3e3fb162a3c1ad4936b0f2678ef07d)
---
 docs/help/in/levels.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/help/in/levels.in b/docs/help/in/levels.in
index 99f3070a..b6eb9fbf 100644
--- a/docs/help/in/levels.in
+++ b/docs/help/in/levels.in
@@ -35,6 +35,7 @@
         HIDDEN          Hides the message when window HIDELEVEL includes HIDDEN.
         NO_ACT          Doesn't trigger any activity in the statusbar.
         NOHILIGHT       The text is not highlighted.
+                        Suppresses hilights when used with /ignore.
 
     When using levels from Irssi scripts, you need to prepend the level with
     'MSGLEVEL_'; for example 'CRAP' becomes 'MSGLEVEL_CRAP'.

From 38a80b21eaa98be2bbe3046dfa04f691457a505f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:31:40 +0000
Subject: [PATCH 1531/1650] Merge pull request #1453 from
 irssi/vague666-ignore-in-update

Update ignore.in

(cherry picked from commit 706b6fff819b53ee97cc365c453b5f6ce1b461d2)
---
 docs/help/in/ignore.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 433490e1..351c0411 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -29,6 +29,8 @@
     because it is allowed in addition to other ignores for the same target.
     The special level 'HIDDEN' can be used to hide matching messages that can
     later be revealed using /WINDOW HIDELEVEL -HIDDEN
+    The special level 'NOHILIGHT' can be used to supress hilights without actually
+    ignoring the message.
 
 %9Examples:%9
 

From 6d3284f7e9259aec81ccd431ddb1a27212388d58 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 21 Mar 2023 07:05:33 +0000
Subject: [PATCH 1532/1650] Merge pull request #1454 from irssi/from-codeberg

Sync

(cherry picked from commit 2b91c45f5d7088861f5355f13b3d9a6ea304c781)
---
 src/fe-common/irc/fe-irc-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 2e71b34f..1419f934 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -208,7 +208,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 		return;
 
 	if (server_ischannel(SERVER(server), target)) {
-		item = irc_channel_find(server, target);
+		item = channel_find(SERVER(server), target);
 	} else {
 		own = (!g_strcmp0(nick, server->nick));
 		item = privmsg_get_query(SERVER(server), own ? target : nick, FALSE, level);

From 9948a18fce9a075923c20249194d4e948424b9ff Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 21 Mar 2023 08:49:09 +0000
Subject: [PATCH 1533/1650] Merge pull request #1455 from
 irssi/vague666-typo-fix

Update ignore.in

(cherry picked from commit 6671fec9a91dc61981ea0554525bf1a68be10999)
---
 docs/help/in/ignore.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 351c0411..26dd63bb 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -29,7 +29,7 @@
     because it is allowed in addition to other ignores for the same target.
     The special level 'HIDDEN' can be used to hide matching messages that can
     later be revealed using /WINDOW HIDELEVEL -HIDDEN
-    The special level 'NOHILIGHT' can be used to supress hilights without actually
+    The special level 'NOHILIGHT' can be used to suppress hilights without actually
     ignoring the message.
 
 %9Examples:%9

From 78d00b99b431bd194bf5aa06e0252421d217483e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 27 Mar 2023 20:46:56 +0000
Subject: [PATCH 1534/1650] Merge pull request #1456 from ailin-nemui/collector

fix stale special collector use after free

(cherry picked from commit c03057f36a2abd37a1176da2890d89116bab5139)
---
 src/fe-text/textbuffer-formats.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 50d6250a..ce104c2d 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -213,7 +213,6 @@ static void sig_print_noformat(TEXT_DEST_REC *dest, const char *text)
 	if (!scrollback_format)
 		return;
 
-	special_push_collector(NULL);
 	info = store_lineinfo_tmp(dest);
 
 	info->format = format_rec_new(NULL, NULL, 2, (const char *[]){ NULL, text });

From 201296a0dae2a9b7d4e8d4f4d52fac451a9d1027 Mon Sep 17 00:00:00 2001
From: David Schultz <me@zpld.me>
Date: Mon, 27 Mar 2023 18:21:36 -0500
Subject: [PATCH 1535/1650] add `time_ago()` in addition to timestamps;
 deduplicate qlist logic

---
 src/fe-common/irc/fe-events-numeric.c | 91 +++++++++++++++++++--------
 src/fe-common/irc/module-formats.c    |  8 +--
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 6b4540ab..1126c2d2 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -138,18 +138,55 @@ static void event_end_of_who(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
+/* Get time elapsed since an event */
+static char *time_ago(time_t seconds)
+{
+	static char ret[128];
+	long unsigned years, weeks, days, hours, minutes;
+
+	seconds = time(NULL) - seconds;
+
+	years = seconds/(86400*365);
+	seconds %= (86400*365);
+	weeks = seconds/604800;
+	seconds %= 604800;
+	days = seconds/86400;
+	seconds %= 86400;
+	hours = seconds/3600;
+	hours %= 3600;
+	minutes = seconds/60;
+	minutes %= 60;
+	seconds %= 60;
+
+	if (years)
+		snprintf(ret, sizeof(ret), "%luy %luw %lud", years, weeks, days);
+	else if (weeks)
+		snprintf(ret, sizeof(ret), "%luw %lud %luh", weeks, days, hours);
+	else if (days)
+		snprintf(ret, sizeof(ret), "%lud %luh %lum", days, hours, minutes);
+	else if (hours)
+		snprintf(ret, sizeof(ret), "%luh %lum", hours, minutes);
+	else if (minutes)
+		snprintf(ret, sizeof(ret), "%lum %lus", minutes, (long unsigned)seconds);
+	else
+		snprintf(ret, sizeof(ret), "%lus", (long unsigned)seconds);
+
+	return ret;
+}
+
 static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 {
 	IRC_CHANNEL_REC *chanrec;
 	BAN_REC *banrec;
 	const char *channel;
-	char *params, *ban, *setby, *tims, *timestr;
+	char *params, *ban, *setby, *tims, *timestr, *ago;
 
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 5, NULL, &channel,
 				  &ban, &setby, &tims);
-	timestr = my_asctime((time_t) atol(tims));
+	timestr = my_asctime((time_t) atoll(tims));
+	ago = time_ago((time_t) atoll(tims));
 
 	chanrec = irc_channel_find(server, channel);
 	banrec = chanrec == NULL ? NULL : banlist_find(chanrec->banlist, ban);
@@ -158,7 +195,7 @@ static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 	printformat(server, channel, MSGLEVEL_CRAP,
 		    *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
 		    banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec)+1,
-		    channel, ban, setby, timestr);
+		    channel, ban, setby, timestr, ago);
 
 	g_free(timestr);
 	g_free(params);
@@ -167,40 +204,49 @@ static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 static void event_eban_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *ban, *setby, *tims, *timestr;
+	char *params, *ban, *setby, *tims, *timestr, *ago;
 
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 5, NULL, &channel,
 				  &ban, &setby, &tims);
-	timestr = my_asctime((time_t) atol(tims));
+	timestr = my_asctime((time_t) atoll(tims));
+	ago = time_ago((time_t) atoll(tims));
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
 		    *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG,
-		    channel, ban, setby, timestr);
+		    channel, ban, setby, timestr, ago);
 
 	g_free(timestr);
 	g_free(params);
 }
 
+static void do_quiet_list(IRC_SERVER_REC *server, const char *channel, char *ban, char *setby, char *tims) {
+	char *timestr, *ago;
+
+	timestr = my_asctime((time_t) atoll(tims));
+	ago = time_ago((time_t) atoll(tims));
+
+	channel = get_visible_target(server, channel);
+	printformat(server, channel, MSGLEVEL_CRAP,
+		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
+		    channel, ban, setby, timestr, ago);
+
+	g_free(timestr);
+}
+
 static void event_quiet_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *ban, *setby, *tims, *timestr;
+	char *params, *ban, *setby, *tims;
 
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 6, NULL, &channel,
 				  NULL, &ban, &setby, &tims);
-	timestr = my_asctime((time_t) atol(tims));
+	do_quiet_list(server, channel, ban, setby, tims);
 
-	channel = get_visible_target(server, channel);
-	printformat(server, channel, MSGLEVEL_CRAP,
-		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
-		    channel, ban, setby, timestr);
-
-	g_free(timestr);
 	g_free(params);
 }
 
@@ -232,18 +278,19 @@ static void event_accept_list(IRC_SERVER_REC *server, const char *data)
 static void event_invite_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *invite, *setby, *tims, *timestr;
+	char *params, *invite, *setby, *tims, *timestr, *ago;
 
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 5, NULL, &channel, &invite,
 			&setby, &tims);
-	timestr = my_asctime((time_t) atol(tims));
+	timestr = my_asctime((time_t) atoll(tims));
+	ago = time_ago((time_t) atoll(tims));
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
 		    *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG,
-		    channel, invite, setby, timestr);
+		    channel, invite, setby, timestr, ago);
 
 	g_free(timestr);
 	g_free(params);
@@ -716,7 +763,7 @@ static void event_target_received(IRC_SERVER_REC *server, const char *data,
 static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *ban, *setby, *tims, *timestr;
+	char *params, *ban, *setby, *tims;
 
 	g_return_if_fail(data != NULL);
 
@@ -728,15 +775,9 @@ static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data)
 		event_target_received(server, data, NULL);
 		return;
 	}
-	channel = get_visible_target(server, channel);
 
-	timestr = my_asctime((time_t) atol(tims));
+	do_quiet_list(server, channel, ban, setby, tims);
 
-	printformat(server, channel, MSGLEVEL_CRAP,
-		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
-		    channel, ban, setby, timestr);
-
-	g_free(timestr);
 	g_free(params);
 }
 
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 2cd87e04..3ccf17f9 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -81,14 +81,14 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "bantype", "Ban type changed to {channel $0}", 1, { 0 } },
 	{ "no_bans", "No bans in channel {channel $0}", 1, { 0 } },
 	{ "banlist", "$0 - {channel $1}: ban {ban $2}", 3, { 1, 0, 0 } },
-        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, on $4}", 5, { 1, 0, 0, 0, 0 } },
+        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, on $4 ($5 ago)}", 6, { 1, 0, 0, 0, 0, 0 } },
 	{ "quietlist", "{channel $0}: quiet {ban $1}", 2, { 0, 0 } },
-        { "quietlist_long", "{channel $0}: quiet {ban $1} {comment by {nick $2}, on $3}", 4, { 0, 0, 0, 0 } },
+        { "quietlist_long", "{channel $0}: quiet {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } },
 	{ "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } },
-        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, on $3}", 4, { 0, 0, 0, 0 } },
+        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } },
 	{ "no_invitelist", "Invite list is empty in channel {channel $0}", 1, { 0 } },
 	{ "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } },
-	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, on $3}", 4, { 0, 0, 0, 0 } },
+	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
 	{ "server_help_start", "$1", 2, { 0, 0 } },

From ee1213481224275afb088518ad763d9f965697dc Mon Sep 17 00:00:00 2001
From: David Schultz <me@zpld.me>
Date: Mon, 27 Mar 2023 19:37:48 -0500
Subject: [PATCH 1536/1650] clean up `time_ago()`

Co-authored-by: Doug Freed <dwfreed@mtu.edu>
---
 src/fe-common/irc/fe-events-numeric.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 1126c2d2..81ae34e5 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -146,16 +146,12 @@ static char *time_ago(time_t seconds)
 
 	seconds = time(NULL) - seconds;
 
-	years = seconds/(86400*365);
-	seconds %= (86400*365);
-	weeks = seconds/604800;
-	seconds %= 604800;
-	days = seconds/86400;
-	seconds %= 86400;
-	hours = seconds/3600;
-	hours %= 3600;
-	minutes = seconds/60;
-	minutes %= 60;
+	years = seconds / (86400 * 365);
+	seconds %= (86400 * 365);
+	weeks = seconds / 604800;
+	days = (seconds / 86400) % 7;
+	hours = (seconds / 3600) % 24;
+	minutes = (seconds / 60) % 60;
 	seconds %= 60;
 
 	if (years)

From a09fcb90930c3f0d9e6bdf660dd01c451e817e46 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 28 Mar 2023 14:12:28 +0200
Subject: [PATCH 1537/1650] tag as 1.4.4

---
 NEWS | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/NEWS b/NEWS
index af46e8fc..63aea544 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+v1.4.4 2023-03-31  The Irssi team <staff@irssi.org>
+	* Expose location of signals.txt via pkg-config (codeberg!1,
+          #1439, #1446, #1447). By Andrej Kacian
+	+ Levels can now be inverted using `^' prefix in the /WINDOW
+	  (HIDE)LEVEL commands (#1428)
+	+ Support receiving monospace (#1370, #1442). By Linus
+	  Heckemann
+	- Fix config broken by /WINDOW LOGFILE without parameter
+          (#1392, #1432)
+	- Fix broken /LASTLOG -window switch (#1418, #1424, regression
+          introduced in #1398)
+	- Fix logic in how actions are printed for other protocols
+          (codeberg!3, #1454). By Andrej Kacian
+	- Fix stale special collector use after free (#1456). Reported
+          by ednash
+	- Help and message fixes (#1421, #1429, #1431, #1434, #1438,
+          #1452, #1453, #1455). Includes work by Jimmie Tyrrell and
+          Sven Grewe
+
 v1.4.3 2022-10-31  The Irssi team <staff@irssi.org>
 	- Fix freeze on Alt+arrows (#1416, #1417)
 	- Fix crash on /upgrade (#1399, #1419)

From 960d185b4234f8df80689e92ef5ae6131338ffed Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 31 Mar 2023 14:42:50 +0200
Subject: [PATCH 1538/1650] update level toggle help

---
 docs/help/in/window.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index 23316911..2566668b 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -53,7 +53,7 @@
 
    %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 
-   %|LEVEL and HIDELEVEL modify the currently set level. Without arguments, the current level is displayed. Levels listed starting with `+' are added to the current levels. Levels listed starting with `-' are removed from the current levels. To clear the levels, start the new level setting with `NONE'. Levels listed starting with `^' are either removed or added from the current setting, depending on whether they were previously set or not (since Irssi 1.5). Levels listed as is are also added to the current levels. Afterwards, the new level setting is displayed.
+   %|LEVEL and HIDELEVEL modify the currently set level. Without arguments, the current level is displayed. Levels listed starting with `+' are added to the current levels. Levels listed starting with `-' are removed from the current levels. To clear the levels, start the new level setting with `NONE'. Levels listed starting with `^' are either removed or added from the current setting, depending on whether they were previously set or not (since Irssi 1.4.4). Levels listed as is are also added to the current levels. Afterwards, the new level setting is displayed.
 
 %9Description:%9
 

From ca148a01224f63e6ad4281c6dcde3c9d08bd7cb0 Mon Sep 17 00:00:00 2001
From: Lukas Mai <lukasmai.403@gmail.com>
Date: Tue, 4 Apr 2023 11:14:19 +0200
Subject: [PATCH 1539/1650] expand ~ to $HOME in /upgrade

Fixes #1460.
---
 src/core/session.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/session.c b/src/core/session.c
index 5fe481fb..3a63a785 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -26,6 +26,7 @@
 #include <irssi/src/core/net-sendbuffer.h>
 #include <irssi/src/core/pidwait.h>
 #include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers.h>
@@ -59,13 +60,19 @@ void session_upgrade(void)
 static void cmd_upgrade(const char *data)
 {
 	CONFIG_REC *session;
-	char *session_file, *str;
+	char *session_file, *str, *name;
 	char *binary;
 
 	if (*data == '\0')
-		data = irssi_binary;
+		name = irssi_binary;
+	else
+		name = convert_home(data);
 
-	if ((binary = g_find_program_in_path(data)) == NULL)
+	binary = g_find_program_in_path(name);
+	if (name != irssi_binary)
+		g_free(name);
+
+	if (binary == NULL)
 		cmd_return_error(CMDERR_PROGRAM_NOT_FOUND);
 
 	/* save the session */

From a93c51796d0874c5d9968c88ecad443df4412e78 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 4 Apr 2023 15:18:54 +0200
Subject: [PATCH 1540/1650] update github workflows ubuntu

---
 .github/workflows/check.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 33582968..192e3204 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -34,12 +34,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-latest]
+        os: [ubuntu-20.04, ubuntu-latest]
         builder: [meson]
         compiler: [clang, gcc]
         flags: [regular]
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             builder: meson
             meson_ver: ==0.53.2
             setuptools_ver: <51

From c5df1c01ccb0f747af95c3b5993dfa7303b80c47 Mon Sep 17 00:00:00 2001
From: Score_Under <seejay.11@gmail.com>
Date: Sat, 15 Apr 2023 00:39:38 +0100
Subject: [PATCH 1541/1650] Print perl import warning to STDERR

Printing to STDOUT can interfere with programs which intend to produce
machine-readable output and yet for whatever reason import Irssi.pm from
outside of irssi.

Closes https://github.com/irssi/irssi/issues/1465
---
 src/perl/common/Irssi.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/common/Irssi.pm b/src/perl/common/Irssi.pm
index 786d0e52..bca0084b 100644
--- a/src/perl/common/Irssi.pm
+++ b/src/perl/common/Irssi.pm
@@ -153,7 +153,7 @@ eval {
 $in_irssi = $@ ? 0 : 1;
 
 if (!in_irssi()) {
-  print "Warning: This script should be run inside irssi\n";
+  print STDERR "Warning: This script should be run inside irssi\n";
 } else {
   bootstrap Irssi $VERSION if (!$static);
 

From 9e9858638d8ef9d5a642c3d4c0ce5107f9754472 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Thu, 4 May 2023 23:04:28 +0200
Subject: [PATCH 1542/1650] Fix logic in how own actions are printed for other
 protocols

When working with channels belonging to other, non-IRC protocols,
calling irc_channel_find() returns NULL, which makes irssi
use IRCTXT_OWN_ACTION_TARGET format, instead of the correct
IRCTXT_OWN_ACTION.

Using generic channel_find() instead fixes the issue.
---
 src/fe-common/irc/fe-irc-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 201e7ffa..89346648 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -173,7 +173,7 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
 	oldtarget = target;
 	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 	if (server_ischannel(SERVER(server), target))
-		item = irc_channel_find(server, target);
+		item = channel_find(SERVER(server), target);
 	else
 		item = irc_query_find(server, target);
 

From 0bcff291e9c1a9120ffbd6a84a20b7948e690ac1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 25 May 2023 11:36:25 +0200
Subject: [PATCH 1543/1650] order

---
 src/fe-common/irc/fe-events-numeric.c | 10 +++++-----
 src/fe-common/irc/module-formats.c    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 81ae34e5..667049cb 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -189,9 +189,9 @@ static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
-		    *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
-		    banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec)+1,
-		    channel, ban, setby, timestr, ago);
+	            *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
+	            banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec) + 1, channel, ban,
+	            setby, ago, timestr);
 
 	g_free(timestr);
 	g_free(params);
@@ -226,8 +226,8 @@ static void do_quiet_list(IRC_SERVER_REC *server, const char *channel, char *ban
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
-		    *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG,
-		    channel, ban, setby, timestr, ago);
+	            *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG, channel, ban, setby,
+	            ago, timestr);
 
 	g_free(timestr);
 }
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 3ccf17f9..86310157 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -81,11 +81,11 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "bantype", "Ban type changed to {channel $0}", 1, { 0 } },
 	{ "no_bans", "No bans in channel {channel $0}", 1, { 0 } },
 	{ "banlist", "$0 - {channel $1}: ban {ban $2}", 3, { 1, 0, 0 } },
-        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, on $4 ($5 ago)}", 6, { 1, 0, 0, 0, 0, 0 } },
+        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, on $5 ($4 ago)}", 6, { 1, 0, 0, 0, 0, 0 } },
 	{ "quietlist", "{channel $0}: quiet {ban $1}", 2, { 0, 0 } },
-        { "quietlist_long", "{channel $0}: quiet {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } },
+        { "quietlist_long", "{channel $0}: quiet {ban $1} {comment by {nick $2}, on $4 ($3 ago)}", 5, { 0, 0, 0, 0, 0 } },
 	{ "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } },
-        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } },
+        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, on $4 ($3 ago)}", 5, { 0, 0, 0, 0, 0 } },
 	{ "no_invitelist", "Invite list is empty in channel {channel $0}", 1, { 0 } },
 	{ "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } },
 	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } },

From 0355ed0bea5a993b49804b6d7a32588ade1a9b48 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 25 May 2023 11:42:15 +0200
Subject: [PATCH 1544/1650] format

---
 src/fe-common/irc/fe-events-numeric.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 667049cb..951bd31f 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -163,9 +163,9 @@ static char *time_ago(time_t seconds)
 	else if (hours)
 		snprintf(ret, sizeof(ret), "%luh %lum", hours, minutes);
 	else if (minutes)
-		snprintf(ret, sizeof(ret), "%lum %lus", minutes, (long unsigned)seconds);
+		snprintf(ret, sizeof(ret), "%lum %lus", minutes, (long unsigned) seconds);
 	else
-		snprintf(ret, sizeof(ret), "%lus", (long unsigned)seconds);
+		snprintf(ret, sizeof(ret), "%lus", (long unsigned) seconds);
 
 	return ret;
 }
@@ -211,14 +211,16 @@ static void event_eban_list(IRC_SERVER_REC *server, const char *data)
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
-		    *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG,
-		    channel, ban, setby, timestr, ago);
+	            *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG, channel, ban, setby,
+	            timestr, ago);
 
 	g_free(timestr);
 	g_free(params);
 }
 
-static void do_quiet_list(IRC_SERVER_REC *server, const char *channel, char *ban, char *setby, char *tims) {
+static void do_quiet_list(IRC_SERVER_REC *server, const char *channel, char *ban, char *setby,
+                          char *tims)
+{
 	char *timestr, *ago;
 
 	timestr = my_asctime((time_t) atoll(tims));
@@ -239,8 +241,7 @@ static void event_quiet_list(IRC_SERVER_REC *server, const char *data)
 
 	g_return_if_fail(data != NULL);
 
-	params = event_get_params(data, 6, NULL, &channel,
-				  NULL, &ban, &setby, &tims);
+	params = event_get_params(data, 6, NULL, &channel, NULL, &ban, &setby, &tims);
 	do_quiet_list(server, channel, ban, setby, tims);
 
 	g_free(params);
@@ -285,8 +286,8 @@ static void event_invite_list(IRC_SERVER_REC *server, const char *data)
 
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
-		    *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG,
-		    channel, invite, setby, timestr, ago);
+	            *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG, channel, invite,
+	            setby, timestr, ago);
 
 	g_free(timestr);
 	g_free(params);
@@ -763,8 +764,7 @@ static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data)
 
 	g_return_if_fail(data != NULL);
 
-	params = event_get_params(data, 5, NULL, &channel,
-				  &ban, &setby, &tims);
+	params = event_get_params(data, 5, NULL, &channel, &ban, &setby, &tims);
 
 	if (*tims == '\0') {
 		/* probably not a quiet list */

From 685816e9459a4c4c93f314222d5123467438e88a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 25 May 2023 11:48:31 +0200
Subject: [PATCH 1545/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 96886f6b..59566dc8 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 51
+#define IRSSI_ABI_VERSION 52
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 3ec05851a06eac761a9382175765923e45f30e6c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 4 Jul 2023 10:27:09 +0200
Subject: [PATCH 1546/1650] fix usage of $type in ExtUtils::ParseXS 3.50

---
 src/perl/common/typemap | 2 +-
 src/perl/irc/typemap    | 2 +-
 src/perl/textui/typemap | 2 +-
 src/perl/ui/typemap     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/perl/common/typemap b/src/perl/common/typemap
index 5b7e0c32..9b6c6668 100644
--- a/src/perl/common/typemap
+++ b/src/perl/common/typemap
@@ -28,5 +28,5 @@ T_IrssiObj
 	$arg = iobject_bless((SERVER_REC *)$var);
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 
diff --git a/src/perl/irc/typemap b/src/perl/irc/typemap
index 9bf87647..c8a9b678 100644
--- a/src/perl/irc/typemap
+++ b/src/perl/irc/typemap
@@ -36,5 +36,5 @@ T_DccObj
 	$arg = simple_iobject_bless((DCC_REC *)$var);
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 
diff --git a/src/perl/textui/typemap b/src/perl/textui/typemap
index 7710c2d2..e597c586 100644
--- a/src/perl/textui/typemap
+++ b/src/perl/textui/typemap
@@ -18,7 +18,7 @@ T_BufferLineWrapper
 OUTPUT
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 
 T_BufferLineWrapper
 	$arg = perl_buffer_line_bless($var);
diff --git a/src/perl/ui/typemap b/src/perl/ui/typemap
index 4afb273d..98355191 100644
--- a/src/perl/ui/typemap
+++ b/src/perl/ui/typemap
@@ -13,5 +13,5 @@ T_PlainObj
 OUTPUT
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 

From c93c61bf997ae98580fe3fecaaaf57186ba982ac Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 19 Jul 2023 20:04:25 +0200
Subject: [PATCH 1547/1650] update perl requirement in install file

---
 INSTALL     | 2 +-
 meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index c2e05416..69bd6aa8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ To compile Irssi you need:
 - meson-0.53 build system with ninja-1.8 or greater
 - glib-2.32 or greater
 - openssl (for ssl support)
-- perl-5.6 or greater (for Perl support)
+- perl-5.8 or greater (for building, and optionally Perl scripts)
 - terminfo or ncurses (for text frontend)
 
 For most people, this should work just fine:
diff --git a/meson.build b/meson.build
index c1698466..264718f2 100644
--- a/meson.build
+++ b/meson.build
@@ -402,7 +402,7 @@ int main()
   else
     xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
     if xsubpp_file_c == UNSET
-      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r', check : true).stdout()
+      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r', check : true).stdout()
     endif
     xsubpp = generator(build_perl,
       output : '@BASENAME@.c',

From 1131a881cffd2b83e9e42b424397cdd1aca53625 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 8 Aug 2023 07:59:31 +0200
Subject: [PATCH 1548/1650] change realpath to use syntax based on
 _POSIX_VERSION

---
 src/lib-config/write.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index 5dbbd1ed..b7c6edb5 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -305,6 +305,9 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	const char *base_name;
 	char *tmp_name = NULL;
 	char *dest_name = NULL;
+#if !defined(_POSIX_VERSION) || _POSIX_VERSION < 200809L
+	char resolved_path[PATH_MAX] = { 0 };
+#endif
 
 	g_return_val_if_fail(rec != NULL, -1);
         g_return_val_if_fail(fname != NULL || rec->fname != NULL, -1);
@@ -313,16 +316,15 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	base_name = fname != NULL ? fname : rec->fname;
 
 	/* expand all symlinks; else we may replace a symlink with a regular file */
-	dest_name = realpath(base_name, NULL);
-
-	if (errno == EINVAL) {
-		/* variable path length not supported by glibc < 2.3, Solaris < 11 */
-		char resolved_path[PATH_MAX] = { 0 };
-		errno = 0;
-		if ((dest_name = realpath(base_name, resolved_path)) != NULL) {
-			dest_name = g_strdup(dest_name);
-		}
+#if !defined(_POSIX_VERSION) || _POSIX_VERSION < 200809L
+	/* variable path length not supported by glibc < 2.3, Solaris < 11 */
+	errno = 0;
+	if ((dest_name = realpath(base_name, resolved_path)) != NULL) {
+		dest_name = g_strdup(dest_name);
 	}
+#else
+	dest_name = realpath(base_name, NULL);
+#endif
 
 	if (dest_name == NULL) {
 		if (errno == ENOENT) {

From c0db0b8cb81f696d3e40be59605319a77283ed58 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 10 Aug 2023 10:19:01 +0200
Subject: [PATCH 1549/1650] add explicit name_suffix to shared modules

---
 meson.build                              | 10 ++++++++++
 src/fe-common/irc/dcc/meson.build        |  1 +
 src/fe-common/irc/meson.build            |  1 +
 src/fe-common/irc/notifylist/meson.build |  1 +
 src/irc/core/meson.build                 |  1 +
 src/irc/dcc/meson.build                  |  1 +
 src/irc/flood/meson.build                |  1 +
 src/irc/notifylist/meson.build           |  1 +
 src/irc/proxy/meson.build                |  1 +
 src/otr/meson.build                      |  1 +
 src/perl/common/meson.build              |  1 +
 src/perl/irc/meson.build                 |  1 +
 src/perl/meson.build                     |  2 ++
 src/perl/textui/meson.build              |  1 +
 src/perl/ui/meson.build                  |  1 +
 15 files changed, 25 insertions(+)

diff --git a/meson.build b/meson.build
index 264718f2..07949e30 100644
--- a/meson.build
+++ b/meson.build
@@ -77,6 +77,16 @@ def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir)
 
 def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
 
+
+module_suffix = []
+perl_module_suffix = []
+# Meson uses the wrong module extensions on Mac.
+# https://gitlab.gnome.org/GNOME/glib/issues/520
+if ['darwin', 'ios'].contains(host_machine.system())
+  module_suffix = 'so'
+  perl_module_suffix = 'bundle'
+endif
+
 ##############
 # Help files #
 ##############
diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
index 50806e81..487d1aea 100644
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@@ -18,6 +18,7 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
   ],
   dependencies : dep)
 shared_module('fe_irc_dcc',
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_dcc,
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index 5af5528a..9b198e24 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -29,6 +29,7 @@ libfe_common_irc_a = static_library('fe_common_irc',
   ],
   dependencies : dep)
 shared_module('fe_common_irc',
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core,
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
index 1d42e147..0f9c4d68 100644
--- a/src/fe-common/irc/notifylist/meson.build
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -13,6 +13,7 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
   ],
   dependencies : dep)
 shared_module('fe_irc_notifylist',
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_notifylist,
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index b8c1bad9..81559f3e 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -39,6 +39,7 @@ libirc_core_a = static_library('irc_core',
   ],
   dependencies : dep)
 libirc_core_sm = shared_module('irc_core',
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_whole : libirc_core_a)
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
index 9c7e33d5..e5e2b0c6 100644
--- a/src/irc/dcc/meson.build
+++ b/src/irc/dcc/meson.build
@@ -13,6 +13,7 @@ libirc_dcc_sm = shared_module('irc_dcc',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core,
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
index 3c763beb..0ba94282 100644
--- a/src/irc/flood/meson.build
+++ b/src/irc/flood/meson.build
@@ -9,6 +9,7 @@ libirc_flood_a = static_library('irc_flood',
   implicit_include_directories : false,
   dependencies : dep)
 shared_module('irc_flood',
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core,
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
index ab664d16..212d68e5 100644
--- a/src/irc/notifylist/meson.build
+++ b/src/irc/notifylist/meson.build
@@ -10,6 +10,7 @@ libirc_notifylist_sm = shared_module('irc_notifylist',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core,
diff --git a/src/irc/proxy/meson.build b/src/irc/proxy/meson.build
index be91c7d5..30ac90a4 100644
--- a/src/irc/proxy/meson.build
+++ b/src/irc/proxy/meson.build
@@ -9,6 +9,7 @@ shared_module('irc_proxy',
   + [ irssi_version_h ],
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,
diff --git a/src/otr/meson.build b/src/otr/meson.build
index 10b9fa55..5b7d256f 100644
--- a/src/otr/meson.build
+++ b/src/otr/meson.build
@@ -11,6 +11,7 @@ shared_module('otr_core',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
index d3c98a88..5b174399 100644
--- a/src/perl/common/meson.build
+++ b/src/perl/common/meson.build
@@ -20,6 +20,7 @@ shared_module('Irssi',
   )
   + [ irssi_version_h ],
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi',
   include_directories : rootinc,
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index b65856ff..a95fd778 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -21,6 +21,7 @@ shared_module('Irc',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'Irc',
   include_directories : rootinc,
diff --git a/src/perl/meson.build b/src/perl/meson.build
index ad996acf..f859c7c4 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -33,6 +33,7 @@ libperl_core_sm = shared_module('perl_core',
   ],
   include_directories : [ rootinc ] + [ generated_files_inc ],
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   install_rpath : perl_rpath,
@@ -56,6 +57,7 @@ shared_module('fe_perl',
   ],
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
index e0b83dd3..23c8d458 100644
--- a/src/perl/textui/meson.build
+++ b/src/perl/textui/meson.build
@@ -17,6 +17,7 @@ shared_module('TextUI',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'TextUI',
   include_directories : rootinc,
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
index f9b8b41c..1577dcf6 100644
--- a/src/perl/ui/meson.build
+++ b/src/perl/ui/meson.build
@@ -15,6 +15,7 @@ shared_module('UI',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'UI',
   include_directories : rootinc,

From 96dbcef1666355d5b7cf0f2589e91dfaaa63e2f6 Mon Sep 17 00:00:00 2001
From: vague666 <jari.matilainen@gmail.com>
Date: Mon, 14 Aug 2023 11:35:06 +0200
Subject: [PATCH 1550/1650] patch by petteri_ to enable bash-like editing of
 window history

---
 src/fe-common/core/command-history.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 43d86354..ccb8bfd9 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -261,7 +261,12 @@ static const char *command_history_prev_int(WINDOW_REC *window, const char *text
 	if (*text != '\0' &&
 	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
 		/* save the old entry to history */
-		command_history_add(history, text);
+		if (pos != NULL && settings_get_bool("command_history_editable")) {
+			history_entry_destroy(pos->data);
+			pos->data = history_entry_new(history, text);
+		} else {
+			command_history_add(history, text);
+		}
 	}
 
 	return history->pos == NULL ? text : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
@@ -292,7 +297,12 @@ static const char *command_history_next_int(WINDOW_REC *window, const char *text
 	if (*text != '\0' &&
 	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
 		/* save the old entry to history */
-		command_history_add(history, text);
+		if (pos != NULL && settings_get_bool("command_history_editable")) {
+			history_entry_destroy(pos->data);
+			pos->data = history_entry_new(history, text);
+		} else {
+			command_history_add(history, text);
+		}
 	}
 	return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
 }
@@ -467,6 +477,7 @@ void command_history_init(void)
 {
 	settings_add_int("history", "max_command_history", 100);
 	settings_add_bool("history", "window_history", FALSE);
+	settings_add_bool("history", "command_history_editable", FALSE);
 
 	special_history_func_set(special_history_func);
 

From 3aa9734c1ca0a4b8fe498a04b3f9e9b418263a80 Mon Sep 17 00:00:00 2001
From: Emil Engler <me@emilengler.com>
Date: Mon, 14 Aug 2023 12:01:31 +0200
Subject: [PATCH 1551/1650] core: remove unused len variable

This commit removes the unused `len` variable, which gets set quite a
few times, but whose value is totally unused.

This also fixes a compiler warning I get on my Darwin.
---
 src/irc/core/netsplit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 38b63fe5..308a20d9 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -222,7 +222,7 @@ NETSPLIT_CHAN_REC *netsplit_find_channel(IRC_SERVER_REC *server,
 int quitmsg_is_split(const char *msg)
 {
 	const char *host2, *p;
-        int prev, len, host1_dot, host2_dot;
+        int prev, host1_dot, host2_dot;
 
 	g_return_val_if_fail(msg != NULL, FALSE);
 
@@ -242,7 +242,7 @@ int quitmsg_is_split(const char *msg)
 	     - can't contain ':' or '/' chars (some servers allow URLs)
 	   */
 	host2 = NULL;
-	prev = '\0'; len = 0; host1_dot = host2_dot = 0;
+	prev = '\0'; host1_dot = host2_dot = 0;
 	while (*msg != '\0') {
 		if (*msg == ' ') {
 			if (prev == '.' || prev == '\0') {
@@ -254,7 +254,7 @@ int quitmsg_is_split(const char *msg)
 				return FALSE; /* only one space allowed */
 			if (!host1_dot)
                                 return FALSE; /* host1 didn't have domain */
-                        host2 = msg+1; len = -1;
+                        host2 = msg+1;
 		} else if (*msg == '.') {
 			if (prev == '\0' || prev == ' ' || prev == '.') {
 				/* domains can't start with '.'
@@ -270,7 +270,7 @@ int quitmsg_is_split(const char *msg)
 			return FALSE;
 
 		prev = *msg;
-                msg++; len++;
+                msg++;
 	}
 
 	if (!host2_dot || prev == '.')

From a037f68f02777db5194bbd6042db535b921e28e9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 22 Aug 2023 22:28:36 +0200
Subject: [PATCH 1552/1650] stop crash on server add

reported by nsprra
---
 src/fe-common/core/fe-server.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index ab76c363..56acf020 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -101,8 +101,14 @@ static SERVER_SETUP_REC *create_server_setup(GHashTable *optlist)
 		}
 	}
 
-        server = rec->create_server_setup();
-        server->chat_type = rec->id;
+	if (rec == NULL) {
+		/* no protocols loaded, bail out */
+		signal_emit("chat protocol unknown", 1, "(none)");
+		return NULL;
+	}
+
+	server = rec->create_server_setup();
+	server->chat_type = rec->id;
 	server->tls_verify = TRUE;
 	return server;
 }

From 523a42e6f09c9a73219efa90960e1c90f5519619 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 4 Sep 2023 21:42:18 +0200
Subject: [PATCH 1553/1650] document meson apple workaround

workaround for https://github.com/mesonbuild/meson/issues/11165
---
 INSTALL                 | 8 ++++++++
 docs/meson-macos-ar.txt | 6 ++++++
 2 files changed, 14 insertions(+)
 create mode 100644 docs/meson-macos-ar.txt

diff --git a/INSTALL b/INSTALL
index 69bd6aa8..9c88325d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -108,3 +108,11 @@ would call:
 Getting perl scripting to work needs a few things:
 
  - TODO
+
+
+ Apple MacOS / Darwin
+
+At the time of writing, meson has an open issue with correctly linking
+libraries on macos.
+
+See docs/meson-macos-ar.txt for a workaround.
diff --git a/docs/meson-macos-ar.txt b/docs/meson-macos-ar.txt
new file mode 100644
index 00000000..77e5cb8e
--- /dev/null
+++ b/docs/meson-macos-ar.txt
@@ -0,0 +1,6 @@
+;; manual workaround for meson bug https://github.com/mesonbuild/meson/issues/11165
+;; fixes compilation with meson on apple macos
+;; usage: meson --native-file ./docs/meson-macos-ar.txt ...
+
+[binaries]
+ar = ['/bin/sh', '-c', 'ar=${AR:-ar}; ranlib=${RANLIB:-ranlib -c -}; case "x$1" in xcsr*) $ar "$@" && $ranlib "$2" || exit $?; ;; *) exec $ar "$@"; ;; esac;', 'ar']

From 9ab78d0160254fdf41588aca748a30022fb7c865 Mon Sep 17 00:00:00 2001
From: KindOne <20209685+RealKindOne@users.noreply.github.com>
Date: Sat, 9 Sep 2023 05:25:30 -0400
Subject: [PATCH 1554/1650] Add -notls and -notls_verify into help file and
 src/core/chat-commands.c

---
 docs/help/in/server.in   | 4 +++-
 src/core/chat-commands.c | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 47b2d524..84b5ad78 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -16,11 +16,13 @@
     -4:                 Connects using IPv4.
     -6:                 Connects using IPv6.
     -tls:               Connects using TLS encryption.
+    -notls:             Connect without TLS encrption.
     -tls_cert:          The TLS client certificate file.
     -tls_pkey:          The TLS client private key, if not included in the
                         certificate file.
     -tls_pass:          The password for the TLS client private key or certificate.
-    -tls_verify:        Verifies the TLS certificate of the server.
+    -tls_verify:        Verifies the TLS certificate of the server.	
+    -notls_verify:      Doesn't verify the TLS certificate of the server.
     -tls_cafile:        The file with the list of CA certificates.
     -tls_capath:        The directory which contains the CA certificates.
     -tls_ciphers:       TLS cipher suite preference lists.
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index a88a27ab..faeec451 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -211,8 +211,8 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }
 
-/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
-                  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls | -notls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+                  [-tls_pass <password>] [-tls_verify | -notls_verify] [-tls_cafile <cafile>]
                   [-tls_capath <capath>] [-tls_ciphers <list>]
                   [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
                   [-!] [-noautosendcmd] [-nocap]

From fe6013be42b9af94de3bb0e497a3ab135af2fb8e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 12 Sep 2023 13:51:36 +0200
Subject: [PATCH 1555/1650] improve code formatting

---
 src/irc/core/netsplit.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 308a20d9..4a902c9e 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -222,7 +222,7 @@ NETSPLIT_CHAN_REC *netsplit_find_channel(IRC_SERVER_REC *server,
 int quitmsg_is_split(const char *msg)
 {
 	const char *host2, *p;
-        int prev, host1_dot, host2_dot;
+	int prev, host1_dot, host2_dot;
 
 	g_return_val_if_fail(msg != NULL, FALSE);
 
@@ -242,7 +242,8 @@ int quitmsg_is_split(const char *msg)
 	     - can't contain ':' or '/' chars (some servers allow URLs)
 	   */
 	host2 = NULL;
-	prev = '\0'; host1_dot = host2_dot = 0;
+	prev = '\0';
+	host1_dot = host2_dot = 0;
 	while (*msg != '\0') {
 		if (*msg == ' ') {
 			if (prev == '.' || prev == '\0') {
@@ -254,7 +255,7 @@ int quitmsg_is_split(const char *msg)
 				return FALSE; /* only one space allowed */
 			if (!host1_dot)
                                 return FALSE; /* host1 didn't have domain */
-                        host2 = msg+1;
+			host2 = msg + 1;
 		} else if (*msg == '.') {
 			if (prev == '\0' || prev == ' ' || prev == '.') {
 				/* domains can't start with '.'
@@ -270,7 +271,7 @@ int quitmsg_is_split(const char *msg)
 			return FALSE;
 
 		prev = *msg;
-                msg++;
+		msg++;
 	}
 
 	if (!host2_dot || prev == '.')

From 4ceafbeea4e001af8cb752c1eeddd64551063ad2 Mon Sep 17 00:00:00 2001
From: Emil Engler <me@emilengler.com>
Date: Mon, 14 Aug 2023 11:56:39 +0200
Subject: [PATCH 1556/1650] fe-text: include the real tputs(3) from term.h

This commit includes the real `tpus(3)` function from the appropriate
`term.h` header file, if found.

This commit is necessary to fix a compiler warning on Darwin.
---
 src/fe-text/term-terminfo.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 5e9ead8a..06310cc9 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -30,6 +30,13 @@
 #include <termios.h>
 #include <stdio.h>
 
+#ifdef HAVE_TERM_H
+#include <term.h>
+#else
+/* TODO: This needs arguments, starting with C2X. */
+int tputs();
+#endif
+
 /* returns number of characters in the beginning of the buffer being a
    a single character, or -1 if more input is needed. The character will be
    saved in result */
@@ -314,9 +321,6 @@ inline static int term_putchar(int c)
         return fputc(c, current_term->out);
 }
 
-/* copied from terminfo-core.c */
-int tputs();
-
 static int termctl_set_color_24bit(int bg, unsigned int lc)
 {
 	static char buf[20];

From 8c2fa0687ea5761d51e2783d903b103a42cce076 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 13 Sep 2023 21:31:11 +0200
Subject: [PATCH 1557/1650] silence clang perl warning on affected version

---
 .github/workflows/check.yml | 3 +++
 meson.build                 | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 192e3204..f92e11e4 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -65,6 +65,9 @@ jobs:
           curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
       - name: unpack archive
         run: tar xaf artifact/irssi-*.tar.gz
+      - name: Setup local annotations
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: irssi-import/actions-irssi/problem-matchers@master
       - name: build and install with meson
         run: |
           # ninja install
diff --git a/meson.build b/meson.build
index 07949e30..0d06c466 100644
--- a/meson.build
+++ b/meson.build
@@ -390,6 +390,11 @@ if want_perl
   if perl_version == UNSET
     perl_version = run_command(cross_perl, '-V::version:', check : true).stdout().split('\'')[1]
   endif
+
+  # disable clang warning
+  if perl_version.version_compare('<5.35.2')
+    perl_cflags += cc.get_supported_arguments('-Wno-compound-token-split-by-macro')
+  endif
   perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
     version : perl_version)
 

From 4bc354d5e434300ca6c9362187627dd806b45273 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 13 Sep 2023 22:54:46 +0200
Subject: [PATCH 1558/1650] load all modules in the right order during check

---
 .github/workflows/check.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f92e11e4..276e513e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -96,9 +96,14 @@ jobs:
           ^set -clear log_day_changed
           ^set -clear log_open_string
           ^set log_timestamp * 
-          ^window log on' > irssi-test/startup
-          echo load perl >> irssi-test/startup
-          echo load proxy >> irssi-test/startup
-          echo ^quit >> irssi-test/startup
+          ^window log on
+          load irc
+          load dcc
+          load flood
+          load notifylist
+          load perl
+          load otr
+          load proxy
+          ^quit' > irssi-test/startup
           irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
           cat irc.log.*

From 7c5b2db26974c671e65055b9b6749bc538186afd Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Thu, 14 Sep 2023 15:21:55 +0200
Subject: [PATCH 1559/1650] add separate annotation-warnings step

see https://github.com/actions/runner/blob/2908d82845c018193655e68f3c20a5ad03bc0efd/src/Runner.Worker/Handlers/OutputManager.cs#L320
see https://github.com/actions/runner/issues/763#issuecomment-1435735340
---
 .github/workflows/check.yml | 55 +++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 276e513e..65f56b17 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -65,9 +65,6 @@ jobs:
           curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
       - name: unpack archive
         run: tar xaf artifact/irssi-*.tar.gz
-      - name: Setup local annotations
-        if: ${{ github.event_name == 'pull_request' }}
-        uses: irssi-import/actions-irssi/problem-matchers@master
       - name: build and install with meson
         run: |
           # ninja install
@@ -107,3 +104,55 @@ jobs:
           ^quit' > irssi-test/startup
           irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
           cat irc.log.*
+  annotation-warnings:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' }}
+    env:
+      CC: clang
+    steps:
+      - name: prepare required software
+        run: |
+          sudo apt update && sudo apt install $apt_build_deps
+      - uses: actions/checkout@main
+      - name: Setup local annotations
+        uses: irssi-import/actions-irssi/problem-matchers@master
+      - name: set PATH
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - name: prepare required software
+        env:
+          meson_ver: ${{ matrix.meson_ver }}
+          setuptools_ver: ${{ matrix.setuptools_ver }}
+        run: |
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_meson
+          eval "$get_pip_build_deps_meson"
+          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
+      - name: build and install with meson
+        run: |
+          meson Build $build_options_meson --prefix=${prefix/\~/~}
+          ninja -C Build
+          ninja -C Build install >/dev/null
+      - name: run launch test
+        env:
+          TERM: xterm
+        run: |
+          # automated irssi launch test
+          cd
+          mkdir irssi-test
+          echo 'echo automated irssi launch test
+          ^set settings_autosave off
+          ^set -clear log_close_string
+          ^set -clear log_day_changed
+          ^set -clear log_open_string
+          ^set log_timestamp * 
+          ^window log on
+          load irc
+          load dcc
+          load flood
+          load notifylist
+          load perl
+          load otr
+          load proxy
+          ^quit' > irssi-test/startup
+          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
+          cat irc.log.*

From dfca0a9f84b0191f891496c7bb0eacbd878a0416 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 22 Sep 2023 12:53:57 +0200
Subject: [PATCH 1560/1650] Restore locale after loading Perl

---
 src/perl/irssi-core.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/perl/irssi-core.pl b/src/perl/irssi-core.pl
index cf987b31..880bd6a3 100644
--- a/src/perl/irssi-core.pl
+++ b/src/perl/irssi-core.pl
@@ -50,3 +50,10 @@ sub eval_file {
     die "cap_sasl has been unloaded from Irssi ".Irssi::version()." because it conflicts with the built-in SASL support. See /help network for configuring SASL or read the ChangeLog for more information.";
   }
 }
+
+if ( $] >= 5.037005 && $] <= 5.038000 ) {
+  # https://github.com/Perl/perl5/issues/21366
+  print STDERR "\e7 \e[A Irssi: applying locale workaround for Perl 5.38.0 \e8";
+  require POSIX;
+  POSIX::setlocale(&POSIX::LC_ALL, "");
+}

From 160c2401a5ad424662d58181da133be60d153489 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 31 Mar 2023 12:43:36 +0000
Subject: [PATCH 1561/1650] Merge pull request #1458 from
 ailin-nemui/help-toglev

update level toggle help

(cherry picked from commit c6ad171fe93573d73bb0ffad0e66de935c54ec15)
---
 docs/help/in/window.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index 23316911..2566668b 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -53,7 +53,7 @@
 
    %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 
-   %|LEVEL and HIDELEVEL modify the currently set level. Without arguments, the current level is displayed. Levels listed starting with `+' are added to the current levels. Levels listed starting with `-' are removed from the current levels. To clear the levels, start the new level setting with `NONE'. Levels listed starting with `^' are either removed or added from the current setting, depending on whether they were previously set or not (since Irssi 1.5). Levels listed as is are also added to the current levels. Afterwards, the new level setting is displayed.
+   %|LEVEL and HIDELEVEL modify the currently set level. Without arguments, the current level is displayed. Levels listed starting with `+' are added to the current levels. Levels listed starting with `-' are removed from the current levels. To clear the levels, start the new level setting with `NONE'. Levels listed starting with `^' are either removed or added from the current setting, depending on whether they were previously set or not (since Irssi 1.4.4). Levels listed as is are also added to the current levels. Afterwards, the new level setting is displayed.
 
 %9Description:%9
 

From 6b65492b65382215fc4eae047b024077a53ce0cc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Apr 2023 13:12:50 +0000
Subject: [PATCH 1562/1650] Merge pull request #1462 from
 mauke/upgrade-tilde-expand

expand ~ to $HOME in /upgrade

(cherry picked from commit 5c42345ea23a96bd0fbc28036af36e5db45d6059)
---
 src/core/session.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/session.c b/src/core/session.c
index 5fe481fb..3a63a785 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -26,6 +26,7 @@
 #include <irssi/src/core/net-sendbuffer.h>
 #include <irssi/src/core/pidwait.h>
 #include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers.h>
@@ -59,13 +60,19 @@ void session_upgrade(void)
 static void cmd_upgrade(const char *data)
 {
 	CONFIG_REC *session;
-	char *session_file, *str;
+	char *session_file, *str, *name;
 	char *binary;
 
 	if (*data == '\0')
-		data = irssi_binary;
+		name = irssi_binary;
+	else
+		name = convert_home(data);
 
-	if ((binary = g_find_program_in_path(data)) == NULL)
+	binary = g_find_program_in_path(name);
+	if (name != irssi_binary)
+		g_free(name);
+
+	if (binary == NULL)
 		cmd_return_error(CMDERR_PROGRAM_NOT_FOUND);
 
 	/* save the session */

From 8afbd6511c095319406a37df16345ebb3d2f1449 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 15 Apr 2023 14:08:31 +0000
Subject: [PATCH 1563/1650] Merge pull request #1467 from
 ScoreUnder/perl_warning_to_stderr

Print perl import warning to STDERR

(cherry picked from commit e732b601f7edd24b268051a8b6d62b8c7f1d9c82)
---
 src/perl/common/Irssi.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/common/Irssi.pm b/src/perl/common/Irssi.pm
index 786d0e52..bca0084b 100644
--- a/src/perl/common/Irssi.pm
+++ b/src/perl/common/Irssi.pm
@@ -153,7 +153,7 @@ eval {
 $in_irssi = $@ ? 0 : 1;
 
 if (!in_irssi()) {
-  print "Warning: This script should be run inside irssi\n";
+  print STDERR "Warning: This script should be run inside irssi\n";
 } else {
   bootstrap Irssi $VERSION if (!$static);
 

From 7f67b5deb0ea59e866df4f3ec57b4fda62512aca Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 25 May 2023 11:00:40 +0000
Subject: [PATCH 1564/1650] Merge pull request #1471 from irssi/from-codeberg

Sync

(cherry picked from commit 274977a5879ca71d1a9b7ea7ce2f980325511a18)
---
 src/fe-common/irc/fe-irc-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 1419f934..5d820bbf 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -173,7 +173,7 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
 	oldtarget = target;
 	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 	if (server_ischannel(SERVER(server), target))
-		item = irc_channel_find(server, target);
+		item = channel_find(SERVER(server), target);
 	else
 		item = irc_query_find(server, target);
 

From 7f32ed012cc05b765b07f552b8cf2bcf3bd2730d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 18 Jul 2023 22:05:28 +0000
Subject: [PATCH 1565/1650] Merge pull request #1474 from ailin-nemui/perl5380

fix usage of $type in ExtUtils::ParseXS 3.50

(cherry picked from commit da49ec62e6cc949d3e5359b88abbd0b038d3e23a)
---
 src/perl/common/typemap | 2 +-
 src/perl/irc/typemap    | 2 +-
 src/perl/textui/typemap | 2 +-
 src/perl/ui/typemap     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/perl/common/typemap b/src/perl/common/typemap
index 5b7e0c32..9b6c6668 100644
--- a/src/perl/common/typemap
+++ b/src/perl/common/typemap
@@ -28,5 +28,5 @@ T_IrssiObj
 	$arg = iobject_bless((SERVER_REC *)$var);
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 
diff --git a/src/perl/irc/typemap b/src/perl/irc/typemap
index 9bf87647..c8a9b678 100644
--- a/src/perl/irc/typemap
+++ b/src/perl/irc/typemap
@@ -36,5 +36,5 @@ T_DccObj
 	$arg = simple_iobject_bless((DCC_REC *)$var);
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 
diff --git a/src/perl/textui/typemap b/src/perl/textui/typemap
index 7710c2d2..e597c586 100644
--- a/src/perl/textui/typemap
+++ b/src/perl/textui/typemap
@@ -18,7 +18,7 @@ T_BufferLineWrapper
 OUTPUT
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 
 T_BufferLineWrapper
 	$arg = perl_buffer_line_bless($var);
diff --git a/src/perl/ui/typemap b/src/perl/ui/typemap
index 4afb273d..98355191 100644
--- a/src/perl/ui/typemap
+++ b/src/perl/ui/typemap
@@ -13,5 +13,5 @@ T_PlainObj
 OUTPUT
 
 T_PlainObj
-	$arg = plain_bless($var, \"$type\");
+	$arg = plain_bless($var, \"$ntype\");
 

From edfbc1f2f67eeb881673b0d83bd42e8afe89c4bf Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 19 Jul 2023 18:26:45 +0000
Subject: [PATCH 1566/1650] Merge pull request #1478 from ailin-nemui/buildperl

update perl requirement in install file

(cherry picked from commit 3f203dc3822b5f357fb3f64ce9020cf4ca367f46)
---
 INSTALL     | 2 +-
 meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 3dbe2ebd..376960d1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ To compile Irssi you need:
 - meson-0.49 build system with ninja-1.5 or greater
 - glib-2.32 or greater
 - openssl (for ssl support)
-- perl-5.6 or greater (for Perl support)
+- perl-5.8 or greater (for building, and optionally Perl scripts)
 - terminfo or ncurses (for text frontend)
 
 For most people, this should work just fine:
diff --git a/meson.build b/meson.build
index 1a8c23f3..064376c4 100644
--- a/meson.build
+++ b/meson.build
@@ -394,7 +394,7 @@ int main()
   else
     xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
     if xsubpp_file_c == UNSET
-      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
+      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r').stdout()
     endif
     xsubpp = generator(build_perl,
       output : '@BASENAME@.c',

From 590ca4dbdf5e6629c908091896d113473559cda0 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:52:16 +0000
Subject: [PATCH 1567/1650] Merge pull request #1484 from ailin-nemui/realposix

change realpath to use syntax based on _POSIX_VERSION

(cherry picked from commit f9c9485d155c1b0545fb30b0d2d6d884079b2f76)
---
 src/lib-config/write.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index 5dbbd1ed..b7c6edb5 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -305,6 +305,9 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	const char *base_name;
 	char *tmp_name = NULL;
 	char *dest_name = NULL;
+#if !defined(_POSIX_VERSION) || _POSIX_VERSION < 200809L
+	char resolved_path[PATH_MAX] = { 0 };
+#endif
 
 	g_return_val_if_fail(rec != NULL, -1);
         g_return_val_if_fail(fname != NULL || rec->fname != NULL, -1);
@@ -313,16 +316,15 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
 	base_name = fname != NULL ? fname : rec->fname;
 
 	/* expand all symlinks; else we may replace a symlink with a regular file */
-	dest_name = realpath(base_name, NULL);
-
-	if (errno == EINVAL) {
-		/* variable path length not supported by glibc < 2.3, Solaris < 11 */
-		char resolved_path[PATH_MAX] = { 0 };
-		errno = 0;
-		if ((dest_name = realpath(base_name, resolved_path)) != NULL) {
-			dest_name = g_strdup(dest_name);
-		}
+#if !defined(_POSIX_VERSION) || _POSIX_VERSION < 200809L
+	/* variable path length not supported by glibc < 2.3, Solaris < 11 */
+	errno = 0;
+	if ((dest_name = realpath(base_name, resolved_path)) != NULL) {
+		dest_name = g_strdup(dest_name);
 	}
+#else
+	dest_name = realpath(base_name, NULL);
+#endif
 
 	if (dest_name == NULL) {
 		if (errno == ENOENT) {

From 5a0dc0db093b11e7c2c5fcfb5f68165f566863cb Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 12 Sep 2023 14:53:59 +0000
Subject: [PATCH 1568/1650] Merge pull request #1488 from
 emilengler/remove-unused-var

core: remove unused len variable
(cherry picked from commit f04375668c569b1a8ded8a127f9e3d9ffe8f019d)
---
 src/irc/core/netsplit.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 38b63fe5..4a902c9e 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -222,7 +222,7 @@ NETSPLIT_CHAN_REC *netsplit_find_channel(IRC_SERVER_REC *server,
 int quitmsg_is_split(const char *msg)
 {
 	const char *host2, *p;
-        int prev, len, host1_dot, host2_dot;
+	int prev, host1_dot, host2_dot;
 
 	g_return_val_if_fail(msg != NULL, FALSE);
 
@@ -242,7 +242,8 @@ int quitmsg_is_split(const char *msg)
 	     - can't contain ':' or '/' chars (some servers allow URLs)
 	   */
 	host2 = NULL;
-	prev = '\0'; len = 0; host1_dot = host2_dot = 0;
+	prev = '\0';
+	host1_dot = host2_dot = 0;
 	while (*msg != '\0') {
 		if (*msg == ' ') {
 			if (prev == '.' || prev == '\0') {
@@ -254,7 +255,7 @@ int quitmsg_is_split(const char *msg)
 				return FALSE; /* only one space allowed */
 			if (!host1_dot)
                                 return FALSE; /* host1 didn't have domain */
-                        host2 = msg+1; len = -1;
+			host2 = msg + 1;
 		} else if (*msg == '.') {
 			if (prev == '\0' || prev == ' ' || prev == '.') {
 				/* domains can't start with '.'
@@ -270,7 +271,7 @@ int quitmsg_is_split(const char *msg)
 			return FALSE;
 
 		prev = *msg;
-                msg++; len++;
+		msg++;
 	}
 
 	if (!host2_dot || prev == '.')

From 1226a587b729866027f962eefaba59bfece573e4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 6 Sep 2023 14:04:20 +0000
Subject: [PATCH 1569/1650] Merge pull request #1492 from
 ailin-nemui/meson-apple

document meson apple workaround

(cherry picked from commit 8c8e4e34d48c4f9bc830f88f6dbb7c6cc6861ac9)
---
 INSTALL                 | 8 ++++++++
 docs/meson-macos-ar.txt | 6 ++++++
 2 files changed, 14 insertions(+)
 create mode 100644 docs/meson-macos-ar.txt

diff --git a/INSTALL b/INSTALL
index 376960d1..9c6245a1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -144,3 +144,11 @@ Getting perl scripting to work needs a few things:
    It doesn't hurt to be defined everywhere, so configure irssi with:
 
      CFLAGS='-DUSEIMPORTLIB' ./configure --with-perl-staticlib
+
+
+ Apple MacOS / Darwin
+
+At the time of writing, meson has an open issue with correctly linking
+libraries on macos.
+
+See docs/meson-macos-ar.txt for a workaround.
diff --git a/docs/meson-macos-ar.txt b/docs/meson-macos-ar.txt
new file mode 100644
index 00000000..77e5cb8e
--- /dev/null
+++ b/docs/meson-macos-ar.txt
@@ -0,0 +1,6 @@
+;; manual workaround for meson bug https://github.com/mesonbuild/meson/issues/11165
+;; fixes compilation with meson on apple macos
+;; usage: meson --native-file ./docs/meson-macos-ar.txt ...
+
+[binaries]
+ar = ['/bin/sh', '-c', 'ar=${AR:-ar}; ranlib=${RANLIB:-ranlib -c -}; case "x$1" in xcsr*) $ar "$@" && $ranlib "$2" || exit $?; ;; *) exec $ar "$@"; ;; esac;', 'ar']

From db4dad3dd0bc7185c862016ae9fc92bc132b9cef Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 12 Sep 2023 11:27:03 +0000
Subject: [PATCH 1570/1650] Merge pull request #1493 from ailin-nemui/macsuffix

add explicit name_suffix to shared modules

(cherry picked from commit f1c9fb4296f1f2795d61b031302bfd9fe1fc7d6b)
---
 meson.build                 | 10 ++++++++++
 src/irc/proxy/meson.build   |  1 +
 src/otr/meson.build         |  1 +
 src/perl/common/meson.build |  1 +
 src/perl/irc/meson.build    |  1 +
 src/perl/meson.build        |  2 ++
 src/perl/textui/meson.build |  1 +
 src/perl/ui/meson.build     |  1 +
 8 files changed, 18 insertions(+)

diff --git a/meson.build b/meson.build
index 064376c4..700fac21 100644
--- a/meson.build
+++ b/meson.build
@@ -73,6 +73,16 @@ def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir)
 
 def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
 
+
+module_suffix = []
+perl_module_suffix = []
+# Meson uses the wrong module extensions on Mac.
+# https://gitlab.gnome.org/GNOME/glib/issues/520
+if ['darwin', 'ios'].contains(host_machine.system())
+  module_suffix = 'so'
+  perl_module_suffix = 'bundle'
+endif
+
 ##############
 # Help files #
 ##############
diff --git a/src/irc/proxy/meson.build b/src/irc/proxy/meson.build
index be91c7d5..30ac90a4 100644
--- a/src/irc/proxy/meson.build
+++ b/src/irc/proxy/meson.build
@@ -9,6 +9,7 @@ shared_module('irc_proxy',
   + [ irssi_version_h ],
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,
diff --git a/src/otr/meson.build b/src/otr/meson.build
index 10b9fa55..5b7d256f 100644
--- a/src/otr/meson.build
+++ b/src/otr/meson.build
@@ -11,6 +11,7 @@ shared_module('otr_core',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
index f2a69bc9..4162756b 100644
--- a/src/perl/common/meson.build
+++ b/src/perl/common/meson.build
@@ -20,6 +20,7 @@ libperl_Irssi_a = shared_module('Irssi',
   )
   + [ irssi_version_h ],
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi',
   include_directories : rootinc,
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index 0a8fd9f9..c83d4b49 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -21,6 +21,7 @@ libperl_Irssi_Irc_a = shared_module('Irc',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'Irc',
   include_directories : rootinc,
diff --git a/src/perl/meson.build b/src/perl/meson.build
index d81173d9..0ae1ec26 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -34,6 +34,7 @@ libperl_core_a = shared_module('perl_core',
   ],
   include_directories : [ rootinc ] + [ generated_files_inc ],
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   install_rpath : perl_rpath,
@@ -57,6 +58,7 @@ libfe_perl_a = shared_module('fe_perl',
   ],
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
index 1705fa36..429e988e 100644
--- a/src/perl/textui/meson.build
+++ b/src/perl/textui/meson.build
@@ -17,6 +17,7 @@ libperl_Irssi_TextUI_a = shared_module('TextUI',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'TextUI',
   include_directories : rootinc,
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
index 14bc7699..26ef42eb 100644
--- a/src/perl/ui/meson.build
+++ b/src/perl/ui/meson.build
@@ -15,6 +15,7 @@ libperl_Irssi_UI_a = shared_module('UI',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'UI',
   include_directories : rootinc,

From 7145e1ef20957c6aab6b9109108accadebc31c64 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sat, 9 Sep 2023 11:00:37 +0000
Subject: [PATCH 1571/1650] Merge pull request #1494 from RealKindOne/master

Add -notls and -notls_verify into help file and src/core/chat-commands.c

(cherry picked from commit e7f1268478dc07e356e7fc0d79b3f810f4d05e8f)
---
 docs/help/in/server.in   | 4 +++-
 src/core/chat-commands.c | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 47b2d524..84b5ad78 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -16,11 +16,13 @@
     -4:                 Connects using IPv4.
     -6:                 Connects using IPv6.
     -tls:               Connects using TLS encryption.
+    -notls:             Connect without TLS encrption.
     -tls_cert:          The TLS client certificate file.
     -tls_pkey:          The TLS client private key, if not included in the
                         certificate file.
     -tls_pass:          The password for the TLS client private key or certificate.
-    -tls_verify:        Verifies the TLS certificate of the server.
+    -tls_verify:        Verifies the TLS certificate of the server.	
+    -notls_verify:      Doesn't verify the TLS certificate of the server.
     -tls_cafile:        The file with the list of CA certificates.
     -tls_capath:        The directory which contains the CA certificates.
     -tls_ciphers:       TLS cipher suite preference lists.
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index a88a27ab..faeec451 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -211,8 +211,8 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }
 
-/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
-                  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls | -notls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+                  [-tls_pass <password>] [-tls_verify | -notls_verify] [-tls_cafile <cafile>]
                   [-tls_capath <capath>] [-tls_ciphers <list>]
                   [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
                   [-!] [-noautosendcmd] [-nocap]

From 91593cfec39725d8505ef3f7fbb885073972b534 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 13 Sep 2023 20:55:21 +0000
Subject: [PATCH 1572/1650] Merge pull request #1495 from
 ailin-nemui/terminclude

fe-text: include the real tputs(3) from term.h
(cherry picked from commit db32744ee42ff30cfa710d32ef1c8bbc6f2ff9a1)
---
 src/fe-text/term-terminfo.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 78496a64..9902bc03 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -30,6 +30,13 @@
 #include <termios.h>
 #include <stdio.h>
 
+#ifdef HAVE_TERM_H
+#include <term.h>
+#else
+/* TODO: This needs arguments, starting with C2X. */
+int tputs();
+#endif
+
 /* returns number of characters in the beginning of the buffer being a
    a single character, or -1 if more input is needed. The character will be
    saved in result */
@@ -314,9 +321,6 @@ inline static int term_putchar(int c)
         return fputc(c, current_term->out);
 }
 
-/* copied from terminfo-core.c */
-int tputs();
-
 static int termctl_set_color_24bit(int bg, unsigned int lc)
 {
 	static char buf[20];

From 6438fcfe70712a019138cd0b4321867db74418e8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 1 Oct 2023 11:31:07 +0000
Subject: [PATCH 1573/1650] Merge pull request #1498 from
 ailin-nemui/perl5380locale

Restore locale after loading Perl

(cherry picked from commit 48bc90eb17ec3c6549afd69c5d6f16d07fd57db0)
---
 src/perl/irssi-core.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/perl/irssi-core.pl b/src/perl/irssi-core.pl
index 46066a38..0999de9e 100644
--- a/src/perl/irssi-core.pl
+++ b/src/perl/irssi-core.pl
@@ -52,3 +52,10 @@ sub eval_file {
     die "cap_sasl has been unloaded from Irssi ".Irssi::version()." because it conflicts with the built-in SASL support. See /help network for configuring SASL or read the ChangeLog for more information.";
   }
 }
+
+if ( $] >= 5.037005 && $] <= 5.038000 ) {
+  # https://github.com/Perl/perl5/issues/21366
+  print STDERR "\e7 \e[A Irssi: applying locale workaround for Perl 5.38.0 \e8";
+  require POSIX;
+  POSIX::setlocale(&POSIX::LC_ALL, "");
+}

From ce4dd911bc6e8fdf819c8b40365855f9bab3a7ec Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:32:44 +0000
Subject: [PATCH 1574/1650] Merge pull request #1497 from
 ailin-nemui/github-workflow-error

Slightly improve GitHub workflow

(cherry picked from commit 2a1291f26f6dc47b1d3169d18faba8f995bd3ea6)
---
 .github/workflows/check.yml | 57 ++++++++++++++++++++++++++++++++++---
 meson.build                 |  5 ++++
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 97cb3feb..3e324649 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -114,9 +114,58 @@ jobs:
           ^set -clear log_day_changed
           ^set -clear log_open_string
           ^set log_timestamp * 
-          ^window log on' > irssi-test/startup
-          echo load perl >> irssi-test/startup
-          echo load proxy >> irssi-test/startup
-          echo ^quit >> irssi-test/startup
+          ^window log on
+          load perl
+          load otr
+          load proxy
+          ^quit' > irssi-test/startup
+          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
+          cat irc.log.*
+  annotation-warnings:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' }}
+    env:
+      CC: clang
+    steps:
+      - name: prepare required software
+        run: |
+          sudo apt update && sudo apt install $apt_build_deps
+      - uses: actions/checkout@main
+      - name: Setup local annotations
+        uses: irssi-import/actions-irssi/problem-matchers@master
+      - name: set PATH
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - name: prepare required software
+        env:
+          meson_ver: ${{ matrix.meson_ver }}
+          setuptools_ver: ${{ matrix.setuptools_ver }}
+        run: |
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_meson
+          eval "$get_pip_build_deps_meson"
+          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
+      - name: build and install with meson
+        run: |
+          meson Build $build_options_meson --prefix=${prefix/\~/~}
+          ninja -C Build
+          ninja -C Build install >/dev/null
+      - name: run launch test
+        env:
+          TERM: xterm
+        run: |
+          # automated irssi launch test
+          cd
+          mkdir irssi-test
+          echo 'echo automated irssi launch test
+          ^set settings_autosave off
+          ^set -clear log_close_string
+          ^set -clear log_day_changed
+          ^set -clear log_open_string
+          ^set log_timestamp * 
+          ^window log on
+          load perl
+          load otr
+          load proxy
+          ^quit' > irssi-test/startup
           irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
           cat irc.log.*
diff --git a/meson.build b/meson.build
index 700fac21..b6ab6178 100644
--- a/meson.build
+++ b/meson.build
@@ -382,6 +382,11 @@ if want_perl
   if perl_version == UNSET
     perl_version = run_command(cross_perl, '-V::version:').stdout().split('\'')[1]
   endif
+
+  # disable clang warning
+  if perl_version.version_compare('<5.35.2')
+    perl_cflags += cc.get_supported_arguments('-Wno-compound-token-split-by-macro')
+  endif
   perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
     version : perl_version)
 

From bcf07a2546b5adfecf0df56553f2e8be0920c6c5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 1 Oct 2023 15:46:01 +0200
Subject: [PATCH 1575/1650] tag as 1.4.5

---
 NEWS         | 21 +++++++++++++++++++++
 configure.ac |  2 +-
 meson.build  |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 63aea544..204d8f32 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+v1.4.5 2023-10-03  The Irssi team <staff@irssi.org>
+	+ Add workaround for Perl 5.38.0 bug that breaks the Irssi
+          locale and glyph rendering (scripts.irssi.org#857, #1498)
+	- Fix Perl scripts broken by Perl 5.38 (scripts.irssi.org#851,
+          #1474). With input from Leon Timmermans
+	- Document workaround to fix linker errors when building with
+          meson on Apple (#1435, #1492)
+	- Fix meson using wrong filenames on Apple, leading to broken
+          Perl support (#1483, #1493)
+	- Fix /upgrade not accepting `~' (#1460, #1462). By Lukas Mai 
+	- Improve compatibility with Perl5-IDEA (#1465, #1467). By
+          Charlie Daffern
+	- Fix logic in how own actions are printed for other protocols
+          (codeberg!5, #1471). By Andrej Kacian
+	- Fix crash on old PowerPC Mac (#1482, #1484)
+	- Fix wrong prototype of library function used in terminal
+          handling (#1495). By Emil Engler
+	- Minor cleanups (#1488, #1497). Includes work by Emil Engler
+	- Minor help and documentation fixes (#1458, #1494, #1477,
+          #1478). Includes work by KindOne
+
 v1.4.4 2023-03-31  The Irssi team <staff@irssi.org>
 	* Expose location of signals.txt via pkg-config (codeberg!1,
           #1439, #1446, #1447). By Andrej Kacian
diff --git a/configure.ac b/configure.ac
index 5c5ba3c6..9a5c2521 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.4.4)
+AC_INIT(irssi, 1.4.5)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index b6ab6178..99809868 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.4.4',
+  version : '1.4.5',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From ea434591f4576e231a49b8b4df979ac360bf94aa Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:58:14 +0100
Subject: [PATCH 1576/1650] Add SET window_default_ to See also in window help

---
 docs/help/in/window.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/window.in b/docs/help/in/window.in
index 2566668b..5a8ecbd0 100644
--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@@ -74,5 +74,5 @@
     /WINDOW HIDELEVEL ^JOINS ^PARTS ^QUITS
     /WINDOW LOGFILE ~/logs/notices.log
 
-%9See also:%9 JOIN, LEVELS, LOG, QUERY
+%9See also:%9 JOIN, LEVELS, LOG, QUERY, SET window_default_level, SET window_default_hidelevel
 

From ed2825f28b77f61af6714a57a5543d4b83f45011 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Sat, 11 Nov 2023 02:13:34 +0100
Subject: [PATCH 1577/1650] Update bind.in

Better explanation for upper-/lowercase usage for keys
---
 docs/help/in/bind.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/bind.in b/docs/help/in/bind.in
index 8fcc744b..761d971e 100644
--- a/docs/help/in/bind.in
+++ b/docs/help/in/bind.in
@@ -17,13 +17,15 @@ Details:
     Adds or removes a binding; the binding itself is case-sensitive and may
     contain as many characters as you want.
 
-    Uppercase characters usually indicate that you need to keep the shift-key
-    pressed to use the binding.
+    Key bindings are case sensitive so uppercase letters mean you also have
+    to use the shift key, except for ctrl which does not support shift but
+    the keys must always be typed in uppercase.
 
 %9Examples:%9
 
     /BIND
     /BIND meta-c /CLEAR
+    /BIND meta-C /CYCLE
     /BIND meta-q change_window 16
     /BIND -delete meta-y
     /BIND ^W^C /WINDOW NEW HIDE

From a11df816b729c8ffdd57c27969dda992c3d934f5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 19 Dec 2023 13:51:46 +0100
Subject: [PATCH 1578/1650] explicitly list pkg-config as build dependency,
 since meson needs it to find glib

---
 INSTALL | 1 +
 1 file changed, 1 insertion(+)

diff --git a/INSTALL b/INSTALL
index 9c88325d..ed5a14a3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,6 +5,7 @@
 To compile Irssi you need:
 
 - meson-0.53 build system with ninja-1.8 or greater
+- pkg-config (or compatible)
 - glib-2.32 or greater
 - openssl (for ssl support)
 - perl-5.8 or greater (for building, and optionally Perl scripts)

From 514f1cdcf6e0c8c6d09d47481e7583eed0d11393 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 22 Dec 2023 13:03:28 +0100
Subject: [PATCH 1579/1650] Revert "Merge pull request #1498 from
 ailin-nemui/perl5380locale"

This reverts commit 48bc90eb17ec3c6549afd69c5d6f16d07fd57db0, reversing
changes made to 2a1291f26f6dc47b1d3169d18faba8f995bd3ea6.
---
 src/perl/irssi-core.pl | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/perl/irssi-core.pl b/src/perl/irssi-core.pl
index 880bd6a3..cf987b31 100644
--- a/src/perl/irssi-core.pl
+++ b/src/perl/irssi-core.pl
@@ -50,10 +50,3 @@ sub eval_file {
     die "cap_sasl has been unloaded from Irssi ".Irssi::version()." because it conflicts with the built-in SASL support. See /help network for configuring SASL or read the ChangeLog for more information.";
   }
 }
-
-if ( $] >= 5.037005 && $] <= 5.038000 ) {
-  # https://github.com/Perl/perl5/issues/21366
-  print STDERR "\e7 \e[A Irssi: applying locale workaround for Perl 5.38.0 \e8";
-  require POSIX;
-  POSIX::setlocale(&POSIX::LC_ALL, "");
-}

From a0caf5e5e64fff9c7f0274800d1fca34b63fcc7a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 22 Dec 2023 13:03:24 +0100
Subject: [PATCH 1580/1650] restore locale if perl breaks it

---
 src/perl/perl-core.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 79d5c13c..fe52874a 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -90,24 +90,41 @@ static void xs_init(pTHX)
 void perl_scripts_init(void)
 {
 	char *code, *use_code;
+	int broken_perl;
 
 	perl_scripts = NULL;
         perl_sources_start();
 	perl_signals_start();
 
 	my_perl = perl_alloc();
+	broken_perl = wcwidth(160);
 	perl_construct(my_perl);
+	broken_perl = broken_perl != wcwidth(160);
 
-	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args)-1, perl_args, NULL);
+	perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args) - 1, perl_args, NULL);
 
-        perl_common_start();
+	perl_common_start();
 
 	use_code = perl_get_use_list();
 	code = g_strdup_printf(irssi_core_code, use_code);
 	perl_eval_pv(code, TRUE);
+	if (broken_perl) {
+		g_warning("applying locale workaround for Perl %d.%d, see "
+		          "https://github.com/Perl/perl5/issues/21366",
+		          PERL_REVISION, PERL_VERSION);
+		perl_eval_pv("package Irssi::Core;"
+		             /* https://github.com/Perl/perl5/issues/21746 */
+		             "if ( $] == $] )"
+		             "{"
+		             "require POSIX;"
+		             "POSIX::setlocale(&POSIX::LC_ALL, \"\");"
+		             "}"
+		             "1;",
+		             TRUE);
+	}
 
 	g_free(code);
-        g_free(use_code);
+	g_free(use_code);
 }
 
 /* Destroy all perl scripts and deinitialize perl interpreter */
@@ -441,7 +458,7 @@ void perl_core_init(void)
 	char **argv = perl_args;
 
 	PERL_SYS_INIT3(&argc, &argv, &environ);
-        print_script_errors = 1;
+	print_script_errors = 1;
 	settings_add_str("perl", "perl_use_lib", PERL_USE_LIB);
 
 	/*PL_perl_destruct_level = 1; - this crashes with some people.. */

From 41f8213fe0f2f4fa4dad535203770cffc9b7f06f Mon Sep 17 00:00:00 2001
From: Gunter Labes <soliton@wesnoth.org>
Date: Thu, 1 Feb 2024 21:56:20 +0100
Subject: [PATCH 1581/1650] typo fixes

---
 docs/help/in/scrollback.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/help/in/scrollback.in b/docs/help/in/scrollback.in
index 5f59d842..e91513cd 100644
--- a/docs/help/in/scrollback.in
+++ b/docs/help/in/scrollback.in
@@ -20,10 +20,10 @@
 
 %9Description:%9
 
-    Manipulate the text in the window to go to a to the given line number, or
+    Manipulate the text in the window to go to the given line number, or
     clear the buffers.
 
-    The timestamp format is format is '[dd[.mm] | -<days ago>] hh:mi[:ss]'.
+    The timestamp format is '[dd[.mm] | -<days ago>] hh:mi[:ss]'.
 
 %9Examples:%9
 

From 4dd57cf24e9166aaaf2ffcbb2b50e013020a847c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 23 Feb 2024 17:04:41 +0100
Subject: [PATCH 1582/1650] missing shell quotes

---
 utils/irssi-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 3a425dcc..afb05546 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DATE=`grep '^v' $1/NEWS | head -1`
+DATE=`grep '^v' "$1"/NEWS | head -1`
 VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
 case $VERSION_DATE in
   *xx)

From cf6615a70e3bded62d449563eb9b40cb44901011 Mon Sep 17 00:00:00 2001
From: maflcko <6399679+maflcko@users.noreply.github.com>
Date: Thu, 28 Mar 2024 19:33:24 +0100
Subject: [PATCH 1583/1650] Update server.c: Add missing include

---
 src/fe-fuzz/server.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index c91a5bcd..25579c8c 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -30,6 +30,7 @@
 #include <irssi/src/core/misc.h>
 #include <irssi/src/core/servers-setup.h>
 #include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/network-openssl.h>
 #include <irssi/src/core/net-sendbuffer.h>
 
 #include <stddef.h>

From e295caa86691fe1172b5a9048da511655fb9e03e Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Mon, 1 Apr 2024 01:44:08 +0200
Subject: [PATCH 1584/1650] Fix github issue #1504 - irssi switches to af_unix
 if network name contains /

In addition to looking for a /, we also check if the network name is
known.
---
 src/core/chat-commands.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index faeec451..10da0d2c 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -30,6 +30,7 @@
 #include <irssi/src/core/servers-setup.h>
 #include <irssi/src/core/servers-reconnect.h>
 #include <irssi/src/core/channels.h>
+#include <irssi/src/core/chatnets.h>
 #include <irssi/src/core/queries.h>
 #include <irssi/src/core/window-item-def.h>
 #include <irssi/src/core/rawlog.h>
@@ -91,7 +92,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 		return NULL;
 	}
 
-	if (strchr(addr, '/') != NULL)
+	if (strchr(addr, '/') != NULL && chatnet_find(addr) == NULL)
 		conn->unix_socket = TRUE;
 
 	/* TLS options are handled in server_create_conn_opt ... -> server_setup_fill_optlist */

From f2b97631e1209d60e77f2a918809c88bd37fdd04 Mon Sep 17 00:00:00 2001
From: Patrick Okraku <patrick.okraku@gmail.com>
Date: Wed, 11 Oct 2023 21:43:34 +0200
Subject: [PATCH 1585/1650] Added support for SCRAM-SHA-1, SCRAM-SHA-256 and
 SCRAM-SHA-512

---
 docs/help/in/network.in          |   4 +-
 src/irc/core/irc-core.c          |   4 +
 src/irc/core/irc-servers-setup.c |  24 ++-
 src/irc/core/irc-servers.h       |   2 +
 src/irc/core/meson.build         |   2 +
 src/irc/core/sasl.c              |  72 ++++++++
 src/irc/core/sasl.h              |   3 +
 src/irc/core/scram.c             | 303 +++++++++++++++++++++++++++++++
 src/irc/core/scram.h             |  27 +++
 9 files changed, 435 insertions(+), 6 deletions(-)
 create mode 100644 src/irc/core/scram.c
 create mode 100644 src/irc/core/scram.h

diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 788c1c65..16ff9f47 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -36,8 +36,8 @@
     -cmdmax:         Specifies the maximum number of commands to perform before
                      starting the internal flood protection.
     -sasl_mechanism  Specifies the mechanism to use for the SASL authentication.
-                     At the moment irssi only supports the 'plain' and the
-                     'external' mechanisms.
+                     Irssi supports: PLAIN, EXTERNAL, SCRAM-SHA-1, SCRAM-SHA-256
+                     and SCRAM-SHA-512
                      Use '' to disable the authentication.
     -sasl_username   Specifies the username to use during the SASL authentication.
     -sasl_password   Specifies the password to use during the SASL authentication.
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index 725ae28a..136bff85 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -77,6 +77,10 @@ static void destroy_server_connect(SERVER_CONNECT_REC *conn)
 	g_free_not_null(ircconn->alternate_nick);
 	g_free_not_null(ircconn->sasl_username);
 	g_free_not_null(ircconn->sasl_password);
+
+	if (ircconn->scram_session != NULL) {
+		scram_session_free(ircconn->scram_session);
+	}
 }
 
 void irc_core_init(void)
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index c1603a48..a575ee34 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -128,11 +128,27 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 				conn->sasl_password = g_strdup(ircnet->sasl_password);
 			} else
 				g_warning("The fields sasl_username and sasl_password are either missing or empty");
-		}
-		else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
+		} else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-1") ||
+		           !g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-256") ||
+		           !g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-512")) {
+			/* The SCRAM-SHA-* methods need both the username and the password */
+			if (ircnet->sasl_username != NULL && *ircnet->sasl_username &&
+			    ircnet->sasl_password != NULL && *ircnet->sasl_password) {
+				if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-1"))
+					conn->sasl_mechanism = SASL_MECHANISM_SCRAM_SHA_1;
+				if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-256"))
+					conn->sasl_mechanism = SASL_MECHANISM_SCRAM_SHA_256;
+				if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-512"))
+					conn->sasl_mechanism = SASL_MECHANISM_SCRAM_SHA_512;
+
+				conn->sasl_username = g_strdup(ircnet->sasl_username);
+				conn->sasl_password = g_strdup(ircnet->sasl_password);
+			} else
+				g_warning("The fields sasl_username and sasl_password are either "
+				          "missing or empty");
+		} else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
 			conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
-		}
-		else
+		} else
 			g_warning("Unsupported SASL mechanism \"%s\" selected", ircnet->sasl_mechanism);
 	}
 }
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 6e78c4da..01605b7d 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -4,6 +4,7 @@
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers.h>
 #include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/scram.h>
 
 /*
  * 63 is the maximum hostname length defined by the protocol.  10 is a common
@@ -54,6 +55,7 @@ struct _IRC_SERVER_CONNECT_REC {
 	int sasl_mechanism;
 	char *sasl_username;
 	char *sasl_password;
+	SCRAM_SESSION_REC *scram_session;
 
 	int max_cmds_at_once;
 	int cmd_queue_speed;
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index 81559f3e..a63ff214 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -28,6 +28,7 @@ libirc_core_a = static_library('irc_core',
     'modes.c',
     'netsplit.c',
     'sasl.c',
+    'scram.c',
     'servers-idle.c',
     'servers-redirect.c',
   ),
@@ -70,6 +71,7 @@ install_headers(
     'module.h',
     'netsplit.h',
     'sasl.h',
+    'scram.h',
     'servers-idle.h',
     'servers-redirect.h',
   ),
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 9bc40ff2..e9689b12 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -80,6 +80,18 @@ static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *fro
 		case SASL_MECHANISM_EXTERNAL:
 			irc_send_cmd_now(server, "AUTHENTICATE EXTERNAL");
 			break;
+
+	        case SASL_MECHANISM_SCRAM_SHA_1:
+		        irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-1");
+		        break;
+
+	        case SASL_MECHANISM_SCRAM_SHA_256:
+		        irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-256");
+		        break;
+
+	        case SASL_MECHANISM_SCRAM_SHA_512:
+		        irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-512");
+		        break;
 	}
 	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
 }
@@ -223,6 +235,54 @@ void sasl_send_response(IRC_SERVER_REC *server, GString *response)
 	g_free(enc);
 }
 
+/*
+ * Sends AUTHENTICATE messages to log in via SCRAM.
+ */
+static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const char *digest)
+{
+	char *output;
+	int ret;
+	size_t output_len;
+	IRC_SERVER_CONNECT_REC *conn = server->connrec;
+
+	if (conn->scram_session == NULL) {
+		conn->scram_session =
+		    scram_session_create(digest, conn->sasl_username, conn->sasl_password);
+
+		if (conn->scram_session == NULL) {
+			g_error("Could not create SCRAM session with digest %s", digest);
+			irc_send_cmd_now(server, "AUTHENTICATE *");
+			return;
+		}
+	}
+
+	ret = scram_process(conn->scram_session, data, &output, &output_len);
+
+	if (ret == SCRAM_IN_PROGRESS) {
+		// Authentication is still in progress
+		GString *resp = g_string_new(output);
+		sasl_send_response(server, resp);
+		g_string_free(resp, TRUE);
+		g_free(output);
+	} else if (ret == SCRAM_SUCCESS) {
+		// Authentication succeeded
+		irc_send_cmd_now(server, "AUTHENTICATE +");
+		scram_session_free(conn->scram_session);
+		conn->scram_session = NULL;
+	} else if (ret == SCRAM_ERROR) {
+		// Authentication failed
+		irc_send_cmd_now(server, "AUTHENTICATE *");
+
+		if (conn->scram_session->error != NULL) {
+			g_warning("SASL SCRAM authentication failed: %s",
+			          conn->scram_session->error);
+		}
+
+		scram_session_free(conn->scram_session);
+		conn->scram_session = NULL;
+	}
+}
+
 /*
  * Called when the incoming SASL request is completely received.
  */
@@ -258,6 +318,18 @@ static void sasl_step_complete(IRC_SERVER_REC *server, GString *data)
 			/* Empty response */
 			sasl_send_response(server, NULL);
 			break;
+
+	        case SASL_MECHANISM_SCRAM_SHA_1:
+		        scram_authenticate(server, data->str, "SHA1");
+		        break;
+
+	        case SASL_MECHANISM_SCRAM_SHA_256:
+		        scram_authenticate(server, data->str, "SHA256");
+		        break;
+
+	        case SASL_MECHANISM_SCRAM_SHA_512:
+		        scram_authenticate(server, data->str, "SHA512");
+		        break;
 	}
 }
 
diff --git a/src/irc/core/sasl.h b/src/irc/core/sasl.h
index 04d0cd9d..67c8567b 100644
--- a/src/irc/core/sasl.h
+++ b/src/irc/core/sasl.h
@@ -25,6 +25,9 @@ enum {
 	SASL_MECHANISM_NONE = 0,
 	SASL_MECHANISM_PLAIN,
 	SASL_MECHANISM_EXTERNAL,
+	SASL_MECHANISM_SCRAM_SHA_1,
+	SASL_MECHANISM_SCRAM_SHA_256,
+	SASL_MECHANISM_SCRAM_SHA_512,
 	SASL_MECHANISM_MAX
 };
 
diff --git a/src/irc/core/scram.c b/src/irc/core/scram.c
new file mode 100644
index 00000000..42812ccc
--- /dev/null
+++ b/src/irc/core/scram.c
@@ -0,0 +1,303 @@
+/*
+ scram.c : irssi
+
+    Copyright (C) 2023 Patrick Okraku
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "module.h"
+#include <irssi/src/irc/core/scram.h>
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+
+#define NONCE_LENGTH 18
+#define CLIENT_KEY "Client Key"
+#define SERVER_KEY "Server Key"
+
+// EVP_MD_CTX_create() and EVP_MD_CTX_destroy() were renamed in OpenSSL 1.1.0
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#define EVP_MD_CTX_new(ctx) EVP_MD_CTX_create(ctx)
+#define EVP_MD_CTX_free(ctx) EVP_MD_CTX_destroy(ctx)
+#endif
+
+SCRAM_SESSION_REC *scram_session_create(const char *digest, const char *username,
+                                        const char *password)
+{
+	SCRAM_SESSION_REC *session;
+	const EVP_MD *md;
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+	OpenSSL_add_all_algorithms();
+#endif
+	md = EVP_get_digestbyname(digest);
+
+	if (md == NULL) {
+		// Unknown message digest
+		return NULL;
+	}
+
+	session = g_new0(SCRAM_SESSION_REC, 1);
+	session->digest = md;
+	session->digest_size = EVP_MD_size(md);
+	session->username = g_strdup(username);
+	session->password = g_strdup(password);
+	return session;
+}
+
+void scram_session_free(SCRAM_SESSION_REC *session)
+{
+	if (session == NULL) {
+		return;
+	}
+
+	g_free(session->username);
+	g_free(session->password);
+	g_free(session->client_nonce_b64);
+	g_free(session->client_first_message_bare);
+	g_free(session->salted_password);
+	g_free(session->auth_message);
+	g_free(session->error);
+
+	g_free(session);
+}
+
+static int create_nonce(void *buffer, size_t length)
+{
+	return RAND_bytes(buffer, length);
+}
+
+static int create_SHA(SCRAM_SESSION_REC *session, const unsigned char *input, size_t input_len,
+                      unsigned char *output, unsigned int *output_len)
+{
+	EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
+
+	if (!EVP_DigestInit_ex(md_ctx, session->digest, NULL)) {
+		session->error = g_strdup("Message digest initialization failed");
+		EVP_MD_CTX_free(md_ctx);
+		return SCRAM_ERROR;
+	}
+
+	if (!EVP_DigestUpdate(md_ctx, input, input_len)) {
+		session->error = g_strdup("Message digest update failed");
+		EVP_MD_CTX_free(md_ctx);
+		return SCRAM_ERROR;
+	}
+
+	if (!EVP_DigestFinal_ex(md_ctx, output, output_len)) {
+		session->error = g_strdup("Message digest finalization failed");
+		EVP_MD_CTX_free(md_ctx);
+		return SCRAM_ERROR;
+	}
+
+	EVP_MD_CTX_free(md_ctx);
+	return SCRAM_IN_PROGRESS;
+}
+
+static scram_status process_client_first(SCRAM_SESSION_REC *session, char **output,
+                                         size_t *output_len)
+{
+	char nonce[NONCE_LENGTH];
+
+	if (!create_nonce(nonce, NONCE_LENGTH)) {
+		session->error = g_strdup("Could not create client nonce");
+		return SCRAM_ERROR;
+	}
+
+	session->client_nonce_b64 = g_base64_encode((guchar *) nonce, NONCE_LENGTH);
+	*output = g_strdup_printf("n,,n=%s,r=%s", session->username, session->client_nonce_b64);
+	*output_len = strlen(*output);
+	session->client_first_message_bare = g_strdup(*output + 3);
+	session->step++;
+	return SCRAM_IN_PROGRESS;
+}
+
+static scram_status process_server_first(SCRAM_SESSION_REC *session, const char *data,
+                                         char **output, size_t *output_len)
+{
+	char **params, *client_final_message_without_proof, *salt, *server_nonce_b64,
+	    *client_proof_b64;
+	unsigned char *client_key, stored_key[EVP_MAX_MD_SIZE], *client_signature, *client_proof;
+	unsigned int i, param_count, iteration_count, client_key_len, stored_key_len;
+	gsize salt_len = 0;
+	size_t client_nonce_len;
+
+	params = g_strsplit(data, ",", -1);
+	param_count = g_strv_length(params);
+
+	if (param_count < 3) {
+		session->error = g_strdup_printf("Invalid server-first-message: %s", data);
+		g_strfreev(params);
+		return SCRAM_ERROR;
+	}
+
+	server_nonce_b64 = NULL;
+	salt = NULL;
+	iteration_count = 0;
+
+	for (i = 0; i < param_count; i++) {
+		if (!strncmp(params[i], "r=", 2)) {
+			g_free(server_nonce_b64);
+			server_nonce_b64 = g_strdup(params[i] + 2);
+		} else if (!strncmp(params[i], "s=", 2)) {
+			g_free(salt);
+			salt = g_strdup(params[i] + 2);
+		} else if (!strncmp(params[i], "i=", 2)) {
+			iteration_count = strtoul(params[i] + 2, NULL, 10);
+		}
+	}
+
+	g_strfreev(params);
+
+	if (server_nonce_b64 == NULL || *server_nonce_b64 == '\0' || salt == NULL ||
+	    *salt == '\0' || iteration_count == 0) {
+		session->error = g_strdup_printf("Invalid server-first-message: %s", data);
+		g_free(server_nonce_b64);
+		g_free(salt);
+		return SCRAM_ERROR;
+	}
+
+	client_nonce_len = strlen(session->client_nonce_b64);
+
+	// The server can append his nonce to the client's nonce
+	if (strlen(server_nonce_b64) < client_nonce_len ||
+	    strncmp(server_nonce_b64, session->client_nonce_b64, client_nonce_len)) {
+		session->error = g_strdup_printf("Invalid server nonce: %s", server_nonce_b64);
+		return SCRAM_ERROR;
+	}
+
+	g_base64_decode_inplace((gchar *) salt, &salt_len);
+
+	// SaltedPassword := Hi(Normalize(password), salt, i)
+	session->salted_password = g_malloc(session->digest_size);
+
+	PKCS5_PBKDF2_HMAC(session->password, strlen(session->password), (unsigned char *) salt,
+	                  salt_len, iteration_count, session->digest, session->digest_size,
+	                  session->salted_password);
+
+	// AuthMessage := client-first-message-bare + "," +
+	//                server-first-message + "," +
+	//                client-final-message-without-proof
+	client_final_message_without_proof = g_strdup_printf("c=biws,r=%s", server_nonce_b64);
+
+	session->auth_message = g_strdup_printf("%s,%s,%s", session->client_first_message_bare,
+	                                        data, client_final_message_without_proof);
+
+	// ClientKey := HMAC(SaltedPassword, "Client Key")
+	client_key = g_malloc0(session->digest_size);
+
+	HMAC(session->digest, session->salted_password, session->digest_size,
+	     (unsigned char *) CLIENT_KEY, strlen(CLIENT_KEY), client_key, &client_key_len);
+
+	// StoredKey := H(ClientKey)
+	if (!create_SHA(session, client_key, session->digest_size, stored_key, &stored_key_len)) {
+		g_free(client_final_message_without_proof);
+		g_free(server_nonce_b64);
+		g_free(salt);
+		g_free(client_key);
+		return SCRAM_ERROR;
+	}
+
+	// ClientSignature := HMAC(StoredKey, AuthMessage)
+	client_signature = g_malloc0(session->digest_size);
+	HMAC(session->digest, stored_key, stored_key_len, (unsigned char *) session->auth_message,
+	     strlen((char *) session->auth_message), client_signature, NULL);
+
+	// ClientProof := ClientKey XOR ClientSignature
+	client_proof = g_malloc0(client_key_len);
+
+	for (i = 0; i < client_key_len; i++) {
+		client_proof[i] = client_key[i] ^ client_signature[i];
+	}
+
+	client_proof_b64 = g_base64_encode((guchar *) client_proof, client_key_len);
+
+	*output = g_strdup_printf("%s,p=%s", client_final_message_without_proof, client_proof_b64);
+	*output_len = strlen(*output);
+
+	g_free(server_nonce_b64);
+	g_free(salt);
+	g_free(client_final_message_without_proof);
+	g_free(client_key);
+	g_free(client_signature);
+	g_free(client_proof);
+	g_free(client_proof_b64);
+
+	session->step++;
+	return SCRAM_IN_PROGRESS;
+}
+
+static scram_status process_server_final(SCRAM_SESSION_REC *session, const char *data)
+{
+	char *verifier;
+	unsigned char *server_key, *server_signature;
+	unsigned int server_key_len = 0, server_signature_len = 0;
+	gsize verifier_len = 0;
+
+	if (strlen(data) < 3 || (data[0] != 'v' && data[1] != '=')) {
+		return SCRAM_ERROR;
+	}
+
+	verifier = g_strdup(data + 2);
+	g_base64_decode_inplace(verifier, &verifier_len);
+
+	// ServerKey := HMAC(SaltedPassword, "Server Key")
+	server_key = g_malloc0(session->digest_size);
+	HMAC(session->digest, session->salted_password, session->digest_size,
+	     (unsigned char *) SERVER_KEY, strlen(SERVER_KEY), server_key, &server_key_len);
+
+	// ServerSignature := HMAC(ServerKey, AuthMessage)
+	server_signature = g_malloc0(session->digest_size);
+	HMAC(session->digest, server_key, session->digest_size,
+	     (unsigned char *) session->auth_message, strlen((char *) session->auth_message),
+	     server_signature, &server_signature_len);
+
+	if (verifier_len == server_signature_len &&
+	    memcmp(verifier, server_signature, verifier_len) == 0) {
+		g_free(verifier);
+		g_free(server_key);
+		g_free(server_signature);
+		return SCRAM_SUCCESS;
+	} else {
+		g_free(verifier);
+		g_free(server_key);
+		g_free(server_signature);
+		return SCRAM_ERROR;
+	}
+}
+
+scram_status scram_process(SCRAM_SESSION_REC *session, const char *input, char **output,
+                           size_t *output_len)
+{
+	scram_status status;
+
+	switch (session->step) {
+	case 0:
+		status = process_client_first(session, output, output_len);
+		break;
+	case 1:
+		status = process_server_first(session, input, output, output_len);
+		break;
+	case 2:
+		status = process_server_final(session, input);
+		break;
+	default:
+		*output = NULL;
+		*output_len = 0;
+		status = SCRAM_ERROR;
+		break;
+	}
+
+	return status;
+}
\ No newline at end of file
diff --git a/src/irc/core/scram.h b/src/irc/core/scram.h
new file mode 100644
index 00000000..ee605142
--- /dev/null
+++ b/src/irc/core/scram.h
@@ -0,0 +1,27 @@
+#ifndef IRSSI_IRC_CORE_SCRAM_H
+#define IRSSI_IRC_CORE_SCRAM_H
+
+#include <openssl/evp.h>
+
+typedef struct {
+	const EVP_MD *digest;
+	size_t digest_size;
+	char *username;
+	char *password;
+	char *client_nonce_b64;
+	char *client_first_message_bare;
+	unsigned char *salted_password;
+	char *auth_message;
+	char *error;
+	int step;
+} SCRAM_SESSION_REC;
+
+typedef enum { SCRAM_ERROR = 0, SCRAM_IN_PROGRESS, SCRAM_SUCCESS } scram_status;
+
+SCRAM_SESSION_REC *scram_session_create(const char *digset, const char *username,
+                                        const char *password);
+void scram_session_free(SCRAM_SESSION_REC *session);
+scram_status scram_process(SCRAM_SESSION_REC *session, const char *input, char **output,
+                           size_t *output_len);
+
+#endif
\ No newline at end of file

From 98b391f62e986e743589b15af866fcbd6072964b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 1 Apr 2024 16:33:36 +0200
Subject: [PATCH 1586/1650] minor cleanup

---
 src/irc/core/sasl.c  | 6 +++---
 src/irc/core/scram.c | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index e9689b12..1695fc4c 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -250,7 +250,7 @@ static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const c
 		    scram_session_create(digest, conn->sasl_username, conn->sasl_password);
 
 		if (conn->scram_session == NULL) {
-			g_error("Could not create SCRAM session with digest %s", digest);
+			g_critical("Could not create SCRAM session with digest %s", digest);
 			irc_send_cmd_now(server, "AUTHENTICATE *");
 			return;
 		}
@@ -260,13 +260,13 @@ static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const c
 
 	if (ret == SCRAM_IN_PROGRESS) {
 		// Authentication is still in progress
-		GString *resp = g_string_new(output);
+		GString *resp = g_string_new_len(output, output_len);
 		sasl_send_response(server, resp);
 		g_string_free(resp, TRUE);
 		g_free(output);
 	} else if (ret == SCRAM_SUCCESS) {
 		// Authentication succeeded
-		irc_send_cmd_now(server, "AUTHENTICATE +");
+		sasl_send_response(server, NULL);
 		scram_session_free(conn->scram_session);
 		conn->scram_session = NULL;
 	} else if (ret == SCRAM_ERROR) {
diff --git a/src/irc/core/scram.c b/src/irc/core/scram.c
index 42812ccc..4c950140 100644
--- a/src/irc/core/scram.c
+++ b/src/irc/core/scram.c
@@ -137,7 +137,8 @@ static scram_status process_server_first(SCRAM_SESSION_REC *session, const char
 	param_count = g_strv_length(params);
 
 	if (param_count < 3) {
-		session->error = g_strdup_printf("Invalid server-first-message: %s", data);
+		/* Invalid server-first-message */
+		session->error = g_strdup_printf("%s", data);
 		g_strfreev(params);
 		return SCRAM_ERROR;
 	}
@@ -300,4 +301,4 @@ scram_status scram_process(SCRAM_SESSION_REC *session, const char *input, char *
 	}
 
 	return status;
-}
\ No newline at end of file
+}

From 08bb648850ca73695d5bf39c53dbd7e9846a0a94 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 1 Apr 2024 16:33:57 +0200
Subject: [PATCH 1587/1650] proper sasl mechanism variable initialisation

---
 src/irc/core/irc-servers-setup.c | 7 +++++--
 src/irc/core/irc-servers.c       | 1 +
 src/irc/core/sasl.c              | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index a575ee34..2d94a48b 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -148,8 +148,11 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 				          "missing or empty");
 		} else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) {
 			conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL;
-		} else
-			g_warning("Unsupported SASL mechanism \"%s\" selected", ircnet->sasl_mechanism);
+		} else {
+			g_warning("Unsupported SASL mechanism \"%s\" selected",
+			          ircnet->sasl_mechanism);
+			conn->sasl_mechanism = SASL_MECHANISM_MAX;
+		}
 	}
 }
 
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 29f63c21..e3fe3143 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -475,6 +475,7 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
 	server->send_message = send_message;
 	server->query_find_func = (QUERY_REC * (*) (SERVER_REC *, const char *) ) irc_query_find;
 	server->nick_comp_func = irc_nickcmp_rfc1459;
+	server->sasl_success = FALSE;
 
 	server_connect_init((SERVER_REC *) server);
 	return (SERVER_REC *) server;
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 1695fc4c..89ca4a9e 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -92,6 +92,12 @@ static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *fro
 	        case SASL_MECHANISM_SCRAM_SHA_512:
 		        irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-512");
 		        break;
+
+	        case SASL_MECHANISM_MAX:
+		        signal_emit("server sasl failure", 2, server,
+		                    "Irssi: Unsupported SASL mechanism");
+		        irc_cap_finish_negotiation(server);
+		        return;
 	}
 	server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server);
 }

From 2f2fa029f92706301ffebf04ce90e428d6c835bd Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 1 Apr 2024 16:37:35 +0200
Subject: [PATCH 1588/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 59566dc8..9f6c54a2 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 52
+#define IRSSI_ABI_VERSION 53
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From e13df83dc8efe19b817460d9dbb8223af8cb5266 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 9 Aug 2023 22:47:53 +0200
Subject: [PATCH 1589/1650] new code for g_module_open which might work with
 apple dylibs given new enough glib

---
 src/core/modules-load.c | 58 +++++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index be1bb385..11c4dd6b 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -102,10 +102,41 @@ static char *module_get_sub(const char *name, const char *root)
         return g_strdup(name);
 }
 
-static GModule *module_open(const char *name, int *found)
+static GModule *module_open(const char *name)
 {
-	struct stat statbuf;
 	GModule *module;
+#if GLIB_CHECK_VERSION(2, 75, 0)
+	/* in this version of glib, g_module_open knows how to construct system-dependent module
+	   file names, and g_module_build_path is deprecated. */
+
+	char *path;
+
+	if (g_path_is_absolute(name) || *name == '~' ||
+	    (*name == '.' && name[1] == G_DIR_SEPARATOR))
+		path = g_strdup(name);
+	else {
+		/* first try from home dir */
+		path = g_strdup_printf("%s/modules/%s", get_irssi_dir(), name);
+
+		module = g_module_open(path, (GModuleFlags) 0);
+		g_free(path);
+		if (module != NULL) {
+			return module;
+		}
+
+		/* module not found from home dir, try global module dir */
+		path = g_strdup_printf("%s/%s", MODULEDIR, name);
+	}
+
+	module = g_module_open(path, (GModuleFlags) 0);
+	g_free(path);
+	return module;
+
+#else /* GLib < 2.75.0 */
+	/* in this version of glib, we build the module path with g_module_build_path.
+	   unfortunately, this is broken on Darwin when compiled with meson. */
+
+	struct stat statbuf;
 	char *path, *str;
 
 	if (g_path_is_absolute(name) || *name == '~' ||
@@ -120,7 +151,6 @@ static GModule *module_open(const char *name, int *found)
 		if (stat(path, &statbuf) == 0) {
 			module = g_module_open(path, (GModuleFlags) 0);
 			g_free(path);
-			*found = TRUE;
 			return module;
 		}
 
@@ -129,10 +159,11 @@ static GModule *module_open(const char *name, int *found)
 		path = g_module_build_path(MODULEDIR, name);
 	}
 
-	*found = stat(path, &statbuf) == 0;
 	module = g_module_open(path, (GModuleFlags) 0);
 	g_free(path);
 	return module;
+
+#endif
 }
 
 static char *module_get_func(const char *rootmodule, const char *submodule,
@@ -151,8 +182,7 @@ static char *module_get_func(const char *rootmodule, const char *submodule,
 	signal_emit("module error", 4, GINT_TO_POINTER(error), text, \
 		    rootmodule, submodule)
 
-/* Returns 1 if ok, 0 if error in module and
-   -1 if module wasn't found */
+/* Returns 1 if ok, 0 if not */
 static int module_load_name(const char *path, const char *rootmodule,
 			    const char *submodule, int silent)
 {
@@ -166,15 +196,15 @@ static int module_load_name(const char *path, const char *rootmodule,
 	gpointer value1, value2 = NULL;
 	char *versionfunc, *initfunc, *deinitfunc;
 	int module_abi_version = 0;
-        int found;
+	int valid;
 
-	gmodule = module_open(path, &found);
+	gmodule = module_open(path);
 	if (gmodule == NULL) {
-		if (!silent || found) {
+		if (!silent) {
 			module_error(MODULE_ERROR_LOAD, g_module_error(),
 				     rootmodule, submodule);
 		}
-		return found ? 0 : -1;
+		return 0;
 	}
 
 	/* get the module's irssi abi version and bail out on mismatch */
@@ -201,12 +231,12 @@ static int module_load_name(const char *path, const char *rootmodule,
 	/* get the module's init() and deinit() functions */
 	initfunc = module_get_func(rootmodule, submodule, "init");
 	deinitfunc = module_get_func(rootmodule, submodule, "deinit");
-	found = g_module_symbol(gmodule, initfunc, &value1) &&
-		g_module_symbol(gmodule, deinitfunc, &value2);
+	valid = g_module_symbol(gmodule, initfunc, &value1) &&
+	        g_module_symbol(gmodule, deinitfunc, &value2);
 	g_free(initfunc);
 	g_free(deinitfunc);
 
-	if (!found) {
+	if (!valid) {
 		module_error(MODULE_ERROR_INVALID, NULL,
 			     rootmodule, submodule);
 		g_module_close(gmodule);
@@ -310,7 +340,7 @@ static int module_load_full(const char *path, const char *rootmodule,
 	/* check if the given module exists.. */
 	try_prefixes = g_strcmp0(rootmodule, submodule) == 0;
 	status = module_load_name(path, rootmodule, submodule, try_prefixes);
-	if (status == -1 && try_prefixes) {
+	if (status <= 0 && try_prefixes) {
 		/* nope, try loading the module_core,
 		   fe_module, etc. */
 		status = module_load_prefixes(path, rootmodule,

From c48354307ef1eace3b51fc3886614110809de284 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 1 Apr 2024 22:10:35 +0200
Subject: [PATCH 1590/1650] Update minimum required Perl version in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 963fbfca..bfe521d3 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ ninja -C Build && sudo ninja -C Build install
 
 - [glib-2.32](https://wiki.gnome.org/Projects/GLib) or greater
 - [openssl](https://www.openssl.org/)
-- [perl-5.6](https://www.perl.org/) or greater (for perl support)
+- [perl-5.8](https://www.perl.org/) or greater (for perl support)
 - terminfo or ncurses (for text frontend)
 
 #### See the [INSTALL](INSTALL) file for details

From 111e9160a96986fa65dd59ae6790b4c2dbbdba2c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 1 Apr 2024 22:28:17 +0200
Subject: [PATCH 1591/1650] github actions nodejs churn

---
 .github/workflows/abicheck.yml  | 10 +++++-----
 .github/workflows/check.yml     |  4 ++--
 .github/workflows/termuxpkg.yml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index d21d55cd..3ac39146 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -37,7 +37,7 @@ jobs:
           echo base abi : $base_abi
           ./base$prefix/bin/irssi --version
           echo base_abi=$base_abi >> $GITHUB_OUTPUT
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: base.inst
           path: base
@@ -71,7 +71,7 @@ jobs:
           echo merge abi : $merge_abi
           ./merge$prefix/bin/irssi --version
           echo merge_abi=$merge_abi >> $GITHUB_OUTPUT
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: merge.inst
           path: merge
@@ -89,12 +89,12 @@ jobs:
         run: |
           sudo apt install abigail-tools
       - name: fetch base build
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: base.inst
           path: base
       - name: fetch merge build
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: merge.inst
           path: merge
@@ -103,7 +103,7 @@ jobs:
           abipkgdiff -l base merge >abipkgdiff.out && diff_ret=0 || diff_ret=$?
           echo "diff_ret=$diff_ret" >> $GITHUB_ENV
           cat abipkgdiff.out
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: abipkgdiff.out
       - run: |
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 65f56b17..2fee4b8b 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -21,7 +21,7 @@ jobs:
       - name: make dist
         run: |
           ./utils/make-dist.sh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: irssi-*.tar.gz
           retention-days: 1
@@ -51,7 +51,7 @@ jobs:
             flags: meson-latest FAILURE-OK
     steps:
       - name: fetch dist
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: set PATH
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml
index 2cb8ccd3..23f35695 100644
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@@ -73,7 +73,7 @@ jobs:
       - name: build irssi package
         run: |
           sudo ./scripts/run-docker.sh ./build-package.sh -I irssi-an
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: irssi-termux-pkg
           path: output/irssi-an*.deb

From 455dcb18ecfa125469bf913655c5a9c1b31a7dd5 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 1 Apr 2024 22:03:33 +0200
Subject: [PATCH 1592/1650] deprecated openssl3 function

---
 src/core/network-openssl.c | 58 +++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 9956f217..5104e7dd 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -28,6 +28,7 @@
 #include <irssi/src/core/tls.h>
 
 #include <openssl/crypto.h>
+#include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>
@@ -751,44 +752,49 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 #ifdef SSL_get_server_tmp_key
 	/* Show ephemeral key information. */
 	EVP_PKEY *ephemeral_key = NULL;
-
-	/* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */
-#ifndef OPENSSL_NO_EC
-	EC_KEY *ec_key = NULL;
-#endif
 	char *ephemeral_key_algorithm = NULL;
-	char *cname = NULL;
-	int nid;
 
 	g_return_if_fail(tls != NULL);
 	g_return_if_fail(ssl != NULL);
 
 	if (SSL_get_server_tmp_key(ssl, &ephemeral_key)) {
-		switch (EVP_PKEY_id(ephemeral_key)) {
-			case EVP_PKEY_DH:
-				tls_rec_set_ephemeral_key_algorithm(tls, "DH");
-				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
-				break;
+		int keytype = EVP_PKEY_id(ephemeral_key);
+		switch (keytype) {
+		case EVP_PKEY_DH:
+			tls_rec_set_ephemeral_key_algorithm(tls, "DH");
+			tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+			break;
 
+			/* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */
 #ifndef OPENSSL_NO_EC
-			case EVP_PKEY_EC:
-				ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
-				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
-				EC_KEY_free(ec_key);
-				cname = (char *)OBJ_nid2sn(nid);
-				ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);
+		case EVP_PKEY_EC: {
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+			char cname[50];
+			EVP_PKEY_get_group_name(ephemeral_key, cname, sizeof(cname), NULL);
+#else
+			EC_KEY *ec_key = NULL;
+			char *cname = NULL;
+			int nid;
 
-				tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm);
-				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+			ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
+			nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
+			EC_KEY_free(ec_key);
+			cname = (char *) OBJ_nid2sn(nid);
+#endif
+			ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);
 
-				g_free_and_null(ephemeral_key_algorithm);
-				break;
+			tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm);
+			tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+
+			g_free_and_null(ephemeral_key_algorithm);
+			break;
+		}
 #endif
 
-			default:
-				tls_rec_set_ephemeral_key_algorithm(tls, "Unknown");
-				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
-				break;
+		default:
+			tls_rec_set_ephemeral_key_algorithm(tls, OBJ_nid2ln(keytype));
+			tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+			break;
 		}
 
 		EVP_PKEY_free(ephemeral_key);

From 9d0787fc1063b7bd3313aec90bccf8fccdba05cc Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Tue, 2 Apr 2024 05:23:10 +0000
Subject: [PATCH 1593/1650] Ensure all files have newlines at the end

---
 .github/workflows/clangformat.yml   | 2 +-
 .github/workflows/trigger-pages.yml | 2 +-
 docs/design.html                    | 2 +-
 docs/faq.html                       | 2 +-
 src/irc/core/scram.h                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index 9076edc2..cf701e2e 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -26,4 +26,4 @@ jobs:
         if: failure()
         with:
           name: git-clang-format.diff
-          path: git-clang-format.diff
\ No newline at end of file
+          path: git-clang-format.diff
diff --git a/.github/workflows/trigger-pages.yml b/.github/workflows/trigger-pages.yml
index e0d4b8ed..0f2d3212 100644
--- a/.github/workflows/trigger-pages.yml
+++ b/.github/workflows/trigger-pages.yml
@@ -17,4 +17,4 @@ jobs:
               repo: 'irssi.github.io',
               workflow_id: 'pages.yml',
               ref: 'main'
-            })
\ No newline at end of file
+            })
diff --git a/docs/design.html b/docs/design.html
index 3865a7fb..e4f9bb06 100644
--- a/docs/design.html
+++ b/docs/design.html
@@ -162,4 +162,4 @@ server reconnections and irc network splits</li>
   <li>placing channels and queries in windows</li>
   <li>nick completion</li>
   <li>printing infomation of some events</li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/docs/faq.html b/docs/faq.html
index 50b404a0..7909b5b4 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -78,4 +78,4 @@
 
 <h3 id="q-how-to-pronounce-irssi">Q: How to pronounce Irssi?</h3>
 
-<p>A: Check <a href="/assets/irssi.wav">here</a></p>
\ No newline at end of file
+<p>A: Check <a href="/assets/irssi.wav">here</a></p>
diff --git a/src/irc/core/scram.h b/src/irc/core/scram.h
index ee605142..14068e48 100644
--- a/src/irc/core/scram.h
+++ b/src/irc/core/scram.h
@@ -24,4 +24,4 @@ void scram_session_free(SCRAM_SESSION_REC *session);
 scram_status scram_process(SCRAM_SESSION_REC *session, const char *input, char **output,
                            size_t *output_len);
 
-#endif
\ No newline at end of file
+#endif

From 822fd501327aec58c3466d841355159b5f3b9529 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 12 Apr 2024 22:55:20 +0200
Subject: [PATCH 1594/1650] fix /ban command

---
 src/fe-common/irc/fe-events-numeric.c | 33 +--------------------------
 src/fe-common/irc/fe-irc-channels.c   | 32 ++++++++++++++++++++++++++
 src/fe-common/irc/fe-irc-channels.h   |  1 +
 src/fe-common/irc/fe-irc-commands.c   | 14 +++++++-----
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 951bd31f..8035cebf 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -35,6 +35,7 @@
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/fe-common/core/fe-channels.h>
 #include <irssi/src/fe-common/irc/fe-irc-server.h>
+#include <irssi/src/fe-common/irc/fe-irc-channels.h>
 
 static void print_event_received(IRC_SERVER_REC *server, const char *data,
 				 const char *nick, int target_param);
@@ -138,38 +139,6 @@ static void event_end_of_who(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-/* Get time elapsed since an event */
-static char *time_ago(time_t seconds)
-{
-	static char ret[128];
-	long unsigned years, weeks, days, hours, minutes;
-
-	seconds = time(NULL) - seconds;
-
-	years = seconds / (86400 * 365);
-	seconds %= (86400 * 365);
-	weeks = seconds / 604800;
-	days = (seconds / 86400) % 7;
-	hours = (seconds / 3600) % 24;
-	minutes = (seconds / 60) % 60;
-	seconds %= 60;
-
-	if (years)
-		snprintf(ret, sizeof(ret), "%luy %luw %lud", years, weeks, days);
-	else if (weeks)
-		snprintf(ret, sizeof(ret), "%luw %lud %luh", weeks, days, hours);
-	else if (days)
-		snprintf(ret, sizeof(ret), "%lud %luh %lum", days, hours, minutes);
-	else if (hours)
-		snprintf(ret, sizeof(ret), "%luh %lum", hours, minutes);
-	else if (minutes)
-		snprintf(ret, sizeof(ret), "%lum %lus", minutes, (long unsigned) seconds);
-	else
-		snprintf(ret, sizeof(ret), "%lus", (long unsigned) seconds);
-
-	return ret;
-}
-
 static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 {
 	IRC_CHANNEL_REC *chanrec;
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index 93ff3603..39752984 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -73,6 +73,38 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
 	return target;
 }
 
+/* Get time elapsed since an event */
+char *time_ago(time_t seconds)
+{
+	static char ret[128];
+	long unsigned years, weeks, days, hours, minutes;
+
+	seconds = time(NULL) - seconds;
+
+	years = seconds / (86400 * 365);
+	seconds %= (86400 * 365);
+	weeks = seconds / 604800;
+	days = (seconds / 86400) % 7;
+	hours = (seconds / 3600) % 24;
+	minutes = (seconds / 60) % 60;
+	seconds %= 60;
+
+	if (years)
+		snprintf(ret, sizeof(ret), "%luy %luw %lud", years, weeks, days);
+	else if (weeks)
+		snprintf(ret, sizeof(ret), "%luw %lud %luh", weeks, days, hours);
+	else if (days)
+		snprintf(ret, sizeof(ret), "%lud %luh %lum", days, hours, minutes);
+	else if (hours)
+		snprintf(ret, sizeof(ret), "%luh %lum", hours, minutes);
+	else if (minutes)
+		snprintf(ret, sizeof(ret), "%lum %lus", minutes, (long unsigned) seconds);
+	else
+		snprintf(ret, sizeof(ret), "%lus", (long unsigned) seconds);
+
+	return ret;
+}
+
 static void sig_channel_rejoin(SERVER_REC *server, REJOIN_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
diff --git a/src/fe-common/irc/fe-irc-channels.h b/src/fe-common/irc/fe-irc-channels.h
index a5770107..080cd484 100644
--- a/src/fe-common/irc/fe-irc-channels.h
+++ b/src/fe-common/irc/fe-irc-channels.h
@@ -3,6 +3,7 @@
 
 int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target);
 const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target);
+char *time_ago(time_t seconds);
 
 void fe_irc_channels_init(void);
 void fe_irc_channels_deinit(void);
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index 40ad36e0..368a3fa6 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -39,6 +39,7 @@
 #include <irssi/src/fe-common/core/window-items.h>
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/irc/fe-irc-channels.h>
 
 /* SYNTAX: ME <message> */
 static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
@@ -224,15 +225,16 @@ static void bans_show_channel(IRC_CHANNEL_REC *channel, IRC_SERVER_REC *server)
 	/* show bans.. */
         counter = 1;
 	for (tmp = channel->banlist; tmp != NULL; tmp = tmp->next) {
+		char *timestr, *ago;
 		BAN_REC *rec = tmp->data;
+		timestr = my_asctime(rec->time);
+		ago = time_ago(rec->time);
 
 		printformat(server, channel->visible_name, MSGLEVEL_CRAP,
-			    (rec->setby == NULL || *rec->setby == '\0') ?
-			    IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
-			    counter, channel->visible_name,
-			    rec->ban, rec->setby,
-			    (int) (time(NULL)-rec->time));
-                counter++;
+		            (rec->setby == NULL || *rec->setby == '\0') ? IRCTXT_BANLIST :
+		                                                          IRCTXT_BANLIST_LONG,
+		            counter, channel->visible_name, rec->ban, rec->setby, ago, timestr);
+		counter++;
 	}
 }
 

From 19e7d3f6b8fa4610984b7a9145b5b4a29de8ae46 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 12 Apr 2024 23:00:52 +0200
Subject: [PATCH 1595/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 9f6c54a2..ec3b9726 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 53
+#define IRSSI_ABI_VERSION 54
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 2dce273264ca92962adaacf4ee93a531152c4b94 Mon Sep 17 00:00:00 2001
From: Arrigo Marchiori <ardovm@yahoo.it>
Date: Sat, 27 Apr 2024 21:38:21 +0200
Subject: [PATCH 1596/1650] Mention the section of the capsicum settings.

---
 docs/capsicum.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/capsicum.txt b/docs/capsicum.txt
index a3a1b8a7..d2ad920c 100644
--- a/docs/capsicum.txt
+++ b/docs/capsicum.txt
@@ -9,13 +9,13 @@ To make Irssi enter capability mode on startup, add
 capsicum = "yes";
 awaylog_file = "~/irclogs/away.log";
 
-to your ~/.irssi/config and restart the client.  Alternatively you can
-enter it "by hand", using the "/capsicum enter" command.  From the security
-point of view it's strongly preferable to use the former method, to avoid
-establishing connections without the sandbox protection; the "/capsicum"
-command is only intended for experimentation, and in cases where you need
-to do something that's not possible in capability mode - run scripts,
-for example - before continuing.
+to your ~/.irssi/config in the settings/core section, and restart the
+client.  Alternatively you can enter it "by hand", using the
+"/capsicum enter" command.  From the security point of view it's strongly
+preferable to use the former method, to avoid establishing connections
+without the sandbox protection; the "/capsicum" command is only intended
+for experimentation, and in cases where you need to do something that's not
+possible in capability mode - run scripts, for example - before continuing.
 
 There is no way to leave the capability mode, apart from exiting Irssi.
 When running in capability mode, there are certain restrictions - Irssi

From ae094ba3e68c9d57223a0ead21ed4db96f84db61 Mon Sep 17 00:00:00 2001
From: Pontus Lundkvist <p@article.se>
Date: Sun, 17 Nov 2024 23:42:00 +0100
Subject: [PATCH 1597/1650] Bump actions/upload-artifact from deprecated
 (defunct) v1 to v4.

---
 .github/workflows/cifuzz.yml      | 2 +-
 .github/workflows/clangformat.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 6325d671..3b20e427 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -44,7 +44,7 @@ jobs:
         dry-run: false
         sanitizer: ${{ matrix.sanitizer }}
     - name: Upload Crash
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: ${{ matrix.sanitizer }}-artifacts
diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml
index cf701e2e..55aca4f3 100644
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@@ -22,7 +22,7 @@ jobs:
           |
             CLANG_FORMAT=clang-format-14 git-clang-format-14 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
             cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: git-clang-format.diff

From ca1cd7a26a559c5f98165c867b43814d0de3fbeb Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 16 Dec 2024 19:42:12 +0100
Subject: [PATCH 1598/1650] new setuptools broken in github workflow

---
 .github/workflows/abicheck.yml | 2 +-
 .github/workflows/check.yml    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 3ac39146..6149f050 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -4,7 +4,7 @@ env:
   build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
   prefix: /usr/local
   apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
-  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.59.0'
+  get_pip_build_deps: pip3 install 'setuptools<66'; pip3 install wheel; pip3 install 'meson<0.59.0'
   getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
   build-base-ref:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 2fee4b8b..c771504e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -38,6 +38,7 @@ jobs:
         builder: [meson]
         compiler: [clang, gcc]
         flags: [regular]
+        setuptools_ver: [<66]
         include:
           - os: ubuntu-20.04
             builder: meson

From a775f50572bc7751b5ff01e7aa3e2e2d3ea5d262 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 16 Dec 2024 19:57:30 +0100
Subject: [PATCH 1599/1650] add glib dependency to github workflows

---
 .github/workflows/abicheck.yml |  2 +-
 .github/workflows/check.yml    | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 6149f050..d1387b82 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -3,7 +3,7 @@ name: abicheck
 env:
   build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
   prefix: /usr/local
-  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
+  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev
   get_pip_build_deps: pip3 install 'setuptools<66'; pip3 install wheel; pip3 install 'meson<0.59.0'
   getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c771504e..646b58d8 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -5,8 +5,7 @@ on:
   pull_request:
 name: Check Irssi
 env:
-  apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
-  apt_build_deps_meson: ninja-build
+  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev
   get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel; pip3 install meson${meson_ver}
   build_options_meson: -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes
   prefix: ~/irssi-build
@@ -35,20 +34,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-latest]
-        builder: [meson]
         compiler: [clang, gcc]
         flags: [regular]
         setuptools_ver: [<66]
         include:
           - os: ubuntu-20.04
-            builder: meson
             meson_ver: ==0.53.2
             setuptools_ver: <51
           - os: ubuntu-latest
-            builder: meson
             meson_ver: <0.63.0
           - os: ubuntu-latest
-            builder: meson
             flags: meson-latest FAILURE-OK
     steps:
       - name: fetch dist
@@ -61,8 +56,8 @@ jobs:
           meson_ver: ${{ matrix.meson_ver }}
           setuptools_ver: ${{ matrix.setuptools_ver }}
         run: |
-          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
-          eval "$get_pip_build_deps_${{ matrix.builder }}"
+          sudo apt update && sudo apt install $apt_build_deps
+          eval "$get_pip_build_deps_meson"
           curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
       - name: unpack archive
         run: tar xaf artifact/irssi-*.tar.gz
@@ -73,14 +68,12 @@ jobs:
           meson Build $build_options_meson --prefix=${prefix/\~/~}
           ninja -C Build
           ninja -C Build install
-        if: ${{ matrix.builder == 'meson' }}
       - name: run tests with Meson
         run: |
           # ninja test
           cd irssi-*/
           ninja -C Build test
           find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
-        if: ${{ matrix.builder == 'meson' }}
       - name: run launch test
         env:
           TERM: xterm
@@ -125,7 +118,7 @@ jobs:
           meson_ver: ${{ matrix.meson_ver }}
           setuptools_ver: ${{ matrix.setuptools_ver }}
         run: |
-          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_meson
+          sudo apt update && sudo apt install $apt_build_deps
           eval "$get_pip_build_deps_meson"
           curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
       - name: build and install with meson

From a7bb40f5301f28476493162e2375dc0c3d07bf72 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 16 Dec 2024 20:11:24 +0100
Subject: [PATCH 1600/1650] pin setuptools and meson ver for make dist in
 workflow

---
 .github/workflows/check.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 646b58d8..37b59749 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -12,10 +12,14 @@ env:
 jobs:
   dist:
     runs-on: ubuntu-latest
+    env:
+      meson_ver: <0.63.0
+      setuptools_ver: <66
     steps:
       - name: prepare required software
         run: |
           sudo apt update && sudo apt install $apt_build_deps
+          eval "$get_pip_build_deps_meson"
       - uses: actions/checkout@main
       - name: make dist
         run: |

From e8e5bf5d817f5a8b590c8da4b21ebd8d4550f267 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 16 Dec 2024 20:43:48 +0100
Subject: [PATCH 1601/1650] patch old setuptools for python 3.12 for github
 workflow

---
 .github/workflows/check.yml | 24 ++++++++++++++++++++++++
 utils/make-dist.sh          |  9 +++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 37b59749..67465f1a 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -20,6 +20,30 @@ jobs:
         run: |
           sudo apt update && sudo apt install $apt_build_deps
           eval "$get_pip_build_deps_meson"
+          patch ~/.local/lib/python3.12/site-packages/pkg_resources/__init__.py <<- PATCH
+          --- __init__.py       2024-12-16 20:37:46.733230351 +0100
+          +++ __init__.py       2024-12-16 20:38:42.479554540 +0100
+          @@ -2188,7 +2188,8 @@ def resolve_egg_link(path):
+               return next(dist_groups, ())
+           
+           
+          -register_finder(pkgutil.ImpImporter, find_on_path)
+          +if hasattr(pkgutil, 'ImpImporter'):
+          +    register_finder(pkgutil.ImpImporter, find_on_path)
+           
+           if hasattr(importlib_machinery, 'FileFinder'):
+               register_finder(importlib_machinery.FileFinder, find_on_path)
+          @@ -2345,7 +2346,8 @@ def file_ns_handler(importer, path_item,
+                   return subpath
+           
+           
+          -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+          +if hasattr(pkgutil, 'ImpImporter'):
+          +    register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+           register_namespace_handler(zipimport.zipimporter, file_ns_handler)
+           
+           if hasattr(importlib_machinery, 'FileFinder'):
+          PATCH
       - uses: actions/checkout@main
       - name: make dist
         run: |
diff --git a/utils/make-dist.sh b/utils/make-dist.sh
index 3ea56599..81d450d7 100755
--- a/utils/make-dist.sh
+++ b/utils/make-dist.sh
@@ -80,10 +80,11 @@ echo "Creating sdist..."
 python3 -W ignore -c 'from setuptools import *;setup()' --quiet sdist --formats=tar
 
 tar --delete --file "dist/$name-$version.tar" \
-    "$name-$version/setup.cfg" \
-    "$name-$version/pyproject.toml" \
-    "$name-$version/$name.egg-info" \
-    "$name-$version/PKG-INFO"
+    $(tar tf "dist/$name-$version.tar" | grep -F \
+      "$name-$version/setup.cfg
+$name-$version/pyproject.toml
+$name-$version/$name.egg-info
+$name-$version/PKG-INFO")
 
 echo "Zipping..."
 xz -k "dist/$name-$version.tar"

From d6c146a1fae01f9eb5693dbd98adfa41701c4ad9 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 24 Mar 2025 08:54:01 +0100
Subject: [PATCH 1602/1650] initialise memory in ctcp ping reply

---
 src/fe-common/irc/fe-ctcp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index 14893966..cc60ea92 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -119,11 +119,10 @@ static void ctcp_default_reply(IRC_SERVER_REC *server, const char *data,
 	g_free(ctcp);
 }
 
-static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
-			    const char *nick, const char *addr,
-			    const char *target)
+static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data, const char *nick,
+                            const char *addr, const char *target)
 {
-	gint64 tv, tv2;
+	gint64 tv, tv2 = 0;
 	long usecs;
 
 	g_return_if_fail(data != NULL);
@@ -141,8 +140,9 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
 	tv2 += tv * G_TIME_SPAN_SECOND;
 	tv = g_get_real_time();
 	usecs = tv - tv2;
-	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
-		    IRCTXT_CTCP_PING_REPLY, nick, usecs / G_TIME_SPAN_SECOND, usecs % G_TIME_SPAN_SECOND);
+	printformat(server, server_ischannel(SERVER(server), target) ? target : nick,
+	            MSGLEVEL_CTCPS, IRCTXT_CTCP_PING_REPLY, nick, usecs / G_TIME_SPAN_SECOND,
+	            usecs % G_TIME_SPAN_SECOND);
 }
 
 void fe_ctcp_init(void)

From 26fd0585cddfa5282bc09d1b4e60afab8ab28e70 Mon Sep 17 00:00:00 2001
From: steering7253 <steering7253@proton.me>
Date: Sat, 2 Nov 2024 17:08:32 -0600
Subject: [PATCH 1603/1650] add ipaddr and family to connrec and perl
 SERVER_REC

---
 docs/perl.txt                 | 2 ++
 src/core/server-connect-rec.h | 1 +
 src/core/servers.c            | 8 +++++++-
 src/perl/perl-common.c        | 2 ++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/perl.txt b/docs/perl.txt
index 964f4f72..b8e097c7 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -522,6 +522,8 @@ Connect->{}
   address - Address where we connected (irc.blah.org)
   port - Port where we connected
   chatnet - Chat network
+  chosen_family - IP family chosen to connect to
+  ipaddr - IP address connected to
 
   password - Password we used in connection.
   wanted_nick - Nick which we would prefer to use
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 2f68bd04..16513109 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -12,6 +12,7 @@ char *proxy_string, *proxy_string_after, *proxy_password;
 
 unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */
 unsigned short chosen_family; /* family actually chosen during name resolution */
+char *ipaddr;
 char *tag; /* try to keep this tag when connected to server */
 char *address;
 int port;
diff --git a/src/core/servers.c b/src/core/servers.c
index 65829c10..0ea8f937 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -212,13 +212,18 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 
 	g_return_if_fail(ip != NULL || unix_socket != NULL);
 
+	if (ip != NULL) {
+		server->connrec->chosen_family = ip->family;
+		net_ip2host(ip, ipaddr);
+		server->connrec->ipaddr = g_strdup(ipaddr);
+	}
+
 	signal_emit("server connecting", 2, server, ip);
 
 	if (server->connrec->no_connect)
 		return;
 
 	if (ip != NULL) {
-		server->connrec->chosen_family = ip->family;
 		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
@@ -637,6 +642,7 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->proxy_string_after);
 	g_free_not_null(conn->proxy_password);
 
+	g_free_not_null(conn->ipaddr);
 	g_free_not_null(conn->tag);
 	g_free_not_null(conn->address);
 	g_free_not_null(conn->chatnet);
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index d9d00035..c54ee643 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -287,6 +287,8 @@ void perl_connect_fill_hash(HV *hv, SERVER_CONNECT_REC *conn)
 	(void) hv_store(hv, "type", 4, new_pv(type), 0);
 	(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
 
+	(void) hv_store(hv, "chosen_family", 13, newSViv(conn->chosen_family), 0);
+	(void) hv_store(hv, "ipaddr", 6, new_pv(conn->ipaddr), 0);
 	(void) hv_store(hv, "tag", 3, new_pv(conn->tag), 0);
 	(void) hv_store(hv, "address", 7, new_pv(conn->address), 0);
 	(void) hv_store(hv, "port", 4, newSViv(conn->port), 0);

From 49d7302e986dc41724f6ee9dfba97d950d3ce555 Mon Sep 17 00:00:00 2001
From: steering7253 <steering7253@proton.me>
Date: Mon, 7 Apr 2025 13:53:39 -0600
Subject: [PATCH 1604/1650] fix irssi SASL negotiation with multiple CAP ACK

when attempting SASL, if multiple CAP ACK were received (for example,
because a script sent an additional CAP REQ), then any not containing
`sasl` would cause SASL to fail (immediately aborting the connection
with no message, depending on sasl_disconnect_on_failure setting)

check not only if SASL is set in this line, but also if we've already
seen it in a previous line.
---
 src/irc/core/irc-cap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index ce7e1616..2c2df7f9 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -234,7 +234,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
 		}
 	}
 	else if (!g_ascii_strcasecmp(evt, "ACK")) {
-		int got_sasl = FALSE;
+		int got_sasl = (i_slist_find_string(server->cap_active, "sasl") != NULL);
 
 		/* Emit a signal for every ack'd cap */
 		for (i = 0; i < caps_length; i++) {

From 99c37387a402791e17b0bde5b5ee5ddf3225fc4d Mon Sep 17 00:00:00 2001
From: steering7253 <steering7253@proton.me>
Date: Mon, 7 Apr 2025 14:36:10 -0600
Subject: [PATCH 1605/1650] bump ABI_VERSION

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index ec3b9726..b5947de6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 54
+#define IRSSI_ABI_VERSION 55
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 7bac5eb76250d26d93048ee1595a36c04daadcf1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 8 Apr 2025 07:42:10 +0200
Subject: [PATCH 1606/1650] include curses.h when needed

---
 meson.build                 | 22 ++++++++++++++++++++++
 src/fe-text/term-terminfo.c | 10 ++++++----
 src/fe-text/terminfo-core.c |  3 +++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 0d06c466..866bfd27 100644
--- a/meson.build
+++ b/meson.build
@@ -569,6 +569,28 @@ foreach h : headers
   endif
 endforeach
 
+if want_textui and conf.get('HAVE_TERM_H', 0) == 1
+  if not cc.links('''
+#include <stdio.h>
+#include <term.h>
+int main () {
+  return tputs("x", 1, putchar);
+}
+''', dependencies : textui_dep)
+    if cc.has_header('curses.h') and cc.links('''
+#include <curses.h>
+#include <term.h>
+int main () {
+  return tputs("x", 1, putchar);
+}
+''', dependencies : textui_dep, name : 'working Curses')
+      conf.set('NEED_CURSES_H', 1, description : 'tputs needs curses.h')
+    else
+      error('could not link terminfo')
+    endif
+  endif
+endif
+
 conf.set('HAVE_LIBUTF8PROC', have_libutf8proc)
 conf.set_quoted('PACKAGE_VERSION', package_version)
 conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 06310cc9..698ff84c 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -31,6 +31,9 @@
 #include <stdio.h>
 
 #ifdef HAVE_TERM_H
+#ifdef NEED_CURSES_H
+#include <curses.h>
+#endif
 #include <term.h>
 #else
 /* TODO: This needs arguments, starting with C2X. */
@@ -40,14 +43,13 @@ int tputs();
 /* returns number of characters in the beginning of the buffer being a
    a single character, or -1 if more input is needed. The character will be
    saved in result */
-typedef int (*TERM_INPUT_FUNC)(const unsigned char *buffer, int size,
-			       unichar *result);
+typedef int (*TERM_INPUT_FUNC)(const unsigned char *buffer, int size, unichar *result);
 
 struct _TERM_WINDOW {
-        /* Terminal to use for window */
+	/* Terminal to use for window */
 	TERM_REC *term;
 
-        /* Area for window in terminal */
+	/* Area for window in terminal */
 	int x, y;
 	int width, height;
 };
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 7c21d509..bd735731 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -13,6 +13,9 @@ inline static int term_putchar(int c)
 }
 
 #ifdef HAVE_TERM_H
+#ifdef NEED_CURSES_H
+#include <curses.h>
+#endif
 #include <term.h>
 #else
 /* Don't bother including curses.h because of these -

From 382bde9ab3ee8290f03012432d7c772d373fc987 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 8 Apr 2025 08:04:21 +0200
Subject: [PATCH 1607/1650] namespace TERM_REC functions (conflict with
 curses.h)

---
 src/fe-text/term-terminfo.c |  34 +++----
 src/fe-text/terminfo-core.c | 181 ++++++++++++++++++------------------
 src/fe-text/terminfo-core.h |  87 ++++++++---------
 3 files changed, 148 insertions(+), 154 deletions(-)

diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 698ff84c..d4db942a 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -369,8 +369,8 @@ void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigne
 	if (!term_use_colors && bg > 0)
 		col |= ATTR_REVERSE;
 
-        set_normal = ((col & ATTR_RESETFG) && last_fg != COLOR_RESET) ||
-		((col & ATTR_RESETBG) && last_bg != COLOR_RESET);
+	set_normal = ((col & ATTR_RESETFG) && last_fg != COLOR_RESET) ||
+	             ((col & ATTR_RESETBG) && last_bg != COLOR_RESET);
 	if (((last_attrs & ATTR_BOLD) && (col & ATTR_BOLD) == 0) ||
 	    ((last_attrs & ATTR_REVERSE) && (col & ATTR_REVERSE) == 0) ||
 	    ((last_attrs & ATTR_BLINK) && (col & ATTR_BLINK) == 0)) {
@@ -381,19 +381,17 @@ void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigne
 
 	if (set_normal) {
 		last_fg = last_bg = COLOR_RESET;
-                last_attrs = 0;
+		last_attrs = 0;
 		terminfo_set_normal();
 	}
 
 	/* set foreground color */
-	if (fg != last_fg &&
-	    (fg != 0 || (col & ATTR_RESETFG) == 0)) {
-                if (term_use_colors) {
+	if (fg != last_fg && (fg != 0 || (col & ATTR_RESETFG) == 0)) {
+		if (term_use_colors) {
 			last_fg = fg;
 			if (fg >> 8)
-				termctl_set_color_24bit(0,
-							last_fg == COLOR_BLACK24 ? 0
-							: last_fg >> 8);
+				termctl_set_color_24bit(0, last_fg == COLOR_BLACK24 ? 0 :
+				                                                      last_fg >> 8);
 			else
 				terminfo_set_fg(last_fg);
 		}
@@ -401,19 +399,17 @@ void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigne
 
 	/* set background color */
 	if (window && window->term->TI_colors &&
-	    (term_color256map[bg&0xff]&8) == window->term->TI_colors)
+	    (term_color256map[bg & 0xff] & 8) == window->term->TI_colors)
 		col |= ATTR_BLINK;
 	if (col & ATTR_BLINK)
-		current_term->set_blink(current_term);
+		current_term->tr_set_blink(current_term);
 
-	if (bg != last_bg &&
-	    (bg != 0 || (col & ATTR_RESETBG) == 0)) {
-                if (term_use_colors) {
+	if (bg != last_bg && (bg != 0 || (col & ATTR_RESETBG) == 0)) {
+		if (term_use_colors) {
 			last_bg = bg;
 			if (bg >> 8)
-				termctl_set_color_24bit(1,
-							last_bg == COLOR_BLACK24 ? 0
-							: last_bg >> 8);
+				termctl_set_color_24bit(1, last_bg == COLOR_BLACK24 ? 0 :
+				                                                      last_bg >> 8);
 			else
 				terminfo_set_bg(last_bg);
 		}
@@ -425,7 +421,7 @@ void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigne
 
 	/* bold */
 	if (window && window->term->TI_colors &&
-	    (term_color256map[fg&0xff]&8) == window->term->TI_colors)
+	    (term_color256map[fg & 0xff] & 8) == window->term->TI_colors)
 		col |= ATTR_BOLD;
 	if (col & ATTR_BOLD)
 		terminfo_set_bold();
@@ -445,7 +441,7 @@ void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigne
 		terminfo_set_italic(FALSE);
 
 	/* update the new attribute settings whilst ignoring color values.  */
-	last_attrs = col & ~( BG_MASK | FG_MASK );
+	last_attrs = col & ~(BG_MASK | FG_MASK);
 }
 
 void term_move(TERM_WINDOW *window, int x, int y)
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index bd735731..fe98efae 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -172,20 +172,20 @@ static void _set_cursor_visible(TERM_REC *term, int set)
 /* Scroll (change_scroll_region+parm_rindex+parm_index / csr+rin+indn) */
 static void _scroll_region(TERM_REC *term, int y1, int y2, int count)
 {
-        /* setup the scrolling region to wanted area */
-        scroll_region_setup(term, y1, y2);
+	/* setup the scrolling region to wanted area */
+	scroll_region_setup(term, y1, y2);
 
-	term->move(term, 0, y1);
+	term->tr_move(term, 0, y1);
 	if (count > 0) {
-		term->move(term, 0, y2);
+		term->tr_move(term, 0, y2);
 		tput(tparm(term->TI_indn, count, count, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
-		term->move(term, 0, y1);
+		term->tr_move(term, 0, y1);
 		tput(tparm(term->TI_rin, -count, -count, 0, 0, 0, 0, 0, 0, 0));
 	}
 
-        /* reset the scrolling region to full screen */
-        scroll_region_setup(term, 0, term->height-1);
+	/* reset the scrolling region to full screen */
+	scroll_region_setup(term, 0, term->height - 1);
 }
 
 /* Scroll (change_scroll_region+scroll_reverse+scroll_forward / csr+ri+ind) */
@@ -193,21 +193,21 @@ static void _scroll_region_1(TERM_REC *term, int y1, int y2, int count)
 {
 	int i;
 
-        /* setup the scrolling region to wanted area */
-        scroll_region_setup(term, y1, y2);
+	/* setup the scrolling region to wanted area */
+	scroll_region_setup(term, y1, y2);
 
 	if (count > 0) {
-		term->move(term, 0, y2);
+		term->tr_move(term, 0, y2);
 		for (i = 0; i < count; i++)
 			tput(tparm(term->TI_ind, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
-		term->move(term, 0, y1);
+		term->tr_move(term, 0, y1);
 		for (i = count; i < 0; i++)
 			tput(tparm(term->TI_ri, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	}
 
-        /* reset the scrolling region to full screen */
-        scroll_region_setup(term, 0, term->height-1);
+	/* reset the scrolling region to full screen */
+	scroll_region_setup(term, 0, term->height - 1);
 }
 
 /* Scroll (parm_insert_line+parm_delete_line / il+dl) */
@@ -216,22 +216,22 @@ static void _scroll_line(TERM_REC *term, int y1, int y2, int count)
 	/* setup the scrolling region to wanted area -
 	   this might not necessarily work with il/dl, but at least it
 	   looks better if it does */
-        scroll_region_setup(term, y1, y2);
+	scroll_region_setup(term, y1, y2);
 
 	if (count > 0) {
-		term->move(term, 0, y1);
+		term->tr_move(term, 0, y1);
 		tput(tparm(term->TI_dl, count, count, 0, 0, 0, 0, 0, 0, 0));
-		term->move(term, 0, y2-count+1);
+		term->tr_move(term, 0, y2 - count + 1);
 		tput(tparm(term->TI_il, count, count, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
-		term->move(term, 0, y2+count+1);
+		term->tr_move(term, 0, y2 + count + 1);
 		tput(tparm(term->TI_dl, -count, -count, 0, 0, 0, 0, 0, 0, 0));
-		term->move(term, 0, y1);
+		term->tr_move(term, 0, y1);
 		tput(tparm(term->TI_il, -count, -count, 0, 0, 0, 0, 0, 0, 0));
 	}
 
-        /* reset the scrolling region to full screen */
-        scroll_region_setup(term, 0, term->height-1);
+	/* reset the scrolling region to full screen */
+	scroll_region_setup(term, 0, term->height - 1);
 }
 
 /* Scroll (insert_line+delete_line / il1+dl1) */
@@ -240,17 +240,17 @@ static void _scroll_line_1(TERM_REC *term, int y1, int y2, int count)
 	int i;
 
 	if (count > 0) {
-		term->move(term, 0, y1);
-                for (i = 0; i < count; i++)
+		term->tr_move(term, 0, y1);
+		for (i = 0; i < count; i++)
 			tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-		term->move(term, 0, y2-count+1);
-                for (i = 0; i < count; i++)
+		term->tr_move(term, 0, y2 - count + 1);
+		for (i = 0; i < count; i++)
 			tput(tparm(term->TI_il1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (count < 0) {
-		term->move(term, 0, y2+count+1);
+		term->tr_move(term, 0, y2 + count + 1);
 		for (i = count; i < 0; i++)
 			tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-		term->move(term, 0, y1);
+		term->tr_move(term, 0, y1);
 		for (i = count; i < 0; i++)
 			tput(tparm(term->TI_il1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 	}
@@ -265,14 +265,14 @@ static void _clear_screen(TERM_REC *term)
 /* Clear screen (clr_eos / ed) */
 static void _clear_eos(TERM_REC *term)
 {
-        term->move(term, 0, 0);
+	term->tr_move(term, 0, 0);
 	tput(tparm(term->TI_ed, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
 /* Clear screen (parm_delete_line / dl) */
 static void _clear_del(TERM_REC *term)
 {
-        term->move(term, 0, 0);
+	term->tr_move(term, 0, 0);
 	tput(tparm(term->TI_dl, term->height, term->height, 0, 0, 0, 0, 0, 0, 0));
 }
 
@@ -281,8 +281,8 @@ static void _clear_del_1(TERM_REC *term)
 {
 	int i;
 
-	term->move(term, 0, 0);
-        for (i = 0; i < term->height; i++)
+	term->tr_move(term, 0, 0);
+	for (i = 0; i < term->height; i++)
 		tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
 }
 
@@ -455,10 +455,7 @@ static void terminfo_colors_deinit(TERM_REC *term)
    terminal capabilities don't contain color codes */
 void terminfo_setup_colors(TERM_REC *term, int force)
 {
-	static const char ansitab[16] = {
-		0, 4, 2, 6, 1, 5, 3, 7,
-		8, 12, 10, 14, 9, 13, 11, 15
-	};
+	static const char ansitab[16] = { 0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15 };
 	unsigned int i, color;
 
 	terminfo_colors_deinit(term);
@@ -466,16 +463,15 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	if (force && term->TI_setf == NULL && term->TI_setaf == NULL)
 		term->TI_colors = 8;
 
-	if ((term->TI_setf || term->TI_setaf || force) &&
-	     term->TI_colors > 0) {
+	if ((term->TI_setf || term->TI_setaf || force) && term->TI_colors > 0) {
 		term->TI_fg = g_new0(char *, term->TI_colors);
 		term->TI_bg = g_new0(char *, term->TI_colors);
-		term->set_fg = _set_fg;
-		term->set_bg = _set_bg;
+		term->tr_set_fg = _set_fg;
+		term->tr_set_bg = _set_bg;
 	} else {
 		/* no colors */
 		term->TI_colors = 0;
-		term->set_fg = term->set_bg = _ignore_parm;
+		term->tr_set_fg = term->tr_set_bg = _ignore_parm;
 	}
 
 	if (term->TI_setaf) {
@@ -489,7 +485,7 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 			term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
-                        term->TI_fg[i] = g_strdup_printf("\033[%dm", 30+ansitab[i]);
+			term->TI_fg[i] = g_strdup_printf("\033[%dm", 30 + ansitab[i]);
 	}
 
 	if (term->TI_setab) {
@@ -503,7 +499,7 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 			term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0, 0, 0, 0, 0, 0, 0, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
-                        term->TI_bg[i] = g_strdup_printf("\033[%dm", 40+ansitab[i]);
+			term->TI_bg[i] = g_strdup_printf("\033[%dm", 40 + ansitab[i]);
 	}
 }
 
@@ -581,12 +577,12 @@ static int term_setup(TERM_REC *term)
 {
 	GString *str;
 	int err;
-        char *term_env;
+	char *term_env;
 
 	term_env = getenv("TERM");
 	if (term_env == NULL) {
 		fprintf(stderr, "TERM environment not set\n");
-                return 0;
+		return 0;
 	}
 
 	if (setupterm(term_env, 1, &err) != 0) {
@@ -594,98 +590,99 @@ static int term_setup(TERM_REC *term)
 		return 0;
 	}
 
-        term_fill_capabilities(term);
+	term_fill_capabilities(term);
 
 	/* Cursor movement */
 	if (term->TI_cup)
-		term->move = _move_cup;
+		term->tr_move = _move_cup;
 	else if (term->TI_hpa && term->TI_vpa)
-		term->move = _move_pa;
+		term->tr_move = _move_pa;
 	else {
-                fprintf(stderr, "Terminal doesn't support cursor movement\n");
+		fprintf(stderr, "Terminal doesn't support cursor movement\n");
 		return 0;
 	}
-	term->move_relative = _move_relative;
-	term->set_cursor_visible = term->TI_civis && term->TI_cnorm ?
-		_set_cursor_visible : _ignore_parm;
+	term->tr_move_relative = _move_relative;
+	term->tr_set_cursor_visible =
+	    term->TI_civis && term->TI_cnorm ? _set_cursor_visible : _ignore_parm;
 
-        /* Scrolling */
+	/* Scrolling */
 	if ((term->TI_csr || term->TI_wind) && term->TI_rin && term->TI_indn)
-		term->scroll = _scroll_region;
+		term->tr_scroll = _scroll_region;
 	else if (term->TI_il && term->TI_dl)
-		term->scroll = _scroll_line;
+		term->tr_scroll = _scroll_line;
 	else if ((term->TI_csr || term->TI_wind) && term->TI_ri && term->TI_ind)
-		term->scroll = _scroll_region_1;
-	else if (term->scroll == NULL && (term->TI_il1 && term->TI_dl1))
-		term->scroll = _scroll_line_1;
-	else if (term->scroll == NULL) {
-                fprintf(stderr, "Terminal doesn't support scrolling\n");
+		term->tr_scroll = _scroll_region_1;
+	else if (term->tr_scroll == NULL && (term->TI_il1 && term->TI_dl1))
+		term->tr_scroll = _scroll_line_1;
+	else if (term->tr_scroll == NULL) {
+		fprintf(stderr, "Terminal doesn't support scrolling\n");
 		return 0;
 	}
 
 	/* Clearing screen */
 	if (term->TI_clear)
-		term->clear = _clear_screen;
+		term->tr_clear = _clear_screen;
 	else if (term->TI_ed)
-		term->clear = _clear_eos;
+		term->tr_clear = _clear_eos;
 	else if (term->TI_dl)
-		term->clear = _clear_del;
+		term->tr_clear = _clear_del;
 	else if (term->TI_dl1)
-		term->clear = _clear_del_1;
+		term->tr_clear = _clear_del_1;
 	else {
 		/* we could do this by line inserts as well, but don't
 		   bother - if some terminal has insert line it most probably
 		   has delete line as well, if not a regular clear screen */
-                fprintf(stderr, "Terminal doesn't support clearing screen\n");
+		fprintf(stderr, "Terminal doesn't support clearing screen\n");
 		return 0;
 	}
 
 	/* Clearing to end of line */
 	if (term->TI_el)
-		term->clrtoeol = _clrtoeol;
+		term->tr_clrtoeol = _clrtoeol;
 	else {
-                fprintf(stderr, "Terminal doesn't support clearing to end of line\n");
+		fprintf(stderr, "Terminal doesn't support clearing to end of line\n");
 		return 0;
 	}
 
 	/* Repeating character */
 	if (term->TI_rep)
-		term->repeat = _repeat;
+		term->tr_repeat = _repeat;
 	else
-		term->repeat = _repeat_manual;
+		term->tr_repeat = _repeat_manual;
 
 	/* Bold, underline, standout, reverse, italics */
-	term->set_blink = term->TI_blink ? _set_blink : _ignore;
-	term->set_bold = term->TI_bold ? _set_bold : _ignore;
-	term->set_reverse = term->TI_rev ? _set_reverse :
-		term->TI_smso ? _set_standout_on : _ignore;
-	term->set_uline = term->TI_smul && term->TI_rmul ?
-		_set_uline : _ignore_parm;
-	term->set_standout = term->TI_smso && term->TI_rmso ?
-		_set_standout : _ignore_parm;
-	term->set_italic = term->TI_sitm && term->TI_ritm ?
-		_set_italic : _ignore_parm;
+	term->tr_set_blink = term->TI_blink ? _set_blink : _ignore;
+	term->tr_set_bold = term->TI_bold ? _set_bold : _ignore;
+	term->tr_set_reverse = term->TI_rev  ? _set_reverse :
+	                       term->TI_smso ? _set_standout_on :
+	                                       _ignore;
+	term->tr_set_uline = term->TI_smul && term->TI_rmul ? _set_uline : _ignore_parm;
+	term->tr_set_standout = term->TI_smso && term->TI_rmso ? _set_standout : _ignore_parm;
+	term->tr_set_italic = term->TI_sitm && term->TI_ritm ? _set_italic : _ignore_parm;
 
-        /* Create a string to set all attributes off */
-        str = g_string_new(NULL);
+	/* Create a string to set all attributes off */
+	str = g_string_new(NULL);
 	if (term->TI_sgr0)
 		g_string_append(str, term->TI_sgr0);
-	if (term->TI_rmul && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmul, term->TI_sgr0) != 0))
+	if (term->TI_rmul &&
+	    (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmul, term->TI_sgr0) != 0))
 		g_string_append(str, term->TI_rmul);
-	if (term->TI_rmso && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmso, term->TI_sgr0) != 0))
+	if (term->TI_rmso &&
+	    (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmso, term->TI_sgr0) != 0))
 		g_string_append(str, term->TI_rmso);
-	if (term->TI_ritm && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_ritm, term->TI_sgr0) != 0))
+	if (term->TI_ritm &&
+	    (term->TI_sgr0 == NULL || g_strcmp0(term->TI_ritm, term->TI_sgr0) != 0))
 		g_string_append(str, term->TI_ritm);
-        term->TI_normal = str->str;
+	term->TI_normal = str->str;
 	g_string_free(str, FALSE);
-        term->set_normal = _set_normal;
+	term->tr_set_normal = _set_normal;
 
-	term->beep = term->TI_bel ? _beep : _ignore;
+	term->tr_beep = term->TI_bel ? _beep : _ignore;
 
 	terminfo_setup_colors(term, FALSE);
 	terminfo_input_init0(term);
-        terminfo_cont(term);
-        return 1;
+	terminfo_cont(term);
+	return 1;
 }
 
 void term_set_appkey_mode(int enable)
@@ -730,14 +727,14 @@ void terminfo_core_deinit(TERM_REC *term)
 	TERM_REC *old_term;
 
 	old_term = current_term;
-        current_term = term;
-	term->set_normal(term);
-        current_term = old_term;
+	current_term = term;
+	term->tr_set_normal(term);
+	current_term = old_term;
 
-        terminfo_stop(term);
+	terminfo_stop(term);
 
 	g_free(term->TI_normal);
 	terminfo_colors_deinit(term);
 
-        g_free(term);
+	g_free(term);
 }
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index a077d0bf..ba103de9 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -3,48 +3,49 @@
 
 #include <termios.h>
 
-#define terminfo_move(x, y) current_term->move(current_term, x, y)
-#define terminfo_move_relative(oldx, oldy, x, y) current_term->move_relative(current_term, oldx, oldy, x, y)
-#define terminfo_set_cursor_visible(set) current_term->set_cursor_visible(current_term, set)
-#define terminfo_scroll(y1, y2, count) current_term->scroll(current_term, y1, y2, count)
-#define terminfo_clear() current_term->clear(current_term)
-#define terminfo_clrtoeol() current_term->clrtoeol(current_term)
-#define terminfo_repeat(chr, count) current_term->repeat(current_term, chr, count)
-#define terminfo_set_fg(color) current_term->set_fg(current_term, color)
-#define terminfo_set_bg(color) current_term->set_bg(current_term, color)
-#define terminfo_set_normal() current_term->set_normal(current_term)
-#define terminfo_set_bold() current_term->set_bold(current_term)
-#define terminfo_set_uline(set) current_term->set_uline(current_term, set)
-#define terminfo_set_standout(set) current_term->set_standout(current_term, set)
-#define terminfo_set_reverse() current_term->set_reverse(current_term)
-#define terminfo_set_italic(set) current_term->set_italic(current_term, set)
+#define terminfo_move(x, y) current_term->tr_move(current_term, x, y)
+#define terminfo_move_relative(oldx, oldy, x, y)                                                   \
+	current_term->tr_move_relative(current_term, oldx, oldy, x, y)
+#define terminfo_set_cursor_visible(set) current_term->tr_set_cursor_visible(current_term, set)
+#define terminfo_scroll(y1, y2, count) current_term->tr_scroll(current_term, y1, y2, count)
+#define terminfo_clear() current_term->tr_clear(current_term)
+#define terminfo_clrtoeol() current_term->tr_clrtoeol(current_term)
+#define terminfo_repeat(chr, count) current_term->tr_repeat(current_term, chr, count)
+#define terminfo_set_fg(color) current_term->tr_set_fg(current_term, color)
+#define terminfo_set_bg(color) current_term->tr_set_bg(current_term, color)
+#define terminfo_set_normal() current_term->tr_set_normal(current_term)
+#define terminfo_set_bold() current_term->tr_set_bold(current_term)
+#define terminfo_set_uline(set) current_term->tr_set_uline(current_term, set)
+#define terminfo_set_standout(set) current_term->tr_set_standout(current_term, set)
+#define terminfo_set_reverse() current_term->tr_set_reverse(current_term)
+#define terminfo_set_italic(set) current_term->tr_set_italic(current_term, set)
 #define terminfo_is_colors_set(term) (term->TI_fg != NULL)
-#define terminfo_beep(term) current_term->beep(current_term)
+#define terminfo_beep(term) current_term->tr_beep(current_term)
 
 typedef struct _TERM_REC TERM_REC;
 
 struct _TERM_REC {
-        /* Functions */
-	void (*move)(TERM_REC *term, int x, int y);
-	void (*move_relative)(TERM_REC *term, int oldx, int oldy, int x, int y);
-	void (*set_cursor_visible)(TERM_REC *term, int set);
-	void (*scroll)(TERM_REC *term, int y1, int y2, int count);
+	/* Functions */
+	void (*tr_move)(TERM_REC *term, int x, int y);
+	void (*tr_move_relative)(TERM_REC *term, int oldx, int oldy, int x, int y);
+	void (*tr_set_cursor_visible)(TERM_REC *term, int set);
+	void (*tr_scroll)(TERM_REC *term, int y1, int y2, int count);
 
-        void (*clear)(TERM_REC *term);
-	void (*clrtoeol)(TERM_REC *term);
-	void (*repeat)(TERM_REC *term, char chr, int count);
+	void (*tr_clear)(TERM_REC *term);
+	void (*tr_clrtoeol)(TERM_REC *term);
+	void (*tr_repeat)(TERM_REC *term, char chr, int count);
 
-	void (*set_fg)(TERM_REC *term, int color);
-	void (*set_bg)(TERM_REC *term, int color);
-	void (*set_normal)(TERM_REC *term);
-	void (*set_blink)(TERM_REC *term);
-	void (*set_bold)(TERM_REC *term);
-	void (*set_reverse)(TERM_REC *term);
-	void (*set_uline)(TERM_REC *term, int set);
-	void (*set_standout)(TERM_REC *term, int set);
-	void (*set_italic)(TERM_REC *term, int set);
+	void (*tr_set_fg)(TERM_REC *term, int color);
+	void (*tr_set_bg)(TERM_REC *term, int color);
+	void (*tr_set_normal)(TERM_REC *term);
+	void (*tr_set_blink)(TERM_REC *term);
+	void (*tr_set_bold)(TERM_REC *term);
+	void (*tr_set_reverse)(TERM_REC *term);
+	void (*tr_set_uline)(TERM_REC *term, int set);
+	void (*tr_set_standout)(TERM_REC *term, int set);
+	void (*tr_set_italic)(TERM_REC *term, int set);
 
-        void (*beep)(TERM_REC *term);
+	void (*tr_beep)(TERM_REC *term);
 
 #ifndef HAVE_TERMINFO
 	char buffer1[1024], buffer2[1024];
@@ -52,13 +53,13 @@ struct _TERM_REC {
 	FILE *in, *out;
 	struct termios tio, old_tio;
 
-        /* Terminal size */
-        int width, height;
+	/* Terminal size */
+	int width, height;
 
-        /* Cursor movement */
+	/* Cursor movement */
 	const char *TI_smcup, *TI_rmcup, *TI_cup;
 	const char *TI_hpa, *TI_vpa, *TI_cub1, *TI_cuf1;
-        const char *TI_civis, *TI_cnorm;
+	const char *TI_civis, *TI_cnorm;
 
 	/* Scrolling */
 	const char *TI_csr, *TI_wind;
@@ -68,26 +69,26 @@ struct _TERM_REC {
 	/* Clearing screen */
 	const char *TI_clear, *TI_ed; /* + *TI_dl, *TI_dl1; */
 
-        /* Clearing to end of line */
+	/* Clearing to end of line */
 	const char *TI_el;
 
 	/* Repeating character */
 	const char *TI_rep;
 
 	/* Colors */
-	int TI_colors; /* numbers of colors in TI_fg[] and TI_bg[] */
-	const char *TI_sgr0; /* turn off all attributes */
+	int TI_colors;                 /* numbers of colors in TI_fg[] and TI_bg[] */
+	const char *TI_sgr0;           /* turn off all attributes */
 	const char *TI_smul, *TI_rmul; /* underline on/off */
 	const char *TI_smso, *TI_rmso; /* standout on/off */
 	const char *TI_sitm, *TI_ritm; /* italic on/off */
 	const char *TI_bold, *TI_blink, *TI_rev;
 	const char *TI_setaf, *TI_setab, *TI_setf, *TI_setb;
 
-        /* Colors - generated and dynamically allocated */
+	/* Colors - generated and dynamically allocated */
 	char **TI_fg, **TI_bg, *TI_normal;
 
 	/* Beep */
-        char *TI_bel;
+	char *TI_bel;
 
 	/* Keyboard-transmit mode */
 	const char *TI_smkx;

From 6dce0a091b8578fe5c715c13c05f4523f99bec27 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 7 Apr 2025 19:01:13 +0200
Subject: [PATCH 1608/1650] test solaris build with vmactions

---
 .github/workflows/solarisvm.yml | 104 ++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 .github/workflows/solarisvm.yml

diff --git a/.github/workflows/solarisvm.yml b/.github/workflows/solarisvm.yml
new file mode 100644
index 00000000..0681b0e3
--- /dev/null
+++ b/.github/workflows/solarisvm.yml
@@ -0,0 +1,104 @@
+on:
+  push:
+    branches:
+     - master
+  pull_request:
+  workflow_dispatch:
+name: Check Irssi on Solaris
+env:
+  get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel
+  prefix: ~/irssi-build
+jobs:
+  dist:
+    runs-on: ubuntu-latest
+    env:
+      setuptools_ver: <66
+    steps:
+      - name: prepare required software
+        run: |
+          sudo apt update && sudo apt install $apt_build_deps
+          eval "$get_pip_build_deps_meson"
+          patch ~/.local/lib/python3.12/site-packages/pkg_resources/__init__.py <<- PATCH
+          --- __init__.py       2024-12-16 20:37:46.733230351 +0100
+          +++ __init__.py       2024-12-16 20:38:42.479554540 +0100
+          @@ -2188,7 +2188,8 @@ def resolve_egg_link(path):
+               return next(dist_groups, ())
+           
+           
+          -register_finder(pkgutil.ImpImporter, find_on_path)
+          +if hasattr(pkgutil, 'ImpImporter'):
+          +    register_finder(pkgutil.ImpImporter, find_on_path)
+           
+           if hasattr(importlib_machinery, 'FileFinder'):
+               register_finder(importlib_machinery.FileFinder, find_on_path)
+          @@ -2345,7 +2346,8 @@ def file_ns_handler(importer, path_item,
+                   return subpath
+           
+           
+          -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+          +if hasattr(pkgutil, 'ImpImporter'):
+          +    register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+           register_namespace_handler(zipimport.zipimporter, file_ns_handler)
+           
+           if hasattr(importlib_machinery, 'FileFinder'):
+          PATCH
+      - uses: actions/checkout@main
+      - name: make dist
+        run: |
+          ./utils/make-dist.sh
+      - uses: actions/upload-artifact@v4
+        with:
+          path: irssi-*.tar.gz
+          retention-days: 1
+  install:
+    runs-on: ubuntu-latest
+    needs: dist
+    steps:
+      - name: fetch dist
+        uses: actions/download-artifact@v4
+      - name: Test in Solaris
+        uses: vmactions/solaris-vm@v1
+        with:
+          usesh: true
+          sync: rsync
+          release: "11.4-gcc"
+          prepare: |
+            pkg update --accept
+            pkg install meson
+            pkgutil -y -i curl
+            pkgutil -y -i gtar
+            pkgutil -y -i findutils
+          run: |
+            set -ex
+            export PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
+            curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
+            gtar xzf artifact/irssi-*.tar.gz
+            # ninja install
+            cd irssi-*/
+            meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes --prefix=$HOME/irssi-build
+            ninja -C Build
+            ninja -C Build install
+            # ninja test
+            ninja -C Build test
+            gfind -name testlog.txt -exec gsed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
+            export TERM=xterm
+            # automated irssi launch test
+            cd
+            mkdir irssi-test
+            echo 'echo automated irssi launch test
+            ^set settings_autosave off
+            ^set -clear log_close_string
+            ^set -clear log_day_changed
+            ^set -clear log_open_string
+            ^set log_timestamp * 
+            ^window log on
+            load irc
+            load dcc
+            load flood
+            load notifylist
+            load perl
+            load otr
+            load proxy
+            ^quit' > irssi-test/startup
+            irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
+            cat irc.log.*

From 4b2951c8283c34e6d6e01bf85bd0c4f7f627f2be Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Fri, 1 Nov 2024 21:56:21 +0100
Subject: [PATCH 1609/1650] Include <sys/select.h> to get select(3).

This is the header required by POSIX-1.2024.

This change is needed to build irssi on operating systems such as Sortix
that have a strict libc without obsolete behaviors.
---
 src/core/net-disconnect.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index a2f7e290..2ed3a421 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -21,6 +21,8 @@
 #include "module.h"
 #include <irssi/src/core/network.h>
 
+#include <sys/select.h>
+
 /* when quitting, wait for max. 5 seconds before forcing to close the socket */
 #define MAX_QUIT_CLOSE_WAIT 5
 

From 38440cf34077b2f348dad02d37148892dd1e31cd Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Fri, 1 Nov 2024 22:10:33 +0100
Subject: [PATCH 1610/1650] Replace obsolescent inet_addr(3)/inet_aton(3) with
 inet_pton(3).

inet_addr has become obsolescent as of POSIX-1.2024 and is not available
on strict POSIX 2024 libc implementations.

inet_pton(3) is the standard and portable replacement available on all
POSIX-1.2001 systems.
---
 src/core/network.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 85fe9896..9e47528d 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -491,8 +491,6 @@ int net_ip2host(IPADDR *ip, char *host)
 
 int net_host2ip(const char *host, IPADDR *ip)
 {
-	unsigned long addr;
-
 	if (strchr(host, ':') != NULL) {
 		/* IPv6 */
 		ip->family = AF_INET6;
@@ -501,16 +499,8 @@ int net_host2ip(const char *host, IPADDR *ip)
 	} else {
 		/* IPv4 */
 		ip->family = AF_INET;
-#ifdef HAVE_INET_ATON
-		if (inet_aton(host, &ip->ip.s_addr) == 0)
+		if (inet_pton(AF_INET, host, &ip->ip) == 0)
 			return -1;
-#else
-		addr = inet_addr(host);
-		if (addr == INADDR_NONE)
-			return -1;
-
-		memcpy(&ip->ip, &addr, 4);
-#endif
 	}
 
 	return 0;

From f24d859c801b58068eb1121157f637f28f16249c Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Fri, 1 Nov 2024 22:23:46 +0100
Subject: [PATCH 1611/1650] Fix using HOST_NOT_FOUND instead of EAI_NONAME.

HOST_NOT_FOUND is a gethostbyname(3) error condition rather than a
getaddrinfo(3) error condition and cannot be passed to net_gethosterror
as documented as it calls gai_strerror(3). EAI_NONAME is the appropriate
similar error condition as standardized by POSIX for getaddrinfo(3).
---
 src/core/network.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/network.c b/src/core/network.c
index 85fe9896..01ce00b5 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -430,7 +430,7 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 	}
 
 	if (count_v4 == 0 && count_v6 == 0)
-		return HOST_NOT_FOUND; /* shouldn't happen? */
+		return EAI_NONAME; /* shouldn't happen? */
 
 	/* if there are multiple addresses, return random one */
 	use_v4 = count_v4 <= 1 ? 0 : rand() % count_v4;

From 32adf7c1dde8368629faa635c34a1b53fb6b0789 Mon Sep 17 00:00:00 2001
From: Emil Engler <me@emilengler.com>
Date: Mon, 14 Aug 2023 11:53:34 +0200
Subject: [PATCH 1612/1650] fe-text: remove const for better Darwin support

This commit removes the `const` qualifier from certain member fields,
as the Darwin version of several `<term.h>` related functions only
accept a `char *` rather than a `const char *`, thereby resulting in
dozens of compiler warnings.
---
 src/fe-text/terminfo-core.c |  4 ++--
 src/fe-text/terminfo-core.h | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index fe98efae..48e1de8c 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -38,8 +38,8 @@ int tigetflag();
 #define CAP_TYPE_STR	2
 
 typedef struct {
-        const char *ti_name; /* terminfo name */
-	const char *tc_name; /* termcap name */
+	char *ti_name; /* terminfo name */
+	char *tc_name; /* termcap name */
 	int type;
 	unsigned int offset;
 } TERMINFO_REC;
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index ba103de9..cb0e41e2 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -57,32 +57,32 @@ struct _TERM_REC {
 	int width, height;
 
 	/* Cursor movement */
-	const char *TI_smcup, *TI_rmcup, *TI_cup;
-	const char *TI_hpa, *TI_vpa, *TI_cub1, *TI_cuf1;
-	const char *TI_civis, *TI_cnorm;
+	char *TI_smcup, *TI_rmcup, *TI_cup;
+	char *TI_hpa, *TI_vpa, *TI_cub1, *TI_cuf1;
+	char *TI_civis, *TI_cnorm;
 
 	/* Scrolling */
-	const char *TI_csr, *TI_wind;
-	const char *TI_ri, *TI_rin, *TI_ind, *TI_indn;
-	const char *TI_il, *TI_il1, *TI_dl, *TI_dl1;
+	char *TI_csr, *TI_wind;
+	char *TI_ri, *TI_rin, *TI_ind, *TI_indn;
+	char *TI_il, *TI_il1, *TI_dl, *TI_dl1;
 
 	/* Clearing screen */
-	const char *TI_clear, *TI_ed; /* + *TI_dl, *TI_dl1; */
+	char *TI_clear, *TI_ed; /* + *TI_dl, *TI_dl1; */
 
 	/* Clearing to end of line */
-	const char *TI_el;
+	char *TI_el;
 
 	/* Repeating character */
-	const char *TI_rep;
+	char *TI_rep;
 
 	/* Colors */
-	int TI_colors;                 /* numbers of colors in TI_fg[] and TI_bg[] */
-	const char *TI_sgr0;           /* turn off all attributes */
-	const char *TI_smul, *TI_rmul; /* underline on/off */
-	const char *TI_smso, *TI_rmso; /* standout on/off */
-	const char *TI_sitm, *TI_ritm; /* italic on/off */
-	const char *TI_bold, *TI_blink, *TI_rev;
-	const char *TI_setaf, *TI_setab, *TI_setf, *TI_setb;
+	int TI_colors;           /* numbers of colors in TI_fg[] and TI_bg[] */
+	char *TI_sgr0;           /* turn off all attributes */
+	char *TI_smul, *TI_rmul; /* underline on/off */
+	char *TI_smso, *TI_rmso; /* standout on/off */
+	char *TI_sitm, *TI_ritm; /* italic on/off */
+	char *TI_bold, *TI_blink, *TI_rev;
+	char *TI_setaf, *TI_setab, *TI_setf, *TI_setb;
 
 	/* Colors - generated and dynamically allocated */
 	char **TI_fg, **TI_bg, *TI_normal;
@@ -91,8 +91,8 @@ struct _TERM_REC {
 	char *TI_bel;
 
 	/* Keyboard-transmit mode */
-	const char *TI_smkx;
-	const char *TI_rmkx;
+	char *TI_smkx;
+	char *TI_rmkx;
 
 	/* Terminal mode states */
 	int appkey_enabled;

From b9511a9b7e927db1496fd077e5d4941d034fc6a1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 27 Apr 2025 12:23:54 +0200
Subject: [PATCH 1613/1650] update to ubuntu 22.04 in github actions

---
 .github/workflows/check.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 67465f1a..186c2e83 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -61,12 +61,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-latest]
+        os: [ubuntu-22.04, ubuntu-latest]
         compiler: [clang, gcc]
         flags: [regular]
         setuptools_ver: [<66]
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             meson_ver: ==0.53.2
             setuptools_ver: <51
           - os: ubuntu-latest

From 8acda3f9eb704a01b9b97a63d61e09ea9a807ddd Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 14 Apr 2025 18:43:18 +0200
Subject: [PATCH 1614/1650] make bitfields unsigned

---
 src/irc/core/irc-servers-setup.h | 2 +-
 src/irc/core/irc-servers.h       | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index 7b11a2fe..ce5f0868 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -25,7 +25,7 @@ typedef struct {
 	int cmd_queue_speed;
         int max_query_chans;
 	int starttls;
-	int no_cap : 1;
+	unsigned int no_cap : 1;
 } IRC_SERVER_SETUP_REC;
 
 void irc_servers_setup_init(void);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 01605b7d..53ff1436 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -43,7 +43,6 @@
 #define IS_IRC_SERVER_CONNECT(conn) \
 	(IRC_SERVER_CONNECT(conn) ? TRUE : FALSE)
 
-/* clang-format off */
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _IRC_SERVER_CONNECT_REC {
@@ -62,11 +61,10 @@ struct _IRC_SERVER_CONNECT_REC {
 	int max_query_chans;
 
 	int max_kicks, max_msgs, max_modes, max_whois;
-	int disallow_starttls:1;
-	int starttls:1;
-	int no_cap:1;
+	unsigned int disallow_starttls : 1;
+	unsigned int starttls : 1;
+	unsigned int no_cap : 1;
 };
-/* clang-format on */
 
 #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC
 struct _IRC_SERVER_REC {

From c7c8d074bde99d47c21480f0ba4fdb20e14d4e48 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 27 Apr 2025 12:04:34 +0200
Subject: [PATCH 1615/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index b5947de6..e514f279 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 55
+#define IRSSI_ABI_VERSION 56
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From 485758656467777cd67655676547502c2c23cc2c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 29 Apr 2025 20:52:56 +0200
Subject: [PATCH 1616/1650] adapt pep440 dev version in make-dist.sh

---
 utils/make-dist.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/make-dist.sh b/utils/make-dist.sh
index 81d450d7..2e26701c 100755
--- a/utils/make-dist.sh
+++ b/utils/make-dist.sh
@@ -43,6 +43,7 @@ if [ -z "$name" ] || [ -z "$version" ]; then
     echo "**Error**: ${PKG_NAME} make-dist.sh could not find either name or version, cannot proceed."
     exit 1
 fi
+version=$(echo "$version"|perl -p -e 's/-head/.dev0/')
 
 git log > ChangeLog
 

From 5c53f2a3293059091215bbbef108fcd597de0191 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 29 Apr 2025 20:59:17 +0200
Subject: [PATCH 1617/1650] test the void

---
 .github/workflows/voiddocker.yml | 72 ++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .github/workflows/voiddocker.yml

diff --git a/.github/workflows/voiddocker.yml b/.github/workflows/voiddocker.yml
new file mode 100644
index 00000000..6e1b7d28
--- /dev/null
+++ b/.github/workflows/voiddocker.yml
@@ -0,0 +1,72 @@
+on:
+  push:
+    branches:
+     - master
+  pull_request:
+  workflow_dispatch:
+name: Check Irssi on Void Linux glibc
+jobs:
+  dist:
+    runs-on: ubuntu-latest
+    container: ghcr.io/void-linux/void-glibc:latest
+    steps:
+      - name: prepare required software
+        run: |
+          xbps-install -Syu
+          xbps-install -Sy git findutils python3-setuptools tar xz gzip
+      - uses: actions/checkout@main
+      - name: make dist
+        run: |
+          git config --global --add safe.directory /__w/irssi/irssi
+          ./utils/make-dist.sh
+      - uses: actions/upload-artifact@v4
+        with:
+          path: irssi-*.tar.gz
+          retention-days: 1
+  install:
+    runs-on: ubuntu-latest
+    container: ghcr.io/void-linux/void-glibc:latest
+    needs: dist
+    steps:
+      - name: prepare required software
+        run: |
+          xbps-install -Syu
+          xbps-install -Sy meson base-devel libglib-devel libutf8proc-devel ncurses-devel ncurses-base openssl-devel libotr-devel libgcrypt-devel tar findutils curl
+      - name: fetch dist
+        uses: actions/download-artifact@v4
+      - name: Setup local annotations
+        uses: irssi-import/actions-irssi/problem-matchers@master
+      - name: Test on Void Linux glibc
+        run: |
+          set -ex
+          tar xzf artifact/irssi-*.tar.gz
+          # ninja install
+          cd irssi-*/
+          meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes --prefix=$HOME/irssi-build --buildtype debugoptimized
+          ninja -C Build
+          ninja -C Build install
+          # ninja test
+          ninja -C Build test
+          find -name testlog.txt -exec gsed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
+          export TERM=xterm
+          # automated irssi launch test
+          cd
+          mkdir irssi-test
+          echo 'echo automated irssi launch test
+          ^set settings_autosave off
+          ^set -clear log_close_string
+          ^set -clear log_day_changed
+          ^set -clear log_open_string
+          ^set log_timestamp * 
+          ^window log on
+          load irc
+          load dcc
+          load flood
+          load notifylist
+          load perl
+          load otr
+          load proxy
+          ^quit' > irssi-test/startup
+          export LC_CTYPE=C.utf8
+          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
+          cat irc.log.*

From af4fa60d3e1a04f0685aa804fc3e7908015a05f8 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 29 Apr 2025 22:14:52 +0200
Subject: [PATCH 1618/1650] s/gsed/sed

---
 .github/workflows/voiddocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voiddocker.yml b/.github/workflows/voiddocker.yml
index 6e1b7d28..3ed94ddd 100644
--- a/.github/workflows/voiddocker.yml
+++ b/.github/workflows/voiddocker.yml
@@ -47,7 +47,7 @@ jobs:
           ninja -C Build install
           # ninja test
           ninja -C Build test
-          find -name testlog.txt -exec gsed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
+          find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
           export TERM=xterm
           # automated irssi launch test
           cd

From 8eea7bef927c14704295f78f0f327d73fd0fcc1b Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 29 Apr 2025 22:19:02 +0200
Subject: [PATCH 1619/1650] curl render

---
 .github/workflows/voiddocker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/voiddocker.yml b/.github/workflows/voiddocker.yml
index 3ed94ddd..3098b551 100644
--- a/.github/workflows/voiddocker.yml
+++ b/.github/workflows/voiddocker.yml
@@ -39,6 +39,7 @@ jobs:
       - name: Test on Void Linux glibc
         run: |
           set -ex
+          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
           tar xzf artifact/irssi-*.tar.gz
           # ninja install
           cd irssi-*/

From 9fd6df2a15bf5ddc794b47042fb312d77941ad5a Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 27 Apr 2025 12:09:17 +0200
Subject: [PATCH 1620/1650] add missing include for wcwidth thread test

---
 src/perl/perl-core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index fe52874a..59ca58fe 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -18,6 +18,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#define _GNU_SOURCE
+#include <wchar.h>
+
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"

From f12ed4ff5492676015b64ea0d5bd1593018a07cd Mon Sep 17 00:00:00 2001
From: Christian Carey <seen@myfairpoint.net>
Date: Fri, 2 May 2025 00:02:46 -0400
Subject: [PATCH 1621/1650] Resolve issue #1513.

---
 src/fe-text/mainwindows.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 26b94248..b9f77c0a 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -233,8 +233,10 @@ MAIN_WINDOW_REC *mainwindow_create(int right)
 			if (MAIN_WINDOW_TEXT_HEIGHT(parent) <
 			    WINDOW_MIN_SIZE+NEW_WINDOW_SIZE)
 				parent = find_window_with_room();
-			if (parent == NULL)
+			if (parent == NULL) {
+				g_free(rec);
 				return NULL; /* not enough space */
+			}
 
 			space = parent->height / 2;
 			rec->first_line = parent->first_line;
@@ -255,8 +257,10 @@ MAIN_WINDOW_REC *mainwindow_create(int right)
 			if (MAIN_WINDOW_TEXT_WIDTH(parent) < 2 * NEW_WINDOW_WIDTH) {
 				parent = find_window_with_room_right();
 			}
-			if (parent == NULL)
+			if (parent == NULL) {
+				g_free(rec);
 				return NULL; /* not enough space */
+			}
 
 			space = parent->width / 2;
 			rec->first_line = parent->first_line;

From 838f8d179e58edc5c0963f789ad8bd27192a022d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 13 Jul 2025 19:33:52 +0200
Subject: [PATCH 1622/1650] fix _GNU_SOURCE redefined warning due to perl
 ccflags

---
 src/perl/perl-core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 59ca58fe..67fff292 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -18,7 +18,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <wchar.h>
 
 #define NEED_PERL_H

From 7681cb7585ec4e28fc943d5ed2d1c616ac0b5c35 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Sun, 20 Jul 2025 22:40:59 +0200
Subject: [PATCH 1623/1650] Add -priority to hilight syntax line

---
 src/fe-common/core/hilight-text.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 66e2dfd3..9bcad57a 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -626,7 +626,7 @@ static void cmd_hilight_show(void)
 }
 
 /* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -matchcase | -regexp]
-   [-color <color>] [-actcolor <color>] [-level <level>]
+   [-color <color>] [-actcolor <color>] [-level <level>] [-priority <number>]
    [-network <network>] [-channels <channels>] <text> */
 static void cmd_hilight(const char *data)
 {

From 6276fe1a68d3ae2611c9a1280ce0cfb60e2b856d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 20 Jul 2025 23:03:52 +0200
Subject: [PATCH 1624/1650] debug logging solarisvm prepare

---
 .github/workflows/solarisvm.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/solarisvm.yml b/.github/workflows/solarisvm.yml
index 0681b0e3..da1ffa17 100644
--- a/.github/workflows/solarisvm.yml
+++ b/.github/workflows/solarisvm.yml
@@ -63,11 +63,11 @@ jobs:
           sync: rsync
           release: "11.4-gcc"
           prepare: |
-            pkg update --accept
-            pkg install meson
-            pkgutil -y -i curl
-            pkgutil -y -i gtar
-            pkgutil -y -i findutils
+            pkg update --accept || echo 1:$?
+            pkg install meson || echo 2:$?
+            pkgutil -y -i curl || echo 3:$?
+            pkgutil -y -i gtar || echo 4:$?
+            pkgutil -y -i findutils || echo 5:$?
           run: |
             set -ex
             export PKG_CONFIG_PATH=/usr/lib/64/pkgconfig

From 9f0b2bc50d4434fec29ff274e3a060a8fb77b778 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 21 Jul 2025 00:23:01 +0200
Subject: [PATCH 1625/1650] detect third argument type of puts

---
 meson.build                 | 31 ++++++++++++++++++++++++-------
 src/fe-text/term-terminfo.c |  7 ++++++-
 src/fe-text/terminfo-core.c |  7 ++++++-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index 866bfd27..f2550641 100644
--- a/meson.build
+++ b/meson.build
@@ -570,23 +570,40 @@ foreach h : headers
 endforeach
 
 if want_textui and conf.get('HAVE_TERM_H', 0) == 1
-  if not cc.links('''
+  if cc.links('''
 #include <stdio.h>
 #include <term.h>
-int main () {
+int main (void) {
   return tputs("x", 1, putchar);
 }
-''', dependencies : textui_dep)
-    if cc.has_header('curses.h') and cc.links('''
+''', args : '-pedantic-errors', dependencies : textui_dep, name : 'Curses working')
+    # ok
+  else
+    has_curses_h = cc.has_header('curses.h')
+    if has_curses_h and cc.links('''
 #include <curses.h>
 #include <term.h>
-int main () {
+int main (void) {
   return tputs("x", 1, putchar);
 }
-''', dependencies : textui_dep, name : 'working Curses')
+''', args : '-pedantic-errors', dependencies : textui_dep, name : 'Curses working with curses.h')
       conf.set('NEED_CURSES_H', 1, description : 'tputs needs curses.h')
     else
-      error('could not link terminfo')
+      if has_curses_h and cc.links('''
+#include <curses.h>
+#include <term.h>
+int char_putchar (char c) {
+  return putchar(c);
+}
+int main (void) {
+  return tputs("x", 1, char_putchar);
+}
+''', args : '-pedantic-errors', dependencies : textui_dep, name : 'Curses with tputs third argument arg char')
+        conf.set('NEED_CURSES_H', 1, description : 'tputs needs curses.h')
+        conf.set('TPUTS_SVR4', 1, description : 'third argument of tputs has the type int (*)(char)')
+      else
+        error('could not link terminfo')
+      endif
     endif
   endif
 endif
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index d4db942a..9bcdd5a0 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -318,7 +318,12 @@ void term_window_scroll(TERM_WINDOW *window, int count)
 		term_lines_empty[window->y+y] = FALSE;
 }
 
-inline static int term_putchar(int c)
+#ifdef TPUTS_SVR4
+#define putc_arg_t char
+#else
+#define putc_arg_t int
+#endif
+inline static int term_putchar(putc_arg_t c)
 {
         return fputc(c, current_term->out);
 }
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 48e1de8c..6e904c9e 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -6,8 +6,13 @@
 #  define _POSIX_VDISABLE 0
 #endif
 
+#ifdef TPUTS_SVR4
+#define putc_arg_t char
+#else
+#define putc_arg_t int
+#endif
 #define tput(s) tputs(s, 0, term_putchar)
-inline static int term_putchar(int c)
+inline static int term_putchar(putc_arg_t c)
 {
         return fputc(c, current_term->out);
 }

From 8eee36d1eaa025e62eadf94e8c4ee25d95b9cf03 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Tue, 22 Jul 2025 11:40:04 +0200
Subject: [PATCH 1626/1650] replace str->str & g_string_free with
 g_string_free_and_steal

solving unused warning in GLib 2.76
---
 src/core/levels.c                 |  4 ++--
 src/core/misc.c                   | 15 +++++++++++----
 src/core/misc.h                   |  6 ++++++
 src/core/servers.c                |  3 +--
 src/core/special-vars.c           |  9 +++------
 src/fe-common/core/completion.c   |  6 ++----
 src/fe-common/core/fe-log.c       |  3 +--
 src/fe-common/core/fe-messages.c  |  8 +++-----
 src/fe-common/core/formats.c      | 12 ++++--------
 src/fe-common/core/hilight-text.c |  3 +--
 src/fe-common/core/printtext.c    |  7 +++----
 src/fe-common/core/themes.c       | 28 ++++++++++++----------------
 src/fe-text/terminfo-core.c       |  4 ++--
 src/irc/core/bans.c               |  5 ++---
 src/irc/core/irc-servers.c        |  3 +--
 src/irc/core/modes.c              |  7 +++----
 src/irc/dcc/dcc-get.c             |  6 ++----
 src/lib-config/write.c            | 12 ++++++++++--
 src/perl/perl-common.c            |  5 ++---
 src/perl/perl-core.c              |  5 ++---
 20 files changed, 73 insertions(+), 78 deletions(-)

diff --git a/src/core/levels.c b/src/core/levels.c
index d4dafba2..0cd99b10 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -19,6 +19,7 @@
 */
 
 #include "module.h"
+#include <irssi/src/core/misc.h>
 #include <irssi/src/core/levels.h>
 
 /* the order of these levels must match the bits in levels.h */
@@ -169,8 +170,7 @@ char *bits2level(int bits)
         if (str->len > 0)
 		g_string_truncate(str, str->len-1);
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 
 	return ret;
 }
diff --git a/src/core/misc.c b/src/core/misc.c
index f0bbf4e0..9ee549a1 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -135,6 +135,15 @@ GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *defaul
 }
 #endif
 
+#if GLIB_CHECK_VERSION(2, 76, 0)
+/* nothing */
+#else
+gchar *g_string_free_and_steal(GString *string)
+{
+	return g_string_free(string, FALSE);
+}
+#endif
+
 int find_substr(const char *list, const char *item)
 {
 	const char *ptr;
@@ -261,8 +270,7 @@ char *gslistptr_to_string(GSList *list, int offset, const char *delimiter)
 		list = list->next;
 	}
 
-        ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
@@ -280,8 +288,7 @@ char *i_slist_to_string(GSList *list, const char *delimiter)
 		list = list->next;
 	}
 
-        ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
diff --git a/src/core/misc.h b/src/core/misc.h
index 622470f7..c7355fc0 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -26,6 +26,12 @@ long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATE
 GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *default_tz);
 #endif
 
+#if GLIB_CHECK_VERSION(2, 76, 0)
+/* nothing */
+#else
+gchar *g_string_free_and_steal(GString *string);
+#endif
+
 GSList *i_slist_find_string(GSList *list, const char *key);
 GSList *i_slist_find_icase_string(GSList *list, const char *key);
 GList *i_list_find_string(GList *list, const char *key);
diff --git a/src/core/servers.c b/src/core/servers.c
index 0ea8f937..811081e8 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -134,8 +134,7 @@ static char *server_create_tag(SERVER_CONNECT_REC *conn)
 	}
 	g_free(tag);
 
-	tag = str->str;
-	g_string_free(str, FALSE);
+	tag = g_string_free(str, FALSE);
 	return tag;
 }
 
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index 802fcb36..8c890645 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -88,8 +88,7 @@ static char *get_argument(char **cmd, char **arglist)
 	}
 	if (str->len > 0) g_string_truncate(str, str->len-1);
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
@@ -412,8 +411,7 @@ char *get_alignment(const char *text, int align, int flags, char pad)
 		}
 	}
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
@@ -604,8 +602,7 @@ char *parse_special_string(const char *cmd, SERVER_REC *server, void *item,
 	}
 	g_strfreev(arglist);
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index e2c4d2a9..852eabff 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -111,8 +111,7 @@ char *auto_word_complete(const char *line, int *pos)
 		*pos = startpos+strlen(replace);
 
 		g_string_insert(result, startpos, replace);
-		ret = result->str;
-		g_string_free(result, FALSE);
+		ret = g_string_free_and_steal(result);
 	}
 
 	g_free(word);
@@ -290,8 +289,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
 	g_free_not_null(last_line);
 	last_line = g_strdup(result->str);
 
-	ret = result->str;
-	g_string_free(result, FALSE);
+	ret = g_string_free_and_steal(result);
 
 	/* free the data */
 	g_free(data);
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index f0f055f6..0d29d6c3 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -214,8 +214,7 @@ static char *log_items_get_list(LOG_REC *log)
 	if(rec->servertag != NULL)
 		g_string_append_printf(str, " (%s)", rec->servertag);
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index 355d4fd4..c6e9a838 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -133,8 +133,7 @@ char *expand_emphasis(WI_ITEM_REC *item, const char *text)
 		}
 	}
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
@@ -730,9 +729,8 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
                 n++;
 	} while (printnick_exists(firstnick, nick, newnick->str));
 
-	g_hash_table_insert(printnicks, nick, newnick->str);
-	g_string_free(newnick, FALSE);
-        g_free(nickhost);
+	g_hash_table_insert(printnicks, nick, g_string_free_and_steal(newnick));
+	g_free(nickhost);
 }
 
 static void sig_nicklist_remove(CHANNEL_REC *channel, NICK_REC *nick)
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 33f80e14..f7614b6f 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -616,8 +616,7 @@ char *format_string_expand(const char *text, int *flags)
 		text++;
 	}
 
-	ret = out->str;
-	g_string_free(out, FALSE);
+	ret = g_string_free_and_steal(out);
 	return ret;
 }
 
@@ -792,8 +791,7 @@ static char *format_get_text_args(TEXT_DEST_REC *dest,
 		text++;
 	}
 
-	ret = out->str;
-	g_string_free(out, FALSE);
+	ret = g_string_free_and_steal(out);
 	return ret;
 }
 
@@ -888,8 +886,7 @@ char *format_add_linestart(const char *text, const char *linestart)
 		text++;
 	}
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
@@ -913,8 +910,7 @@ char *format_add_lineend(const char *text, const char *linestart)
 	}
 	g_string_append(str, linestart);
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 9bcad57a..2412a1f8 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -469,8 +469,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
 		}
 		g_string_append(str, text + pos);
 
-		newstr = str->str;
-		g_string_free(str, FALSE);
+		newstr = g_string_free_and_steal(str);
 
 		format_dest_meta_stash(dest, "hilight-start",
 		                       tmp = g_strdup_printf("%d", hilight_start));
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 18652689..9de8d740 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -24,6 +24,7 @@
 #include <irssi/src/core/signals.h>
 #include <irssi/src/core/commands.h>
 #include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.h>
 
 #include <irssi/src/core/levels.h>
 #include <irssi/src/core/servers.h>
@@ -240,8 +241,7 @@ static char *printtext_get_args(TEXT_DEST_REC *dest, const char *str,
 		}
 	}
 
-	ret = out->str;
-	g_string_free(out, FALSE);
+	ret = g_string_free_and_steal(out);
 	return ret;
 }
 
@@ -270,8 +270,7 @@ static char *printtext_expand_formats(const char *str, int *flags)
 		}
 	}
 
-	ret = out->str;
-	g_string_free(out, FALSE);
+	ret = g_string_free_and_steal(out);
 	return ret;
 }
 
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 04f00477..58d17b8e 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -395,9 +395,8 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format)
 		(*format)++;
 	}
 
-	ret = str->str;
-        g_string_free(str, FALSE);
-        return ret;
+	ret = g_string_free_and_steal(str);
+	return ret;
 }
 
 static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
@@ -496,8 +495,7 @@ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp
 		p++;
 	}
 	g_free(ret);
-	abstract = str->str;
-	g_string_free(str, FALSE);
+	abstract = g_string_free_and_steal(str);
 
 	/* abstract may itself contain abstracts or replaces */
 	p = abstract;
@@ -568,15 +566,14 @@ static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
 		}
 	}
 
-		/* save the last color */
-		if (save_last_fg != NULL)
-			*save_last_fg = last_fg;
-		if (save_last_bg != NULL)
-			*save_last_bg = last_bg;
+	/* save the last color */
+	if (save_last_fg != NULL)
+		*save_last_fg = last_fg;
+	if (save_last_bg != NULL)
+		*save_last_bg = last_bg;
 
-	ret = str->str;
-        g_string_free(str, FALSE);
-        return ret;
+	ret = g_string_free_and_steal(str);
+	return ret;
 }
 
 /* expand the data part in {abstract data} */
@@ -645,9 +642,8 @@ static char *theme_format_compress_colors(THEME_REC *theme, const char *format)
 		}
 	}
 
-	ret = str->str;
-        g_string_free(str, FALSE);
-        return ret;
+	ret = g_string_free_and_steal(str);
+	return ret;
 }
 
 char *theme_format_expand(THEME_REC *theme, const char *format)
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 6e904c9e..0aa329f4 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -1,5 +1,6 @@
 #include "module.h"
 #include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 #include <irssi/src/fe-text/terminfo-core.h>
 
 #ifndef _POSIX_VDISABLE
@@ -678,8 +679,7 @@ static int term_setup(TERM_REC *term)
 	if (term->TI_ritm &&
 	    (term->TI_sgr0 == NULL || g_strcmp0(term->TI_ritm, term->TI_sgr0) != 0))
 		g_string_append(str, term->TI_ritm);
-	term->TI_normal = str->str;
-	g_string_free(str, FALSE);
+	term->TI_normal = g_string_free_and_steal(str);
 	term->tr_set_normal = _set_normal;
 
 	term->tr_beep = term->TI_bel ? _beep : _ignore;
diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index 8a43d398..5281ac95 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -106,9 +106,8 @@ char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks, int ban_type)
 	if (str->len > 0)
 		g_string_truncate(str, str->len-1);
 
-	ret = str->str;
-	g_string_free(str, FALSE);
-        return ret;
+	ret = g_string_free_and_steal(str);
+	return ret;
 }
 
 void ban_set(IRC_CHANNEL_REC *channel, const char *bans, int ban_type)
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index e3fe3143..7e8fdb5a 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -874,8 +874,7 @@ char *irc_server_get_channels(IRC_SERVER_REC *server, int rejoin_channels_mode)
 		if (use_keys) g_string_append_printf(chans, " %s", keys->str);
 	}
 
-	ret = chans->str;
-	g_string_free(chans, FALSE);
+	ret = g_string_free_and_steal(chans);
 	g_string_free(keys, TRUE);
 
 	return ret;
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index b0de2f18..ff37a1e1 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -21,6 +21,7 @@
 #include "module.h"
 #include <irssi/src/core/signals.h>
 #include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.h>
 
 #include <irssi/src/irc/core/irc-commands.h>
 #include <irssi/src/irc/core/irc-servers.h>
@@ -443,8 +444,7 @@ char *modes_join(IRC_SERVER_REC *server, const char *old,
 	}
 	g_free(dup);
 
-	modestr = newmode->str;
-	g_string_free(newmode, FALSE);
+	modestr = g_string_free_and_steal(newmode);
 	return modestr;
 }
 
@@ -755,8 +755,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item,
 	}
 
         if (str->len > 0) g_string_truncate(str, str->len-1);
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	g_strfreev(matches);
 	cmd_params_free(free_arg);
 
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index 0214387b..cc1c9e43 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -88,8 +88,7 @@ static char *dcc_get_rename_file(const char *fname)
 		num++;
 	} while (stat(newname->str, &statbuf) == 0);
 
-	ret = newname->str;
-	g_string_free(newname, FALSE);
+	ret = g_string_free_and_steal(newname);
 	return ret;
 }
 
@@ -416,8 +415,7 @@ char *get_file_name(char **params, int fileparams)
 		out = g_string_append(out, params[pos]);
 	}
 
-	ret = out->str;
-	g_string_free(out, FALSE);
+	ret = g_string_free_and_steal(out);
 	return ret;
 }
 
diff --git a/src/lib-config/write.c b/src/lib-config/write.c
index b7c6edb5..168b4e40 100644
--- a/src/lib-config/write.c
+++ b/src/lib-config/write.c
@@ -26,6 +26,15 @@
 #define CONFIG_INDENT_SIZE 2
 static const char *indent_block = "  "; /* needs to be the same size as CONFIG_INDENT_SIZE! */
 
+#if GLIB_CHECK_VERSION(2, 76, 0)
+/* nothing */
+#else
+static gchar *g_string_free_and_steal(GString *string)
+{
+	return g_string_free(string, FALSE);
+}
+#endif
+
 /* write needed amount of indentation to the start of the line */
 static int config_write_indent(CONFIG_REC *rec)
 {
@@ -108,8 +117,7 @@ static char *config_escape_string(const char *text)
 
 	g_string_append_c(str, '"');
 
-	ret = str->str;
-	g_string_free(str, FALSE);
+	ret = g_string_free_and_steal(str);
 	return ret;
 }
 
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index c54ee643..58b56bb8 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -239,9 +239,8 @@ char *perl_get_use_list(void)
 	for (tmp = use_protocols; tmp != NULL; tmp = tmp->next)
 		g_string_append_printf(str, "use Irssi::%s;", (char *) tmp->data);
 
-	ret = str->str;
-        g_string_free(str, FALSE);
-        return ret;
+	ret = g_string_free_and_steal(str);
+	return ret;
 }
 
 void irssi_callXS(void (*subaddr)(pTHX_ CV* cv), CV *cv, SV **mark)
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 67fff292..fe2d2f62 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -202,9 +202,8 @@ static char *script_data_get_name(void)
                 n++;
 	} while (perl_script_find(name->str) != NULL);
 
-	ret = name->str;
-        g_string_free(name, FALSE);
-        return ret;
+	ret = g_string_free_and_steal(name);
+	return ret;
 }
 
 static int perl_script_eval(PERL_SCRIPT_REC *script)

From d21ff2e6589341c9c514d05893483a69914fc980 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 25 Jul 2025 16:22:00 +0200
Subject: [PATCH 1627/1650] fix xbps

---
 .github/workflows/voiddocker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/voiddocker.yml b/.github/workflows/voiddocker.yml
index 3098b551..9dc2addf 100644
--- a/.github/workflows/voiddocker.yml
+++ b/.github/workflows/voiddocker.yml
@@ -12,6 +12,7 @@ jobs:
     steps:
       - name: prepare required software
         run: |
+          xbps-install -Syu xbps || :
           xbps-install -Syu
           xbps-install -Sy git findutils python3-setuptools tar xz gzip
       - uses: actions/checkout@main
@@ -30,6 +31,7 @@ jobs:
     steps:
       - name: prepare required software
         run: |
+          xbps-install -Syu xbps || :
           xbps-install -Syu
           xbps-install -Sy meson base-devel libglib-devel libutf8proc-devel ncurses-devel ncurses-base openssl-devel libotr-devel libgcrypt-devel tar findutils curl
       - name: fetch dist

From df8aa427789050c3036d66bf6cce761d2968fdae Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@cygwin.localdomain>
Date: Fri, 25 Jul 2025 16:15:05 +0100
Subject: [PATCH 1628/1650] make compilation work on cygwin

---
 meson.build                              |  5 +++++
 src/core/modules-load.c                  |  2 +-
 src/fe-common/irc/dcc/meson.build        |  2 +-
 src/fe-common/irc/meson.build            |  2 +-
 src/fe-common/irc/notifylist/meson.build |  2 +-
 src/fe-common/meson.build                |  6 ++----
 src/fe-none/meson.build                  |  6 +++++-
 src/fe-text/meson.build                  |  6 +++++-
 src/irc/core/meson.build                 |  3 ++-
 src/irc/dcc/meson.build                  |  2 +-
 src/irc/flood/meson.build                |  2 +-
 src/irc/notifylist/meson.build           |  2 +-
 src/meson.build                          | 21 +++++++++++----------
 src/perl/common/meson.build              |  2 +-
 src/perl/irc/meson.build                 |  2 +-
 src/perl/meson.build                     |  3 ++-
 src/perl/textui/meson.build              |  2 +-
 src/perl/ui/meson.build                  |  2 +-
 18 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/meson.build b/meson.build
index f2550641..9499a126 100644
--- a/meson.build
+++ b/meson.build
@@ -13,10 +13,15 @@ rootinc = include_directories('.')
 dep = []
 textui_dep = []
 need_dl_cross_link = false
+need_dl_cross_link_main = false
+dl_cross_irssi_main = []
 # The Android environment requires that all modules are linked to each other.
 # See https://github.com/android/ndk/issues/201
 if host_machine.system() == 'android'
   need_dl_cross_link = true
+elif host_machine.system() == 'cygwin'
+  need_dl_cross_link = true
+  need_dl_cross_link_main = true
 endif
 
 includedir          = get_option('includedir')
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index 11c4dd6b..f4278897 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -42,7 +42,7 @@ static char *module_get_name(const char *path, int *start, int *end)
 	if (name == NULL)
 		name = path;
 
-	if (strncmp(name, "lib", 3) == 0)
+	if (strncmp(name, "lib", 3) == 0 || strncmp(name, "cyg", 3) == 0)
 		name += 3;
 
 	module_name = g_strdup(name);
diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
index 487d1aea..f380fb10 100644
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@@ -21,7 +21,7 @@ shared_module('fe_irc_dcc',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
-  link_with : dl_cross_irc_dcc,
+  link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
   link_whole : libfe_irc_dcc_a)
 
 install_headers(
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index 9b198e24..decce520 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -32,7 +32,7 @@ shared_module('fe_common_irc',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
-  link_with : dl_cross_irc_core,
+  link_with : dl_cross_irc_core + dl_cross_irssi_main,
   link_whole : libfe_common_irc_a)
 
 install_headers(
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
index 0f9c4d68..fd28306b 100644
--- a/src/fe-common/irc/notifylist/meson.build
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -16,7 +16,7 @@ shared_module('fe_irc_notifylist',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
-  link_with : dl_cross_irc_notifylist,
+  link_with : dl_cross_irc_notifylist + dl_cross_irssi_main,
   link_whole : libfe_irc_notifylist_a)
 
 install_headers(
diff --git a/src/fe-common/meson.build b/src/fe-common/meson.build
index 05ab38a1..91a46324 100644
--- a/src/fe-common/meson.build
+++ b/src/fe-common/meson.build
@@ -1,6 +1,4 @@
 # this file is part of irssi
 
-subdir('core')
-foreach s : chat_modules
-  subdir(s)
-endforeach
+# intentionally empty
+
diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build
index 8f6b797d..49cfe517 100644
--- a/src/fe-none/meson.build
+++ b/src/fe-none/meson.build
@@ -1,12 +1,13 @@
 # this file is part of irssi
 
-executable('botti',
+fe_none_irssi = executable('botti',
   files(
     'irssi.c',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
   export_dynamic : true,
+  implib : true,
   link_with : [
     libconfig_a,
     libcore_a,
@@ -14,6 +15,9 @@ executable('botti',
   install : true,
   dependencies : dep
 )
+if need_dl_cross_link_main
+  dl_cross_irssi_main = [ fe_none_irssi ]
+endif
 
 # noinst_headers = files(
 #   'module.h',
diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 94990c82..1c885b89 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-executable('irssi',
+fe_text_irssi = executable('irssi',
   files(
     #### terminfo_sources ####
     'term-terminfo.c',
@@ -35,6 +35,7 @@ executable('irssi',
   include_directories : rootinc,
   implicit_include_directories : false,
   export_dynamic : true,
+  implib : true,
   link_with : [
     libconfig_a,
     libcore_a,
@@ -44,6 +45,9 @@ executable('irssi',
   dependencies : dep
   + textui_dep
 )
+if need_dl_cross_link_main
+  dl_cross_irssi_main = [ fe_text_irssi ]
+endif
 
 install_headers(
   files(
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index a63ff214..40ef1cdd 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -43,7 +43,8 @@ libirc_core_sm = shared_module('irc_core',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
-  link_whole : libirc_core_a)
+  link_whole : libirc_core_a,
+  link_with : dl_cross_irssi_main)
 
 dl_cross_irc_core = []
 if need_dl_cross_link
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
index e5e2b0c6..cf5b1365 100644
--- a/src/irc/dcc/meson.build
+++ b/src/irc/dcc/meson.build
@@ -16,7 +16,7 @@ libirc_dcc_sm = shared_module('irc_dcc',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
-  link_with : dl_cross_irc_core,
+  link_with : dl_cross_irc_core + dl_cross_irssi_main,
   dependencies : dep)
 
 dl_cross_irc_dcc = []
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
index 0ba94282..02ad222b 100644
--- a/src/irc/flood/meson.build
+++ b/src/irc/flood/meson.build
@@ -12,7 +12,7 @@ shared_module('irc_flood',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
-  link_with : dl_cross_irc_core,
+  link_with : dl_cross_irc_core + dl_cross_irssi_main,
   link_whole : libirc_flood_a)
 
 install_headers(
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
index 212d68e5..1bf9dd98 100644
--- a/src/irc/notifylist/meson.build
+++ b/src/irc/notifylist/meson.build
@@ -13,7 +13,7 @@ libirc_notifylist_sm = shared_module('irc_notifylist',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
-  link_with : dl_cross_irc_core,
+  link_with : dl_cross_irc_core + dl_cross_irssi_main,
   dependencies : dep)
 
 dl_cross_irc_notifylist = []
diff --git a/src/meson.build b/src/meson.build
index dee8dc3c..cc30da1b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,22 +2,23 @@
 
 subdir('lib-config')
 subdir('core')
-foreach s : chat_modules
-  subdir(s)
-endforeach
-subdir('fe-common')
-if have_perl
-  subdir('perl')
-endif
-if have_otr
-  subdir('otr')
-endif
+subdir('fe-common' / 'core')
 if want_bot
   subdir('fe-none')
 endif
 if want_textui
   subdir('fe-text')
 endif
+foreach s : chat_modules
+  subdir(s)
+  subdir('fe-common' / s)
+endforeach
+if have_perl
+  subdir('perl')
+endif
+if have_otr
+  subdir('otr')
+endif
 if want_fuzzer
   subdir('fe-fuzz')
 endif
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
index 5b174399..ae408a7e 100644
--- a/src/perl/common/meson.build
+++ b/src/perl/common/meson.build
@@ -26,7 +26,7 @@ shared_module('Irssi',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
-  link_with : dl_cross_perl_core,
+  link_with : dl_cross_perl_core + dl_cross_irssi_main,
 )
 
 install_headers(
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index a95fd778..7b366aa8 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -27,7 +27,7 @@ shared_module('Irc',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
-  link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist,
+  link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
 )
 
 install_headers(
diff --git a/src/perl/meson.build b/src/perl/meson.build
index f859c7c4..09d4f8a6 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -40,6 +40,7 @@ libperl_core_sm = shared_module('perl_core',
   build_rpath : perl_rpath,
   dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep,
   override_options : ['b_asneeded=false'],
+  link_with : dl_cross_irssi_main,
 )
 
 dl_cross_perl_core = []
@@ -61,7 +62,7 @@ shared_module('fe_perl',
   install : true,
   install_dir : moduledir,
   dependencies : dep,
-  link_with : dl_cross_perl_core,
+  link_with : dl_cross_perl_core + dl_cross_irssi_main,
 )
 
 subdir('common')
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
index 23c8d458..5b2ed136 100644
--- a/src/perl/textui/meson.build
+++ b/src/perl/textui/meson.build
@@ -23,7 +23,7 @@ shared_module('TextUI',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
-  link_with : dl_cross_perl_core,
+  link_with : dl_cross_perl_core + dl_cross_irssi_main,
 )
 
 install_headers(
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
index 1577dcf6..e74d0898 100644
--- a/src/perl/ui/meson.build
+++ b/src/perl/ui/meson.build
@@ -21,7 +21,7 @@ shared_module('UI',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
-  link_with : dl_cross_perl_core,
+  link_with : dl_cross_perl_core + dl_cross_irssi_main,
 )
 
 install_headers(

From 989ddd8429173a3b5fa7feda1c09f4b717af3d79 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Fri, 25 Jul 2025 19:49:53 +0200
Subject: [PATCH 1629/1650] replace shared_module with shared_library

according to mesonbuild irc chat
---
 src/fe-common/irc/dcc/meson.build        | 5 +++--
 src/fe-common/irc/meson.build            | 5 +++--
 src/fe-common/irc/notifylist/meson.build | 5 +++--
 src/irc/core/meson.build                 | 5 +++--
 src/irc/dcc/meson.build                  | 5 +++--
 src/irc/flood/meson.build                | 5 +++--
 src/irc/notifylist/meson.build           | 5 +++--
 src/irc/proxy/meson.build                | 3 ++-
 src/otr/meson.build                      | 3 ++-
 src/perl/common/meson.build              | 3 ++-
 src/perl/irc/meson.build                 | 3 ++-
 src/perl/meson.build                     | 7 ++++---
 src/perl/textui/meson.build              | 3 ++-
 src/perl/ui/meson.build                  | 3 ++-
 14 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
index f380fb10..5edf2477 100644
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@@ -17,12 +17,13 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
     def_sysconfdir,
   ],
   dependencies : dep)
-shared_module('fe_irc_dcc',
+shared_library('fe_irc_dcc',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
-  link_whole : libfe_irc_dcc_a)
+  link_whole : libfe_irc_dcc_a,
+  override_options : ['b_lundef=false'])
 
 install_headers(
   files(
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index decce520..518dfbfa 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -28,12 +28,13 @@ libfe_common_irc_a = static_library('fe_common_irc',
     def_themesdir,
   ],
   dependencies : dep)
-shared_module('fe_common_irc',
+shared_library('fe_common_irc',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
-  link_whole : libfe_common_irc_a)
+  link_whole : libfe_common_irc_a,
+  override_options : ['b_lundef=false'])
 
 install_headers(
   files(
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
index fd28306b..cdb5168b 100644
--- a/src/fe-common/irc/notifylist/meson.build
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -12,12 +12,13 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
     def_sysconfdir,
   ],
   dependencies : dep)
-shared_module('fe_irc_notifylist',
+shared_library('fe_irc_notifylist',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_notifylist + dl_cross_irssi_main,
-  link_whole : libfe_irc_notifylist_a)
+  link_whole : libfe_irc_notifylist_a,
+  override_options : ['b_lundef=false'])
 
 install_headers(
   files(
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index 40ef1cdd..94ed20a2 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -39,12 +39,13 @@ libirc_core_a = static_library('irc_core',
     def_sysconfdir,
   ],
   dependencies : dep)
-libirc_core_sm = shared_module('irc_core',
+libirc_core_sm = shared_library('irc_core',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_whole : libirc_core_a,
-  link_with : dl_cross_irssi_main)
+  link_with : dl_cross_irssi_main,
+  override_options : ['b_lundef=false'])
 
 dl_cross_irc_core = []
 if need_dl_cross_link
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
index cf5b1365..3ab1bace 100644
--- a/src/irc/dcc/meson.build
+++ b/src/irc/dcc/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_dcc_sm = shared_module('irc_dcc',
+libirc_dcc_sm = shared_library('irc_dcc',
   files(
     'dcc-autoget.c',
     'dcc-chat.c',
@@ -17,7 +17,8 @@ libirc_dcc_sm = shared_module('irc_dcc',
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
-  dependencies : dep)
+  dependencies : dep,
+  override_options : ['b_lundef=false'])
 
 dl_cross_irc_dcc = []
 if need_dl_cross_link
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
index 02ad222b..257e5c11 100644
--- a/src/irc/flood/meson.build
+++ b/src/irc/flood/meson.build
@@ -8,12 +8,13 @@ libirc_flood_a = static_library('irc_flood',
   include_directories : rootinc,
   implicit_include_directories : false,
   dependencies : dep)
-shared_module('irc_flood',
+shared_library('irc_flood',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
-  link_whole : libirc_flood_a)
+  link_whole : libirc_flood_a,
+  override_options : ['b_lundef=false'])
 
 install_headers(
   files('module.h'),
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
index 1bf9dd98..34517b34 100644
--- a/src/irc/notifylist/meson.build
+++ b/src/irc/notifylist/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-libirc_notifylist_sm = shared_module('irc_notifylist',
+libirc_notifylist_sm = shared_library('irc_notifylist',
   files(
     'notify-commands.c',
     'notify-ison.c',
@@ -14,7 +14,8 @@ libirc_notifylist_sm = shared_module('irc_notifylist',
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
-  dependencies : dep)
+  dependencies : dep,
+  override_options : ['b_lundef=false'])
 
 dl_cross_irc_notifylist = []
 if need_dl_cross_link
diff --git a/src/irc/proxy/meson.build b/src/irc/proxy/meson.build
index 30ac90a4..4cc2b658 100644
--- a/src/irc/proxy/meson.build
+++ b/src/irc/proxy/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-shared_module('irc_proxy',
+shared_library('irc_proxy',
   files(
     'dump.c',
     'listen.c',
@@ -13,6 +13,7 @@ shared_module('irc_proxy',
   install : true,
   install_dir : moduledir,
   dependencies : dep,
+  override_options : ['b_lundef=false'],
 )
 
 # noinst_headers = files(
diff --git a/src/otr/meson.build b/src/otr/meson.build
index 5b7d256f..13b564ea 100644
--- a/src/otr/meson.build
+++ b/src/otr/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-shared_module('otr_core',
+shared_library('otr_core',
   files(
     'key.c',
     'otr-fe.c',
@@ -15,6 +15,7 @@ shared_module('otr_core',
   install : true,
   install_dir : moduledir,
   dependencies : dep,
+  override_options : ['b_lundef=false'],
 )
 
 # noinst_headers = files(
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
index ae408a7e..0f3f3bb5 100644
--- a/src/perl/common/meson.build
+++ b/src/perl/common/meson.build
@@ -1,5 +1,5 @@
 
-shared_module('Irssi',
+shared_library('Irssi',
   [ xsubpp.process(
     files(
       'Channel.xs',
@@ -27,6 +27,7 @@ shared_module('Irssi',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
+  override_options : ['b_lundef=false'],
 )
 
 install_headers(
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index 7b366aa8..e033c260 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -1,4 +1,4 @@
-shared_module('Irc',
+shared_library('Irc',
   [ xsubpp.process(
     files(
       'Channel.xs',
@@ -28,6 +28,7 @@ shared_module('Irc',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
+  override_options : ['b_lundef=false'],
 )
 
 install_headers(
diff --git a/src/perl/meson.build b/src/perl/meson.build
index 09d4f8a6..1c6e2fbc 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -17,7 +17,7 @@ irssi_core_pl_h = custom_target('irssi-core.pl.h',
 # required as of Meson 0.58.0
 generated_files_inc = include_directories('.')
 
-libperl_core_sm = shared_module('perl_core',
+libperl_core_sm = shared_library('perl_core',
   files(
     'perl-common.c',
     'perl-core.c',
@@ -39,7 +39,7 @@ libperl_core_sm = shared_module('perl_core',
   install_rpath : perl_rpath,
   build_rpath : perl_rpath,
   dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep,
-  override_options : ['b_asneeded=false'],
+  override_options : ['b_asneeded=false', 'b_lundef=false'],
   link_with : dl_cross_irssi_main,
 )
 
@@ -48,7 +48,7 @@ if need_dl_cross_link
   dl_cross_perl_core += libperl_core_sm
 endif
 
-shared_module('fe_perl',
+shared_library('fe_perl',
   files(
     'module-formats.c',
     'perl-fe.c',
@@ -63,6 +63,7 @@ shared_module('fe_perl',
   install_dir : moduledir,
   dependencies : dep,
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
+  override_options : ['b_lundef=false'],
 )
 
 subdir('common')
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
index 5b2ed136..b7d769c5 100644
--- a/src/perl/textui/meson.build
+++ b/src/perl/textui/meson.build
@@ -1,4 +1,4 @@
-shared_module('TextUI',
+shared_library('TextUI',
   [ xsubpp.process(
     files(
       'Statusbar.xs',
@@ -24,6 +24,7 @@ shared_module('TextUI',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
+  override_options : ['b_lundef=false'],
 )
 
 install_headers(
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
index e74d0898..a6e5c93c 100644
--- a/src/perl/ui/meson.build
+++ b/src/perl/ui/meson.build
@@ -1,4 +1,4 @@
-shared_module('UI',
+shared_library('UI',
   [ xsubpp.process(
     files(
       'Formats.xs',
@@ -22,6 +22,7 @@ shared_module('UI',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
+  override_options : ['b_lundef=false'],
 )
 
 install_headers(

From f293277765706a1470c46b4c1ee3bf5046f73114 Mon Sep 17 00:00:00 2001
From: arza <arza@arza.us>
Date: Tue, 23 Sep 2025 00:01:54 +0300
Subject: [PATCH 1630/1650] Increase default scrollback_lines

It seems common that people miss important messages when being away and want to increase the scrollback.
---
 src/fe-text/gui-printtext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 2091b5a3..7482d470 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -405,7 +405,7 @@ void gui_printtext_init(void)
 	indent_functions = g_hash_table_new((GHashFunc) g_str_hash,
 					    (GCompareFunc) g_str_equal);
 
-	settings_add_int("history", "scrollback_lines", 500);
+	settings_add_int("history", "scrollback_lines", 5000);
 	settings_add_time("history", "scrollback_time", "1day");
 	settings_add_time("history", "scrollback_max_age", "0");
 	settings_add_int("history", "scrollback_burst_remove", 10);

From 3316202c489074b2d08c457397a6209484f4aafe Mon Sep 17 00:00:00 2001
From: Juha Remes <jremes@outlook.com>
Date: Sat, 22 Nov 2025 14:27:53 +0000
Subject: [PATCH 1631/1650] Typo fix in docs/help/in/lusers.in

---
 docs/help/in/lusers.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/lusers.in b/docs/help/in/lusers.in
index f9edf535..99089fb7 100644
--- a/docs/help/in/lusers.in
+++ b/docs/help/in/lusers.in
@@ -5,7 +5,7 @@
 
 %9Parameters:%9
 
-    The server to search on and the remote sever to search on; if no arguments
+    The server to search on and the remote server to search on; if no arguments
     are given, the active server will be used.
 
 %9Description:%9

From 5416843d2d8a8292abfd9ab28a9b9f9b9b604d49 Mon Sep 17 00:00:00 2001
From: soulseller <soulseller@users.noreply.github.com>
Date: Sat, 22 Nov 2025 22:30:38 +0200
Subject: [PATCH 1632/1650] fe-netsplit: fix nickname truncation to avoid
 trailing comma-space

---
 src/fe-common/irc/fe-netsplit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index b76d4ce7..990c4fe2 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -137,7 +137,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split,
 			g_string_append_printf(chanrec->nicks, "%s, ", split->nick);
 
 			if (chanrec->nick_count == netsplit_max_nicks)
-                                chanrec->maxnickpos = chanrec->nicks->len;
+				chanrec->maxnickpos = chanrec->nicks->len - 2;
 		}
 	}
 }

From 3811b1ffc9f38d52a0e433b0d9ddce9b2b3e2486 Mon Sep 17 00:00:00 2001
From: soulseller <soulseller@users.noreply.github.com>
Date: Wed, 26 Nov 2025 23:49:58 +0200
Subject: [PATCH 1633/1650] formats: fix hide_text_style and hide_colors to
 mitigate color bleed

---
 src/fe-common/core/formats.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index f7614b6f..db2148d0 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -1546,9 +1546,13 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 			break;
 		case 15:
 			/* remove all styling */
-			fgcolor = theme->default_color;
-			bgcolor = -1;
-			flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE;
+			if (!hide_text_style) {
+				if (!hide_colors) {
+					fgcolor = theme->default_color;
+					bgcolor = -1;
+				}
+				flags &= GUI_PRINT_FLAG_INDENT | GUI_PRINT_FLAG_MONOSPACE;
+			}
 			break;
 		case 17:
 			if (!hide_text_style)

From d145f24c2226b1ca461249e3020e69d4e71509d4 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 27 Dec 2025 20:41:26 +0100
Subject: [PATCH 1634/1650] run syncscripts.sh

autoop 1.10 -> 1.11
mail 2.92 -> 2.93
scriptassist 2022053100 -> 2023111700
---
 scripts/autoop.pl       |  11 +-
 scripts/mail.pl         |   6 +-
 scripts/scriptassist.pl | 392 ++++++++++++++++++++++++++--------------
 3 files changed, 265 insertions(+), 144 deletions(-)

diff --git a/scripts/autoop.pl b/scripts/autoop.pl
index b72def15..ce37e705 100644
--- a/scripts/autoop.pl
+++ b/scripts/autoop.pl
@@ -5,7 +5,7 @@ use Irssi;
 use strict;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.10";
+$VERSION = "1.11";
 %IRSSI = (
     authors     => 'Timo Sirainen & Jostein Kjønigsen',
     name        => 'autoop',
@@ -98,10 +98,11 @@ sub load_autoops {
     %opnicks = ();
     open(CONF, "<", "$file") or return;
     while (my $line = <CONF>) {
-	if ($line !=~ /^\s*$/) {
-	    cmd_autoop($line);
-	    $count++;
-	}
+        chomp($line);
+        if ($line !~ /^\s*$/) {
+            cmd_autoop($line);
+            $count++;
+        }
     }
     close(CONF);
     
diff --git a/scripts/mail.pl b/scripts/mail.pl
index 23f99c01..bf14503a 100644
--- a/scripts/mail.pl
+++ b/scripts/mail.pl
@@ -1,6 +1,6 @@
 use strict;
 use vars qw($VERSION %IRSSI);
-$VERSION = "2.92";
+$VERSION = "2.93";
 %IRSSI = (
     authors     => "Timo Sirainen, Matti Hiljanen, Joost Vunderink, Bart Matthaei",
     contact     => "tss\@iki.fi, matti\@hiljanen.com, joost\@carnique.nl, bart\@dreamflow.nl",
@@ -63,8 +63,8 @@ sub cmd_print_help {
   "/MAILBOX SHOW\n".
   "    - Shows a list of the defined mailboxes.\n\n".
   "Use the following commands to change the behaviour:\n\n".
-  "/SET MAILDIRMODE on|off\n".
-  "    - If maildirmode is on, the mailboxes in the list are assumed to be ".
+  "/SET MAILDIR_MODE on|off\n".
+  "    - If maildir_mode is on, the mailboxes in the list are assumed to be ".
   "directories. Otherwise they are assumed to be spool files.\n".
   "      Default: off.\n".
   "/SET MAIL_OLDNOTNEW on|off\n".
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 5cad3838..665615db 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2022053100';
+our $VERSION = '2023111700';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -22,6 +22,8 @@ our ($forked, %remote_db, $have_gpg, @complist);
 use Irssi 20020324;
 use CPAN::Meta::YAML;
 use LWP::UserAgent;
+use Hash::Util qw(lock_ref_keys);
+use JSON::PP;
 use POSIX;
 use version;
 
@@ -43,7 +45,7 @@ sub show_help {
 /scriptassist info <scripts>
     Display information about <scripts>
 /scriptassist ratings <scripts|all>
-    Retrieve the average ratings of the the scripts
+    Retrieve the average ratings of the scripts
 /scriptassist top <num>
     Retrieve the first <num> top rated scripts
 /scriptassist new <num>
@@ -199,87 +201,163 @@ sub get_unknown {
 }
 
 sub get_names {
-    my ($sname, $db) = shift;
+    my ($sname, $db, $votes) = @_;
     $sname =~ s/\s+$//;
-    $sname =~ s/\.pl$//;
-    my $plname = "$sname.pl";
+    my $ext = 'pl';  # default extension
+    if ($sname =~ s/\.(\w{2,3})$//) {
+	$ext = $1;
+    }
+    my $plname = "$sname.$ext";
     $sname =~ s/^.*\///;
     my $xname = $sname;
     $xname =~ s/\W/_/g;
     my $pname = "${xname}::";
     if ($xname ne $sname || $sname =~ /_/) {
 	my $dir = Irssi::get_irssi_dir()."/scripts/";
-	if ($db && exists $db->{"$sname.pl"}) {
+	if ($db && exists $db->{$plname}) {
 	    # $found = 1;
-	} elsif (-e $dir.$plname || -e $dir."$sname.pl" || -e $dir."autorun/$sname.pl") {
+	} elsif (-e $dir.$plname || -e $dir."autorun/".$plname) {
 	    # $found = 1;
 	} else {
 	    # not found
 	    my $pat = $xname; $pat =~ y/_/?/;
 	    my $re = "\Q$xname"; $re =~ s/\Q_/./g;
 	    if ($db) {
-		my ($cand) = grep /^$re\.pl$/, sort keys %$db;
+		my ($cand) = grep /^$re\.\Q$ext\E$/, sort keys %$db;
 		if ($cand) {
-		    return get_names($cand, $db);
+		    return get_names($cand, $db, $votes);
 		}
 	    }
-	    my ($cand) = glob "'$dir$pat.pl' '${dir}autorun/$pat.pl'";
+	    my ($cand) = glob "'$dir$pat.$ext' '${dir}autorun/$pat.$ext'";
 	    if ($cand) {
 		$cand =~ s/^.*\///;
-		return get_names($cand, $db);
+		return get_names($cand, $db, $votes);
 	    }
 	}
     }
-    ($sname, $plname, $pname, $xname)
+    my ($script_stash, $script_irssi, $script_db, $local_version);
+    $script_db = $db->{$plname} if $db && exists $db->{$plname};
+    if (lc $ext eq 'pl') {
+	$script_stash = $Irssi::Script::{$pname};
+    }
+    elsif (lc $ext eq 'py' && is_python_loaded()) {
+	my $filename;
+	capture_print_text_command(
+	    'py list',
+	    sub {
+		for my $line (@_[ 1 .. $#_ ]) {
+		    my ($script, $fn) = split ' ', $line, 2;
+		    if ($script eq $sname) {
+			$filename = $fn;
+		    }
+		}
+	    });
+	if (defined $filename) {
+	    my $filename_quoted = $filename;
+	    $filename_quoted =~ s/[\\']/\\$&/g;
+	    capture_print_text_command(
+		# make sure the command line stays short
+		'py exec ' .
+		(join ';', split /\n/, <<PYTHON
+import ast as A, types as _, json
+i = 'IRSSI'
+v = '__version__'
+T = isinstance
+f = '$filename_quoted'
+a = lambda _: T(_, A.Assign)
+n = lambda _: T(_, A.Name)
+y = lambda _: _.id
+t = lambda _: list(map(y, filter(n, _.targets)))
+C = lambda e: lambda _: a(_) and t(_) == [e]
+O = _.SimpleNamespace(value=A.Constant(None))
+P = A.parse(open(f).read(), filename=f)
+f = lambda e: A.literal_eval(next(filter(C(e), P.body), O).value)
+print(json.dumps({ i: f(i), v: f(v) }))
+PYTHON
+		),
+		sub {
+		    eval {
+			my $doc = decode_json("@_");
+			$script_stash = { IRSSI => $doc->{IRSSI}, VERSION => \($doc->{__version__}) };
+		    };
+		}
+	       );
+	}
+    }
+    if (defined $script_stash) {
+	$script_irssi = $script_stash->{IRSSI};
+	$local_version = ${$script_stash->{VERSION}}
+	  if $script_stash->{VERSION};
+    }
+    lock_ref_keys({
+	sname => $ext eq 'pl' ? $sname : $plname,
+	plname => $plname,
+	pname => $pname,
+	xname => $xname,
+	stash => $script_stash,
+	irssi => $script_irssi,
+	db => $script_db,
+	db_version => ($script_db ? $script_db->{version} : undef),
+	local_version => $local_version,
+	($votes ? (votes => $votes->{$plname}) : ()),
+    })
 }
 
 sub script_info {
     my ($scripts) = @_;
     my %result;
     my $xml = get_scripts();
+    my $py = is_python_loaded();
     foreach (@{$scripts}) {
-	my ($sname, $plname, $pname) = get_names($_, $xml);
-	next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} ));
-	$result{$sname}{version} = get_remote_version($sname, $xml);
+	my %r;
+	my $n = get_names($_, $xml);
+	next unless (defined $n->{db} || defined $n->{irssi});
+	$r{version} = $n->{db_version};
 	my @headers = ('authors', 'contact', 'description', 'license', 'source');
 	foreach my $entry (@headers) {
-	    $result{$sname}{$entry} = $Irssi::Script::{$pname}{IRSSI}{$entry};
-	    if (defined $xml->{$plname}{$entry}) {
-		$result{$sname}{$entry} = $xml->{$plname}{$entry};
+	    $r{$entry} = $n->{irssi}{$entry};
+	    if ($n->{db} && defined $n->{db}{$entry}) {
+		$r{$entry} = $n->{db}{$entry};
 	    }
 	}
-	if ($xml->{$plname}{signature_available}) {
-	    $result{$sname}{signature_available} = 1;
+	if ($n->{db} && $n->{db}{signature_available}) {
+	    $r{signature_available} = 1;
 	}
-	if (defined $xml->{$plname}{modules}) {
-	    my $modules = $xml->{$plname}{modules};
+	if ($n->{db} && defined $n->{db}{modules}) {
+	    my $modules = $n->{db}{modules};
 	    foreach my $mod (split(/ /, $modules)) {
 		my $opt = ($mod =~ /\((.*)\)/)? 1 : 0;
 		$mod = $1 if $1;
-		$result{$sname}{modules}{$mod}{optional} = $opt;
-		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
+		$r{modules}{$mod}{optional} = $opt;
+		$r{modules}{$mod}{installed} = module_exist($mod);
 	    }
-	} elsif (defined $Irssi::Script::{$pname}{IRSSI}{modules}) {
-	    my $modules = $Irssi::Script::{$pname}{IRSSI}{modules};
+	} elsif ($n->{irssi} && defined $n->{irssi}{modules}) {
+	    my $modules = $n->{irssi}{modules};
 	    foreach my $mod (split(/ /, $modules)) {
 		my $opt = ($mod =~ /\((.*)\)/)? 1 : 0;
 		$mod = $1 if $1;
-		$result{$sname}{modules}{$mod}{optional} = $opt;
-		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
+		$r{modules}{$mod}{optional} = $opt;
+		$r{modules}{$mod}{installed} = module_exist($mod);
 	    }
 	}
-	# if (defined $xml->{$plname}{depends}) {
-	#     my $depends = $xml->{$plname}{depends};
+	if (!$py && $n->{db} && $n->{db}{language} eq 'Python') {  # py
+	    $r{modules}{'irssi-python module'}{installed} = 0;
+	}
+	# if (defined $n->{db}{depends}) {
+	#     my $depends = $n->{db}{depends};
 	#     foreach my $dep (split(/ /, $depends)) {
-	# 	$result{$sname}{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep });
+	# 	$r{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep });
 	#     }
 	# }
+	$result{$n->{sname}} = \%r;
     }
     return \%result;
 }
 
 sub get_rate_url {
     my ($src) = @_;
+    if (ref $src) { ($src) = grep { $_ } map { $_->{source} } values %$src; }
+    die("No script source address found\n") unless $src;
     my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
     $ua->agent('ScriptAssist/'.$VERSION);
     my $request = HTTP::Request->new('GET', $src);
@@ -288,6 +366,9 @@ sub get_rate_url {
 	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
 	die("Fetching ratings location failed: $error");
     }
+    if (my $error = $response->header('X-Died')) {
+	die("$error\n");
+    }
     my $votes_url;
     for my $tag ($response->content() =~ /<script([^>]*)>/g) {
 	my $attr = " $tag ";
@@ -299,7 +380,7 @@ sub get_rate_url {
     }
     $request = HTTP::Request->new('GET', $votes_url);
     $response = $ua->request($request);
-    if (!$response->is_success) {
+    if (!$response->is_success || $response->header('X-Died')) {
 	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
 	die("Fetching ratings failed: $error");
     }
@@ -311,16 +392,16 @@ sub get_rate_url {
 sub rate_script {
     my ($script, $stars) = @_;
     my $xml = get_scripts();
-    my $votes = get_rate_url(map { $_->{source} } values %$xml);
-    my ($sname, $plname, $pname) = get_names($script, $xml);
-    die "Script $script not found\n" unless $votes->{$plname};
-    return $votes->{$plname}{u}
+    my $votes = get_rate_url($xml);
+    my $n = get_names($script, $xml, $votes);
+    die "Script $script not found\n" unless $n->{votes};
+    return $n->{votes}{u}
 }
 
 sub get_ratings {
     my ($scripts, $limit) = @_;
     my $xml = get_scripts();
-    my $votes = get_rate_url(map { $_->{source} } values %$xml);
+    my $votes = get_rate_url($xml);
     foreach (keys %{$votes}) {
 	if ($xml->{$_}) {
 	    $xml->{$_}{votes} = $votes->{$_}{v};
@@ -329,9 +410,9 @@ sub get_ratings {
     my %result;
     if (@{$scripts}) {
 	foreach (@{$scripts}) {
-	    my ($sname, $plname, $pname) = get_names($_, $xml);
-	    next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} ));
-	    $result{$plname} = [$xml->{$plname}{votes}];
+	    my $n = get_names($_, $xml);
+	    next unless ($n->{db} || $n->{irssi});
+	    $result{$n->{plname}} = [$n->{db}{votes}];
 	}
     } else {
 	my @keys = sort { $xml->{$b}{votes} <=> $xml->{$a}{votes}
@@ -371,16 +452,22 @@ sub debug_scripts {
     my ($scripts) = @_;
     my %result;
     my $xml = get_scripts();
+    my $py = is_python_loaded();
     foreach (@{$scripts}) {
-	my ($sname, $plname) = get_names($_, $xml);
-	if (defined $xml->{$plname}{modules}) {
-	    my $modules = $xml->{$plname}{modules};
+	my %r;
+	my $n = get_names($_, $xml);
+	if ($n->{db} && defined $n->{db}{modules}) {
+	    my $modules = $n->{db}{modules};
 	    foreach my $mod (split(/ /, $modules)) {
                 my $opt = ($mod =~ /\((.*)\)/)? 1 : 0;
                 $mod = $1 if $1;
-                $result{$sname}{$mod}{optional} = $opt;
-                $result{$sname}{$mod}{installed} = module_exist($mod);
+                $r{$mod}{optional} = $opt;
+                $r{$mod}{installed} = module_exist($mod);
 	    }
+	    $result{$n->{sname}} = \%r;
+	}
+	if (!$py && $n->{db} && $n->{db}{language} eq 'Python') {  # py
+	    $result{$n->{sname}}{'irssi-python module'}{installed} = 0;
 	}
     }
     return(\%result);
@@ -391,11 +478,11 @@ sub install_scripts {
     my %success;
     my $dir = Irssi::get_irssi_dir()."/scripts/";
     foreach (@{$scripts}) {
-	my ($sname, $plname, $pname) = get_names($_, $xml);
-	if (get_local_version($sname) && (-e $dir.$plname)) {
-	    $success{$sname}{installed} = -2;
+	my $n = get_names($_, $xml);
+	if ($n->{stash} && (-e $dir.$n->{plname})) {
+	    $success{$n->{sname}}{installed} = -2;
 	} else {
-	    $success{$sname} = download_script($sname, $xml);
+	    $success{$n->{sname}} = download_script($n->{sname}, $xml);
 	}
     }
     return \%success;
@@ -406,24 +493,24 @@ sub update_scripts {
     $list = loaded_scripts() if ($list->[0] eq "all" || scalar(@$list) == 0);
     my %status;
     foreach (@{$list}) {
-	my ($sname) = get_names($_, $database);
-	my $local = get_local_version($sname);
-	my $remote = get_remote_version($sname, $database);
+	my $n = get_names($_, $database);
+	my $local = $n->{local_version};
+	my $remote = $n->{db_version};
 	next if $local eq '' || $remote eq '';
 	if (compare_versions($local, $remote) eq "older") {
-	    $status{$sname} = download_script($sname, $database);
+	    $status{$n->{sname}} = download_script($n->{sname}, $database);
 	} else {
-	    $status{$sname}{installed} = -2;
+	    $status{$n->{sname}}{installed} = -2;
 	}
-	$status{$sname}{remote} = $remote;
-	$status{$sname}{local} = $local;
+	$status{$n->{sname}}{remote} = $remote;
+	$status{$n->{sname}}{local} = $local;
     }
     return \%status;
 }
 
 sub search_scripts {
     my ($query, $database) = @_;
-    $query =~ s/\.pl\Z//;
+    $query =~ s/\.pl\Z//;  # pl
     my %result;
     foreach (sort keys %{$database}) {
 	my %entry = %{$database->{$_}};
@@ -432,7 +519,7 @@ sub search_scripts {
 	$string .= $entry{description} if defined $entry{description};
 	if ($string =~ /$query/i) {
 	    my $name = $_;
-	    $name =~ s/\.pl$//;
+	    $name =~ s/\.pl$//;  # pl
 	    if (defined $entry{description}) {
 		$result{$name}{desc} = $entry{description};
 	    } else {
@@ -443,7 +530,7 @@ sub search_scripts {
 	    } else {
 		$result{$name}{authors} = "";
 	    }
-	    if (get_local_version($name)) {
+	    if (get_names($name, $database)->{stash}) {
 		$result{$name}{installed} = 1;
 	    } else {
 		$result{$name}{installed} = 0;
@@ -531,8 +618,8 @@ sub print_unknown {
 	    my $text .= "The command '/".$cmd."' is provided by the script '".$data->{$cmd}{$_}{name}."'.\n";
 	    $text .= "This script is currently not installed on your system.\n";
 	    $text .= "If you want to install the script, enter\n";
-	    my ($name) = get_names($_);
-	    $text .= "  %U/script install ".$name."%U ";
+	    my $n = get_names($_);
+	    $text .= "  %U/script install ".$n->{sname}."%U ";
 	    my $output = draw_box("ScriptAssist", $text, "'".$_."' missing", 1);
 	    print CLIENTCRAP $output;
 	}
@@ -541,10 +628,10 @@ sub print_unknown {
 
 sub check_autorun {
     my ($script) = @_;
-    my (undef, $plname) = get_names($script);
+    my $n = get_names($script);
     my $dir = Irssi::get_irssi_dir()."/scripts/";
-    if (-e $dir."/autorun/".$plname) {
-	if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
+    if (-e $dir."/autorun/".$n->{plname}) {
+	if (readlink($dir."/autorun/".$n->{plname}) eq "../".$n->{plname}) {
 	    return 1;
 	}
     }
@@ -582,14 +669,15 @@ sub print_info {
     my $line;
     foreach my $script (sort keys(%data)) {
 	my ($local, $autorun);
-	if (get_local_version($script)) {
+	my $n = get_names($script);
+	if ($n->{stash}) {
 	    $line .= "%go%n ";
-	    $local = get_local_version($script);
+	    $local = $n->{local_version};
 	} else {
 	    $line .= "%ro%n ";
 	    $local = undef;
 	}
-	if (defined $local || check_autorun($script)) {
+	if ($n->{stash} || check_autorun($script)) {
 	    $autorun = "no";
 	    $autorun = "yes" if check_autorun($script);
 	} else {
@@ -643,7 +731,7 @@ sub print_ratings {
     my @table;
     foreach my $script (sort {$data{$b}{rating}<=>$data{$a}{rating}} keys(%data)) {
 	my @line;
-	if (get_local_version($script)) {
+	if (get_names($script)->{stash}) {
 	    push @line, "%go%n";
 	} else {
 	    push @line, "%yo%n";
@@ -660,13 +748,13 @@ sub print_new {
     my @table;
     foreach (sort {$list->{$b}{modified} cmp $list->{$a}{modified}} keys %$list) {
 	my @line;
-	my ($name) = get_names($_);
-        if (get_local_version($name)) {
+	my $n = get_names($_);
+        if ($n->{stash}) {
             push @line, "%go%n";
         } else {
             push @line, "%yo%n";
         }
-	push @line, "%9".$name."%9";
+	push @line, "%9".$n->{sname}."%9";
 	push @line, $list->{$_}{modified};
 	push @table, \@line;
     }
@@ -678,14 +766,23 @@ sub print_debug {
     my $line;
     foreach my $script (sort keys %data) {
 	$line .= "%ro%n %9".$script."%9 failed to load\n";
-	$line .= "  Make sure you have the following perl modules installed:\n";
+	my $py = $data{$script}{'irssi-python module'};
+	if ($py) {  # py
+	    $line .= "  You are attempting to load a Python script!\n";
+	} else {
+	    $line .= "  Make sure you have the following perl modules installed:\n";
+	}
 	foreach (sort keys %{$data{$script}}) {
 	    if ( $data{$script}{$_}{installed} == 1 ) {
 		$line .= "  %g->%n ".$_." (found)";
 	    } else {
 		$line .= "  %r->%n ".$_." (not found)\n";
 		$line .= "     [This module is optional]\n" if $data{$script}{$_}{optional};
-		$line .= "     [Try /scriptassist cpan ".$_."]";
+		if ($py) {  # py
+		    $line .= "     [If you have it installed, try: /load python]";
+		} else {
+		    $line .= "     [Try /scriptassist cpan ".$_."]";
+		}
 	    }
 	    $line .= "\n";
 	}
@@ -695,7 +792,13 @@ sub print_debug {
 
 sub load_script {
     my ($script) = @_;
-    Irssi::command('script load '.$script);
+    if ($script =~ s/\.py$//i) {  # py
+	if (is_python_loaded()) {
+	    Irssi::command('py load '.$script);
+	}
+    } else {
+	Irssi::command('script load '.$script);  # pl
+    }
 }
 
 sub print_install {
@@ -715,7 +818,7 @@ sub print_install {
 	    } else {
 		load_script($script) unless (lc($script) eq lc($IRSSI{name}));
 	    }
-    	    if (get_local_version($script) && not lc($script) eq lc($IRSSI{name})) {
+	    if (get_names($script)->{stash} && not lc($script) eq lc($IRSSI{name})) {
 		$line .= "%go%n %9".$script."%9 installed\n";
 		push @installed, $script;
 	    } elsif (lc($script) eq lc($IRSSI{name})) {
@@ -751,16 +854,14 @@ sub list_sbitems {
     my ($scripts) = @_;
     my $text;
     foreach (@$scripts) {
-	next unless exists $Irssi::Script::{"${_}::"};
-	next unless exists $Irssi::Script::{"${_}::"}{IRSSI};
-	my $header = $Irssi::Script::{"${_}::"}{IRSSI};
-	next unless $header->{sbitems};
+	my $n = get_names($_);
+	next unless $n->{irssi}{sbitems};
 	$text .= '%9"'.$_.'"%9 provides the following statusbar item(s):'."\n";
-	$text .= '  ->'.$_."\n" foreach (split / /, $header->{sbitems});
+	$text .= '  ->'.$_."\n" foreach (split / /, $n->{irssi}{sbitems});
     }
     return unless $text;
     $text .= "\n";
-    $text .= "Enter '/statusbar window add <item>' to add an item.";
+    $text .= "Enter '/statusbar additem <item> window' to add an item.";
     print CLIENTCRAP draw_box('ScriptAssist', $text, 'sbitems', 1);
 }
 
@@ -838,14 +939,12 @@ sub print_update {
 
 sub contact_author {
     my ($script) = @_;
-    my ($sname, $plname, $pname) = get_names($script);
-    return unless exists $Irssi::Script::{$pname};
-    my $header = $Irssi::Script::{$pname}{IRSSI};
-    if ($header && defined $header->{contact}) {
-	my @ads = split(/ |,/, $header->{contact});
+    my $n = get_names($script);
+    if ($n->{irssi} && defined $n->{irssi}{contact}) {
+	my @ads = split(/ |,/, $n->{irssi}{contact});
 	my $address = $ads[0];
 	$address .= '?subject='.$script;
-	$address .= '_'.get_local_version($script) if defined get_local_version($script);
+	$address .= '_'.$n->{local_version} if $n->{local_version};
 	call_openurl($address) if $address =~ /[\@:]/;
     }
 }
@@ -874,6 +973,10 @@ sub get_scripts {
 	    $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
 	    next;
 	}
+	if (my $died = $response->header('X-Died')) {
+	    $error = $died;
+	    next;
+	}
 	$fetched = 1;
 	my $data = $response->content();
 	my $src = $site;
@@ -929,20 +1032,6 @@ sub get_scripts {
     return $remote_db{db};
 }
 
-sub get_remote_version {
-    my ($script, $database) = @_;
-    my $plname = (get_names($script, $database))[1];
-    return $database->{$plname}{version};
-}
-
-sub get_local_version {
-    my ($script) = @_;
-    my $pname = (get_names($script))[2];
-    return unless exists $Irssi::Script::{$pname};
-    my $vref = $Irssi::Script::{$pname}{VERSION};
-    return $vref ? $$vref : undef;
-}
-
 sub compare_versions {
     my ($ver1, $ver2) = @_;
     for ($ver1, $ver2) {
@@ -959,11 +1048,42 @@ sub compare_versions {
     return 'equal';
 }
 
+sub is_python_loaded {
+    !! grep { $_->{cmd} eq 'py' } Irssi::commands
+}
+
+my @print_text_capture;
+sub capture_print_text {
+    my ($dest, $text, $plain) = @_;
+    push @print_text_capture, $plain;
+    Irssi::signal_stop;
+}
+
+sub capture_print_text_command {
+    my ($command, $sub) = @_;
+    Irssi::signal_add_first('print text', 'capture_print_text');
+    @print_text_capture = ();
+    Irssi::command($command);
+    my @capture = @print_text_capture;
+    Irssi::signal_remove('print text', 'capture_print_text');
+    @print_text_capture = ();
+    $sub->(@capture);
+}
+
 sub loaded_scripts {
     my @modules;
-    foreach (sort grep(s/::$//, keys %Irssi::Script::)) {
+    foreach (sort grep(s/::$//, keys %Irssi::Script::)) {  # pl
 	push @modules, $_;
     }
+    if (is_python_loaded()) {
+	capture_print_text_command(
+	    'py list', sub {
+		for my $line (@_[ 1 .. $#_ ]) {
+		    my ($script, $file) = split ' ', $line, 2;
+		    push @modules, "$script.py";
+		}
+	    });
+    }
     return \@modules;
 }
 
@@ -971,9 +1091,9 @@ sub check_scripts {
     my ($data) = @_;
     my %versions;
     foreach (@{loaded_scripts()}) {
-	my ($sname) = get_names($_, $data);
-	my $remote = get_remote_version($sname, $data);
-	my $local = get_local_version($sname);
+	my $n = get_names($_, $data);
+	my $remote = $n->{db_version};
+	my $local = $n->{local_version};
 	my $state;
 	if ($local && $remote) {
 	    $state = compare_versions($local, $remote);
@@ -986,9 +1106,9 @@ sub check_scripts {
 	    $remote = '/';
 	}
 	if ($state) {
-	    $versions{$sname}{state} = $state;
-	    $versions{$sname}{remote} = $remote;
-	    $versions{$sname}{local} = $local;
+	    $versions{$n->{sname}}{state} = $state;
+	    $versions{$n->{sname}}{remote} = $remote;
+	    $versions{$n->{sname}}{local} = $local;
 	}
     }
     return \%versions;
@@ -996,40 +1116,40 @@ sub check_scripts {
 
 sub download_script {
     my ($script, $xml) = @_;
-    my ($sname, $plname) = get_names($script, $xml);
+    my $n = get_names($script, $xml);
+    my $site = $n->{db}{source};
     my %result;
-    my $site = $xml->{$plname}{source};
     $result{installed} = 0;
     $result{signed} = 0;
     my $dir = Irssi::get_irssi_dir();
-    my $ua = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1,timeout => 30);
+    my $ua = LWP::UserAgent->new(env_proxy => 1, keep_alive => 1, timeout => 30);
     $ua->agent('ScriptAssist/'.2003020803);
-    my $request = HTTP::Request->new('GET', $site.'/scripts/'.$script.'.pl');
+    my $request = HTTP::Request->new('GET', $site.'/scripts/'.$n->{plname});
     my $response = $ua->request($request);
-    if ($response->is_success()) {
+    if ($response->is_success() && !$response->header('X-Died')) {
 	my $file = $response->content();
 	mkdir $dir.'/scripts/' unless (-e $dir.'/scripts/');
-	open(my $F, '>', $dir.'/scripts/'.$plname.'.new');
-	print $F $file;
-	close($F);
+	open(my $f, '>', $dir.'/scripts/'.$n->{plname}.'.new');
+	print $f $file;
+	close($f);
 	if ($have_gpg && Irssi::settings_get_bool('scriptassist_use_gpg')) {
 	    my $ua2 = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1,timeout => 30);
 	    $ua->agent('ScriptAssist/'.2003020803);
-	    my $request2 = HTTP::Request->new('GET', $site.'/signatures/'.$plname.'.asc');
+	    my $request2 = HTTP::Request->new('GET', $site.'/signatures/'.$n->{plname}.'.asc');
 	    my $response2 = $ua->request($request2);
-	    if ($response2->is_success()) {
+	    if ($response2->is_success() && !$response->header('X-Died')) {
 		my $sig_dir = $dir.'/scripts/signatures/';
 		mkdir $sig_dir unless (-e $sig_dir);
-		open(my $S, '>', $sig_dir.$plname.'.asc');
+		open(my $s, '>', $sig_dir.$n->{plname}.'.asc');
 		my $file2 = $response2->content();
-		print $S $file2;
-		close($S);
+		print $s $file2;
+		close($s);
 		my $sig;
 		foreach (1..2) {
 		    # FIXME gpg needs two rounds to load the key
 		    my $gpg = new GnuPG();
 		    eval {
-			$sig = $gpg->verify( file => $dir.'/scripts/'.$plname.'.new', signature => $sig_dir.$plname.'.asc' );
+			$sig = $gpg->verify( file => $dir.'/scripts/'.$n->{plname}.'.new', signature => $sig_dir.$n->{plname}.'.asc' );
 		    };
 		}
 		if (defined $sig->{user}) {
@@ -1055,8 +1175,8 @@ sub download_script {
     if ($result{installed}) {
 	my $old_dir = "$dir/scripts/old/";
 	mkdir $old_dir unless (-e $old_dir);
-	rename "$dir/scripts/$plname", "$old_dir/$plname.old" if -e "$dir/scripts/$plname";
-	rename "$dir/scripts/$plname.new", "$dir/scripts/$plname";
+	rename "$dir/scripts/".$n->{plname}, "$old_dir/".$n->{plname}.".old" if -e "$dir/scripts/".$n->{plname};
+	rename "$dir/scripts/".$n->{plname}.".new", "$dir/scripts/".$n->{plname};
     }
     return \%result;
 }
@@ -1083,23 +1203,23 @@ sub print_check {
 
 sub toggle_autorun {
     my ($script) = @_;
-    my ($sname, $plname) = get_names($script);
+    my $n = get_names($script);
     my $dir = Irssi::get_irssi_dir()."/scripts/";
     mkdir $dir."autorun/" unless (-e $dir."autorun/");
-    return unless (-e $dir.$plname);
-    if (-e $dir."/autorun/".$plname) {
-	if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
-	    if (unlink($dir."/autorun/".$plname)) {
-		print CLIENTCRAP "%R>>%n Autorun of ".$sname." disabled";
+    return unless (-e $dir.$n->{plname});
+    if (-e $dir."/autorun/".$n->{plname}) {
+	if (readlink($dir."/autorun/".$n->{plname}) eq "../".$n->{plname}) {
+	    if (unlink($dir."/autorun/".$n->{plname})) {
+		print CLIENTCRAP "%R>>%n Autorun of ".$n->{sname}." disabled";
 	    } else {
 		print CLIENTCRAP "%R>>%n Unable to delete link";
 	    }
 	} else {
-	    print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$plname." is not a correct link";
+	    print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$n->{plname}." is not a correct link";
 	}
     } else {
-	if (symlink("../".$plname, $dir."/autorun/".$plname)) {
-    	    print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
+	if (symlink("../".$n->{plname}, $dir."/autorun/".$n->{plname})) {
+	    print CLIENTCRAP "%R>>%n Autorun of ".$n->{sname}." enabled";
 	} else {
 	    print CLIENTCRAP "%R>>%n Unable to create autorun link";
 	}
@@ -1178,9 +1298,9 @@ sub cmd_help {
 
 sub sig_command_script_load {
     my ($script, $server, $witem) = @_;
-    my ($sname, $plname, $pname, $xname) = get_names($script);
-    if ( exists $Irssi::Script::{$pname} ) {
-	if (my $code = "Irssi::Script::${pname}"->can('pre_unload')) {
+    my $n = get_names($script);
+    if ( $n->{stash} ) {
+	if (my $code = ("Irssi::Script::".$n->{pname})->can('pre_unload')) {
 	    print CLIENTCRAP "%R>>%n Triggering pre_unload function of $script...";
 	    $code->();
 	}

From 82b253f63ea0dfc4fd9b8b523a3a1bec63a9b872 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 27 Dec 2025 22:27:11 +0100
Subject: [PATCH 1635/1650] run syncdocs.sh

added New-users and qna, removed faq and startup-HOWTO from sync
---
 docs/New-users.html | 110 +++++++++++++++++++++++++
 docs/New-users.txt  | 193 ++++++++++++++++++++++++++++++++++++++++++++
 docs/qna.html       |  52 ++++++++++++
 docs/qna.txt        | 111 +++++++++++++++++++++++++
 utils/syncdocs.sh   |  58 +++++++------
 5 files changed, 501 insertions(+), 23 deletions(-)
 create mode 100644 docs/New-users.html
 create mode 100644 docs/New-users.txt
 create mode 100644 docs/qna.html
 create mode 100644 docs/qna.txt

diff --git a/docs/New-users.html b/docs/New-users.html
new file mode 100644
index 00000000..496f319e
--- /dev/null
+++ b/docs/New-users.html
@@ -0,0 +1,110 @@
+<base href='https://irssi.org/New-users/'>
+<h1>New users guide</h1>
+<section id="new-to-irc">
+<h2>New to IRC</h2>
+<p>Internet Relay Chat was created in 1988 and has hardly changed. It can be used to exchange text messages (one message = single line) with other people, either privately (called query, PM, private message, MSG) or in a room (channel). Pictures are shared by uploading them to a temporary host like <a class="reference external" href="https://pomf.lain.la/">https://pomf.lain.la/</a> and then pasting the HTTP links. Code snippets or longer texts are shared by pasting them to a Pastebin like <a class="reference external" href="https://paste.opensuse.org/">https://paste.opensuse.org/</a> and then sharing the HTTP link.</p>
+<p>IRC does not have message history. You can only receive replies while your computer is turned on and connected to the channel you want to follow. Some people run their IRC programs on remote servers for that reason.</p>
+<p>IRC is organised into networks. Each network consists of many servers. It (mostly) does not matter which server you connect to as long as it belongs to the network you want to use. Irssi supports connections to many networks at the same time.</p>
+<p>Each network contains many channels, rooms that are often dedicated to discussing a specific topic. You can find many channels on <a class="reference external" href="https://netsplit.de/">https://netsplit.de/</a> or using a search engine with the keyword “IRC”. Irssi supports joining many channels at the same time.</p>
+<p>There is a rather large IRC network catering to free and open-source software and peer directed projects at <a class="reference external" href="https://libera.chat/">https://libera.chat/</a> and a smaller one at <a class="reference external" href="https://www.oftc.net/">https://www.oftc.net/</a> – many free software projects still have support channels on these IRC networks (although some have moved to Matrix or proprietary platforms like Discord).</p>
+</section>
+<section id="first-start">
+<h2>First start</h2>
+<p>After (compiling and) installing Irssi, to start it, open a shell (Terminal) and type:</p>
+<div class="highlight-default notranslate"><div><pre>irssi
+</pre></div>
+</div>
+<p>You should be greeted by a blinking cursor behind <code class="docutils literal notranslate">[(status)]</code>. You are now in the status window of Irssi. Window is the Irssi name for what you might nowadays call a “Web browser tab”.</p>
+<p>If you’re confused about what you are seeing on the Irssi screen, you can find an annotated screenshot of it at <a class="reference internal" href="../User-interface/">User interface</a>.</p>
+<p>If you want, you can pick a nick name (handle) that will be shown to others reading your messages now, by typing</p>
+<div class="highlight-default notranslate"><div><pre>/set nick whatyouwant
+</pre></div>
+</div>
+<p>Each command or message can be sent by pressing Enter. Commands in Irssi start with a <code class="docutils literal notranslate">/</code>. If there is no <code class="docutils literal notranslate">/</code>, then the line that you wrote will be sent as a message to the channel that you have open, for everyone to see.</p>
+<section id="leaving">
+<h3>Leaving</h3>
+<p>Type <code class="docutils literal notranslate">/quit</code> to get out of Irssi.</p>
+</section>
+</section>
+<section id="connecting-to-a-network">
+<h2>Connecting to a network</h2>
+<p>Irssi comes with some predefined networks. You can see the current list of networks by typing</p>
+<div class="highlight-default notranslate"><div><pre>/network
+</pre></div>
+</div>
+<p>(the list will be shown in your status window)</p>
+<p>To connect to one of the networks in the list, type <code class="docutils literal notranslate">/connect networkname</code>, for example:</p>
+<div class="highlight-default notranslate"><div><pre>/connect liberachat
+</pre></div>
+</div>
+<p>You should see several messages scroll by. After a while, you should be connected to the Libera Chat network.</p>
+<div class="admonition attention">
+<p class="admonition-title">Attention</p>
+<p>Irssi version 1.2 or older may be lacking the liberachat network entry. See <a class="reference external" href="https://github.com/shabble/irssi-docs/wiki/liberachat">https://github.com/shabble/irssi-docs/wiki/liberachat</a> for how to add it.</p>
+</div>
+<section id="nickname-registration">
+<h3>Nickname registration</h3>
+<p>Many IRC networks (but not all) offer a way to register a user account. Sometimes (but not on all networks) the account registration also includes reserving a nick for you. <em>How</em> to register also differs by network. Some <em>channels</em> only allow users with registered accounts to join them, so it may be very important for you to register a user account.</p>
+<p>User accounts are always specific to a network.</p>
+<p>For the Libera Chat network, you can find instructions how to register and set up your account with Irssi on <a class="reference external" href="https://github.com/shabble/irssi-docs/wiki/liberachat#configure-sasl-automated-log-in">https://github.com/shabble/irssi-docs/wiki/liberachat#configure-sasl-automated-log-in</a></p>
+</section>
+</section>
+<section id="joining-a-channel">
+<h2>Joining a channel</h2>
+<p>Once you are connected to a network, you can join channels by typing <code class="docutils literal notranslate">/join #channelname</code>, for example:</p>
+<div class="highlight-default notranslate"><div><pre>/join #irssi
+</pre></div>
+</div>
+<p>Now, a new window will open and you can send messages to the channel.</p>
+<section id="changing-windows">
+<h3>Changing windows</h3>
+<p>You can change between windows using the <code class="docutils literal notranslate">Ctrl</code>+<code class="docutils literal notranslate">n</code> or <code class="docutils literal notranslate">Ctrl</code>+<code class="docutils literal notranslate">p</code> keys, or–if your terminal is configured properly–using <code class="docutils literal notranslate">Alt</code>+<code class="docutils literal notranslate">1</code>, <code class="docutils literal notranslate">Alt</code>+<code class="docutils literal notranslate">2</code>, … See <a class="reference internal" href="../documentation/help/bind_-list/">bind -list</a> for a list of all default key bindings.</p>
+</section>
+<section id="removing-clutter">
+<h3>Removing clutter</h3>
+<p>By default, Irssi shows when someone joins or leaves a channel. These messages can waste a lot of lines and obscure the actual chat. To hide them, type</p>
+<div class="highlight-default notranslate"><div><pre>/window hidelevel +joins +parts +quits
+</pre></div>
+</div>
+<p>To get them back</p>
+<div class="highlight-default notranslate"><div><pre>/window hidelevel -joins -parts -quits
+</pre></div>
+</div>
+<p>If you want to hide them by default, <code class="docutils literal notranslate">/set window_default_hidelevel hidden joins parts quits</code></p>
+</section>
+</section>
+<section id="adding-a-new-network">
+<h2>Adding a new network</h2>
+<p>If you want to join a network that is not there, you first need to find at least one server of that network. Let’s say you have found the room <a class="reference external" href="https://netsplit.de/channels/details.php?room=%23hackint&amp;net=hackint">#hackint</a> on netsplit.de and want to join it. Then you can find that the <a class="reference external" href="https://netsplit.de/servers/?net=hackint">server</a> is irc.hackint.org, port 6697, SSL (TLS) on. To add it to Irssi, use the commands:</p>
+<div class="highlight-default notranslate"><div><pre>/network add hackint
+/server add -tls -network hackint irc.hackint.org 6697
+</pre></div>
+</div>
+<p>Then, you can connect to the newly added network with</p>
+<div class="highlight-default notranslate"><div><pre>/connect hackint
+</pre></div>
+</div>
+<section id="multiple-networks">
+<h3>Multiple networks</h3>
+<p>If you are connected to multiple networks, you can change which one you are “talking” to (which one to send commands) by using the <code class="docutils literal notranslate">Ctrl</code>+<code class="docutils literal notranslate">x</code> key in the status window.</p>
+</section>
+</section>
+<section id="on-line-help">
+<h2>On-line help</h2>
+<p>Most /commands have a help page, you can read it with</p>
+<div class="highlight-default notranslate"><div><pre>/help commandname
+</pre></div>
+</div>
+<p>or <a class="reference internal" href="../documentation/help/">on-line</a>.</p>
+<p>The settings that can be changed with /SET are described on <a class="reference internal" href="../documentation/settings/">Settings Documentation</a> – the settingshelp <a class="reference internal" href="#about-scripts">script</a> can be used to read it from within <code class="docutils literal notranslate">/help</code></p>
+</section>
+<section id="about-scripts">
+<h2>About Scripts</h2>
+<p>You can enhance your Irssi by installing scripts. Many Perl scripts written by other Irssi users can be found on <a class="reference external" href="https://scripts.irssi.org/">https://scripts.irssi.org/</a></p>
+<p>Most of them should be compatible with Irssi 1.4 (but some may not, also see the Full Change log for some incompatible ones)</p>
+</section>
+<section id="about-themes">
+<h2>About Themes</h2>
+<p>Irssi’s look can be thoroughly changed with themes. Many themes created by other Irssi users can be found on <a class="reference external" href="https://themes.irssi.org/">https://themes.irssi.org/</a></p>
+<p>If you want to modify the look of Irssi yourself, the <em>default</em> theme which can be found in your <code class="docutils literal notranslate">~/.irssi</code> folder is a good starting point. It also has a few comments explaining what some of the abstracts are used for</p>
+</section>
\ No newline at end of file
diff --git a/docs/New-users.txt b/docs/New-users.txt
new file mode 100644
index 00000000..5c5a268c
--- /dev/null
+++ b/docs/New-users.txt
@@ -0,0 +1,193 @@
+# New users guide #
+
+## New to IRC ##
+
+Internet Relay Chat was created in 1988 and has hardly changed. It can be used
+to exchange text messages (one message = single line) with other people, either
+privately (called query, PM, private message, MSG) or in a room (channel).
+Pictures are shared by uploading them to a temporary host like [1]https://
+pomf.lain.la/ and then pasting the HTTP links. Code snippets or longer texts
+are shared by pasting them to a Pastebin like [2]https://paste.opensuse.org/
+and then sharing the HTTP link.
+
+IRC does not have message history. You can only receive replies while your
+computer is turned on and connected to the channel you want to follow. Some
+people run their IRC programs on remote servers for that reason.
+
+IRC is organised into networks. Each network consists of many servers. It
+(mostly) does not matter which server you connect to as long as it belongs to
+the network you want to use. Irssi supports connections to many networks at the
+same time.
+
+Each network contains many channels, rooms that are often dedicated to
+discussing a specific topic. You can find many channels on [3]https://
+netsplit.de/ or using a search engine with the keyword “IRC”. Irssi supports
+joining many channels at the same time.
+
+There is a rather large IRC network catering to free and open-source software
+and peer directed projects at [4]https://libera.chat/ and a smaller one at [5]
+https://www.oftc.net/ – many free software projects still have support channels
+on these IRC networks (although some have moved to Matrix or proprietary
+platforms like Discord).
+
+## First start ##
+
+After (compiling and) installing Irssi, to start it, open a shell (Terminal)
+and type:
+
+irssi
+
+You should be greeted by a blinking cursor behind [(status)]. You are now in
+the status window of Irssi. Window is the Irssi name for what you might
+nowadays call a “Web browser tab”.
+
+If you’re confused about what you are seeing on the Irssi screen, you can find
+an annotated screenshot of it at [6]User interface.
+
+If you want, you can pick a nick name (handle) that will be shown to others
+reading your messages now, by typing
+
+/set nick whatyouwant
+
+Each command or message can be sent by pressing Enter. Commands in Irssi start
+with a /. If there is no /, then the line that you wrote will be sent as a
+message to the channel that you have open, for everyone to see.
+
+### Leaving ###
+
+Type /quit to get out of Irssi.
+
+## Connecting to a network ##
+
+Irssi comes with some predefined networks. You can see the current list of
+networks by typing
+
+/network
+
+(the list will be shown in your status window)
+
+To connect to one of the networks in the list, type /connect networkname, for
+example:
+
+/connect liberachat
+
+You should see several messages scroll by. After a while, you should be
+connected to the Libera Chat network.
+
+Attention
+
+Irssi version 1.2 or older may be lacking the liberachat network entry. See [7]
+https://github.com/shabble/irssi-docs/wiki/liberachat for how to add it.
+
+### Nickname registration ###
+
+Many IRC networks (but not all) offer a way to register a user account.
+Sometimes (but not on all networks) the account registration also includes
+reserving a nick for you. How to register also differs by network. Some
+channels only allow users with registered accounts to join them, so it may be
+very important for you to register a user account.
+
+User accounts are always specific to a network.
+
+For the Libera Chat network, you can find instructions how to register and set
+up your account with Irssi on [8]https://github.com/shabble/irssi-docs/wiki/
+liberachat#configure-sasl-automated-log-in
+
+## Joining a channel ##
+
+Once you are connected to a network, you can join channels by typing /join #
+channelname, for example:
+
+/join #irssi
+
+Now, a new window will open and you can send messages to the channel.
+
+### Changing windows ###
+
+You can change between windows using the Ctrl+n or Ctrl+p keys, or–if your
+terminal is configured properly–using Alt+1, Alt+2, … See [9]bind -list for a
+list of all default key bindings.
+
+### Removing clutter ###
+
+By default, Irssi shows when someone joins or leaves a channel. These messages
+can waste a lot of lines and obscure the actual chat. To hide them, type
+
+/window hidelevel +joins +parts +quits
+
+To get them back
+
+/window hidelevel -joins -parts -quits
+
+If you want to hide them by default, /set window_default_hidelevel hidden joins
+parts quits
+
+## Adding a new network ##
+
+If you want to join a network that is not there, you first need to find at
+least one server of that network. Let’s say you have found the room [10]#
+hackint on netsplit.de and want to join it. Then you can find that the [11]
+server is irc.hackint.org, port 6697, SSL (TLS) on. To add it to Irssi, use the
+commands:
+
+/network add hackint
+/server add -tls -network hackint irc.hackint.org 6697
+
+Then, you can connect to the newly added network with
+
+/connect hackint
+
+### Multiple networks ###
+
+If you are connected to multiple networks, you can change which one you are
+“talking” to (which one to send commands) by using the Ctrl+x key in the status
+window.
+
+## On-line help ##
+
+Most /commands have a help page, you can read it with
+
+/help commandname
+
+or [12]on-line.
+
+The settings that can be changed with /SET are described on [13]Settings
+Documentation – the settingshelp [14]script can be used to read it from within
+/help
+
+## About Scripts ##
+
+You can enhance your Irssi by installing scripts. Many Perl scripts written by
+other Irssi users can be found on [15]https://scripts.irssi.org/
+
+Most of them should be compatible with Irssi 1.4 (but some may not, also see
+the Full Change log for some incompatible ones)
+
+## About Themes ##
+
+Irssi’s look can be thoroughly changed with themes. Many themes created by
+other Irssi users can be found on [16]https://themes.irssi.org/
+
+If you want to modify the look of Irssi yourself, the default theme which can
+be found in your ~/.irssi folder is a good starting point. It also has a few
+comments explaining what some of the abstracts are used for
+
+
+References:
+
+[1] https://pomf.lain.la/
+[2] https://paste.opensuse.org/
+[3] https://netsplit.de/
+[4] https://libera.chat/
+[5] https://www.oftc.net/
+[6] https://irssi.org/User-interface/
+[7] https://github.com/shabble/irssi-docs/wiki/liberachat
+[8] https://github.com/shabble/irssi-docs/wiki/liberachat#configure-sasl-automated-log-in
+[9] https://irssi.org/documentation/help/bind_-list/
+[10] https://netsplit.de/channels/details.php?room=%23hackint&net=hackint
+[11] https://netsplit.de/servers/?net=hackint
+[12] https://irssi.org/documentation/help/
+[13] https://irssi.org/documentation/settings/
+[14] https://irssi.org/New-users/#about-scripts
+[15] https://scripts.irssi.org/
+[16] https://themes.irssi.org/
diff --git a/docs/qna.html b/docs/qna.html
new file mode 100644
index 00000000..a61ee40d
--- /dev/null
+++ b/docs/qna.html
@@ -0,0 +1,52 @@
+<base href='https://irssi.org/documentation/qna/multi/'>
+
+<h1>Right-aligned nicks</h1>
+<p>To create a “tabular” effect of the chat view, or to align nick names in a column, you can use Irssi’s theme/format system. The basic commands are the following:</p>
+<div class="highlight-default notranslate"><div><pre>/format own_msg {ownmsgnick $2 {ownnick $[-9]0}}$1
+/format own_msg_channel {ownmsgnick $3 {ownnick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_me {pubmsgmenick $2 {menick $[-9]0}}$1
+/format pubmsg_me_channel {pubmsgmenick $3 {menick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_hilight {pubmsghinick $0 $3 $[-9]1}$2
+/format pubmsg_hilight_channel {pubmsghinick $0 $4 $[-9]1{msgchannel $2}}$3
+/format pubmsg {pubmsgnick $2 {pubnick $[-9]0}}$1
+/format pubmsg_channel {pubmsgnick $3 {pubnick $[-9]0}{msgchannel $1}}$2
+</pre></div>
+</div>
+<p>These are copied from the default theme’s default values, which are responsible for displaying your own messages sent to a channel (<code class="docutils literal notranslate">own_msg</code>) as well as received messages (<code class="docutils literal notranslate">pubmsg</code>) and the two basic highlightings (<code class="docutils literal notranslate">me</code> and <code class="docutils literal notranslate">hilight</code>).</p>
+<p>Then, in front of the argument that contains the nick name (<code class="docutils literal notranslate">$0</code> in most cases, but <code class="docutils literal notranslate">$1</code> in <code class="docutils literal notranslate">pubmsg_hilight</code>), an alignment modifier (see <a class="reference internal" href="../../settings/#a-b">Appendix B: Special Variables and Expandos</a>) has been added: <code class="docutils literal notranslate">[-9]</code>. This means that the nicks will be right-aligned and truncated to 9 characters.</p>
+<p><strong>Note</strong>: Modifiers <em>only</em> work in the <code class="docutils literal notranslate">/format</code> section of a theme (this may change in the future)</p>
+<p>There are also some scripts that try to do the alignment for you, like: <code class="docutils literal notranslate">nm</code>, <code class="docutils literal notranslate">nm2</code>.</p>
+<p>There are also some nice themes that extend the alignment to further formats, like: <a class="reference external" href="https://github.com/ronilaukkarinen/weed">weed</a>.</p>
+<h1>Automatic log-in to NickServ</h1>
+<p>Please check here =&gt; <a class="reference internal" href="../../manual/automation/#automatic-log-in-to-nickserv">Automatic log-in to NickServ</a></p>
+<h1>CertFP Log-in</h1>
+<p>CertFP, short for Certificate Finger Print, is another method to log you in to NickServ. Instead of a password, it uses a <a class="reference external" href="https://en.wikipedia.org/wiki/Client_certificate">Client Certificate</a>.</p>
+<p>In order to use it, you</p>
+<ul class="simple">
+<li><p>first need a certificate,</p></li>
+<li><p>then configure Irssi to use this certificate,</p></li>
+<li><p>and finally register the certificate with NickServ.</p></li>
+</ul>
+<p>Irssi does not have built-in certificate management commands, so you need to use an external tool like <code class="docutils literal notranslate">openssl</code> to create the certificate.</p>
+<p>A step-by-step guide for the Libera Chat network can be found here =&gt; <a class="reference external" href="https://github.com/shabble/irssi-docs/wiki/liberachat_certfp">https://github.com/shabble/irssi-docs/wiki/liberachat_certfp</a></p>
+<p>It is necessary that the certificate be available as a file; PKCS#11 is not supported.</p>
+<h1>Tor (The Onion Router)</h1>
+<p><a class="reference external" href="https://www.torproject.org/">Tor</a> is an overlay network for anonymous communication. It operates a local <a class="reference external" href="https://en.wikipedia.org/wiki/SOCKS">SOCKS</a> proxy for applications to use.</p>
+<p>Unfortunately, Irssi currently does not support SOCKS proxies natively. As a workaround, you can install the <a class="reference external" href="https://github.com/rofl0r/proxychains-ng">ProxyChains-NG</a> program (note, it must be the NG version).</p>
+<p>Afterwards, you can launch Irssi like this:</p>
+<div class="highlight-default notranslate"><div><pre>proxychains4 irssi
+</pre></div>
+</div>
+<p>Now your connections will go through the Proxy configured in ProxyChains-NG (Tor by default).</p>
+<p>IRC networks may have different requirements to be able to connect via Tor. For the Libera Chat network, you will first need to set up <a class="reference internal" href="../certfp/">CertFP Log-in</a> using a clearnet connection, and then connect to their <a class="reference external" href="https://libera.chat/guides/connect#accessing-liberachat-via-tor">Onion Service</a> <code class="docutils literal notranslate">palladium.libera.chat</code>. More detailed instructions can be found here =&gt; <a class="reference external" href="https://github.com/shabble/irssi-docs/wiki/liberator">https://github.com/shabble/irssi-docs/wiki/liberator</a></p>
+<h1>The following signatures were invalid: EXPKEYSIG</h1>
+<p>If you see such a message</p>
+<div class="highlight-default notranslate"><div><pre>Err:4 home:/ailin_nemui:/irssi-an  InRelease
+  The following signatures were invalid: EXPKEYSIG EDB7AED941EEDB57 home:ailin_nemui OBS Project &lt;home:ailin_nemui@build.opensuse.org&gt;
+</pre></div>
+</div>
+<p>this means that the automatic signing key used by the Open Build Service expired. OBS renews the key periodically, but Debian does not support this.</p>
+<section id="fix">
+<h2>Fix</h2>
+<p>Download the key again, following the regular OBS instructions. If it still does not work, verify if there is a second expired copy of the key in <code class="docutils literal notranslate">/etc/apt/trusted.gpg.d</code> or in <code class="docutils literal notranslate">apt-key list</code> and remove it as well.</p>
+</section>
\ No newline at end of file
diff --git a/docs/qna.txt b/docs/qna.txt
new file mode 100644
index 00000000..92f4f64c
--- /dev/null
+++ b/docs/qna.txt
@@ -0,0 +1,111 @@
+# Right-aligned nicks #
+
+To create a “tabular” effect of the chat view, or to align nick names in a
+column, you can use Irssi’s theme/format system. The basic commands are the
+following:
+
+/format own_msg {ownmsgnick $2 {ownnick $[-9]0}}$1
+/format own_msg_channel {ownmsgnick $3 {ownnick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_me {pubmsgmenick $2 {menick $[-9]0}}$1
+/format pubmsg_me_channel {pubmsgmenick $3 {menick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_hilight {pubmsghinick $0 $3 $[-9]1}$2
+/format pubmsg_hilight_channel {pubmsghinick $0 $4 $[-9]1{msgchannel $2}}$3
+/format pubmsg {pubmsgnick $2 {pubnick $[-9]0}}$1
+/format pubmsg_channel {pubmsgnick $3 {pubnick $[-9]0}{msgchannel $1}}$2
+
+These are copied from the default theme’s default values, which are responsible
+for displaying your own messages sent to a channel (own_msg) as well as
+received messages (pubmsg) and the two basic highlightings (me and hilight).
+
+Then, in front of the argument that contains the nick name ($0 in most cases,
+but $1 in pubmsg_hilight), an alignment modifier (see [1]Appendix B: Special
+Variables and Expandos) has been added: [-9]. This means that the nicks will be
+right-aligned and truncated to 9 characters.
+
+Note: Modifiers only work in the /format section of a theme (this may change in
+the future)
+
+There are also some scripts that try to do the alignment for you, like: nm,
+nm2.
+
+There are also some nice themes that extend the alignment to further formats,
+like: [2]weed.
+
+# Automatic log-in to NickServ #
+
+Please check here => [3]Automatic log-in to NickServ
+
+# CertFP Log-in #
+
+CertFP, short for Certificate Finger Print, is another method to log you in to
+NickServ. Instead of a password, it uses a [4]Client Certificate.
+
+In order to use it, you
+
+  • first need a certificate,
+
+  • then configure Irssi to use this certificate,
+
+  • and finally register the certificate with NickServ.
+
+Irssi does not have built-in certificate management commands, so you need to
+use an external tool like openssl to create the certificate.
+
+A step-by-step guide for the Libera Chat network can be found here => [5]https:
+//github.com/shabble/irssi-docs/wiki/liberachat_certfp
+
+It is necessary that the certificate be available as a file; PKCS#11 is not
+supported.
+
+# Tor (The Onion Router) #
+
+[6]Tor is an overlay network for anonymous communication. It operates a local
+[7]SOCKS proxy for applications to use.
+
+Unfortunately, Irssi currently does not support SOCKS proxies natively. As a
+workaround, you can install the [8]ProxyChains-NG program (note, it must be the
+NG version).
+
+Afterwards, you can launch Irssi like this:
+
+proxychains4 irssi
+
+Now your connections will go through the Proxy configured in ProxyChains-NG
+(Tor by default).
+
+IRC networks may have different requirements to be able to connect via Tor. For
+the Libera Chat network, you will first need to set up [9]CertFP Log-in using a
+clearnet connection, and then connect to their [10]Onion Service
+palladium.libera.chat. More detailed instructions can be found here => [11]
+https://github.com/shabble/irssi-docs/wiki/liberator
+
+# The following signatures were invalid: EXPKEYSIG #
+
+If you see such a message
+
+Err:4 home:/ailin_nemui:/irssi-an  InRelease
+  The following signatures were invalid: EXPKEYSIG EDB7AED941EEDB57 home:ailin_nemui OBS Project <home:ailin_nemui@build.opensuse.org>
+
+this means that the automatic signing key used by the Open Build Service
+expired. OBS renews the key periodically, but Debian does not support this.
+
+## Fix ##
+
+Download the key again, following the regular OBS instructions. If it still
+does not work, verify if there is a second expired copy of the key in /etc/apt/
+trusted.gpg.d or in apt-key list and remove it as well.
+
+
+References:
+
+[1] https://irssi.org/documentation/settings/#a-b
+[2] https://github.com/ronilaukkarinen/weed
+[3] https://irssi.org/documentation/manual/automation/#automatic-log-in-to-nickserv
+[4] https://en.wikipedia.org/wiki/Client_certificate
+[5] https://github.com/shabble/irssi-docs/wiki/liberachat_certfp
+[6] https://www.torproject.org/
+[7] https://en.wikipedia.org/wiki/SOCKS
+[8] https://github.com/rofl0r/proxychains-ng
+[9] https://irssi.org/documentation/qna/certfp/
+[10] https://libera.chat/guides/connect#accessing-liberachat-via-tor
+[11] https://github.com/shabble/irssi-docs/wiki/liberator
diff --git a/utils/syncdocs.sh b/utils/syncdocs.sh
index 77ac93bf..73c69c03 100755
--- a/utils/syncdocs.sh
+++ b/utils/syncdocs.sh
@@ -1,19 +1,22 @@
 #!/bin/sh -e
-# Run this to download FAQ and startup-HOWTO from irssi.org
+# Run this to download QNA and New-users from irssi.org
 
 PKG_NAME="Irssi"
+export LC_ALL=en_IE.utf8
 
 site=https://irssi.org
 
-faq=$site/documentation/faq/
-howto=$site/documentation/startup/
-design=$site/documentation/design/
+qna=$site/documentation/qna/
+howto=$site/New-users/
+#design=$site/documentation/design/
 
 # remove everything until H1 and optionally 2 DIVs before the
 # FOOTER. May need to be adjusted as the source pages change
 pageclean_regex='s{.*(?=<h1)}{}s;
-s{(\s*<script\s.*?</script>)?\s*(</div>\s*){0,3}<footer.*}{}s;
-s{(<.*?)\sclass="(?:[^"]*\s+)*(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;'
+s{(\s*<script\s.*?</script>)?\s*(</section>(\r?\n)*\s*</article>\s*)?(</div>\s*){0,3}<footer.*}{}s;
+s{(<.*?)\sclass="(?:[^"]*\s+)*(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;
+s{<a class="headerlink" href=".*?" title="Permalink to this heading"></a>}{}g;
+s{<span.*?>(.*?)</span>}{\1}g;'
 
 srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
@@ -45,6 +48,7 @@ else
     any=false
 fi
 
+addheadermark="perl -p -e s{<h(\\d).*?>\\K}{(q:#:x\$1).q:&#32;:}ge;s{(?=</h(\\d)>)}{q:&#32;:.(q:#:x\$1)}ge"
 if type w3m >/dev/null 2>&1 ; then
     converter="w3m -o display_link_number=1 -dump -T text/html"
     any=true
@@ -83,25 +87,33 @@ download_it() {
     mv "$3".tmp "$3"
 }
 
-download_it "FAQ" "$faq" "$srcdir"/docs/faq.html
-download_it "Startup How-To" "$howto" "$srcdir"/docs/startup-HOWTO.html
-download_it "Design" "$design" "$srcdir"/docs/design.html
+download_it_nested() {
+    name=$1; shift
+    src=$1; shift
+    dest=$1; shift
+    download_it "$name" "$src" "$dest".nest
+    echo > "$dest"
+    eval $(perl -n -0777 -e 'print qq{download_it "\$name ($2)" "\${src}$1/" "\${dest}.$1";
+cat "\${dest}.$1" >> "\${dest}.tmp";
+rm "\${dest}.$1";\n}
+ while(m{<a class="reference internal" href="(.*?)/">(.*?)</a>}g)' "$dest".nest)
+    rm "$dest".nest
+    perl -i -0777 -p -e 's{<base href=.*?>}{}g;s{\A}{<base href='"'${src}multi/'"'>\n}' "$dest".tmp
+    mv "$dest".tmp "$dest"
+}
+
+download_it_nested "QNA" "$qna" "$srcdir"/docs/qna.html
+download_it "New users guide" "$howto" "$srcdir"/docs/New-users.html
+#download_it "Design" "$design" "$srcdir"/docs/design.html
 
 # .html -> .txt with lynx or elinks
-echo "Documentation: html -> txt..."
+echo "Documentation: html -> txt... [converter: $converter]"
 
-cat "$srcdir"/docs/faq.html \
-    | LC_ALL=en_IE.utf8 $converter \
-    | perl -pe '
-	s/^ *//;
-	if ($_ eq "\n" && $state eq "Q") { $_ = ""; }
-	elsif (/^([QA]):/) { $state = $1 }
-	elsif ($_ ne "\n") { $_ = "   $_"; };
-' > "$srcdir"/docs/faq.txt
+cat "$srcdir"/docs/qna.html \
+    | $addheadermark | $converter > "$srcdir"/docs/qna.txt
 
-cat "$srcdir"/docs/startup-HOWTO.html \
-    | perl -pe "s/\\bhref=([\"\'])#.*?\\1//" \
-    | LC_ALL=en_IE.utf8 $converter > "$srcdir"/docs/startup-HOWTO.txt
+cat "$srcdir"/docs/New-users.html \
+    | $addheadermark | $converter > "$srcdir"/docs/New-users.txt
 
-cat "$srcdir"/docs/design.html \
-    | LC_ALL=en_IE.utf8 $converter > "$srcdir"/docs/design.txt
+#cat "$srcdir"/docs/design.html \
+#    | $addheadermark | $converter > "$srcdir"/docs/design.txt

From d30cdafcffeb5c14a4afc2028a93d93d825fd0db Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 27 Dec 2025 22:41:02 +0100
Subject: [PATCH 1636/1650] github actions: update package lists

---
 .github/workflows/abicheck.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index d1387b82..254c64f9 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -17,7 +17,7 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
       - name: prepare required software
         run: |
-          sudo apt install $apt_build_deps
+          sudo apt update; sudo apt install $apt_build_deps
           eval "$get_pip_build_deps"
       - name: checkout base ref
         uses: actions/checkout@main
@@ -52,7 +52,7 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
       - name: prepare required software
         run: |
-          sudo apt install $apt_build_deps
+          sudo apt update; sudo apt install $apt_build_deps
           eval "$get_pip_build_deps"
       - name: checkout merge ref
         uses: actions/checkout@main
@@ -87,7 +87,7 @@ jobs:
     steps:
       - name: prepare required software
         run: |
-          sudo apt install abigail-tools
+          sudo apt update; sudo apt install abigail-tools
       - name: fetch base build
         uses: actions/download-artifact@v4
         with:

From 51f2a4f7fb51f57fe32ce5bccdbb5ed6cd9013c3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 27 Jul 2025 20:06:10 +0200
Subject: [PATCH 1637/1650] use GIO resolver

change: rename resolve_prefer_ipv6 -> irssiproxy_prefer_ipv6
---
 docs/help/in/toggle.in              |   1 -
 docs/manual.txt                     |   3 -
 meson.build                         |  35 ++++-
 src/common.h                        |   3 +-
 src/core/chat-commands.c            |   9 +-
 src/core/net-nonblock.c             | 120 +++++++-----------
 src/core/net-nonblock.h             |  18 +--
 src/core/network.c                  | 182 ++++++++++----------------
 src/core/network.h                  |  30 ++---
 src/core/server-connect-rec.h       |   4 +-
 src/core/server-rec.h               |   4 +-
 src/core/servers-reconnect.c        |  11 +-
 src/core/servers-setup.c            |  14 +-
 src/core/servers.c                  | 190 +++++++++++++++-------------
 src/core/servers.h                  |   1 +
 src/fe-common/core/fe-common-core.c |  23 +++-
 src/irc/proxy/listen.c              |  11 +-
 src/irc/proxy/proxy.c               |   1 +
 18 files changed, 317 insertions(+), 343 deletions(-)

diff --git a/docs/help/in/toggle.in b/docs/help/in/toggle.in
index f87a6462..9469ba5c 100644
--- a/docs/help/in/toggle.in
+++ b/docs/help/in/toggle.in
@@ -15,7 +15,6 @@
 
 %9Examples:%9
 
-    /TOGGLE resolve_prefer_ipv6
     /TOGGLE channels_rejoin_unavailable ON
 
 %9See also:%9 SET
diff --git a/docs/manual.txt b/docs/manual.txt
index d55e362e..073abe18 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -373,9 +373,6 @@
 	After connected to server, Irssi can automatically change your user
 	mode. You can set it with /SET usermode <mode>, default is +i.
 
-	/SET resolve_prefer_ipv6 - If ON, prefer IPv6 for hosts that
-	     have both v4 and v6 addresses.
-
  5.5 Automatic reconnecting
 
 	If you get disconnected from server, Irssi will try to reconnect
diff --git a/meson.build b/meson.build
index 9499a126..4f78600e 100644
--- a/meson.build
+++ b/meson.build
@@ -8,6 +8,7 @@ project('irssi', 'c',
 
 glib_internal_version = 'glib-2.74.3' # keep this in sync with subprojects/glib.wrap
 glib_pcre2_internal_version = 'pcre2-10.40'
+glib_libffi_internal_version = 'libffi'
 cc = meson.get_compiler('c')
 rootinc = include_directories('.')
 dep = []
@@ -217,11 +218,6 @@ if not glib_dep.found()
       prov_lib = cc.find_library('iconv', dirs : '/usr/local/lib')
       glib_internal_usr_local = true
     endif
-    if cc.has_function('libiconv_open', dependencies : prov_lib)
-      glib_internal_configure_args += '-Diconv=gnu'
-    else
-      glib_internal_configure_args += '-Diconv=native'
-    endif
     glib_internal_dependencies += prov_lib
   endif
 
@@ -254,7 +250,7 @@ if not glib_dep.found()
   glib_internal_configure_t = custom_target('glib-internal-configure',
     command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
       '--buildtype=' + get_option('buildtype'),
-      '-Dlibmount=disabled', '-Dselinux=disabled', '-Ddefault_library=static', '-Dforce_fallback_for=pcre2',
+      '-Dlibmount=disabled', '-Dselinux=disabled', '-Ddefault_library=static', '-Dforce_fallback_for=pcre2,libffi',
       glib_internal_configure_args,
       (meson.current_build_dir() / 'build-subprojects' / 'glib'),
       (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
@@ -263,9 +259,13 @@ if not glib_dep.found()
     depends : glib_internal_download_t,)
   glib_internal_build_t = custom_target('glib-internal-build',
     command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
+      'subprojects' / glib_libffi_internal_version / 'src' / 'libffi.a',
       'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
       'glib' / 'libglib-2.0.a',
-      'gmodule' / 'libgmodule-2.0.a'],
+      'gmodule' / 'libgmodule-2.0.a',
+      'gobject' / 'libgobject-2.0.a',
+      'gio' / 'libgio-2.0.a',
+      ],
     console : true,
     output : ['glib-internal-build'],
     depends : glib_internal_configure_t,)
@@ -295,11 +295,32 @@ if not glib_dep.found()
     ],
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
   )
+  gobject_dep = declare_dependency(sources : glib_internal_build_t,
+    compile_args : [
+      '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib'),
+    ],
+    link_args : [
+      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'subprojects' / glib_libffi_internal_version / 'src' / 'libffi.a',
+      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gobject' / 'libgobject-2.0.a'
+    ],
+  )
+  gio_dep = declare_dependency(sources : glib_internal_build_t,
+    dependencies : cc.find_library('z'),
+    compile_args : [
+      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gio'),
+      '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib'),
+    ],
+    link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gio' / 'libgio-2.0.a' ],
+  )
 else
   gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency, include_type : 'system')
+  gobject_dep = dependency('gobject-2.0', static : want_static_dependency, include_type : 'system')
+  gio_dep = dependency('gio-2.0', static : want_static_dependency, include_type : 'system')
 endif
 dep += glib_dep
 dep += gmodule_dep
+dep += gobject_dep
+dep += gio_dep
 
 if glib_internal and want_static_dependency and want_fuzzer
   openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled'])
diff --git a/src/common.h b/src/common.h
index e514f279..06b63a15 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 56
+#define IRSSI_ABI_VERSION 57
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
@@ -38,6 +38,7 @@
 
 #include <glib.h>
 #include <gmodule.h>
+#include <gio/gio.h>
 
 typedef guint64 uoff_t;
 #define PRIuUOFF_T G_GUINT64_FORMAT
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 10da0d2c..9e2b80e8 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -101,10 +101,11 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 
         host = g_hash_table_lookup(optlist, "host");
 	if (host != NULL && *host != '\0') {
-		IPADDR ip4, ip6;
-
-		if (net_gethostbyname(host, &ip4, &ip6) == 0)
-                        server_connect_own_ip_save(conn, &ip4, &ip6);
+		IPADDR ip4 = { 0 };
+		IPADDR ip6 = { 0 };
+		if (net_gethostbyname_first_ips(host, G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT, &ip4,
+		                                &ip6) == 0)
+			server_connect_own_ip_save(conn, &ip4, &ip6);
 	}
 
 	cmd_params_free(free_arg);
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 643884ee..494d9894 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -22,86 +22,54 @@
 
 #include <signal.h>
 
-#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/network.h>
 #include <irssi/src/core/net-nonblock.h>
 
-/* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
-   written to pipe when found PID of the resolver child is returned */
-int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe, int reverse_lookup)
-{
-	RESOLVED_IP_REC rec;
-	const char *errorstr;
-	int pid;
+typedef struct {
+	NetGethostbynameContinuationFunc cont;
+	void *cont_data;
+} NET_GETHOSTBYNAME_CALLBACK_DATA;
 
-	(void) reverse_lookup; /* Kept for API backward compatibility */
+static void net_gethostbyname_callback(GResolver *resolver, GAsyncResult *result,
+                                       NET_GETHOSTBYNAME_CALLBACK_DATA *data)
+{
+	/* GList<GInetAddress> */
+	GList *ailist;
+	GError *error;
+	RESOLVED_IP_REC *iprec;
+
+	error = NULL;
+	ailist = g_resolver_lookup_by_name_with_flags_finish(resolver, result, &error);
+	iprec = g_new0(RESOLVED_IP_REC, 1);
+	if (error != NULL) {
+		iprec->error = error;
+	} else {
+		iprec->ailist = ailist;
+	}
+	g_object_unref(resolver);
+	resolved_ip_ref(iprec);
+
+	data->cont(iprec, data->cont_data);
+	g_free(data);
+}
+
+/* nonblocking gethostbyname() */
+GCancellable *net_gethostbyname_nonblock(const char *addr, GResolverNameLookupFlags flags,
+                                         NetGethostbynameContinuationFunc cont, void *cont_data)
+{
+	GResolver *resolver;
+	GCancellable *cancellable;
+	NET_GETHOSTBYNAME_CALLBACK_DATA *data;
 
 	g_return_val_if_fail(addr != NULL, FALSE);
 
-	pid = fork();
-	if (pid > 0) {
-		/* parent */
-		pidwait_add(pid);
-		return pid;
-	}
-
-	if (pid != 0) {
-		/* failed! */
-		g_warning("net_connect_thread(): fork() failed! "
-			  "Using blocking resolving");
-	}
-
-	/* child */
-	srand(time(NULL));
-
-	memset(&rec, 0, sizeof(rec));
-	rec.error = net_gethostbyname(addr, &rec.ip4, &rec.ip6);
-	if (rec.error == 0) {
-		errorstr = NULL;
-	} else {
-		errorstr = net_gethosterror(rec.error);
-		rec.errlen = errorstr == NULL ? 0 : strlen(errorstr)+1;
-	}
-
-	i_io_channel_write_block(pipe, &rec, sizeof(rec));
-	if (rec.errlen != 0)
-		i_io_channel_write_block(pipe, (void *) errorstr, rec.errlen);
-
-	if (pid == 0)
-		_exit(99);
-
-	/* we used blocking lookup */
-	return 0;
-}
-
-/* get the resolved IP address */
-int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec)
-{
-	rec->error = -1;
-	rec->errorstr = NULL;
-
-	fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK);
-
-	/* get ip+error */
-	if (i_io_channel_read_block(pipe, rec, sizeof(*rec)) == -1) {
-		rec->errorstr = g_strdup_printf("Host name lookup: %s",
-						g_strerror(errno));
-		return -1;
-	}
-
-	if (rec->error) {
-		/* read error string, if we can't read everything for some
-		   reason, just ignore it. */
-		rec->errorstr = g_malloc0(rec->errlen+1);
-		i_io_channel_read_block(pipe, rec->errorstr, rec->errlen);
-	}
-
-	return 0;
-}
-
-/* Kill the resolver child */
-void net_disconnect_nonblock(int pid)
-{
-	g_return_if_fail(pid > 0);
-
-	kill(pid, SIGKILL);
+	resolver = g_resolver_get_default();
+	cancellable = g_cancellable_new();
+	data = g_new0(NET_GETHOSTBYNAME_CALLBACK_DATA, 1);
+	data->cont = cont;
+	data->cont_data = cont_data;
+	g_resolver_lookup_by_name_with_flags_async(resolver, addr, flags, cancellable,
+	                                           (GAsyncReadyCallback) net_gethostbyname_callback,
+	                                           data);
+	return cancellable;
 }
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index c93dd9e3..c4cb7824 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -3,20 +3,10 @@
 
 #include <irssi/src/core/network.h>
 
-typedef struct {
-	IPADDR ip4, ip6; /* resolved ip addresses */
-	int error; /* error, 0 = no error, -1 = error: */
-	int errlen; /* error text length */
-	char *errorstr; /* error string - dynamically allocated, you'll
-	                   need to free() it yourself unless it's NULL */
-} RESOLVED_IP_REC;
+typedef void (*NetGethostbynameContinuationFunc)(RESOLVED_IP_REC *, void *);
 
-/* nonblocking gethostbyname(), PID of the resolver child is returned. */
-int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe, int reverse_lookup);
-/* get the resolved IP address. returns -1 if some error occurred with read() */
-int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec);
-
-/* Kill the resolver child */
-void net_disconnect_nonblock(int pid);
+/* nonblocking gethostbyname(), Cancellable of the resolver child is returned. */
+GCancellable *net_gethostbyname_nonblock(const char *addr, GResolverNameLookupFlags flags,
+                                         NetGethostbynameContinuationFunc cont, void *cont_data);
 
 #endif
diff --git a/src/core/network.c b/src/core/network.c
index fa70d62a..c763a7c6 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -81,27 +81,6 @@ int i_io_channel_read_block(GIOChannel *channel, void *data, int len)
 	return received < len ? -1 : 0;
 }
 
-IPADDR ip4_any = {
-	AF_INET,
-#if defined(IN6ADDR_ANY_INIT)
-	IN6ADDR_ANY_INIT
-#else
-	{ INADDR_ANY }
-#endif
-};
-
-int net_ip_compare(IPADDR *ip1, IPADDR *ip2)
-{
-	if (ip1->family != ip2->family)
-		return 0;
-
-	if (ip1->family == AF_INET6)
-		return memcmp(&ip1->ip, &ip2->ip, sizeof(ip1->ip)) == 0;
-
-	return memcmp(&ip1->ip, &ip2->ip, 4) == 0;
-}
-
-
 static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
 {
 	if (ip == NULL) {
@@ -392,95 +371,87 @@ int net_getsockname(GIOChannel *handle, IPADDR *addr, int *port)
 	return 0;
 }
 
-/* Get IP addresses for host, both IPv4 and IPv6 if possible.
-   If ip->family is 0, the address wasn't found.
-   Returns 0 = ok, others = error code for net_gethosterror() */
-int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
+void resolved_ip_ref(RESOLVED_IP_REC *iprec)
 {
-	union sockaddr_union *so;
-	struct addrinfo hints, *ai, *ailist;
-	int ret, count_v4, count_v6, use_v4, use_v6;
+	iprec->refcount++;
+}
+
+int resolved_ip_unref(RESOLVED_IP_REC *iprec)
+{
+	if (--iprec->refcount > 0) {
+		return TRUE;
+	}
+
+	g_resolver_free_addresses(iprec->ailist);
+	if (iprec->error != NULL) {
+		g_error_free(iprec->error);
+	}
+	g_free(iprec);
+
+	return FALSE;
+}
+
+/* Get IP addresses for host, both IPv4 and IPv6 if possible. */
+static RESOLVED_IP_REC *net_gethostbyname(const char *addr, GResolverNameLookupFlags flags)
+{
+	/* GList<GInetAddress> */
+	GList *ailist;
+	GError *error;
+	GResolver *resolver;
+	RESOLVED_IP_REC *iprec;
 
 #ifdef HAVE_CAPSICUM
 	if (capsicum_enabled())
-		return (capsicum_net_gethostbyname(addr, ip4, ip6));
+		return (capsicum_net_gethostbyname(addr, flags));
 #endif
 
-	g_return_val_if_fail(addr != NULL, -1);
+	g_return_val_if_fail(addr != NULL, NULL);
 
-	memset(ip4, 0, sizeof(IPADDR));
-	memset(ip6, 0, sizeof(IPADDR));
-
-	memset(&hints, 0, sizeof(struct addrinfo));
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_flags = AI_ADDRCONFIG;
-
-	/* save error to host_error for later use */
-	ret = getaddrinfo(addr, NULL, &hints, &ailist);
-	if (ret != 0)
-		return ret;
-
-	/* count IPs */
-        count_v4 = count_v6 = 0;
-	for (ai = ailist; ai != NULL; ai = ai->ai_next) {
-		if (ai->ai_family == AF_INET)
-			count_v4++;
-		else if (ai->ai_family == AF_INET6)
-			count_v6++;
+	error = NULL;
+	resolver = g_resolver_get_default();
+	ailist = g_resolver_lookup_by_name_with_flags(resolver, addr, flags, NULL, &error);
+	iprec = g_new0(RESOLVED_IP_REC, 1);
+	if (error != NULL) {
+		iprec->error = error;
+	} else {
+		iprec->ailist = ailist;
 	}
+	g_object_unref(resolver);
+	resolved_ip_ref(iprec);
 
-	if (count_v4 == 0 && count_v6 == 0)
-		return EAI_NONAME; /* shouldn't happen? */
-
-	/* if there are multiple addresses, return random one */
-	use_v4 = count_v4 <= 1 ? 0 : rand() % count_v4;
-	use_v6 = count_v6 <= 1 ? 0 : rand() % count_v6;
-
-	count_v4 = count_v6 = 0;
-	for (ai = ailist; ai != NULL; ai = ai->ai_next) {
-		so = (union sockaddr_union *) ai->ai_addr;
-
-		if (ai->ai_family == AF_INET) {
-			if (use_v4 == count_v4)
-				sin_get_ip(so, ip4);
-                        count_v4++;
-		} else if (ai->ai_family == AF_INET6) {
-			if (use_v6 == count_v6)
-				sin_get_ip(so, ip6);
-			count_v6++;
-		}
-	}
-	freeaddrinfo(ailist);
-	return 0;
+	return iprec;
 }
 
-/* Get name for host, *name should be g_free()'d unless it's NULL.
-   Return values are the same as with net_gethostbyname() */
-int net_gethostbyaddr(IPADDR *ip, char **name)
+int net_gethostbyname_first_ips(const char *addr, GResolverNameLookupFlags flags, IPADDR *ip4,
+                                IPADDR *ip6)
 {
-	union sockaddr_union so;
-	int host_error;
-	char hostname[NI_MAXHOST];
+	RESOLVED_IP_REC *iprec;
 
-	g_return_val_if_fail(ip != NULL, -1);
-	g_return_val_if_fail(name != NULL, -1);
+	iprec = net_gethostbyname(addr, flags);
+	if (iprec->error == NULL) {
+		GList *curr;
 
-	*name = NULL;
+		for (curr = iprec->ailist; curr->next; curr = curr->next) {
+			unsigned short family;
+			GInetAddress *addr;
 
-	memset(&so, 0, sizeof(so));
-	sin_set_ip(&so, ip);
+			addr = curr->data;
+			family = g_inet_address_get_family(addr);
+			if (ip4->family == 0 && family == AF_INET) {
+				ip4->family = AF_INET;
+				memcpy(&ip4->ip, g_inet_address_to_bytes(addr), sizeof(ip4->ip));
+			} else if (ip6->family == 0 && family == AF_INET6) {
+				ip6->family = AF_INET6;
+				memcpy(&ip6->ip, g_inet_address_to_bytes(addr), sizeof(ip6->ip));
+			}
+		}
 
-	/* save error to host_error for later use */
-        host_error = getnameinfo((struct sockaddr *)&so, sizeof(so),
-				 hostname, sizeof(hostname),
-				 NULL, 0,
-				 NI_NAMEREQD);
-        if (host_error != 0)
-                return host_error;
-
-	*name = g_strdup(hostname);
-
-	return 0;
+		resolved_ip_unref(iprec);
+		return 0;
+	} else {
+		resolved_ip_unref(iprec);
+		return -1;
+	}
 }
 
 int net_ip2host(IPADDR *ip, char *host)
@@ -519,29 +490,6 @@ int net_geterror(GIOChannel *handle)
 	return data;
 }
 
-/* get error of net_gethostname() */
-const char *net_gethosterror(int error)
-{
-	g_return_val_if_fail(error != 0, NULL);
-
-	if (error == EAI_SYSTEM) {
-		return strerror(errno);
-	} else {
-		return gai_strerror(error);
-	}
-}
-
-/* return TRUE if host lookup failed because it didn't exist (ie. not
-   some error with name server) */
-int net_hosterror_notfound(int error)
-{
-#ifdef EAI_NODATA /* NODATA is deprecated */
-	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
-#else
-	return error != 1 && (error == EAI_NONAME);
-#endif
-}
-
 /* Get name of TCP service */
 char *net_getservbyport(int port)
 {
diff --git a/src/core/network.h b/src/core/network.h
index 5cd85ccc..647cd8c7 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -6,6 +6,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
+#include <irssi/src/common.h>
 
 #ifndef AF_INET6
 #  ifdef PF_INET6
@@ -20,6 +21,13 @@ struct _IPADDR {
 	struct in6_addr ip;
 };
 
+typedef struct {
+	int refcount;
+	/* GList<GInetAddress> */
+	GList *ailist; /* needs to be freed */
+	GError *error; /* needs to be freed */
+} RESOLVED_IP_REC;
+
 /* maxmimum string length of IP address */
 #define MAX_IP_LEN INET6_ADDRSTRLEN
 
@@ -29,9 +37,7 @@ extern IPADDR ip4_any;
 
 GIOChannel *i_io_channel_new(int handle);
 
-/* Returns 1 if IPADDRs are the same. */
-/* Deprecated since it is unused. It will be deleted in a later release. */
-int net_ip_compare(IPADDR *ip1, IPADDR *ip2) G_GNUC_DEPRECATED;
+/* OTR */
 int i_io_channel_write_block(GIOChannel *channel, void *data, int len);
 int i_io_channel_read_block(GIOChannel *channel, void *data, int len);
 
@@ -60,18 +66,9 @@ int net_receive(GIOChannel *handle, char *buf, int len);
 /* Transmit data, return number of bytes sent, -1 = error */
 int net_transmit(GIOChannel *handle, const char *data, int len);
 
-/* Get IP addresses for host, both IPv4 and IPv6 if possible.
-   If ip->family is 0, the address wasn't found.
-   Returns 0 = ok, others = error code for net_gethosterror() */
-int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6);
-/* Get name for host, *name should be g_free()'d unless it's NULL.
-   Return values are the same as with net_gethostbyname() */
-int net_gethostbyaddr(IPADDR *ip, char **name);
-/* get error of net_gethostname() */
-const char *net_gethosterror(int error);
-/* return TRUE if host lookup failed because it didn't exist (ie. not
-   some error with name server) */
-int net_hosterror_notfound(int error);
+/* Get the first IP address for host, both IPv4 and IPv6 if possible. */
+int net_gethostbyname_first_ips(const char *addr, GResolverNameLookupFlags flags, IPADDR *ip4,
+                                IPADDR *ip6);
 
 /* Get socket address/port */
 int net_getsockname(GIOChannel *handle, IPADDR *addr, int *port);
@@ -90,4 +87,7 @@ char *net_getservbyport(int port);
 int is_ipv4_address(const char *host);
 int is_ipv6_address(const char *host);
 
+void resolved_ip_ref(RESOLVED_IP_REC *iprec);
+int resolved_ip_unref(RESOLVED_IP_REC *iprec);
+
 #endif
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 16513109..de1f06df 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -45,6 +45,8 @@ unsigned int unix_socket:1; /* Connect using named unix socket */
 unsigned int use_tls:1; /* this connection uses TLS */
 unsigned int tls_verify:1;
 unsigned int no_connect:1; /* don't connect() at all, it's done by plugin */
-unsigned short last_failed_family; /* #641: if we failed to connect to ipv6, try ipv4 and vice versa */
+int last_connected;
+int last_failed;
+RESOLVED_IP_REC *resolved_host;
 char *channels;
 char *away_reason;
diff --git a/src/core/server-rec.h b/src/core/server-rec.h
index 6c7c63e3..e43245a7 100644
--- a/src/core/server-rec.h
+++ b/src/core/server-rec.h
@@ -21,10 +21,8 @@ unsigned int no_reconnect:1; /* Don't reconnect to server */
 NET_SENDBUF_REC *handle;
 int readtag; /* input tag */
 
-/* for net_gethostbyname_return() */
-GIOChannel *connect_pipe[2];
+GCancellable *connect_cancellable;
 int connect_tag;
-int connect_pid;
 
 RAWLOG_REC *rawlog;
 GHashTable *module_data;
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index a9d9422b..64af6287 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -120,6 +120,10 @@ static int server_reconnect_timeout(void)
 			if (server->connect_tag != -1) {
 				g_source_remove(server->connect_tag);
 				server->connect_tag = -1;
+			} else if (server->connect_cancellable != NULL) {
+				g_cancellable_cancel(server->connect_cancellable);
+				g_object_unref(server->connect_cancellable);
+				server->connect_cancellable = NULL;
 			}
 			server->connection_lost = TRUE;
 			server_connect_failed(server, "Timeout");
@@ -168,7 +172,8 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
         server_connect_ref(dest);
 	dest->type = module_get_uniq_id("SERVER CONNECT", 0);
 	dest->reconnection = src->reconnection;
-	dest->last_failed_family = src->last_failed_family;
+	dest->last_connected = src->last_connected;
+	dest->last_failed = src->last_failed;
 	dest->proxy = g_strdup(src->proxy);
         dest->proxy_port = src->proxy_port;
 	dest->proxy_string = g_strdup(src->proxy_string);
@@ -207,6 +212,10 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
 		dest->own_ip6 = g_new(IPADDR, 1);
 		memcpy(dest->own_ip6, src->own_ip6, sizeof(IPADDR));
 	}
+	dest->resolved_host = src->resolved_host;
+	if (dest->resolved_host != NULL) {
+		resolved_ip_ref(dest->resolved_host);
+	}
 
 	dest->channels = g_strdup(src->channels);
 	dest->away_reason = g_strdup(src->away_reason);
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index ff3d6584..97206328 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -58,7 +58,8 @@ static void save_ips(IPADDR *ip4, IPADDR *ip6,
 static void get_source_host_ip(void)
 {
         const char *hostname;
-	IPADDR ip4, ip6;
+	IPADDR ip4 = { 0 };
+	IPADDR ip6 = { 0 };
 
 	if (source_host_ok)
 		return;
@@ -66,7 +67,8 @@ static void get_source_host_ip(void)
 	/* FIXME: This will block! */
         hostname = settings_get_str("hostname");
 	source_host_ok = *hostname != '\0' &&
-		net_gethostbyname(hostname, &ip4, &ip6) == 0;
+	                 net_gethostbyname_first_ips(hostname, G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT,
+	                                             &ip4, &ip6) == 0;
 
 	if (source_host_ok)
 		save_ips(&ip4, &ip6, &source_host_ip4, &source_host_ip6);
@@ -79,12 +81,14 @@ static void get_source_host_ip(void)
 static void conn_set_ip(SERVER_CONNECT_REC *conn, const char *own_host,
 			IPADDR **own_ip4, IPADDR **own_ip6)
 {
-	IPADDR ip4, ip6;
+	IPADDR ip4 = { 0 };
+	IPADDR ip6 = { 0 };
 
 	if (*own_ip4 == NULL && *own_ip6 == NULL) {
 		/* resolve the IP */
-		if (net_gethostbyname(own_host, &ip4, &ip6) == 0)
-                        save_ips(&ip4, &ip6, own_ip4, own_ip6);
+		if (net_gethostbyname_first_ips(own_host, G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT,
+		                                &ip4, &ip6) == 0)
+			save_ips(&ip4, &ip6, own_ip4, own_ip6);
 	}
 
 	server_connect_own_ip_save(conn, *own_ip4, *own_ip6);
diff --git a/src/core/servers.c b/src/core/servers.c
index 811081e8..e62f09ec 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -51,20 +51,16 @@ void server_connect_failed(SERVER_REC *server, const char *msg)
 		g_source_remove(server->connect_tag);
 		server->connect_tag = -1;
 	}
+	if (server->connect_cancellable != NULL) {
+		g_cancellable_cancel(server->connect_cancellable);
+		g_object_unref(server->connect_cancellable);
+		server->connect_cancellable = NULL;
+	}
 	if (server->handle != NULL) {
 		net_sendbuffer_destroy(server->handle, TRUE);
 		server->handle = NULL;
 	}
 
-	if (server->connect_pipe[0] != NULL) {
-		g_io_channel_shutdown(server->connect_pipe[0], TRUE, NULL);
-		g_io_channel_unref(server->connect_pipe[0]);
-		g_io_channel_shutdown(server->connect_pipe[1], TRUE, NULL);
-		g_io_channel_unref(server->connect_pipe[1]);
-		server->connect_pipe[0] = NULL;
-		server->connect_pipe[1] = NULL;
-	}
-
 	server_unref(server);
 }
 
@@ -156,7 +152,7 @@ static void server_connect_callback_init(SERVER_REC *server, GIOChannel *handle)
 	error = net_geterror(handle);
 	if (error != 0) {
 		server->connection_lost = TRUE;
-		server->connrec->last_failed_family = server->connrec->chosen_family;
+		server->connrec->last_failed = server->connrec->last_connected;
 		server_connect_failed(server, g_strerror(error));
 		return;
 	}
@@ -177,7 +173,7 @@ static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *han
 	error = irssi_ssl_handshake(handle);
 	if (error == -1) {
 		server->connection_lost = TRUE;
-		server->connrec->last_failed_family = server->connrec->chosen_family;
+		server->connrec->last_failed = server->connrec->last_connected;
 		server_connect_failed(server, NULL);
 		return;
 	}
@@ -259,12 +255,12 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 
 		server->connection_lost = TRUE;
 		if (ip != NULL) {
-			server->connrec->last_failed_family = ip->family;
+			server->connrec->last_failed = server->connrec->last_connected;
 		}
 		server_connect_failed(server, errmsg2 ? errmsg2 : errmsg);
 		g_free(errmsg2);
 	} else {
-		server->connrec->last_failed_family = 0;
+		server->connrec->last_failed = 0;
 		if (!server->connrec->use_tls)
 			server->handle = net_sendbuffer_create(handle, 0);
 		if (server->connrec->use_tls)
@@ -276,48 +272,47 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 	}
 }
 
-static void server_connect_callback_readpipe(SERVER_REC *server)
+static int server_start_connect_resolve(SERVER_REC *server);
+
+static void server_connect_use_resolved(SERVER_REC *server)
 {
-	RESOLVED_IP_REC iprec;
-        IPADDR *ip;
+	IPADDR *ip;
 	const char *errormsg;
+	RESOLVED_IP_REC *iprec = server->connrec->resolved_host;
 
-	g_source_remove(server->connect_tag);
-	server->connect_tag = -1;
-
-	net_gethostbyname_return(server->connect_pipe[0], &iprec);
-
-	g_io_channel_shutdown(server->connect_pipe[0], TRUE, NULL);
-	g_io_channel_unref(server->connect_pipe[0]);
-	g_io_channel_shutdown(server->connect_pipe[1], TRUE, NULL);
-	g_io_channel_unref(server->connect_pipe[1]);
-
-	server->connect_pipe[0] = NULL;
-	server->connect_pipe[1] = NULL;
-
-	/* figure out if we should use IPv4 or v6 address */
-	if (iprec.error != 0) {
-                /* error */
+	if (iprec->error != NULL) {
+		/* error */
 		ip = NULL;
-	} else if (server->connrec->family == AF_INET) {
-		/* force IPv4 connection */
-		ip = iprec.ip4.family == 0 ? NULL : &iprec.ip4;
-	} else if (server->connrec->family == AF_INET6) {
-		/* force IPv6 connection */
-		ip = iprec.ip6.family == 0 ? NULL : &iprec.ip6;
 	} else {
-		/* pick the one that was found. if both were found:
-		   1. disprefer the last one that failed
-		   2. prefer ipv4 over ipv6 unless resolve_prefer_ipv6 is set
-		*/
-		if (iprec.ip4.family == 0 ||
-		    (iprec.ip6.family != 0 &&
-		     (server->connrec->last_failed_family == AF_INET ||
-		      (settings_get_bool("resolve_prefer_ipv6") &&
-		       server->connrec->last_failed_family != AF_INET6)))) {
-			ip = &iprec.ip6;
+		GList *curr;
+		int i;
+
+		curr = iprec->ailist;
+		i = 0;
+		while (i < server->connrec->last_failed) {
+			if (curr != NULL) {
+				curr = curr->next;
+				i++;
+			}
+			/* curr is different now */
+			if (curr == NULL) {
+				resolved_ip_unref(server->connrec->resolved_host);
+				server->connrec->resolved_host = NULL;
+				server->connrec->last_failed = 0;
+				/* retry resolve */
+				server_start_connect_resolve(server);
+				return;
+			}
+		}
+		if (curr != NULL) {
+			GInetAddress *addr;
+			addr = curr->data;
+			server->connrec->last_connected = i + 1;
+			ip = g_new0(IPADDR, 1);
+			ip->family = g_inet_address_get_family(addr);
+			memcpy(&ip->ip, g_inet_address_to_bytes(addr), sizeof(ip->ip));
 		} else {
-			ip = &iprec.ip4;
+			ip = NULL;
 		}
 	}
 
@@ -326,28 +321,63 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
 		server_real_connect(server, ip, NULL);
 		errormsg = NULL;
 	} else {
-		if (iprec.error == 0 || net_hosterror_notfound(iprec.error)) {
+		if (iprec->error->code == G_RESOLVER_ERROR_NOT_FOUND) {
 			/* IP wasn't found for the host, don't try to
 			   reconnect back to this server */
 			server->dns_error = TRUE;
 		}
 
-		if (iprec.error == 0) {
-			/* forced IPv4 or IPv6 address but it wasn't found */
-			errormsg = server->connrec->family == AF_INET ?
-				"IPv4 address not found for host" :
-				"IPv6 address not found for host";
-		} else {
-			/* gethostbyname() failed */
-			errormsg = iprec.errorstr != NULL ? iprec.errorstr :
-				"Host lookup failed";
-		}
+		errormsg = iprec->error->message;
+		if (errormsg == NULL)
+			errormsg = "Host lookup failed";
 
 		server->connection_lost = TRUE;
+		/* clear the error in resolved_host */
+		server->connrec->resolved_host = NULL;
 		server_connect_failed(server, errormsg);
-	}
 
-	g_free(iprec.errorstr);
+		resolved_ip_unref(iprec);
+	}
+}
+
+static void server_connect_callback_resolved(RESOLVED_IP_REC *iprec, SERVER_REC *server)
+{
+	server->connect_cancellable = NULL;
+
+	if (server->connrec->resolved_host != NULL) {
+		resolved_ip_unref(server->connrec->resolved_host);
+	}
+	server->connrec->resolved_host = iprec;
+	if (iprec->error == NULL && iprec->ailist == NULL) {
+		server->connection_lost = TRUE;
+		server->dns_error = TRUE;
+		server_connect_failed(server, "Host lookup failed");
+	} else {
+		server_connect_use_resolved(server);
+	}
+}
+
+static int server_start_connect_resolve(SERVER_REC *server)
+{
+	const char *connect_address;
+	GResolverNameLookupFlags net_gethostbyname_flags;
+
+	connect_address =
+	    server->connrec->proxy != NULL ? server->connrec->proxy : server->connrec->address;
+	net_gethostbyname_flags = G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT;
+	if (server->connrec->family == AF_INET) {
+		net_gethostbyname_flags = G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY;
+	} else if (server->connrec->family == AF_INET6) {
+		net_gethostbyname_flags = G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY;
+	}
+	if (server->connrec->resolved_host == NULL) {
+		server->connect_cancellable = net_gethostbyname_nonblock(
+		    connect_address, net_gethostbyname_flags,
+		    (NetGethostbynameContinuationFunc) server_connect_callback_resolved, server);
+		return FALSE;
+	} else {
+		return TRUE;
+	}
 }
 
 SERVER_REC *server_connect(SERVER_CONNECT_REC *conn)
@@ -399,9 +429,6 @@ void server_connect_init(SERVER_REC *server)
 /* starts connecting to server */
 int server_start_connect(SERVER_REC *server)
 {
-	const char *connect_address;
-        int fd[2];
-
 	g_return_val_if_fail(server != NULL, FALSE);
 	if (!server->connrec->unix_socket && server->connrec->port <= 0)
 		return FALSE;
@@ -419,30 +446,17 @@ int server_start_connect(SERVER_REC *server)
 		/* connect with unix socket */
 		server_real_connect(server, NULL, server->connrec->address);
 	} else {
+		int already_resolved;
 		/* resolve host name */
-		if (pipe(fd) != 0) {
-			g_warning("server_connect(): pipe() failed.");
-			g_free(server->tag);
-			g_free(server->nick);
-			return FALSE;
-		}
-
-		server->connect_pipe[0] = i_io_channel_new(fd[0]);
-		server->connect_pipe[1] = i_io_channel_new(fd[1]);
-
-		connect_address = server->connrec->proxy != NULL ?
-			server->connrec->proxy : server->connrec->address;
-		server->connect_pid =
-			net_gethostbyname_nonblock(connect_address,
-						   server->connect_pipe[1], 0);
-		server->connect_tag =
-		    i_input_add(server->connect_pipe[0], I_INPUT_READ,
-		                (GInputFunction) server_connect_callback_readpipe, server);
+		already_resolved = server_start_connect_resolve(server);
 
 		server->connect_time = time(NULL);
 		lookup_servers = g_slist_append(lookup_servers, server);
 
 		signal_emit("server looking", 1, server);
+		if (already_resolved) {
+			server_connect_use_resolved(server);
+		}
 	}
 	return TRUE;
 }
@@ -481,8 +495,9 @@ void server_disconnect(SERVER_REC *server)
 
 	if (server->connect_tag != -1) {
 		/* still connecting to server.. */
-		if (server->connect_pid != -1)
-			net_disconnect_nonblock(server->connect_pid);
+		server_connect_failed(server, NULL);
+		return;
+	} else if (server->connect_cancellable != NULL) {
 		server_connect_failed(server, NULL);
 		return;
 	}
@@ -649,6 +664,10 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->own_ip4);
 	g_free_not_null(conn->own_ip6);
 
+	if (conn->resolved_host != NULL) {
+		resolved_ip_unref(conn->resolved_host);
+	}
+
 	g_free_not_null(conn->password);
 	g_free_not_null(conn->nick);
 	g_free_not_null(conn->username);
@@ -769,7 +788,6 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto)
 
 void servers_init(void)
 {
-	settings_add_bool("server", "resolve_prefer_ipv6", TRUE);
 	lookup_servers = servers = NULL;
 
 	signal_add("chat protocol deinit", (SIGNAL_FUNC) sig_chat_protocol_deinit);
diff --git a/src/core/servers.h b/src/core/servers.h
index d52603eb..5e5a7fd2 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -2,6 +2,7 @@
 #define IRSSI_CORE_SERVERS_H
 
 #include <irssi/src/core/modules.h>
+#include <irssi/src/core/network.h>
 
 /* Returns SERVER_REC if it's server, NULL if it isn't. */
 #define SERVER(server) \
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 9724354f..06240d5c 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -166,7 +166,7 @@ void fe_common_core_init(void)
 	settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
 	g_get_charset(&str);
 	settings_add_str("lookandfeel", "term_charset", str);
-	settings_add_str("lookandfeel", "glib_log_domains", "all");
+	settings_add_str("lookandfeel", "glib_log_domains", "all -glib-gio:debug");
 	themes_init();
         theme_register(fecommon_core_formats);
 
@@ -258,13 +258,19 @@ void fe_common_core_deinit(void)
 	g_log_set_default_handler(logger_old, NULL);
 }
 
-static gboolean glib_domain_wanted(const char *domain)
+static gboolean glib_domain_wanted(const char *domain, const char *level)
 {
 	const char *domains;
 	char *c, *cur;
 	int len = 0;
 	int print_it = 0; /* -1 for exclude, 0 for undecided, 1 for include */
 	int incl;
+	char *domainlevel, *alllevel, *starlevel, *domainstar;
+
+	domainlevel = g_strdup_printf("%s:%s", domain, level);
+	alllevel = g_strdup_printf("all:%s", level);
+	starlevel = g_strdup_printf("*:%s", level);
+	domainstar = g_strdup_printf("%s:*", domain);
 
 	/* Go through each item in glib_log_domains setting to determine whether
 	 * or not we want to print message from this domain */
@@ -287,8 +293,10 @@ static gboolean glib_domain_wanted(const char *domain)
 		}
 
 		/* If we got a valid item, process it */
-		if (len > 0 && (!strncmp(domain, c, len) || !strncasecmp("all", c, len) ||
-		                !strncmp("*", c, len)))
+		if (len > 0 && (!strncasecmp(domain, c, len) || !strncasecmp("all", c, len) ||
+		                !strncmp("*", c, len) || !strncasecmp(domainstar, c, len) ||
+		                !strncasecmp(domainlevel, c, len) ||
+		                !strncasecmp(alllevel, c, len) || !strncasecmp(starlevel, c, len)))
 			print_it = incl;
 
 		/* Go past any spaces towards the next item */
@@ -300,6 +308,11 @@ static gboolean glib_domain_wanted(const char *domain)
 		len = 0;
 	} while (*c != '\0' && print_it != -1);
 
+	g_free(domainlevel);
+	g_free(alllevel);
+	g_free(starlevel);
+	g_free(domainstar);
+
 	return (print_it == 1);
 }
 
@@ -333,7 +346,7 @@ static void i_log_func(const char *log_domain, GLogLevelFlags log_level, const c
 	domain = (log_domain ? log_domain : "default");
 
 	/* Only print the message if we decided to */
-	if (!glib_domain_wanted(domain))
+	if (!glib_domain_wanted(domain, reason))
 		return;
 
 	if (windows == NULL)
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 19aba87d..1fed639e 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -711,16 +711,19 @@ static void add_listen(const char *ircnet, int port, const char *port_or_path)
 		/* bind to specific host/ip? */
 		my_ip = NULL;
 		if (*settings_get_str("irssiproxy_bind") != '\0') {
-			if (net_gethostbyname(settings_get_str("irssiproxy_bind"),
-				                 &ip4, &ip6) != 0) {
+			if (net_gethostbyname_first_ips(settings_get_str("irssiproxy_bind"),
+			                                G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT, &ip4,
+			                                &ip6) != 0) {
 				printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
 				          "Proxy: can not resolve '%s' - aborting",
 				          settings_get_str("irssiproxy_bind"));
 				return;
 			}
 
-			my_ip = ip6.family == 0 ? &ip4 : ip4.family == 0 ||
-				settings_get_bool("resolve_prefer_ipv6") ? &ip6 : &ip4;
+			my_ip = ip6.family == 0 ? &ip4 :
+			        ip4.family == 0 || settings_get_bool("irssiproxy_prefer_ipv6") ?
+			                          &ip6 :
+			                          &ip4;
 		}
 		handle = net_listen(my_ip, &port);
 	}
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index d32b6009..240df971 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -74,6 +74,7 @@ static void irc_proxy_setup_changed(void)
 
 void irc_proxy_init(void)
 {
+	settings_add_bool("irssiproxy", "irssiproxy_prefer_ipv6", TRUE);
 	settings_add_str("irssiproxy", "irssiproxy_ports", "");
 	settings_add_str("irssiproxy", "irssiproxy_password", "");
 	settings_add_str("irssiproxy", "irssiproxy_bind", "");

From e64ed836a5a62ab1e398bd0ca7b6e7070df82939 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 27 Jul 2025 21:16:06 +0200
Subject: [PATCH 1638/1650] up glib wrap

---
 meson.build           | 2 +-
 subprojects/glib.wrap | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 4f78600e..c7eed79d 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project('irssi', 'c',
 ############################
 ############################
 
-glib_internal_version = 'glib-2.74.3' # keep this in sync with subprojects/glib.wrap
+glib_internal_version = 'glib-2.74.7' # keep this in sync with subprojects/glib.wrap
 glib_pcre2_internal_version = 'pcre2-10.40'
 glib_libffi_internal_version = 'libffi'
 cc = meson.get_compiler('c')
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index 5e50e9a5..e6c649fc 100644
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -1,6 +1,6 @@
 [wrap-file]
 # make sure to update the glib_internal_version in meson.build
-directory = glib-2.74.3
-source_url = https://download.gnome.org/sources/glib/2.74/glib-2.74.3.tar.xz
-source_filename = glib-2.74.3.tar.xz
-source_hash = e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb
+directory = glib-2.74.7
+source_url = https://download.gnome.org/sources/glib/2.74/glib-2.74.7.tar.xz
+source_filename = glib-2.74.7.tar.xz
+source_hash = 196ab86c27127a61b7a70c3ba6af7b97bdc01c07cd3b21abd5e778b955eccb1b

From c6d15ee461569ef821ea8b7cff85ddc83da6e42d Mon Sep 17 00:00:00 2001
From: nikolas <nikolas@gnu.org>
Date: Thu, 12 Jun 2025 20:53:18 -0400
Subject: [PATCH 1639/1650] Add a few more compile dependencies to INSTALL
 document

---
 INSTALL | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/INSTALL b/INSTALL
index ed5a14a3..ac7c419f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,10 @@ To compile Irssi you need:
 - glib-2.32 or greater
 - openssl (for ssl support)
 - perl-5.8 or greater (for building, and optionally Perl scripts)
+  (n.b a complete perl is needed, including ExtUtils::Embed and xsubpp)
 - terminfo or ncurses (for text frontend)
+- utf8proc (optional, for additional char width calculation)
+- libgcrypt (for OTR)
 
 For most people, this should work just fine:
 

From 51322d6af121c0394becf96189244428302df7cd Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 24 Jan 2026 13:53:23 +0100
Subject: [PATCH 1640/1650] restore ip4_any

---
 src/core/network.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/core/network.c b/src/core/network.c
index c763a7c6..8dd5cf9d 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -81,6 +81,14 @@ int i_io_channel_read_block(GIOChannel *channel, void *data, int len)
 	return received < len ? -1 : 0;
 }
 
+IPADDR ip4_any = { AF_INET,
+#if defined(IN6ADDR_ANY_INIT)
+	           IN6ADDR_ANY_INIT
+#else
+	           { INADDR_ANY }
+#endif
+};
+
 static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
 {
 	if (ip == NULL) {

From 2012668beff7a275ad5ddb94d56adcf54b0d77be Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 24 Jan 2026 13:54:57 +0100
Subject: [PATCH 1641/1650] make Irssi::Irc usable without dcc

---
 src/perl/irc/Dcc.xs      | 102 +++++++++++++++++++++++++++++++++++++++
 src/perl/irc/Irc.pm      |   6 +++
 src/perl/irc/Irc.xs      |  83 ++-----------------------------
 src/perl/irc/Irc/Dcc.pm  |  26 ++++++++++
 src/perl/irc/meson.build |  34 ++++++++++++-
 5 files changed, 169 insertions(+), 82 deletions(-)
 create mode 100644 src/perl/irc/Irc/Dcc.pm

diff --git a/src/perl/irc/Dcc.xs b/src/perl/irc/Dcc.xs
index c078a1b5..f96f4d33 100644
--- a/src/perl/irc/Dcc.xs
+++ b/src/perl/irc/Dcc.xs
@@ -1,7 +1,74 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
 
+static int initialized = FALSE;
+
+static void perl_dcc_fill_hash(HV *hv, DCC_REC *dcc)
+{
+	(void) hv_store(hv, "type", 4, new_pv(dcc_type2str(dcc->type)), 0);
+	(void) hv_store(hv, "orig_type", 9, new_pv(dcc_type2str(dcc->orig_type)), 0);
+	(void) hv_store(hv, "created", 7, newSViv(dcc->created), 0);
+
+	(void) hv_store(hv, "server", 6, iobject_bless(dcc->server), 0);
+	(void) hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0);
+	(void) hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0);
+	(void) hv_store(hv, "nick", 4, new_pv(dcc->nick), 0);
+
+	(void) hv_store(hv, "chat", 4, simple_iobject_bless(dcc->chat), 0);
+	(void) hv_store(hv, "target", 6, new_pv(dcc->target), 0);
+	(void) hv_store(hv, "arg", 3, new_pv(dcc->arg), 0);
+
+	(void) hv_store(hv, "addr", 4, new_pv(dcc->addrstr), 0);
+	(void) hv_store(hv, "port", 4, newSViv(dcc->port), 0);
+
+	(void) hv_store(hv, "starttime", 9, newSViv(dcc->starttime), 0);
+	(void) hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0);
+}
+
+static void perl_dcc_chat_fill_hash(HV *hv, CHAT_DCC_REC *dcc)
+{
+	perl_dcc_fill_hash(hv, (DCC_REC *) dcc);
+
+	(void) hv_store(hv, "id", 2, new_pv(dcc->id), 0);
+	(void) hv_store(hv, "mirc_ctcp", 9, newSViv(dcc->mirc_ctcp), 0);
+	(void) hv_store(hv, "connection_lost", 15, newSViv(dcc->connection_lost), 0);
+}
+
+static void perl_dcc_file_fill_hash(HV *hv, FILE_DCC_REC *dcc)
+{
+	perl_dcc_fill_hash(hv, (DCC_REC *) dcc);
+
+	(void) hv_store(hv, "size", 4, newSViv(dcc->size), 0);
+	(void) hv_store(hv, "skipped", 7, newSViv(dcc->skipped), 0);
+}
+
+static void perl_dcc_get_fill_hash(HV *hv, GET_DCC_REC *dcc)
+{
+	perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc);
+
+	(void) hv_store(hv, "get_type", 8, newSViv(dcc->get_type), 0);
+	(void) hv_store(hv, "file", 4, new_pv(dcc->file), 0);
+	(void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
+}
+
+static void perl_dcc_send_fill_hash(HV *hv, SEND_DCC_REC *dcc)
+{
+	perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc);
+
+	(void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
+	(void) hv_store(hv, "waitforend", 10, newSViv(dcc->waitforend), 0);
+	(void) hv_store(hv, "gotalldata", 10, newSViv(dcc->gotalldata), 0);
+}
+
+static PLAIN_OBJECT_INIT_REC irc_dcc_plains[] = { { "Irssi::Irc::Dcc",
+	                                            (PERL_OBJECT_FUNC) perl_dcc_fill_hash },
+
+	                                          { NULL, NULL } };
+
+/********************************/
+
 MODULE = Irssi::Irc::Dcc  PACKAGE = Irssi::Irc
+
 PROTOTYPES: ENABLE
 
 void
@@ -101,3 +168,38 @@ MODULE = Irssi::Irc::Dcc  PACKAGE = Irssi::Windowitem  PREFIX = item_
 Irssi::Irc::Dcc::Chat
 item_get_dcc(item)
 	Irssi::Windowitem item
+
+#*******************************
+MODULE = Irssi::Irc::Dcc  PACKAGE = Irssi::Irc::Dcc
+#*******************************
+
+void
+init()
+CODE:
+	if (initialized)
+		return;
+	perl_api_version_check("Irssi::Irc::Dcc");
+	initialized = TRUE;
+
+	irssi_add_object(module_get_uniq_id_str("DCC", "CHAT"), 0, "Irssi::Irc::Dcc::Chat",
+	                 (PERL_OBJECT_FUNC) perl_dcc_chat_fill_hash);
+	irssi_add_object(module_get_uniq_id_str("DCC", "GET"), 0, "Irssi::Irc::Dcc::Get",
+	                 (PERL_OBJECT_FUNC) perl_dcc_get_fill_hash);
+	irssi_add_object(module_get_uniq_id_str("DCC", "SEND"), 0, "Irssi::Irc::Dcc::Send",
+	                 (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash);
+	irssi_add_object(module_get_uniq_id_str("DCC", "SERVER"), 0, "Irssi::Irc::Dcc::Server",
+	                 (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash);
+	irssi_add_plains(irc_dcc_plains);
+	perl_eval_pv("@Irssi::Irc::Dcc::Chat::ISA = qw(Irssi::Irc::Dcc);\n"
+	             "@Irssi::Irc::Dcc::Get::ISA = qw(Irssi::Irc::Dcc);\n"
+	             "@Irssi::Irc::Dcc::Send::ISA = qw(Irssi::Irc::Dcc);\n"
+	             "@Irssi::Irc::Dcc::Server::ISA = qw(Irssi::Irc::Dcc);\n",
+	             TRUE);
+
+void
+deinit()
+CODE:
+	initialized = FALSE;
+
+BOOT:
+	/* nothing * /
diff --git a/src/perl/irc/Irc.pm b/src/perl/irc/Irc.pm
index 1d95462d..b5ace267 100644
--- a/src/perl/irc/Irc.pm
+++ b/src/perl/irc/Irc.pm
@@ -22,5 +22,11 @@ Irssi::Irc::init();
 
 Irssi::EXPORT_ALL();
 
+eval {
+    local $@;
+    require Irssi::Irc::Dcc;
+    1;
+};
+
 1;
 
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 33be93d5..80033fba 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -69,63 +69,6 @@ static void perl_ban_fill_hash(HV *hv, BAN_REC *ban)
 	(void) hv_store(hv, "time", 4, newSViv(ban->time), 0);
 }
 
-static void perl_dcc_fill_hash(HV *hv, DCC_REC *dcc)
-{
-	(void) hv_store(hv, "type", 4, new_pv(dcc_type2str(dcc->type)), 0);
-	(void) hv_store(hv, "orig_type", 9, new_pv(dcc_type2str(dcc->orig_type)), 0);
-	(void) hv_store(hv, "created", 7, newSViv(dcc->created), 0);
-
-	(void) hv_store(hv, "server", 6, iobject_bless(dcc->server), 0);
-	(void) hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0);
-	(void) hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0);
-	(void) hv_store(hv, "nick", 4, new_pv(dcc->nick), 0);
-
-	(void) hv_store(hv, "chat", 4, simple_iobject_bless(dcc->chat), 0);
-	(void) hv_store(hv, "target", 6, new_pv(dcc->target), 0);
-	(void) hv_store(hv, "arg", 3, new_pv(dcc->arg), 0);
-
-	(void) hv_store(hv, "addr", 4, new_pv(dcc->addrstr), 0);
-	(void) hv_store(hv, "port", 4, newSViv(dcc->port), 0);
-
-	(void) hv_store(hv, "starttime", 9, newSViv(dcc->starttime), 0);
-	(void) hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0);
-}
-
-static void perl_dcc_chat_fill_hash(HV *hv, CHAT_DCC_REC *dcc)
-{
-        perl_dcc_fill_hash(hv, (DCC_REC *) dcc);
-
-	(void) hv_store(hv, "id", 2, new_pv(dcc->id), 0);
-	(void) hv_store(hv, "mirc_ctcp", 9, newSViv(dcc->mirc_ctcp), 0);
-	(void) hv_store(hv, "connection_lost", 15, newSViv(dcc->connection_lost), 0);
-}
-
-static void perl_dcc_file_fill_hash(HV *hv, FILE_DCC_REC *dcc)
-{
-        perl_dcc_fill_hash(hv, (DCC_REC *) dcc);
-
-	(void) hv_store(hv, "size", 4, newSViv(dcc->size), 0);
-	(void) hv_store(hv, "skipped", 7, newSViv(dcc->skipped), 0);
-}
-
-static void perl_dcc_get_fill_hash(HV *hv, GET_DCC_REC *dcc)
-{
-        perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc);
-
-	(void) hv_store(hv, "get_type", 8, newSViv(dcc->get_type), 0);
-	(void) hv_store(hv, "file", 4, new_pv(dcc->file), 0);
-	(void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
-}
-
-static void perl_dcc_send_fill_hash(HV *hv, SEND_DCC_REC *dcc)
-{
-        perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc);
-
-	(void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0);
-	(void) hv_store(hv, "waitforend", 10, newSViv(dcc->waitforend), 0);
-	(void) hv_store(hv, "gotalldata", 10, newSViv(dcc->gotalldata), 0);
-}
-
 static void perl_netsplit_fill_hash(HV *hv, NETSPLIT_REC *netsplit)
 {
         AV *av;
@@ -195,7 +138,6 @@ static void perl_client_fill_hash(HV *hv, CLIENT_REC *client)
 
 static PLAIN_OBJECT_INIT_REC irc_plains[] = {
 	{ "Irssi::Irc::Ban", (PERL_OBJECT_FUNC) perl_ban_fill_hash },
-	{ "Irssi::Irc::Dcc", (PERL_OBJECT_FUNC) perl_dcc_fill_hash },
 	{ "Irssi::Irc::Netsplit", (PERL_OBJECT_FUNC) perl_netsplit_fill_hash },
 	{ "Irssi::Irc::Netsplitserver", (PERL_OBJECT_FUNC) perl_netsplit_server_fill_hash },
 	{ "Irssi::Irc::Netsplitchannel", (PERL_OBJECT_FUNC) perl_netsplit_channel_fill_hash },
@@ -244,27 +186,9 @@ CODE:
 	irssi_add_object(module_get_uniq_id("SERVER CONNECT", 0),
 			 chat_type, "Irssi::Irc::Connect",
 			 (PERL_OBJECT_FUNC) perl_irc_connect_fill_hash);
-	irssi_add_object(module_get_uniq_id("SERVER", 0),
-			 chat_type, "Irssi::Irc::Server",
-			 (PERL_OBJECT_FUNC) perl_irc_server_fill_hash);
-	irssi_add_object(module_get_uniq_id_str("DCC", "CHAT"),
-			 0, "Irssi::Irc::Dcc::Chat",
-			 (PERL_OBJECT_FUNC) perl_dcc_chat_fill_hash);
-	irssi_add_object(module_get_uniq_id_str("DCC", "GET"),
-			 0, "Irssi::Irc::Dcc::Get",
-			 (PERL_OBJECT_FUNC) perl_dcc_get_fill_hash);
-	irssi_add_object(module_get_uniq_id_str("DCC", "SEND"),
-			 0, "Irssi::Irc::Dcc::Send",
-			 (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash);
-	irssi_add_object(module_get_uniq_id_str("DCC", "SERVER"),
-			 0, "Irssi::Irc::Dcc::Server",
-			 (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash);
-        irssi_add_plains(irc_plains);
-	perl_eval_pv("@Irssi::Irc::Dcc::Chat::ISA = qw(Irssi::Irc::Dcc);\n"
-		     "@Irssi::Irc::Dcc::Get::ISA = qw(Irssi::Irc::Dcc);\n"
-		     "@Irssi::Irc::Dcc::Send::ISA = qw(Irssi::Irc::Dcc);\n"
-		     "@Irssi::Irc::Dcc::Server::ISA = qw(Irssi::Irc::Dcc);\n",
-		     TRUE);
+	irssi_add_object(module_get_uniq_id("SERVER", 0), chat_type, "Irssi::Irc::Server",
+	                 (PERL_OBJECT_FUNC) perl_irc_server_fill_hash);
+	irssi_add_plains(irc_plains);
 
 void
 deinit()
@@ -274,7 +198,6 @@ CODE:
 BOOT:
 	irssi_boot(Irc__Channel);
 	irssi_boot(Irc__Ctcp);
-	irssi_boot(Irc__Dcc);
 	irssi_boot(Irc__Modes);
 	irssi_boot(Irc__Netsplit);
 	irssi_boot(Irc__Notifylist);
diff --git a/src/perl/irc/Irc/Dcc.pm b/src/perl/irc/Irc/Dcc.pm
new file mode 100644
index 00000000..65a30c44
--- /dev/null
+++ b/src/perl/irc/Irc/Dcc.pm
@@ -0,0 +1,26 @@
+#
+# Perl interface to irssi functions.
+#
+
+package Irssi::Irc::Dcc;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+
+$VERSION = "0.9";
+
+require Exporter;
+require DynaLoader;
+
+@ISA = qw(Exporter DynaLoader);
+@EXPORT = qw();
+@EXPORT_OK = qw();
+
+bootstrap Irssi::Irc::Dcc $VERSION if (!Irssi::Core::is_static());
+
+Irssi::Irc::Dcc::init();
+
+Irssi::EXPORT_ALL();
+
+1;
+
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index e033c260..af68ce7f 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -4,7 +4,6 @@ shared_library('Irc',
       'Channel.xs',
       'Client.xs',
       'Ctcp.xs',
-      'Dcc.xs',
       'Irc.xs',
       'Modes.xs',
       'Netsplit.xs',
@@ -27,7 +26,7 @@ shared_library('Irc',
   include_directories : rootinc,
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
-  link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
+  link_with : dl_cross_perl_core + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
   override_options : ['b_lundef=false'],
 )
 
@@ -37,6 +36,37 @@ install_headers(
   ),
   install_dir : perlmoddir / 'Irssi',
 )
+
+shared_library('Dcc',
+  [ xsubpp.process(
+    files(
+      'Dcc.xs',
+    ),
+    extra_args : [
+      '-typemap',
+      '../common/typemap',
+    ],
+  ) ]
+  + files(
+    'module.h',
+  ),
+  name_prefix : '',
+  name_suffix : perl_module_suffix,
+  install : true,
+  install_dir : perlmoddir / 'auto' / 'Irssi' / 'Irc' / 'Dcc',
+  include_directories : rootinc,
+  implicit_include_directories : true,
+  dependencies : dep + [ perl_dep ],
+  link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
+  override_options : ['b_lundef=false'],
+)
+
+install_headers(
+  files(
+    'Irc/Dcc.pm',
+  ),
+  install_dir : perlmoddir / 'Irssi' / 'Irc',
+)
   
 # 'Makefile.PL.in',
 # 'typemap',

From a54677ce99413e4c5f7ac7e5061ac83f5a4af85d Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 24 Jan 2026 14:08:28 +0100
Subject: [PATCH 1642/1650] up perl api

---
 src/perl/module.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/module.h b/src/perl/module.h
index 0a4d78f6..398eb1c7 100644
--- a/src/perl/module.h
+++ b/src/perl/module.h
@@ -17,4 +17,4 @@ extern PerlInterpreter *my_perl; /* must be called my_perl or some perl implemen
 
 /* Change this every time when some API changes between irssi's perl module
    (or irssi itself) and irssi's perl libraries. */
-#define IRSSI_PERL_API_VERSION (20011214 + IRSSI_ABI_VERSION)
+#define IRSSI_PERL_API_VERSION (20160124 + IRSSI_ABI_VERSION)

From 45d3013f9e490626f0cf8ba11b1db7569239e0e3 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 24 Jan 2026 14:11:42 +0100
Subject: [PATCH 1643/1650] up abi

---
 src/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.h b/src/common.h
index 06b63a15..4e9b5c79 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 57
+#define IRSSI_ABI_VERSION 58
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

From e9281b2f1147eb25dd811f4cd2a870eae3c22a62 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 24 Jan 2026 18:05:05 +0100
Subject: [PATCH 1644/1650] add compatibility code for older GResolver

---
 src/core/net-nonblock.c | 40 ++++++++++++++++++++++++++++++++++++++++
 src/core/network.h      | 13 +++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 494d9894..1a06a662 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -26,6 +26,7 @@
 #include <irssi/src/core/net-nonblock.h>
 
 typedef struct {
+	GResolverNameLookupFlags flags;
 	NetGethostbynameContinuationFunc cont;
 	void *cont_data;
 } NET_GETHOSTBYNAME_CALLBACK_DATA;
@@ -39,7 +40,39 @@ static void net_gethostbyname_callback(GResolver *resolver, GAsyncResult *result
 	RESOLVED_IP_REC *iprec;
 
 	error = NULL;
+#if GLIB_CHECK_VERSION(2, 59, 0)
 	ailist = g_resolver_lookup_by_name_with_flags_finish(resolver, result, &error);
+#else
+	/* compatibility code for old GLib */
+	ailist = g_resolver_lookup_by_name_finish(resolver, result, &error);
+	if (error == NULL && data->flags) {
+		GList *ll, *lll;
+
+		for (ll = ailist; ll != NULL; ll = lll) {
+			GInetAddress *address;
+			GSocketFamily family;
+
+			address = G_INET_ADDRESS(ll->data);
+			family = g_inet_address_get_family(address);
+			lll = ll->next;
+
+			if ((data->flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY &&
+			     family == G_SOCKET_FAMILY_IPV6) ||
+			    (data->flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY &&
+			     family == G_SOCKET_FAMILY_IPV4)) {
+				g_object_unref(address);
+				ailist = g_list_delete_link(ailist, ll);
+			}
+		}
+
+		if (ailist == NULL) {
+			g_set_error(&error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
+			            data->flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY ?
+			                "IPv4 address not found for host" :
+			                "IPv6 address not found for host");
+		}
+	}
+#endif
 	iprec = g_new0(RESOLVED_IP_REC, 1);
 	if (error != NULL) {
 		iprec->error = error;
@@ -66,10 +99,17 @@ GCancellable *net_gethostbyname_nonblock(const char *addr, GResolverNameLookupFl
 	resolver = g_resolver_get_default();
 	cancellable = g_cancellable_new();
 	data = g_new0(NET_GETHOSTBYNAME_CALLBACK_DATA, 1);
+	data->flags = flags;
 	data->cont = cont;
 	data->cont_data = cont_data;
+#if GLIB_CHECK_VERSION(2, 59, 0)
 	g_resolver_lookup_by_name_with_flags_async(resolver, addr, flags, cancellable,
 	                                           (GAsyncReadyCallback) net_gethostbyname_callback,
 	                                           data);
+#else
+	/* compatibility code for old GLib */
+	g_resolver_lookup_by_name_async(resolver, addr, cancellable,
+	                                (GAsyncReadyCallback) net_gethostbyname_callback, data);
+#endif
 	return cancellable;
 }
diff --git a/src/core/network.h b/src/core/network.h
index 647cd8c7..78092375 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -16,6 +16,19 @@
 #  endif
 #endif
 
+#if GLIB_CHECK_VERSION(2, 59, 0)
+/* nothing */
+#else
+/* compatibility code for old GLib */
+
+typedef enum {
+	G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT = 0,
+	G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY = 1 << 0,
+	G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY = 1 << 1,
+} GResolverNameLookupFlags;
+
+#endif
+
 struct _IPADDR {
 	unsigned short family;
 	struct in6_addr ip;

From 00146211d08ddc0ba0e1907f25fd08a0624f0eea Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 24 Jan 2026 18:06:21 +0100
Subject: [PATCH 1645/1650] fix space in end comment

---
 src/perl/irc/Dcc.xs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/perl/irc/Dcc.xs b/src/perl/irc/Dcc.xs
index f96f4d33..a6d2c473 100644
--- a/src/perl/irc/Dcc.xs
+++ b/src/perl/irc/Dcc.xs
@@ -202,4 +202,4 @@ CODE:
 	initialized = FALSE;
 
 BOOT:
-	/* nothing * /
+	/* nothing */

From 0157a4424bce0715b09799af64a86f8e956e6a64 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sat, 24 Jan 2026 20:53:29 +0100
Subject: [PATCH 1646/1650] fix clang-format-xs boot code

---
 utils/clang-format-xs/clang-format-xs | 29 ++++++++++++++++++++++++---
 utils/clang-format-xs/format-xs-1.pl  |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/utils/clang-format-xs/clang-format-xs b/utils/clang-format-xs/clang-format-xs
index 3216210b..39493c53 100755
--- a/utils/clang-format-xs/clang-format-xs
+++ b/utils/clang-format-xs/clang-format-xs
@@ -6,14 +6,22 @@ srcdir=$(dirname "$(readlink -f "$0")")
 test -z "$srcdir" && srcdir=.
 
 CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
+if [[ "$CLANG_FORMAT" = *-xs\ * ]]; then
+    CLANG_FORMAT=${CLANG_FORMAT/-xs / }
+elif [[ "$CLANG_FORMAT" = *-xs ]]; then
+    CLANG_FORMAT=${CLANG_FORMAT%-xs}
+fi
+
+clang_format_version=$($CLANG_FORMAT --version 2>/dev/null | perl -ne '/(\d+)/ && print $1 or print 0')
+
 options=()
 files=()
 lines=()
-inplace=0;xml=0;
+inplace=0;xml=0;list_ignored=0;
 filename=tmp.1.c
 offsets=
 off_opts=()
-opts=$(getopt -n clang-format-xs -s bash -a -o in -l Werror,assume-filename:,cursor:,dry-run,dump-config,fallback-style:,ferror-limit:,help,length:,lines:,offset:,output-replacement-xmls,sort-includes,style:,verbose,version -- "$@")
+opts=$(getopt -n clang-format-xs -s bash -a -o in -l Werror,assume-filename:,cursor:,dry-run,dump-config,fallback-style:,ferror-limit:,help,length:,lines:,offset:,output-replacement-xmls,sort-includes,list-ignored,style:,verbose,version -- "$@")
 if [ $? -ne 0 ]; then exit 1; fi
 eval set -- "$opts"; unset opts
 while :; do
@@ -47,6 +55,11 @@ while :; do
 	    shift
 	    continue
 	    ;;
+	--list-ignored)
+	    list_ignored=1
+	    shift
+	    continue
+	    ;;
 	-i)
 	    inplace=1
 	    shift
@@ -75,6 +88,10 @@ fi
 if [[ $xml = 1 ]]; then
     options_o=("-output-replacements-xml" "${options[@]}")
 fi
+if [[ $list_ignored = 1 ]]; then
+    options_o=("-list-ignored" "${options[@]}")
+fi
+
 options_o+=("${off_opts[@]}")
 
 do_xs() {
@@ -92,7 +109,13 @@ do_xs() {
     rm "$1".1.c
 }
 
-if [[ ${#files[@]} -eq 0 ]]; then
+if [[ $list_ignored = 1 ]]; then
+    if [[ $clang_format_version -lt 19 ]]; then
+	: # true
+    else
+	$CLANG_FORMAT "${options_o[@]}" -- "${files[@]}"
+    fi
+elif [[ ${#files[@]} -eq 0 ]]; then
     case "$filename" in
 	    *.xs)
 		cat > "$filename".1.xs
diff --git a/utils/clang-format-xs/format-xs-1.pl b/utils/clang-format-xs/format-xs-1.pl
index 1d15316e..fab1e90a 100644
--- a/utils/clang-format-xs/format-xs-1.pl
+++ b/utils/clang-format-xs/format-xs-1.pl
@@ -30,7 +30,7 @@ while (<>) {
 	$prot = 2;
 	$in_code = 0;
     }
-    elsif (/^((PP)?CODE|PREINIT):/) {
+    elsif (/^((PP)?CODE|PREINIT|BOOT):/) {
 	$prot = 1;
 	$in_code = 3;
     }

From 88afc78aacc3e89b49745cac6c61be662fe9cefa Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 25 Jan 2026 00:25:14 +0100
Subject: [PATCH 1647/1650] GResolver fixes

fix issues brought up by @horgh in #1580
---
 src/core/network.c       | 44 ++++++++++++++++++++++++++++++++++------
 src/core/servers-setup.c |  8 ++++----
 src/core/servers.c       |  8 +++++++-
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/core/network.c b/src/core/network.c
index 8dd5cf9d..c641b203 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -408,16 +408,43 @@ static RESOLVED_IP_REC *net_gethostbyname(const char *addr, GResolverNameLookupF
 	GResolver *resolver;
 	RESOLVED_IP_REC *iprec;
 
-#ifdef HAVE_CAPSICUM
-	if (capsicum_enabled())
-		return (capsicum_net_gethostbyname(addr, flags));
-#endif
-
 	g_return_val_if_fail(addr != NULL, NULL);
 
 	error = NULL;
 	resolver = g_resolver_get_default();
+#if GLIB_CHECK_VERSION(2, 59, 0)
 	ailist = g_resolver_lookup_by_name_with_flags(resolver, addr, flags, NULL, &error);
+#else
+	/* compatibility code for old GLib */
+	ailist = g_resolver_lookup_by_name(resolver, addr, NULL, &error);
+	if (error == NULL && flags) {
+		GList *ll, *lll;
+
+		for (ll = ailist; ll != NULL; ll = lll) {
+			GInetAddress *address;
+			GSocketFamily family;
+
+			address = G_INET_ADDRESS(ll->data);
+			family = g_inet_address_get_family(address);
+			lll = ll->next;
+
+			if ((flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY &&
+			     family == G_SOCKET_FAMILY_IPV6) ||
+			    (flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY &&
+			     family == G_SOCKET_FAMILY_IPV4)) {
+				g_object_unref(address);
+				ailist = g_list_delete_link(ailist, ll);
+			}
+		}
+
+		if (ailist == NULL) {
+			g_set_error(&error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
+			            flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY ?
+			                "IPv4 address not found for host" :
+			                "IPv6 address not found for host");
+		}
+	}
+#endif
 	iprec = g_new0(RESOLVED_IP_REC, 1);
 	if (error != NULL) {
 		iprec->error = error;
@@ -435,11 +462,16 @@ int net_gethostbyname_first_ips(const char *addr, GResolverNameLookupFlags flags
 {
 	RESOLVED_IP_REC *iprec;
 
+#ifdef HAVE_CAPSICUM
+	if (capsicum_enabled())
+		return (capsicum_net_gethostbyname(addr, ip4, ip6));
+#endif
+
 	iprec = net_gethostbyname(addr, flags);
 	if (iprec->error == NULL) {
 		GList *curr;
 
-		for (curr = iprec->ailist; curr->next; curr = curr->next) {
+		for (curr = iprec->ailist; curr; curr = curr->next) {
 			unsigned short family;
 			GInetAddress *addr;
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 97206328..8747eea3 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -70,11 +70,11 @@ static void get_source_host_ip(void)
 	                 net_gethostbyname_first_ips(hostname, G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT,
 	                                             &ip4, &ip6) == 0;
 
-	if (source_host_ok)
+	if (source_host_ok) {
 		save_ips(&ip4, &ip6, &source_host_ip4, &source_host_ip6);
-	else {
-                g_free_and_null(source_host_ip4);
-                g_free_and_null(source_host_ip6);
+	} else {
+		g_free_and_null(source_host_ip4);
+		g_free_and_null(source_host_ip6);
 	}
 }
 
diff --git a/src/core/servers.c b/src/core/servers.c
index e62f09ec..04852104 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -338,16 +338,22 @@ static void server_connect_use_resolved(SERVER_REC *server)
 
 		resolved_ip_unref(iprec);
 	}
+
+	g_free(ip);
 }
 
 static void server_connect_callback_resolved(RESOLVED_IP_REC *iprec, SERVER_REC *server)
 {
-	server->connect_cancellable = NULL;
+	if (server->connect_cancellable != NULL) {
+		g_object_unref(server->connect_cancellable);
+		server->connect_cancellable = NULL;
+	}
 
 	if (server->connrec->resolved_host != NULL) {
 		resolved_ip_unref(server->connrec->resolved_host);
 	}
 	server->connrec->resolved_host = iprec;
+
 	if (iprec->error == NULL && iprec->ailist == NULL) {
 		server->connection_lost = TRUE;
 		server->dns_error = TRUE;

From 221d520c370d5dedfe2f7ab97d76459fc20c7dc1 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Sun, 25 Jan 2026 22:07:44 +0100
Subject: [PATCH 1648/1650] run meson formatter

---
 .muon_fmt.ini                            |  14 +
 docs/help/meson.build                    |   3 +-
 docs/meson.build                         |   3 +-
 meson.build                              | 494 +++++++++++++++++------
 scripts/meson.build                      |   3 +-
 src/core/meson.build                     |  11 +-
 src/fe-common/core/meson.build           |  19 +-
 src/fe-common/irc/dcc/meson.build        |  15 +-
 src/fe-common/irc/meson.build            |  15 +-
 src/fe-common/irc/notifylist/meson.build |  15 +-
 src/fe-fuzz/fe-common/core/meson.build   |   7 +-
 src/fe-fuzz/irc/core/meson.build         |   7 +-
 src/fe-fuzz/meson.build                  |  14 +-
 src/fe-none/meson.build                  |   5 +-
 src/fe-text/meson.build                  |  11 +-
 src/irc/core/meson.build                 |  17 +-
 src/irc/dcc/meson.build                  |  11 +-
 src/irc/flood/meson.build                |  15 +-
 src/irc/notifylist/meson.build           |  11 +-
 src/irc/proxy/meson.build                |   5 +-
 src/lib-config/meson.build               |   9 +-
 src/meson.build                          |   7 +-
 src/otr/meson.build                      |   5 +-
 src/perl/common/meson.build              |  40 +-
 src/perl/irc/meson.build                 |  62 +--
 src/perl/meson.build                     |  29 +-
 src/perl/textui/meson.build              |  33 +-
 src/perl/ui/meson.build                  |  30 +-
 tests/fe-common/core/meson.build         |  14 +-
 tests/fe-text/meson.build                |  13 +-
 tests/irc/core/meson.build               |  24 +-
 tests/irc/flood/meson.build              |  12 +-
 themes/meson.build                       |   3 +-
 33 files changed, 661 insertions(+), 315 deletions(-)
 create mode 100644 .muon_fmt.ini

diff --git a/.muon_fmt.ini b/.muon_fmt.ini
new file mode 100644
index 00000000..47fce5d2
--- /dev/null
+++ b/.muon_fmt.ini
@@ -0,0 +1,14 @@
+# Irssi configuration for muon fmt
+max_line_len = 108
+indent_style = space
+indent_size = 2
+#indent_by = '  '
+space_array = true
+kwargs_force_multiline = true
+wide_colon = true
+no_single_comma_function = true
+insert_final_newline = true
+sort_files = false
+group_arg_value = true
+sticky_parens = true
+continuation_indent = true
diff --git a/docs/help/meson.build b/docs/help/meson.build
index 7fe95d43..6eaa3025 100644
--- a/docs/help/meson.build
+++ b/docs/help/meson.build
@@ -116,6 +116,7 @@ install_data(
     'whowas',
     'window',
   ),
-  install_dir : helpdir)
+  install_dir : helpdir,
+)
 
 # subdir('in')
diff --git a/docs/meson.build b/docs/meson.build
index a58faed3..f6761200 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -13,6 +13,7 @@ install_data(
     'startup-HOWTO.html',
     'startup-HOWTO.txt',
   ),
-  install_dir : docdir)
+  install_dir : docdir,
+)
 
 subdir('help')
diff --git a/meson.build b/meson.build
index c7eed79d..d6c582b5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,10 @@
-project('irssi', 'c',
+project(
+  'irssi',
+  'c',
   version : '1.5-head',
   meson_version : '>=0.53',
-  default_options : ['warning_level=1'])
+  default_options : [ 'warning_level=1' ],
+)
 
 ############################
 ############################
@@ -11,11 +14,11 @@ glib_pcre2_internal_version = 'pcre2-10.40'
 glib_libffi_internal_version = 'libffi'
 cc = meson.get_compiler('c')
 rootinc = include_directories('.')
-dep = []
-textui_dep = []
+dep = [  ]
+textui_dep = [  ]
 need_dl_cross_link = false
 need_dl_cross_link_main = false
-dl_cross_irssi_main = []
+dl_cross_irssi_main = [  ]
 # The Android environment requires that all modules are linked to each other.
 # See https://github.com/android/ndk/issues/201
 if host_machine.system() == 'android'
@@ -66,14 +69,33 @@ if fs.exists('config.status') or fs.exists('irssi-version.h') or fs.exists('defa
 endif
 
 UNSET = '=INVALID='
-UNSET_ARR = [UNSET]
+UNSET_ARR = [ UNSET ]
 
-chat_modules = ['irc']
+chat_modules = [ 'irc' ]
 
-run_command('mkdir', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir, check : false)
+run_command(
+  'mkdir',
+  meson.current_build_dir() / incdir,
+  check : false,
+)
+run_command(
+  'ln',
+  '-s', meson.current_source_dir() / 'src',
+  meson.current_build_dir() / incdir,
+  check : false,
+)
+run_command(
+  'ln',
+  '-s', meson.current_build_dir() / 'irssi-config.h',
+  meson.current_build_dir() / incdir,
+  check : false,
+)
+run_command(
+  'ln',
+  '-s', meson.current_build_dir() / 'irssi-version.h',
+  meson.current_build_dir() / incdir,
+  check : false,
+)
 
 def_moduledir  = '-D' + 'MODULEDIR'  + '="' + (get_option('prefix') / moduledir) + '"'
 def_sysconfdir = '-D' + 'SYSCONFDIR' + '="' + (get_option('prefix') / get_option('sysconfdir')) + '"'
@@ -83,12 +105,11 @@ def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir)
 
 def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
 
-
-module_suffix = []
-perl_module_suffix = []
+module_suffix = [  ]
+perl_module_suffix = [  ]
 # Meson uses the wrong module extensions on Mac.
 # https://gitlab.gnome.org/GNOME/glib/issues/520
-if ['darwin', 'ios'].contains(host_machine.system())
+if [ 'darwin', 'ios' ].contains(host_machine.system())
   module_suffix = 'so'
   perl_module_suffix = 'bundle'
 endif
@@ -97,13 +118,20 @@ endif
 # Help files #
 ##############
 
-build_perl = find_program('perl', native : true)
+build_perl = find_program(
+  'perl',
+  native : true,
+)
 if meson.is_cross_build()
   cross_perl = find_program('perl')
 else
   cross_perl = build_perl
 endif
-run_command(build_perl, files('utils/syntax.pl'), check : true)
+run_command(
+  build_perl,
+  files('utils/syntax.pl'),
+  check : true,
+)
 
 ###################
 # irssi-version.h #
@@ -111,12 +139,12 @@ run_command(build_perl, files('utils/syntax.pl'), check : true)
 
 env = find_program('env')
 irssi_version_sh = find_program('utils/irssi-version.sh')
-irssi_version_h = custom_target('irssi-version.h',
+irssi_version_h = custom_target(
+  'irssi-version.h',
   build_by_default : true,
   build_always_stale : true,
   capture : true,
-  command : [env, 'VERSION=' + meson.project_version(),
-    irssi_version_sh, meson.current_source_dir()],
+  command : [ env, 'VERSION=' + meson.project_version(), irssi_version_sh, meson.current_source_dir() ],
   output : 'irssi-version.h',
   install : true,
   install_dir : includedir / incdir,
@@ -127,22 +155,24 @@ irssi_version_h = custom_target('irssi-version.h',
 ####################
 
 file2header = find_program('utils/file2header.sh')
-default_config_h = custom_target('default-config.h',
+default_config_h = custom_target(
+  'default-config.h',
   input : files('irssi.conf'),
   output : 'default-config.h',
   capture : true,
-  command : [file2header, '@INPUT@', 'default_config'],
+  command : [ file2header, '@INPUT@', 'default_config' ],
 )
 
 ###################
 # default-theme.h #
 ###################
 
-default_theme_h = custom_target('default-theme.h',
+default_theme_h = custom_target(
+  'default-theme.h',
   input : files('themes/default.theme'),
   output : 'default-theme.h',
   capture : true,
-  command : [file2header, '@INPUT@', 'default_theme'],
+  command : [ file2header, '@INPUT@', 'default_theme' ],
 )
 
 ################
@@ -151,12 +181,18 @@ default_theme_h = custom_target('default-theme.h',
 
 #### inet_addr ####
 inet_addr_found = false
-foreach inet_addr_provider : ['', 'nsl']
-  prov_lib = []
+foreach inet_addr_provider : [ '', 'nsl' ]
+  prov_lib = [  ]
   if inet_addr_provider != ''
-    prov_lib += cc.find_library(inet_addr_provider, required : false)
+    prov_lib += cc.find_library(
+      inet_addr_provider,
+      required : false,
+    )
   endif
-  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('inet_addr', dependencies : prov_lib)
+  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function(
+      'inet_addr',
+      dependencies : prov_lib,
+    )
     dep += prov_lib
     inet_addr_found = true
     break
@@ -168,12 +204,18 @@ endif
 
 #### socket ####
 socket_found = false
-foreach socket_provider : ['', 'socket', 'network']
-  prov_lib = []
+foreach socket_provider : [ '', 'socket', 'network' ]
+  prov_lib = [  ]
   if socket_provider != ''
-    prov_lib += cc.find_library(socket_provider, required : false)
+    prov_lib += cc.find_library(
+      socket_provider,
+      required : false,
+    )
   endif
-  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('socket', dependencies : prov_lib)
+  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function(
+      'socket',
+      dependencies : prov_lib,
+    )
     dep += prov_lib
     socket_found = true
     break
@@ -183,7 +225,7 @@ if not socket_found
   error('socket not found')
 endif
 
-built_src = []
+built_src = [  ]
 glib_internal = false
 message('*** If you don\'t have GLib, you can run meson ... -Dinstall-glib=yes')
 message('*** to download and build it automatically')
@@ -191,54 +233,82 @@ message('*** Or alternatively install your distribution\'s package')
 message('*** On Debian: sudo apt-get install libglib2.0-dev')
 message('*** On Redhat: dnf install glib2-devel')
 if not require_glib_internal
-  glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency, include_type : 'system')
+  glib_dep = dependency(
+    'glib-2.0',
+    version : '>=2.32',
+    required : not want_glib_internal,
+    static : want_static_dependency,
+    include_type : 'system',
+  )
 else
-  glib_dep = dependency('', required : false)
+  glib_dep = dependency(
+    '',
+    required : false,
+  )
 endif
 if not glib_dep.found()
   glib_internal = true
   meson_cmd = find_program('meson')
   ninja = find_program('ninja')
 
-  glib_internal_download_t = custom_target('glib-internal-download',
+  glib_internal_download_t = custom_target(
+    'glib-internal-download',
     command : [ meson_cmd, 'subprojects', 'download', 'glib', '--sourcedir', meson.current_source_dir() ],
     console : true,
-    output : ['glib-internal-download'],
+    output : [ 'glib-internal-download' ],
   )
 
   glib_internal_dependencies = [
     dependency('threads'),
   ]
-  glib_internal_configure_args = []
+  glib_internal_configure_args = [  ]
 
   glib_internal_usr_local = false
   if not cc.has_function('iconv_open')
-    prov_lib = cc.find_library('iconv', required : false)
+    prov_lib = cc.find_library(
+      'iconv',
+      required : false,
+    )
     if not prov_lib.found()
-      prov_lib = cc.find_library('iconv', dirs : '/usr/local/lib')
+      prov_lib = cc.find_library(
+        'iconv',
+        dirs : '/usr/local/lib',
+      )
       glib_internal_usr_local = true
     endif
     glib_internal_dependencies += prov_lib
   endif
 
   if not cc.has_function('ngettext')
-    prov_lib = cc.find_library('intl', required : false)
+    prov_lib = cc.find_library(
+      'intl',
+      required : false,
+    )
     if not prov_lib.found()
-      prov_lib = cc.find_library('intl', dirs : '/usr/local/lib')
+      prov_lib = cc.find_library(
+        'intl',
+        dirs : '/usr/local/lib',
+      )
       glib_internal_usr_local = true
     endif
     glib_internal_dependencies += prov_lib
   endif
 
   if glib_internal_usr_local
-    glib_internal_configure_args += ['-Dc_args=-I/usr/local/include', '-Dc_link_args=-L/usr/local/lib']
+    glib_internal_configure_args += [ '-Dc_args=-I/usr/local/include', '-Dc_link_args=-L/usr/local/lib' ]
   endif
 
   if not cc.has_function('getxattr') or not cc.has_header('sys/xattr.h')
     if cc.has_header_symbol('attr/xattr.h', 'getxattr')
-      prov_lib = cc.find_library('xattr', required : false)
+      prov_lib = cc.find_library(
+        'xattr',
+        required : false,
+      )
     else
-      prov_lib = dependency('', required : false)
+      prov_lib = dependency(
+        '',
+        required : false,
+      )
     endif
     if prov_lib.found()
       glib_internal_dependencies += prov_lib
@@ -247,28 +317,41 @@ if not glib_dep.found()
     endif
   endif
 
-  glib_internal_configure_t = custom_target('glib-internal-configure',
-    command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
+  glib_internal_configure_t = custom_target(
+    'glib-internal-configure',
+    command : [
+      meson_cmd,
+      'setup',
+      '--prefix=/irssi-glib-internal',
       '--buildtype=' + get_option('buildtype'),
-      '-Dlibmount=disabled', '-Dselinux=disabled', '-Ddefault_library=static', '-Dforce_fallback_for=pcre2,libffi',
+      '-Dlibmount=disabled',
+      '-Dselinux=disabled',
+      '-Ddefault_library=static',
+      '-Dforce_fallback_for=pcre2,libffi',
       glib_internal_configure_args,
       (meson.current_build_dir() / 'build-subprojects' / 'glib'),
-      (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
+      (meson.current_source_dir() / 'subprojects' / glib_internal_version),
+    ],
     console : true,
-    output : ['glib-internal-configure'],
-    depends : glib_internal_download_t,)
-  glib_internal_build_t = custom_target('glib-internal-build',
-    command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
+    output : [ 'glib-internal-configure' ],
+    depends : glib_internal_download_t,
+  )
+  glib_internal_build_t = custom_target(
+    'glib-internal-build',
+    command : [
+      ninja,
+      '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
       'subprojects' / glib_libffi_internal_version / 'src' / 'libffi.a',
       'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
       'glib' / 'libglib-2.0.a',
       'gmodule' / 'libgmodule-2.0.a',
       'gobject' / 'libgobject-2.0.a',
       'gio' / 'libgio-2.0.a',
-      ],
+    ],
     console : true,
-    output : ['glib-internal-build'],
-    depends : glib_internal_configure_t,)
+    output : [ 'glib-internal-build' ],
+    depends : glib_internal_configure_t,
+  )
   glib_dep = declare_dependency(
     dependencies : glib_internal_dependencies,
     sources : glib_internal_build_t,
@@ -283,28 +366,37 @@ if not glib_dep.found()
     ],
   )
   built_src += glib_internal_build_t
-  libdl_dep = []
-  prov_lib = cc.find_library('dl', required : false)
-  if prov_lib.found() and cc.has_function('dlopen', dependencies : prov_lib)
+  libdl_dep = [  ]
+  prov_lib = cc.find_library(
+    'dl',
+    required : false,
+  )
+  if prov_lib.found() and cc.has_function(
+      'dlopen',
+      dependencies : prov_lib,
+    )
     libdl_dep += prov_lib
   endif
-  gmodule_dep = declare_dependency(sources : glib_internal_build_t,
+  gmodule_dep = declare_dependency(
+    sources : glib_internal_build_t,
     dependencies : libdl_dep,
     compile_args : [
       '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
     ],
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
   )
-  gobject_dep = declare_dependency(sources : glib_internal_build_t,
+  gobject_dep = declare_dependency(
+    sources : glib_internal_build_t,
     compile_args : [
       '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib'),
     ],
     link_args : [
       meson.current_build_dir() / 'build-subprojects' / 'glib' / 'subprojects' / glib_libffi_internal_version / 'src' / 'libffi.a',
-      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gobject' / 'libgobject-2.0.a'
+      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gobject' / 'libgobject-2.0.a',
     ],
   )
-  gio_dep = declare_dependency(sources : glib_internal_build_t,
+  gio_dep = declare_dependency(
+    sources : glib_internal_build_t,
     dependencies : cc.find_library('z'),
     compile_args : [
       '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gio'),
@@ -313,9 +405,21 @@ if not glib_dep.found()
     link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gio' / 'libgio-2.0.a' ],
   )
 else
-  gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency, include_type : 'system')
-  gobject_dep = dependency('gobject-2.0', static : want_static_dependency, include_type : 'system')
-  gio_dep = dependency('gio-2.0', static : want_static_dependency, include_type : 'system')
+  gmodule_dep = dependency(
+    'gmodule-2.0',
+    static : want_static_dependency,
+    include_type : 'system',
+  )
+  gobject_dep = dependency(
+    'gobject-2.0',
+    static : want_static_dependency,
+    include_type : 'system',
+  )
+  gio_dep = dependency(
+    'gio-2.0',
+    static : want_static_dependency,
+    include_type : 'system',
+  )
 endif
 dep += glib_dep
 dep += gmodule_dep
@@ -323,10 +427,17 @@ dep += gobject_dep
 dep += gio_dep
 
 if glib_internal and want_static_dependency and want_fuzzer
-  openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled'])
+  openssl_proj = subproject(
+    'openssl',
+    default_options : [ 'default_library=static', 'asm=disabled' ],
+  )
   openssl_dep = openssl_proj.get_variable('openssl_dep')
 else
-  openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system')
+  openssl_dep = dependency(
+    'openssl',
+    static : want_static_dependency,
+    include_type : 'system',
+  )
 endif
 dep += openssl_dep
 
@@ -335,10 +446,16 @@ dep += openssl_dep
 ############
 
 have_libutf8proc = false
-libutf8proc = []
+libutf8proc = [  ]
 if want_libutf8proc
-  libutf8proc = cc.find_library('utf8proc', required : require_libutf8proc)
-  have_libutf8proc = cc.has_function('utf8proc_version', dependencies : libutf8proc)
+  libutf8proc = cc.find_library(
+    'utf8proc',
+    required : require_libutf8proc,
+  )
+  have_libutf8proc = cc.has_function(
+    'utf8proc_version',
+    dependencies : libutf8proc,
+  )
   if have_libutf8proc
     dep += libutf8proc
   endif
@@ -353,9 +470,15 @@ endif
 
 if want_textui
   setupterm_found = false
-  foreach setupterm_provider : ['tinfo', 'ncursesw', 'ncurses', 'terminfo']
-    prov_lib = cc.find_library(setupterm_provider, required : false)
-    if prov_lib.found() and cc.has_function('setupterm', dependencies : prov_lib)
+  foreach setupterm_provider : [ 'tinfo', 'ncursesw', 'ncurses', 'terminfo' ]
+    prov_lib = cc.find_library(
+      setupterm_provider,
+      required : false,
+    )
+    if prov_lib.found() and cc.has_function(
+        'setupterm',
+        dependencies : prov_lib,
+      )
       textui_dep += prov_lib
       setupterm_found = true
       break
@@ -372,15 +495,20 @@ endif
 
 have_perl = false
 if want_perl
-  perl_cflags = []
-  perl_ldflags = []
-  perl_rpath_flags = []
+  perl_cflags = [  ]
+  perl_ldflags = [  ]
+  perl_rpath_flags = [  ]
   perl_rpath = ''
 
   #### ccopts ####
   perl_ccopts = meson.get_cross_property('perl_ccopts', UNSET_ARR)
   if perl_ccopts == UNSET_ARR
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts', check : true)
+    res = run_command(
+      cross_perl,
+      '-MExtUtils::Embed',
+      '-e', 'ccopts',
+      check : true,
+    )
     perl_ccopts = res.stdout().strip().split()
   endif
   foreach fl : perl_ccopts
@@ -397,10 +525,15 @@ if want_perl
   #### ldopts ####
   perl_ldopts = meson.get_cross_property('perl_ldopts', UNSET_ARR)
   if perl_ldopts == UNSET_ARR
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts', check : true)
+    res = run_command(
+      cross_perl,
+      '-MExtUtils::Embed',
+      '-e', 'ldopts',
+      check : true,
+    )
     perl_ldopts = res.stdout().strip().split()
   endif
-  skip_libs = ['-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic']
+  skip_libs = [ '-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic' ]
   foreach fl : perl_ldopts
     if not fl.startswith('-A') and not skip_libs.contains(fl)
       if fl.startswith('-Wl,-rpath,')
@@ -414,18 +547,26 @@ if want_perl
 
   perl_version = meson.get_cross_property('perl_version', UNSET)
   if perl_version == UNSET
-    perl_version = run_command(cross_perl, '-V::version:', check : true).stdout().split('\'')[1]
+    perl_version = run_command(
+      cross_perl,
+      '-V::version:',
+      check : true,
+    ).stdout().split('\'')[1]
   endif
 
   # disable clang warning
   if perl_version.version_compare('<5.35.2')
     perl_cflags += cc.get_supported_arguments('-Wno-compound-token-split-by-macro')
   endif
-  perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
-    version : perl_version)
+  perl_dep = declare_dependency(
+    compile_args : perl_cflags,
+    link_args : perl_ldflags,
+    version : perl_version,
+  )
 
   ####
-  if not cc.links('''
+  if not cc.links(
+      '''
 #include <EXTERN.h>
 #include <perl.h>
 int main()
@@ -433,8 +574,10 @@ int main()
   perl_alloc();
   return 0;
 }
-''', args : perl_cflags + perl_ldflags + perl_rpath_flags,
-     name : 'working Perl support')
+''',
+      args : perl_cflags + perl_ldflags + perl_rpath_flags,
+      name : 'working Perl support',
+    )
     if require_perl
       error('error linking with perl libraries')
     else
@@ -443,9 +586,15 @@ int main()
   else
     xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
     if xsubpp_file_c == UNSET
-      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r', check : true).stdout()
+      xsubpp_file_c = run_command(
+        build_perl,
+        '-MExtUtils::ParseXS',
+        '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r',
+        check : true,
+      ).stdout()
     endif
-    xsubpp = generator(build_perl,
+    xsubpp = generator(
+      build_perl,
       output : '@BASENAME@.c',
       capture : true,
       arguments : [ xsubpp_file_c, '@EXTRA_ARGS@', '@INPUT@' ],
@@ -453,31 +602,44 @@ int main()
     xsubpp_file = files(xsubpp_file_c)
 
     if with_perl_lib == 'module'
-      perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}', check : true).stdout()
+      perl_install_base = run_command(
+        build_perl,
+        '-MText::ParseWords=shellwords',
+        '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}',
+        check : true,
+      ).stdout()
       if perl_install_base == ''
         with_perl_lib = ''
       endif
     endif
     if with_perl_lib == ''
-      if get_option('prefix') in ['/usr/local', 'C:/']
+      if get_option('prefix') in [ '/usr/local', 'C:/' ]
         with_perl_lib = 'site'
-      elif get_option('prefix') in ['/usr']
+      elif get_option('prefix') in [ '/usr' ]
         with_perl_lib = 'vendor'
       endif
     endif
     perlmoddir = ''
-    if with_perl_lib in ['site', 'vendor', 'module']
+    if with_perl_lib in [ 'site', 'vendor', 'module' ]
       set_perl_use_lib = false
       perl_library_dir = with_perl_lib + ' default'
-      if with_perl_lib in ['site', 'vendor']
+      if with_perl_lib in [ 'site', 'vendor' ]
         perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', UNSET)
         if perlmoddir == UNSET
-          perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:', check : true).stdout().split('\'')[1]
+          perlmoddir = run_command(
+            cross_perl,
+            '-V::install' + with_perl_lib + 'arch:',
+            check : true,
+          ).stdout().split('\'')[1]
         endif
       elif with_perl_lib == 'module'
         perl_archname = meson.get_cross_property('perl_archname', UNSET)
         if perl_archname == UNSET
-          perl_archname = run_command(cross_perl, '-V::archname:', check : true).stdout().split('\'')[1]
+          perl_archname = run_command(
+            cross_perl,
+            '-V::archname:',
+            check : true,
+          ).stdout().split('\'')[1]
         endif
         perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
       endif
@@ -498,7 +660,12 @@ int main()
     if set_perl_use_lib
       perl_inc = meson.get_cross_property('perl_inc', UNSET_ARR)
       if perl_inc == UNSET_ARR
-        set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib, check : false).returncode() != 0
+        set_perl_use_lib = run_command(
+          cross_perl,
+          '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC',
+          perl_use_lib,
+          check : false,
+        ).returncode() != 0
       else
         set_perl_use_lib = not perl_inc.contains(perl_use_lib)
       endif
@@ -524,8 +691,20 @@ endif
 
 have_otr = false
 if want_otr
-  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency, include_type : 'system')
-  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency, include_type : 'system')
+  libgcrypt = dependency(
+    'libgcrypt',
+    version : '>=1.2.0',
+    required : require_otr,
+    static : want_static_dependency,
+    include_type : 'system',
+  )
+  libotr = dependency(
+    'libotr',
+    version : '>=4.1.0',
+    required : require_otr,
+    static : want_static_dependency,
+    include_type : 'system',
+  )
   if libgcrypt.found() and libotr.found()
     dep += libgcrypt
     dep += libotr
@@ -539,9 +718,19 @@ endif
 
 have_capsicum = false
 if want_capsicum
-  if cc.has_function('cap_enter', dependencies : cc.find_library('c'))
-    libnv = cc.find_library('nv', required : require_capsicum)
-    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv, prefix : '#include <sys/nv.h>')
+  if cc.has_function(
+      'cap_enter',
+      dependencies : cc.find_library('c'),
+    )
+    libnv = cc.find_library(
+      'nv',
+      required : require_capsicum,
+    )
+    nvlist_create_found = libnv.found() and cc.has_function(
+      'nvlist_create',
+      dependencies : libnv,
+      prefix : '#include <sys/nv.h>',
+    )
     if nvlist_create_found
       dep += libnv
       have_capsicum = true
@@ -558,11 +747,14 @@ if want_capsicum
 endif
 
 # dependency helper sets
-dep_cflagsonly = []
+dep_cflagsonly = [  ]
 foreach d : dep
-  dep_cflagsonly += d.partial_dependency(includes : true, compile_args : true)
+  dep_cflagsonly += d.partial_dependency(
+    includes : true,
+    compile_args : true,
+  )
 endforeach
-dl_cross_dep = []
+dl_cross_dep = [  ]
 if need_dl_cross_link
   dl_cross_dep = dep
 endif
@@ -573,11 +765,19 @@ endif
 
 conf = configuration_data()
 
-conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support')
+conf.set(
+  'HAVE_CAPSICUM',
+  have_capsicum,
+  description : 'Build with Capsicum support',
+)
 conf.set('HAVE_GMODULE', true)
 conf.set('TERM_TRUECOLOR', true)
 conf.set('USE_GREGEX', true)
-conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.')
+conf.set10(
+  '_DARWIN_USE_64_BIT_INODE',
+  true,
+  description : 'Enable large inode numbers on Mac OS X 10.5.',
+)
 conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix'))
 
 headers = [
@@ -591,31 +791,50 @@ headers = [
 ]
 foreach h : headers
   if cc.has_header(h)
-    conf.set('HAVE_' + h.underscorify().to_upper(), 1, description : 'Define to 1 if you have the <' + h + '> header file.')
+    conf.set(
+      'HAVE_' + h.underscorify().to_upper(),
+      1,
+      description : 'Define to 1 if you have the <' + h + '> header file.',
+    )
   endif
 endforeach
 
 if want_textui and conf.get('HAVE_TERM_H', 0) == 1
-  if cc.links('''
+  if cc.links(
+      '''
 #include <stdio.h>
 #include <term.h>
 int main (void) {
   return tputs("x", 1, putchar);
 }
-''', args : '-pedantic-errors', dependencies : textui_dep, name : 'Curses working')
+''',
+      args : '-pedantic-errors',
+      dependencies : textui_dep,
+      name : 'Curses working',
+    )
     # ok
   else
     has_curses_h = cc.has_header('curses.h')
-    if has_curses_h and cc.links('''
+    if has_curses_h and cc.links(
+        '''
 #include <curses.h>
 #include <term.h>
 int main (void) {
   return tputs("x", 1, putchar);
 }
-''', args : '-pedantic-errors', dependencies : textui_dep, name : 'Curses working with curses.h')
-      conf.set('NEED_CURSES_H', 1, description : 'tputs needs curses.h')
+''',
+        args : '-pedantic-errors',
+        dependencies : textui_dep,
+        name : 'Curses working with curses.h',
+      )
+      conf.set(
+        'NEED_CURSES_H',
+        1,
+        description : 'tputs needs curses.h',
+      )
     else
-      if has_curses_h and cc.links('''
+      if has_curses_h and cc.links(
+          '''
 #include <curses.h>
 #include <term.h>
 int char_putchar (char c) {
@@ -624,9 +843,21 @@ int char_putchar (char c) {
 int main (void) {
   return tputs("x", 1, char_putchar);
 }
-''', args : '-pedantic-errors', dependencies : textui_dep, name : 'Curses with tputs third argument arg char')
-        conf.set('NEED_CURSES_H', 1, description : 'tputs needs curses.h')
-        conf.set('TPUTS_SVR4', 1, description : 'third argument of tputs has the type int (*)(char)')
+''',
+          args : '-pedantic-errors',
+          dependencies : textui_dep,
+          name : 'Curses with tputs third argument arg char',
+        )
+        conf.set(
+          'NEED_CURSES_H',
+          1,
+          description : 'tputs needs curses.h',
+        )
+        conf.set(
+          'TPUTS_SVR4',
+          1,
+          description : 'third argument of tputs has the type int (*)(char)',
+        )
       else
         error('could not link terminfo')
       endif
@@ -638,21 +869,32 @@ conf.set('HAVE_LIBUTF8PROC', have_libutf8proc)
 conf.set_quoted('PACKAGE_VERSION', package_version)
 conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
 
-configure_file(output : 'irssi-config.h',
+configure_file(
+  output : 'irssi-config.h',
   configuration : conf,
-  install_dir : includedir / incdir)
+  install_dir : includedir / incdir,
+)
 
 ##########
 # CFLAGS #
 ##########
 
 #### warnings ####
-add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c')
+add_project_arguments(
+  cc.get_supported_arguments('-Werror=declaration-after-statement'),
+  language : 'c',
+)
 
 #### personality ####
-add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c')
+add_project_arguments(
+  cc.get_supported_arguments('-fno-strict-aliasing'),
+  language : 'c',
+)
 if get_option('buildtype').contains('debug')
-  add_project_arguments(cc.get_supported_arguments('-fno-omit-frame-pointer'), language : 'c')
+  add_project_arguments(
+    cc.get_supported_arguments('-fno-omit-frame-pointer'),
+    language : 'c',
+  )
 endif
 
 if want_fuzzer
@@ -660,7 +902,10 @@ if want_fuzzer
     if not cc.has_argument('-fsanitize=fuzzer-no-link')
       error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
     endif
-    add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
+    add_project_arguments(
+      '-fsanitize=fuzzer-no-link',
+      language : 'c',
+    )
   endif
   if fuzzer_link_language != 'c'
     add_languages(fuzzer_link_language)
@@ -672,7 +917,7 @@ endif
 ##############
 
 pc = import('pkgconfig')
-pc_requires = []
+pc_requires = [  ]
 if not glib_internal
   pc_requires += glib_dep
 endif
@@ -687,7 +932,8 @@ if signalsfile.startswith('/')
 else
   signalsfile = '${prefix}' / signalsfile
 endif
-pc.generate(filebase : 'irssi-1',
+pc.generate(
+  filebase : 'irssi-1',
   name : 'Irssi',
   description : 'Irssi chat client',
   version : package_version,
diff --git a/scripts/meson.build b/scripts/meson.build
index 072ac3ea..10fdc34b 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -11,4 +11,5 @@ install_data(
     'scriptassist.pl',
     'usercount.pl',
   ),
-  install_dir : scriptdir)
+  install_dir : scriptdir,
+)
diff --git a/src/core/meson.build b/src/core/meson.build
index 56b6ec77..521015d4 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -3,10 +3,11 @@
 if have_capsicum
   core_capsicum_source = files('capsicum.c')
 else
-  core_capsicum_source = []
+  core_capsicum_source = [  ]
 endif
 
-libcore_a = static_library('core',
+libcore_a = static_library(
+  'core',
   files(
     'args.c',
     'channels-setup.c',
@@ -63,7 +64,8 @@ libcore_a = static_library('core',
     def_moduledir,
     def_sysconfdir,
   ],
-  dependencies : dep)
+  dependencies : dep,
+)
 
 install_headers(
   files(
@@ -122,4 +124,5 @@ install_headers(
     'window-item-def.h',
     'write-buffer.h',
   ),
-  subdir : incdir / 'src' / 'core')
+  subdir : incdir / 'src' / 'core',
+)
diff --git a/src/fe-common/core/meson.build b/src/fe-common/core/meson.build
index 73cb156a..a84f12eb 100644
--- a/src/fe-common/core/meson.build
+++ b/src/fe-common/core/meson.build
@@ -3,7 +3,7 @@
 if have_capsicum
   fe_common_core_capsicum_source = files('fe-capsicum.c')
 else
-  fe_common_core_capsicum_source = []
+  fe_common_core_capsicum_source = [  ]
 endif
 
 fe_common_core_sources = [
@@ -43,10 +43,11 @@ fe_common_core_sources = [
   + [
     default_theme_h,
     irssi_version_h,
-  ]
+  ],
 ]
 
-libfe_common_core_a = static_library('fe_common_core',
+libfe_common_core_a = static_library(
+  'fe_common_core',
   fe_common_core_sources,
   include_directories : rootinc,
   implicit_include_directories : false,
@@ -54,10 +55,12 @@ libfe_common_core_a = static_library('fe_common_core',
     def_helpdir,
     def_themesdir,
   ],
-  dependencies : dep)
+  dependencies : dep,
+)
 
 if want_fuzzer
-  libfuzzer_fe_common_core_a = static_library('fuzzer_fe_common_core',
+  libfuzzer_fe_common_core_a = static_library(
+    'fuzzer_fe_common_core',
     fe_common_core_sources,
     include_directories : rootinc,
     implicit_include_directories : false,
@@ -66,7 +69,8 @@ if want_fuzzer
       def_themesdir,
       def_suppress_printf_fallback,
     ],
-    dependencies : dep)
+    dependencies : dep,
+  )
 endif
 
 install_headers(
@@ -96,4 +100,5 @@ install_headers(
     'window-items.h',
     'windows-layout.h',
   ),
-  subdir : incdir / 'src' / 'fe-common' / 'core')
+  subdir : incdir / 'src' / 'fe-common' / 'core',
+)
diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build
index 5edf2477..b347cd00 100644
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-libfe_irc_dcc_a = static_library('fe_irc_dcc',
+libfe_irc_dcc_a = static_library(
+  'fe_irc_dcc',
   files(
     'fe-dcc-chat-messages.c',
     'fe-dcc-chat.c',
@@ -16,14 +17,17 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
     def_helpdir,
     def_sysconfdir,
   ],
-  dependencies : dep)
-shared_library('fe_irc_dcc',
+  dependencies : dep,
+)
+shared_library(
+  'fe_irc_dcc',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
   link_whole : libfe_irc_dcc_a,
-  override_options : ['b_lundef=false'])
+  override_options : [ 'b_lundef=false' ],
+)
 
 install_headers(
   files(
@@ -31,4 +35,5 @@ install_headers(
     'module-formats.h',
     'module.h',
   ),
-  subdir : incdir / 'src' / 'fe-common' / 'irc' / 'dcc')
+  subdir : incdir / 'src' / 'fe-common' / 'irc' / 'dcc',
+)
diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build
index 518dfbfa..b4d78032 100644
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-libfe_common_irc_a = static_library('fe_common_irc',
+libfe_common_irc_a = static_library(
+  'fe_common_irc',
   files(
     'fe-cap.c',
     'fe-common-irc.c',
@@ -27,14 +28,17 @@ libfe_common_irc_a = static_library('fe_common_irc',
     def_helpdir,
     def_themesdir,
   ],
-  dependencies : dep)
-shared_library('fe_common_irc',
+  dependencies : dep,
+)
+shared_library(
+  'fe_common_irc',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
   link_whole : libfe_common_irc_a,
-  override_options : ['b_lundef=false'])
+  override_options : [ 'b_lundef=false' ],
+)
 
 install_headers(
   files(
@@ -43,7 +47,8 @@ install_headers(
     'module-formats.h',
     'module.h',
   ),
-  subdir : incdir / 'src' / 'fe-common' / 'irc')
+  subdir : incdir / 'src' / 'fe-common' / 'irc',
+)
 
 subdir('dcc')
 subdir('notifylist')
diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build
index cdb5168b..894c1d89 100644
--- a/src/fe-common/irc/notifylist/meson.build
+++ b/src/fe-common/irc/notifylist/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
+libfe_irc_notifylist_a = static_library(
+  'fe_irc_notifylist',
   files(
     'fe-notifylist.c',
     'module-formats.c',
@@ -11,18 +12,22 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
     def_helpdir,
     def_sysconfdir,
   ],
-  dependencies : dep)
-shared_library('fe_irc_notifylist',
+  dependencies : dep,
+)
+shared_library(
+  'fe_irc_notifylist',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_notifylist + dl_cross_irssi_main,
   link_whole : libfe_irc_notifylist_a,
-  override_options : ['b_lundef=false'])
+  override_options : [ 'b_lundef=false' ],
+)
 
 install_headers(
   files(
     'module-formats.h',
     'module.h',
   ),
-  subdir : incdir / 'src' / 'fe-common' / 'irc' / 'notifylist')
+  subdir : incdir / 'src' / 'fe-common' / 'irc' / 'notifylist',
+)
diff --git a/src/fe-fuzz/fe-common/core/meson.build b/src/fe-fuzz/fe-common/core/meson.build
index 893f5937..af9dea6e 100644
--- a/src/fe-fuzz/fe-common/core/meson.build
+++ b/src/fe-fuzz/fe-common/core/meson.build
@@ -1,5 +1,6 @@
 # this file is part of irssi
-executable('theme-load-fuzz',
+executable(
+  'theme-load-fuzz',
   files(
     '../../null-logger.c',
     'theme-load.c',
@@ -10,12 +11,12 @@ executable('theme-load-fuzz',
     libcore_a,
     libfuzzer_fe_common_core_a,
   ],
-  link_args : [fuzzer_lib],
+  link_args : [ fuzzer_lib ],
   link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,
-  dependencies : dep
+  dependencies : dep,
 )
 
 # noinst_headers = files(
diff --git a/src/fe-fuzz/irc/core/meson.build b/src/fe-fuzz/irc/core/meson.build
index 730c9240..65d316d3 100644
--- a/src/fe-fuzz/irc/core/meson.build
+++ b/src/fe-fuzz/irc/core/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-executable('event-get-params-fuzz',
+executable(
+  'event-get-params-fuzz',
   files(
     '../../null-logger.c',
     'event-get-params.c',
@@ -12,12 +13,12 @@ executable('event-get-params-fuzz',
     libirc_core_a,
     libfuzzer_fe_common_core_a,
   ],
-  link_args : [fuzzer_lib],
+  link_args : [ fuzzer_lib ],
   link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,
-  dependencies : dep
+  dependencies : dep,
 )
 
 # noinst_headers = files(
diff --git a/src/fe-fuzz/meson.build b/src/fe-fuzz/meson.build
index 5ab19651..55071a30 100644
--- a/src/fe-fuzz/meson.build
+++ b/src/fe-fuzz/meson.build
@@ -3,7 +3,8 @@
 subdir('irc')
 subdir('fe-common')
 
-executable('irssi-fuzz',
+executable(
+  'irssi-fuzz',
   files(
     'null-logger.c',
     'irssi.c',
@@ -14,15 +15,16 @@ executable('irssi-fuzz',
     libcore_a,
     libfuzzer_fe_common_core_a,
   ],
-  link_args : [fuzzer_lib],
+  link_args : [ fuzzer_lib ],
   link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,
-  dependencies : dep
+  dependencies : dep,
 )
 
-executable('server-fuzz',
+executable(
+  'server-fuzz',
   files(
     'null-logger.c',
     'server.c',
@@ -37,12 +39,12 @@ executable('server-fuzz',
     libfe_irc_dcc_a,
     libfe_irc_notifylist_a,
   ],
-  link_args : [fuzzer_lib],
+  link_args : [ fuzzer_lib ],
   link_language : fuzzer_link_language,
   include_directories : rootinc,
   implicit_include_directories : false,
   install : true,
-  dependencies : dep
+  dependencies : dep,
 )
 
 # noinst_headers = files(
diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build
index 49cfe517..b6b91b57 100644
--- a/src/fe-none/meson.build
+++ b/src/fe-none/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-fe_none_irssi = executable('botti',
+fe_none_irssi = executable(
+  'botti',
   files(
     'irssi.c',
   ),
@@ -13,7 +14,7 @@ fe_none_irssi = executable('botti',
     libcore_a,
   ],
   install : true,
-  dependencies : dep
+  dependencies : dep,
 )
 if need_dl_cross_link_main
   dl_cross_irssi_main = [ fe_none_irssi ]
diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 1c885b89..6165b461 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-fe_text_irssi = executable('irssi',
+fe_text_irssi = executable(
+  'irssi',
   files(
     #### terminfo_sources ####
     'term-terminfo.c',
@@ -40,10 +41,9 @@ fe_text_irssi = executable('irssi',
     libconfig_a,
     libcore_a,
     libfe_common_core_a,
-    ],
+  ],
   install : true,
-  dependencies : dep
-  + textui_dep
+  dependencies : dep + textui_dep,
 )
 if need_dl_cross_link_main
   dl_cross_irssi_main = [ fe_text_irssi ]
@@ -61,7 +61,8 @@ install_headers(
     'textbuffer-view.h',
     'textbuffer.h',
   ),
-  subdir : incdir / 'src' / 'fe-text')
+  subdir : incdir / 'src' / 'fe-text',
+)
 
 # noinst_headers = files(
 #   'gui-entry.h',
diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build
index 94ed20a2..d1b7db78 100644
--- a/src/irc/core/meson.build
+++ b/src/irc/core/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-libirc_core_a = static_library('irc_core',
+libirc_core_a = static_library(
+  'irc_core',
   files(
     'bans.c',
     'channel-events.c',
@@ -38,16 +39,19 @@ libirc_core_a = static_library('irc_core',
     def_moduledir,
     def_sysconfdir,
   ],
-  dependencies : dep)
-libirc_core_sm = shared_library('irc_core',
+  dependencies : dep,
+)
+libirc_core_sm = shared_library(
+  'irc_core',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_whole : libirc_core_a,
   link_with : dl_cross_irssi_main,
-  override_options : ['b_lundef=false'])
+  override_options : [ 'b_lundef=false' ],
+)
 
-dl_cross_irc_core = []
+dl_cross_irc_core = [  ]
 if need_dl_cross_link
   dl_cross_irc_core += libirc_core_sm
 endif
@@ -77,4 +81,5 @@ install_headers(
     'servers-idle.h',
     'servers-redirect.h',
   ),
-  subdir : incdir / 'src' / 'irc' / 'core')
+  subdir : incdir / 'src' / 'irc' / 'core',
+)
diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build
index 3ab1bace..c09f07b2 100644
--- a/src/irc/dcc/meson.build
+++ b/src/irc/dcc/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-libirc_dcc_sm = shared_library('irc_dcc',
+libirc_dcc_sm = shared_library(
+  'irc_dcc',
   files(
     'dcc-autoget.c',
     'dcc-chat.c',
@@ -18,9 +19,10 @@ libirc_dcc_sm = shared_library('irc_dcc',
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
   dependencies : dep,
-  override_options : ['b_lundef=false'])
+  override_options : [ 'b_lundef=false' ],
+)
 
-dl_cross_irc_dcc = []
+dl_cross_irc_dcc = [  ]
 if need_dl_cross_link
   dl_cross_irc_dcc += libirc_dcc_sm
 endif
@@ -38,4 +40,5 @@ install_headers(
     'dcc.h',
     'module.h',
   ),
-  subdir : incdir / 'src' / 'irc' / 'dcc')
+  subdir : incdir / 'src' / 'irc' / 'dcc',
+)
diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build
index 257e5c11..9df0ef84 100644
--- a/src/irc/flood/meson.build
+++ b/src/irc/flood/meson.build
@@ -1,21 +1,26 @@
 # this file is part of irssi
 
-libirc_flood_a = static_library('irc_flood',
+libirc_flood_a = static_library(
+  'irc_flood',
   files(
     'autoignore.c',
     'flood.c',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
-  dependencies : dep)
-shared_library('irc_flood',
+  dependencies : dep,
+)
+shared_library(
+  'irc_flood',
   name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
   link_whole : libirc_flood_a,
-  override_options : ['b_lundef=false'])
+  override_options : [ 'b_lundef=false' ],
+)
 
 install_headers(
   files('module.h'),
-  subdir : incdir / 'src' / 'irc' / 'flood')
+  subdir : incdir / 'src' / 'irc' / 'flood',
+)
diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build
index 34517b34..75f92810 100644
--- a/src/irc/notifylist/meson.build
+++ b/src/irc/notifylist/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-libirc_notifylist_sm = shared_library('irc_notifylist',
+libirc_notifylist_sm = shared_library(
+  'irc_notifylist',
   files(
     'notify-commands.c',
     'notify-ison.c',
@@ -15,9 +16,10 @@ libirc_notifylist_sm = shared_library('irc_notifylist',
   install_dir : moduledir,
   link_with : dl_cross_irc_core + dl_cross_irssi_main,
   dependencies : dep,
-  override_options : ['b_lundef=false'])
+  override_options : [ 'b_lundef=false' ],
+)
 
-dl_cross_irc_notifylist = []
+dl_cross_irc_notifylist = [  ]
 if need_dl_cross_link
   dl_cross_irc_notifylist += libirc_notifylist_sm
 endif
@@ -28,4 +30,5 @@ install_headers(
     'notify-setup.h',
     'notifylist.h',
   ),
-  subdir : incdir / 'src' / 'irc' / 'notifylist')
+  subdir : incdir / 'src' / 'irc' / 'notifylist',
+)
diff --git a/src/irc/proxy/meson.build b/src/irc/proxy/meson.build
index 4cc2b658..4d5ed554 100644
--- a/src/irc/proxy/meson.build
+++ b/src/irc/proxy/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-shared_library('irc_proxy',
+shared_library(
+  'irc_proxy',
   files(
     'dump.c',
     'listen.c',
@@ -13,7 +14,7 @@ shared_library('irc_proxy',
   install : true,
   install_dir : moduledir,
   dependencies : dep,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 # noinst_headers = files(
diff --git a/src/lib-config/meson.build b/src/lib-config/meson.build
index 2bc094dd..c4818dcd 100644
--- a/src/lib-config/meson.build
+++ b/src/lib-config/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-libconfig_a = static_library('irssi_config',
+libconfig_a = static_library(
+  'irssi_config',
   files(
     'get.c',
     'parse.c',
@@ -9,11 +10,13 @@ libconfig_a = static_library('irssi_config',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
-  dependencies : dep)
+  dependencies : dep,
+)
 
 install_headers(
   files(
     'iconfig.h',
     'module.h',
   ),
-  subdir : incdir / 'src' / 'lib-config')
+  subdir : incdir / 'src' / 'lib-config',
+)
diff --git a/src/meson.build b/src/meson.build
index cc30da1b..b1663d18 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -24,7 +24,6 @@ if want_fuzzer
 endif
 
 install_headers(
-  files(
-    'common.h'
-  ),
-  subdir : incdir / 'src')
+  files('common.h'),
+  subdir : incdir / 'src',
+)
diff --git a/src/otr/meson.build b/src/otr/meson.build
index 13b564ea..9611b428 100644
--- a/src/otr/meson.build
+++ b/src/otr/meson.build
@@ -1,6 +1,7 @@
 # this file is part of irssi
 
-shared_library('otr_core',
+shared_library(
+  'otr_core',
   files(
     'key.c',
     'otr-fe.c',
@@ -15,7 +16,7 @@ shared_library('otr_core',
   install : true,
   install_dir : moduledir,
   dependencies : dep,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 # noinst_headers = files(
diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build
index 0f3f3bb5..1d0ba953 100644
--- a/src/perl/common/meson.build
+++ b/src/perl/common/meson.build
@@ -1,20 +1,22 @@
-
-shared_library('Irssi',
-  [ xsubpp.process(
-    files(
-      'Channel.xs',
-      'Core.xs',
-      'Expando.xs',
-      'Ignore.xs',
-      'Irssi.xs',
-      'Log.xs',
-      'Masks.xs',
-      'Query.xs',
-      'Rawlog.xs',
-      'Server.xs',
-      'Settings.xs',
-    )
-  ) ]
+shared_library(
+  'Irssi',
+  [
+    xsubpp.process(
+      files(
+        'Channel.xs',
+        'Core.xs',
+        'Expando.xs',
+        'Ignore.xs',
+        'Irssi.xs',
+        'Log.xs',
+        'Masks.xs',
+        'Query.xs',
+        'Rawlog.xs',
+        'Server.xs',
+        'Settings.xs',
+      )
+    ),
+  ]
   + files(
     'module.h',
   )
@@ -27,7 +29,7 @@ shared_library('Irssi',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 install_headers(
@@ -36,6 +38,6 @@ install_headers(
   ),
   install_dir : perlmoddir,
 )
-  
+
 # 'Makefile.PL.in',
 # 'typemap',
diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build
index af68ce7f..4dd0f5e1 100644
--- a/src/perl/irc/meson.build
+++ b/src/perl/irc/meson.build
@@ -1,21 +1,23 @@
-shared_library('Irc',
-  [ xsubpp.process(
-    files(
-      'Channel.xs',
-      'Client.xs',
-      'Ctcp.xs',
-      'Irc.xs',
-      'Modes.xs',
-      'Netsplit.xs',
-      'Notifylist.xs',
-      'Query.xs',
-      'Server.xs',
+shared_library(
+  'Irc',
+  [
+    xsubpp.process(
+      files(
+        'Channel.xs',
+        'Client.xs',
+        'Ctcp.xs',
+        'Irc.xs',
+        'Modes.xs',
+        'Netsplit.xs',
+        'Notifylist.xs',
+        'Query.xs',
+        'Server.xs',
+      ),
+      extra_args : [
+        '-typemap', '../common/typemap',
+      ],
     ),
-    extra_args : [
-      '-typemap',
-      '../common/typemap',
-    ],
-  ) ]
+  ]
   + files(
     'module.h',
   ),
@@ -27,7 +29,7 @@ shared_library('Irc',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 install_headers(
@@ -37,16 +39,18 @@ install_headers(
   install_dir : perlmoddir / 'Irssi',
 )
 
-shared_library('Dcc',
-  [ xsubpp.process(
-    files(
-      'Dcc.xs',
+shared_library(
+  'Dcc',
+  [
+    xsubpp.process(
+      files(
+        'Dcc.xs',
+      ),
+      extra_args : [
+        '-typemap', '../common/typemap',
+      ],
     ),
-    extra_args : [
-      '-typemap',
-      '../common/typemap',
-    ],
-  ) ]
+  ]
   + files(
     'module.h',
   ),
@@ -58,7 +62,7 @@ shared_library('Dcc',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 install_headers(
@@ -67,6 +71,6 @@ install_headers(
   ),
   install_dir : perlmoddir / 'Irssi' / 'Irc',
 )
-  
+
 # 'Makefile.PL.in',
 # 'typemap',
diff --git a/src/perl/meson.build b/src/perl/meson.build
index 1c6e2fbc..9e85ca06 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -1,32 +1,36 @@
-
-perl_signals_list_h = custom_target('perl-signals-list.h',
+perl_signals_list_h = custom_target(
+  'perl-signals-list.h',
   input : files('../../docs/signals.txt'),
   output : 'perl-signals-list.h',
   capture : true,
   depend_files : files('get-signals.pl'),
-  command : [build_perl, files('get-signals.pl'), '@INPUT@'],
+  command : [ build_perl, files('get-signals.pl'), '@INPUT@' ],
 )
 
-irssi_core_pl_h = custom_target('irssi-core.pl.h',
+irssi_core_pl_h = custom_target(
+  'irssi-core.pl.h',
   input : files('irssi-core.pl'),
   output : 'irssi-core.pl.h',
   capture : true,
-  command : [file2header, '@INPUT@', 'irssi_core_code'],
+  command : [ file2header, '@INPUT@', 'irssi_core_code' ],
 )
 
 # required as of Meson 0.58.0
 generated_files_inc = include_directories('.')
 
-libperl_core_sm = shared_library('perl_core',
+libperl_core_sm = shared_library(
+  'perl_core',
   files(
     'perl-common.c',
     'perl-core.c',
     'perl-signals.c',
     'perl-sources.c',
-  ) + [
+  )
+  + [
     irssi_core_pl_h,
     perl_signals_list_h,
-  ] + built_src,
+  ]
+  + built_src,
   c_args : [
     def_scriptdir,
     def_perl_use_lib,
@@ -39,16 +43,17 @@ libperl_core_sm = shared_library('perl_core',
   install_rpath : perl_rpath,
   build_rpath : perl_rpath,
   dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep,
-  override_options : ['b_asneeded=false', 'b_lundef=false'],
+  override_options : [ 'b_asneeded=false', 'b_lundef=false' ],
   link_with : dl_cross_irssi_main,
 )
 
-dl_cross_perl_core = []
+dl_cross_perl_core = [  ]
 if need_dl_cross_link
   dl_cross_perl_core += libperl_core_sm
 endif
 
-shared_library('fe_perl',
+shared_library(
+  'fe_perl',
   files(
     'module-formats.c',
     'perl-fe.c',
@@ -63,7 +68,7 @@ shared_library('fe_perl',
   install_dir : moduledir,
   dependencies : dep,
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 subdir('common')
diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build
index b7d769c5..9a5b08cf 100644
--- a/src/perl/textui/meson.build
+++ b/src/perl/textui/meson.build
@@ -1,18 +1,19 @@
-shared_library('TextUI',
-  [ xsubpp.process(
-    files(
-      'Statusbar.xs',
-      'TextBufferView.xs',
-      'TextBuffer.xs',
-      'TextUI.xs',
+shared_library(
+  'TextUI',
+  [
+    xsubpp.process(
+      files(
+        'Statusbar.xs',
+        'TextBufferView.xs',
+        'TextBuffer.xs',
+        'TextUI.xs',
+      ),
+      extra_args : [
+        '-typemap', '../common/typemap',
+        '-typemap', '../ui/typemap',
+      ],
     ),
-    extra_args : [
-      '-typemap',
-      '../common/typemap',
-      '-typemap',
-      '../ui/typemap',
-    ],
-  ) ]
+  ]
   + files(
     'module.h',
   ),
@@ -24,7 +25,7 @@ shared_library('TextUI',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 install_headers(
@@ -33,6 +34,6 @@ install_headers(
   ),
   install_dir : perlmoddir / 'Irssi',
 )
-  
+
 # 'Makefile.PL.in',
 # 'typemap',
diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build
index a6e5c93c..5a24d5d6 100644
--- a/src/perl/ui/meson.build
+++ b/src/perl/ui/meson.build
@@ -1,16 +1,18 @@
-shared_library('UI',
-  [ xsubpp.process(
-    files(
-      'Formats.xs',
-      'Themes.xs',
-      'UI.xs',
-      'Window.xs',
+shared_library(
+  'UI',
+  [
+    xsubpp.process(
+      files(
+        'Formats.xs',
+        'Themes.xs',
+        'UI.xs',
+        'Window.xs',
+      ),
+      extra_args : [
+        '-typemap', '../common/typemap',
+      ],
     ),
-    extra_args : [
-      '-typemap',
-      '../common/typemap',
-    ],
-  ) ]
+  ]
   + files(
     'module.h',
   ),
@@ -22,7 +24,7 @@ shared_library('UI',
   implicit_include_directories : true,
   dependencies : dep + [ perl_dep ],
   link_with : dl_cross_perl_core + dl_cross_irssi_main,
-  override_options : ['b_lundef=false'],
+  override_options : [ 'b_lundef=false' ],
 )
 
 install_headers(
@@ -31,6 +33,6 @@ install_headers(
   ),
   install_dir : perlmoddir / 'Irssi',
 )
-  
+
 # 'Makefile.PL.in',
 # 'typemap',
diff --git a/tests/fe-common/core/meson.build b/tests/fe-common/core/meson.build
index 44b11222..a3181f7b 100644
--- a/tests/fe-common/core/meson.build
+++ b/tests/fe-common/core/meson.build
@@ -1,4 +1,5 @@
-test_test_formats = executable('test-formats',
+test_test_formats = executable(
+  'test-formats',
   files(
     'test-formats.c',
   ),
@@ -12,8 +13,11 @@ test_test_formats = executable('test-formats',
   ],
   include_directories : rootinc,
   implicit_include_directories : false,
-  dependencies : dep
+  dependencies : dep,
+)
+test(
+  'test-formats test',
+  test_test_formats,
+  args : [ '--tap' ],
+  protocol : 'tap',
 )
-test('test-formats test', test_test_formats,
-  args : ['--tap'],
-  protocol : 'tap')
diff --git a/tests/fe-text/meson.build b/tests/fe-text/meson.build
index 397bd39f..68def5f8 100644
--- a/tests/fe-text/meson.build
+++ b/tests/fe-text/meson.build
@@ -1,4 +1,5 @@
-test_test_paste_join_multiline = executable('test-paste-join-multiline',
+test_test_paste_join_multiline = executable(
+  'test-paste-join-multiline',
   files(
     '../../src/fe-text/gui-entry.c',
     '../../src/fe-text/gui-printtext.c',
@@ -25,7 +26,9 @@ test_test_paste_join_multiline = executable('test-paste-join-multiline',
   implicit_include_directories : false,
   dependencies : dep + textui_dep,
 )
-test('test-paste-join-multiline test', test_test_paste_join_multiline,
-  args : ['--tap'],
-  protocol : 'tap')
-
+test(
+  'test-paste-join-multiline test',
+  test_test_paste_join_multiline,
+  args : [ '--tap' ],
+  protocol : 'tap',
+)
diff --git a/tests/irc/core/meson.build b/tests/irc/core/meson.build
index f63f4fa8..d59b645d 100644
--- a/tests/irc/core/meson.build
+++ b/tests/irc/core/meson.build
@@ -1,4 +1,5 @@
-test_test_irc = executable('test-irc',
+test_test_irc = executable(
+  'test-irc',
   files(
     'test-irc.c',
   ),
@@ -13,15 +14,19 @@ test_test_irc = executable('test-irc',
   ],
   include_directories : rootinc,
   implicit_include_directories : false,
-  dependencies : dep
+  dependencies : dep,
 )
-test('test-irc test', test_test_irc,
+test(
+  'test-irc test',
+  test_test_irc,
   args : [
     '--tap',
   ],
-  protocol : 'tap')
+  protocol : 'tap',
+)
 
-test_test_channel_events = executable('test-channel-events',
+test_test_channel_events = executable(
+  'test-channel-events',
   files(
     'test-channel-events.c',
   ),
@@ -36,10 +41,13 @@ test_test_channel_events = executable('test-channel-events',
   ],
   include_directories : rootinc,
   implicit_include_directories : false,
-  dependencies : dep
+  dependencies : dep,
 )
-test('test-channel-events test', test_test_channel_events,
+test(
+  'test-channel-events test',
+  test_test_channel_events,
   args : [
     '--tap',
   ],
-  protocol : 'tap')
+  protocol : 'tap',
+)
diff --git a/tests/irc/flood/meson.build b/tests/irc/flood/meson.build
index 78556331..9da3dda5 100644
--- a/tests/irc/flood/meson.build
+++ b/tests/irc/flood/meson.build
@@ -1,4 +1,5 @@
-test_test_796 = executable('test-796',
+test_test_796 = executable(
+  'test-796',
   files(
     'test-796.c',
   ),
@@ -17,10 +18,13 @@ test_test_796 = executable('test-796',
   ],
   include_directories : rootinc,
   implicit_include_directories : false,
-  dependencies : dep
+  dependencies : dep,
 )
-test('test-796 test', test_test_796,
+test(
+  'test-796 test',
+  test_test_796,
   args : [
     '--tap',
   ],
-  protocol : 'tap')
+  protocol : 'tap',
+)
diff --git a/themes/meson.build b/themes/meson.build
index d58dddf4..bdf2519e 100644
--- a/themes/meson.build
+++ b/themes/meson.build
@@ -3,4 +3,5 @@ install_data(
     'default.theme',
     'colorless.theme',
   ),
-  install_dir : themedir)
+  install_dir : themedir,
+)

From 7ca9fd5aee415ca50f0262a7382cb113732d5bfd Mon Sep 17 00:00:00 2001
From: William Storey <will@summercat.com>
Date: Mon, 26 Jan 2026 20:58:37 -0800
Subject: [PATCH 1649/1650] Format root meson.build

---
 meson.build | 58 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/meson.build b/meson.build
index d6c582b5..bb6d2829 100644
--- a/meson.build
+++ b/meson.build
@@ -28,40 +28,40 @@ elif host_machine.system() == 'cygwin'
   need_dl_cross_link_main = true
 endif
 
-includedir          = get_option('includedir')
-incdir              = 'irssi'
-moduledir           = get_option('libdir') / incdir / 'modules'
-helpdir             = get_option('datadir') / incdir / 'help'
-themedir            = get_option('datadir') / incdir / 'themes'
-scriptdir           = get_option('datadir') / incdir / 'scripts'
-docdir              = get_option('docdir') != '' ? get_option('docdir') : (get_option('datadir') / 'doc' / incdir)
+includedir = get_option('includedir')
+incdir = 'irssi'
+moduledir = get_option('libdir') / incdir / 'modules'
+helpdir = get_option('datadir') / incdir / 'help'
+themedir = get_option('datadir') / incdir / 'themes'
+scriptdir = get_option('datadir') / incdir / 'scripts'
+docdir = get_option('docdir') != '' ? get_option('docdir') : (get_option('datadir') / 'doc' / incdir)
 
-want_textui         = get_option('without-textui') != 'yes'
-want_bot            = get_option('with-bot') == 'yes'
-want_fuzzer         = get_option('with-fuzzer') == 'yes'
-fuzzer_lib          = get_option('with-fuzzer-lib')
+want_textui = get_option('without-textui') != 'yes'
+want_bot = get_option('with-bot') == 'yes'
+want_fuzzer = get_option('with-fuzzer') == 'yes'
+fuzzer_lib = get_option('with-fuzzer-lib')
 fuzzer_link_language = get_option('fuzzer-link-language')
-want_proxy          = get_option('with-proxy') == 'yes'
+want_proxy = get_option('with-proxy') == 'yes'
 
-require_capsicum    = get_option('with-capsicum') == 'yes'
-want_capsicum       = get_option('with-capsicum') != 'no'
+require_capsicum = get_option('with-capsicum') == 'yes'
+want_capsicum = get_option('with-capsicum') != 'no'
 
 require_libutf8proc = get_option('disable-utf8proc') == 'no'
-want_libutf8proc    = get_option('disable-utf8proc') != 'yes'
+want_libutf8proc = get_option('disable-utf8proc') != 'yes'
 
-require_perl        = get_option('with-perl') == 'yes'
-want_perl           = get_option('with-perl') != 'no'
-with_perl_lib       = get_option('with-perl-lib')
+require_perl = get_option('with-perl') == 'yes'
+want_perl = get_option('with-perl') != 'no'
+with_perl_lib = get_option('with-perl-lib')
 
-require_otr         = get_option('with-otr') == 'yes'
-want_otr            = get_option('with-otr') != 'no'
+require_otr = get_option('with-otr') == 'yes'
+want_otr = get_option('with-otr') != 'no'
 
-want_glib_internal  = get_option('install-glib') != 'no'
+want_glib_internal = get_option('install-glib') != 'no'
 require_glib_internal = get_option('install-glib') == 'force'
 
 want_static_dependency = get_option('static-dependency') == 'yes'
 
-package_version     = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version()
+package_version = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version()
 
 fs = import('fs')
 if fs.exists('config.status') or fs.exists('irssi-version.h') or fs.exists('default-config.h') or fs.exists('default-theme.h') or fs.exists('src/perl/irssi-core.pl.h') or fs.exists('src/perl/perl-signals-list.h') or fs.exists('irssi-config.h')
@@ -97,11 +97,11 @@ run_command(
   check : false,
 )
 
-def_moduledir  = '-D' + 'MODULEDIR'  + '="' + (get_option('prefix') / moduledir) + '"'
+def_moduledir = '-D' + 'MODULEDIR' + '="' + (get_option('prefix') / moduledir) + '"'
 def_sysconfdir = '-D' + 'SYSCONFDIR' + '="' + (get_option('prefix') / get_option('sysconfdir')) + '"'
-def_helpdir    = '-D' + 'HELPDIR'    + '="' + (get_option('prefix') / helpdir) + '"'
-def_themesdir  = '-D' + 'THEMESDIR'  + '="' + (get_option('prefix') / themedir) + '"'
-def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir) + '"'
+def_helpdir = '-D' + 'HELPDIR' + '="' + (get_option('prefix') / helpdir) + '"'
+def_themesdir = '-D' + 'THEMESDIR' + '="' + (get_option('prefix') / themedir) + '"'
+def_scriptdir = '-D' + 'SCRIPTDIR' + '="' + (get_option('prefix') / scriptdir) + '"'
 
 def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
 
@@ -938,10 +938,8 @@ pc.generate(
   description : 'Irssi chat client',
   version : package_version,
   requires : pc_requires,
-  variables : [
-    'irssimoduledir=${libdir}' / incdir / 'modules',
-    'signalsfile=' + signalsfile
-  ])
+  variables : [ 'irssimoduledir=${libdir}' / incdir / 'modules', 'signalsfile=' + signalsfile ],
+)
 
 ###########
 # irssi.1 #

From 54bb34e14fa996ca2db543a7a62e1225ffe6c0f2 Mon Sep 17 00:00:00 2001
From: William Storey <will@summercat.com>
Date: Mon, 26 Jan 2026 20:42:05 -0800
Subject: [PATCH 1650/1650] Add muon fmt GitHub Actions workflow

---
 .github/workflows/muon-fmt.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/workflows/muon-fmt.yml

diff --git a/.github/workflows/muon-fmt.yml b/.github/workflows/muon-fmt.yml
new file mode 100644
index 00000000..6fa06d38
--- /dev/null
+++ b/.github/workflows/muon-fmt.yml
@@ -0,0 +1,32 @@
+name: Format meson files
+
+on:
+  push:
+  pull_request:
+
+permissions: {}
+
+jobs:
+  muon-meson-fmt:
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+        with:
+          persist-credentials: false
+
+      # Build from source because Ubuntu 24.04 apt only has muon 0.2.0.
+      # Newer muons seem to format differently.
+      - name: Build muon from source
+        run: |
+          git clone --depth 1 --branch 0.5.0 https://github.com/muon-build/muon /tmp/muon
+          cd /tmp/muon
+          ./bootstrap.sh build
+          build/muon-bootstrap setup build
+          build/muon-bootstrap -C build samu
+          sudo build/muon -C build install
+
+      - name: Run muon fmt
+        run: |
+          find . -name meson.build -print0 | xargs -0 muon fmt -c .muon_fmt.ini -i
+          git diff --exit-code