Merge from mh-e; up to 2012-01-03T02:14:40Z!lekktu@gmail.com.

diff --cc lisp/mh-e/ChangeLog
index 0854010e60f1e2fe62493cc0bbbbf7f788cd5c6e,ee95f8051a86b1d16de96722e7964c3347f96b1f..49229b902256814e56500c754bfc8f6c4c8d7d0e
--- 1/lisp/mh-e/ChangeLog
--- 2/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@@ -1,8 -1,30 +1,24 @@@
 -2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
 -
 -      * mh-acros.el (mh-do-at-event-location): Use point-marker.
 -      * mh-search.el (mh-index-create-imenu-index): Likewise.
 -      * mh-xface.el (mh-x-image-url-display): Likewise.
 -
+ 2013-03-02  Bill Wohler  <wohler@newt.com>
+ 
+       Release MH-E version 8.5.
+ 
+       * mh-e.el (Version, mh-version): Update for release 8.5.
+ 
 -2012-12-08  Jeffrey C Honig  <jch@honig.net>
 -
+ 2012-12-10  Jeffrey C Honig  <jch@honig.net>
+ 
+       * mh-folder.el (mh-inc-folder): Revert SF #2321115, SF #250
+       which processed pending deletes and refiles.  Call to
+       mh-process-or-undo-commands to insure that pending changes are
+       properly tagged after including new mail (closes SF #271).
+ 
 -2012-11-25  Bill Wohler  <wohler@newt.com>
+       * mh-comp.el: Insure that mail-header-separator is set before
+       invoking any mml functions (closes SF #270).
+ 
 +2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
  
 -      * mh-e.el (mh-version):  Add +bzr to version.
 +      * mh-acros.el (mh-do-at-event-location): Use point-marker.
 +      * mh-search.el (mh-index-create-imenu-index): Likewise.
 +      * mh-xface.el (mh-x-image-url-display): Likewise.
  
  2012-11-25  Bill Wohler  <wohler@newt.com>