From: Glenn Morris <rgm@gnu.org>
Date: Sat, 19 Jan 2013 20:54:56 +0000 (-0800)
Subject: * lisp/mail/unrmail.el (unrmail): Do not mangle the mbox From line
X-Git-Tag: emacs-24.3.90~173^2~7^2~260
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4d1e0c39c41ced76bf6e1d7abae4fc333ef2834;p=emacs.git

* lisp/mail/unrmail.el (unrmail): Do not mangle the mbox From line
fixes 2012-12-07 change.

Fixes: debbugs:13499
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34dbe74f23f..bcab1e746a5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-19  Glenn Morris  <rgm@gnu.org>
+
+	* mail/unrmail.el (unrmail): Do not mangle the mbox From line;
+	fixes 2012-12-07 change.  (Bug#13499)
+
 2013-01-19  Leo Liu  <sdl.web@gmail.com>
 
 	* dired.el (dired-get-marked-files): Prune erroneous values due to
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 85e8bb4f863..406009af5e2 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -241,6 +241,7 @@ The variable `unrmail-mbox-format' controls which mbox format to use."
 	    (when keywords
 	      (insert "X-RMAIL-KEYWORDS: " keywords "\n"))
 	    (goto-char (point-min))
+	    (forward-line 1)		; skip `From ' line
 	    ;; Convert From to >From, etc.
 	    (let ((case-fold-search nil)
 		  (fromline (if (eq 'mboxrd unrmail-mbox-format)