comparison lisp/mail/rmail.el @ 17565:09d1f6578d7f

(rmail-reply): Pass Rmail buffer and msgnum as arguments within the mail-send action. (rmail-forward, rmail-retry-failure): Likewise. (rmail-mark-message): New function. (rmail-only-expunge): Update the new kind of action. (rmail-send-actions-rmail-msg-number) (rmail-send-actions-rmail-buffer): Variables no longer used.

17564:050f15e0b948

	    ;; message number.
	    (let ((bufs (buffer-list)))
	      (while bufs
		(save-excursion
		  (set-buffer (car bufs))
		  (and (boundp 'rmail-send-actions-rmail-buffer)
		       (eq rmail-send-actions-rmail-buffer rmailbuf)
		       (setq rmail-send-actions-rmail-msg-number
			     (rmail-msg-number-after-expunge
			      deleted
			      rmail-send-actions-rmail-msg-number))))
		(setq bufs (cdr bufs))))

	    (while (<= number total)
	      (if (= (aref deleted number) ?D)
		  (progn

(defun rmail-continue ()
  "Continue composing outgoing message previously being composed."
  (interactive)
  (rmail-start-mail t))

(put 'rmail-send-actions-rmail-buffer 'permanent-local t)
(put 'rmail-send-actions-rmail-msg-number 'permanent-local t)

(defun rmail-reply (just-sender)
  "Reply to the current message.
Normally include CC: to all other recipients of original message;
prefix argument means ignore them.  While composing the reply,

	(let* ((cc-list (rmail-dont-reply-to
			  (mail-strip-quoted-names
			    (if (null cc) to (concat to ", " cc))))))
	  (if (string= cc-list "") nil cc-list)))
      rmail-view-buffer
      (list (list '(lambda ()
		     (let ((msgnum rmail-send-actions-rmail-msg-number))
		       (save-excursion
			 (set-buffer rmail-send-actions-rmail-buffer)
			 (if msgnum
			     (rmail-set-attribute "answered" t msgnum)))))))
      nil
      (list (cons "References" (concat (mapconcat 'identity references " ")
				       " " message-id))))
    ;; We keep the rmail buffer and message number in these 
    ;; buffer-local vars in the sendmail buffer,
    ;; so that rmail-only-expunge can relocate the message number.
    (make-local-variable 'rmail-send-actions-rmail-buffer)
    (make-local-variable 'rmail-send-actions-rmail-msg-number)
    (setq rmail-send-actions-rmail-buffer rmail-view-buffer)
    (setq rmail-send-actions-rmail-msg-number msgnum)))

(defun rmail-make-in-reply-to-field (from date message-id)
  (cond ((not from)
         (if message-id
             message-id

			       ""))
			   (or (mail-fetch-field "Subject") "")
			   "]")))
      (if (rmail-start-mail
	   nil nil subject nil nil nil
	   (list (list (function
			(lambda ()
			  (let ((msgnum
				 rmail-send-actions-rmail-msg-number))
			    (save-excursion
			      (set-buffer rmail-send-actions-rmail-buffer)
			      (if msgnum
				  (rmail-set-attribute
				   "forwarded" t msgnum))))))))
	   ;; If only one window, use it for the mail buffer.
	   ;; Otherwise, use another window for the mail buffer
	   ;; so that the Rmail buffer remains visible
	   ;; and sending the mail will get back to it.
	   (and (not rmail-mail-new-frame) (one-window-p t)))
	  ;; The mail buffer is now current.
	  (save-excursion
	    ;; We keep the rmail buffer and message number in these 
	    ;; buffer-local vars in the sendmail buffer,
	    ;; so that rmail-only-expunge can relocate the message number.
	    (make-local-variable 'rmail-send-actions-rmail-buffer)
	    (make-local-variable 'rmail-send-actions-rmail-msg-number)
	    (setq rmail-send-actions-rmail-buffer forward-buffer)
	    (setq rmail-send-actions-rmail-msg-number msgnum)
	    ;; Insert after header separator--before signature if any.
	    (goto-char (point-min))
	    (search-forward-regexp
	     (concat "^" (regexp-quote mail-header-separator) "$"))
	    (forward-line 1)

		(error "Cannot find end of header in failed message"))
	    ))))
    ;; Start sending a new message; default header fields from the original.
    ;; Turn off the usual actions for initializing the message body
    ;; because we want to get only the text from the failure message.
    (let ((action
	   ;; This function will be called when the user sends the retry.
	   ;; It will mark the bounce message as "retried".
	   (function (lambda ()
		       (let ((msgnum rmail-send-actions-rmail-msg-number))
			 (save-excursion
			   (set-buffer rmail-send-actions-rmail-buffer)
			   (if msgnum
			       (rmail-set-attribute "retried" t msgnum)))))))
	  mail-signature mail-setup-hook)
      (if (rmail-start-mail nil nil nil nil nil rmail-buffer
			    (list (list action)))
	  ;; Insert original text as initial text of new draft message.
	  ;; Bind inhibit-read-only since the header delimiter
	  ;; of the previous message was probably read-only.
	  (let ((inhibit-read-only t))
	    ;; We keep the rmail buffer and message number in these 
	    ;; buffer-local vars in the sendmail buffer,
	    ;; so that the rmail-only-expunge can relocate the message number.
	    (make-local-variable 'rmail-send-actions-rmail-buffer)
	    (make-local-variable 'rmail-send-actions-rmail-msg-number)
	    (setq rmail-send-actions-rmail-buffer rmail-buffer)
	    (setq rmail-send-actions-rmail-msg-number msgnum)
	    (erase-buffer)
	    (insert-buffer-substring rmail-buffer bounce-start bounce-end)
	    (goto-char (point-min))
	    (if bounce-indent
		(indent-rigidly (point-min) (point-max) bounce-indent))

17565:09d1f6578d7f

	    ;; message number.
	    (let ((bufs (buffer-list)))
	      (while bufs
		(save-excursion
		  (set-buffer (car bufs))
		  (let ((tail mail-send-actions) action)
		    (while tail
		      (setq action (car tail)
			    tail (cdr tail))
		      (and (eq (car action) 'rmail-mark-message)
			   (eq (nth 1 action) rmailbuf)
			   (setcar (nthcdr 2 action)
				   (rmail-msg-number-after-expunge
				    deleted
				    (nth 2 action)))))))
		(setq bufs (cdr bufs))))

	    (while (<= number total)
	      (if (= (aref deleted number) ?D)
		  (progn

(defun rmail-continue ()
  "Continue composing outgoing message previously being composed."
  (interactive)
  (rmail-start-mail t))

(defun rmail-reply (just-sender)
  "Reply to the current message.
Normally include CC: to all other recipients of original message;
prefix argument means ignore them.  While composing the reply,

	(let* ((cc-list (rmail-dont-reply-to
			  (mail-strip-quoted-names
			    (if (null cc) to (concat to ", " cc))))))
	  (if (string= cc-list "") nil cc-list)))
      rmail-view-buffer
      (list (list 'rmail-mark-message
		  rmail-view-buffer
		  msgnum
		  "answered"))
      nil
      (list (cons "References" (concat (mapconcat 'identity references " ")
				       " " message-id))))))

(defun rmail-mark-message (buffer msgnum attribute)
  "Give BUFFER's message number MSGNUM the attribute ATTRIBUTE.
This is use in the send-actions for message buffers."
  (save-excursion
    (set-buffer buffer)
    (if msgnum
	(rmail-set-attribute attribute t msgnum))))

(defun rmail-make-in-reply-to-field (from date message-id)
  (cond ((not from)
         (if message-id
             message-id

			       ""))
			   (or (mail-fetch-field "Subject") "")
			   "]")))
      (if (rmail-start-mail
	   nil nil subject nil nil nil
	   (list (list 'rmail-mark-message
		       forward-buffer msgnum
		       "forwarded"))
	   ;; If only one window, use it for the mail buffer.
	   ;; Otherwise, use another window for the mail buffer
	   ;; so that the Rmail buffer remains visible
	   ;; and sending the mail will get back to it.
	   (and (not rmail-mail-new-frame) (one-window-p t)))
	  ;; The mail buffer is now current.
	  (save-excursion
	    ;; Insert after header separator--before signature if any.
	    (goto-char (point-min))
	    (search-forward-regexp
	     (concat "^" (regexp-quote mail-header-separator) "$"))
	    (forward-line 1)

		(error "Cannot find end of header in failed message"))
	    ))))
    ;; Start sending a new message; default header fields from the original.
    ;; Turn off the usual actions for initializing the message body
    ;; because we want to get only the text from the failure message.
    (let (mail-signature mail-setup-hook)
      (if (rmail-start-mail nil nil nil nil nil rmail-buffer
			    (list (list 'rmail-mark-message
					rmail-buffer msgnum "retried")))
	  ;; Insert original text as initial text of new draft message.
	  ;; Bind inhibit-read-only since the header delimiter
	  ;; of the previous message was probably read-only.
	  (let ((inhibit-read-only t))
	    (erase-buffer)
	    (insert-buffer-substring rmail-buffer bounce-start bounce-end)
	    (goto-char (point-min))
	    (if bounce-indent
		(indent-rigidly (point-min) (point-max) bounce-indent))