comparison lisp/mail/rmail.el @ 17762:dfefaeb20c75

(rmail-enable-decoding-message): New variable. (rmail-convert-file): Comment fixed. (rmail-revert): Do not decode RMAIL file again because the backup file is saved in Emacs internal format. (rmail-convert-to-babyl-format): Check rmail-enable-decoding-message.

17761:c5f430853301

;;;###autoload
(defvar rmail-file-coding-system nil
  "Coding system used in RMAIL file.

This is set to nil by default.")

;;;###autoload
(defcustom rmail-enable-mime nil
  "*If non-nil, RMAIL uses MIME feature.
If the value is t, RMAIL automatically shows MIME decoded message.

	   (setq convert t)
	   (rmail-insert-rmail-file-header)))
    (if (and (not convert)
	     (not rmail-enable-mime)
	     rmail-file-coding-system)
	;; Decode BABYL part at the headq only.  The remaining non
	;; BABYL parts are decode in rmail-convert-to-babyl-format if
	;; necessary..
	(rmail-decode-babyl-format))
    ;; If file was not a Babyl file or if there are
    ;; Unix format messages added at the end,
    ;; convert file as necessary.
    (if (or convert

  (let ((revert-buffer-function (default-value 'revert-buffer-function)))
    ;; Call our caller again, but this time it does the default thing.
    (if (revert-buffer arg noconfirm)
	;; If the user said "yes", and we changed something,
	;; reparse the messages.
	(progn
	  (rmail-convert-file)
	  (goto-char (point-max))
	  (rmail-mode)))))

;; Return a list of files from this buffer's Mail: option.

		   (narrow-to-region start (1- (point)))
		   (goto-char (point-min))
		   (while (search-forward "\n\^_" nil t); single char "\^_"
		     (replace-match "\n^_")))); 2 chars: "^" and "_"
	       (or rmail-enable-mime
		   (not rmail-file-coding-system)
		   (decode-coding-region start (point) 'automatic-conversion))
	       (narrow-to-region (point) (point-max))
	       (setq count (1+ count)))
	      ;;*** Mail format
	      ((looking-at "^From ")

		   (goto-char (point-min))
		   (while (search-forward "\n\^_" nil t); single char
		     (replace-match "\n^_")))); 2 chars: "^" and "_"
	       (insert ?\^_)
	       (or rmail-enable-mime
		   (not rmail-file-coding-system)
		   (decode-coding-region start (point) 'automatic-conversion))
	       (narrow-to-region (point) (point-max)))
	      ;;
	      ;; This kludge is because some versions of sendmail.el
	      ;; insert an extra newline at the beginning that shouldn't

17762:dfefaeb20c75

;;;###autoload
(defvar rmail-file-coding-system nil
  "Coding system used in RMAIL file.

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.
If the value is t, RMAIL automatically shows MIME decoded message.

	   (setq convert t)
	   (rmail-insert-rmail-file-header)))
    (if (and (not convert)
	     (not rmail-enable-mime)
	     rmail-file-coding-system)
	;; Decode coding system of BABYL part at the head only.  The
	;; remaining non BABYL parts are decoded in
	;; rmail-convert-to-babyl-format if necessary.
	(rmail-decode-babyl-format))
    ;; If file was not a Babyl file or if there are
    ;; Unix format messages added at the end,
    ;; convert file as necessary.
    (if (or convert

  (let ((revert-buffer-function (default-value 'revert-buffer-function)))
    ;; Call our caller again, but this time it does the default thing.
    (if (revert-buffer arg noconfirm)
	;; If the user said "yes", and we changed something,
	;; reparse the messages.
	;; 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))
	  (rmail-convert-file)
	  (goto-char (point-max))
	  (rmail-mode)))))

;; Return a list of files from this buffer's Mail: option.

		   (narrow-to-region start (1- (point)))
		   (goto-char (point-min))
		   (while (search-forward "\n\^_" nil t); single char "\^_"
		     (replace-match "\n^_")))); 2 chars: "^" and "_"
	       (or rmail-enable-mime
		   (not rmail-enable-decoding-message)
		   (decode-coding-region start (point) 'automatic-conversion))
	       (narrow-to-region (point) (point-max))
	       (setq count (1+ count)))
	      ;;*** Mail format
	      ((looking-at "^From ")

		   (goto-char (point-min))
		   (while (search-forward "\n\^_" nil t); single char
		     (replace-match "\n^_")))); 2 chars: "^" and "_"
	       (insert ?\^_)
	       (or rmail-enable-mime
		   (not rmail-enable-decoding-message)
		   (decode-coding-region start (point) 'automatic-conversion))
	       (narrow-to-region (point) (point-max)))
	      ;;
	      ;; This kludge is because some versions of sendmail.el
	      ;; insert an extra newline at the beginning that shouldn't