mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Code Issues Releases Activity

Conflict resolution fixup

Browse Source
This commit is contained in:
Andreas Schwab 2010-06-10 00:34:08 +02:00
parent 639b2760f1
commit 3c093c775f
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -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.

11
lisp/net/rcirc.el
View File

@ -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