From 26a1b9cb2c20406bb3e1919ac161985591a8ff84 Mon Sep 17 00:00:00 2001 From: ueno Date: Wed, 22 Oct 2003 20:33:15 +0000 Subject: [PATCH] * riece-identity.el (riece-format-identity): Return copied strings. --- lisp/ChangeLog | 4 ++++ lisp/riece-display.el | 62 ++++++++++++++++++++++++------------------------ lisp/riece-identity.el | 2 +- lisp/riece.el | 2 +- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8250aea..ce30160 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2003-10-22 Daiki Ueno + + * riece-identity.el (riece-format-identity): Return copied strings. + 2003-10-22 OHASHI Akira * riece.el (riece): When riece server was opened, Do diff --git a/lisp/riece-display.el b/lisp/riece-display.el index 3101aa3..b353474 100644 --- a/lisp/riece-display.el +++ b/lisp/riece-display.el @@ -48,37 +48,37 @@ Local to the buffer in `riece-buffer-list'.") (defun riece-update-user-list-buffer () (save-excursion (set-buffer riece-user-list-buffer) - (when (and riece-current-channel - (riece-channel-p (riece-identity-prefix riece-current-channel))) - (let (users operators speakers) - (with-current-buffer (process-buffer (riece-server-process - (riece-identity-server - riece-current-channel))) - (setq users - (riece-channel-get-users - (riece-identity-prefix riece-current-channel)) - operators - (riece-channel-get-operators - (riece-identity-prefix riece-current-channel)) - speakers - (riece-channel-get-speakers - (riece-identity-prefix riece-current-channel)))) - (let ((inhibit-read-only t) - buffer-read-only) - (erase-buffer) - (while users - (insert (if (member (car users) operators) - "@" - (if (member (car users) speakers) - "+" - " ")) - (riece-format-identity - (riece-make-identity (car users) - (riece-identity-server - riece-current-channel)) - t) - "\n") - (setq users (cdr users)))))))) + (if (and riece-current-channel + (riece-channel-p (riece-identity-prefix riece-current-channel))) + (let (users operators speakers) + (with-current-buffer (process-buffer (riece-server-process + (riece-identity-server + riece-current-channel))) + (setq users + (riece-channel-get-users + (riece-identity-prefix riece-current-channel)) + operators + (riece-channel-get-operators + (riece-identity-prefix riece-current-channel)) + speakers + (riece-channel-get-speakers + (riece-identity-prefix riece-current-channel)))) + (let ((inhibit-read-only t) + buffer-read-only) + (erase-buffer) + (while users + (insert (if (member (car users) operators) + "@" + (if (member (car users) speakers) + "+" + " ")) + (riece-format-identity + (riece-make-identity (car users) + (riece-identity-server + riece-current-channel)) + t) + "\n") + (setq users (cdr users)))))))) (defun riece-update-channel-list-buffer () (save-excursion diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el index 77e4474..ee7e728 100644 --- a/lisp/riece-identity.el +++ b/lisp/riece-identity.el @@ -131,7 +131,7 @@ will be added." (let ((string (if (or prefix-only (equal (riece-identity-server identity) "")) - (riece-identity-prefix identity) + (copy-sequence (riece-identity-prefix identity)) (concat (riece-identity-prefix identity) " " (riece-identity-server identity))))) (if riece-abbrev-identity-string-function diff --git a/lisp/riece.el b/lisp/riece.el index 72e53cb..ca0c1b9 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -402,7 +402,7 @@ Instead, these commands are available: (kill-all-local-variables) (buffer-disable-undo) (setq major-mode 'riece-user-list-mode - mode-name "User list" + mode-name "Users" mode-line-buffer-identification (riece-mode-line-buffer-identification '("Riece: " riece-long-channel-indicator " ")) -- 1.7.10.4