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

4 files changed, 29 insertions, 9 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0854010e60f..49229b90225 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,19 @@
+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-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).
+
+        * 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-acros.el (mh-do-at-event-location): Use point-marker.
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index fbfc1207a5a..1f07a7983b1 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -587,6 +587,13 @@ See also `mh-compose-forward-as-mime-flag',
              (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 --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 334f73ff7ed..6ed033b8fa8 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -5,7 +5,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 8.4
+;; Version: 8.5
 ;; 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.4" "Version number of MH-E.")
+(defconst mh-version "8.5" "Version number of MH-E.")
 
 ;; Variants
 
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index f3ea8003ed0..01f304a38dc 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -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,10 +785,7 @@ The hook `mh-inc-folder-hook' is run after incorporating new
 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: "
@@ -797,8 +794,6 @@ if DONT-EXEC-PENDING is non-nil."
                          (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))
@@ -820,6 +815,8 @@ if DONT-EXEC-PENDING is non-nil."
                           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)))