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

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0854010e60f1e2fe62493cc0bbbbf7f788cd5c6e..72be15e69a0f01a480b01a04717d95d57553dae9 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -4,6 +4,22 @@
        * 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 --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index fbfc1207a5a5aa239c6487162d098449360409d0..1f07a7983b1fd695fcfaa9fffddcd0651e8c6150 100644 (file)
--- 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 334f73ff7ed28cd9cca08a105178aab3366da682..9fd300d7b55552d03463853118615cf7c693463c 100644 (file)
--- 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.4+bzr
 ;; 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.4+bzr" "Version number of MH-E.")
 
 ;; Variants
 

diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index f3ea8003ed0ea552e481794ca81d4d530d38b5e7..01f304a38dca4468f37885a0af902315c5ee535f 100644 (file)
--- 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)))