Browse files

Merge from mh-e; up to r106762.

  • Loading branch information...
2 parents e51c82d + 26b5b97 commit 8669cd1408e5e5d13012b6ef9a56e3f3461aef36 @wohler wohler committed Mar 2, 2013
Showing with 55 additions and 10 deletions.
  1. +6 −0 etc/ChangeLog
  2. +19 −0 etc/MH-E-NEWS
  3. +1 −1 etc/NEWS
  4. +16 −0 lisp/mh-e/ChangeLog
  5. +7 −0 lisp/mh-e/mh-comp.el
  6. +2 −2 lisp/mh-e/mh-e.el
  7. +4 −7 lisp/mh-e/mh-folder.el
View
6 etc/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-02 Bill Wohler <wohler@newt.com>
+
+ Release MH-E version 8.5.
+
+ * NEWS, MH-E-NEWS: Update for MH-E release 8.5.
+
2013-03-02 Paul Eggert <eggert@cs.ucla.edu>
* NEWS: The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
View
19 etc/MH-E-NEWS
@@ -3,6 +3,25 @@
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
+* Changes in MH-E 8.5
+
+Version 8.5 fixes bugs when incorporating or forwarding mail.
+
+** Bug Fixes in MH-E 8.5
+
+*** mh-rmail doesn't switch to +inbox
+
+The function `mh-rmail' now switches to `+inbox' as expected (closes
+SF #271).
+
+*** Problem forwarding a messsage
+
+Forwarding messages resulted in the error: `(wrong-type-argument
+number-or-marker-p nil).' This has been fixed by setting the mail
+separator (closes SF #270).
+
+
+
* Changes in MH-E 8.4
Version 8.4 postpones junk processing and merges in your components
View
2 etc/NEWS
@@ -159,7 +159,7 @@ callers to fit the image to a frame other than the selected frame.
*** `C-x 8 RET' in Isearch mode reads a character by its Unicode name
and adds it to the search string.
-** MH-E has been updated to MH-E version 8.4.
+** MH-E has been updated to MH-E version 8.5.
See MH-E-NEWS for details.
---
View
16 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.
View
7 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
View
4 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
View
11 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)))

0 comments on commit 8669cd1

Please sign in to comment.