* texi/gnus-ja.texi (Article Date): Update Japanese translation.

[elisp/gnus.git-] / lisp / nnmbox.el

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index 72e144f..ced6c4f 100644 (file)
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -4,7 +4,7 @@
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news, mail
 
 ;; This file is part of GNU Emacs.
@@ -26,12 +26,14 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'static))
+
 (require 'nnheader)
 (require 'message)
 (require 'nnmail)
 (require 'nnoo)
 (require 'gnus-range)
-(eval-when-compile (require 'cl))
 
 (nnoo-declare nnmbox)
 
@@ -62,9 +64,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)
 
 (defvar nnmbox-group-building-active-articles nil)
@@ -187,11 +189,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
@@ -263,8 +272,8 @@
                (unless (eq nnmail-expiry-target 'delete)
                  (with-temp-buffer
                    (nnmbox-request-article (car articles)
-                                            newsgroup server
-                                            (current-buffer))
+                                           newsgroup server
+                                           (current-buffer))
                    (let ((nnml-current-directory nil))
                      (nnmail-expiry-target-group
                       nnmail-expiry-target newsgroup)))
@@ -623,7 +632,6 @@
                                 nnmbox-file-coding-system))
                            (nnheader-find-file-noselect
                             nnmbox-mbox-file t t))))
-       (mm-enable-multibyte)
        (buffer-disable-undo)
 
        ;; Go through the group alist and compare against the mbox file.