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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/18 04:34:24

Modified files:
        lisp/mail      : rmailout.el 

Log message:
        (rmail-mbox-from): Move to mail-utils.
        Update callers for name change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailout.el?cvsroot=emacs&r1=1.95&r2=1.96

Patches:
Index: rmailout.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailout.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- rmailout.el 17 Feb 2009 02:54:16 -0000      1.95
+++ rmailout.el 18 Feb 2009 04:34:24 -0000      1.96
@@ -308,20 +308,7 @@
                    "From: \\1\n"))
                t)))))))
 
-;; Note this is duplicated in unrmail.el.
-(defun rmail-mbox-from ()
-  "Return a \"From \" line for the current message.
-The buffer should be narrowed to just the header."
-  (let ((from (or (mail-fetch-field "from")
-                 (mail-fetch-field "really-from")
-                 (mail-fetch-field "sender")
-                 "unknown"))
-       (date (mail-fetch-field "date")))
-    (format "From %s %s\n" (mail-strip-quoted-names from)
-           (or (and date
-                    (ignore-errors
-                     (current-time-string (date-to-time date))))
-               (current-time-string)))))
+(autoload 'mail-mbox-from "mail-utils")
 
 (defun rmail-output-as-mbox (file-name nomsg &optional as-seen)
   "Convert the current buffer's text to mbox and output to FILE-NAME.
@@ -344,7 +331,7 @@
        "Mail-From\\|MIME-Version\\|Content-type"))
     (goto-char (point-min))
     (or (looking-at "From ")
-       (insert (rmail-mbox-from)))
+       (insert (mail-mbox-from)))
     (widen)
     ;; Make sure message ends with blank line.
     (goto-char (point-max))
@@ -451,7 +438,7 @@
                ;; rmail-convert-to-babyl-format errors if no From line,
                ;; whereas rmail-output-as-mbox inserts one.
                (or (looking-at "From ")
-                   (insert (rmail-mbox-from)))
+                   (insert (mail-mbox-from)))
                (rmail-output-as-babyl file-name noattribute))
            (rmail-output-as-mbox file-name noattribute)))
       ;; Called from an Rmail buffer.