X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-log.el;h=93a4ed915c3e05f19a6bafd0277b55ff096ce843;hb=005b6ff058be7fcdaab3373304bea2925c7efb94;hp=1cd1c60705fa486b993212e42603ceeb7df6e00a;hpb=ecbecf044c5fc72ad6614b9a662c4bb77cf35229;p=elisp%2Friece.git

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 1cd1c60..93a4ed9 100644
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -1,4 +1,4 @@
-;;; riece-log.el --- saving irc logs add-on
+;;; riece-log.el --- Save IRC logs
 ;; Copyright (C) 2003 OHASHI Akira
 ;; Copyright (C) 2004 Daiki Ueno
 
@@ -20,15 +20,12 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;; This add-on saves irc logs for every channel.
-
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-log)
+;;; NOTE: This is an add-on module for Riece.
 
 ;;; Code:
 
@@ -36,7 +33,8 @@
 (require 'riece-button)
 
 (defgroup riece-log nil
-  "Save irc log"
+  "Save IRC logs."
+  :prefix "riece-"
   :group 'riece)
 
 (defcustom riece-log-directory
@@ -91,19 +89,20 @@ It is created if there is at least one instance of Emacs running riece-log.")
 (defconst riece-log-file-name-regexp
   (concat (riece-make-interval-regexp "[0-9]" 8) "\\.txt\\(\\.\\(.*\\)\\)?$"))
 
-(defvar riece-log-enabled nil)
-
 (defconst riece-log-description
-  "Saving IRC logs")
+  "Save IRC logs.")
 
 (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)
+  (if (get 'riece-log 'riece-addon-enabled)
+      (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 +111,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)
@@ -285,14 +287,19 @@ If LINES is t, insert today's logs entirely."
   (add-hook 'riece-channel-buffer-create-functions
 	    'riece-log-flashback))
 
+(defun riece-log-uninstall ()
+  (setq riece-log-lock-file nil)
+  (remove-hook 'riece-after-display-message-functions
+	       'riece-log-display-message-function)
+  (remove-hook 'riece-channel-buffer-create-functions
+	       'riece-log-flashback))
+
 (defvar riece-command-mode-map)
 (defun riece-log-enable ()
-  (define-key riece-command-mode-map "\C-cd" 'riece-log-dired)
-  (setq riece-log-enabled t))
+  (define-key riece-command-mode-map "\C-cd" 'riece-log-dired))
 
 (defun riece-log-disable ()
-  (define-key riece-command-mode-map "\C-cd" nil)
-  (setq riece-log-enabled nil))
+  (define-key riece-command-mode-map "\C-cd" nil))
 
 (provide 'riece-log)