From 95c6d880f8cb702cd96a3966cd958c6b46dfa6a0 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 28 Feb 2003 15:19:45 +0000
Subject: [PATCH] Synch to Oort Gnus.

---
 lisp/ChangeLog    |    5 +++++
 lisp/nnfolder.el  |    6 +++---
 texi/ChangeLog    |    4 ++++
 texi/gnus-ja.texi |   11 ++++-------
 texi/gnus.texi    |   13 +++++--------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 137148f..299abd6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-28  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnfolder.el (nnfolder-request-accept-article): Don't use
+	mail-header-unfold-field.
+
 2003-02-27  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* imap.el (imap-ssl-open): Don't depend on ssl.el.
diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 251c6c7..eb3a75d 100644
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -512,9 +512,9 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
 	  result art-group)
       (goto-char (point-min))
       (when (looking-at "X-From-Line: ")
-	(save-match-data
-	  (mail-header-unfold-field))
-	(replace-match "From "))
+	(replace-match "From ")
+	(while (progn (forward-line) (looking-at "[ \t]"))
+	  (delete-char -1)))
       (with-temp-buffer
 	(let ((nnmail-file-coding-system nnfolder-active-file-coding-system)
 	      (nntp-server-buffer (current-buffer)))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 92f9b75..0d570ed 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-27  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus.texi: Remove the dependence on ssl.el.
+
 2003-02-26  Jesper Harder  <harder@ifa.au.dk>
 
 	* message.texi (Mail Variables): Add
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 07926a9..c697dd0 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -11777,10 +11777,8 @@ LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
 @dfn{$B0BA4$J(B} $B%A%c%s%M%k$r;H$C$F%5!<%P!<$K@\B3$7$^$9!#$3$l$r;H$&$?$a$K$O!"(B
-OpenSSL (@uref{http://www.openssl.org}) $B$+(B SSLeay
-(@uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL} $B$H(B @file{ssl.el} ($BNc$((B
-$B$P(B W3 $B$NG[I[$+$i(B) $B$,I,MW(B) $B$,%$%s%9%H!<%k$5$l$F$$$J$1$l$P$J$j$^$;$s!#$=$l(B
-$B$+$i%5!<%P!<$r<!$N$h$&$KDj5A$7$^$9(B:
+OpenSSL (@uref{http://www.openssl.org}) $B$+(B SSLeay $B$,%$%s%9%H!<%k$5$l$F$$(B
+$B$J$1$l$P$J$j$^$;$s!#$=$l$+$i%5!<%P!<$r<!$N$h$&$KDj5A$7$^$9(B:
 
 @lisp
 ;; $BJT=8$7=*$o$C$?$i(B `C-c C-c' $B$r%?%$%W$7$F2<$5$$!#(B
@@ -14864,7 +14862,7 @@ Gnus $B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K(B url $B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<
 $B%j(B @samp{starttls.el} $B$H(B @samp{starttls} $B%W%m%0%i%`$,I,MW$G$9!#(B
 @item
 @dfn{ssl:} SSL $B$r;H$$$^$9!#(BOpenSSL (@samp{openssl} $B%W%m%0%i%`(B) $B$+(B SSLeay
-(@samp{s_client}) $B$H30It%i%$%V%i%j(B @samp{ssl.el} $B$,I,MW$G$9!#(B
+(@samp{s_client}) $B$,I,MW$G$9!#(B
 @item
 @dfn{shell:} $B%7%'%kL?Na$r;H$C$F(B @sc{imap} $B@\B3$r3+;O$7$^$9!#(B
 @item
@@ -14889,8 +14887,7 @@ SSL $B@\B3$N$?$a$N(B OpenSSL $B%W%m%0%i%`$O(B @uref{http://www.openssl.org/}
 nnimap $B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"(BSSLeay $B$N:G?7HG$G$"$k(B 0.9.x $B$K$O(B
 $B=EBg$J%P%0$,$"$k$?$a;H$($^$;$s!#0JA0$NHG!"FC$K(B SSLeay 0.8.x $B$O;H$($k$3$H(B
 $B$,$o$+$C$F$$$^$9!#JQ?t(B @code{imap-ssl-program} $B$O(B OpenSSL/SSLeay $B$KEO$9(B
-$B%Q%?%a!<%?$r4^$_$^$9!#2C$($F(B @samp{ssl.el}  ($BNc$($P(B W3 $B$K4^$^$l$F$$$k$b(B
-$B$N(B) $B$,I,MW$G$9!#(B
+$B%Q%?%a!<%?$r4^$_$^$9!#(B
 
 @vindex imap-shell-program
 @vindex imap-shell-host
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 2a459d8..c4f9810 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12360,10 +12360,9 @@ remote system.
 
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
-Opens a connection to a server over a @dfn{secure} channel.  To use
-this you must have OpenSSL (@uref{http://www.openssl.org}) or SSLeay
-installed (@uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL}, and you also
-need @file{ssl.el} (from the W3 distribution, for instance).  You then
+Opens a connection to a server over a @dfn{secure} channel.  To use this
+you must have OpenSSL (@uref{http://www.openssl.org}) or SSLeay
+installed (@uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL}.  You then
 define a server as follows:
 
 @lisp
@@ -15315,8 +15314,7 @@ SSL).  Requires the external library @samp{starttls.el} and program
 @samp{starttls}.
 @item
 @dfn{ssl:} Connect through SSL.  Requires OpenSSL (the program
-@samp{openssl}) or SSLeay (@samp{s_client}) as well as the external
-library @samp{ssl.el}.
+@samp{openssl}) or SSLeay (@samp{s_client}).
 @item
 @dfn{shell:} Use a shell command to start @sc{imap} connection.
 @item
@@ -15341,8 +15339,7 @@ and nnimap support it too - although the most recent versions of
 SSLeay, 0.9.x, are known to have serious bugs making it
 useless. Earlier versions, especially 0.8.x, of SSLeay are known to
 work. The variable @code{imap-ssl-program} contain parameters to pass
-to OpenSSL/SSLeay.  You also need @samp{ssl.el} (from the W3
-distribution, for instance).
+to OpenSSL/SSLeay.
 
 @vindex imap-shell-program
 @vindex imap-shell-host
-- 
1.7.10.4