X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mixi-gnus.el;h=009dd21376680d3ab68b667cbea1be9ebb087b3f;hb=13307b6d03ef2420dadd7ef96a85ba7c1d126ece;hp=82fb1cc2b598ff4d46d7ee3b54e37f9d7c06cc55;hpb=0d5a9286069e1bb3779644f61c7c3a6d29ff5381;p=elisp%2Fmixi.git

diff --git a/mixi-gnus.el b/mixi-gnus.el
index 82fb1cc..009dd21 100644
--- a/mixi-gnus.el
+++ b/mixi-gnus.el
@@ -34,19 +34,8 @@
 
 ;;; Code:
 
-(require 'sb-mixi)
-
-;; 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"))
+(require 'mixi-utils)
+(require 'message)
 
 (defun message-mixi-p ()
   "Say whether the current buffer contains a mixi message."
@@ -55,8 +44,7 @@
 	 (save-restriction
 	   (message-narrow-to-headers)
 	   (or (message-fetch-field "mixi-to")
-	       (string-match shimbun-mixi-to-regexp
-			     (message-fetch-field "to")))))))
+	       (string-match mixi-to-regexp (message-fetch-field "to")))))))
 
 (defun message-send-via-mixi (arg)
   "Send the current message via mixi."
@@ -77,10 +65,10 @@
 	  (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-to")
-				  (message-fetch-field "subject")
-				  (buffer-substring (message-goto-body)
-						    (point-max))))
+	  (mixi-send-mail (message-fetch-field "mixi-to")
+			  (message-fetch-field "subject")
+			  (buffer-substring (message-goto-body)
+					    (point-max))))
       (kill-buffer tembuf))
     (set-buffer mailbuf)
     (push 'mixi message-sent-message-via)))