Merge from trunk; up to 2012-11-25T20:14:53Z!wohler@newt.com.

3 files changed, 78 insertions, 25 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 076dfd2bac5..8a067b5c100 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -5,6 +5,11 @@
         * mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH, Preface):
         Update for release 8.4.
 
+        * mh-e.texi (Sequences): Add mh-whitelist-preserves-sequences-flag.
+        (Junk): Add mh-whitelist-preserves-sequences-flag,
+        mh-blacklist-msg-hook, mh-whitelist-msg-hook,
+        mh-folder-blacklisted, mh-folder-whitelisted (closes SF #2945712).
+
 2012-11-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         * mh-e.texi (Procmail): Fix two @ typos.
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 08ef9e484b5..e419ba05055 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -7394,6 +7394,9 @@ The name of the MH sequence for ticked messages (default: @samp{'tick}).
 @item mh-update-sequences-after-mh-show-flag
 On means flush MH sequences to disk after message is shown (default:
 @samp{on}).
+@item mh-whitelist-preserves-sequences-flag
+On means that sequences are preserved when messages are whitelisted
+(default: @samp{on}).
 @end vtable
 
 The following hook is available.
@@ -7599,6 +7602,40 @@ Disposition of junk mail (default: @samp{Delete Spam}).
 Spam program that MH-E should use (default: @samp{Auto-detect}).
 @end vtable
 
+@cindex @samp{mh-sequences} customization group
+@cindex customization group, @samp{mh-sequences}
+
+The following option in the @samp{mh-sequences} customization group is
+also available.
+
+@vtable @code
+@item mh-whitelist-preserves-sequences-flag
+On means that sequences are preserved when messages are whitelisted
+(default: @samp{on}).
+@end vtable
+
+The following hooks are available.
+
+@vtable @code
+@item mh-blacklist-msg-hook
+Hook run by @kbd{J b} (@code{mh-junk-blacklist}) after marking each
+message for blacklisting (default: @code{nil}).
+@c -------------------------
+@item mh-whitelist-msg-hook
+Hook run by @kbd{J w} (@code{mh-junk-whitelist}) after marking each
+message for whitelisting (default @samp{nil}).
+@end vtable
+
+The following faces are available.
+
+@vtable @code
+@item mh-folder-blacklisted
+Blacklisted message face.
+@c -------------------------
+@item mh-folder-whitelisted
+Whitelisted message face
+@end vtable
+
 @cindex SpamProbe
 @cindex Spamassassin
 @cindex bogofilter
@@ -7641,6 +7678,18 @@ reclassifies a range of messages (@pxref{Ranges}) as ham if it were
 incorrectly classified as spam. It then refiles the message into the
 @file{+inbox} folder.
 
+@cindex MH profile component, @samp{Previous-Sequence:}
+@cindex @samp{cur} sequence
+@cindex @samp{Previous-Sequence:} MH profile component
+@cindex sequence, @samp{cur}
+@cindex sequence, @samp{Previous-Sequence}
+@vindex mh-whitelist-preserves-sequences-flag
+
+If a message is in any sequence (except @samp{Previous-Sequence:} and
+@samp{cur}) when it is whitelisted, then it will still be in those
+sequences in the destination folder. If this behavior is not desired,
+then turn off the option @code{mh-whitelist-preserves-sequences-flag}.
+
 @cindex @samp{*MH-E Log*}
 @cindex buffers, @samp{*MH-E Log*}
 @findex call-process
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index b2fbee187f1..72c11db1c37 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -29,14 +29,15 @@
         * mh-thread.el (mh-thread-set-tables): Replace flet with new alias
         mh-cl-flet.
 
-        * mh-show.el (mh-gnus-article-highlight-citation):  Replace flet with new alias
-        mh-cl-flet.
+        * mh-show.el (mh-gnus-article-highlight-citation):
+        Replace flet with new alias mh-cl-flet.
 
         * mh-mime.el (mh-display-with-external-viewer, mh-mime-display)
         (mh-press-button, mh-push-button, mh-display-emphasis): Replace
         flet with new alias mh-cl-flet.
 
-        * mh-e.el (mh-invisible-header-fields-internal): Remove trailing whitespace.
+        * mh-e.el (mh-invisible-header-fields-internal):
+        Remove trailing whitespace.
 
 2012-11-25  Jeffrey C Honig  <jch@honig.net>
 
@@ -52,31 +53,15 @@
         (mh-insert-auto-fields, mh-modify-header-field): New syntax for
         calling mh-regexp-in-field-p (closes SF #1708292).
 
-2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
-
-2012-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * mh-utils.el (minibuffer-completing-file-name): Don't declare, unused.
-
-2012-04-21  Juanma Barranquero  <lekktu@gmail.com>
-
-        * mh-folder.el (top): Check whether which-func-modes is t before
-        adding mh-folder-mode.
-
-2012-01-07  Jeffrey C Honig  <jch@honig.net>
-
         * mh-e.el (mh-invisible-header-fields-internal): Added: X-xsi.
         (addresses SF #1916032).
 
-2011-12-28  Jeffrey C Honig  <jch@honig.net>
-
         * mh-folder.el (mh-inc-folder): Call mh-process-or-undo-commands
         before running to insure we do not lose any pending changes.
         (closes SF #2321115).
 
-2011-12-27  Ted Phelps  <phelps@gnusto.com>
+2012-11-25  Ted Phelps  <phelps@gnusto.com>
+
         Postpone junk processing (closes SF #2945712). Patch submitted by
         Ted Phelps and refined by Bill Wohler.
 
@@ -112,7 +97,8 @@
         * mh-search.el (mh-index-execute-commands): Handle blacklisted and
         whitelisted messages.
 
-2011-12-27  Jeffrey C Honig  <jch@honig.net>
+2012-11-25  Jeffrey C Honig  <jch@honig.net>
+
         * mh-e.el (mh-invisible-header-fields-internal): Added:
         Bounces-To:, Bounces_to:, X-ACL-Warn:, X-BFI:, X-BPS1:, X-BPS2:,
         X-Campaign-Id:, X-Campaign:, X-Cloudmark-SP-, X-Destination-ID:,
@@ -125,7 +111,7 @@
         X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-. Updated
         the comment. (addresses SF #1916032).
 
-2011-12-27  Bill Wohler  <wohler@newt.com>
+2012-11-25  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (mh-invisible-header-fields-internal): Add
         X-AnalysisOut, X-Authentication-Info, X-Auto-Response-Suppress,
@@ -135,7 +121,7 @@
         X-Notification-, X-Notifications, X-Oracle-Calendar. Replace
         X-DCC-Usenix-Metrics with X-DCC- (addresses SF #1916032).
 
-2011-12-27  Jeffrey C Honig  <jch@honig.net>
+2012-11-25  Jeffrey C Honig  <jch@honig.net>
 
         * mh-letter.el (mh-yank-cur-msg): Replace usage of set-buffer with
         with-current-buffer in mh-yang-cur-msg, semantics changed in emacs
@@ -145,10 +131,23 @@
         * mh-show.el (mh-show-folder-map): Add missing key binding for
         mh-show-pack-folder (closes SF #3466086).
 
-2011-12-25  Bill Wohler  <wohler@newt.com>
+2012-11-25  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (Version, mh-version): Add +bzr to version.
 
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
+
+2012-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mh-utils.el (minibuffer-completing-file-name): Don't declare, unused.
+
+2012-04-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * mh-folder.el (top): Check whether which-func-modes is t before
+        adding mh-folder-mode.
+
 2011-11-20  Bill Wohler  <wohler@newt.com>
 
         * Release MH-E version 8.3.1.