diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-06-18 22:35:10 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-06-18 22:35:10 +0000 |
| commit | 8ff02afa7029a724f704f4e27812bf77786365d2 (patch) | |
| tree | fd20db4865cd693a1b6ad553b1d338571079838c | |
| parent | ca3d3c9f7bbf69870f04f0363dafea04746ca60b (diff) | |
| download | emacs-8ff02afa7029a724f704f4e27812bf77786365d2.tar.gz | |
(smtpmail-smtp-service): Use port 25 as default.
(smtpmail-send-it): Require mail-utils upon entry.
Don't invoke sendmail-synch-aliases.
(smtpmail-deduce-address-list): Only use text matched in regexp group,
not the whole regexp.
| -rw-r--r-- | lisp/mail/smtpmail.el | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 660dfa1b1f7..dcea31faa09 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -1,6 +1,6 @@ ;; Simple SMTP protocol (RFC 821) for sending mail -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp> ;; Keywords: mail @@ -45,11 +45,11 @@ (defvar smtpmail-default-smtp-server nil "*Specify default SMTP server.") -(defvar smtpmail-smtp-server (or (getenv "SMTPSERVER") - smtpmail-default-smtp-server) +(defvar smtpmail-smtp-server + (or (getenv "SMTPSERVER") smtpmail-default-smtp-server) "*The name of the host running SMTP server.") -(defvar smtpmail-smtp-service "smtp" +(defvar smtpmail-smtp-service 25 "*SMTP service port number. smtp or 25 .") (defvar smtpmail-local-domain nil @@ -68,6 +68,7 @@ don't define this value.") ;;; (defun smtpmail-send-it () + (require 'mail-utils) (let ((errbuf (if mail-interactive (generate-new-buffer " smtpmail errors") 0)) @@ -92,6 +93,7 @@ don't define this value.") (replace-match "\n") (backward-char 1) (setq delimline (point-marker)) +;; (sendmail-synch-aliases) (if mail-aliases (expand-mail-aliases (point-min) delimline)) (goto-char (point-min)) @@ -436,10 +438,10 @@ don't define this value.") (goto-char (point-min)) (let (recipient-address-list) - (while (re-search-forward " [^ ]+ " (point-max) t) + (while (re-search-forward " \\([^ ]+\\) " (point-max) t) (backward-char 1) - (setq recipient-address-list(cons (buffer-substring (match-beginning 0) (match-end 0)) - recipient-address-list)) + (setq recipient-address-list (cons (buffer-substring (match-beginning 1) (match-end 1)) + recipient-address-list)) ) (setq smtpmail-recipient-address-list recipient-address-list)) |