Emacs 24.4 freeze and very minor MH-E update

Emacs 24.4 freeze and very minor MH-E update

[Bill Wohler]

I'd like to merge what few changes we have on the MH-E branch into trunk
so Eric can ignore the branch during his migration.

Unless the other MH-E developers are sitting on changes in their local
repositories (I've asked), the changes are few and minor.

Shall I merge the changes into trunk now, or shall I wait until 24.4 is
released?

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk

Re: Emacs 24.4 freeze and very minor MH-E update

[Stefan Monnier]

> Shall I merge the changes into trunk now, or shall I wait until 24.4 is
> released?

What kind of changes are we talking about?


        Stefan

Re: Emacs 24.4 freeze and very minor MH-E update

[Bill Wohler]

Stefan Monnier <monnier@iro.umontreal.ca> wrote:

> > Shall I merge the changes into trunk now, or shall I wait until 24.4 is
> > released?
> 
> What kind of changes are we talking about?

The diffs are small enough to include here.

The only code-related change fixes a problem with GNU Mailutils.

=== modified file 'lisp/mh-e/ChangeLog'
--- lisp/mh-e/ChangeLog	2014-01-26 00:47:40 +0000
+++ lisp/mh-e/ChangeLog	2014-02-24 02:10:09 +0000
@@ -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-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mh-print.el (mh-ps-print-preprint): Don't use dynamic-var
@@ -26,6 +31,10 @@
 
 	* mh-comp.el (mh-regexp-in-field-p): Minor simplification.
 
+2013-03-03  Bill Wohler  <wohler@newt.com>
+
+	* mh-e.el (mh-version): Add +bzr to version.
+
 2013-03-02  Bill Wohler  <wohler@newt.com>
 
 	Release MH-E version 8.5.

=== modified file 'lisp/mh-e/mh-e.el'
--- lisp/mh-e/mh-e.el	2014-01-01 07:43:34 +0000
+++ lisp/mh-e/mh-e.el	2014-02-24 02:10:09 +0000
@@ -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
 

=== modified file 'lisp/mh-e/mh-folder.el'
--- lisp/mh-e/mh-folder.el	2014-01-01 07:43:34 +0000
+++ lisp/mh-e/mh-folder.el	2014-02-24 02:10:09 +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'
--- lisp/mh-e/mh-thread.el	2014-01-01 07:43:34 +0000
+++ lisp/mh-e/mh-thread.el	2014-02-24 02:10:09 +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


> 
> 
>         Stefan
> 
> ------------------------------------------------------------------------------
> Android apps run on BlackBerry 10
> Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
> Now with support for Jelly Bean, Bluetooth, Mapview and more.
> Get your Android app in front of a whole new audience.  Start now.
> http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
> _______________________________________________
> mh-e-devel mailing list
> mh-e-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mh-e-devel
> 

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk

Re: Emacs 24.4 freeze and very minor MH-E update

[Stefan Monnier]

>> > Shall I merge the changes into trunk now, or shall I wait until 24.4 is
>> > released?
>> What kind of changes are we talking about?
> The diffs are small enough to include here.
> The only code-related change fixes a problem with GNU Mailutils.

Looks OK, go ahead.


        Stefan

Re: Emacs 24.4 freeze and very minor MH-E update

[Glenn Morris]

Stefan Monnier wrote:

>>> > Shall I merge the changes into trunk now, or shall I wait until 24.4 is
>>> > released?
>>> What kind of changes are we talking about?
>> The diffs are small enough to include here.
>> The only code-related change fixes a problem with GNU Mailutils.
>
> Looks OK, go ahead.

Still not applied AFAICS.

Re: Emacs 24.4 freeze and very minor MH-E update

[Bill Wohler]

Glenn Morris <rgm@gnu.org> wrote:

> Stefan Monnier wrote:
> 
> >>> > Shall I merge the changes into trunk now, or shall I wait until 24.4 is
> >>> > released?
> >>> What kind of changes are we talking about?
> >> The diffs are small enough to include here.
> >> The only code-related change fixes a problem with GNU Mailutils.
> >
> > Looks OK, go ahead.
> 
> Still not applied AFAICS.

No, I've been traveling on business. I'll respond to Stefan's email when
applied, hopefully this weekend.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech

Re: Emacs 24.4 freeze and very minor MH-E update

[Bill Wohler]

Stefan Monnier <monnier@iro.umontreal.ca> wrote:

> >> > Shall I merge the changes into trunk now, or shall I wait until 24.4 is
> >> > released?
> >> What kind of changes are we talking about?
> > The diffs are small enough to include here.
> > The only code-related change fixes a problem with GNU Mailutils.
> 
> Looks OK, go ahead.

The mh-e branch has been merged into the trunk, thanks.

I got the following error when I checked it in. Was it something I did
(or didn't do)?

    $ bzr ci -m"Merge from mh-e; up to r106766."
    Committing to: bzr+ssh://wohler@bzr.savannah.gnu.org/emacs/trunk/                          
    modified lisp/mh-e/ChangeLog
    modified lisp/mh-e/mh-e.el                                                                 
    modified lisp/mh-e/mh-folder.el
    modified lisp/mh-e/mh-thread.el
    Committed revision 116777.                                                                 
    From: Bill Wohler <wohler@newt.com>: No such file or directory- Stage 7/7                  
    bzr: ERROR: Failed to send email: exit status 1[No hook name] - Stage 7/7 

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech

Re: Emacs 24.4 freeze and very minor MH-E update

[Glenn Morris]

Bill Wohler wrote:

>     From: Bill Wohler <wohler@newt.com>: No such file or directory- Stage 7/7                  
>     bzr: ERROR: Failed to send email: exit status 1[No hook name] - Stage 7/7 
Do you have the bzr-email plugin installed on the machine that you
committed from? `bzr plugins | grep email'

If so, see the section "Note: if you have the bzr-email plugin installed
locally," in admin/notes/bzr.

Re: Emacs 24.4 freeze and very minor MH-E update

[Bill Wohler]

Glenn Morris <rgm@gnu.org> wrote:

> Bill Wohler wrote:
> 
> >     From: Bill Wohler <wohler@newt.com>: No such file or directory- Stage 7/7                  
> >     bzr: ERROR: Failed to send email: exit status 1[No hook name] - Stage 7/7 
> Do you have the bzr-email plugin installed on the machine that you
> committed from? `bzr plugins | grep email'

Yep.

> If so, see the section "Note: if you have the bzr-email plugin installed
> locally," in admin/notes/bzr.

Thanks, I've updated ~/.bazaar/locations.conf per the directions.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech