diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-05-18 11:24:16 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-05-18 11:24:16 +0000 |
| commit | 9e9569f0b94ec72c74e0c9e531b43f9dde569a8d (patch) | |
| tree | 6a87597d9fc08aed517719a9d32ffde1cb005eb4 /lisp/mail | |
| parent | 72452f9684cd7c36fdc9328bb19861073584b4d2 (diff) | |
| download | emacs-9e9569f0b94ec72c74e0c9e531b43f9dde569a8d.tar.gz | |
(maybe-append-domain): Renamed to
`smtpmail-maybe-append-domain'.
(smtpmail-via-smtp): Use the new name.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/smtpmail.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index abe0a365472..fdc33ac2a11 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -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 @@ buffer includes an exchange like: :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 @@ This is relative to `smtpmail-queue-dir'.") (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 @@ This is relative to `smtpmail-queue-dir'.") ;; 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)) |