projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Described 3.1.2 changes.
[riece]
/
lisp
/
riece-misc.el
diff --git
a/lisp/riece-misc.el
b/lisp/riece-misc.el
index
2e2a912
..
fb511b5
100644
(file)
--- a/
lisp/riece-misc.el
+++ b/
lisp/riece-misc.el
@@
-19,8
+19,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Code:
;;; Code:
@@
-32,6
+32,7
@@
(require 'riece-server)
(require 'riece-user)
(require 'riece-mode)
(require 'riece-server)
(require 'riece-user)
(require 'riece-mode)
+(require 'riece-cache)
(defun riece-get-buffer-create (name &optional init-major-mode)
(let ((buffer (get-buffer name)))
(defun riece-get-buffer-create (name &optional init-major-mode)
(let ((buffer (get-buffer name)))
@@
-214,22
+215,31
@@
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-cache-hash-obarray riece-user-cache))
+ 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
- (lambda (
atom
)
+ (lambda (
channel
)
(setq identities
(setq identities
- (cons (riece-make-identity (symbol-name
atom
) server-name)
+ (cons (riece-make-identity (symbol-name
channel
) server-name)
identities)))
identities)))
-
riece-obarray
)
+
(riece-cache-hash-obarray riece-channel-cache)
)
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