Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3e537f..ccb1105 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-02  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-art.el (article-unsplit-urls): Keep URL buttonized after
+       unsplitting.  From Niklas Morberg <niklas.morberg@axis.com>.
+
 2002-07-01  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-msg.el (gnus-summary-resend-default-address): New user option.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 94849bb..ddb9ea4 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2297,7 +2297,10 @@ If READ-CHARSET, ask for a coding system."
       (goto-char (point-min))
       (while (re-search-forward
              "^\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
-       (replace-match "\\1\\3" t)))))
+       (replace-match "\\1\\3" t)))
+    (when gnus-display-mime-function
+      (funcall gnus-display-mime-function))))
+
 
 (defun article-wash-html (&optional read-charset)
   "Format an html article.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b87786f..c710173 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-02  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus.texi (Washing Mail): Document the shortcoming of
+       nnmail-remove-leading-whitespace.
+
 2002-06-30  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.texi (News Headers): Include example for removing an

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 1e1fb65..e1d8e19 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -13058,6 +13058,11 @@ Gnus \e$B$O5-;v$rI=<($9$k$H$-$K$=$l$r@vBu$9$k$?$a$K2aEY$N4X?t$rDs6!$7$F$$$^\e(B
 \e$B%X%C%@!<$K$=$l$,NI$/8+$($k$h$&$K\e(B ``\e$BM-MQ$J\e(B'' \e$B%j%9%H%5!<%P!<$,A0$NJ}$KIU$1\e(B
 \e$B2C$($?6uGr$rL5$/$7$^$9!#$"$!$!!#\e(B
 
+(\e$B$3$N4X?t$O$9$Y$F$N%a%C%;!<%8$N%\%G%#Cf$K$"$k%X%C%@!<\e(B (\e$B%\%G%#Cf$N%a%C%;!<\e(B
+\e$B%8$,;}$C$F$$$k%X%C%@!<9T$N$h$&$J$b$N\e(B) \e$B$KBP$7$F$bF0:n$9$k$N$G!";HMQ$K:]$7\e(B
+\e$B$F$O@x:_E*$J4m81$rUT$s$G$$$^$9!#$7$?$,$C$F%P%0$r=$@5$9$k$h$j$O!"J8=q$GFC\e(B
+\e$BD'$r<($9$N$,!"$b$A$m$s@5$7$$2r7h$NF;$G$9!#\e(B)
+
 @item nnmail-remove-list-identifiers
 @findex nnmail-remove-list-identifiers
 \e$B$$$/$D$+$N%j%9%H%5!<%P!<$OF10l<1JL;R$rIU$12C$($^$9\e(B---\e$BNc$($P!"\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 9ab44b7..380c50d 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -13647,6 +13647,12 @@ cleaning up the headers.  Functions that can be used include:
 Clear leading white space that ``helpful'' listservs have added to the
 headers to make them look nice.  Aaah.
 
+(Note that this function works on both the header on the body of all
+messages, so it is a potentially dangerous function to use (if a body
+of a message contains something that looks like a header line).  So
+rather than fix the bug, it is of course the right solution to make it
+into a feature by documenting it.)
+
 @item nnmail-remove-list-identifiers
 @findex nnmail-remove-list-identifiers
 Some list servers add an identifier---for example, @samp{(idm)}---to the