diff lisp/gnus/message.el @ 35453:26726eff41ca zsh-sync-ognus-2

2001-01-21 ShengHuo ZHU <[e-mail]> * message.el (message-forward): Use mule4. * mm-util.el (mm-string-as-unibyte): New. * message.el (message-forward): Use it. * message.el (message-cite-original-without-signature): Don't peel off the blank line. (message-get-reply-headers): Add Cc if it is not in follow-to. * message.el (message-send-mail): Content-Type may not be there. By Alberto Lusiani. * gnus-art.el (article-display-x-face): Insert X-Face if there is not. * rfc2047.el (rfc2047-fold-region): Don't insert LWSP if there is one. * gnus-win.el (gnus-configure-windows): switch-to-buffer in XEmacs. (gnus-remove-some-windows): Ditto. * mm-decode.el (mm-interactively-view-part): Don't copy-sequence handle. * gnus-art.el (gnus-mime-view-part): Copy it. (gnus-mime-view-part-as-type): Add into gnus-article-mime-handles. * nnmail.el (nnmail-get-new-mail): Find group only if file is not orig-file. Use ',source. * nnslashdot.el (nnslashdot-request-list): Get the right year. By Lars Magne Ingebrigtsen. * pop3.el (pop3-get-message-count): Andrew Innes <[e-mail]>'s patch of 1999-12-01 was not fully committed.

--- a/lisp/gnus/message.el	Sat Jan 20 18:20:59 2001 +0000
+++ b/lisp/gnus/message.el	Sun Jan 21 05:33:42 2001 +0000
@@ -1,5 +1,5 @@
 ;;; message.el --- composing mail and news messages  -*- coding: iso-latin-1 -*-
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[e-mail]>
@@ -1975,7 +1975,8 @@
 	       message-cite-function)
       (delete-windows-on message-reply-buffer t)
       (insert-buffer message-reply-buffer)
-      (funcall message-cite-function)
+      (unless arg
+	(funcall message-cite-function))
       (message-exchange-point-and-mark)
       (unless (bolp)
 	(insert ?\n))
@@ -2019,7 +2020,10 @@
       (while (looking-at "^[ \t]*$")
 	(forward-line -1))
       (forward-line 1)
-      (delete-region (point) end))
+      (delete-region (point) end)
+      (unless (search-backward "\n\n" start t)
+	;; Insert a blank line if it is peeled off.
+	(insert "\n")))
     (goto-char start)
     (while functions
       (funcall (pop functions)))
@@ -2373,10 +2377,13 @@
 		(and news
 		     (or (message-fetch-field "cc")
 			 (message-fetch-field "to"))
-		     (string= "text/plain"
-			      (car
-			       (mail-header-parse-content-type
-				(message-fetch-field "content-type"))))))
+		     (let ((content-type (message-fetch-field "content-type")))
+		       (or
+			(not content-type)
+			(string= "text/plain"
+				 (car
+				  (mail-header-parse-content-type
+				   content-type)))))))
 	    (message-insert-courtesy-copy))
 	  (if (or (not message-send-mail-partially-limit)
 		  (< (point-max) message-send-mail-partially-limit)
@@ -4208,24 +4215,18 @@
 	      (insert-buffer-substring cur)
 	    (mml-insert-buffer cur))
 	(if message-forward-show-mml
-	    (let ((target (current-buffer)) tmp)
-	      (with-temp-buffer
-		(mm-disable-multibyte) ;; Must copy buffer in unibyte mode
-		(setq tmp (current-buffer))
-		(set-buffer cur)
-		(mm-with-unibyte-current-buffer
-		  (set-buffer tmp)
-		  (insert-buffer-substring cur)
-		  (set-buffer cur))
-		(set-buffer tmp)
-		(mm-enable-multibyte)
-		(mime-to-mml)
-		(goto-char (point-min))
-		(when (looking-at "From ")
-		  (replace-match "X-From-Line: "))
-		(set-buffer target)
-		(insert-buffer-substring tmp)
-		(set-buffer tmp)))
+	    (insert
+	     (with-temp-buffer
+	       (mm-disable-multibyte-mule4) ;; Must copy buffer in unibyte mode
+	       (insert
+		(with-current-buffer cur
+		  (mm-string-as-unibyte (buffer-string))))
+	       (mm-enable-multibyte-mule4)
+	       (mime-to-mml)
+	       (goto-char (point-min))
+	       (when (looking-at "From ")
+		 (replace-match "X-From-Line: "))
+	       (buffer-string)))
 	  (save-restriction
 	    (narrow-to-region (point) (point))
 	    (mml-insert-buffer cur)