Synch to No Gnus 200603061028.

diff --git a/ChangeLog b/ChangeLog
index db6b0fc..c64385d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
        * etc/images/mail/save.xpm, etc/images/mail/preview.xpm: Rename
        char*.
 
+2006-03-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * xemacs.mak: Remove outdated file.  Use make.bat instead.
+
 2006-03-02  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * make.bat: Add note about "Out of environment space" on Windows

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3d7db8..14a3491 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -16,6 +16,14 @@
        * gnus-sum.el (gnus-summary-tool-bar-gnome): Check if spam.el is
        loaded.
 
+2006-03-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mm-util.el (mm-with-unibyte-current-buffer): Change "Emacs 23"
+       to "Emacs 23 (unicode)" in doc string.
+
+       * gnus-sum.el (gnus-summary-set-display-table): Change "Emacs 23" to
+       "Emacs 23 (unicode)" in comment.
+
 2006-03-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-decode.el (mm-get-part): Don't use

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index a9b445c..f321ed5 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3281,7 +3281,7 @@ display only a single character."
     ;; We keep TAB as well.
     (aset table ?\t nil)
     ;; We nix out any glyphs 127 through 255, or 127 through 159 in
-    ;; Emacs 23, that are not set already.
+    ;; Emacs 23 (unicode), that are not set already.
     (let ((i (if (ignore-errors (= (make-char 'latin-iso8859-1 160) 160))
                 160
               256)))

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 7189ea6..3eb4d41 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -902,7 +902,8 @@ NOTE: Use this macro with caution in multibyte buffers (it is not
 worth using this macro in unibyte buffers of course).  Use of
 `(set-buffer-multibyte t)', which is run finally, is generally
 harmful since it is likely to modify existing data in the buffer.
-For instance, it converts \"\\300\\255\" into \"\\255\" in Emacs 23."
+For instance, it converts \"\\300\\255\" into \"\\255\" in
+Emacs 23 (unicode)."
   (let ((multibyte (make-symbol "multibyte"))
        (buffer (make-symbol "buffer")))
     `(if mm-emacs-mule

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 9cd9e1f..511275b 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * xemacs.mak: Remove outdated file.  Use make.bat instead.
+
+       * gnus.texi (Oort Gnus): Add `mm-fill-flowed'.
+
 2006-02-09  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.texi (Mail Spool): nnml-use-compressed-files can be a

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 72bac78..883b3ab 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -26420,6 +26420,12 @@ format=flowed \e$B$N%G%3!<%I$O0JA0$+$i$G$-$^$7$?$,!"=i4|$NHG$G$O@bL@$NJ8=q$,\e(B
 \e$B$"$j$^$;$s$G$7$?!#\e(B
 
 @item
+@code{mm-fill-flowed} \e$B%*%W%7%g%s$G!H\e(Bformat=flowed\e$B!I%a%C%;!<%8$rN.F0%F%-%9\e(B
+\e$B%H$H$7$F=hM}$9$k$3$H$r$d$a$5$;$k$3$H$,$G$-$^$9!#$^$?!"\e(BPGP \e$B=pL>$,Kd$a9~$^\e(B
+\e$B$l$?%a%C%;!<%8$rAw?.$9$k$H$-!"N.F0%F%-%9%H$N=hM}$O9T$J$o$l$^$;$s!#\e(B(Gnus
+5.10.7 \e$B$N?75!G=\e(B)
+
+@item
 Gnus \e$B$O\e(B RFC 2298 \e$B$N3+Iu3NG'MW5a$N@8@.$r%5%]!<%H$7$^$9!#\e(B
 
 \e$B$3$l$O%a%C%;!<%8%b!<%I$N\e(B @kbd{C-c M-n} \e$B%-!<$G8F$S=P$5$l$^$9!#\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 774056c..776585c 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -27000,6 +27000,11 @@ Decoding format=flowed was present but not documented in earlier
 versions.
 
 @item
+The option @code{mm-fill-flowed} can be used to disable treatment of
+``format=flowed'' messages.  Also, flowed text is disabled when sending
+inline PGP signed messages.  (New in Gnus 5.10.7)
+
+@item
 Gnus supports the generation of RFC 2298 Disposition Notification requests.
 
 This is invoked with the @kbd{C-c M-n} key binding from message mode.