X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mixi-gnus.el;h=82fb1cc2b598ff4d46d7ee3b54e37f9d7c06cc55;hb=dfda4558bd9f337a3ec7e0ac9b6944607c1f03fc;hp=5557ea406160599453f586394b372c37715cac54;hpb=75d3483bfd4e9bb61dead0631a805bee37a3cd1f;p=elisp%2Fmixi.git

diff --git a/mixi-gnus.el b/mixi-gnus.el
index 5557ea4..82fb1cc 100644
--- a/mixi-gnus.el
+++ b/mixi-gnus.el
@@ -35,7 +35,18 @@
 ;;; Code:
 
 (require 'sb-mixi)
-(require 'message)
+
+;; Functions and variables which should be defined in the other module
+;; at run-time.
+(eval-when-compile
+  (defvar message-this-is-news)
+  (defvar message-sent-message-via)
+  (defvar message-send-method-alist)
+  (autoload 'message-narrow-to-headers "message")
+  (autoload 'message-fetch-field "message")
+  (autoload 'message-generate-new-buffer-clone-locals "message")
+  (autoload 'message-goto-body "message")
+  (autoload 'mml-buffer-substring-no-properties-except-hard-newlines "mml"))
 
 (defun message-mixi-p ()
   "Say whether the current buffer contains a mixi message."
@@ -43,7 +54,7 @@
        (save-excursion
 	 (save-restriction
 	   (message-narrow-to-headers)
-	   (or (message-fetch-field "mixi")
+	   (or (message-fetch-field "mixi-to")
 	       (string-match shimbun-mixi-to-regexp
 			     (message-fetch-field "to")))))))
 
@@ -55,8 +66,9 @@
     ;; Avoid matching with message-mail-p.
     (with-current-buffer mailbuf
       (goto-char (point-min))
-      (when (search-forward "\nTo: " nil t)
-	(replace-match "\nMixi: ")))
+      (unless (search-forward "\nMixi-To: " nil t)
+	(when (search-forward "\nTo: " nil t)
+	  (replace-match "\nMixi-To: "))))
     (unwind-protect
 	(save-excursion
 	  (set-buffer tembuf)
@@ -65,7 +77,7 @@
 	  (insert (with-current-buffer mailbuf
 		    (mml-buffer-substring-no-properties-except-hard-newlines
 		     (point-min) (point-max))))
-	  (shimbun-mixi-send-mail (message-fetch-field "mixi")
+	  (shimbun-mixi-send-mail (message-fetch-field "mixi-to")
 				  (message-fetch-field "subject")
 				  (buffer-substring (message-goto-body)
 						    (point-max))))
@@ -77,8 +89,7 @@
   (let ((method '(mixi message-mixi-p message-send-via-mixi)))
     (unless (member method message-send-method-alist)
       (setq message-send-method-alist
-	    (cons '(mixi message-mixi-p message-send-via-mixi)
-		  message-send-method-alist)))))
+	    (cons method message-send-method-alist)))))
 
 (provide 'mixi-gnus)