projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce windmove.el.
[riece]
/
lisp
/
riece-misc.el
diff --git
a/lisp/riece-misc.el
b/lisp/riece-misc.el
index
bc1e2c9
..
eb0de20
100644
(file)
--- a/
lisp/riece-misc.el
+++ b/
lisp/riece-misc.el
@@
-214,12
+214,17
@@
user-at-host))
(defun riece-get-users-on-server (server-name)
user-at-host))
(defun riece-get-users-on-server (server-name)
- (delq nil (mapcar (lambda (identity)
- (if (riece-user-p (riece-identity-prefix identity))
- identity))
- (riece-get-identities-on-server server-name))))
+ (riece-with-server-buffer server-name
+ (let (identities)
+ (mapatoms
+ (lambda (user)
+ (setq identities
+ (cons (riece-make-identity (symbol-name user) server-name)
+ identities)))
+ riece-user-obarray)
+ identities)))
-(defun riece-get-
identitie
s-on-server (server-name)
+(defun riece-get-
channel
s-on-server (server-name)
(riece-with-server-buffer server-name
(let (identities)
(mapatoms
(riece-with-server-buffer server-name
(let (identities)
(mapatoms
@@
-228,14
+233,12
@@
(cons (riece-make-identity (symbol-name channel) server-name)
identities)))
riece-channel-obarray)
(cons (riece-make-identity (symbol-name channel) server-name)
identities)))
riece-channel-obarray)
- (mapatoms
- (lambda (user)
- (setq identities
- (cons (riece-make-identity (symbol-name user) server-name)
- identities)))
- riece-user-obarray)
identities)))
identities)))
+(defun riece-get-identities-on-server (server-name)
+ (nconc (riece-get-channels-on-server server-name)
+ (riece-get-users-on-server server-name)))
+
(defun riece-check-channel-commands-are-usable (&optional channel)
(unless riece-current-channel
(error (substitute-command-keys
(defun riece-check-channel-commands-are-usable (&optional channel)
(unless riece-current-channel
(error (substitute-command-keys