Merge from mh-e; up to 2012-01-03T19:41:14Z!larsi@gnus.org.

4 files changed, 19 insertions, 13 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index da6895eaf39..b3d37ac4b1b 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-16  Bill Wohler  <wohler@newt.com>
+
+	* mh-folder.el (mh-regenerate-headers): Fix scan: bad message list
+	`unseen' error (closes SF #471).
+	* mh-e.el (mh-version): Add +bzr to version.
+
 2014-03-06  Glenn Morris  <rgm@gnu.org>
 
 	* mh-compat.el (mh-display-completion-list):
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 5707cdcc4da..eaa05720f43 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -5,7 +5,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 8.5
+;; Version: 8.5+bzr
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -127,7 +127,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "8.5" "Version number of MH-E.")
+(defconst mh-version "8.5+bzr" "Version number of MH-E.")
 
 ;; Variants
 
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 532a1890a7a..acb4d7d5197 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
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index d368ca6454b..3fa7c2c4d37 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -27,9 +27,11 @@
 ;; The threading portion of this files tries to implement the
 ;; algorithm described at:
 ;;   http://www.jwz.org/doc/threading.html
-;; It also begins to implement the IMAP Threading extension RFC. The
-;; implementation lacks the reference and subject canonicalization of
-;; the RFC.
+;; It also begins to implement the threading section of the IMAP -
+;; SORT and THREAD Extensions RFC at:
+;;   http://tools.ietf.org/html/rfc5256
+;; The implementation lacks the reference and subject canonicalization
+;; of the RFC.
 
 ;; In the presentation buffer, children messages are shown indented
 ;; with either [ ] or < > around them. Square brackets ([ ]) denote