Jesper Harder <harder@ifa.au.dk>

(smtpmail-send-data): Don't append spurious newline.

2 files changed, 15 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b41992d11c..f3ca6a6364d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-18  Jesper Harder  <harder@ifa.au.dk>
+
+	* mail/smtpmail.el (smtpmail-send-data): Don't append spurious
+        newline.
+
+2004-01-18   David Ponce  <david@dponce.com>  (tiny change)
+
+	* progmodes/which-func.el (which-function-mode): Don't cancel
+        which-func-update-timer if not set.
+
 2004-01-17  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* calendar/diary-lib.el (diary-entry-time): Fix typo/bug:
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index c9bfce7f400..39886ad343d 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -858,31 +858,15 @@ This is relative to `smtpmail-queue-dir'.")
   )
 
 (defun smtpmail-send-data (process buffer)
-  (let
-      ((data-continue t)
-       (sending-data nil)
-       this-line
-       this-line-end)
-
+  (let ((data-continue t) sending-data)
     (with-current-buffer buffer
       (goto-char (point-min)))
-
     (while data-continue
       (with-current-buffer buffer
-	(beginning-of-line)
-	(setq this-line (point))
-	(end-of-line)
-	(setq this-line-end (point))
-	(setq sending-data nil)
-	(setq sending-data (buffer-substring this-line this-line-end))
-	(if (/= (forward-line 1) 0)
-	    (setq data-continue nil)))
-
-      (smtpmail-send-data-1 process sending-data)
-      )
-    )
-  )
-
+        (setq sending-data (buffer-substring (point-at-bol) (point-at-eol)))
+	(end-of-line 2)
+        (setq data-continue (not (eobp))))
+      (smtpmail-send-data-1 process sending-data))))
 
 (defun smtpmail-deduce-address-list (smtpmail-text-buffer header-start header-end)
   "Get address list suitable for smtp RCPT TO: <address>."