Re: 0.50 bug: gnus tries to search for empty line in message

[Shenghuo ZHU <zsh@cs.rochester.edu>]

>>>>> "VVV" == Vladimir Volovich <vvv@vvv.vsu.ru> writes:

VVV> Hi,
VVV> when i try to send the following message:

VVV> --------------------------
VVV> To: anybody
VVV> Subject: test
VVV> --text follows this line--
VVV> abc
VVV> def
VVV> --------------------------

VVV> i get an error:

VVV> Signaling: (search-failed "

VVV> ")
VVV>   search-forward("\n\n")
VVV>   message-encode-message-body()
VVV>   message-send-mail(nil)
VVV>   message-send-via-mail(nil)
VVV>   message-send(nil)
VVV>   message-send-and-exit(nil)
VVV> * call-interactively(message-send-and-exit)


VVV> I.e., gnus for some strange reason searches for an empty line in a
VVV> message. If the message does not contain an empty line, it issues an
VVV> error.

VVV> Also, it seems that pgnus 0.50 inserts an additional empty line after
VVV> the first empty line in the message body.

VVV> 	Best regards, -- Vladimir.

Hope this patch works.

-- 
Shenghuo

:- cut --------------
--- ChangeLog	1998/11/18 18:45:57	1.2
+++ ChangeLog	1998/11/18 18:46:15
@@ -1,3 +1,7 @@
+Wed Nov 18 13:46:08 1998  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+	* message.el (message-encode-message-body): Rewrite.
+
 Wed Nov 18 11:52:19 1998  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-art.el (gnus-mime-display-alternative): Set end of

--- message.el	1998/11/18 17:03:07	1.1
+++ message.el	1998/11/18 18:51:13
@@ -4116,27 +4116,32 @@
 		  type file)))
 
 (defun message-encode-message-body ()
-  (message-goto-body)
-  (save-restriction
-    (narrow-to-region (point) (point-max))
-    (let ((new (mml-generate-mime)))
-      (delete-region (point-min) (point-max))
-      (insert new)
-      (goto-char (point-min))
-      (widen)
-      (forward-line -1)
-      (let ((beg (point))
-	    (line (buffer-substring (point) (progn (forward-line 1) (point)))))
-	(delete-region beg (point))
-	(insert "Mime-Version: 1.0\n")
-	(search-forward "\n\n")
-	(forward-char -1)
-	(insert line)
-	(when (save-excursion
-		(re-search-backward "^Content-Type: multipart/" nil t))
-	  (insert "This is a MIME multipart message.  If you are reading\n")
-	  (insert "this, you shouldn't.\n"))))))
-    
+  (let (lines multipart-p)
+    (message-goto-body)
+    (save-restriction
+      (narrow-to-region (point) (point-max))
+      (let ((new (mml-generate-mime)))
+	(delete-region (point-min) (point-max))
+	(insert new)
+	(goto-char (point-min))
+	(if (eq (aref new 0) ?\n)
+	    (delete-char 1)
+	  (search-forward "\n\n")
+	  (setq lines (buffer-substring (point-min) (1- (point))))
+	  (delete-region (point-min)  (point)))))
+    (save-restriction
+      (message-narrow-to-headers-or-head)
+      (goto-char (point-max))
+      (insert "Mime-Version: 1.0\n")
+      (if lines
+	  (insert lines))
+      (setq multipart-p 
+	    (re-search-backward "^Content-Type: multipart/" nil t)))
+    (when multipart-p
+      (message-goto-body)
+      (insert "This is a MIME multipart message.  If you are reading\n")
+      (insert "this, you shouldn't.\n"))))
+
 (run-hooks 'message-load-hook)
 
 (provide 'message)