diff options
| author | Jeffrey C Honig <jch@honig.net> | 2012-12-09 22:04:15 -0500 |
|---|---|---|
| committer | Jeffrey C Honig <jch@honig.net> | 2012-12-09 22:04:15 -0500 |
| commit | 6d14beddb06b5ae86f9dd770a1661ebd24846f28 (patch) | |
| tree | 233fa48718f6dffdcf7d0a24913d22dde8d00185 /lisp/mh-e | |
| parent | e1b489df7af8f7034f8c2ef275b786e93a39df31 (diff) | |
| download | emacs-6d14beddb06b5ae86f9dd770a1661ebd24846f28.tar.gz | |
* 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).
Diffstat (limited to 'lisp/mh-e')
| -rw-r--r-- | lisp/mh-e/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/mh-e/mh-folder.el | 11 |
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))) |