X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-log.el;h=624115b46707e5510d8e47a87fd856acc9e48a91;hb=bf2df5d4bf0f70c7f102eb924e352f83d46f3fa4;hp=55689962176a0c18108f983318c633e9b33bf7bf;hpb=312bb821869adf84c0e0cc3fdfc879dc5b46f0c3;p=elisp%2Friece.git

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 5568996..624115b 100644
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -20,8 +20,8 @@
 
 ;; 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:
 
@@ -31,6 +31,7 @@
 
 (require 'riece-message)
 (require 'riece-button)
+(require 'riece-mcat)
 
 (defgroup riece-log nil
   "Save IRC logs."
@@ -89,13 +90,11 @@ 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
   "Save IRC logs.")
 
 (defun riece-log-display-message-function (message)
-  (if riece-log-enabled
+  (if (get 'riece-log 'riece-addon-enabled)
       (let* ((coding-system-for-write
 	      (if (featurep 'mule)
 		  (or riece-log-coding-system
@@ -239,8 +238,9 @@ If LINES is t, insert today's logs entirely."
   (when riece-log-flashback
     (riece-insert-info (current-buffer)
 		       (if (eq riece-log-flashback t)
-			   "Recent messages of the day:\n"
-			 (format "Recent messages up to %d lines:\n"
+			   (riece-mcat "Recent messages of the day:\n")
+			 (format (riece-mcat
+				  "Recent messages up to %d lines:\n")
 				 riece-log-flashback)))
     (let (buffer-read-only
 	  (point (goto-char (point-max))))
@@ -298,12 +298,10 @@ If LINES is t, insert today's logs entirely."
 
 (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)