From: ueno <ueno>
Date: Wed, 17 Aug 2005 00:51:31 +0000 (+0000)
Subject: * riece-filter.el (riece-handle-message): Use
X-Git-Tag: channel-coding-branchpoint~85
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a05f503e01d1ed85ca8d9cf43c53221f86d7f375;p=elisp%2Friece.git

* riece-filter.el (riece-handle-message): Use
riece-funcall-ignore-errors instead of riece-ignore-errors.

* riece-ctcp.el (riece-handle-ctcp-request): Use
riece-funcall-ignore-errors instead of riece-ignore-errors.
(riece-handle-ctcp-response): Ditto.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 798123a..5fc2b20 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-17  Daiki Ueno  <ueno@unixuser.org>
+
+	* riece-filter.el (riece-handle-message): Use
+	riece-funcall-ignore-errors instead of riece-ignore-errors.
+
+	* riece-ctcp.el (riece-handle-ctcp-request): Use
+	riece-funcall-ignore-errors instead of riece-ignore-errors.
+	(riece-handle-ctcp-response): Ditto.
+
 2005-08-16  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-options.el (riece-data-directory): Use load-file-name.
diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 45eebf8..7e1948c 100644
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -73,16 +73,18 @@
 		  (after-hook
 		   (intern (concat "riece-ctcp-after-" request
 				   "-request-hook"))))
-	      (unless (riece-ignore-errors (symbol-name hook)
-			(run-hook-with-args-until-success
-			 hook prefix (car targets) message))
+	      (unless (riece-funcall-ignore-errors
+		       (symbol-name hook)
+		       #'run-hook-with-args-until-success
+		       hook prefix (car targets) message)
 		(if function
 		    (riece-funcall-ignore-errors (symbol-name function)
 						  function prefix (car targets)
 						  message))
-		(riece-ignore-errors (symbol-name after-hook)
-		  (run-hook-with-args-until-success
-		   after-hook prefix (car targets) message))))
+		(riece-funcall-ignore-errors (symbol-name after-hook)
+					     #'run-hook-with-args-until-success
+					     after-hook prefix (car targets)
+					     message)))
 	    t)))))
 
 (defun riece-handle-ctcp-version-request (prefix target string)
@@ -231,16 +233,18 @@
 		  (after-hook
 		   (intern (concat "riece-ctcp-after-" response
 				   "-response-hook"))))
-	      (unless (riece-ignore-errors (symbol-name hook)
-			(run-hook-with-args-until-success
-			 hook prefix (car targets) message))
+	      (unless (riece-funcall-ignore-errors
+		       (symbol-name hook)
+		       #'run-hook-with-args-until-success
+		       hook prefix (car targets) message)
 		(if function
 		    (riece-funcall-ignore-errors
 		     (symbol-name function)
 		     function prefix (car targets) message))
-		(riece-ignore-errors (symbol-name after-hook)
-		  (run-hook-with-args-until-success
-		   after-hook prefix (car targets) message))))
+		(riece-funcall-ignore-errors (symbol-name after-hook)
+					     #'run-hook-with-args-until-success
+					     after-hook prefix (car targets)
+					     message)))
 	    t)))))
 
 (defun riece-handle-ctcp-version-response (prefix target string)
diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 7f739be..44b5eda 100644
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -41,9 +41,7 @@
 	     (format "riece-handle-default-%03d-message" base-number))))
     (if (and function
 	     (symbol-function function))
-	(riece-funcall-ignore-errors (if (symbolp function)
-					 (symbol-name function)
-				       (format "numeric-reply-%d" number))
+	(riece-funcall-ignore-errors (symbol-name function)
 				     function prefix number name
 				     (riece-decode-coding-string string)))))
 
@@ -58,19 +56,15 @@
   (let ((function (intern-soft (concat "riece-handle-" message "-message")))
 	(hook (intern (concat "riece-" message "-hook")))
 	(after-hook (intern (concat "riece-after-" message "-hook"))))
-    (unless (riece-ignore-errors (if (symbolp hook)
-				     (symbol-name hook)
-				   (format "%s-hook" message))
-	      (run-hook-with-args-until-success hook prefix string))
+    (unless (riece-funcall-ignore-errors (symbol-name hook)
+					 #'run-hook-with-args-until-success
+					 hook prefix string)
       (if function
-	  (riece-funcall-ignore-errors (if (symbolp function)
-					   (symbol-name function)
-					 (format "message-%s" message))
+	  (riece-funcall-ignore-errors (symbol-name function)
 				       function prefix string))
-      (riece-ignore-errors (if (symbolp after-hook)
-			       (symbol-name after-hook)
-			     (format "%s-after-hook" message))
-	(run-hook-with-args-until-success after-hook prefix string)))))
+      (riece-funcall-ignore-errors (symbol-name after-hook)
+				   #'run-hook-with-args-until-success
+				   after-hook prefix string))))
 
 (defsubst riece-chomp-string (string)
   (if (string-match "\r\\'" string)