Use the same log file for incoming and outgoing private messages

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e271be..7cf5276 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-26  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-log.el (riece-log-display-message-function): Use the same
+       log file for incoming and outgoing private messages.
+
 2012-07-31  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-commands.el (riece-command-open-server): Open the default

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index c525d25..5eabb8b 100644 (file)
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -100,8 +100,12 @@ It is created if there is at least one instance of Emacs running riece-log.")
                  (or riece-log-coding-system
                      (car (get-language-info current-language-environment
                                              'coding-system)))))
-            (file (riece-log-make-file-name (riece-message-target message)
-                                            coding-system-for-write))
+            (file (riece-log-make-file-name
+                   (if (and (riece-message-private-p message)
+                            (not (riece-message-own-p message)))
+                       (riece-message-speaker message)
+                     (riece-message-target message))
+                   coding-system-for-write))
             (file-name-coding-system 'no-conversion))
        (unless (file-directory-p (file-name-directory file))
          (make-directory (file-name-directory file) t))