* mh-folder.el (mh-regenerate-headers): Fix scan: bad message list

`unseen' error (closes SF #471).

2 files changed, 11 insertions, 8 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 301576aa9d1..74cab4443da 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-24  Bill Wohler  <wohler@newt.com>
+
+        * mh-folder.el (mh-regenerate-headers): Fix scan: bad message list
+        `unseen' error (closes SF #471).
+
 2013-03-03  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (mh-version): Add +bzr to version.
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 01f304a38dc..599baf3326f 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1817,15 +1817,13 @@ If UPDATE, append the scan lines, otherwise replace."
              "-width" (window-width)
              folder range)
       (goto-char scan-start)
-      (cond ((looking-at "scan: no messages in")
-             (keep-lines mh-scan-valid-regexp)) ; Flush random scan lines
-            ((looking-at (if (mh-variant-p 'gnu-mh)
-                             "scan: message set .* does not exist"
-                           "scan: bad message list "))
-             (keep-lines mh-scan-valid-regexp))
-            ((looking-at "scan: "))     ; Keep error messages
+      (cond ((or (looking-at "scan: no messages in")
+                 (looking-at "scan: message set .* does not exist")
+                 (looking-at "scan: bad message list "))
+             (keep-lines mh-scan-valid-regexp)) ; flush common scan output
+            ((looking-at "scan: "))             ; keep unexpected error messages
             (t
-             (keep-lines mh-scan-valid-regexp))) ; Flush random scan lines
+             (keep-lines mh-scan-valid-regexp))) ; flush random scan output
       (setq mh-seq-list (mh-read-folder-sequences folder nil))
       (mh-notate-user-sequences)
       (or update