From a71832f78d2fa8128a03aeb551a1ec0895b49f67 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 9 Jun 2010 21:10:04 -0400
Subject: [PATCH] * lisp/net/rcirc.el (rcirc-server-alist, rcirc,
 rcirc-connect): Resolve merge conflict, giving preference to the emacs-23
 version of the code.

---
 lisp/ChangeLog    |  5 +++++
 lisp/net/rcirc.el | 35 ++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa2fed11ea2..d5e0b5ac4f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
+	merge conflict, giving preference to the emacs-23 version of the code.
+
 2010-06-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/advice.el (ad-compile-function):
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 7761bbc650e..76fc1cd72dd 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -81,15 +81,16 @@ VALUE must be a number or string.  If absent,
 VALUE must be a string.  If absent, `rcirc-default-user-name' is
 used.
 
+`:password'
+
+VALUE must be a string.  If absent, no PASS command will be sent
+to the server.
+
 `:full-name'
 
 VALUE must be a string.  If absent, `rcirc-default-full-name' is
 used.
 
-`:pass'
-
-VALUE must be a string.
-
 `:channels'
 
 VALUE must be a list of strings describing which channels to join
@@ -99,8 +100,8 @@ connected to automatically."
 		:value-type (plist :options ((:nick string)
 					     (:port integer)
 					     (:user-name string)
+					     (:password string)
 					     (:full-name string)
-					     (:pass string)
 					     (:channels (repeat string)))))
   :group 'rcirc)
 
@@ -406,8 +407,8 @@ If ARG is non-nil, instead prompt for connection parameters."
                                      (or (plist-get server-plist :user-name)
                                          rcirc-default-user-name)
                                      'rcirc-user-name-history))
-	     (pass (read-passwd "IRC Password: " nil
-				(plist-get server-plist :pass)))
+	     (password (read-passwd "IRC Password: " nil
+                                    (plist-get server-plist :password)))
 	     (channels (split-string
 			(read-string "IRC Channels: "
 				     (mapconcat 'identity
@@ -415,9 +416,9 @@ If ARG is non-nil, instead prompt for connection parameters."
 							   :channels)
 						" "))
 			"[, ]+" t)))
-	(rcirc-connect server port nick user-name pass
+	(rcirc-connect server port nick user-name
 		       rcirc-default-full-name
-		       channels))
+		       channels password))
     ;; connect to servers in `rcirc-server-alist'
     (let (connected-servers)
       (dolist (c rcirc-server-alist)
@@ -426,10 +427,10 @@ If ARG is non-nil, instead prompt for connection parameters."
 	      (port (or (plist-get (cdr c) :port) rcirc-default-port))
 	      (user-name (or (plist-get (cdr c) :user-name)
 			     rcirc-default-user-name))
-              (pass (plist-get (cdr c) :pass))
 	      (full-name (or (plist-get (cdr c) :full-name)
 			     rcirc-default-full-name))
-	      (channels (plist-get (cdr c) :channels)))
+	      (channels (plist-get (cdr c) :channels))
+              (password (plist-get (cdr c) :password)))
 	  (when server
 	    (let (connected)
 	      (dolist (p (rcirc-process-list))
@@ -437,8 +438,8 @@ If ARG is non-nil, instead prompt for connection parameters."
 		  (setq connected p)))
 	      (if (not connected)
 		  (condition-case e
-		      (rcirc-connect server port nick user-name pass
-				     full-name channels)
+		      (rcirc-connect server port nick user-name
+				     full-name channels password)
 		    (quit (message "Quit connecting to %s" server)))
 		(with-current-buffer (process-buffer connected)
 		  (setq connected-servers
@@ -469,8 +470,8 @@ If ARG is non-nil, instead prompt for connection parameters."
 (defvar rcirc-process nil)
 
 ;;;###autoload
-(defun rcirc-connect (server &optional port nick user-name pass
-                             full-name startup-channels)
+(defun rcirc-connect (server &optional port nick user-name
+                             full-name startup-channels password)
   (save-excursion
     (message "Connecting to %s..." server)
     (let* ((inhibit-eol-conversion)
@@ -519,8 +520,8 @@ If ARG is non-nil, instead prompt for connection parameters."
       (add-hook 'auto-save-hook 'rcirc-log-write)
 
       ;; identify
-      (when pass
-        (rcirc-send-string process (concat "PASS " pass)))
+      (when password
+        (rcirc-send-string process (concat "PASS " password)))
       (rcirc-send-string process (concat "NICK " nick))
       (rcirc-send-string process (concat "USER " user-name
                                          " 0 * :" full-name))
-- 
2.39.2