From: yamaoka <yamaoka>
Date: Thu, 10 Jun 2004 22:00:57 +0000 (+0000)
Subject: Synch to No Gnus 200406101736.
X-Git-Tag: t-gnus-6_17_4-quimby-~866
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9659b855b163a000478a344ac13aaca8b62297e0;p=elisp%2Fgnus.git-

Synch to No Gnus 200406101736.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a0a777..32213b1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* rfc2047.el (rfc2047-encode-message-header): Disabled header
+	folding -- not all headers can be folded, and this should be done
+	by the message composition mode.  Probably.  I think. 
+
 2004-06-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-util.el (gnus-remove-text-with-property): Make it slightly
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 43c57fb..f8295ac 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -169,14 +169,15 @@ Should be called narrowed to the head of the message."
 		       (mm-charset-to-coding-system
 			(car message-posting-charset))))
 		;; No encoding necessary, but folding is nice
-		(rfc2047-fold-region
-		 (save-excursion
-		   (goto-char (point-min))
-		   (skip-chars-forward "^:")
-		   (when (looking-at ": ")
-		     (forward-char 2))
-		   (point))
-		 (point-max)))
+		(when nil
+		  (rfc2047-fold-region
+		   (save-excursion
+		     (goto-char (point-min))
+		     (skip-chars-forward "^:")
+		     (when (looking-at ": ")
+		       (forward-char 2))
+		     (point))
+		   (point-max))))
 	    ;; We found something that may perhaps be encoded.
 	    (setq method nil
 		  alist rfc2047-header-encoding-alist)
@@ -611,9 +612,9 @@ By default, the region is treated as containing addresses (see
 	(goto-char (or break qword-break))
 	(setq break nil
 	      qword-break nil)
-	(if (looking-at "[ \t]")
-	    (insert ?\n)
-	  (insert "\n "))
+	  (if (looking-at "[ \t]")
+	      (insert ?\n)
+	    (insert "\n "))
 	(setq bol (1- (point)))
 	;; Don't break before the first non-LWSP characters.
 	(skip-chars-forward " \t")