(rmail-summary-goto-msg): Get rmail-total-messages from the rmail buffer.

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 2f7a8d4b47e635fcc2bd6273af29e456fecec94c..6458d06f47fd80c1016e1ae80c5df3fc7b10e4c9 100644 (file)
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -786,13 +786,14 @@ Commands for sorting the summary:
   (if (consp n) (setq n (prefix-numeric-value n)))
   (if (eobp) (forward-line -1))
   (beginning-of-line)
-  (let ((obuf (current-buffer))
-       (buf rmail-buffer)
-       (cur (point))
-       message-not-found
-       (curmsg (string-to-int
-                (buffer-substring (point)
-                                  (min (point-max) (+ 5 (point)))))))
+  (let* ((obuf (current-buffer))
+        (buf rmail-buffer)
+        (cur (point))
+        message-not-found
+        (curmsg (string-to-int
+                 (buffer-substring (point)
+                                   (min (point-max) (+ 5 (point))))))
+        (total (save-excursion (set-buffer buf) rmail-total-messages)))
     ;; If message number N was specified, find that message's line
     ;; or set message-not-found.
     ;; If N wasn't specified or that message can't be found.
@@ -802,7 +803,7 @@ Commands for sorting the summary:
       (if (< n 1)
          (progn (message "No preceding message")
                 (setq n 1)))
-      (if (> n rmail-total-messages)
+      (if (> n total)
          (progn (message "No following message")
                 (goto-char (point-max))
                 (rmail-summary-goto-msg)))