[Emacs-diffs] emacs/lisp/mail unrmail.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/04/10 11:53:59

Modified files:
        lisp/mail      : unrmail.el 

Log message:
        (unrmail): If "Mail-From" header is found, append a newline to it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/unrmail.el?cvsroot=emacs&r1=1.37&r2=1.38

Patches:
Index: unrmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/unrmail.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- unrmail.el  18 Feb 2009 04:34:43 -0000      1.37
+++ unrmail.el  10 Apr 2009 11:53:59 -0000      1.38
@@ -191,7 +191,13 @@
               (save-excursion (search-forward "\n\n" nil 'move) (point)))
 
              ;; Fetch or construct what we should use in the `From ' line.
-             (setq mail-from (or (mail-fetch-field "Mail-From")
+             (setq mail-from (or (let ((from (mail-fetch-field "Mail-From")))
+                                   ;; mail-mbox-from (below) returns a
+                                   ;; string that ends in a newline, but
+                                   ;; but mail-fetch-field does not, so
+                                   ;; we append a newline here.
+                                   (if from
+                                       (format "%s\n" from)))
                                  (mail-mbox-from)))
 
              ;; If the message specifies a coding system, use it.
@@ -213,7 +219,7 @@
 
            (goto-char (point-min))
            ;; Insert the `From ' line.
-           (insert mail-from "\n")
+           (insert mail-from)
            ;; Record the keywords and attributes in our special way.
            (insert "X-RMAIL-ATTRIBUTES: " (apply 'string attrs) "\n")
            (when keywords