From: ueno <ueno>
Date: Sun, 24 Sep 2006 00:34:36 +0000 (+0000)
Subject: * smtp.el (smtp-end-of-line): Abolished; reverted the change
X-Git-Tag: flim-1_14_9-pre0~12
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05c653fb2de87a6bed68d443a9f4bcfe186262e1;p=elisp%2Fflim.git

* smtp.el (smtp-end-of-line): Abolished; reverted the change
2002-07-24 Katsumi Yamaoka <yamaoka@jpl.org>.
---

diff --git a/ChangeLog b/ChangeLog
index d78e78b..35059ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-24  Daiki Ueno  <ueno@unixuser.org>
+
+	* smtp.el (smtp-end-of-line): Abolished; reverted the change
+	2002-07-24 Katsumi Yamaoka <yamaoka@jpl.org>.
+
 2006-06-15  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* smtp.el (smtp-submit-package): Ignore error in
diff --git a/smtp.el b/smtp.el
index 0df5fa6..fe09491 100644
--- a/smtp.el
+++ b/smtp.el
@@ -171,8 +171,7 @@ Here is an example:
 It connects to a SMTP server using \"ssh\" before actually connecting
 to the SMTP port.  Where the command \"nc\" is the netcat executable;
 see http://www.atstake.com/research/tools/index.html#network_utilities
-for details.  In addition, you will have to modify the value for
-`smtp-end-of-line' to \"\\n\" if you use \"telnet\" instead of \"nc\".")
+for details.")
 
 (defvar smtp-read-point nil)
 
@@ -180,11 +179,6 @@ for details.  In addition, you will have to modify the value for
 
 (defvar smtp-submit-package-function #'smtp-submit-package)
 
-(defvar smtp-end-of-line "\r\n"
-  "*String to use as end-of-line marker when talking to a SMTP server.
-This is \"\\r\\n\" by default, but it may have to be \"\\n\" when using a non
-native connection function.  See also `smtp-open-connection-function'.")
-
 ;;; @ SMTP package
 ;;; A package contains a mail message, an envelope sender address,
 ;;; and one or more envelope recipient addresses.  In ESMTP model
@@ -672,7 +666,7 @@ BUFFER may be a buffer or a buffer name which contains mail message."
 	    (delete-region bol (point))
 	    (insert (funcall decoder string))
 	    (setq eol (point))
-	    (insert smtp-end-of-line)))
+	    (insert "\r\n")))
 	(setq smtp-read-point (point))
 	(goto-char bol)
 	(cond
@@ -695,7 +689,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 smtp-end-of-line))
+      (setq command (concat command "\r\n"))
       (insert command)
       (setq smtp-read-point (point))
       (if encoder
@@ -709,8 +703,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 smtp-end-of-line))
-      (setq data (concat data smtp-end-of-line)))
+	(setq data (concat "." data "\r\n"))
+      (setq data (concat data "\r\n")))
     (if encoder
 	(setq data (funcall encoder data)))
     (process-send-string process data)))