;;; rmailsum.el --- make summary buffers for the mail reader
-;; Copyright (C) 1985, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1993-1996, 2000-2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
+;; Package: rmail
;; This file is part of GNU Emacs.
;;; Code:
-(defvar msgnum)
-
-;; For rmail-select-summary
+;; For rmail-select-summary.
(require 'rmail)
+(require 'rfc2047)
-;;;###autoload
(defcustom rmail-summary-scroll-between-messages t
- "*Non-nil means Rmail summary scroll commands move between messages."
+ "Non-nil means Rmail summary scroll commands move between messages.
+That is, after `rmail-summary-scroll-msg-up' reaches the end of a
+message, it moves to the next message; and similarly for
+`rmail-summary-scroll-msg-down'."
:type 'boolean
:group 'rmail-summary)
-;;;###autoload
+;; FIXME could do with a :set function that regenerates the summary
+;; and updates rmail-summary-vector.
(defcustom rmail-summary-line-count-flag t
- "*Non-nil means Rmail summary should show the number of lines in each message."
+ "Non-nil means Rmail summary should show the number of lines in each message.
+Setting this option to nil might speed up the generation of summaries."
:type 'boolean
:group 'rmail-summary)
("{ \\([^\n}]+\\) }" 1 font-lock-comment-face)) ; Labels.
"Additional expressions to highlight in Rmail Summary mode.")
-(defvar rmail-summary-redo
+(defvar rmail-summary-redo nil
"(FUNCTION . ARGS) to regenerate this Rmail summary buffer.")
-(defvar rmail-summary-overlay nil)
+(defvar rmail-summary-overlay nil
+ "Overlay used to highlight the current message in the Rmail summary.")
(put 'rmail-summary-overlay 'permanent-local t)
-(defvar rmail-summary-mode-map nil)
+(defvar rmail-summary-mode-map nil
+ "Keymap used in Rmail summary mode.")
;; Entry points for making a summary buffer.
(defun rmail-summary ()
"Display a summary of all messages, one line per message."
(interactive)
- (rmail-new-summary "All" '(rmail-summary) nil))
+ (rmail-new-summary "All" '(rmail-summary) nil)
+ (unless (get-buffer-window rmail-buffer)
+ (rmail-summary-beginning-of-message)))
;;;###autoload
(defun rmail-summary-by-labels (labels)
(rmail-new-summary (concat "labels " labels)
(list 'rmail-summary-by-labels labels)
'rmail-message-labels-p
- (concat ", \\(" (mail-comma-list-regexp labels) "\\),")))
-
+ (concat " \\("
+ (mail-comma-list-regexp labels)
+ "\\)\\(,\\|\\'\\)")))
+
+;; FIXME "a string of regexps separated by commas" makes no sense because:
+;; i) it's pointless (you can just use \\|)
+;; ii) it's broken (you can't specify a literal comma)
+;; rmail-summary-by-topic and rmail-summary-by-senders have the same issue.
;;;###autoload
(defun rmail-summary-by-recipients (recipients &optional primary-only)
"Display a summary of all messages with the given RECIPIENTS.
'rmail-message-recipients-p
(mail-comma-list-regexp recipients) primary-only))
+(defun rmail-message-recipients-p (msg recipients &optional primary-only)
+ (rmail-apply-in-message msg 'rmail-message-recipients-p-1
+ recipients primary-only))
+
+(defun rmail-message-recipients-p-1 (recipients &optional primary-only)
+ ;; mail-fetch-field does not care where it starts from.
+ (narrow-to-region (point) (progn (search-forward "\n\n") (point)))
+ (or (string-match recipients (or (mail-fetch-field "To") ""))
+ (string-match recipients (or (mail-fetch-field "From") ""))
+ (if (not primary-only)
+ (string-match recipients (or (mail-fetch-field "Cc") "")))))
+
+;; FIXME I find this a non-obvious name for what this function does.
+;; Also, the optional WHOLE-MESSAGE argument of r-s-by-topic would
+;; seem more natural here.
;;;###autoload
(defun rmail-summary-by-regexp (regexp)
"Display a summary of all messages according to regexp REGEXP.
If the regular expression is found in the header of the message
\(including in the date and other lines, as well as the subject line),
-Emacs will list the header line in the RMAIL-summary."
+Emacs will list the message in the summary."
(interactive "sRegexp to summarize by: ")
(if (string= regexp "")
(setq regexp (or rmail-last-regexp
'rmail-message-regexp-p
regexp))
-;; rmail-summary-by-topic
-;; 1989 R.A. Schnitzler
+(defun rmail-message-regexp-p (msg regexp)
+ "Return t, if for message number MSG, regexp REGEXP matches in the header."
+ (rmail-apply-in-message msg 'rmail-message-regexp-p-1 msg regexp))
+
+(defun rmail-message-regexp-p-1 (msg regexp)
+ ;; Search functions can expect to start from the beginning.
+ (narrow-to-region (point) (save-excursion (search-forward "\n\n") (point)))
+ (if rmail-enable-mime
+ (if rmail-search-mime-header-function
+ (funcall rmail-search-mime-header-function msg regexp (point))
+ (error "You must set `rmail-search-mime-header-function'"))
+ (re-search-forward regexp nil t)))
;;;###autoload
(defun rmail-summary-by-topic (subject &optional whole-message)
"Display a summary of all messages with the given SUBJECT.
-Normally checks the Subject field of headers;
-but if WHOLE-MESSAGE is non-nil (prefix arg given),
- look in the whole message.
+Normally checks just the Subject field of headers; but with prefix
+argument WHOLE-MESSAGE is non-nil, looks in the whole message.
SUBJECT is a string of regexps separated by commas."
(interactive
- (let* ((subject (with-current-buffer rmail-buffer
- (rmail-current-subject)))
- (subject-re (with-current-buffer rmail-buffer
- (rmail-current-subject-regexp)))
+ ;; We quote the default subject, because if it contains regexp
+ ;; special characters (eg "?"), it can fail to match itself. (Bug#2333)
+ (let* ((subject (regexp-quote (rmail-simplified-subject)))
(prompt (concat "Topics to summarize by (regexp"
(if subject ", default current subject" "")
"): ")))
(mail-comma-list-regexp subject) whole-message))
(defun rmail-message-subject-p (msg subject &optional whole-message)
- (save-restriction
- (goto-char (rmail-msgbeg msg))
- (search-forward "\n*** EOOH ***\n" (rmail-msgend msg) 'move)
- (narrow-to-region
- (point)
- (progn (search-forward (if whole-message "\^_" "\n\n")) (point)))
- (goto-char (point-min))
- (if whole-message (re-search-forward subject nil t)
- (string-match subject (let ((subj (mail-fetch-field "Subject")))
- (if subj
- (funcall rmail-summary-line-decoder subj)
- ""))))))
+ (if whole-message
+ (rmail-apply-in-message msg 're-search-forward subject nil t)
+ (string-match subject (rmail-simplified-subject msg))))
;;;###autoload
(defun rmail-summary-by-senders (senders)
- "Display a summary of all messages with the given SENDERS.
-SENDERS is a string of names separated by commas."
+ "Display a summary of all messages whose \"From\" field matches SENDERS.
+SENDERS is a string of regexps separated by commas."
(interactive "sSenders to summarize by: ")
(rmail-new-summary
(concat "senders " senders)
(mail-comma-list-regexp senders)))
(defun rmail-message-senders-p (msg senders)
- (save-restriction
- (goto-char (rmail-msgbeg msg))
- (search-forward "\n*** EOOH ***\n")
- (narrow-to-region (point) (progn (search-forward "\n\n") (point)))
- (string-match senders (or (mail-fetch-field "From") ""))))
+ (string-match senders (or (rmail-get-header "From" msg) "")))
\f
;; General making of a summary buffer.
(defvar rmail-new-summary-line-count)
-(defun rmail-new-summary (description redo-form function &rest args)
+(defun rmail-new-summary (desc redo func &rest args)
"Create a summary of selected messages.
-DESCRIPTION makes part of the mode line of the summary buffer.
-For each message, FUNCTION is applied to the message number and ARGS...
+DESC makes part of the mode line of the summary buffer. REDO is form ...
+For each message, FUNC is applied to the message number and ARGS...
and if the result is non-nil, that message is included.
nil for FUNCTION means all messages."
(message "Computing summary lines...")
- (let (sumbuf mesg 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 sumbuf
- (if (and rmail-summary-buffer
- (buffer-name rmail-summary-buffer))
- rmail-summary-buffer
- (generate-new-buffer (concat (buffer-name) "-summary"))))
- (setq mesg rmail-current-message)
- ;; Filter the messages; make or get their summary lines.
- (let ((summary-msgs ())
- (rmail-new-summary-line-count 0))
- (let ((msgnum 1)
- (buffer-read-only nil)
- (old-min (point-min-marker))
- (old-max (point-max-marker)))
- ;; Can't use save-restriction here; that doesn't work if we
- ;; plan to modify text outside the original restriction.
- (save-excursion
- (widen)
- (goto-char (point-min))
- (while (>= rmail-total-messages msgnum)
- (if (or (null function)
- (apply function (cons msgnum args)))
- (setq summary-msgs
- (cons (cons msgnum (rmail-make-summary-line msgnum))
- summary-msgs)))
- (setq msgnum (1+ msgnum)))
- (setq summary-msgs (nreverse summary-msgs)))
- (narrow-to-region old-min old-max))
- ;; Temporarily, while summary buffer is unfinished,
- ;; we "don't have" a summary.
- (setq rmail-summary-buffer nil)
- (if rmail-enable-mime
- (with-current-buffer rmail-view-buffer
- (setq rmail-summary-buffer nil)))
- (save-excursion
- (let ((rbuf (current-buffer))
- (vbuf rmail-view-buffer)
- (total rmail-total-messages))
- (set-buffer sumbuf)
- ;; Set up the summary buffer's contents.
- (let ((buffer-read-only nil))
- (erase-buffer)
- (while summary-msgs
- (princ (cdr (car summary-msgs)) sumbuf)
- (setq summary-msgs (cdr summary-msgs)))
- (goto-char (point-min)))
- ;; Set up the rest of its state and local variables.
- (setq buffer-read-only t)
- (rmail-summary-mode)
- (make-local-variable 'minor-mode-alist)
- (setq minor-mode-alist (list (list t (concat ": " description))))
- (setq rmail-buffer rbuf
- rmail-view-buffer vbuf
- rmail-summary-redo redo-form
- rmail-total-messages total))))
- (setq rmail-summary-buffer sumbuf))
+ (unless rmail-buffer
+ (error "No RMAIL buffer found"))
+ (let (mesg was-in-summary)
+ (if (eq major-mode 'rmail-summary-mode)
+ (setq was-in-summary t))
+ (with-current-buffer rmail-buffer
+ (if (zerop (setq mesg rmail-current-message))
+ (error "No messages to summarize"))
+ (setq rmail-summary-buffer (rmail-new-summary-1 desc redo func args)))
;; 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))
- ;; If there is just one window, put the summary on the top.
- (progn
- (split-window (selected-window) rmail-summary-window-size)
- (select-window (next-window (frame-first-window)))
- (pop-to-buffer sumbuf)
- ;; If pop-to-buffer did not use that window, delete that
- ;; window. (This can happen if it uses another frame.)
- (if (not (eq sumbuf (window-buffer (frame-first-window))))
- (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)))
+ (unless was-in-summary
+ (if (and (one-window-p)
+ pop-up-windows
+ (not pop-up-frames))
+ ;; If there is just one window, put the summary on the top.
+ (progn
+ (split-window (selected-window) rmail-summary-window-size)
+ (select-window (next-window (frame-first-window)))
+ (rmail-pop-to-buffer rmail-summary-buffer)
+ ;; If pop-to-buffer did not use that window, delete that
+ ;; window. (This can happen if it uses another frame.)
+ (if (not (eq rmail-summary-buffer
+ (window-buffer (frame-first-window))))
+ (delete-other-windows)))
+ (rmail-pop-to-buffer rmail-summary-buffer))
+ (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 mesg t t)
(rmail-summary-construct-io-menu)
(message "Computing summary lines...done")))
+
+(defun rmail-new-summary-1 (description form function args)
+ "Filter messages to obtain summary lines.
+DESCRIPTION is added to the mode line.
+
+Return the summary buffer by invoking FUNCTION on each message
+passing the message number and ARGS...
+
+REDO is a form ...
+
+The current buffer must be a Rmail buffer either containing a
+collection of mbox formatted messages or displaying a single
+message."
+ (let ((summary-msgs ())
+ (rmail-new-summary-line-count 0)
+ (sumbuf (rmail-get-create-summary-buffer)))
+ ;; Scan the messages, getting their summary strings
+ ;; and putting the list of them in SUMMARY-MSGS.
+ (let ((msgnum 1)
+ (main-buffer (current-buffer))
+ (total rmail-total-messages)
+ (inhibit-read-only t))
+ (save-excursion
+ ;; Go where the mbox text is.
+ (if (rmail-buffers-swapped-p)
+ (set-buffer rmail-view-buffer))
+ (let ((old-min (point-min-marker))
+ (old-max (point-max-marker)))
+ (unwind-protect
+ ;; Can't use save-restriction here; that doesn't work if we
+ ;; plan to modify text outside the original restriction.
+ (save-excursion
+ (widen)
+ (goto-char (point-min))
+ (while (>= total msgnum)
+ ;; Go back to the Rmail buffer so
+ ;; so FUNCTION and rmail-get-summary can see its local vars.
+ (with-current-buffer main-buffer
+ ;; First test whether to include this message.
+ (if (or (null function)
+ (apply function msgnum args))
+ (setq summary-msgs
+ (cons (cons msgnum (rmail-get-summary msgnum))
+ summary-msgs))))
+ (setq msgnum (1+ msgnum))
+ ;; Provide a periodic User progress message.
+ (if (and (not (zerop rmail-new-summary-line-count))
+ (zerop (% rmail-new-summary-line-count 10)))
+ (message "Computing summary lines...%d"
+ rmail-new-summary-line-count)))
+ (setq summary-msgs (nreverse summary-msgs)))
+ (narrow-to-region old-min old-max)))))
+ ;; Temporarily, while summary buffer is unfinished,
+ ;; we "don't have" a summary.
+ (setq rmail-summary-buffer nil)
+ (unless summary-msgs
+ (kill-buffer sumbuf)
+ (error "Nothing to summarize"))
+ ;; I have not a clue what this clause is doing. If you read this
+ ;; chunk of code and have a clue, then please email that clue to
+ ;; pmr@pajato.com
+ (if rmail-enable-mime
+ (with-current-buffer rmail-buffer
+ (setq rmail-summary-buffer nil)))
+ (save-excursion
+ (let ((rbuf (current-buffer))
+ (total rmail-total-messages))
+ (set-buffer sumbuf)
+ ;; Set up the summary buffer's contents.
+ (let ((buffer-read-only nil))
+ (erase-buffer)
+ (while summary-msgs
+ (princ (cdr (car summary-msgs)) sumbuf)
+ (setq summary-msgs (cdr summary-msgs)))
+ (goto-char (point-min)))
+ ;; Set up the rest of its state and local variables.
+ (setq buffer-read-only t)
+ (rmail-summary-mode)
+ (make-local-variable 'minor-mode-alist)
+ (setq minor-mode-alist (list (list t (concat ": " description))))
+ (setq rmail-buffer rbuf
+ rmail-summary-redo form
+ rmail-total-messages total)))
+ sumbuf))
+
+(defun rmail-get-create-summary-buffer ()
+ "Return the Rmail summary buffer.
+If necessary, it is created and undo is disabled."
+ (if (and rmail-summary-buffer (buffer-name rmail-summary-buffer))
+ rmail-summary-buffer
+ (let ((buff (generate-new-buffer (concat (buffer-name) "-summary"))))
+ (with-current-buffer buff
+ (setq buffer-undo-list t))
+ buff)))
+
\f
;; Low levels of generating a summary.
-(defun rmail-make-summary-line (msg)
- (let ((line (or (aref rmail-summary-vector (1- msg))
- (progn
- (setq rmail-new-summary-line-count
- (1+ rmail-new-summary-line-count))
- (if (zerop (% rmail-new-summary-line-count 10))
- (message "Computing summary lines...%d"
- rmail-new-summary-line-count))
- (rmail-make-summary-line-1 msg))))
- delpos)
- ;; Fix up the part of the summary that says "deleted" or "unseen".
- (string-match "[0-9]+" line)
- (aset line (match-end 0)
- (if (rmail-message-deleted-p msg) ?D
- (if (= ?0 (char-after (+ 3 (rmail-msgbeg msg))))
- ?- ?\s)))
+(defun rmail-get-summary (msgnum)
+ "Return the summary line for message MSGNUM.
+The mbox buffer must be current when you call this function
+even if its text is swapped.
+
+If the message has a summary line already, it will be stored in
+the message as a header and simply returned, otherwise the
+summary line is created, saved in the message header, cached and
+returned.
+
+The current buffer contains the unrestricted message collection."
+ (let ((line (aref rmail-summary-vector (1- msgnum))))
+ (unless line
+ ;; Register a summary line for MSGNUM.
+ (setq rmail-new-summary-line-count (1+ rmail-new-summary-line-count)
+ line (rmail-create-summary-line msgnum))
+ ;; Cache the summary line for use during this Rmail session.
+ (aset rmail-summary-vector (1- msgnum) line))
line))
-;;;###autoload
-(defcustom rmail-summary-line-decoder (function identity)
- "*Function to decode summary-line.
+(defcustom rmail-summary-line-decoder (function rfc2047-decode-string)
+ "Function to decode a Rmail summary line.
+It receives the summary line for one message as a string
+and should return the decoded string.
-By default, `identity' is set."
+By default, it is `rfc2047-decode-string', which decodes MIME-encoded
+subject."
:type 'function
+ :version "23.3"
:group 'rmail-summary)
-(defun rmail-make-summary-line-1 (msg)
- (goto-char (rmail-msgbeg msg))
- (let* ((lim (save-excursion (forward-line 2) (point)))
- pos
- (labels
- (progn
- (forward-char 3)
- (concat
-; (if (save-excursion (re-search-forward ",answered," lim t))
-; "*" "")
-; (if (save-excursion (re-search-forward ",filed," lim t))
-; "!" "")
- (if (progn (search-forward ",,") (eolp))
- ""
- (concat "{"
- (buffer-substring (point)
- (progn (end-of-line)
- (backward-char)
- (if (looking-at ",")
- (point)
- (1+ (point)))))
- " } ")))))
- (line
- (progn
- (forward-line 1)
- (if (looking-at "Summary-line: ")
- (progn
- (goto-char (match-end 0))
- (buffer-substring (point)
- (progn (forward-line 1) (point))))))))
- ;; Obsolete status lines lacking a # should be flushed.
- (and line
- (not (string-match "#" line))
+(defun rmail-create-summary-line (msgnum)
+ "Return the summary line for message MSGNUM.
+Obtain the message summary from the header if it is available
+otherwise create it and store it in the message header.
+
+The mbox buffer must be current when you call this function
+even if its text is swapped."
+ (let ((beg (rmail-msgbeg msgnum))
+ (end (rmail-msgend msgnum))
+ (deleted (rmail-message-deleted-p msgnum))
+ ;; Does not work (swapped?)
+;;; (unseen (rmail-message-unseen-p msgnum))
+ unseen lines)
+ (save-excursion
+ ;; Switch to the buffer that has the whole mbox text.
+ (if (rmail-buffers-swapped-p)
+ (set-buffer rmail-view-buffer))
+ ;; Now we can compute the line count.
+ (if rmail-summary-line-count-flag
+ (setq lines (count-lines beg end)))
+ ;; Narrow to the message header.
+ (save-excursion
+ (save-restriction
+ (widen)
+ (goto-char beg)
+ (if (search-forward "\n\n" end t)
+ (progn
+ (narrow-to-region beg (point))
+ ;; Replace rmail-message-unseen-p from above.
+ (goto-char beg)
+ (setq unseen (and (search-forward
+ (concat rmail-attribute-header ": ") nil t)
+ (looking-at "......U")))
+ ;; Generate a status line from the message.
+ (rmail-create-summary msgnum deleted unseen lines))
+ (rmail-error-bad-format msgnum)))))))
+
+;; FIXME this is now unused.
+;; The intention was to display in the summary something like {E}
+;; for an edited messaged, similarly for answered, etc.
+;; But that conflicts with the previous rmail usage, where
+;; any user-defined { labels } occupied this space.
+;; So whilst it would be nice to have this information in the summary,
+;; it would need to go somewhere else.
+(defun rmail-get-summary-status ()
+ "Return a coded string wrapped in curly braces denoting the status.
+
+The current buffer must already be narrowed to the message headers for
+the message being processed."
+ (let ((status (mail-fetch-field rmail-attribute-header))
+ (index 0)
+ (result "")
+ char)
+ ;; Strip off the read/unread and the deleted attribute which are
+ ;; handled separately.
+ (setq status
+ (if status
+ (concat (substring status 0 1) (substring status 2 6))
+ ""))
+ (while (< index (length status))
+ (unless (string= "-" (setq char (substring status index (1+ index))))
+ (setq result (concat result char)))
+ (setq index (1+ index)))
+ (when (> (length result) 0)
+ (setq result (concat "{" result "}")))
+ result))
+
+(autoload 'rmail-make-label "rmailkwd")
+
+(defun rmail-get-summary-labels ()
+ "Return a string wrapped in curly braces with the current message labels.
+Returns nil if there are no labels. The current buffer must
+already be narrowed to the message headers for the message being
+processed."
+ (let ((labels (mail-fetch-field rmail-keyword-header)))
+ (and labels
+ (not (string-equal labels ""))
(progn
- (delete-region (point)
- (progn (forward-line -1) (point)))
- (setq line nil)))
- ;; If we didn't get a valid status line from the message,
- ;; make a new one and put it in the message.
- (or line
- (let* ((case-fold-search t)
- (next (rmail-msgend msg))
- (beg (if (progn (goto-char (rmail-msgbeg msg))
- (search-forward "\n*** EOOH ***\n" next t))
- (point)
- (forward-line 1)
- (point)))
- (end (progn (search-forward "\n\n" nil t) (point))))
- (save-restriction
- (narrow-to-region beg end)
- (goto-char beg)
- (setq line (rmail-make-basic-summary-line)))
- (goto-char (rmail-msgbeg msg))
- (forward-line 2)
- (insert "Summary-line: " line)))
- (setq pos (string-match "#" line))
- (aset rmail-summary-vector (1- msg)
- (funcall rmail-summary-line-decoder
- (concat (format "%5d " msg)
- (substring line 0 pos)
- labels
- (substring line (1+ pos)))))
- ))
-
-;;;###autoload
-(defcustom rmail-user-mail-address-regexp nil
- "*Regexp matching user mail addresses.
-If non-nil, this variable is used to identify the correspondent
-when receiving new mail. If it matches the address of the sender,
-the recipient is taken as correspondent of a mail.
-If nil \(default value\), your `user-login-name' and `user-mail-address'
-are used to exclude yourself as correspondent.
-
-Usually you don't have to set this variable, except if you collect mails
-sent by you under different user names.
-Then it should be a regexp matching your mail addresses.
-
-Setting this variable has an effect only before reading a mail."
- :type '(choice (const :tag "None" nil) regexp)
- :group 'rmail-retrieve
- :version "21.1")
-
-(defun rmail-make-basic-summary-line ()
+ ;; Intern so that rmail-read-label can offer completion.
+ (mapc 'rmail-make-label (split-string labels ", "))
+ (format "{ %s } " labels)))))
+
+(defun rmail-create-summary (msgnum deleted unseen lines)
+ "Return the summary line for message MSGNUM.
+The current buffer should already be narrowed to the header for that message.
+It could be either buffer, so don't access Rmail local variables.
+DELETED is t if this message is marked deleted.
+UNSEEN is t if it is marked unseen.
+LINES is the number of lines in the message (if we should display that)
+ or else nil."
(goto-char (point-min))
- (concat (save-excursion
- (if (not (re-search-forward "^Date:" nil t))
- " "
- (cond ((re-search-forward "\\([^0-9:]\\)\\([0-3]?[0-9]\\)\\([- \t_]+\\)\\([adfjmnos][aceopu][bcglnprtvy]\\)"
- (save-excursion (end-of-line) (point)) t)
- (format "%2d-%3s"
- (string-to-number (buffer-substring
- (match-beginning 2)
- (match-end 2)))
- (buffer-substring
- (match-beginning 4) (match-end 4))))
- ((re-search-forward "\\([^a-z]\\)\\([adfjmnos][acepou][bcglnprtvy]\\)\\([-a-z \t_]*\\)\\([0-9][0-9]?\\)"
- (save-excursion (end-of-line) (point)) t)
- (format "%2d-%3s"
- (string-to-number (buffer-substring
- (match-beginning 4)
- (match-end 4)))
- (buffer-substring
- (match-beginning 2) (match-end 2))))
- ((re-search-forward "\\(19\\|20\\)\\([0-9][0-9]\\)-\\([01][0-9]\\)-\\([0-3][0-9]\\)"
- (save-excursion (end-of-line) (point)) t)
- (format "%2s%2s%2s"
- (buffer-substring
- (match-beginning 2) (match-end 2))
- (buffer-substring
- (match-beginning 3) (match-end 3))
- (buffer-substring
- (match-beginning 4) (match-end 4))))
- (t "??????"))))
- " "
- (save-excursion
- (let* ((from (and (re-search-forward "^From:[ \t]*" nil t)
- (mail-strip-quoted-names
- (buffer-substring
- (1- (point))
- ;; Get all the lines of the From field
- ;; so that we get a whole comment if there is one,
- ;; so that mail-strip-quoted-names can discard it.
- (let ((opoint (point)))
- (while (progn (forward-line 1)
- (looking-at "[ \t]")))
- ;; Back up over newline, then trailing spaces or tabs
- (forward-char -1)
- (skip-chars-backward " \t")
- (point))))))
- len mch lo)
- (if (or (null from)
- (string-match
- (or rmail-user-mail-address-regexp
- (concat "^\\("
- (regexp-quote (user-login-name))
- "\\($\\|@\\)\\|"
- (regexp-quote
- ;; Don't lose if run from init file
- ;; where user-mail-address is not
- ;; set yet.
- (or user-mail-address
- (concat (user-login-name) "@"
- (or mail-host-address
- (system-name)))))
- "\\>\\)"))
- from))
- ;; No From field, or it's this user.
- (save-excursion
- (goto-char (point-min))
- (if (not (re-search-forward "^To:[ \t]*" nil t))
- nil
- (setq from
- (concat "to: "
- (mail-strip-quoted-names
- (buffer-substring
- (point)
- (progn (end-of-line)
- (skip-chars-backward " \t")
- (point)))))))))
- (if (null from)
- " "
- (setq len (length from))
- (setq mch (string-match "[@%]" from))
- (format "%25s"
- (if (or (not mch) (<= len 25))
- (substring from (max 0 (- len 25)))
- (substring from
- (setq lo (cond ((< (- mch 14) 0) 0)
- ((< len (+ mch 11))
- (- len 25))
- (t (- mch 14))))
- (min len (+ lo 25))))))))
- (if rmail-summary-line-count-flag
- (save-excursion
- (save-restriction
- (widen)
- (let ((beg (rmail-msgbeg msgnum))
- (end (rmail-msgend msgnum))
- lines)
- (save-excursion
- (goto-char beg)
- ;; Count only lines in the reformatted header,
- ;; if we have reformatted it.
- (search-forward "\n*** EOOH ***\n" end t)
- (setq lines (count-lines (point) end)))
- (format (cond
- ((<= lines 9) " [%d]")
- ((<= lines 99) " [%d]")
- ((<= lines 999) " [%3d]")
- (t "[%d]"))
- lines))))
- " ")
- " #" ;The # is part of the format.
- (if (re-search-forward "^Subject:" nil t)
- (progn (skip-chars-forward " \t")
- (buffer-substring (point)
+ (let ((line (rmail-header-summary))
+ (labels (rmail-get-summary-labels))
+ pos status prefix basic-start basic-end linecount-string)
+
+ (setq linecount-string
+ (cond
+ ((not lines) " ")
+ ((<= lines 9) (format " [%d]" lines))
+ ((<= lines 99) (format " [%d]" lines))
+ ((<= lines 999) (format " [%d]" lines))
+ ((<= lines 9999) (format " [%dk]" (/ lines 1000)))
+ ((<= lines 99999) (format " [%dk]" (/ lines 1000)))
+ (t (format "[%dk]" (/ lines 1000)))))
+
+ (setq status (cond
+ (deleted ?D)
+ (unseen ?-)
+ (t ? ))
+ prefix (format "%5d%c " msgnum status)
+ basic-start (car line)
+ basic-end (cadr line))
+ (funcall rmail-summary-line-decoder
+ (concat prefix basic-start linecount-string " "
+ labels basic-end))))
+
+(defun rmail-header-summary ()
+ "Return a message summary based on the message headers.
+The value is a list of two strings, the first and second parts of the summary.
+
+The current buffer must already be narrowed to the message headers for
+the message being processed."
+ (goto-char (point-min))
+ (list
+ (concat (save-excursion
+ (if (not (re-search-forward "^Date:" nil t))
+ " "
+ ;; Match month names case-insensitively
+ (cond ((let ((case-fold-search t))
+ (re-search-forward "\\([^0-9:]\\)\\([0-3]?[0-9]\\)\\([- \t_]+\\)\\([adfjmnos][aceopu][bcglnprtvy]\\)"
+ (line-end-position) t))
+ (format "%2d-%3s"
+ (string-to-number (buffer-substring
+ (match-beginning 2)
+ (match-end 2)))
+ (buffer-substring
+ (match-beginning 4) (match-end 4))))
+ ((let ((case-fold-search t))
+ (re-search-forward "\\([^a-z]\\)\\([adfjmnos][acepou][bcglnprtvy]\\)\\([-a-z \t_]*\\)\\([0-9][0-9]?\\)"
+ (line-end-position) t))
+ (format "%2d-%3s"
+ (string-to-number (buffer-substring
+ (match-beginning 4)
+ (match-end 4)))
+ (buffer-substring
+ (match-beginning 2) (match-end 2))))
+ ((re-search-forward "\\(19\\|20\\)\\([0-9][0-9]\\)-\\([01][0-9]\\)-\\([0-3][0-9]\\)"
+ (line-end-position) t)
+ (format "%2s%2s%2s"
+ (buffer-substring
+ (match-beginning 2) (match-end 2))
+ (buffer-substring
+ (match-beginning 3) (match-end 3))
+ (buffer-substring
+ (match-beginning 4) (match-end 4))))
+ (t "??????"))))
+ " "
+ (save-excursion
+ (let* ((from (and (re-search-forward "^From:[ \t]*" nil t)
+ (mail-strip-quoted-names
+ (buffer-substring
+ (1- (point))
+ ;; Get all the lines of the From field
+ ;; so that we get a whole comment if there is one,
+ ;; so that mail-strip-quoted-names can discard it.
+ (let ((opoint (point)))
+ (while (progn (forward-line 1)
+ (looking-at "[ \t]")))
+ ;; Back up over newline, then trailing spaces or tabs
+ (forward-char -1)
+ (skip-chars-backward " \t")
+ (point))))))
+ len mch lo)
+ (if (or (null from)
+ (string-match
+ (or rmail-user-mail-address-regexp
+ (concat "^\\("
+ (regexp-quote (user-login-name))
+ "\\($\\|@\\)\\|"
+ (regexp-quote
+ ;; Don't lose if run from init file
+ ;; where user-mail-address is not
+ ;; set yet.
+ (or user-mail-address
+ (concat (user-login-name) "@"
+ (or mail-host-address
+ (system-name)))))
+ "\\>\\)"))
+ from))
+ ;; No From field, or it's this user.
+ (save-excursion
+ (goto-char (point-min))
+ (if (not (re-search-forward "^To:[ \t]*" nil t))
+ nil
+ (setq from
+ (concat "to: "
+ (mail-strip-quoted-names
+ (buffer-substring
+ (point)
(progn (end-of-line)
- (point))))
- (re-search-forward "[\n][\n]+" nil t)
- (buffer-substring (point) (progn (end-of-line) (point))))
- "\n"))
+ (skip-chars-backward " \t")
+ (point)))))))))
+ (if (null from)
+ " "
+ (setq len (length from))
+ (setq mch (string-match "[@%]" from))
+ (format "%25s"
+ (if (or (not mch) (<= len 25))
+ (substring from (max 0 (- len 25)))
+ (substring from
+ (setq lo (cond ((< (- mch 14) 0) 0)
+ ((< len (+ mch 11))
+ (- len 25))
+ (t (- mch 14))))
+ (min len (+ lo 25)))))))))
+ (concat (if (re-search-forward "^Subject:" nil t)
+ (let (pos str)
+ (skip-chars-forward " \t")
+ (setq pos (point))
+ (forward-line 1)
+ (setq str (buffer-substring pos (1- (point))))
+ (while (looking-at "\\s ")
+ (setq str (concat str " "
+ (buffer-substring (match-end 0)
+ (line-end-position))))
+ (forward-line 1))
+ str)
+ (re-search-forward "[\n][\n]+" nil t)
+ (buffer-substring (point) (progn (end-of-line) (point))))
+ "\n")))
\f
;; Simple motion in a summary buffer.
non-del-msg-found)))
(setq count (1- count))))
(beginning-of-line)
- (display-buffer rmail-view-buffer))
+ (display-buffer rmail-buffer))
(defun rmail-summary-previous-msg (&optional number)
"Display previous non-deleted msg from rmail file.
With prefix argument N moves forward N messages with these labels."
(interactive "p\nsMove to next msg with labels: ")
(let (msg)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-next-labeled-message n labels)
(setq msg rmail-current-message))
(rmail-summary-goto-msg msg)))
With prefix argument N moves backward N messages with these labels."
(interactive "p\nsMove to previous msg with labels: ")
(let (msg)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-previous-labeled-message n labels)
(setq msg rmail-current-message))
(rmail-summary-goto-msg msg)))
If N is negative, go backwards."
(interactive "p")
(let ((forward (> n 0))
- search-regexp i found)
+ subject i found)
(with-current-buffer rmail-buffer
- (setq search-regexp (rmail-current-subject-regexp)
+ (setq subject (rmail-simplified-subject)
i rmail-current-message))
(save-excursion
(while (and (/= n 0)
(setq i (string-to-number
(buffer-substring (point)
(min (point-max) (+ 6 (point))))))
- ;; See if that msg has desired subject.
- (save-excursion
- (set-buffer rmail-buffer)
- (save-restriction
- (widen)
- (goto-char (rmail-msgbeg i))
- (search-forward "\n*** EOOH ***\n")
- (let ((beg (point)) end)
- (search-forward "\n\n")
- (setq end (point))
- (goto-char beg)
- (setq done (re-search-forward search-regexp end t))))))
+ (setq done (string-equal subject (rmail-simplified-subject i))))
(if done (setq found i)))
(setq n (if forward (1- n) (1+ n)))))
(if found
(not (overlay-get rmail-summary-overlay 'face))
(let ((buffer-read-only nil))
(skip-chars-forward " ")
- (skip-chars-forward "[0-9]")
+ (skip-chars-forward "0-9")
(if undel
(if (looking-at "D")
(progn (delete-char 1) (insert " ")))
(delete-char 1)
- (insert "D"))))
+ (insert "D"))
+ ;; Register a new summary line.
+ (with-current-buffer rmail-buffer
+ (aset rmail-summary-vector (1- n) (rmail-create-summary-line n)))))
(beginning-of-line))
+(defun rmail-summary-update-line (n)
+ "Update the summary line for message N."
+ (when (rmail-summary-goto-msg n t t)
+ (let* ((buffer-read-only nil)
+ (start (line-beginning-position))
+ (end (line-beginning-position 2))
+ (overlays (overlays-in start end))
+ high ov)
+ (while (and (setq ov (car overlays))
+ (not (setq high (overlay-get ov 'rmail-summary))))
+ (setq overlays (cdr overlays)))
+ (delete-region start end)
+ (princ
+ (with-current-buffer rmail-buffer
+ (aset rmail-summary-vector (1- n) (rmail-create-summary-line n)))
+ (current-buffer))
+ (when high
+ (forward-line -1)
+ (rmail-summary-update-highlight nil)))))
+
(defun rmail-summary-mark-undeleted (n)
(rmail-summary-mark-deleted n t))
(save-excursion
(and n (rmail-summary-goto-msg n nil t))
(skip-chars-forward " ")
- (skip-chars-forward "[0-9]")
+ (skip-chars-forward "0-9")
(looking-at "D")))
(defun rmail-summary-undelete (&optional arg)
(rmail-summary-goto-msg)
(if rmail-enable-mime
(set-buffer rmail-buffer)
- (pop-to-buffer rmail-buffer))
+ (rmail-pop-to-buffer rmail-buffer))
(and (rmail-message-deleted-p rmail-current-message)
(rmail-undelete-previous-message))
(if rmail-enable-mime
- (pop-to-buffer rmail-view-buffer))
- (pop-to-buffer rmail-summary-buffer))
+ (rmail-pop-to-buffer rmail-buffer))
+ (rmail-pop-to-buffer rmail-summary-buffer))
(t (goto-char opoint))))))
(defun rmail-summary-undelete-many (&optional n)
"Undelete all deleted msgs, optional prefix arg N means undelete N prev msgs."
(interactive "P")
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(let* ((init-msg (if n rmail-current-message rmail-total-messages))
(rmail-current-message init-msg)
(n (or n rmail-total-messages))
(while (and (> rmail-current-message 0)
(< msgs-undeled n))
(if (rmail-message-deleted-p rmail-current-message)
- (progn (rmail-set-attribute "deleted" nil)
+ (progn (rmail-set-attribute rmail-deleted-attr-index nil)
(setq msgs-undeled (1+ msgs-undeled))))
(setq rmail-current-message (1- rmail-current-message)))
(set-buffer rmail-summary-buffer)
(setq buffer-read-only t)
(set-syntax-table text-mode-syntax-table)
(make-local-variable 'rmail-buffer)
- (make-local-variable 'rmail-view-buffer)
(make-local-variable 'rmail-total-messages)
(make-local-variable 'rmail-current-message)
(setq rmail-current-message nil)
(add-hook 'post-command-hook 'rmail-summary-rmail-update nil t)
(setq revert-buffer-function 'rmail-update-summary))
+(defun rmail-summary-mark-seen (n &optional nomove unseen)
+ "Remove the unseen mark from the current message, update the summary vector.
+N is the number of the current message. Optional argument NOMOVE
+non-nil means we are already at the right column. Optional argument
+UNSEEN non-nil means mark the message as unseen."
+ (save-excursion
+ (unless nomove
+ (beginning-of-line)
+ (skip-chars-forward " ")
+ (skip-chars-forward "0-9"))
+ (when (char-equal (following-char) (if unseen ?\s ?-))
+ (let ((buffer-read-only nil))
+ (delete-char 1)
+ (insert (if unseen "-" " ")))
+ (let ((line (buffer-substring-no-properties (line-beginning-position)
+ (line-beginning-position 2))))
+ (with-current-buffer rmail-buffer
+ (aset rmail-summary-vector (1- n) line))))))
+
(defvar rmail-summary-put-back-unseen nil
"Used for communicating between calls to `rmail-summary-rmail-update'.
If it moves to a message within an Incremental Search, and removes
(setq rmail-summary-put-back-unseen nil))
(or (eq rmail-current-message msg-num)
- (let ((window (get-buffer-window rmail-view-buffer t))
+ (let ((window (get-buffer-window rmail-buffer t))
(owin (selected-window)))
(if isearch-mode
- (save-excursion
- (set-buffer rmail-buffer)
+ (progn
;; If we first saw the previous message in this search,
;; and we have gone to a different message while searching,
;; put back `unseen' on the former one.
- (if rmail-summary-put-back-unseen
- (rmail-set-attribute "unseen" t
- rmail-current-message))
+ (when rmail-summary-put-back-unseen
+ (rmail-set-attribute rmail-unseen-attr-index t
+ rmail-current-message)
+ (save-excursion
+ (goto-char rmail-summary-put-back-unseen)
+ (rmail-summary-mark-seen rmail-current-message t t)))
;; Arrange to do that later, for the new current message,
;; if it still has `unseen'.
(setq rmail-summary-put-back-unseen
- (rmail-message-labels-p msg-num ", ?\\(unseen\\),")))
+ (if (rmail-message-unseen-p msg-num)
+ (point))))
(setq rmail-summary-put-back-unseen nil))
-
;; Go to the desired message.
(setq rmail-current-message msg-num)
-
;; Update the summary to show the message has been seen.
- (if (= (following-char) ?-)
- (progn
- (delete-char 1)
- (insert " ")))
-
+ (rmail-summary-mark-seen msg-num t)
(if window
;; Using save-window-excursion would cause the new value
;; of point to get lost.
(rmail-show-message msg-num t))
(select-window owin))
(if (buffer-name rmail-buffer)
- (save-excursion
- (set-buffer rmail-buffer)
- (rmail-show-message msg-num t))))))
+ (with-current-buffer rmail-buffer
+ (rmail-show-message msg-num t))))
+ ;; In linum mode, the message buffer must be specially
+ ;; updated (Bug#4878).
+ (and (fboundp 'linum-update)
+ (buffer-name rmail-buffer)
+ (linum-update rmail-buffer))))
(rmail-summary-update-highlight nil)))))
(defun rmail-summary-save-buffer ()
(define-key rmail-summary-mode-map "\e\C-l" 'rmail-summary-by-labels)
(define-key rmail-summary-mode-map "\e\C-r" 'rmail-summary-by-recipients)
(define-key rmail-summary-mode-map "\e\C-s" 'rmail-summary-by-regexp)
+ ;; `f' for "from".
+ (define-key rmail-summary-mode-map "\e\C-f" 'rmail-summary-by-senders)
(define-key rmail-summary-mode-map "\e\C-t" 'rmail-summary-by-topic)
(define-key rmail-summary-mode-map "m" 'rmail-summary-mail)
(define-key rmail-summary-mode-map "\M-m" 'rmail-summary-retry-failure)
(define-key rmail-summary-mode-map "n" 'rmail-summary-next-msg)
(define-key rmail-summary-mode-map "\en" 'rmail-summary-next-all)
(define-key rmail-summary-mode-map "\e\C-n" 'rmail-summary-next-labeled-message)
- (define-key rmail-summary-mode-map "o" 'rmail-summary-output-to-rmail-file)
- (define-key rmail-summary-mode-map "\C-o" 'rmail-summary-output)
+ (define-key rmail-summary-mode-map "o" 'rmail-summary-output)
+ (define-key rmail-summary-mode-map "\C-o" 'rmail-summary-output-as-seen)
(define-key rmail-summary-mode-map "p" 'rmail-summary-previous-msg)
(define-key rmail-summary-mode-map "\ep" 'rmail-summary-previous-all)
(define-key rmail-summary-mode-map "\e\C-p" 'rmail-summary-previous-labeled-message)
(define-key rmail-summary-mode-map "Q" 'rmail-summary-wipe)
(define-key rmail-summary-mode-map "r" 'rmail-summary-reply)
(define-key rmail-summary-mode-map "s" 'rmail-summary-expunge-and-save)
+ ;; See rms's comment in rmail.el
+;;; (define-key rmail-summary-mode-map "\er" 'rmail-summary-search-backward)
(define-key rmail-summary-mode-map "\es" 'rmail-summary-search)
(define-key rmail-summary-mode-map "t" 'rmail-summary-toggle-header)
(define-key rmail-summary-mode-map "u" 'rmail-summary-undelete)
(define-key rmail-summary-mode-map "\M-u" 'rmail-summary-undelete-many)
(define-key rmail-summary-mode-map "x" 'rmail-summary-expunge)
(define-key rmail-summary-mode-map "w" 'rmail-summary-output-body)
+ (define-key rmail-summary-mode-map "v" 'rmail-mime)
(define-key rmail-summary-mode-map "." 'rmail-summary-beginning-of-message)
(define-key rmail-summary-mode-map "/" 'rmail-summary-end-of-message)
(define-key rmail-summary-mode-map "<" 'rmail-summary-first-message)
'(nil))
(define-key rmail-summary-mode-map [menu-bar classify output-body]
- '("Output (body)..." . rmail-summary-output-body))
+ '("Output body..." . rmail-summary-output-body))
(define-key rmail-summary-mode-map [menu-bar classify output-inbox]
- '("Output (inbox)..." . rmail-summary-output))
+ '("Output..." . rmail-summary-output))
(define-key rmail-summary-mode-map [menu-bar classify output]
- '("Output (Rmail)..." . rmail-summary-output-to-rmail-file))
+ '("Output as seen..." . rmail-summary-output-as-seen))
(define-key rmail-summary-mode-map [menu-bar classify kill-label]
'("Kill Label..." . rmail-summary-kill-label))
and move to that message in the Rmail buffer.
If NOWARN, don't say anything if N is out of range.
-If SKIP-RMAIL, don't do anything to the Rmail buffer."
+If SKIP-RMAIL, don't do anything to the Rmail buffer.
+Returns non-nil if message N was found."
(interactive "P")
(if (consp n) (setq n (prefix-numeric-value n)))
(if (eobp) (forward-line -1))
(curmsg (string-to-number
(buffer-substring (point)
(min (point-max) (+ 6 (point))))))
- (total (save-excursion (set-buffer buf) rmail-total-messages)))
+ (total (with-current-buffer buf rmail-total-messages)))
;; If message number N was specified, find that message's line
;; or set message-not-found.
;; If N wasn't specified or that message can't be found.
(setq n curmsg)
(setq message-not-found t)
(goto-char cur))))
- (beginning-of-line)
- (skip-chars-forward " ")
- (skip-chars-forward "0-9")
- (save-excursion (if (= (following-char) ?-)
- (let ((buffer-read-only nil))
- (delete-char 1)
- (insert " "))))
+ (rmail-summary-mark-seen n)
(rmail-summary-update-highlight message-not-found)
(beginning-of-line)
- (if skip-rmail
- nil
+ (unless skip-rmail
(let ((selwin (selected-window)))
(unwind-protect
- (progn (pop-to-buffer buf)
+ (progn (rmail-pop-to-buffer buf)
(rmail-show-message n))
(select-window selwin)
;; The actions above can alter the current buffer. Preserve it.
- (set-buffer obuf))))))
+ (set-buffer obuf))))
+ (not message-not-found)))
;; Update the highlighted line in an rmail summary buffer.
;; That should be current. We highlight the line point is on.
(or rmail-summary-overlay
(progn
(make-local-variable 'rmail-summary-overlay)
- (setq rmail-summary-overlay (make-overlay (point) (point)))))
+ (setq rmail-summary-overlay (make-overlay (point) (point)))
+ (overlay-put rmail-summary-overlay 'rmail-summary t)))
;; If this message is in the summary, use the overlay to highlight it.
;; Otherwise, don't highlight anything.
(if not-found
(save-excursion (beginning-of-line)
(skip-chars-forward " ")
(point))
- (save-excursion (end-of-line) (point)))
+ (line-end-position))
(overlay-put rmail-summary-overlay 'face 'highlight)))
\f
(defun rmail-summary-scroll-msg-up (&optional dist)
(interactive "P")
(if (eq dist '-)
(rmail-summary-scroll-msg-down nil)
- (let ((rmail-buffer-window (get-buffer-window rmail-view-buffer)))
+ (let ((rmail-buffer-window (get-buffer-window rmail-buffer)))
(if rmail-buffer-window
(if (let ((rmail-summary-window (selected-window)))
(select-window rmail-buffer-window)
(if (not rmail-summary-scroll-between-messages)
(error "End of buffer")
(rmail-summary-next-msg (or dist 1)))
- (let ((other-window-scroll-buffer rmail-view-buffer))
+ (let ((other-window-scroll-buffer rmail-buffer))
(scroll-other-window dist)))
;; If it isn't visible at all, show the beginning.
(rmail-summary-beginning-of-message)))))
(interactive "P")
(if (eq dist '-)
(rmail-summary-scroll-msg-up nil)
- (let ((rmail-buffer-window (get-buffer-window rmail-view-buffer)))
+ (let ((rmail-buffer-window (get-buffer-window rmail-buffer)))
(if rmail-buffer-window
(if (let ((rmail-summary-window (selected-window)))
(select-window rmail-buffer-window)
(if (not rmail-summary-scroll-between-messages)
(error "Beginning of buffer")
(rmail-summary-previous-msg (or dist 1)))
- (let ((other-window-scroll-buffer rmail-view-buffer))
+ (let ((other-window-scroll-buffer rmail-buffer))
(scroll-other-window-down dist)))
;; If it isn't visible at all, show the beginning.
(rmail-summary-beginning-of-message)))))
Position it according to WHERE which can be BEG or END"
(if (and (one-window-p) (not pop-up-frames))
;; If there is just one window, put the summary on the top.
- (let ((buffer rmail-view-buffer))
+ (let ((buffer rmail-buffer))
(split-window (selected-window) rmail-summary-window-size)
(select-window (frame-first-window))
- (pop-to-buffer rmail-view-buffer)
+ (rmail-pop-to-buffer rmail-buffer)
;; If pop-to-buffer did not use that window, delete that
;; window. (This can happen if it uses another frame.)
(or (eq buffer (window-buffer (next-window (frame-first-window))))
(delete-other-windows)))
- (pop-to-buffer rmail-view-buffer))
+ (rmail-pop-to-buffer rmail-buffer))
(cond
((eq where 'BEG)
(goto-char (point-min))
(goto-char (point-max))
(recenter (1- (window-height))))
)
- (pop-to-buffer rmail-summary-buffer))
+ (rmail-pop-to-buffer rmail-summary-buffer))
(defun rmail-summary-bury ()
"Bury the Rmail buffer and the Rmail summary buffer."
(defun rmail-summary-wipe ()
"Kill and wipe away Rmail summary, remaining within Rmail."
(interactive)
- (save-excursion (set-buffer rmail-buffer) (setq rmail-summary-buffer nil))
- (let ((local-rmail-buffer rmail-view-buffer))
+ (with-current-buffer rmail-buffer (setq rmail-summary-buffer nil))
+ (let ((local-rmail-buffer rmail-buffer))
(kill-buffer (current-buffer))
;; Delete window if not only one.
(if (not (eq (selected-window) (next-window nil 'no-minibuf)))
(delete-window))
;; Switch windows to the rmail buffer, or switch to it in this window.
- (pop-to-buffer local-rmail-buffer)))
+ (rmail-pop-to-buffer local-rmail-buffer)))
(defun rmail-summary-expunge ()
"Actually erase all deleted messages and recompute summary headers."
(interactive)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(when (rmail-expunge-confirmed)
(rmail-only-expunge)))
(rmail-update-summary))
"Expunge and save RMAIL file."
(interactive)
(save-excursion
- (set-buffer rmail-buffer)
- (when (rmail-expunge-confirmed)
- (rmail-only-expunge)))
+ (rmail-expunge-and-save))
(rmail-update-summary)
- (save-excursion
- (set-buffer rmail-buffer)
- (save-buffer))
(set-buffer-modified-p nil))
(defun rmail-summary-get-new-mail (&optional file-name)
(list (if current-prefix-arg
(read-file-name "Get new mail from file: "))))
(let (msg)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-get-new-mail file-name)
;; Get the proper new message number.
(setq msg rmail-current-message))
"Run Rmail on file FILENAME."
(interactive "FRun rmail on RMAIL file: ")
;; We switch windows here, then display the other Rmail file there.
- (pop-to-buffer rmail-buffer)
+ (rmail-pop-to-buffer rmail-buffer)
(rmail filename))
(defun rmail-summary-first-message ()
(declare-function rmail-cease-edit "rmailedit"())
(declare-function rmail-set-label "rmailkwd" (l state &optional n))
(declare-function rmail-output-read-file-name "rmailout" ())
-(declare-function rmail-output-read-rmail-file-name "rmailout" ())
(declare-function mail-send-and-exit "sendmail" (&optional arg))
(defvar rmail-summary-edit-map nil)
(defun rmail-summary-edit-current-message ()
"Edit the contents of this message."
(interactive)
- (pop-to-buffer rmail-buffer)
+ (rmail-pop-to-buffer rmail-buffer)
(rmail-edit-current-message)
(use-local-map rmail-summary-edit-map))
"Finish editing message, then go back to Rmail summary buffer."
(interactive)
(rmail-cease-edit)
- (pop-to-buffer rmail-summary-buffer))
+ (rmail-pop-to-buffer rmail-summary-buffer))
(defun rmail-summary-abort-edit ()
"Abort edit of current message; restore original contents.
Go back to summary buffer."
(interactive)
(rmail-abort-edit)
- (pop-to-buffer rmail-summary-buffer))
+ (rmail-pop-to-buffer rmail-summary-buffer))
(defun rmail-summary-search-backward (regexp &optional n)
"Show message containing next match for REGEXP.
(prefix-numeric-value current-prefix-arg))))
;; Don't use save-excursion because that prevents point from moving
;; properly in the summary buffer.
- (let ((buffer (current-buffer)))
- (unwind-protect
- (progn
- (set-buffer rmail-buffer)
- (rmail-search regexp (- n)))
- (set-buffer buffer))))
+ (with-current-buffer rmail-buffer
+ (rmail-search regexp (- n))))
(defun rmail-summary-search (regexp &optional n)
"Show message containing next match for REGEXP.
(prefix-numeric-value current-prefix-arg))))
;; Don't use save-excursion because that prevents point from moving
;; properly in the summary buffer.
- (let ((buffer (current-buffer)))
+ (let ((buffer (current-buffer))
+ (selwin (selected-window)))
(unwind-protect
(progn
- (set-buffer rmail-buffer)
+ (rmail-pop-to-buffer rmail-buffer)
(rmail-search regexp n))
+ (select-window selwin)
(set-buffer buffer))))
(defun rmail-summary-toggle-header ()
(rmail-toggle-header))
;; Inside save-excursion, some changes to point in the RMAIL buffer are lost.
;; Set point to point-min in the RMAIL buffer, if it is visible.
- (let ((window (get-buffer-window rmail-view-buffer)))
+ (let ((window (get-buffer-window rmail-buffer)))
(if window
;; Using save-window-excursion would lose the new value of point.
(let ((owin (selected-window)))
(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)
+ (interactive (list (with-current-buffer rmail-buffer
(rmail-read-label "Add label"))))
- (save-excursion
- (set-buffer rmail-buffer)
+ (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 (save-excursion
- (set-buffer rmail-buffer)
+ (interactive (list (with-current-buffer rmail-buffer
(rmail-read-label "Kill label"))))
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-set-label label nil)))
\f
;;;; *** Rmail Summary Mailing Commands ***
prefix argument means ignore them. While composing the reply,
use \\[mail-yank-original] to yank the original message into it."
(interactive "P")
- (let ((window (get-buffer-window rmail-view-buffer)))
+ (let ((window (get-buffer-window rmail-buffer)))
(if window
(select-window window)
- (set-buffer rmail-view-buffer)))
+ (set-buffer rmail-buffer)))
(rmail-reply just-sender)
(rmail-summary-override-mail-send-and-exit))
\f
;; Summary output commands.
-(defun rmail-summary-output-to-rmail-file (&optional file-name n)
- "Append the current message to an Rmail file named FILE-NAME.
-If the file does not exist, ask if it should be created.
-If file is being visited, the message is appended to the Emacs
-buffer visiting that file.
-
-A prefix argument N says to output N consecutive messages
-starting with the current one. Deleted messages are skipped and don't count."
+(defun rmail-summary-output (&optional file-name n)
+ "Append this message to mail file FILE-NAME.
+This works with both mbox format and Babyl format files,
+outputting in the appropriate format for each.
+The default file name comes from `rmail-default-file',
+which is updated to the name you use in this command.
+
+A prefix argument N says to output that many consecutive messages
+from those in the summary, starting with the current one.
+Deleted messages are skipped and don't count.
+When called from Lisp code, N may be omitted and defaults to 1.
+
+This command always outputs the complete message header,
+even the header display is currently pruned."
(interactive
(progn (require 'rmailout)
- (list (rmail-output-read-rmail-file-name)
+ (list (rmail-output-read-file-name)
(prefix-numeric-value current-prefix-arg))))
(let ((i 0) prev-msg)
(while
(setq i (1+ i))
(with-current-buffer rmail-buffer
(let ((rmail-delete-after-output nil))
- (rmail-output-to-rmail-file file-name 1)))
+ (rmail-output file-name 1)))
(if rmail-delete-after-output
(rmail-summary-delete-forward nil)
(if (< i n)
(rmail-summary-next-msg 1))))))
-(defun rmail-summary-output (&optional file-name n)
- "Append this message to Unix mail file named FILE-NAME.
+(defalias 'rmail-summary-output-to-rmail-file 'rmail-summary-output)
+
+(declare-function rmail-output-as-seen "rmailout"
+ (file-name &optional count noattribute from-gnus))
-A prefix argument N says to output N consecutive messages
-starting with the current one. Deleted messages are skipped and don't count."
+(defun rmail-summary-output-as-seen (&optional file-name n)
+ "Append this message to mbox file named FILE-NAME.
+A prefix argument N says to output that many consecutive messages,
+from the summary, starting with the current one.
+Deleted messages are skipped and don't count.
+When called from Lisp code, N may be omitted and defaults to 1.
+
+This outputs the message header as you see it (or would see it)
+displayed in Rmail.
+
+The default file name comes from `rmail-default-file',
+which is updated to the name you use in this command."
(interactive
(progn (require 'rmailout)
(list (rmail-output-read-file-name)
(prefix-numeric-value current-prefix-arg))))
+ (require 'rmailout) ; for rmail-output-as-seen in non-interactive case
(let ((i 0) prev-msg)
(while
(and (< i n)
(setq i (1+ i))
(with-current-buffer rmail-buffer
(let ((rmail-delete-after-output nil))
- (rmail-output file-name 1)))
+ (rmail-output-as-seen file-name 1)))
(if rmail-delete-after-output
(rmail-summary-delete-forward nil)
(if (< i n)
(defun rmail-summary-output-menu ()
"Output current message to another Rmail file, chosen with a menu.
-Also set the default for subsequent \\[rmail-output-to-rmail-file] commands.
+Also set the default for subsequent \\[rmail-output-to-babyl-file] commands.
The variables `rmail-secondary-file-directory' and
`rmail-secondary-file-regexp' control which files are offered in the menu."
(interactive)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(let ((rmail-delete-after-output nil))
(call-interactively 'rmail-output-menu)))
(if rmail-delete-after-output
(cons "Output Rmail File"
(rmail-list-to-menu "Output Rmail File"
files
- 'rmail-summary-output-to-rmail-file))))
+ 'rmail-summary-output))))
(define-key rmail-summary-mode-map [menu-bar classify input-menu]
'("Input Rmail File" . rmail-disable-menu))
(define-key rmail-summary-mode-map [menu-bar classify output-menu]
"Write this message body to the file FILE-NAME.
FILE-NAME defaults, interactively, from the Subject field of the message."
(interactive)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(let ((rmail-delete-after-output nil))
(if file-name
(rmail-output-body-to-file file-name)
;; Sorting messages in Rmail Summary buffer.
(defun rmail-summary-sort-by-date (reverse)
- "Sort messages of current Rmail summary by date.
-If prefix argument REVERSE is non-nil, sort them in reverse order."
+ "Sort messages of current Rmail summary by \"Date\" header.
+If prefix argument REVERSE is non-nil, sorts in reverse order."
(interactive "P")
(rmail-sort-from-summary (function rmail-sort-by-date) reverse))
(defun rmail-summary-sort-by-subject (reverse)
- "Sort messages of current Rmail summary by subject.
-If prefix argument REVERSE is non-nil, sort them in reverse order."
+ "Sort messages of current Rmail summary by \"Subject\" header.
+Ignores any \"Re: \" prefix. If prefix argument REVERSE is
+non-nil, sorts in reverse order."
(interactive "P")
(rmail-sort-from-summary (function rmail-sort-by-subject) reverse))
(defun rmail-summary-sort-by-author (reverse)
"Sort messages of current Rmail summary by author.
-If prefix argument REVERSE is non-nil, sort them in reverse order."
+This uses either the \"From\" or \"Sender\" header, downcased.
+If prefix argument REVERSE is non-nil, sorts in reverse order."
(interactive "P")
(rmail-sort-from-summary (function rmail-sort-by-author) reverse))
(defun rmail-summary-sort-by-recipient (reverse)
"Sort messages of current Rmail summary by recipient.
-If prefix argument REVERSE is non-nil, sort them in reverse order."
+This uses either the \"To\" or \"Apparently-To\" header, downcased.
+If prefix argument REVERSE is non-nil, sorts in reverse order."
(interactive "P")
(rmail-sort-from-summary (function rmail-sort-by-recipient) reverse))
(defun rmail-summary-sort-by-correspondent (reverse)
"Sort messages of current Rmail summary by other correspondent.
-If prefix argument REVERSE is non-nil, sort them in reverse order."
+This uses either the \"From\", \"Sender\", \"To\", or
+\"Apparently-To\" header, downcased. Uses the first header not
+excluded by `rmail-dont-reply-to-names'. If prefix argument
+REVERSE is non-nil, sorts in reverse order."
(interactive "P")
(rmail-sort-from-summary (function rmail-sort-by-correspondent) reverse))
(defun rmail-summary-sort-by-lines (reverse)
- "Sort messages of current Rmail summary by lines of the message.
-If prefix argument REVERSE is non-nil, sort them in reverse order."
+ "Sort messages of current Rmail summary by the number of lines.
+If prefix argument REVERSE is non-nil, sorts in reverse order."
(interactive "P")
(rmail-sort-from-summary (function rmail-sort-by-lines) reverse))
(defun rmail-summary-sort-by-labels (reverse labels)
"Sort messages of current Rmail summary by labels.
-If prefix argument REVERSE is non-nil, sort them in reverse order.
-KEYWORDS is a comma-separated list of labels."
+LABELS is a comma-separated list of labels.
+If prefix argument REVERSE is non-nil, sorts in reverse order."
(interactive "P\nsSort by labels: ")
(rmail-sort-from-summary
- (function (lambda (reverse)
- (rmail-sort-by-labels reverse labels)))
+ (lambda (reverse) (rmail-sort-by-labels reverse labels))
reverse))
(defun rmail-sort-from-summary (sortfun reverse)
- "Sort Rmail messages from Summary buffer and update it after sorting."
+ "Sort the Rmail buffer using sorting function SORTFUN.
+Passes REVERSE to SORTFUN as its sole argument. Then regenerates
+the summary. Note that the whole Rmail buffer is sorted, even if
+the summary is only showing a subset of messages."
(require 'rmailsort)
(let ((selwin (selected-window)))
(unwind-protect
- (progn (pop-to-buffer rmail-buffer)
+ (progn (rmail-pop-to-buffer rmail-buffer)
(funcall sortfun reverse))
(select-window selwin))))
(provide 'rmailsum)
-;; arch-tag: 556079ee-75c1-47f5-9884-2e0a0bc6c5a1
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
;;; rmailsum.el ends here
HCoop / bpt / emacs.git / blobdiff