* 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).

2 files changed, 11 insertions, 7 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 196d296fabd..c4d1e213079 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 6b5ff3b62e2..802e75bcc57 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)))