Merge from trunk; up to 2013-02-18T01:30:27Z!monnier@iro.umontreal.ca.

diff --cc lisp/mh-e/ChangeLog
index c4d1e21,0854010..72be15e
--- 1/lisp/mh-e/ChangeLog
--- 2/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@@ -1,19 -1,9 +1,25 @@@
+ 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.
+ 
 +2012-12-10  Jeffrey C Honig  <jch@honig.net>
 +
 +      * mh-folder.el (mh-inc-folder): Revert SF #2321115, SF bugs/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 bugs/271).
 +
 +2012-12-08  Jeffrey C Honig  <jch@honig.net>
 +
 +      * mh-comp.el: Insure that mail-header-separator is set before
 +      invoking any mml functions.  (closes SF #270).
 +
 +2012-11-25  Bill Wohler  <wohler@newt.com>
 +
 +      * mh-e.el (mh-version):  Add +bzr to version.
 +
  2012-11-25  Bill Wohler  <wohler@newt.com>
  
        Release MH-E version 8.4.

diff --cc lisp/mh-e/mh-comp.el
Simple merge

diff --cc lisp/mh-e/mh-e.el
Simple merge

diff --cc lisp/mh-e/mh-folder.el
Simple merge