2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 186860c2b17..ba9886a33e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-01-06  Glenn Morris  <rgm@gnu.org>
 
+        * mail/unrmail.el (unrmail): Give an explicit error if the input file
+        has no messages.  (Bug#10377)
+
         * info.el (Info-mode-map): Bind e to end-of-buffer, rather
         than Info-edit.  (Bug#10385)
 
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 178b64f1191..929f97746b0 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -66,7 +66,8 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
           from to)
       (goto-char (point-min))
       (search-forward "\n\^_" nil t)    ; Skip BABYL header.
-      (setq from (point))
+      (if (= (setq from (point)) (point-max))
+          (error "The input file contains no messages"))
       (goto-char (point-max))
       (search-backward "\n\^_" from 'mv)
       (setq to (point))