* riece-addon.el (riece-command-list-addons): Use

[riece] / lisp / riece-log.el

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 1cd1c60..0dfd3ef 100644 (file)
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -36,7 +36,8 @@
 (require 'riece-button)
 
 (defgroup riece-log nil
-  "Save irc log"
+  "Save IRC logs."
+  :prefix "riece-"
   :group 'riece)
 
 (defcustom riece-log-directory
@@ -98,12 +99,15 @@ It is created if there is at least one instance of Emacs running riece-log.")
 
 (defun riece-log-display-message-function (message)
   (if riece-log-enabled
-      (let ((coding-system-for-write (or riece-log-coding-system
-                                        buffer-file-coding-system))
-           (file (riece-log-make-file-name (riece-message-target message)
-                                           coding-system-for-write))
-           file-name-coding-system
-           default-file-name-coding-system)
+      (let* ((coding-system-for-write
+             (if (featurep 'mule)
+                 (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-name-coding-system
+            default-file-name-coding-system)
        (unless (file-directory-p (file-name-directory file))
          (make-directory (file-name-directory file) t))
        (write-region (concat (format-time-string "%H:%M") " "
@@ -112,9 +116,12 @@ It is created if there is at least one instance of Emacs running riece-log.")
                      riece-log-lock-file))))
 
 (defun riece-log-make-file-name (identity coding-system)
-  (expand-file-name (format "%s.txt.%s"
-                           (format-time-string "%Y%m%d")
-                           coding-system)
+  (expand-file-name (if (featurep 'mule)
+                       (format "%s.txt.%s"
+                               (format-time-string "%Y%m%d")
+                               coding-system)
+                     (format "%s.txt"
+                               (format-time-string "%Y%m%d")))
                    (riece-log-directory identity)))
 
 (defun riece-log-list-files (identity time)