From: yamaoka <yamaoka>
Date: Mon, 17 May 2004 12:41:55 +0000 (+0000)
Subject: Synch to No Gnus 200405171235.
X-Git-Tag: t-gnus-6_17_4-quimby-~927
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa210c81cd3c6f6e6b20ae765e791b7b200fb002;p=elisp%2Fgnus.git-

Synch to No Gnus 200405171235.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fca9099..3836235 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* imap.el (imap-authenticators): Comment out sasl.
+
 	* message.el (message-skip-to-next-address): New function.
 	(message-fill-header-address): Refactor.
 	(message-fill-address): Use it.
@@ -7,6 +9,10 @@
 	(message-fill-header-general): Refactor.
 	(message-fill-field-address): Rename.
 	(message-narrow-to-field): Find the start of the header. 
+	(message-header-format-alist): Don't pre-fill.
+	(message-fill-header): Removed.
+	(message-insert-header): New function.
+	(message-shorten-references): Use it.
 
 	* rfc2047.el (rfc2047-field-value): Strip props.
 
diff --git a/lisp/imap.el b/lisp/imap.el
index a6bf517..135c0c0 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -296,7 +296,7 @@ stream.")
 			      kerberos4
 			      digest-md5
 			      cram-md5
-			      sasl
+			      ;;sasl
 			      login
 			      anonymous)
   "Priority of authenticators to consider when authenticating to server.")
diff --git a/lisp/message.el b/lisp/message.el
index 1b9ea30..2ee96bd 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1688,15 +1688,15 @@ no, only reply back to the author."
   "A regexp that matches the separator before the text of a failed message.")
 
 (defvar message-field-fillers
-  '((To message-fill-address)
-    (Cc message-fill-address)
-    (From message-fill-address))
+  '((To message-fill-field-address)
+    (Cc message-fill-field-address)
+    (From message-fill-field-address))
   "Alist of header names/filler functions.")
 
 (defvar message-header-format-alist
   `((Newsgroups)
-    (To . message-fill-address)
-    (Cc . message-fill-address)
+    (To)
+    (Cc)
     (Subject)
     (In-Reply-To)
     (Fcc)
@@ -5626,6 +5626,7 @@ Headers already prepared in the buffer are not modified."
 		      (if formatter
 			  (funcall formatter header value)
 			(insert header-string ": " value))
+		      (message-fill-field)
 		      ;; We check whether the value was ended by a
 		      ;; newline.  If now, we insert one.
 		      (unless (bolp)
@@ -5639,8 +5640,7 @@ Headers already prepared in the buffer are not modified."
 		(unless optionalp
 		  (push header-string message-inserted-headers)
 		  (insert value)
-		  (when (bolp)
-		    (delete-char -1))))
+		  (message-fill-field)))
 	      ;; Add the deletable property to the headers that require it.
 	      (and (memq header message-deletable-headers)
 		   (progn (beginning-of-line) (looking-at "[^:]+: "))
@@ -5736,12 +5736,10 @@ If the current line has `message-yank-prefix', insert it on the new line."
     (error
      (split-line))))
 
-(defun message-fill-header (header value)
+(defun message-insert-header (header value)
   (insert (capitalize (symbol-name header))
 	  ": "
-	  (if (consp value) (car value) value)
-	  "\n")
-  (message-fill-field))
+	  (if (consp value) (car value) value)))
 
 (defun message-field-name ()
   (save-excursion
@@ -5832,12 +5830,13 @@ they are."
     (when message-this-is-news
       (while (< 998
 		(with-temp-buffer
-		  (message-fill-header header (mapconcat #'identity refs " "))
+		  (message-insert-header
+		   header (mapconcat #'identity refs " "))
 		  (buffer-size)))
 	(message-shorten-1 refs cut 1)))
     ;; Finally, collect the references back into a string and insert
     ;; it into the buffer.
-    (message-fill-header header (mapconcat #'identity refs " "))))
+    (message-insert-header header (mapconcat #'identity refs " "))))
 
 (defun message-position-point ()
   "Move point to where the user probably wants to find it."