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

diff --combined lisp/mh-e/ChangeLog
index c4d1e2130799430430d77c204c16b6de32096f0a,0854010e60f1e2fe62493cc0bbbbf7f788cd5c6e..72be15e69a0f01a480b01a04717d95d57553dae9
--- 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.
@@@ -3597,7 -3587,7 +3603,7 @@@
        * ChangeLog.1: New file.  Contains old ChangeLog.
  
  
-       Copyright (C) 2005-2012  Free Software Foundation, Inc.
+       Copyright (C) 2005-2013 Free Software Foundation, Inc.
  
    This file is part of GNU Emacs.
  

diff --combined lisp/mh-e/mh-comp.el
index 03758efb29a3ad2157a16dc0315f0d65220cf991,fbfc1207a5a5aa239c6487162d098449360409d0..1f07a7983b1fd695fcfaa9fffddcd0651e8c6150
--- 1/lisp/mh-e/mh-comp.el
--- 2/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@@ -1,6 -1,7 +1,7 @@@
  ;;; mh-comp.el --- MH-E functions for composing and sending messages
  
- ;; Copyright (C) 1993, 1995, 1997, 2000-2012  Free Software Foundation, Inc.
+ ;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+ ;; Inc.
  
  ;; Author: Bill Wohler <wohler@newt.com>
  ;; Maintainer: Bill Wohler <wohler@newt.com>
@@@ -586,13 -587,6 +587,13 @@@ See also `mh-compose-forward-as-mime-fl
               (mh-forwarded-letter-subject orig-from orig-subject)))
          (mh-insert-fields "Subject:" forw-subject)
          (goto-char (point-min))
 +        ;; Set the local value of mh-mail-header-separator according to what is
 +        ;; present in the buffer...
 +        (set (make-local-variable 'mh-mail-header-separator)
 +             (save-excursion
 +               (goto-char (mh-mail-header-end))
 +               (buffer-substring-no-properties (point) (mh-line-end-position))))
 +        (set (make-local-variable 'mail-header-separator) mh-mail-header-separator) ;override sendmail.el
          ;; If using MML, translate MH-style directive
          (if (equal mh-compose-insertion 'mml)
              (save-excursion

diff --combined lisp/mh-e/mh-e.el
index 25784d0ebcd59eb535aae22c62bc952267045be6,334f73ff7ed28cd9cca08a105178aab3366da682..9fd300d7b55552d03463853118615cf7c693463c
--- 1/lisp/mh-e/mh-e.el
--- 2/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@@ -1,11 -1,11 +1,11 @@@
  ;;; mh-e.el --- GNU Emacs interface to the MH mail system
  
- ;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2012
- ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2013 Free
+ ;; Software Foundation, Inc.
  
  ;; Author: Bill Wohler <wohler@newt.com>
  ;; Maintainer: Bill Wohler <wohler@newt.com>
 -;; Version: 8.4
 +;; Version: 8.4+bzr
  ;; Keywords: mail
  
  ;; This file is part of GNU Emacs.
@@@ -127,7 -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.4" "Version number of MH-E.")
 +(defconst mh-version "8.4+bzr" "Version number of MH-E.")
  
  ;; Variants
  

diff --combined lisp/mh-e/mh-folder.el
index 802e75bcc57d0476723a2a2635ba91dc6448397b,f3ea8003ed0ea552e481794ca81d4d530d38b5e7..01f304a38dca4468f37885a0af902315c5ee535f
--- 1/lisp/mh-e/mh-folder.el
--- 2/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; mh-folder.el --- MH-Folder mode
  
- ;; Copyright (C) 2002-2003, 2005-2012  Free Software Foundation, Inc.
+ ;; Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
  
  ;; Author: Bill Wohler <wohler@newt.com>
  ;; Maintainer: Bill Wohler <wohler@newt.com>
@@@ -774,7 -774,7 +774,7 @@@ the message.
      return-value))
  
  ;;;###mh-autoload
 -(defun mh-inc-folder (&optional file folder dont-exec-pending)
 +(defun mh-inc-folder (&optional file folder)
    "Incorporate new mail into a folder.
  
  You can incorporate mail from any file into the current folder by
@@@ -785,7 -785,10 +785,7 @@@ The hook `mh-inc-folder-hook' is run af
  mail.
  
  Do not call this function from outside MH-E; use \\[mh-rmail]
 -instead.
 -
 -In a program, the processing of outstanding commands is not performed
 -if DONT-EXEC-PENDING is non-nil."
 +instead."
    (interactive (list (if current-prefix-arg
                           (expand-file-name
                            (read-file-name "inc mail from file: "
@@@ -794,6 -797,8 +794,6 @@@
                           (mh-prompt-for-folder "inc mail into" mh-inbox t))))
    (if (not folder)
        (setq folder mh-inbox))
 -  (unless dont-exec-pending
 -    (mh-process-or-undo-commands folder))
    (let ((threading-needed-flag nil))
      (let ((config (current-window-configuration)))
        (when (and mh-show-buffer (get-buffer mh-show-buffer))
@@@ -815,8 -820,6 +815,8 @@@
                            nil))))
        (mh-toggle-threads))
      (beginning-of-line)
 +    (when (mh-outstanding-commands-p)
 +      (mh-notate-deleted-and-refiled))
      (if (and mh-showing-mode (looking-at mh-scan-valid-regexp)) (mh-show))
      (run-hooks 'mh-inc-folder-hook)))