* riece-ctlseq.el: Require 'riece-message for riece-message-text;

[riece] / lisp / riece-ctcp.el

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 37061bc..f1fd937 100644 (file)
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -27,6 +27,7 @@
 (require 'riece-version)
 (require 'riece-misc)
 (require 'riece-highlight)
+(require 'riece-display)
 
 (defface riece-ctcp-action-face
   '((((class color)
@@ -90,29 +91,29 @@
                           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)))))
 
 (defun riece-handle-ctcp-version-request (prefix target string)
-  (let ((buffer (if (riece-channel-p target)
-                   (riece-channel-buffer (riece-make-identity
-                                          target riece-server-name))))
-       (user (riece-prefix-nickname prefix)))
+  (let* ((target-identity (riece-make-identity target riece-server-name))
+        (buffer (if (riece-channel-p target)
+                    (riece-channel-buffer target-identity)))
+        (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (format "NOTICE %s :\1VERSION %s\1\r\n" user (riece-extended-version)))
     (riece-insert-change buffer (format "CTCP VERSION from %s\n" user))
@@ -126,14 +127,14 @@
        (format "CTCP VERSION from %s (%s) to %s"
               user
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
-              (riece-format-identity target t)))
+              (riece-format-identity target-identity t)))
       "\n"))))
 
 (defun riece-handle-ctcp-ping-request (prefix target string)
-  (let ((buffer (if (riece-channel-p target)
-                   (riece-channel-buffer (riece-make-identity
-                                          target riece-server-name))))
-       (user (riece-prefix-nickname prefix)))
+  (let* ((target-identity (riece-make-identity target riece-server-name))
+        (buffer (if (riece-channel-p target)
+                    (riece-channel-buffer target-identity)))
+        (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (if string
         (format "NOTICE %s :\1PING %s\1\r\n" user string)
@@ -149,14 +150,14 @@
        (format "CTCP PING from %s (%s) to %s"
               user
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
-              (riece-format-identity target t)))
+              (riece-format-identity target-identity t)))
       "\n"))))
 
 (defun riece-handle-ctcp-clientinfo-request (prefix target string)
-  (let ((buffer (if (riece-channel-p target)
-                   (riece-channel-buffer (riece-make-identity
-                                          target riece-server-name))))
-       (user (riece-prefix-nickname prefix)))
+  (let* ((target-identity (riece-make-identity target riece-server-name))
+        (buffer (if (riece-channel-p target)
+                    (riece-channel-buffer target-identity)))
+        (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (format "NOTICE %s :\1CLIENTINFO %s\1\r\n"
             user
@@ -185,7 +186,7 @@
        (format "CTCP CLIENTINFO from %s (%s) to %s"
               user
               (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
-              (riece-format-identity target t)))
+              (riece-format-identity target-identity t)))
       "\n"))))
 
 (defun riece-handle-ctcp-action-request (prefix target string)
@@ -225,21 +226,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)))))