From 7b239924e043d1a519b5efe06049c2cdf2e45c54 Mon Sep 17 00:00:00 2001 From: ueno Date: Sun, 18 Jul 2004 11:52:08 +0000 Subject: [PATCH] * riece-handle.el (riece-300): Require 'riece-000, 'riece-200, 'riece-300, 'riece-400, and 'riece-500. (riece-default-handle-numeric-reply): Moved from riece-filter.el. * riece-filter.el (riece-handle-numeric-reply): Don't load riece-{000,200,300,400,500}.el on demand. --- lisp/ChangeLog | 8 ++++++++ lisp/riece-filter.el | 12 ------------ lisp/riece-handle.el | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8bdc8ac..dbbc5bf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2004-07-18 Daiki Ueno + + * riece-handle.el (riece-300): Require 'riece-000, 'riece-200, + 'riece-300, 'riece-400, and 'riece-500. + (riece-default-handle-numeric-reply): Moved from riece-filter.el. + * riece-filter.el (riece-handle-numeric-reply): Don't load + riece-{000,200,300,400,500}.el on demand. + 2004-07-10 Daiki Ueno * Riece: Version 1.0.1 released. diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el index 5c1b42b..5dc9cf6 100644 --- a/lisp/riece-filter.el +++ b/lisp/riece-filter.el @@ -32,9 +32,6 @@ (defun riece-handle-numeric-reply (prefix number name string) (let ((base-number (* (/ number 100) 100)) function) - (condition-case nil - (require (intern (format "riece-%03d" base-number))) - (error)) (setq function (intern-soft (format "riece-handle-%03d-message" number))) (unless (and function (symbol-function function)) @@ -50,15 +47,6 @@ (if riece-debug (message "Error in `%S': %S" function error))))))) -(defun riece-default-handle-numeric-reply - (client-prefix prefix number name string) - (riece-insert - (list riece-dialogue-buffer riece-others-buffer) - (concat client-prefix - (riece-concat-server-name - (mapconcat #'identity (riece-split-parameters string) " ")) - "\n"))) - (defun riece-handle-message (prefix message string) (if (and prefix (string-match "![^\x00\x0d\x0a @]+@" prefix)) diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el index f08270d..75b88be 100644 --- a/lisp/riece-handle.el +++ b/lisp/riece-handle.el @@ -30,6 +30,20 @@ (require 'riece-naming) (require 'riece-signal) (require 'riece-mode) +(require 'riece-000) +(require 'riece-200) +(require 'riece-300) +(require 'riece-400) +(require 'riece-500) + +(defun riece-default-handle-numeric-reply + (client-prefix prefix number name string) + (riece-insert + (list riece-dialogue-buffer riece-others-buffer) + (concat client-prefix + (riece-concat-server-name + (mapconcat #'identity (riece-split-parameters string) " ")) + "\n"))) (defun riece-handle-nick-message (prefix string) (let* ((old (riece-prefix-nickname prefix)) -- 1.7.10.4