From d66bf782049a0ce8eb2e65e329c3502b0c71e9bf Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Sat, 5 Apr 2003 14:01:56 +0000
Subject: [PATCH] Synch to Oort Gnus 200304050540.

---
 lisp/ChangeLog     |   23 +++++++++++++++++++++++
 lisp/gnus-audio.el |    4 ++--
 lisp/gnus-start.el |    7 ++++++-
 lisp/gnus-sum.el   |    4 +++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acc77df..f5c742c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2003-04-05  Steve Youngs  <youngs@xemacs.org>
+
+	* gnus-sum.el: XEmacs doesn't support the 5th arg to 'load', so
+	don't use it when loading gnus-sum.el if we're in XEmacs.
+
+2003-04-05  Kevin Greiner <kgreiner@xpediantsolutions.com>
+
+	* gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound
+	print-escape-nonascii to fix more characters in compiled format
+	specs.
+
+2003-04-05  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player):
+	Fix customization type.
+
+2003-04-04  Kevin Greiner <kgreiner@xpediantsolutions.com>
+
+	* gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound
+	print-quoted, print-readably, print-escape-multibyte, and
+	print-level to match original behavior of gnus-prin1.  This should
+	repair the format of .newsrc.eld when using compiled format specs.
+
 2003-04-04  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-group.el (tool-bar-map): defvar it.
diff --git a/lisp/gnus-audio.el b/lisp/gnus-audio.el
index 0ae9b3c..62a6b86 100644
--- a/lisp/gnus-audio.el
+++ b/lisp/gnus-audio.el
@@ -52,12 +52,12 @@
 (defcustom gnus-audio-au-player (exec-installed-p "play")
   "Executable program for playing sun AU format sound files."
   :group 'gnus-audio
-  :type 'string)
+  :type '(choice file (const nil)))
 
 (defcustom gnus-audio-wav-player (exec-installed-p "play")
   "Executable program for playing WAV files."
   :group 'gnus-audio
-  :type 'string)
+  :type '(choice file (const nil)))
 
 ;;; The following isn't implemented yet.  Wait for Millennium Gnus.
 ;;(defvar gnus-audio-effects-enabled t
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 32baacb..524be2e 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2725,7 +2725,12 @@ If FORCE is non-nil, the .newsrc file is read."
     (princ "(setq gnus-newsrc-file-version ")
     (princ (gnus-prin1-to-string gnus-version))
     (princ ")\n")
-    (let* ((print-length nil)
+    (let* ((print-quoted t)
+           (print-readably t)
+           (print-escape-multibyte nil)
+           (print-escape-nonascii t)
+           (print-length nil)
+           (print-level nil)
            (print-escape-newlines t)
 	   (gnus-killed-list
 	    (if (and gnus-save-killed-list
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index d21181d..51087ab 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1451,7 +1451,9 @@ buffers. For example:
     ;; source file.
     (if (boundp 'gnus-newsgroup-variables)
         nil
-      (load "gnus-sum.el" t t t t))
+      (if (featurep 'xemacs)
+	  (load "gnus-sum.el" t t t)
+	(load "gnus-sum.el" t t t t)))
     (require 'gnus)
     (require 'gnus-agent)
     (require 'gnus-art)))
-- 
1.7.10.4