diff options
| author | Magnus Henoch <mange@freemail.hu> | 2008-02-20 01:43:15 +0000 |
|---|---|---|
| committer | Kirill A. Korinskiy <catap@catap.ru> | 2008-02-20 01:43:15 +0000 |
| commit | c42927c8aef0aaedb8df95133834afa9f1d8c102 (patch) | |
| tree | 8b017c1ad5ddfedc143d2a9cdbf95938e4f28cda /jabber-core.el | |
| parent | f0d0ae981c02f3c6c9d2adf79a9ccfed9840b29e (diff) | |
Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-451
Creator: Magnus Henoch <mange@freemail.hu>
Fix completion of connection type in jabber-connect
Diffstat (limited to 'jabber-core.el')
| -rw-r--r-- | jabber-core.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/jabber-core.el b/jabber-core.el index f18e569..13b34d0 100644 --- a/jabber-core.el +++ b/jabber-core.el @@ -189,10 +189,13 @@ With double prefix argument, specify more connection details." (setq connection-type (car (read-from-string - (or (nonempty (completing-read - (format "Connection type: (default `%s') " connection-type) - '(("starttls" "network" "ssl")) t)) - (symbol-name connection-type))))) + (let ((default (or connection-type jabber-default-connection-type))) + (completing-read + (format "Connection type: (default `%s') " default) + (mapcar (lambda (type) + (cons (symbol-name (car type)) nil)) + jabber-connect-methods) + nil t nil nil default))))) (setq registerp (yes-or-no-p "Register new account? "))) (when (equal current-prefix-arg '(4)) (setq registerp t)) |