From: Andreas Schwab <schwab@linux-m68k.org>
Date: Wed, 9 Jun 2010 22:34:08 +0000 (+0200)
Subject: Conflict resolution fixup
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~89
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c093c775f9264f1bca87c41f094b4778b20fff1;p=emacs.git

Conflict resolution fixup
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f02772f0c90..f581fd2be04 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -76,13 +76,6 @@
 	* emacs-lisp/smie.el (smie-indent-keyword): Remove special case that
 	can be handled with a ((:before "fn") (:prev "=>" parent)) rule.
 
-2010-06-07  Jonathan Rockway  <jon@jrock.us>
-
-	* net/rcirc.el: Add support for password authentication.
-	(rcirc-server-alist): Add :password keyword.
-	(rcirc): Ask for a password, or get it from the server's alist.
-	(rcirc-connect): Add password argument.  Pass it to server.
-
 2010-06-07  Martin Pohlack  <mp26@os.inf.tu-dresden.de>
 
 	* iimage.el: Remove images as soon as the underlying text is modified.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 60c34c879f6..7761bbc650e 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -81,11 +81,6 @@ 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
@@ -104,7 +99,6 @@ connected to automatically."
 		:value-type (plist :options ((:nick string)
 					     (:port integer)
 					     (:user-name string)
-					     (:password string)
 					     (:full-name string)
 					     (:pass string)
 					     (:channels (repeat string)))))
@@ -435,8 +429,7 @@ If ARG is non-nil, instead prompt for connection parameters."
               (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))
-              (password (plist-get (cdr c) :password)))
+	      (channels (plist-get (cdr c) :channels)))
 	  (when server
 	    (let (connected)
 	      (dolist (p (rcirc-process-list))
@@ -445,7 +438,7 @@ If ARG is non-nil, instead prompt for connection parameters."
 	      (if (not connected)
 		  (condition-case e
 		      (rcirc-connect server port nick user-name pass
-				     full-name channels password)
+				     full-name channels)
 		    (quit (message "Quit connecting to %s" server)))
 		(with-current-buffer (process-buffer connected)
 		  (setq connected-servers