Update for rmail-show-message-maybe name change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31347cd3197b5809b34ff1bc6f4faaf79299edaf..66922bd2a4062a0895e0d3fce85067d2172d6609 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
 2009-02-13  Glenn Morris  <rgm@gnu.org>
 
+       * mail/rmail.el (rmail-show-message-1): New name for the old
+       rmail-show-message.
+       * mail/rmail.el, mail/rmailkwd.el, mail/rmailmsc.el, mail/rmailout.el:
+       * mail/rmailsort.el: Update for rmail-show-message name change.
+
+       * mail/rmail.el (rmail-show-message): New name for the old
+       rmail-show-message-maybe.
+       * mail/rmail.el, mail/rmailsum.el: Update for rmail-show-message-maybe
+       name change.
+
        * mail/rmailsum.el (msgnum): Remove declaration.
        (rmail-summary-redo): Add missing initialization value.
        (rmail-summary-overlay, rmail-summary-mode-map): Add doc string.

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index ce7a74a992da2d1cb884145ce2f52e5c87a14df5..6940f3d4ba6122443fbb72ae5b2327c4e295e11a 100644 (file)
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -958,12 +958,12 @@ Search, the `unseen' attribute is restored.")
                  (unwind-protect
                      (progn
                        (select-window window)
-                       (rmail-show-message-maybe msg-num t))
+                       (rmail-show-message msg-num t))
                    (select-window owin))
                (if (buffer-name rmail-buffer)
                    (save-excursion
                      (set-buffer rmail-buffer)
-                     (rmail-show-message-maybe msg-num t))))))
+                     (rmail-show-message msg-num t))))))
        (rmail-summary-update-highlight nil)))))
 
 (defun rmail-summary-save-buffer ()
@@ -1223,7 +1223,7 @@ Returns non-nil if message N was found."
       (let ((selwin (selected-window)))
        (unwind-protect
            (progn (pop-to-buffer buf)
-                  (rmail-show-message-maybe n))
+                  (rmail-show-message n))
          (select-window selwin)
          ;; The actions above can alter the current buffer.  Preserve it.
          (set-buffer obuf))))