(rmail-enable-decoding-message): Deleted.

(rmail-revert): Bind enable-multibyte-characters to nil before
calling rmail-convert-file.
(rmail-convert-to-babyl-format): If enable-multibyte-characters is
nil, do not convert code.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 83246d59e8d869731a34444197224803d20fc891..4f1d97c50351a071a2e087b7f264c165c22e49b3 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -392,14 +392,6 @@ by substituting the new message number into the existing list.")
 
 This is set to nil by default.")
 
-;;;###autoload
-(defvar rmail-enable-decoding-message nil
-  "*If non-nil, RMAIL decode character code of incomming mails automatically.
-The default value is nil.
-
-Regardless of the value of this variable, MIME messages are decoded
-if rmail-enable-mime is non-nil.")
-
 ;;;###autoload
 (defcustom rmail-enable-mime nil
   "*If non-nil, RMAIL uses MIME feature.
@@ -898,7 +890,7 @@ Instead, these commands are available:
        ;; But, we don't have to convert coding system because backup
        ;; files should have been saved by Emacs' internal format.
        (let ((rmail-file-coding-system nil)
-             (rmail-enable-decoding-message nil))
+             (enable-multibyte-characters nil))
          (rmail-convert-file)
          (goto-char (point-max))
          (rmail-mode)))))
@@ -1402,7 +1394,7 @@ Optional DEFAULT is password to start with."
                   (while (search-forward "\n\^_" nil t); single char "\^_"
                     (replace-match "\n^_")))); 2 chars: "^" and "_"
               (or rmail-enable-mime
-                  (not rmail-enable-decoding-message)
+                  (not enable-multibyte-characters)
                   (decode-coding-region start (point) 'undecided))
               (narrow-to-region (point) (point-max))
               (setq count (1+ count)))
@@ -1465,7 +1457,7 @@ Optional DEFAULT is password to start with."
                     (replace-match "\n^_")))); 2 chars: "^" and "_"
               (insert ?\^_)
               (or rmail-enable-mime
-                  (not rmail-enable-decoding-message)
+                  (not enable-multibyte-characters)
                   (decode-coding-region start (point) 'undecided))
               (narrow-to-region (point) (point-max)))
              ;;