[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/mail smtpmail.el
From: |
Roland Winkler |
Subject: |
[Emacs-diffs] emacs/lisp/mail smtpmail.el |
Date: |
Mon, 25 May 2009 01:11:46 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Roland Winkler <winkler> 09/05/25 01:11:46
Modified files:
lisp/mail : smtpmail.el
Log message:
* mail/smtpmail.el: Indent code properly to make it more readable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/smtpmail.el?cvsroot=emacs&r1=1.109&r2=1.110
Patches:
Index: smtpmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/smtpmail.el,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- smtpmail.el 3 Mar 2009 16:28:19 -0000 1.109
+++ smtpmail.el 25 May 2009 01:11:46 -0000 1.110
@@ -46,8 +46,8 @@
;; Where the 25 equals the value of `smtpmail-smtp-service', it can be an
;; integer or a string, just as long as they match (eq).
-;; To queue mail, set smtpmail-queue-mail to t and use
-;; smtpmail-send-queued-mail to send.
+;; To queue mail, set `smtpmail-queue-mail' to t and use
+;; `smtpmail-send-queued-mail' to send.
;; Modified by Stephen Cranefield <address@hidden>,
;; 22/6/99, to support SMTP Authentication by the AUTH=LOGIN mechanism.
@@ -122,8 +122,7 @@
when sending mail, and the *trace of SMTP session to <somewhere>*
buffer includes an exchange like:
RCPT TO: <someone>
- 501 <someone>: recipient address must contain a domain
-"
+ 501 <someone>: recipient address must contain a domain."
:type '(choice (const nil) string)
:group 'smtpmail)
@@ -246,8 +245,8 @@
(save-excursion
(set-buffer tembuf)
(erase-buffer)
- ;; Use the same buffer-file-coding-system as in the mail
- ;; buffer, otherwise any write-region invocations (e.g., in
+ ;; Use the same `buffer-file-coding-system' as in the mail
+ ;; buffer, otherwise any `write-region' invocations (e.g., in
;; mail-do-fcc below) will annoy with asking for a suitable
;; encoding.
(set-buffer-file-coding-system smtpmail-code-conv-from nil t)
@@ -259,7 +258,7 @@
;; Change header-delimiter to be what sendmail expects.
(mail-sendmail-undelimit-header)
(setq delimline (point-marker))
-;; (sendmail-synch-aliases)
+ ;; (sendmail-synch-aliases)
(if mail-aliases
(expand-mail-aliases (point-min) delimline))
(goto-char (point-min))
@@ -270,7 +269,7 @@
(let ((case-fold-search t))
;; We used to process Resent-... headers here,
;; but it was not done properly, and the job
- ;; is done correctly in smtpmail-deduce-address-list.
+ ;; is done correctly in `smtpmail-deduce-address-list'.
;; Don't send out a blank subject line
(goto-char (point-min))
(if (re-search-forward "^Subject:\\([ \t]*\n\\)+\\b" delimline t)
@@ -357,7 +356,7 @@
;; Find and handle any FCC fields.
(goto-char (point-min))
(if (re-search-forward "^FCC:" delimline t)
- ;; Force mail-do-fcc to use the encoding of the mail
+ ;; Force `mail-do-fcc' to use the encoding of the mail
;; buffer to encode outgoing messages on FCC files.
(let ((coding-system-for-write smtpmail-code-conv-from))
(mail-do-fcc delimline)))
@@ -365,15 +364,13 @@
(with-current-buffer errbuf
(erase-buffer))))
;;
- ;;
- ;;
(setq smtpmail-address-buffer (generate-new-buffer "*smtp-mail*"))
(setq smtpmail-recipient-address-list
(smtpmail-deduce-address-list tembuf (point-min) delimline))
(kill-buffer smtpmail-address-buffer)
(smtpmail-do-bcc delimline)
- ; Send or queue
+ ;; Send or queue
(if (not smtpmail-queue-mail)
(if (not (null smtpmail-recipient-address-list))
(if (not (smtpmail-via-smtp
@@ -424,8 +421,8 @@
"Send mail that was queued as a result of setting `smtpmail-queue-mail'."
(interactive)
(with-temp-buffer
- ;;; Get index, get first mail, send it, update index, get second
- ;;; mail, send it, etc...
+ ;; Get index, get first mail, send it, update index, get second
+ ;; mail, send it, etc...
(let ((file-msg "")
(qfile (expand-file-name smtpmail-queue-index-file
smtpmail-queue-dir)))
@@ -453,7 +450,7 @@
(delete-region (point-at-bol) (point-at-bol 2)))
(write-region (point-min) (point-max) qfile))))
-;(defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)
+;; (defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)
(defun smtpmail-fqdn ()
(if smtpmail-local-domain
@@ -530,7 +527,7 @@
(list "--x509keyfile" cred-key "--x509certfile" cred-cert)))))
(starttls-open-stream "SMTP" process-buffer host port)))))
-;; password-read autoloads password-cache.
+;; `password-read' autoloads password-cache.
(declare-function password-cache-add "password-cache" (key password))
(defun smtpmail-try-auth-methods (process supported-extensions host port)
@@ -552,8 +549,8 @@
(list host port
(netrc-get hostentry "login")
(netrc-get hostentry "password"))))
- ;; else, try smtpmail-find-credentials since
- ;; smtpmail-auth-credentials is not a string
+ ;; else, try `smtpmail-find-credentials' since
+ ;; `smtpmail-auth-credentials' is not a string
(smtpmail-find-credentials
smtpmail-auth-credentials host port))))
(prompt (when cred (format "SMTP password for %s:%s: "
@@ -584,7 +581,7 @@
;; In my case, the response string is 80 characters
;; long. Without the no-line-break option for
- ;; base64-encode-sting, only the first 76 characters
+ ;; `base64-encode-string', only the first 76 characters
;; are taken as a response to the server, and the
;; authentication fails.
(encoded (base64-encode-string response t)))
@@ -639,7 +636,7 @@
(host (or smtpmail-smtp-server
(error "`smtpmail-smtp-server' not defined")))
(port smtpmail-smtp-service)
- ;; smtpmail-mail-address should be set to the appropriate
+ ;; `smtpmail-mail-address' should be set to the appropriate
;; buffer-local value by the caller, but in case not:
(envelope-from (or smtpmail-mail-address
(and mail-specify-envelope-from
@@ -676,8 +673,7 @@
(if (or (null (car (setq greeting (smtpmail-read-response
process))))
(not (integerp (car greeting)))
(>= (car greeting) 400))
- (throw 'done nil)
- )
+ (throw 'done nil))
(let ((do-ehlo t)
(do-starttls t))
@@ -790,7 +786,7 @@
" BODY=8BITMIME"
"")
"")))
-; (smtpmail-send-command process (format "MAIL FROM:address@hidden"
(user-login-name) (smtpmail-fqdn)))
+ ;; (smtpmail-send-command process (format "MAIL
FROM:address@hidden" (user-login-name) (smtpmail-fqdn)))
(smtpmail-send-command process (format "MAIL FROM:<%s>%s%s"
envelope-from
size-part
@@ -799,8 +795,7 @@
(if (or (null (car (setq response-code (smtpmail-read-response
process))))
(not (integerp (car response-code)))
(>= (car response-code) 400))
- (throw 'done nil)
- ))
+ (throw 'done nil)))
;; RCPT TO:<recipient>
(let ((n 0))
@@ -812,9 +807,7 @@
(if (or (null (car response-code))
(not (integerp (car response-code)))
(>= (car response-code) 400))
- (throw 'done nil)
- )
- ))
+ (throw 'done nil))))
;; DATA
(smtpmail-send-command process "DATA")
@@ -822,36 +815,33 @@
(if (or (null (car (setq response-code (smtpmail-read-response
process))))
(not (integerp (car response-code)))
(>= (car response-code) 400))
- (throw 'done nil)
- )
+ (throw 'done nil))
;; Mail contents
(smtpmail-send-data process smtpmail-text-buffer)
- ;;DATA end "."
+ ;; DATA end "."
(smtpmail-send-command process ".")
(if (or (null (car (setq response-code (smtpmail-read-response
process))))
(not (integerp (car response-code)))
(>= (car response-code) 400))
- (throw 'done nil)
- )
+ (throw 'done nil))
- ;;QUIT
-; (smtpmail-send-command process "QUIT")
-; (and (null (car (smtpmail-read-response process)))
-; (throw 'done nil))
- t ))
+ ;; QUIT
+ ;; (smtpmail-send-command process "QUIT")
+ ;; (and (null (car (smtpmail-read-response process)))
+ ;; (throw 'done nil))
+ t))
(if process
(with-current-buffer (process-buffer process)
(smtpmail-send-command process "QUIT")
(smtpmail-read-response process)
-; (if (or (null (car (setq response-code (smtpmail-read-response
process))))
-; (not (integerp (car response-code)))
-; (>= (car response-code) 400))
-; (throw 'done nil)
-; )
+ ;; (if (or (null (car (setq response-code (smtpmail-read-response
process))))
+ ;; (not (integerp (car response-code)))
+ ;; (>= (car response-code) 400))
+ ;; (throw 'done nil))
(delete-process process)
(unless smtpmail-debug-info
(kill-buffer process-buffer)))))))
@@ -939,8 +929,7 @@
(if (eq (string-to-char data) ?.)
(process-send-string process "."))
(process-send-string process data)
- (process-send-string process "\r\n")
- )
+ (process-send-string process "\r\n"))
(defun smtpmail-send-data (process buffer)
(let ((data-continue t) sending-data)
@@ -958,8 +947,7 @@
(unwind-protect
(with-current-buffer smtpmail-address-buffer
(erase-buffer)
- (let
- ((case-fold-search t)
+ (let ((case-fold-search t)
(simple-address-list "")
this-line
this-line-end
@@ -984,13 +972,12 @@
(setq this-line-end (point-marker))
(setq simple-address-list
(concat simple-address-list " "
- (mail-strip-quoted-names (buffer-substring this-line
this-line-end))))
- )
+ (mail-strip-quoted-names (buffer-substring this-line
this-line-end)))))
(erase-buffer)
(insert " " simple-address-list "\n")
- (subst-char-in-region (point-min) (point-max) 10 ? t);; newline -->
blank
- (subst-char-in-region (point-min) (point-max) ?, ? t);; comma -->
blank
- (subst-char-in-region (point-min) (point-max) 9 ? t);; tab -->
blank
+ (subst-char-in-region (point-min) (point-max) 10 ? t) ; newline -->
blank
+ (subst-char-in-region (point-min) (point-max) ?, ? t) ; comma -->
blank
+ (subst-char-in-region (point-min) (point-max) 9 ? t) ; tab -->
blank
(goto-char (point-min))
;; tidyness in case hook is not robust when it looks at this
@@ -1001,15 +988,8 @@
(while (re-search-forward " \\([^ ]+\\) " (point-max) t)
(backward-char 1)
(setq recipient-address-list (cons (buffer-substring
(match-beginning 1) (match-end 1))
- recipient-address-list))
- )
- (setq smtpmail-recipient-address-list recipient-address-list))
-
- )
- )
- )
- )
-
+ recipient-address-list)))
+ (setq smtpmail-recipient-address-list recipient-address-list))))))
(defun smtpmail-do-bcc (header-end)
"Delete [Resent-]BCC: and their continuation lines from the header area.
@@ -1026,7 +1006,6 @@
(while (and (looking-at "^[ \t].*\n") (< (point) header-end))
(replace-match ""))))))
-
(provide 'smtpmail)
;; arch-tag: a76992df-6d71-43b7-9e72-4bacc6c05466
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp/mail smtpmail.el,
Roland Winkler <=