Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv29015
Modified Files:
jabber-core.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-407
Creator: Magnus Henoch <ma...@fr...>
Adapt interactive spec of jabber-connect to alist form of jabber-account-list
Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- jabber-core.el 3 Sep 2007 17:14:52 -0000 1.68
+++ jabber-core.el 3 Sep 2007 17:17:34 -0000 1.69
@@ -165,6 +165,7 @@
(interactive
(let* ((jid (completing-read "Enter your JID: " jabber-account-list))
(entry (assoc jid jabber-account-list))
+ (alist (cdr entry))
password network-server port connection-type registerp)
(flet ((nonempty
(s)
@@ -172,10 +173,10 @@
(when entry
;; If the user entered the JID of one of the preconfigured
;; accounts, use that data.
- (setq password (nonempty (nth 1 entry)))
- (setq network-server (nonempty (nth 2 entry)))
- (setq port (nth 3 entry))
- (setq connection-type (nth 4 entry)))
+ (setq password (cdr (assq :password alist)))
+ (setq network-server (cdr (assq :network-server alist)))
+ (setq port (cdr (assq :port alist)))
+ (setq connection-type (cdr (assq :connection-type alist))))
(when (equal current-prefix-arg '(16))
;; Double prefix arg: ask about everything.
;; (except password, which is asked about later anyway)
|
