* riece-ctcp.el: "Error occurred in XXX" -> "Error in XXX".

* riece-filter.el: "Error occurred in XXX" -> "Error in XXX".
* riece-signal.el: "Error occurred in XXX" -> "Error in XXX".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0fc4b5..e85fe98 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-13  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-ctcp.el: "Error occurred in XXX" -> "Error in XXX".
+       * riece-filter.el: "Error occurred in XXX" -> "Error in XXX".
+       * riece-signal.el: "Error occurred in XXX" -> "Error in XXX".
+
 2004-03-09  Daiki Ueno  <ueno@unixuser.org>
 
        * Riece: Version 0.2.1 released.

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 8f19673..79a22da 100644 (file)
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -90,21 +90,21 @@
                           hook prefix (car targets) message)
                        (error
                         (if riece-debug
-                            (message "Error occurred in `%S': %S" hook error))
+                            (message "Error in `%S': %S" hook error))
                         nil))
                (if function
                    (condition-case error
                        (funcall function prefix (car targets) message)
                      (error
                       (if riece-debug
-                          (message "Error occurred in `%S': %S"
+                          (message "Error in `%S': %S"
                                    function error))))))
              (condition-case error
                  (run-hook-with-args-until-success
                   after-hook prefix (car targets) message)
                (error
                 (if riece-debug
-                    (message "Error occurred in `%S': %S"
+                    (message "Error in `%S': %S"
                              after-hook error)))))
            t)))))
 
@@ -225,21 +225,21 @@
                           hook prefix (car targets) message)
                        (error
                         (if riece-debug
-                            (message "Error occurred in `%S': %S" hook error))
+                            (message "Error in `%S': %S" hook error))
                         nil))
                (if function
                    (condition-case error
                        (funcall function prefix (car targets) message)
                      (error
                       (if riece-debug
-                          (message "Error occurred in `%S': %S"
+                          (message "Error in `%S': %S"
                                    function error))))))
              (condition-case error
                  (run-hook-with-args-until-success
                   after-hook prefix (car targets) message)
                (error
                 (if riece-debug
-                    (message "Error occurred in `%S': %S"
+                    (message "Error in `%S': %S"
                              after-hook error)))))
            t)))))
 

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index f888921..5c1b42b 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -48,7 +48,7 @@
                     (riece-decode-coding-string string))
          (error
           (if riece-debug
-              (message "Error occurred in `%S': %S" function error)))))))
+              (message "Error in `%S': %S" function error)))))))
 
 (defun riece-default-handle-numeric-reply
   (client-prefix prefix number name string)
@@ -74,19 +74,19 @@
                (run-hook-with-args-until-success hook prefix string)
              (error
               (if riece-debug
-                  (message "Error occurred in `%S': %S" hook error))
+                  (message "Error in `%S': %S" hook error))
               nil))
       (if function
          (condition-case error
              (funcall function prefix string)
            (error
             (if riece-debug
-                (message "Error occurred in `%S': %S" function error)))))
+                (message "Error in `%S': %S" function error)))))
       (condition-case error
          (run-hook-with-args-until-success after-hook prefix string)
        (error
         (if riece-debug
-            (message "Error occurred in `%S': %S" after-hook error)))))))
+            (message "Error in `%S': %S" after-hook error)))))))
 
 (defun riece-filter (process input)
   (save-excursion

diff --git a/lisp/riece-signal.el b/lisp/riece-signal.el
index 7fedd2f..08d9d52 100644 (file)
--- a/lisp/riece-signal.el
+++ b/lisp/riece-signal.el
@@ -93,14 +93,14 @@ This function is for internal use only."
                      (error
                       (if riece-debug
                           (message
-                           "Error occurred in signal filter for \"%S\": %S"
+                           "Error in signal filter for \"%S\": %S"
                            signal-name error)))
                      nil))
                (funcall (riece-slot-function (car slots))
                         signal (riece-slot-handback (car slots))))
          (error
           (if riece-debug
-              (message "Error occurred in slot function for \"%S\": %S"
+              (message "Error in slot function for \"%S\": %S"
                        signal-name error))))
        (setq slots (cdr slots))))))