From: Bill Wohler Date: Mon, 24 Feb 2014 01:55:39 +0000 (-0800) Subject: * mh-folder.el (mh-regenerate-headers): Fix scan: bad message list X-Git-Tag: emacs-24.3.90~173^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=791c0d7634e44bb92ca85af605be84ff2ae08963;p=emacs.git * mh-folder.el (mh-regenerate-headers): Fix scan: bad message list `unseen' error (closes SF #471). --- 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 + + * mh-folder.el (mh-regenerate-headers): Fix scan: bad message list + `unseen' error (closes SF #471). + 2013-03-03 Bill Wohler * 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