Update for rmail-show-message -> rmail-show-message-1 name change.

diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 001249a222da542da2c7c1ce787d194111bda939..5c69daa6d339fcd8a88cbb41e8af1e238193d1c1 100644 (file)
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -182,7 +182,7 @@ With prefix argument N moves forward N messages with these labels."
        (error "No previous message with labels %s" labels)
       (if (> n 0)
          (error "No following message with labels %s" labels)
-       (rmail-show-message lastwin)))))
+       (rmail-show-message-1 lastwin)))))
 
 (provide 'rmailkwd)
 

diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index b1e5bd7ed12483555b8d88beac93b1fc44f784d7..5ea184861713f213d90458f867fedc29431c57b6 100644 (file)
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -49,7 +49,7 @@ If FILE-NAME is empty, remove any existing inbox list."
       (message "Setting the inbox list for %s for this session"
               (file-name-nondirectory (buffer-file-name)))
       (setq rmail-inbox-list inbox-list)))
-  (rmail-show-message rmail-current-message))
+  (rmail-show-message-1 rmail-current-message))
 
 ;; arch-tag: 94614a62-2a0a-4e25-bac9-06f461ed4c60
 ;;; rmailmsc.el ends here

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index bbd09b1b61d781e33f0dba27be85c2aee49a1fbf..4984fd7454f27b3ce89ea816034609da0818cac1 100644 (file)
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -155,7 +155,7 @@ Then display message number MSG."
     (if (rmail-summary-exists)
        (rmail-select-summary
         (rmail-update-summary)))
-    (rmail-show-message msg)))
+    (rmail-show-message-1 msg)))
 \f
 (defun rmail-convert-to-babyl-format ()
   (let ((count 0) (start (point-min))
@@ -392,7 +392,7 @@ Then display message number MSG."
     (if (rmail-summary-exists)
        (rmail-select-summary
         (rmail-update-summary)))
-    (rmail-show-message msg)))
+    (rmail-show-message-1 msg)))
 \f
 ;;; There are functions elsewhere in Emacs that use this function;
 ;;; look at them before you change the calling method.

diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index e53bcdfa8a2c8ab293c0f1899a7b3dc4ff32fb7a..68398b06fc8b0757bb518ca1e1b5175e73853c8b 100644 (file)
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -216,7 +216,7 @@ If 1st argument REVERSE is non-nil, sort them in reverse order.
        (delete-char 1)
        (setq quit-flag nil)
        (rmail-set-message-counters)
-       (rmail-show-message current-message)
+       (rmail-show-message-1 current-message)
        (if return-to-point
            (goto-char return-to-point))
        (if (rmail-summary-exists)