# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: skangas@skangas.se-20110116000355-aavl1epdl3fvv9su
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk
# testament_sha1: 54e6a9181465f0576d5ab92676c4d626dcd69f0f
# timestamp: 2011-01-16 01:10:22 +0100
# base_revision_id: rgm@gnu.org-20110115232357-ja3ha94kwuroxwso
# 
# Begin patch
=== modified file 'lisp/net/rcirc.el'
--- lisp/net/rcirc.el	2011-01-15 23:16:57 +0000
+++ lisp/net/rcirc.el	2011-01-16 00:03:55 +0000
@@ -472,9 +472,11 @@
 
 ;;;###autoload
 (defun rcirc-connect (server &optional port nick user-name
-                             full-name startup-channels password)
+                             full-name startup-channels password process-plist)
   (save-excursion
     (message "Connecting to %s..." server)
+    (when (not (plist-get process-plist :name))
+      (setq (plist-put process-plist :name server)))
     (let* ((inhibit-eol-conversion)
            (port-number (if port
 			    (if (stringp port)
@@ -485,7 +487,8 @@
 	   (user-name (or user-name rcirc-default-user-name))
 	   (full-name (or full-name rcirc-default-full-name))
 	   (startup-channels startup-channels)
-           (process (make-network-process :name server :host server :service port-number)))
+           (process (apply 'make-network-process :host server
+                           :service port-number process-plist)))
       ;; set up process
       (set-process-coding-system process 'raw-text 'raw-text)
       (switch-to-buffer (rcirc-generate-new-buffer-name process nil))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRBHxhoAAbH/gFCQAKBQ8//3
UgkIAL////BQA/p73erRzzW167263DJBNNFPBDTaTFPRPQmmQ0ANAGUEaYTBCanpDQ0GgAAADJMS
ZKY2pPU8hPKaA0AA0aABtSTTUwyp6aNRp6JtQeoA9QANACSIU9AmqexU21J6ntU8ieZU9QAZM0gi
aYjIfW35GHCrpukWbRmBF76sWnHGLfFVCAFI/Wfd06fN3OZAiGL3LmR1qYNrFhEUgrTPNGEfu/F+
v1m9t+a9HOlETWhbERQhq01VYZuRUhFwOSZZT7DGgopYLJVTj4BqSibhenC+jezqmg848VDcGRGv
KL9tgWhEDb6qI2U138dA5MJzYhEHjmBPSMG+FgoBNOeD+nUoCmJtFQZcftMprCHQnNEkYquAps3i
RIyMCQzyWvAeYYZYHRqyRKzwxwy49Rk0QH0Mbwax1FF0BEEqOIUuaAaXKpdfMWa87b7ARyDVcwzV
iBgeCc1clDbGao5jCREa4gxOvepgjUKTLyxoDLCzUBigqumjQWH+zK4IW3wupSmnDSxOSVN8O0lk
OpqCoavbwvrWmw2wcNGaxQU5ZMhpkBiFXLzYkIaEuRchInMiIedrXtS+Sl/eUrRMLku90Yh43rbC
xxbg5bTRixKC0XOC1/oO5IdAodfKiOCx6goMUUKtY8BfjcEhwDmI8A/LB9Utm2/wjmHQB6mTHk9Z
xshWwT4RNo4bNv9XDIgSUi85Zix16Uj1W9A7DpeF+qXXQAu8rNaMSn6oDnGcxA8NKsbNGwOv3nEH
QC7c8SQ8e8nUvCiQFzJmtDU6r8BuGt8piMoVjEGmA5RutADaZjxdYaCdYRnJwbJZhku59BxJewCe
3OuVaNO/nedmKOKbu8DY61E/ZItplUchSk0grvTZbRbYhwECZRbOGoJgPt5i4CF1VYUBhWu4OWxd
cs+VznPzawWASQHvROAegMduLME09HVrEMxhdwovh+lGLNggoqFdwEOzKSqgNBkB0k8K0xOltRpA
GJeH4XYFLBWL1imEYhuWHcKrS5tU5W5d4H5JjKZ/kgL8ov53YcVkWcB9KZ2cCqKbdsg8SAIcJwy4
qwU2DAKIKh1cBin3yDR5HcFXzBilbhh456trzCiGMLUQosVgtfoA0ihyWSsaGgSKpoPPwmkYUUsr
0R2cTNKDUCbCxPSmSequd6zsaAte7QPg03TpsCDd7BRAAZ470otXYNs2va1t4N8AMDAI46rDs4zP
LQAUUWoArTA8QUtjVAXVQwQcqwXXBdJy5khv9dae2euu0pCpWMRZbHgRC5SB725EMy18DDFGRmKy
tKxHrFE3JiRkuAzmRdQMb8jd127rdQf/i7kinChICCPjDQA=