* mh-comp.el: Insure that mail-header-separator is set before

invoking any mml functions.  (closes SF #270).

2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 72c11db1c37..196d296fabd 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 3f2ee056bdf..03758efb29a 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -586,6 +586,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