Mercurial > emacs
changeset 37800:9cddd888d25f
(maybe-append-domain): Renamed to
`smtpmail-maybe-append-domain'.
(smtpmail-via-smtp): Use the new name.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 18 May 2001 11:24:16 +0000 |
| parents | d10de887e52e |
| children | 6c6c8f8b2d4c |
| files | lisp/mail/smtpmail.el |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/smtpmail.el Fri May 18 11:15:46 2001 +0000 +++ b/lisp/mail/smtpmail.el Fri May 18 11:24:16 2001 +0000 @@ -1,12 +1,12 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail -;;; ### Hacked by Mike Taylor, 11th October 1999 to add support for -;;; automatically appending a domain to RCPT TO: addresses. ;; Copyright (C) 1995, 1996, 2001 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp> ;; Maintainer: Brian D. Carlstrom <bdc@ai.mit.edu> ;; ESMTP support: Simon Leinen <simon@switch.ch> +;; Hacked by Mike Taylor, 11th October 1999 to add support for +;; automatically appending a domain to RCPT TO: addresses. ;; Keywords: mail ;; This file is part of GNU Emacs. @@ -93,12 +93,6 @@ :type '(choice (const nil) string) :group 'smtpmail) -(defun maybe-append-domain (recipient) - (if (or (not smtpmail-sendto-domain) - (string-match "@" recipient)) - recipient - (concat recipient "@" smtpmail-sendto-domain))) - (defcustom smtpmail-debug-info nil "*smtpmail debug info printout. messages and process buffer." :type 'boolean @@ -338,6 +332,12 @@ (concat (system-name) "." smtpmail-local-domain) (system-name))) +(defun smtpmail-maybe-append-domain (recipient) + (if (or (not smtpmail-sendto-domain) + (string-match "@" recipient)) + recipient + (concat recipient "@" smtpmail-sendto-domain))) + (defun smtpmail-via-smtp (recipient smtpmail-text-buffer) (let ((process nil) (host (or smtpmail-smtp-server @@ -481,7 +481,7 @@ ;; RCPT TO: <recipient> (let ((n 0)) (while (not (null (nth n recipient))) - (smtpmail-send-command process (format "RCPT TO: <%s>" (maybe-append-domain (nth n recipient)))) + (smtpmail-send-command process (format "RCPT TO: <%s>" (smtpmail-maybe-append-domain (nth n recipient)))) (setq n (1+ n)) (setq response-code (smtpmail-read-response process))