Mercurial > emacs
changeset 101994:12c790fb58af
(rmail-show-message): New name for the old rmail-show-message-maybe.
Update callers.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 13 Feb 2009 07:46:14 +0000 |
| parents | 1bb96ade4801 |
| children | 8240a7c5e099 |
| files | lisp/mail/rmail.el |
| diffstat | 1 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/rmail.el Fri Feb 13 07:44:18 2009 +0000 +++ b/lisp/mail/rmail.el Fri Feb 13 07:46:14 2009 +0000 @@ -880,7 +880,7 @@ (rmail-get-new-mail)) (progn (set-buffer mail-buf) - (rmail-show-message-maybe (rmail-first-unseen-message)) + (rmail-show-message (rmail-first-unseen-message)) (if rmail-display-summary (rmail-summary)) (rmail-construct-io-menu) (if run-mail-hook @@ -969,7 +969,7 @@ (define-key map "g" 'rmail-get-new-mail) (define-key map "h" 'rmail-summary) (define-key map "i" 'rmail-input) - (define-key map "j" 'rmail-show-message-maybe) + (define-key map "j" 'rmail-show-message) (define-key map "k" 'rmail-kill-label) (define-key map "l" 'rmail-summary-by-labels) (define-key map "\e\C-h" 'rmail-summary) @@ -1190,7 +1190,7 @@ \\[rmail-previous-message] Move to Previous message whether deleted or not. \\[rmail-first-message] Move to the first message in Rmail file. \\[rmail-last-message] Move to the last message in Rmail file. -\\[rmail-show-message-maybe] Jump to message specified by numeric position in file. +\\[rmail-show-message] Jump to message specified by numeric position in file. \\[rmail-search] Search for string and show message it is found in. \\[rmail-delete-forward] Delete this message, move to next nondeleted. \\[rmail-delete-backward] Delete this message, move to previous nondeleted. @@ -1236,7 +1236,7 @@ (goto-char (point-max)) (set-buffer-multibyte t))) (rmail-set-message-counters) - (rmail-show-message-maybe rmail-total-messages) + (rmail-show-message rmail-total-messages) (when finding-rmail-file (when rmail-display-summary (rmail-summary)) @@ -1397,7 +1397,7 @@ (set-buffer-multibyte t)) (goto-char (point-max)) (rmail-set-message-counters) - (rmail-show-message-maybe rmail-total-messages) + (rmail-show-message rmail-total-messages) (run-hooks 'rmail-mode-hook)))) (defun rmail-expunge-and-save () @@ -1633,11 +1633,11 @@ found)))) ;; Move to the first new message unless we have other unseen ;; messages before it. - (if found (rmail-show-message-maybe (rmail-first-unseen-message))) + (if found (rmail-show-message (rmail-first-unseen-message))) (run-hooks 'rmail-after-get-new-mail-hook) found) ;; Don't leave the buffer screwed up if we get a disk-full error. - (rmail-show-message-maybe)))) + (rmail-show-message)))) (defun rmail-get-new-mail-1 (file-name files delete-files) "Return t if new messages are detected without error, nil otherwise." @@ -2403,7 +2403,7 @@ (if (numberp arg) (if (> arg 0) 'normal 'full) (if (rmail-msg-is-pruned) 'full 'normal)))) - (rmail-show-message-maybe))) + (rmail-show-message))) (defun rmail-beginning-of-message () "Show current message starting from the beginning." @@ -2411,7 +2411,7 @@ (let ((rmail-show-message-hook (list (function (lambda () (goto-char (point-min))))))) - (rmail-show-message-maybe rmail-current-message))) + (rmail-show-message rmail-current-message))) (defun rmail-end-of-message () "Show bottom of current message." @@ -2420,7 +2420,7 @@ (list (function (lambda () (goto-char (point-max)) (recenter (1- (window-height)))))))) - (rmail-show-message-maybe rmail-current-message))) + (rmail-show-message rmail-current-message))) (defun rmail-unknown-mail-followup-to () "Handle a \"Mail-Followup-To\" header field with an unknown mailing list. @@ -2468,7 +2468,7 @@ (erase-buffer) "No mail.")))) -(defun rmail-show-message-maybe (&optional n no-summary) +(defun rmail-show-message (&optional n no-summary) "Show message number N (prefix argument), counting from start of file. If summary buffer is currently displayed, update current message there also. N defaults to the current message." @@ -2725,7 +2725,7 @@ (forward-line -1)) (insert "X-Coding-System: " (symbol-name coding)))) - (rmail-show-message-maybe)))))) + (rmail-show-message)))))) ;; Find all occurrences of certain fields, and highlight them. (defun rmail-highlight-headers () @@ -2816,7 +2816,7 @@ (interactive "p") (set-buffer rmail-buffer) (rmail-maybe-set-message-counters) - (rmail-show-message-maybe (+ rmail-current-message n))) + (rmail-show-message (+ rmail-current-message n))) (defun rmail-previous-message (n) "Show previous message whether deleted or not. @@ -2844,7 +2844,7 @@ (if (not (rmail-message-deleted-p current)) (setq lastwin current n (1+ n)))) (if (/= lastwin rmail-current-message) - (progn (rmail-show-message-maybe lastwin) + (progn (rmail-show-message lastwin) t) (if (< n 0) (message "No previous nondeleted message")) @@ -2863,13 +2863,13 @@ "Show first message in file." (interactive) (rmail-maybe-set-message-counters) - (rmail-show-message-maybe 1)) + (rmail-show-message 1)) (defun rmail-last-message () "Show last message in file." (interactive) (rmail-maybe-set-message-counters) - (rmail-show-message-maybe rmail-total-messages)) + (rmail-show-message rmail-total-messages)) (defun rmail-what-message () "For debugging Rmail: find the message number that point is in." @@ -2951,7 +2951,7 @@ (setq n (+ n (if reversep 1 -1)))) (if found (progn - (rmail-show-message-maybe msg) + (rmail-show-message msg) ;; Search forward (if this is a normal search) or backward ;; (if this is a reverse search) through this message to ;; position point. This search may fail because REGEXP @@ -2967,7 +2967,7 @@ (message "%sRmail search for %s...done" (if reversep "Reverse " "") regexp)) - (rmail-show-message-maybe orig-message) + (rmail-show-message orig-message) (if opoint (goto-char opoint)) (ding) (message "Search failed: %s" regexp))))) @@ -3059,7 +3059,7 @@ (if done (setq found i))) (setq n (if forward (1- n) (1+ n)))) (if found - (rmail-show-message-maybe found) + (rmail-show-message found) (error "No %s message with same subject" (if forward "following" "previous"))))) @@ -3095,7 +3095,7 @@ (if (= msg 0) (error "No previous deleted message") (if (/= msg rmail-current-message) - (rmail-show-message-maybe msg)) + (rmail-show-message msg)) (rmail-set-attribute rmail-deleted-attr-index nil) (if (rmail-summary-exists) (with-current-buffer rmail-summary-buffer @@ -3230,7 +3230,7 @@ (if (not win) (narrow-to-region (- (buffer-size) omin) (- (buffer-size) omax))) (if (not dont-show) - (rmail-show-message-maybe (min rmail-current-message rmail-total-messages))) + (rmail-show-message (min rmail-current-message rmail-total-messages))) (if rmail-enable-mime (goto-char (+ (point-min) opoint)) (goto-char (+ (point) opoint))))))