[Emacs-diffs] emacs/lisp/mail rmail.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/13 07:43:50

Modified files:
        lisp/mail      : rmail.el 

Log message:
        (rmail-show-message-1): New name for the old rmail-show-message.
        Update callers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.501&r2=1.502

Patches:
Index: rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -b -r1.501 -r1.502
--- rmail.el    13 Feb 2009 03:51:19 -0000      1.501
+++ rmail.el    13 Feb 2009 07:43:50 -0000      1.502
@@ -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))))))