From: Miciah Masters <miciah.masters@gmail.com>
Date: Mon, 11 Dec 2017 01:14:09 +0000 (-0500)
Subject: Save the server alias on reconnect (Bug#29657)
X-Git-Tag: emacs-26.1.90~274
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef9025f;p=emacs.git

Save the server alias on reconnect (Bug#29657)

rcirc does not retain the server alias on reconnect.  As a result, rcirc
fails to re-use server and channel buffers when an alias is used.  Further
problems may ensue when aliases are used to differentiate multiple
connections to the same host, for example when using a single IRC bouncer
or proxy to connect to multiple IRC networks.

Save the server alias when connecting to a server so that reconnect will
retain the alias.
* lisp/net/rcirc.el (rcirc-connect): Include server-alias when setting
rcirc-connection-info.

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 5acbec7dcb4..c09bff765b2 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -585,7 +585,7 @@ If ARG is non-nil, instead prompt for connection parameters."
 
       (setq-local rcirc-connection-info
 		  (list server port nick user-name full-name startup-channels
-			password encryption))
+			password encryption server-alias))
       (setq-local rcirc-process process)
       (setq-local rcirc-server server)
       (setq-local rcirc-server-name