/[emacs]/emacs/lisp/mail/smtpmail.el
ViewVC logotype

Diff of /emacs/lisp/mail/smtpmail.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.43 by jas, Thu May 9 10:18:09 2002 UTC revision 1.44 by rms, Sun May 12 17:00:52 2002 UTC
# Line 211  This is relative to `smtpmail-queue-dir' Line 211  This is relative to `smtpmail-queue-dir'
211  ;;;  ;;;
212  ;;;  ;;;
213    
214    (defvar smtpmail-mail-address nil
215      "Value of `user-mail-address' in ambient buffer.")
216    
217  ;;;###autoload  ;;;###autoload
218  (defun smtpmail-send-it ()  (defun smtpmail-send-it ()
219    (let ((errbuf (if mail-interactive    (let ((errbuf (if mail-interactive
# Line 220  This is relative to `smtpmail-queue-dir' Line 223  This is relative to `smtpmail-queue-dir'
223          (case-fold-search nil)          (case-fold-search nil)
224          delimline          delimline
225          (mailbuf (current-buffer))          (mailbuf (current-buffer))
226          (mail-address user-mail-address)          (smtpmail-mail-address user-mail-address)
227          (smtpmail-code-conv-from          (smtpmail-code-conv-from
228           (if enable-multibyte-characters           (if enable-multibyte-characters
229               (let ((sendmail-coding-system smtpmail-code-conv-from))               (let ((sendmail-coding-system smtpmail-code-conv-from))
# Line 261  This is relative to `smtpmail-queue-dir' Line 264  This is relative to `smtpmail-queue-dir'
264              ;; they put one in themselves.              ;; they put one in themselves.
265              (goto-char (point-min))              (goto-char (point-min))
266              (if (not (re-search-forward "^From:" delimline t))              (if (not (re-search-forward "^From:" delimline t))
267                  (let* ((login mail-address)                  (let* ((login smtpmail-mail-address)
268                         (fullname (user-full-name)))                         (fullname (user-full-name)))
269                    (cond ((eq mail-from-style 'angles)                    (cond ((eq mail-from-style 'angles)
270                           (insert "From: " fullname)                           (insert "From: " fullname)
# Line 686  This is relative to `smtpmail-queue-dir' Line 689  This is relative to `smtpmail-queue-dir'
689  ;             (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))  ;             (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))
690                (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"                (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
691                                                       (or mail-envelope-from                                                       (or mail-envelope-from
692                                                           mail-address)                                                           smtpmail-mail-address)
693                                                       size-part                                                       size-part
694                                                       body-part))                                                       body-part))
695    

Legend:
Removed from v.1.43  
changed lines
  Added in v.1.44

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26