From e7568cae27a5d991c2818161169fa6ab85b2f388 Mon Sep 17 00:00:00 2001 From: ueno Date: Mon, 25 Aug 2003 00:12:27 +0000 Subject: [PATCH] * riece.el (riece-dialogue-mode-map): Bind riece-command-change-layout. (riece): Switch to riece-command-buffer before riece-redisplay-buffers. * riece-unread.el: Require 'riece-commands. * riece-server.el: Require 'riece-identity and 'riece-compat. * riece-ndcc.el: Require 'riece-globals, 'riece-options, 'riece-display. (riece-handle-dcc-request): Use riece-channel-buffer-name. * riece-identity.el: Don't require 'riece-server. * riece-doctor.el: Require 'riece-globals, 'riece-identity, 'riece-message, and 'riece-server. * riece-ctcp.el: Require 'riece-display. * riece-commands.el: Require 'riece-layout. (riece-command-change-layout): New command. * riece-alias.el: Require 'riece-identity. --- lisp/COMPILE | 3 ++- lisp/ChangeLog | 23 +++++++++++++++++++++++ lisp/riece-alias.el | 2 ++ lisp/riece-commands.el | 7 +++++++ lisp/riece-ctcp.el | 1 + lisp/riece-doctor.el | 5 +++++ lisp/riece-identity.el | 1 - lisp/riece-ndcc.el | 11 +++++++---- lisp/riece-server.el | 2 ++ lisp/riece-unread.el | 3 ++- lisp/riece.el | 2 ++ 11 files changed, 53 insertions(+), 7 deletions(-) diff --git a/lisp/COMPILE b/lisp/COMPILE index f529579..4b79abc 100644 --- a/lisp/COMPILE +++ b/lisp/COMPILE @@ -18,6 +18,8 @@ riece-user riece-misc + ;; riece-layout ---> riece-display + riece-layout riece-display riece-server @@ -48,7 +50,6 @@ riece-unread riece-doctor riece-alias - riece-layout riece-skk-kakutei)))) (defun riece-compile-modules (modules) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b34a40f..e38a90c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,28 @@ 2003-08-25 Daiki Ueno + * riece.el (riece-dialogue-mode-map): Bind riece-command-change-layout. + (riece): Switch to riece-command-buffer before riece-redisplay-buffers. + + * riece-unread.el: Require 'riece-commands. + + * riece-server.el: Require 'riece-identity and 'riece-compat. + + * riece-ndcc.el: Require 'riece-globals, 'riece-options, + 'riece-display. + (riece-handle-dcc-request): Use riece-channel-buffer-name. + + * riece-identity.el: Don't require 'riece-server. + + * riece-doctor.el: Require 'riece-globals, 'riece-identity, + 'riece-message, and 'riece-server. + + * riece-ctcp.el: Require 'riece-display. + + * riece-commands.el: Require 'riece-layout. + (riece-command-change-layout): New command. + + * riece-alias.el: Require 'riece-identity. + * riece-layout.el: No longer provided as an add-on. * riece-display.el: Remove window configuration stuff. diff --git a/lisp/riece-alias.el b/lisp/riece-alias.el index dae97f5..4755310 100644 --- a/lisp/riece-alias.el +++ b/lisp/riece-alias.el @@ -32,6 +32,8 @@ ;;; Code: +(require 'riece-identity) + (defgroup riece-alias nil "Define aliases of names" :prefix "riece-" diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el index 8303504..a4c0cf2 100644 --- a/lisp/riece-commands.el +++ b/lisp/riece-commands.el @@ -26,6 +26,7 @@ (require 'riece-channel) (require 'riece-complete) +(require 'riece-layout) (require 'riece-display) (require 'riece-version) (require 'riece-server) @@ -112,6 +113,12 @@ (interactive) (riece-redisplay-buffers t)) +(defun riece-command-change-layout (name) + "Select a layout-name from all current available layouts and change +the layout to the selected layout-name." + (interactive (list (completing-read "Layout: " riece-layout-alist))) + (customize-set-variable 'riece-layout name)) + (defun riece-command-toggle-channel-buffer-mode () (interactive) (setq riece-channel-buffer-mode diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el index 78a4dae..804b705 100644 --- a/lisp/riece-ctcp.el +++ b/lisp/riece-ctcp.el @@ -26,6 +26,7 @@ (require 'riece-version) (require 'riece-misc) +(require 'riece-display) (defvar riece-ctcp-ping-time nil) (defvar riece-ctcp-additional-clientinfo nil) diff --git a/lisp/riece-doctor.el b/lisp/riece-doctor.el index c922c9e..bd9ef47 100644 --- a/lisp/riece-doctor.el +++ b/lisp/riece-doctor.el @@ -30,6 +30,11 @@ ;;; Code: +(require 'riece-globals) +(require 'riece-identity) +(require 'riece-message) +(require 'riece-server) + (defgroup riece-doctor nil "Interface to doctor.el" :prefix "riece-" diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el index 0def749..6b6eedf 100644 --- a/lisp/riece-identity.el +++ b/lisp/riece-identity.el @@ -26,7 +26,6 @@ (require 'riece-globals) (require 'riece-coding) -(require 'riece-server) (require 'riece-compat) ;riece-set-case-syntax-pair (defvar riece-abbrev-identity-string-function nil) diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el index ca9244c..a5a9ae8 100644 --- a/lisp/riece-ndcc.el +++ b/lisp/riece-ndcc.el @@ -23,6 +23,10 @@ ;;; Code: +(require 'riece-globals) +(require 'riece-options) +(require 'riece-display) + (require 'calc) (defgroup riece-ndcc nil @@ -169,7 +173,7 @@ Only used for sending files." "DCC" " *DCC*" (riece-ndcc-decode-address (nth 2 request)) (nth 3 request)))) - (setq riece-rdcc-requests (delq request riece-rdcc-requests)) + (setq riece-ndcc-requests (delq request riece-ndcc-requests)) (with-current-buffer (process-buffer process) (set-buffer-multibyte nil) (buffer-disable-undo) @@ -191,9 +195,8 @@ Only used for sending files." (port (string-to-number (match-string 3 message))) (size (string-to-number (match-string 4 message))) (buffer (if (riece-channel-p target) - (cdr (riece-identity-assoc - (riece-make-identity target) - riece-channel-buffer-alist)))) + (riece-channel-buffer-name + (riece-make-identity target riece-server-name)))) (user (riece-prefix-nickname prefix))) (setq riece-ndcc-requests (cons (list user file address port size) diff --git a/lisp/riece-server.el b/lisp/riece-server.el index 3d6e366..756598b 100644 --- a/lisp/riece-server.el +++ b/lisp/riece-server.el @@ -27,6 +27,8 @@ (require 'riece-options) (require 'riece-globals) ;for server local variables. (require 'riece-coding) ;riece-default-coding-system +(require 'riece-identity) +(require 'riece-compat) (eval-and-compile (defvar riece-server-keyword-map diff --git a/lisp/riece-unread.el b/lisp/riece-unread.el index 21a8771..8f42ddc 100644 --- a/lisp/riece-unread.el +++ b/lisp/riece-unread.el @@ -31,7 +31,8 @@ ;;; Code: -(eval-when-compile (require 'riece-message)) +(require 'riece-message) +(require 'riece-commands) (defvar riece-unread-channels nil) diff --git a/lisp/riece.el b/lisp/riece.el index ade5273..4de3a8b 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -142,6 +142,7 @@ If optional argument SAFE is nil, overwrite previous definitions." "\C-tu" riece-command-toggle-user-list-buffer-mode "\C-tc" riece-command-toggle-channel-buffer-mode "\C-tC" riece-command-toggle-channel-list-buffer-mode + "\C-tl" riece-command-change-layout "i" riece-command-invite "j" riece-command-join "\C-k" riece-command-kick @@ -250,6 +251,7 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (if (stringp riece-server) (setq riece-server (riece-server-name-to-server riece-server))) (riece-create-buffers) + (switch-to-buffer riece-command-buffer) (riece-redisplay-buffers) (riece-open-server riece-server "") (run-hooks 'riece-startup-hook) -- 1.7.10.4