X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fnnmbox.el;h=3e502b8abd22b8657e72174b60d6ccb2a79abf27;hb=refs%2Ftags%2Fbefore-feeding-back-t-gnus-6_15-;hp=43b00a65098fed0870c25c37f234ae6445713059;hpb=a707b63af25b91cb730c12e65156ca364bf49a44;p=elisp%2Fgnus.git-

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index 43b00a6..3e502b8 100644
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -26,11 +26,13 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'static))
+
 (require 'nnheader)
 (require 'message)
 (require 'nnmail)
 (require 'nnoo)
-(eval-when-compile (require 'cl))
 
 (nnoo-declare nnmbox)
 
@@ -61,9 +63,9 @@
 (defvoo nnmbox-group-alist nil)
 (defvoo nnmbox-active-timestamp nil)
 
-(defvoo nnmbox-file-coding-system mm-binary-coding-system)
+(defvoo nnmbox-file-coding-system 'binary)
 (defvoo nnmbox-file-coding-system-for-write nil)
-(defvoo nnmbox-active-file-coding-system mm-binary-coding-system)
+(defvoo nnmbox-active-file-coding-system 'binary)
 (defvoo nnmbox-active-file-coding-system-for-write nil)
 
 
@@ -188,11 +190,18 @@
 		       (1+ (- (cdr active) (car active)))
 		       (car active) (cdr active) group)))))
 
-(defun nnmbox-save-buffer ()
-  (let ((coding-system-for-write 
-	 (or nnmbox-file-coding-system-for-write
-	     nnmbox-file-coding-system)))
-    (save-buffer)))
+(static-if (boundp 'MULE)
+    (defun nnmbox-save-buffer ()
+      (let ((output-coding-system
+	     (or nnmbox-file-coding-system-for-write
+		 nnmbox-file-coding-system)))
+	(save-buffer)))
+  (defun nnmbox-save-buffer ()
+    (let ((coding-system-for-write
+	   (or nnmbox-file-coding-system-for-write
+	       nnmbox-file-coding-system)))
+      (save-buffer)))
+  )
 
 (defun nnmbox-save-active (group-alist active-file)
   (let ((nnmail-active-file-coding-system
@@ -450,7 +459,6 @@
 			       nnmbox-file-coding-system))
 			  (nnheader-find-file-noselect
 			   nnmbox-mbox-file nil t))))
-      (mm-enable-multibyte)
       (buffer-disable-undo)))
   (when (not nnmbox-group-alist)
     (nnmail-activate 'nnmbox))
@@ -543,8 +551,7 @@
 				 nnmbox-file-coding-system))
 			    (nnheader-find-file-noselect
 			     nnmbox-mbox-file nil t))))
-	(mm-enable-multibyte)
-	(buffer-disable-undo)
+ 	(buffer-disable-undo)
 
 	;; Go through the group alist and compare against
 	;; the mbox file.