comparison lisp/mail/rmailsum.el @ 88166:d20b1cfca610

(rmail-new-summary): Make sure summary buffer is current when selecting message. (rmail-summary-browse-body): Deleted. (rmail-summary-rmail-update, rmail-summary-get-message-at-point, rmail-summary-goto-msg): Use string-to-number. (rmail-summary-toggle-header, rmail-summary-add-label, rmail-summary-kill-label): Use with-current-buffer. (rmail-summary-previous-msg): Add docstring.

88165:fd1a32d32b23

  (let ((summary-msgs ())
        (new-summary-line-count 0)
        (msgnum 1)
        current-message sumbuf was-in-summary)
    (save-excursion

      ;; Go to the Rmail buffer.
      (if (eq major-mode 'rmail-summary-mode)
	  (setq was-in-summary t))
      (set-buffer rmail-buffer)

      ;; Find its summary buffer, or make one.
      (setq current-message rmail-current-message
	    sumbuf
	    (if (and rmail-summary-buffer
		     (buffer-name rmail-summary-buffer))
		rmail-summary-buffer
	      (generate-new-buffer (concat (buffer-name) "-summary"))))

      ;; Collect the message summaries based on the filtering
      ;; argument (FUNCTION).
      (while (>= rmail-total-messages msgnum)
	(if (or (null function)
		(apply function (cons msgnum args)))
	    (setq summary-msgs
		  (cons (cons msgnum (rmail-summary-get-summary msgnum))
			summary-msgs)))
	(setq msgnum (1+ msgnum)))
      (setq summary-msgs (nreverse summary-msgs))

      ;; Place the collected summaries into the summary buffer.
      (setq rmail-summary-buffer nil)
      (save-excursion
	(let ((rbuf (current-buffer))
	      (vbuf rmail-view-buffer)

		rmail-view-buffer vbuf
		rmail-summary-redo redo-form
		rmail-total-messages total
		rmail-current-message current-message)))
      (setq rmail-summary-buffer sumbuf))

    ;; Now display the summary buffer and go to the right place in it.
    (or was-in-summary
	(progn
	  (if (and (one-window-p)
		   pop-up-windows (not pop-up-frames))

		    (delete-other-windows)))
	    (pop-to-buffer sumbuf))
	  (set-buffer rmail-buffer)
	  ;; This is how rmail makes the summary buffer reappear.
	  ;; We do this here to make the window the proper size.
	  (rmail-select-summary nil)))

    (rmail-summary-goto-msg current-message nil t)
    (rmail-summary-construct-io-menu)
    (message "Computing summary lines...done")))

;;;; Low levels of generating a summary.

  (display-buffer rmail-buffer))

;;; mbox: ready
(defun rmail-summary-next-msg (&optional number)
  "Display next non-deleted msg from rmail file.
With optional prefix argument NUMBER, moves forward this number of non-deleted
messages, or backward if NUMBER is negative."
  (interactive "p")
  (let (msg)
    (with-current-buffer rmail-buffer
      (rmail-next-undeleted-message number)
      (setq msg rmail-current-message))
    (rmail-summary-goto-msg msg)))

;;; mbox: ready
(defun rmail-summary-previous-msg (&optional number)
  (interactive "p")
  (rmail-summary-next-msg (- (if number number 1))))

(defun rmail-summary-next-labeled-message (n labels)
  "Show next message with LABEL.  Defaults to last labels used.

      (if (eobp)
	  (forward-line -1))
      ;; Determine the message number correpsonding to line point is on.
      (beginning-of-line)
      (skip-chars-forward " ")
      (let ((msg-num (string-to-int (buffer-substring
 				     (point)
 				     (progn (skip-chars-forward "0-9")
 					    (point))))))

	;; Always leave `unseen' removed if we get out of isearch mode.
	;; Don't let a subsequent isearch restore `unseen'.
	(if (not isearch-mode)
	    (setq rmail-summary-put-back-unseen nil))

(defun rmail-summary-get-message-at-point ()
  "Return the message number corresponding to the line containing point.
If the summary buffer contains no messages, nil is returned."
  (save-excursion

    ;; Position point at the beginning of a line.
    (if (eobp)
        (forward-line -1)
      (forward-line 0))

    ;; Parse the message number.
    (string-to-int
     (buffer-substring (point) (min (point-max) (+ 4 (point)))))))

(defun rmail-summary-goto-msg (&optional n nowarn skip-rmail)
  "Go to message N in the summary buffer and the Rmail buffer.
If N is nil, use the message corresponding to point in the summary

  ;; Do the end of buffer adjustment.
  (if (eobp) (forward-line -1))
  (beginning-of-line)
  ;; Set N to the current message unless it was already set by the
  ;; caller.
  (unless n
    (setq n (rmail-summary-get-message-at-point)))

  (let* ((obuf (current-buffer))
	 (buf rmail-buffer)
	 (cur (point))
	 message-not-found
	 (curmsg (string-to-int
		  (buffer-substring (point)
				    (min (point-max) (+ 6 (point))))))
	 (total (save-excursion
		  (set-buffer buf)
		  rmail-total-messages)))

    ;; Do a validity check on N.  If it is valid then set the current
    ;; summary message to N.  `rmail-summary-rmail-update' will then
    ;; actually move point to the selected message.
    (if (< n 1)
	(progn (message "No preceding message")

			(let ((buffer-read-only nil))
			  (delete-char 1)
			  (insert " "))))
    (rmail-summary-update-highlight message-not-found)
    (beginning-of-line)

    ;; Determine if the Rmail buffer needs to be processed.
    (if skip-rmail
	nil
      ;; It does.
      (let ((selwin (selected-window)))

;;; mbox: ready
(defun rmail-summary-toggle-header ()
  "Show original message header if pruned header currently shown, or vice versa."
  (interactive)
  (save-excursion
    (set-buffer rmail-buffer)
    (rmail-toggle-header)))

;;; mbox: ready
(defun rmail-summary-add-label (label)
  "Add LABEL to labels associated with current Rmail message.
Completion is performed over known labels when reading."
  (interactive (list (save-excursion
		       (set-buffer rmail-buffer)
		       (rmail-read-label "Add label"))))
  (save-excursion
    (set-buffer rmail-buffer)
    (rmail-add-label label)))

(defun rmail-summary-kill-label (label)
  "Remove LABEL from labels associated with current Rmail message.
Completion is performed over known labels when reading."
  (interactive (list (save-excursion
		       (set-buffer rmail-buffer)
		       (rmail-read-label "Kill label"))))
  (save-excursion
    (set-buffer rmail-buffer)
    (rmail-set-label label nil)))

;;;; *** Rmail Summary Mailing Commands ***

(defun rmail-summary-override-mail-send-and-exit ()

            (goto-char (+ (point) offset))
            (unless (looking-at char)
              (delete-char 1)
              (insert char)))))))

;;;; Browser related functions.

(defun rmail-summary-browse-body ()
  "Send the message body to the browser."
  (interactive)
  (save-excursion
    (set-buffer rmail-buffer)
    (rmail-browse-body)))

(provide 'rmailsum)

;;; arch-tag: 556079ee-75c1-47f5-9884-2e0a0bc6c5a1
;;; rmailsum.el ends here

88166:d20b1cfca610

  (let ((summary-msgs ())
        (new-summary-line-count 0)
        (msgnum 1)
        current-message sumbuf was-in-summary)
    (save-excursion
      ;; Go to the Rmail buffer.
      (if (eq major-mode 'rmail-summary-mode)
	  (setq was-in-summary t))
      (set-buffer rmail-buffer)
      ;; Find its summary buffer, or make one.
      (setq current-message rmail-current-message
	    sumbuf
	    (if (and rmail-summary-buffer
		     (buffer-name rmail-summary-buffer))
		rmail-summary-buffer
	      (generate-new-buffer (concat (buffer-name) "-summary"))))
      ;; Collect the message summaries based on the filtering
      ;; argument (FUNCTION).
      (while (>= rmail-total-messages msgnum)
	(if (or (null function)
		(apply function (cons msgnum args)))
	    (setq summary-msgs
		  (cons (cons msgnum (rmail-summary-get-summary msgnum))
			summary-msgs)))
	(setq msgnum (1+ msgnum)))
      (setq summary-msgs (nreverse summary-msgs))
      ;; Place the collected summaries into the summary buffer.
      (setq rmail-summary-buffer nil)
      (save-excursion
	(let ((rbuf (current-buffer))
	      (vbuf rmail-view-buffer)

		rmail-view-buffer vbuf
		rmail-summary-redo redo-form
		rmail-total-messages total
		rmail-current-message current-message)))
      (setq rmail-summary-buffer sumbuf))
    ;; Now display the summary buffer and go to the right place in it.
    (or was-in-summary
	(progn
	  (if (and (one-window-p)
		   pop-up-windows (not pop-up-frames))

		    (delete-other-windows)))
	    (pop-to-buffer sumbuf))
	  (set-buffer rmail-buffer)
	  ;; This is how rmail makes the summary buffer reappear.
	  ;; We do this here to make the window the proper size.
	  (rmail-select-summary nil)
	  (set-buffer rmail-summary-buffer)))
    (rmail-summary-goto-msg current-message nil t)
    (rmail-summary-construct-io-menu)
    (message "Computing summary lines...done")))

;;;; Low levels of generating a summary.

  (display-buffer rmail-buffer))

;;; mbox: ready
(defun rmail-summary-next-msg (&optional number)
  "Display next non-deleted msg from rmail file.
With optional prefix argument NUMBER, moves forward this number of
non-deleted messages, or backward if NUMBER is negative."
  (interactive "p")
  (let (msg)
    (with-current-buffer rmail-buffer
      (rmail-next-undeleted-message number)
      (setq msg rmail-current-message))
    (rmail-summary-goto-msg msg)))

;;; mbox: ready
(defun rmail-summary-previous-msg (&optional number)
  "Display previous non-deleted msg from rmail file.
With optional prefix argument NUMBER, moves backward this number of
non-deleted messages."
  (interactive "p")
  (rmail-summary-next-msg (- (if number number 1))))

(defun rmail-summary-next-labeled-message (n labels)
  "Show next message with LABEL.  Defaults to last labels used.

      (if (eobp)
	  (forward-line -1))
      ;; Determine the message number correpsonding to line point is on.
      (beginning-of-line)
      (skip-chars-forward " ")
      (let ((msg-num (string-to-number (buffer-substring
					(point)
					(progn (skip-chars-forward "0-9")
					       (point))))))

	;; Always leave `unseen' removed if we get out of isearch mode.
	;; Don't let a subsequent isearch restore `unseen'.
	(if (not isearch-mode)
	    (setq rmail-summary-put-back-unseen nil))

(defun rmail-summary-get-message-at-point ()
  "Return the message number corresponding to the line containing point.
If the summary buffer contains no messages, nil is returned."
  (save-excursion
    ;; Position point at the beginning of a line.
    (if (eobp)
        (forward-line -1)
      (forward-line 0))
    ;; Parse the message number.
    (string-to-number
     (buffer-substring (point) (min (point-max) (+ 4 (point)))))))

(defun rmail-summary-goto-msg (&optional n nowarn skip-rmail)
  "Go to message N in the summary buffer and the Rmail buffer.
If N is nil, use the message corresponding to point in the summary

  ;; Do the end of buffer adjustment.
  (if (eobp) (forward-line -1))
  (beginning-of-line)
  ;; Set N to the current message unless it was already set by the
  ;; caller.
  (unless n (setq n (rmail-summary-get-message-at-point)))
  (let* ((obuf (current-buffer))
	 (buf rmail-buffer)
	 (cur (point))
	 message-not-found
	 (curmsg (string-to-number
		  (buffer-substring (point)
				    (min (point-max) (+ 6 (point))))))
	 (total (with-current-buffer buf
		  rmail-total-messages)))
    ;; Do a validity check on N.  If it is valid then set the current
    ;; summary message to N.  `rmail-summary-rmail-update' will then
    ;; actually move point to the selected message.
    (if (< n 1)
	(progn (message "No preceding message")

			(let ((buffer-read-only nil))
			  (delete-char 1)
			  (insert " "))))
    (rmail-summary-update-highlight message-not-found)
    (beginning-of-line)
    ;; Determine if the Rmail buffer needs to be processed.
    (if skip-rmail
	nil
      ;; It does.
      (let ((selwin (selected-window)))

;;; mbox: ready
(defun rmail-summary-toggle-header ()
  "Show original message header if pruned header currently shown, or vice versa."
  (interactive)
  (with-current-buffer rmail-buffer
    (rmail-toggle-header)))

;;; mbox: ready
(defun rmail-summary-add-label (label)
  "Add LABEL to labels associated with current Rmail message.
Completion is performed over known labels when reading."
  (interactive (list (with-current-buffer rmail-buffer
		       (rmail-read-label "Add label"))))
  (with-current-buffer rmail-buffer
    (rmail-add-label label)))

(defun rmail-summary-kill-label (label)
  "Remove LABEL from labels associated with current Rmail message.
Completion is performed over known labels when reading."
  (interactive (list (with-current-buffer rmail-buffer
		       (rmail-read-label "Kill label"))))
  (with-current-buffer rmail-buffer
    (rmail-set-label label nil)))

;;;; *** Rmail Summary Mailing Commands ***

(defun rmail-summary-override-mail-send-and-exit ()

            (goto-char (+ (point) offset))
            (unless (looking-at char)
              (delete-char 1)
              (insert char)))))))

(provide 'rmailsum)

;;; arch-tag: 556079ee-75c1-47f5-9884-2e0a0bc6c5a1
;;; rmailsum.el ends here