Synch up with flim-1_14

diff --git a/ChangeLog b/ChangeLog
index daa1372..096c65a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-24  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * smtp.el (smtp-end-of-line): New variable.
+       (smtp-read-response): Use it.
+       (smtp-send-command): Use it.
+       (smtp-send-data): Use it.
+
+\f
 2001-02-20  Kenichi OKADA <okada@opaopa.org>
 
        * SLIM: Version 1.14.8 released.

diff --git a/SLIM-VERSION b/SLIM-VERSION
index 17447df..176c0ad 100644 (file)
--- a/SLIM-VERSION
+++ b/SLIM-VERSION
@@ -17,4 +17,4 @@ l.14.3 \e$B<D86$H$b$(\e(B
 1.14.5 \e$B0BC#M4<B\e(B
 1.14.6 \e$BGO^<1QN$2?\e(B
 1.14.7 \e$B<r0f:LL>\e(B
-1.14.7 \e$B>.CS1I;R\e(B
+1.14.8 \e$B>.CS1I;R\e(B

diff --git a/smtp.el b/smtp.el
index 4531880..a59108e 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -133,6 +133,17 @@ don't define this value."
 
 (defvar smtp-submit-package-function #'smtp-submit-package)
 
+(defvar smtp-end-of-line "\r\n"
+  "*String to use on the end of lines when talking to the SMTP server.
+This is \"\\r\\n\" by default, but should be \"\\n\" when using and
+indirect connection method, e.g. bind `smtp-open-connection-function'
+to a custom function as shown below:
+
+\(setq smtp-open-connection-function
+      (lambda (name buffer host service)
+       (start-process name buffer \"ssh\" \"-C\" host
+                      \"telnet\" \"-8\" host service)))")
+
 ;;; @ SMTP package
 ;;; A package contains a mail message, an envelope sender address,
 ;;; and one or more envelope recipient addresses.  In ESMTP model
@@ -601,13 +612,13 @@ BUFFER may be a buffer or a buffer name which contains mail message."
        response)
     (while response-continue
       (goto-char smtp-read-point)
-      (while (not (search-forward "\r\n" nil t))
+      (while (not (search-forward smtp-end-of-line nil t))
        (accept-process-output (smtp-connection-process-internal connection))
        (goto-char smtp-read-point))
       (if decoder
          (let ((string (buffer-substring smtp-read-point (- (point) 2))))
            (delete-region smtp-read-point (point))
-           (insert (funcall decoder string) "\r\n")))
+           (insert (funcall decoder string) smtp-end-of-line)))
       (setq response
            (nconc response
                   (list (buffer-substring
@@ -629,7 +640,7 @@ BUFFER may be a buffer or a buffer name which contains mail message."
           (smtp-connection-encoder-internal connection)))
       (set-buffer (process-buffer process))
       (goto-char (point-max))
-      (setq command (concat command "\r\n"))
+      (setq command (concat command smtp-end-of-line))
       (insert command)
       (setq smtp-read-point (point))
       (if encoder
@@ -643,8 +654,8 @@ BUFFER may be a buffer or a buffer name which contains mail message."
         (smtp-connection-encoder-internal connection)))
     ;; Escape "." at start of a line.
     (if (eq (string-to-char data) ?.)
-       (setq data (concat "." data "\r\n"))
-      (setq data (concat data "\r\n")))
+       (setq data (concat "." data smtp-end-of-line))
+      (setq data (concat data smtp-end-of-line)))
     (if encoder
        (setq data (funcall encoder data)))
     (process-send-string process data)))