Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index cf8f1ac2b165cf4436b60e3ba0c87f1ddc540611..196d296fabd65c13d2205d1e02427b3f0a42a855 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,12 @@
+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 3f2ee056bdfc7d5ee2ed5830784a361bacba9d97..03758efb29a3ad2157a16dc0315f0d65220cf991 100644 (file)
--- 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

diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 3b37b9e799c7af0ddf9ce9043dbcd966aa330507..25784d0ebcd59eb535aae22c62bc952267045be6 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