[Emacs-diffs] /srv/bzr/emacs/trunk r100563: Conflict resolution fixup

[Andreas Schwab]

------------------------------------------------------------
revno: 100563
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2010-06-10 00:34:08 +0200
message:
  Conflict resolution fixup
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-09 22:08:50 +0000
+++ b/lisp/ChangeLog    2010-06-09 22:34:08 +0000
@@ -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  <address@hidden>
-
-       * 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  <address@hidden>
 
        * iimage.el: Remove images as soon as the underlying text is modified.

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2010-06-09 22:08:50 +0000
+++ b/lisp/net/rcirc.el 2010-06-09 22:34:08 +0000
@@ -81,11 +81,6 @@
 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 @@
                :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 @@
               (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 (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