Conflict resolution fixup

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f02772f0c90ee8e08ee72a6706f4b3b71bbaa407..f581fd2be042096c6c49906fd0bb61f522a1da70 100644 (file)
--- 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 60c34c879f6417755247628db2bec4ac14666cc9..7761bbc650ee77773e0377523a7bf4fde87890b2 100644 (file)
--- 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