Merge branch 'muc-join-prompt-bookmarks' into pete

jabber.el

@@ -665,6 +665,12 @@ If FULLJIDS is non-nil, complete jids with resources."
 	 chosen)))))
 ;; jabber-read-jid-completing:1 ends here
 
+(defun jabber-read-bookmark-completing (prompt)
+  "Read a MUC JID out of the cache from the minibuffer."
+  (completing-read prompt
+		   (mapcar (lambda(bm) (cdr (assoc 'jid (cadr bm))))
+			   (jabber-get-bookmarks-from-cache (jabber-read-account)))))
+
 ;; [[file:jabber.org::#read-node][jabber-read-node:1]]
 (defun jabber-read-node (prompt)
   "Read node name, taking default from disco item at point."
@@ -9849,7 +9855,7 @@ groupchat buffer.
 JC is the Jabber connection."
   (interactive
    (let ((account (jabber-read-account))
-	 (group (jabber-read-jid-completing "group: ")))
+	 (group (jabber-read-bookmark-completing "Group: ")))
      (list account group (jabber-muc-read-my-nickname account group) t)))
 
   ;; If the user is already in the room, we don't need as many checks.