diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-07-13 09:28:15 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-07-13 09:28:15 -0700 |
| commit | cda7e1850f2f19a5025fd163ff2c6c6cba275acf (patch) | |
| tree | 1fdb0014a632e936da813128ead6353051436cbd /lisp/net/rcirc.el | |
| parent | 1013e0392b78ee0e2199fb51859dc9e939315f9b (diff) | |
| parent | 17ebb6e5ae9cdd2586d1b4d6f2347ae09c6f653f (diff) | |
| download | emacs-cda7e1850f2f19a5025fd163ff2c6c6cba275acf.tar.gz emacs-cda7e1850f2f19a5025fd163ff2c6c6cba275acf.tar.bz2 emacs-cda7e1850f2f19a5025fd163ff2c6c6cba275acf.zip | |
Merge from origin/emacs-26
17ebb6e (origin/emacs-26) Use consistent function names in thread-tes...
1c86229 Fix format error in Faccept_process_output
b38b91a Lessen stack consumption in recursive read1
3eb4603 Match w32 paths in grep sans --null hits (Bug#32051)
5cc7c4b Fix previous make-network-process change
d6a1b69 Another documentation improvement in flyspell.el
9b49a8e Improve documentation of Flyspell
3744fda Provide feature 'threads
ef9025f Save the server alias on reconnect (Bug#29657)
db3874b Refer to "proper lists" instead of "true lists"
35e0305 Avoid turning on the global-minor-mode recursively
51bf4e4 Fix Bug#32085
Diffstat (limited to 'lisp/net/rcirc.el')
| -rw-r--r-- | lisp/net/rcirc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 5b63e0c34df..108e368373f 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -583,7 +583,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 |