comparison lisp/mail/rmail.el @ 88268:6a755a3db87f

(rmail-process-new-messages): Don't decode messages here. (rmail-decode-messages): New function. (rmail): Use it. (rmail-get-new-mail): Likewise.

88267:960c11d84a7d

		(let ((inhibit-read-only t))
		  (erase-buffer)
		  (insert-file-contents-literally new-file))
		(message "Replacing BABYL format with mbox format...done"))
	    (delete-file old-file)
	    (delete-file new-file))))
      (goto-char (point-max))
      (rmail-mode-2)
      ;; setup files coding system
      (rmail-decode-mail-file)
      ;;  We use `run-mail-hook' to remember whether we should run

		(unless (equal (point-min) (point-max))
		  (setq new-messages (rmail-process-new-messages)
			rmail-current-message (1+ rmail-total-messages)
			rmail-total-messages (rmail-desc-get-count))
		  (run-hooks 'rmail-get-new-mail-hook)
		  (save-buffer))
		;; Delete the old files, now that the RMAIL file is
		;; saved.
		(rmail-delete-inbox-files delete-files)))
	    (if (= new-messages 0)

	(setq coding-system last-coding-system-used))
      (set-buffer-modified-p modifiedp)
      (setq buffer-file-coding-system nil)
      (setq save-buffer-coding-system (or coding-system 'undecided)))))


;;;; *** Rmail Message Formatting and Header Manipulation ***

(defun rmail-clear-headers (&optional ignored-headers)
  "Delete all header fields that Rmail should not show.

		  (goto-char (point-max))
		  (while (search-backward "\r\n" (point-min) t)
		    (delete-char 1)))
		(setq end (marker-position end-marker))
		(set-marker end-marker nil)))

	  ;; Decode Message according to charset.
	  (setq last-coding-system-used nil)
	  (or rmail-enable-mime
	      (not rmail-enable-multibyte)
	      (let ((mime-charset
		     (when (and rmail-decode-mime-charset
				(save-excursion
				  (goto-char (rmail-header-get-limit))
				  (let ((case-fold-search t))
				    (re-search-backward
				     rmail-mime-charset-pattern
				     (point-min) t))))
			 (intern (downcase (match-string 1))))))
		(rmail-decode-region start (point) mime-charset)))

	  ;; Add an X-Coding-System header if we don't have one.
	  (unless (rmail-header-get-header "X-Coding-System")
	    (rmail-header-add-header "X-Coding-System"
				     (symbol-name last-coding-system-used)))

	  ;; Make sure we have an Rmail BABYL attribute header field.
	  ;; All we can assume is that the Rmail BABYL header field is
	  ;; in the header section.  It's placement can be modified by
	  ;; another mailer.

88268:6a755a3db87f

		(let ((inhibit-read-only t))
		  (erase-buffer)
		  (insert-file-contents-literally new-file))
		(message "Replacing BABYL format with mbox format...done"))
	    (delete-file old-file)
	    (delete-file new-file)))
	;; Go through the converted file and decode each message
	;; according to its mime charset.
	(rmail-decode-messages))
      (goto-char (point-max))
      (rmail-mode-2)
      ;; setup files coding system
      (rmail-decode-mail-file)
      ;;  We use `run-mail-hook' to remember whether we should run

		(unless (equal (point-min) (point-max))
		  (setq new-messages (rmail-process-new-messages)
			rmail-current-message (1+ rmail-total-messages)
			rmail-total-messages (rmail-desc-get-count))
		  (run-hooks 'rmail-get-new-mail-hook)
		  ;; Go through the RMAIL file and decode each message
		  ;; according to its mime charset.
		  (rmail-decode-messages)
		  (save-buffer))
		;; Delete the old files, now that the RMAIL file is
		;; saved.
		(rmail-delete-inbox-files delete-files)))
	    (if (= new-messages 0)

	(setq coding-system last-coding-system-used))
      (set-buffer-modified-p modifiedp)
      (setq buffer-file-coding-system nil)
      (setq save-buffer-coding-system (or coding-system 'undecided)))))

(defun rmail-decode-messages ()
  (let ((inhibit-read-only t)
        (case-fold-search nil)
	(start (point-max))
	end)
    ;; Process each message in turn starting from the back and
    ;; proceeding to the front of the region.  This is especially a good
    ;; approach since the buffer will likely have new headers added.
    (widen)
    (goto-char start)
    (while (re-search-backward rmail-unix-mail-delimiter nil t)
      (setq end start)
      (setq start (point))
      (save-excursion
	(save-restriction
	  (narrow-to-region start end)
	  (goto-char (point-min))

	  (setq last-coding-system-used nil)
	  (or rmail-enable-mime
	      (not rmail-enable-multibyte)
	      (let ((mime-charset
		     (when (and rmail-decode-mime-charset
				(save-excursion
				  (goto-char (rmail-header-get-limit))
				  (let ((case-fold-search t))
				    (re-search-backward
				     rmail-mime-charset-pattern
				     (point-min) t))))
		       (intern (downcase (match-string 1))))))
		(rmail-decode-region start (point) mime-charset)))

	  ;; Add an the X-Coding-System header.
	  (unless (rmail-header-get-header "X-Coding-System")
	    (let ((val (symbol-name last-coding-system-used)))
	      (rmail-header-add-header "X-Coding-System" val))))))))


;;;; *** Rmail Message Formatting and Header Manipulation ***

(defun rmail-clear-headers (&optional ignored-headers)
  "Delete all header fields that Rmail should not show.

		  (goto-char (point-max))
		  (while (search-backward "\r\n" (point-min) t)
		    (delete-char 1)))
		(setq end (marker-position end-marker))
		(set-marker end-marker nil)))

	  ;; Make sure we have an Rmail BABYL attribute header field.
	  ;; All we can assume is that the Rmail BABYL header field is
	  ;; in the header section.  It's placement can be modified by
	  ;; another mailer.