From 08b228794a08022cc9dee8c751da3e344387f17f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 14 Dec 2000 23:42:47 +0000 Subject: [PATCH] * smtp.el (smtp-primitive-ehlo): Enclose the `lambda' form with `function'. * smtp.el (smtp-make-connection, smtp-connection-set-extensions, smtp-connection-extensions, smtp-connection-service, smtp-connection-server, smtp-connection-process, smtp-make-package, smtp-package-buffer, smtp-package-recipients, smtp-package-sender): Use old fashioned backquoting. * mmgeneric.el (mm-define-method, mm-define-backend,mm-expand-class-name): Ditto. * smtp.el (smtp-send-buffer, smtp-submit-package-function, smtp-open-connection-function): Replace #' with `function'. * sasl.el (sasl-unique-id-function): Ditto. * qmtp.el (qmtp-send-package): Ditto. --- ChangeLog | 24 +++++++++++++++++++++--- mmgeneric.el | 42 ++++++++++++++++-------------------------- qmtp.el | 2 +- sasl.el | 2 +- smtp.el | 45 +++++++++++++++++++++++---------------------- 5 files changed, 62 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bc305e..1ff075f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,26 @@ +2000-12-14 Katsumi Yamaoka + + * smtp.el (smtp-primitive-ehlo): Enclose the `lambda' form with + `function'. + + * smtp.el (smtp-make-connection, smtp-connection-set-extensions, + smtp-connection-extensions, smtp-connection-service, + smtp-connection-server, smtp-connection-process, smtp-make-package, + smtp-package-buffer, smtp-package-recipients, smtp-package-sender): + Use old fashioned backquoting. + * mmgeneric.el (mm-define-method, mm-define-backend, + mm-expand-class-name): Ditto. + + * smtp.el (smtp-send-buffer, smtp-submit-package-function, + smtp-open-connection-function): Replace #' with `function'. + * sasl.el (sasl-unique-id-function): Ditto. + * qmtp.el (qmtp-send-package): Ditto. + 2000-12-04 Daiki Ueno - * smtpmail.el (smtpmail-send-it): Use `smtp-send-buffer' instead of - `smtp-via-smtp'. - (smtpmail-send-queued-mail): Ditto. + * smtpmail.el (smtpmail-send-it): Use `smtp-send-buffer' instead of + `smtp-via-smtp'. + (smtpmail-send-queued-mail): Ditto. 2000-11-24 MORIOKA Tomohiko diff --git a/mmgeneric.el b/mmgeneric.el index 5bd9686..307e472 100644 --- a/mmgeneric.el +++ b/mmgeneric.el @@ -45,9 +45,7 @@ content-disposition encoding ;; for other fields original-header parsed-header)) - - (luna-define-internal-accessors 'mime-entity) - ) + (luna-define-internal-accessors 'mime-entity)) (defalias 'mime-entity-representation-type-internal 'luna-class-name) (defalias 'mime-entity-set-representation-type-internal 'luna-set-class-name) @@ -66,23 +64,22 @@ (mime-entity-content-type entity) "charset") default-mime-charset) - 'CRLF) - )) + 'CRLF))) ;;; @ for mm-backend ;;; (defmacro mm-expand-class-name (type) - `(intern (format "mime-%s-entity" ,type))) + (` (intern (format "mime-%s-entity" (, type))))) (defmacro mm-define-backend (type &optional parents) - `(luna-define-class ,(mm-expand-class-name type) - ,(nconc (mapcar (lambda (parent) - (mm-expand-class-name parent) - ) - parents) - '(mime-entity)))) + (` (luna-define-class (, (mm-expand-class-name type)) + (, (nconc (mapcar (function + (lambda (parent) + (mm-expand-class-name parent))) + parents) + '(mime-entity)))))) (defmacro mm-define-method (name args &rest body) (or (eq name 'initialize-instance) @@ -92,8 +89,7 @@ (cons (list (car spec) (mm-expand-class-name (nth 1 spec))) (cdr args))) - `(luna-define-method ,name ,args ,@body) - )) + (` (luna-define-method (, name) (, args) (,@ body))))) (put 'mm-define-method 'lisp-indent-function 'defun) @@ -101,8 +97,7 @@ (&define name ((arg symbolp) [&rest arg] [&optional ["&optional" arg &rest arg]] - &optional ["&rest" arg] - ) + &optional ["&rest" arg]) def-body)) @@ -117,18 +112,14 @@ (while visible-fields (let ((regexp (car visible-fields))) (if (string-match regexp field-name) - (throw 'found t) - )) - (setq visible-fields (cdr visible-fields)) - )) + (throw 'found t))) + (setq visible-fields (cdr visible-fields)))) (catch 'found (while invisible-fields (let ((regexp (car invisible-fields))) (if (string-match regexp field-name) - (throw 'found nil) - )) - (setq invisible-fields (cdr invisible-fields)) - ) + (throw 'found nil))) + (setq invisible-fields (cdr invisible-fields))) t))) (defun mime-insert-header-from-buffer (buffer start end @@ -162,8 +153,7 @@ (funcall field-decoder field-body len) ;; Don't decode field-body)) - (insert "\n") - ))))))) + (insert "\n")))))))) ;;; @ end diff --git a/qmtp.el b/qmtp.el index 459cd7f..ef1a84d 100644 --- a/qmtp.el +++ b/qmtp.el @@ -87,7 +87,7 @@ called from `qmtp-via-qmtp' with arguments SENDER and RECIPIENTS.") "\n," (qmtp-encode-netstring-string sender) (qmtp-encode-netstring-string - (mapconcat #'qmtp-encode-netstring-string + (mapconcat (function qmtp-encode-netstring-string) recipients ""))) (process-send-region process (point-min)(point-max))) (goto-char qmtp-read-point) diff --git a/sasl.el b/sasl.el index 8528898..cc782b9 100644 --- a/sasl.el +++ b/sasl.el @@ -46,7 +46,7 @@ ("LOGIN" sasl-login) ("ANONYMOUS" sasl-anonymous))) -(defvar sasl-unique-id-function #'sasl-unique-id-function) +(defvar sasl-unique-id-function (function sasl-unique-id-function)) (put 'sasl-error 'error-message "SASL error") (put 'sasl-error 'error-conditions '(sasl-error error)) diff --git a/smtp.el b/smtp.el index 2a979d4..418028c 100644 --- a/smtp.el +++ b/smtp.el @@ -27,7 +27,7 @@ ;;; Commentary: -;; +;; ;;; Code: @@ -111,14 +111,14 @@ don't define this value." :group 'smtp-extensions) (defvar sasl-mechanisms) - -(defvar smtp-open-connection-function #'open-network-stream) + +(defvar smtp-open-connection-function (function open-network-stream)) (defvar smtp-read-point nil) (defvar smtp-connection-alist nil) -(defvar smtp-submit-package-function #'smtp-submit-package) +(defvar smtp-submit-package-function (function smtp-submit-package)) ;;; @ SMTP package structure ;;; A package contains a mail message, an envelope sender address, @@ -128,15 +128,15 @@ don't define this value." (defmacro smtp-package-sender (package) "Return the sender of PACKAGE, a string." - `(aref ,package 0)) + (` (aref (, package) 0))) (defmacro smtp-package-recipients (package) "Return the recipients of PACKAGE, a list of strings." - `(aref ,package 1)) + (` (aref (, package) 1))) (defmacro smtp-package-buffer (package) "Return the data of PACKAGE, a buffer." - `(aref ,package 2)) + (` (aref (, package) 2))) (defmacro smtp-make-package (sender recipients buffer) "Create a new package structure. @@ -144,7 +144,7 @@ A package is a unit of SMTP message SENDER specifies the package sender, a string. RECIPIENTS is a list of recipients. BUFFER may be a buffer or a buffer name which contains mail message." - `(vector ,sender ,recipients ,buffer)) + (` (vector (, sender) (, recipients) (, buffer)))) (defun smtp-package-buffer-size (package) "Return the size of PACKAGE, an integer." @@ -173,31 +173,31 @@ BUFFER may be a buffer or a buffer name which contains mail message." (defmacro smtp-connection-process (connection) "Return the subprocess-object of CONNECTION." - `(aref ,connection 0)) + (` (aref (, connection) 0))) (defmacro smtp-connection-server (connection) "Return the server of CONNECTION, a string." - `(aref ,connection 1)) + (` (aref (, connection) 1))) (defmacro smtp-connection-service (connection) "Return the service of CONNECTION, a string or an integer." - `(aref ,connection 2)) + (` (aref (, connection) 2))) (defmacro smtp-connection-extensions (connection) "Return the SMTP extensions of CONNECTION, a list of strings." - `(aref ,connection 3)) + (` (aref (, connection) 3))) (defmacro smtp-connection-set-extensions (connection extensions) "Set the SMTP extensions of CONNECTION. EXTENSIONS is a list of cons cells of the form \(EXTENSION . PARAMETERS). Where EXTENSION is a symbol and PARAMETERS is a list of strings." - `(aset ,connection 3 ,extensions)) + (` (aset (, connection) 3 (, extensions)))) (defmacro smtp-make-connection (process server service) "Create a new connection structure. PROCESS is an internal subprocess-object. SERVER is name of the host to connect to. SERVICE is name of the service desired." - `(vector ,process ,server ,service nil)) + (` (vector (, process) (, server) (, service) nil))) (defun smtp-connection-opened (connection) "Say whether the CONNECTION to server has been opened." @@ -277,7 +277,7 @@ of the host to connect to. SERVICE is name of the service desired." (smtp-make-package sender recipients buffer)) (smtp-open-connection-function (if smtp-use-starttls - #'starttls-open-stream + (function starttls-open-stream) smtp-open-connection-function))) (save-excursion (set-buffer @@ -335,13 +335,14 @@ of the host to connect to. SERVICE is name of the service desired." (smtp-response-error response)) (smtp-connection-set-extensions connection (mapcar - (lambda (extension) - (let ((extensions - (split-string extension))) - (setcar extensions - (car (read-from-string - (downcase (car extensions))))) - extensions)) + (function + (lambda (extension) + (let ((extensions + (split-string extension))) + (setcar extensions + (car (read-from-string + (downcase (car extensions))))) + extensions))) (cdr response))))) (defun smtp-primitive-helo (package) -- 1.7.10.4