From 79b6c6edb6f998dc40fee2ff5265534b73778ffb Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 28 Oct 2003 04:25:08 +0000 Subject: [PATCH] * riece-layout.el (riece-set-window-points): Move point in the channel-buffer's window. * riece-ctcp.el (riece-command-ctcp-version): Prompt to select an identity on the current server. (riece-command-ctcp-ping): Ditto. (riece-command-ctcp-clientinfo): Ditto. (riece-command-ctcp-action): Ditto. * riece-commands.el (riece-command-change-mode): Prompt to select an identity on the current server. (riece-command-join): Ditto. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/riece-commands.el | 9 ++++++--- lisp/riece-ctcp.el | 20 ++++---------------- lisp/riece-layout.el | 18 +++++++++++++++++- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ecf1f19..148837e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2003-10-28 Daiki Ueno + + * riece-layout.el (riece-set-window-points): Move point in + the channel-buffer's window. + + * riece-ctcp.el (riece-command-ctcp-version): Prompt to select + an identity on the current server. + (riece-command-ctcp-ping): Ditto. + (riece-command-ctcp-clientinfo): Ditto. + (riece-command-ctcp-action): Ditto. + + * riece-commands.el (riece-command-change-mode): Prompt to select + an identity on the current server. + (riece-command-join): Ditto. + 2003-10-27 Daiki Ueno * riece-keyword.el (riece-keywords): Change custom spec. diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el index 4994a8f..c242442 100644 --- a/lisp/riece-commands.el +++ b/lisp/riece-commands.el @@ -252,7 +252,8 @@ the layout to the selected layout-name." (channel (if current-prefix-arg (riece-completing-read-identity - "Channel/User: " riece-current-channels) + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))) (riece-check-channel-commands-are-usable t) riece-current-channel)) (riece-overriding-server-name (riece-identity-server channel)) @@ -428,9 +429,11 @@ the layout to the selected layout-name." riece-join-channel-candidate))) (riece-completing-read-identity (format "Channel/User (default %s): " default) - riece-current-channels nil nil nil nil default)) + (riece-get-identities-on-server (riece-current-server-name)) + nil nil nil nil default)) (riece-completing-read-identity - "Channel/User: " riece-current-channels))) + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))))) key) (if (and current-prefix-arg (riece-channel-p (riece-identity-prefix target))) diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el index 5ea2e8d..99266cd 100644 --- a/lisp/riece-ctcp.el +++ b/lisp/riece-ctcp.el @@ -284,10 +284,7 @@ (interactive (list (riece-completing-read-identity "Channel/User: " - (apply #'nconc - (mapcar (lambda (entry) - (riece-get-identities-on-server (car entry))) - riece-server-process-alist))))) + (riece-get-identities-on-server (riece-current-server-name))))) (riece-send-string (format "PRIVMSG %s :\1VERSION\1\r\n" (riece-identity-prefix target)))) @@ -295,10 +292,7 @@ (interactive (list (riece-completing-read-identity "Channel/User: " - (apply #'nconc - (mapcar (lambda (entry) - (riece-get-identities-on-server (car entry))) - riece-server-process-alist))))) + (riece-get-identities-on-server (riece-current-server-name))))) (riece-send-string (format "PRIVMSG %s :\1PING\1\r\n" (riece-identity-prefix target))) (setq riece-ctcp-ping-time (current-time))) @@ -307,10 +301,7 @@ (interactive (list (riece-completing-read-identity "Channel/User: " - (apply #'nconc - (mapcar (lambda (entry) - (riece-get-identities-on-server (car entry))) - riece-server-process-alist))))) + (riece-get-identities-on-server (riece-current-server-name))))) (riece-send-string (format "PRIVMSG %s :\1CLIENTINFO\1\r\n" (riece-identity-prefix target)))) @@ -319,10 +310,7 @@ (list (if current-prefix-arg (riece-completing-read-identity "Channel/User: " - (apply #'nconc - (mapcar (lambda (entry) - (riece-get-identities-on-server (car entry))) - riece-server-process-alist))) + (riece-get-identities-on-server (riece-current-server-name))) riece-current-channel) (let (message) (beginning-of-line) diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el index 8643a4e..e1c6908 100644 --- a/lisp/riece-layout.el +++ b/lisp/riece-layout.el @@ -83,7 +83,23 @@ happen unconditionally." (with-current-buffer riece-channel-list-buffer (unless (riece-frozen riece-channel-list-buffer) (set-window-start (get-buffer-window riece-channel-list-buffer) - (point-min)))))) + (point-min))))) + (if (and riece-channel-buffer + (get-buffer-window riece-channel-buffer)) + (with-current-buffer riece-channel-buffer + (unless (riece-frozen riece-channel-buffer) + (set-window-point (get-buffer-window riece-channel-buffer) + (point-max))))) + (if (get-buffer-window riece-others-buffer) + (with-current-buffer riece-others-buffer + (unless (riece-frozen riece-others-buffer) + (set-window-point (get-buffer-window riece-others-buffer) + (point-max))))) + (if (get-buffer-window riece-dialogue-buffer) + (with-current-buffer riece-dialogue-buffer + (unless (riece-frozen riece-dialogue-buffer) + (set-window-point (get-buffer-window riece-dialogue-buffer) + (point-max)))))) (defun riece-reconfigure-windows-predicate () "Return t, if window reconfiguration is needed. -- 1.7.10.4