(rmail-summary-get-message-at-point): Handle 5-digit message ids.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index fbbb467fb8654a16badcea1f7c4705962a3092e5..655a2ec953e4c393fbd6b1e56372124f29e8c2a0 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -7,6 +7,7 @@
 
        * rmailsum.el (rmail-summary-output-to-rmail-file): Use
        `rmail-output-read-file-name'.
+       (rmail-summary-get-message-at-point): Handle 5-digit message ids.
        
        * rmail.el (rmail-process-new-messages): Require rmailkwd.
        (rmail-ignored-headers): Add "Original-Recipient"

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 1819f4a25094a3be7fe40201d5f3462f58817a99..2e5dba0089bfa40d7ac9b37ce300cde8fc9796e8 100644 (file)
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -577,7 +577,6 @@ If N is negative, go forwards instead."
 \f
 ;; Delete and undelete summary commands.
 
-;;; mbox: ready
 (defun rmail-summary-delete-forward (&optional count)
   "Delete this message and move to next nondeleted one.
 Deleted messages stay in the file until the \\[rmail-expunge] command is given.
@@ -599,7 +598,6 @@ a negative argument means to delete and move backward."
        (forward-line (if backward -1 1)))
       (setq count
            (if (> count 0) (1- count) (1+ count))))
-
     ;; Update the summary buffer current message counter and show the
     ;; message in the Rmail buffer.
     (rmail-summary-goto-msg (rmail-summary-get-message-at-point))))
@@ -1027,7 +1025,7 @@ If the summary buffer contains no messages, nil is returned."
       (forward-line 0))
     ;; Parse the message number.
     (string-to-number
-     (buffer-substring (point) (min (point-max) (+ 4 (point)))))))
+     (buffer-substring (point) (min (point-max) (+ 6 (point)))))))
 
 (defun rmail-summary-goto-msg (&optional n nowarn skip-rmail)
   "Go to message N in the summary buffer and the Rmail buffer.