Revision: emacs@sv.gnu.org/gnus--devo--0--patch-74

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 50-51)

   - Update from CVS

2006-03-03  Reiner Steib  <Reiner.Steib@gmx.de>

   * xemacs.mak: Remove outdated file. Use make.bat instead.

2006-03-03  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/mm-util.el (mm-with-unibyte-current-buffer): Change "Emacs 23"
   to "Emacs 23 (unicode)" in doc string.

   * lisp/gnus-sum.el (gnus-summary-set-display-table): Change "Emacs 23" to
   "Emacs 23 (unicode)" in comment.

2006-03-03  Reiner Steib  <Reiner.Steib@gmx.de>

   * texi/xemacs.mak: Remove outdated file. Use make.bat instead.

   * texi/gnus.texi (Oort Gnus): Add `mm-fill-flowed'.

diff --git a/ChangeLog b/ChangeLog
index b89642d..fdefb7b 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 bc5bd47..412f936 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 876614e..a2fea77 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3298,7 +3298,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 46c1773..802ad86 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -899,7 +899,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 4249f31..d8a271c 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.texi b/texi/gnus.texi
index f94e6b4..5108465 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -26995,6 +26995,11 @@ composing messages, it is enabled by @code{use-hard-newlines}.
 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.
 

diff --git a/texi/xemacs.mak b/texi/xemacs.mak
deleted file mode 100644 (file)
index 2d06450..0000000
--- a/texi/xemacs.mak
+++ /dev/null
@@ -1,57 +0,0 @@
-############################################################################
-# Subsidiary makefile to install Gnus under Windows NT using nmake.
-# Adrian Aichner, aichner@ecf.teradyne.com, Teradyne GmbH, 1999-07-14.
-############################################################################
-# Do not change anything below this line.
-# No spaces are allowed due to inference rule limitation:
-MAKEINFO="$(XEMACS)" $(FLAGS) -l texinfmt -f batch-texinfo-format
-
-!if "$(XEMACS)" == ""
-!message Please use $(MAKEDIR)\..\xemacs.mak instead.
-!error
-!endif
-
-!if ["$(XEMACS)" $(FLAGS) -eval \
-"(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"]
-!message Install `texinfo' in XEmacs from Options->Manage Packages->List & Install.
-!message Without it Gnus info documentation cannot be built by XEmacs!
-!error Cannot build `info' without `texinfo'.
-!endif
-
-all: gnus message emacs-mime
-
-gnus: gnus.texi
-       $(MAKEINFO) "$**"
-
-message: message.texi
-       $(MAKEINFO) "$**"
-
-emacs-mime: emacs-mime.texi
-       $(MAKEINFO) "$**"
-
-clean:
-       del gnus.*.bak *.ky *.cp *.fn *.cps *.kys *.log *.aux *.dvi *.vr \
-       *.tp *.toc *.pg gnus.latexi *.aux *.[cgk]idx \
-       gnus.ilg gnus.ind gnus.[cgk]ind gnus.idx \
-       gnus.tmptexi *.tmplatexi gnus.tmplatexi1 texput.log *.orig *.rej \
-       gnus.latexi*~* xface.tex picons.tex smiley.tex *.latexi
-
-makeinfo: all
-
-veryclean:
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) clean
-       del /f gnus.dvi gnus.ps texi2latex.elc
-
-distclean:
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) clean
-       del /f *.orig *.rej *.elc *~ gnus gnus-?? Makefile
-       del /f message
-       del /f emacs-mime
-
-install: all
-       -mkdir "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\dir" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\gnus" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\gnus-??" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\message" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\emacs-mime" "$(INFODIR)"

diff --git a/xemacs.mak b/xemacs.mak
deleted file mode 100644 (file)
index 495ce7f..0000000
--- a/xemacs.mak
+++ /dev/null
@@ -1,143 +0,0 @@
-############################################################################
-# Makefile to install Gnus under Windows NT using nmake.
-# Adrian Aichner, aichner@ecf.teradyne.com, Teradyne GmbH, 1999-07-14.
-#
-# Please specify path to the Gnus sources here, if $(MAKEDIR) is
-# inappropriate:
-#
-GNUSDIR=$(MAKEDIR)
-#
-# Please specify the path where you want Gnus installed:
-#
-# INSTALLDIR=c:\XEmacs\site-packages\pgnus-0.98
-#
-# Please specify the path to the XEmacs executable here:
-#
-# XEMACS=c:\XEmacs\XEmacs-21.1.8\i386-pc-win32\xemacs.exe
-#
-# Specify wheter you want to use XEmacs mail-lib package with UIDL support.
-#
-USE_XEMACS_MAIL_LIB=0
-#
-############################################################################
-# Do not change anything below this line.
-MANDIR=$(GNUSDIR)\texi
-LISPDIR=$(GNUSDIR)\lisp
-INFODIR=$(INSTALLDIR)\info
-FLAGS=-batch -q -no-site-file
-VARDEFS=XEMACS="$(XEMACS)" INFODIR="$(INFODIR)" MANDIR="$(MANDIR)" FLAGS="$(FLAGS)"
-
-!if !exist("$(XEMACS)")
-!error Please set XEMACS to point to XEmacs executable, "$(XEMACS)" does not exist.
-!endif
-
-!if "$(INSTALLDIR)" == ""
-!error Please specify INSTALLDIR.
-!endif
-
-all: lick info
-
-lick:
-#      protect paths containing whitespace
-       cd "$(LISPDIR)"
-!if $(USE_XEMACS_MAIL_LIB) != 0
-!if exist("$(LISPDIR)\pop3.el")
-       rename pop3.el pop3-not-used.el
-!endif
-!if exist("$(LISPDIR)\pop3.elc")
-       rename pop3.elc pop3-not-used.elc
-!endif
-       @echo Gnus pop3.el not used, verify you have XEmacs mail-lib package.
-!else
-       @echo Consider using XEmacs mail-lib package by setting USE_XEMACS_MAIL_LIB.
-!endif
-       "$(XEMACS)" $(FLAGS) -l ./dgnushack.el -f dgnushack-compile
-
-install-without-info: lick
-       -rmdir /s /q "$(INSTALLDIR)"
-       xcopy /i "$(LISPDIR)\*.el" "$(INSTALLDIR)\lisp"
-       xcopy /i "$(LISPDIR)\*.elc" "$(INSTALLDIR)\lisp"
-       xcopy /i /s "$(GNUSDIR)\etc" "$(INSTALLDIR)\etc"
-
-install: install-without-info info
-       cd "$(MANDIR)"
-#      protect paths containing whitespace
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) install
-
-info:
-#      protect paths containing whitespace
-       cd "$(MANDIR)"
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) all
-
-clean:
-       del *.orig *.rej
-
-elclean:
-       del "$(LISPDIR)\*.elc"
-
-distclean:
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) clean
-       del *~
-#      protect paths containing whitespace
-       cd "$(LISPDIR)"
-       del "*.orig" "*.rej" "*.elc" "*~"
-#      protect paths containing whitespace
-       cd "$(MANDIR)"
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) distclean
-############################################################################
-# Subsidiary makefile to install Gnus under Windows NT using nmake.
-# Adrian Aichner, aichner@ecf.teradyne.com, Teradyne GmbH, 1999-07-14.
-############################################################################
-# Do not change anything below this line.
-# No spaces are allowed due to inference rule limitation:
-MAKEINFO="$(XEMACS)" $(FLAGS) -l texinfmt -f batch-texinfo-format
-
-!if "$(XEMACS)" == ""
-!message Please use $(MAKEDIR)\..\xemacs.mak instead.
-!error
-!endif
-
-!if ["$(XEMACS)" $(FLAGS) -eval \
-"(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"]
-!message Install `texinfo' in XEmacs from Options->Manage Packages->List & Install.
-!message Without it Gnus info documentation cannot be built by XEmacs!
-!error Cannot build `info' without `texinfo'.
-!endif
-
-all: gnus message emacs-mime
-
-gnus: gnus.texi
-       $(MAKEINFO) "$**"
-
-message: message.texi
-       $(MAKEINFO) "$**"
-
-emacs-mime: emacs-mime.texi
-       $(MAKEINFO) "$**"
-
-clean:
-       del gnus.*.bak *.ky *.cp *.fn *.cps *.kys *.log *.aux *.dvi *.vr \
-       *.tp *.toc *.pg gnus.latexi *.aux *.[cgk]idx \
-       gnus.ilg gnus.ind gnus.[cgk]ind gnus.idx \
-       gnus.tmptexi *.tmplatexi gnus.tmplatexi1 texput.log *.orig *.rej \
-       gnus.latexi*~* xface.tex picons.tex smiley.tex *.latexi
-
-makeinfo: all
-
-veryclean:
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) clean
-       del /f gnus.dvi gnus.ps texi2latex.elc
-
-distclean:
-       $(MAKE) /$(MAKEFLAGS) /f xemacs.mak $(VARDEFS) clean
-       del /f *.orig *.rej *.elc *~ gnus gnus-?? Makefile
-       del /f message
-       del /f emacs-mime
-
-install: all
-       -mkdir "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\dir" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\gnus" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\gnus-??" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\message" "$(INFODIR)"
-       xcopy /i /s "$(MANDIR)\emacs-mime" "$(INFODIR)"