diff options
| author | Evgenii Terechkov <evg@altlinux.org> | 2010-01-24 00:11:45 +0700 |
|---|---|---|
| committer | Evgenii Terechkov <evg@altlinux.org> | 2010-01-24 00:11:45 +0700 |
| commit | 1d80442c4c97434a892d72cde95c6c1938885804 (patch) | |
| tree | b21dcfcfbfb5a6064f6448d3f24c87bb314803fe /jabber-muc.el | |
| parent | 3855ca686eb9a7b5b87e4da210671266a051d501 (diff) | |
Try to enter muc on RET in roster. Ignore errors.
Diffstat (limited to 'jabber-muc.el')
| -rw-r--r-- | jabber-muc.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/jabber-muc.el b/jabber-muc.el index 4fd7e04..5fd65f5 100644 --- a/jabber-muc.el +++ b/jabber-muc.el @@ -520,15 +520,17 @@ groupchat buffer." (let ((buffer (jabber-muc-create-buffer jc group))) (switch-to-buffer buffer)))) -(defun jabber-muc-read-my-nickname (jc group) - "Read nickname for joining GROUP." +(defun jabber-muc-read-my-nickname (jc group &optional default) + "Read nickname for joining GROUP. If DEFAULT is non-nil, return default nick without prompting." (let ((default-nickname (or (jabber-get-conference-data jc group nil :nick) (cdr (assoc group jabber-muc-default-nicknames)) (plist-get (fsm-get-state-data jc) :username)))) - (jabber-read-with-input-method (format "Nickname: (default %s) " + (if default + default-nickname + (jabber-read-with-input-method (format "Nickname: (default %s) " default-nickname) - nil nil default-nickname))) + nil nil default-nickname)))) (add-to-list 'jabber-jid-muc-menu (cons "Change nickname" 'jabber-muc-nick)) |