[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116777: Merge from mh-e; up to r106766.
From: |
Bill Wohler |
Subject: |
[Emacs-diffs] trunk r116777: Merge from mh-e; up to r106766. |
Date: |
Mon, 17 Mar 2014 00:50:11 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116777 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Bill Wohler <address@hidden>
branch nick: trunk
timestamp: Sun 2014-03-16 17:50:05 -0700
message:
Merge from mh-e; up to r106766.
modified:
lisp/mh-e/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2547
lisp/mh-e/mh-e.el mhe.el-20091113204419-o5vbwnq5f7feedwu-2534
lisp/mh-e/mh-folder.el
mhfolder.el-20091113204419-o5vbwnq5f7feedwu-4349
lisp/mh-e/mh-thread.el
mhthread.el-20091113204419-o5vbwnq5f7feedwu-4354
=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog 2014-03-06 02:02:46 +0000
+++ b/lisp/mh-e/ChangeLog 2014-03-17 00:50:05 +0000
@@ -1,3 +1,9 @@
+2014-03-16 Bill Wohler <address@hidden>
+
+ * 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 <address@hidden>
* mh-compat.el (mh-display-completion-list):
=== modified file 'lisp/mh-e/mh-e.el'
--- a/lisp/mh-e/mh-e.el 2014-01-01 07:43:34 +0000
+++ b/lisp/mh-e/mh-e.el 2014-02-24 02:04:35 +0000
@@ -5,7 +5,7 @@
;; Author: Bill Wohler <address@hidden>
;; Maintainer: Bill Wohler <address@hidden>
-;; 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
=== modified file 'lisp/mh-e/mh-folder.el'
--- a/lisp/mh-e/mh-folder.el 2014-01-01 07:43:34 +0000
+++ b/lisp/mh-e/mh-folder.el 2014-02-24 02:04:35 +0000
@@ -1817,15 +1817,13 @@
"-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
=== modified file 'lisp/mh-e/mh-thread.el'
--- a/lisp/mh-e/mh-thread.el 2014-01-01 07:43:34 +0000
+++ b/lisp/mh-e/mh-thread.el 2014-02-24 02:04:35 +0000
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116777: Merge from mh-e; up to r106766.,
Bill Wohler <=