;;; rmailsum.el --- make summary buffers for the mail reader
-;; Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1993, 1994, 1995 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
;;; Code:
+;; For rmail-select-summary
+(require 'rmail)
+
+(defvar rmail-summary-font-lock-keywords
+ '(("^....D.*" . font-lock-string-face) ; Deleted.
+ ("^....-.*" . font-lock-type-face) ; Unread.
+ ;; Neither of the below will be highlighted if either of the above are:
+ ("^....[^D-] \\(......\\)" 1 font-lock-keyword-face) ; Date.
+ ("{ \\([^}]+\\),}" 1 font-lock-comment-face)) ; Labels.
+ "Additional expressions to highlight in Rmail Summary mode.")
+
;; Entry points for making a summary buffer.
;; Regenerate the contents of the summary
(setq rmail-summary-buffer sumbuf))
;; Now display the summary buffer and go to the right place in it.
(or was-in-summary
- (if (one-window-p)
- ;; If there is just one window, put the summary on the top.
- (progn
- (split-window)
- (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)))
+ (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)))
(rmail-summary-goto-msg mesg t t)
+ (rmail-summary-construct-io-menu)
(message "Computing summary lines...done")))
\f
;; Low levels of generating a summary.
(skip-chars-backward " \t")
(point)))))
len mch lo)
- (if (string-match (concat "^"
+ (if (string-match (concat "^\\("
(regexp-quote (user-login-name))
- "\\($\\|@\\)")
+ "\\($\\|@\\)\\|"
+ (regexp-quote user-mail-address)
+ "\\>\\)")
from)
(save-excursion
(goto-char (point-min))
(defun rmail-summary-next-all (&optional number)
(interactive "p")
(forward-line (if number number 1))
+ ;; It doesn't look nice to move forward past the last message line.
+ (and (eobp) (> number 0)
+ (forward-line -1))
(display-buffer rmail-buffer))
(defun rmail-summary-previous-all (&optional number)
(interactive "p")
(forward-line (- (if number number 1)))
+ ;; It doesn't look nice to move forward past the last message line.
+ (and (eobp) (< number 0)
+ (forward-line -1))
(display-buffer rmail-buffer))
(defun rmail-summary-next-msg (&optional number)
(save-excursion
(set-buffer rmail-buffer)
(rmail-previous-labeled-message n labels)))
+
+(defun rmail-summary-next-same-subject (n)
+ "Go to the next message in the summary having the same subject.
+With prefix argument N, do this N times.
+If N is negative, go backwards."
+ (interactive "p")
+ (let (subject search-regexp i found
+ (forward (> n 0)))
+ (save-excursion
+ (set-buffer rmail-buffer)
+ (setq subject (mail-fetch-field "Subject"))
+ (setq search-regexp (concat "^Subject: *\\(Re: *\\)?"
+ (regexp-quote subject)
+ "\n"))
+ (setq i rmail-current-message))
+ (if (string-match "Re:[ \t]*" subject)
+ (setq subject (substring subject (match-end 0))))
+ (save-excursion
+ (while (and (/= n 0)
+ (if forward
+ (not (eobp))
+ (not (bobp))))
+ (let (done)
+ (while (and (not done)
+ (if forward
+ (not (eobp))
+ (not (bobp))))
+ ;; Advance thru summary.
+ (forward-line (if forward 1 -1))
+ ;; Get msg number of this line.
+ (setq i (string-to-int
+ (buffer-substring (point)
+ (min (point-max) (+ 5 (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))))))
+ (if done (setq found i)))
+ (setq n (if forward (1- n) (1+ n)))))
+ (if found
+ (rmail-summary-goto-msg found)
+ (error "No %s message with same subject"
+ (if forward "following" "previous")))))
+
+(defun rmail-summary-previous-same-subject (n)
+ "Go to the previous message in the summary having the same subject.
+With prefix argument N, do this N times.
+If N is negative, go forwards instead."
+ (interactive "p")
+ (rmail-summary-next-same-subject (- n)))
\f
;; Delete and undelete summary commands.
(rmail-summary-mark-deleted del-msg)
(while (and (not (if backward (bobp) (eobp)))
(save-excursion (beginning-of-line)
- (looking-at " +[0-9]+D")))
- (forward-line (if backward -1 1))))))
+ (looking-at " *[0-9]+D")))
+ (forward-line (if backward -1 1)))
+ ;; It looks ugly to move to the empty line at end of buffer.
+ (and (eobp) (not backward)
+ (forward-line -1)))))
(defun rmail-summary-delete-backward ()
"Delete this message and move to previous nondeleted one.
(defun rmail-summary-mark-deleted (&optional n undel)
(and n (rmail-summary-goto-msg n t t))
(or (eobp)
+ (not (overlay-get rmail-summary-overlay 'face))
(let ((buffer-read-only nil))
(skip-chars-forward " ")
(skip-chars-forward "[0-9]")
(setq rmail-summary-redo nil)
(make-local-variable 'revert-buffer-function)
(make-local-variable 'post-command-hook)
+ (make-local-variable 'font-lock-defaults)
+ (setq font-lock-defaults '(rmail-summary-font-lock-keywords t))
(rmail-summary-enable)
(run-hooks 'rmail-summary-mode-hook))
(unwind-protect
(progn
(select-window window)
- (rmail-show-message msg-num))
+ (rmail-show-message msg-num t))
(select-window owin))
- (save-excursion
- (set-buffer rmail-buffer)
- (rmail-show-message msg-num)))))))))
+ (if (buffer-name rmail-buffer)
+ (save-excursion
+ (set-buffer rmail-buffer)
+ (rmail-show-message msg-num t))))))
+ (rmail-summary-update-highlight nil)))))
\f
(defvar rmail-summary-mode-map nil)
(define-key rmail-summary-mode-map " " 'rmail-summary-scroll-msg-up)
(define-key rmail-summary-mode-map "\177" 'rmail-summary-scroll-msg-down)
(define-key rmail-summary-mode-map "?" 'describe-mode)
+ (define-key rmail-summary-mode-map "\C-c\C-n" 'rmail-summary-next-same-subject)
+ (define-key rmail-summary-mode-map "\C-c\C-p" 'rmail-summary-previous-same-subject)
(define-key rmail-summary-mode-map "\C-c\C-s\C-d"
'rmail-summary-sort-by-date)
(define-key rmail-summary-mode-map "\C-c\C-s\C-s"
(define-key rmail-summary-mode-map [menu-bar classify]
(cons "Classify" (make-sparse-keymap "Classify")))
+(define-key rmail-summary-mode-map [menu-bar classify output-menu]
+ '("Output (Rmail Menu)..." . rmail-summary-output-menu))
+
+(define-key rmail-summary-mode-map [menu-bar classify input-menu]
+ '("Input Rmail File (menu)..." . rmail-input-menu))
+
+(define-key rmail-summary-mode-map [menu-bar classify input-menu]
+ '(nil))
+
+(define-key rmail-summary-mode-map [menu-bar classify output-menu]
+ '(nil))
+
(define-key rmail-summary-mode-map [menu-bar classify output-inbox]
- '("Output (inbox)" . rmail-summary-output))
+ '("Output (inbox)..." . rmail-summary-output))
(define-key rmail-summary-mode-map [menu-bar classify output]
- '("Output (Rmail)" . rmail-summary-output-to-rmail-file))
+ '("Output (Rmail)..." . rmail-summary-output-to-rmail-file))
(define-key rmail-summary-mode-map [menu-bar classify kill-label]
- '("Kill Label" . rmail-summary-kill-label))
+ '("Kill Label..." . rmail-summary-kill-label))
(define-key rmail-summary-mode-map [menu-bar classify add-label]
- '("Add Label" . rmail-summary-add-label))
+ '("Add Label..." . rmail-summary-add-label))
(define-key rmail-summary-mode-map [menu-bar summary]
(cons "Summary" (make-sparse-keymap "Summary")))
(define-key rmail-summary-mode-map [menu-bar summary labels]
- '("By Labels" . rmail-summary-by-labels))
+ '("By Labels..." . rmail-summary-by-labels))
(define-key rmail-summary-mode-map [menu-bar summary recipients]
- '("By Recipients" . rmail-summary-by-recipients))
+ '("By Recipients..." . rmail-summary-by-recipients))
(define-key rmail-summary-mode-map [menu-bar summary topic]
- '("By Topic" . rmail-summary-by-topic))
+ '("By Topic..." . rmail-summary-by-topic))
(define-key rmail-summary-mode-map [menu-bar summary regexp]
- '("By Regexp" . rmail-summary-by-regexp))
+ '("By Regexp..." . rmail-summary-by-regexp))
(define-key rmail-summary-mode-map [menu-bar summary all]
'("All" . rmail-summary))
(define-key rmail-summary-mode-map [menu-bar mail rmail-summary-get-new-mail]
'("Get New Mail" . rmail-summary-get-new-mail))
-(define-key rmail-summary--mode-map [menu-bar mail lambda]
+(define-key rmail-summary-mode-map [menu-bar mail lambda]
'("----"))
(define-key rmail-summary-mode-map [menu-bar mail continue]
'("Continue" . rmail-summary-continue))
(define-key rmail-summary-mode-map [menu-bar mail resend]
- '("Re-send" . rmail-resend))
+ '("Re-send..." . rmail-summary-resend))
(define-key rmail-summary-mode-map [menu-bar mail forward]
'("Forward" . rmail-summary-forward))
(cons "Move" (make-sparse-keymap "Move")))
(define-key rmail-summary-mode-map [menu-bar move search-back]
- '("Search Back" . rmail-summary-search-backward))
+ '("Search Back..." . rmail-summary-search-backward))
(define-key rmail-summary-mode-map [menu-bar move search]
- '("Search" . rmail-summary-search))
+ '("Search..." . rmail-summary-search))
(define-key rmail-summary-mode-map [menu-bar move previous]
'("Previous Nondeleted" . rmail-summary-previous-msg))
'("Next" . rmail-summary-next-all))
\f
(defvar rmail-summary-overlay nil)
+(put 'rmail-summary-overlay 'permanent-local t)
(defun rmail-summary-goto-msg (&optional n nowarn skip-rmail)
(interactive "P")
(if (consp n) (setq n (prefix-numeric-value n)))
(if (eobp) (forward-line -1))
(beginning-of-line)
- (let ((buf rmail-buffer)
- (cur (point))
- message-not-found
- (curmsg (string-to-int
- (buffer-substring (point)
- (min (point-max) (+ 5 (point)))))))
+ (let* ((obuf (current-buffer))
+ (buf rmail-buffer)
+ (cur (point))
+ message-not-found
+ (curmsg (string-to-int
+ (buffer-substring (point)
+ (min (point-max) (+ 5 (point))))))
+ (total (save-excursion (set-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.
(if (< n 1)
(progn (message "No preceding message")
(setq n 1)))
- (if (> n rmail-total-messages)
+ (if (> n total)
(progn (message "No following message")
(goto-char (point-max))
(rmail-summary-goto-msg)))
(goto-char (point-min))
- (if (not (re-search-forward (concat "^ *" (int-to-string n)) nil t))
+ (if (not (re-search-forward (format "^%4d[^0-9]" n) nil t))
(progn (or nowarn (message "Message %d not found" n))
(setq n curmsg)
(setq message-not-found t)
(let ((buffer-read-only nil))
(delete-char 1)
(insert " "))))
- ;; Make sure we have an overlay to use.
- (or rmail-summary-overlay
- (progn
- (make-local-variable 'rmail-summary-overlay)
- (setq rmail-summary-overlay (make-overlay (point) (point)))))
- ;; If this message is in the summary, use the overlay to highlight it.
- ;; Otherwise, don't highlight anything.
- (if message-not-found
- (overlay-put rmail-summary-overlay 'face nil)
- (move-overlay rmail-summary-overlay
- (save-excursion (beginning-of-line) (1+ (point)))
- (save-excursion (end-of-line) (point)))
- (overlay-put rmail-summary-overlay 'face 'highlight))
+ (rmail-summary-update-highlight message-not-found)
(beginning-of-line)
(if skip-rmail
nil
(unwind-protect
(progn (pop-to-buffer buf)
(rmail-show-message n))
- (select-window selwin))))))
+ (select-window selwin)
+ ;; The actions above can alter the current buffer. Preserve it.
+ (set-buffer obuf))))))
+
+;; Update the highlighted line in an rmail summary buffer.
+;; That should be current. We highlight the line point is on.
+;; If NOT-FOUND is non-nil, we turn off highlighting.
+(defun rmail-summary-update-highlight (not-found)
+ ;; Make sure we have an overlay to use.
+ (or rmail-summary-overlay
+ (progn
+ (make-local-variable 'rmail-summary-overlay)
+ (setq rmail-summary-overlay (make-overlay (point) (point)))))
+ ;; If this message is in the summary, use the overlay to highlight it.
+ ;; Otherwise, don't highlight anything.
+ (if not-found
+ (overlay-put rmail-summary-overlay 'face nil)
+ (move-overlay rmail-summary-overlay
+ (save-excursion (beginning-of-line)
+ (skip-chars-forward " ")
+ (point))
+ (save-excursion (end-of-line) (point)))
+ (overlay-put rmail-summary-overlay 'face 'highlight)))
\f
(defun rmail-summary-scroll-msg-up (&optional dist)
- "Scroll the Rmail window forward."
+ "Scroll the Rmail window forward.
+If the Rmail window is displaying the end of a message,
+advance to the next message."
(interactive "P")
- (let ((other-window-scroll-buffer rmail-buffer))
- (scroll-other-window dist)))
+ (if (eq dist '-)
+ (rmail-summary-scroll-msg-down nil)
+ (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)
+ (prog1
+ ;; Is EOB visible in the buffer?
+ (save-excursion
+ (let ((ht (window-height (selected-window))))
+ (move-to-window-line (- ht 2))
+ (end-of-line)
+ (eobp)))
+ (select-window rmail-summary-window)))
+ (rmail-summary-next-msg (or dist 1))
+ (let ((other-window-scroll-buffer rmail-buffer))
+ (scroll-other-window dist)))
+ ;; This forces rmail-buffer to be sized correctly later.
+ (display-buffer rmail-buffer)
+ (setq rmail-current-message nil)))))
(defun rmail-summary-scroll-msg-down (&optional dist)
- "Scroll the Rmail window backward."
+ "Scroll the Rmail window backward.
+If the Rmail window is displaying the beginning of a message,
+advance to the previous message."
(interactive "P")
- (rmail-summary-scroll-msg-up
- (cond ((eq dist '-) nil)
- ((null dist) '-)
- (t (- (prefix-numeric-value dist))))))
+ (if (eq dist '-)
+ (rmail-summary-scroll-msg-up nil)
+ (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)
+ (prog1
+ ;; Is BOB visible in the buffer?
+ (save-excursion
+ (move-to-window-line 0)
+ (beginning-of-line)
+ (bobp))
+ (select-window rmail-summary-window)))
+ (rmail-summary-previous-msg (or dist 1))
+ (let ((other-window-scroll-buffer rmail-buffer))
+ (scroll-other-window-down dist)))
+ ;; This forces rmail-buffer to be sized correctly later.
+ (display-buffer rmail-buffer)
+ (setq rmail-current-message nil)))))
(defun rmail-summary-beginning-of-message ()
"Show current message from the beginning."
;; Get the proper new message number.
(setq msg rmail-current-message))
;; Make sure that message is displayed.
- (rmail-summary-goto-msg msg)))
+ (or (zerop msg)
+ (rmail-summary-goto-msg msg))))
(defun rmail-summary-input (filename)
"Run Rmail on file FILENAME."
(interactive)
(save-excursion
(set-buffer rmail-buffer)
- (rmail-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-buffer)))
+ (if window
+ ;; Using save-window-excursion would lose the new value of point.
+ (let ((owin (selected-window)))
+ (unwind-protect
+ (progn
+ (select-window window)
+ (goto-char (point-min)))
+ (select-window owin))))))
+
(defun rmail-summary-add-label (label)
"Add LABEL to labels associated with current Rmail message.
While composing the message, use \\[mail-yank-original] to yank the
original message into it."
(interactive)
- (rmail-start-mail nil nil nil nil nil rmail-buffer)
+ (let ((window (get-buffer-window rmail-buffer)))
+ (if window
+ (select-window window)
+ (set-buffer rmail-buffer)))
+ (rmail-start-mail nil nil nil nil nil (current-buffer))
(use-local-map (copy-keymap (current-local-map)))
(define-key (current-local-map)
"\C-c\C-c" 'rmail-summary-send-and-exit))
(defun rmail-summary-continue ()
"Continue composing outgoing message previously being composed."
(interactive)
+ (let ((window (get-buffer-window rmail-buffer)))
+ (if window
+ (select-window window)
+ (set-buffer rmail-buffer)))
(rmail-start-mail t))
(defun rmail-summary-reply (just-sender)
prefix argument means ignore them. While composing the reply,
use \\[mail-yank-original] to yank the original message into it."
(interactive "P")
- (set-buffer rmail-buffer)
+ (let ((window (get-buffer-window rmail-buffer)))
+ (if window
+ (select-window window)
+ (set-buffer rmail-buffer)))
(rmail-reply just-sender)
(use-local-map (copy-keymap (current-local-map)))
(define-key (current-local-map)
For a message rejected by the mail system, extract the interesting headers and
the body of the original message; otherwise copy the current message."
(interactive)
- (set-buffer rmail-buffer)
+ (let ((window (get-buffer-window rmail-buffer)))
+ (if window
+ (select-window window)
+ (set-buffer rmail-buffer)))
(rmail-retry-failure)
(use-local-map (copy-keymap (current-local-map)))
(define-key (current-local-map)
see the documentation of `rmail-resend'."
(interactive "P")
(save-excursion
- (set-buffer rmail-buffer)
+ (let ((window (get-buffer-window rmail-buffer)))
+ (if window
+ (select-window window)
+ (set-buffer rmail-buffer)))
(rmail-forward resend)
(use-local-map (copy-keymap (current-local-map)))
(define-key (current-local-map)
"\C-c\C-c" 'rmail-summary-send-and-exit)))
+
+(defun rmail-summary-resend ()
+ "Resend current message using 'rmail-resend'."
+ (interactive)
+ (save-excursion
+ (let ((window (get-buffer-window rmail-buffer)))
+ (if window
+ (select-window window)
+ (set-buffer rmail-buffer)))
+ (call-interactively 'rmail-resend)))
\f
;; Summary output commands.
-(defun rmail-summary-output-to-rmail-file ()
+(defun rmail-summary-output-to-rmail-file (&optional file-name)
"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
(save-excursion
(set-buffer rmail-buffer)
(let ((rmail-delete-after-output nil))
- (call-interactively 'rmail-output-to-rmail-file)))
+ (if file-name
+ (rmail-output-to-rmail-file file-name)
+ (call-interactively 'rmail-output-to-rmail-file))))
+ (if rmail-delete-after-output
+ (rmail-summary-delete-forward nil)))
+
+(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.
+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)
+ (let ((rmail-delete-after-output nil))
+ (call-interactively 'rmail-output-menu)))
(if rmail-delete-after-output
(rmail-summary-delete-forward nil)))
(call-interactively 'rmail-output)))
(if rmail-delete-after-output
(rmail-summary-delete-forward nil)))
+
+(defun rmail-summary-construct-io-menu ()
+ (let ((files (rmail-find-all-files rmail-secondary-file-directory)))
+ (if files
+ (progn
+ (define-key rmail-summary-mode-map [menu-bar classify input-menu]
+ (cons "Input Rmail File"
+ (rmail-list-to-menu "Input Rmail File"
+ files
+ 'rmail-summary-input)))
+ (define-key rmail-summary-mode-map [menu-bar classify output-menu]
+ (cons "Output Rmail File"
+ (rmail-list-to-menu "Output Rmail File"
+ files
+ 'rmail-summary-output-to-rmail-file))))
+ (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]
+ '("Output Rmail File" . rmail-disable-menu)))))
+
\f
;; Sorting messages in Rmail Summary buffer.
HCoop / bpt / emacs.git / blobdiff