Described 4.0.0 changes.

[elisp/riece.git] / lisp / riece-handle.el

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index e3cc584..9dc1cb7 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -116,8 +116,9 @@
                             (riece-make-identity (car targets)
                                                  riece-server-name)
                             message 'notice
-                            (riece-identity-equal-no-server
-                             user riece-real-nickname)))
+                            (if riece-real-nickname
+                                (riece-identity-equal-no-server
+                                 user riece-real-nickname))))
       ;; message from server
       (riece-insert-notice
        (list riece-dialogue-buffer riece-others-buffer)
@@ -145,7 +146,7 @@
             (buffer (riece-channel-buffer channel-identity)))
        (riece-insert-change
         buffer
-        (format "%s (%s) has joined %s\n"
+        (format (riece-mcat "%s (%s) has joined %s\n")
                 (riece-format-identity user-identity t)
                 (riece-user-get-user-at-host user)
                 (riece-format-identity channel-identity t)))
@@ -156,7 +157,7 @@
           riece-dialogue-buffer)
         (concat
          (riece-concat-server-name
-          (format "%s (%s) has joined %s"
+          (format (riece-mcat "%s (%s) has joined %s")
                   (riece-format-identity user-identity t)
                   (riece-user-get-user-at-host user)
                   (riece-format-identity channel-identity t)))
@@ -183,7 +184,7 @@
         buffer
         (concat
          (riece-concat-message
-          (format "%s has left %s"
+          (format (riece-mcat "%s has left %s")
                   (riece-format-identity user-identity t)
                   (riece-format-identity channel-identity t))
           message)
@@ -196,7 +197,7 @@
         (concat
          (riece-concat-server-name
           (riece-concat-message
-           (format "%s has left %s"
+           (format (riece-mcat "%s has left %s")
                    (riece-format-identity user-identity t)
                    (riece-format-identity channel-identity t))
            message))
@@ -223,7 +224,7 @@
        buffer
        (concat
        (riece-concat-message
-        (format "%s kicked %s out from %s"
+        (format (riece-mcat "%s kicked %s out from %s")
                 (riece-format-identity kicker-identity t)
                 (riece-format-identity user-identity t)
                 (riece-format-identity channel-identity t))
@@ -237,7 +238,7 @@
        (concat
        (riece-concat-server-name
         (riece-concat-message
-         (format "%s kicked %s out from %s\n"
+         (format (riece-mcat "%s kicked %s out from %s\n")
                 (riece-format-identity kicker-identity t)
                 (riece-format-identity user-identity t)
                 (riece-format-identity channel-identity t))
@@ -268,7 +269,7 @@
        buffers
        (concat
        (riece-concat-message
-        (format "%s has left IRC"
+        (format (riece-mcat "%s has left IRC")
                 (riece-format-identity user-identity t))
         message)
        "\n"))
@@ -280,7 +281,7 @@
        (concat
        (riece-concat-server-name
         (riece-concat-message
-         (format "%s has left IRC"
+         (format (riece-mcat "%s has left IRC")
                  (riece-format-identity user-identity t))
          message))
        "\n")))))
@@ -311,7 +312,7 @@
        buffers
        (concat
        (riece-concat-message
-        (format "%s killed %s"
+        (format (riece-mcat "%s killed %s")
                 (riece-format-identity killer-identity t)
                 (riece-format-identity user-identity t))
         message)
@@ -324,7 +325,7 @@
        (concat
        (riece-concat-server-name
         (riece-concat-message
-         (format "%s killed %s"
+         (format (riece-mcat "%s killed %s")
                 (riece-format-identity killer-identity t)
                 (riece-format-identity user-identity t))
          message))
@@ -342,7 +343,7 @@
      (list riece-dialogue-buffer riece-others-buffer)
      (concat
       (riece-concat-server-name
-       (format "%s invites %s to %s"
+       (format (riece-mcat "%s invites %s to %s")
               (riece-format-identity (riece-make-identity
                                       user riece-server-name))
               (riece-format-identity (riece-make-identity
@@ -367,7 +368,7 @@
     (let ((buffer (riece-channel-buffer channel-identity)))
       (riece-insert-change
        buffer
-       (format "Topic by %s: %s\n"
+       (format (riece-mcat "Topic by %s: %s\n")
               (riece-format-identity user-identity t)
               topic))
       (riece-insert-change
@@ -377,7 +378,7 @@
         riece-dialogue-buffer)
        (concat
        (riece-concat-server-name
-        (format "Topic on %s by %s: %s"
+        (format (riece-mcat "Topic on %s by %s: %s")
                 (riece-format-identity channel-identity t)
                 (riece-format-identity user-identity t)
                 topic))
@@ -397,7 +398,7 @@
             (buffer (riece-channel-buffer channel-identity)))
        (riece-insert-change
         buffer
-        (format "Mode by %s: %s\n"
+        (format (riece-mcat "Mode by %s: %s\n")
                 (riece-format-identity user-identity t)
                 string))
        (riece-insert-change
@@ -407,7 +408,7 @@
           riece-dialogue-buffer)
         (concat
          (riece-concat-server-name
-          (format "Mode on %s by %s: %s"
+          (format (riece-mcat "Mode on %s by %s: %s")
                   (riece-format-identity channel-identity t)
                   (riece-format-identity user-identity t)
                   string))