# HG changeset patch # User Glenn Morris # Date 1234511030 0 # Node ID ef7ed7efa61cf4d0d4094e75341c7f50ab247745 # Parent 22fabdb9d4458f8354dd9faf5392a0ca95ec500a (rmail-show-message-1): New name for the old rmail-show-message. Update callers. diff -r 22fabdb9d445 -r ef7ed7efa61c lisp/mail/rmail.el --- a/lisp/mail/rmail.el Fri Feb 13 03:51:16 2009 +0000 +++ b/lisp/mail/rmail.el Fri Feb 13 07:43:50 2009 +0000 @@ -1472,7 +1472,7 @@ (goto-char (point-max)) (rmail-set-message-counters) (set-buffer-modified-p t) - (rmail-show-message n)) + (rmail-show-message-1 n)) (if (rmail-summary-exists) (rmail-select-summary (rmail-update-summary))) (message "Message duplicated")) @@ -2479,7 +2479,7 @@ (rmail-swap-buffers-maybe) (rmail-maybe-set-message-counters) (widen) - (let ((blurb (rmail-show-message n))) + (let ((blurb (rmail-show-message-1 n))) (or (zerop rmail-total-messages) (progn (when mail-mailing-lists @@ -2515,7 +2515,7 @@ :type 'integer :group 'rmail) -(defun rmail-show-message (&optional msg) +(defun rmail-show-message-1 (&optional msg) "Show message MSG (default: current message) using `rmail-view-buffer'. Return text to display in the minibuffer if MSG is out of range (displaying a reasonable choice as well), nil otherwise. @@ -2644,7 +2644,7 @@ ;; Handle the case where all headers should be copied. ((eq rmail-header-style 'full) (prepend-to-buffer rmail-view-buffer beg (point-max)) - ;; rmail-show-message expects this function to leave point + ;; rmail-show-message-1 expects this function to leave point ;; at the end of the headers. (with-current-buffer rmail-view-buffer (search-forward "\n\n" nil t))) @@ -3246,7 +3246,7 @@ (rmail-only-expunge dont-show) (if (rmail-summary-exists) (rmail-select-summary (rmail-update-summary)) - (rmail-show-message rmail-current-message) + (rmail-show-message-1 rmail-current-message) (if (and (eq old-total rmail-total-messages) opoint) (goto-char opoint))))))