Synch to Oort Gnus 200304221823.

diff --git a/ChangeLog b/ChangeLog
index 02b4172..df0b1d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-22  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * make.bat: Flag as binary to ensure DOS line terminators.  Delete
+       trailing whitespace.
+
 2003-04-21  Reiner Steib  <Reiner.Steib@gmx.de>
        From Frank Schmitt  <ich@frank-schmitt.net>
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a413d0b..989e4e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-22  Paul Jarc  <prj@po.cwru.edu>
+
+       * gnus-util.el (gnus-merge): Added "type" argument to match CL
+       merge and gnus-sum.el's expectations.
+
 2003-04-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-art.el (gnus-button-url-regexp): Added nntp.
@@ -64,8 +69,8 @@
 
        * nnmail.el (nnmail-split-fancy-with-parent): docstring fix
 
-       * gnus-registry.el (gnus-registry-clear) 
-       (gnus-registry-fetch-group, gnus-registry-grep-in-list) 
+       * gnus-registry.el (gnus-registry-clear)
+       (gnus-registry-fetch-group, gnus-registry-grep-in-list)
        (gnus-registry-split-fancy-with-parent): new functions
        (gnus-register-spool-action, gnus-register-action): simplified the format
        (gnus-registry): new customization group
@@ -86,7 +91,7 @@
 
 2003-04-17  Mike Woolley  <mike@ariel.co.uk>
 
-       * gnus-sum.el (gnus-sum-thread-tree-false-root): New variable. 
+       * gnus-sum.el (gnus-sum-thread-tree-false-root): New variable.
 
 2003-04-15  Michael Shields  <shields@msrl.com>
 
@@ -117,9 +122,9 @@
 
 2003-04-16  Teodor Zlatanov  <tzz@lifelogs.com>
 
-       * gnus-registry.el (gnus-register-action) 
-       (gnus-register-spool-action, hashtable-to-alist) 
-       (gnus-registry-translate-from-alist, alist-to-hashtable) 
+       * gnus-registry.el (gnus-register-action)
+       (gnus-register-spool-action, hashtable-to-alist)
+       (gnus-registry-translate-from-alist, alist-to-hashtable)
        (gnus-registry-translate-to-alist, gnus-registry-headers-hashtb):
        new variables and function fixes
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 831f4b9..e7a8ee1 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1455,7 +1455,7 @@ sequence, this is like `mapcar'.  With several, it is like the Common Lisp
 (if (fboundp 'merge)
     (defalias 'gnus-merge 'merge)
   ;; Adapted from cl-seq.el
-  (defun gnus-merge (list1 list2 pred)
+  (defun gnus-merge (type list1 list2 pred)
     "Destructively merge lists LIST1 and LIST2 to produce a new list.
 Ordering of the elements is preserved according to PRED, a `less-than'
 predicate on the elements."

diff --git a/make.bat b/make.bat
index 1caa81a..ddd22a3 100755 (executable)
--- a/make.bat
+++ b/make.bat
@@ -1,285 +1,285 @@
-@echo off
-
-rem Written by Frank Schmitt <ich@frank-schmitt.net>
-rem based on the work by David Charlap (shamino@writeme.com)
-rem .
-rem Clear PWD so emacs doesn't get confused
-set GNUS_PWD_SAVE=%PWD%
-set PWD=
-set ERROR=:
-
-if "%1" == "" goto usage
-
-rem Emacs 20.7 no longer includes emacs.bat. Use emacs.exe if the batch file is
-rem not present -- this also fixes the problem about too many parameters on Win9x.
-if exist %1\emacs.bat goto ebat
-if exist %1\emacs.exe goto eexe
-if exist %1\xemacs.exe goto xemacs
-goto noemacs
-
-:ebat
-set EMACS=emacs.bat
-echo.
-echo ***************************************************************************
-echo * Using emacs.bat (If you've got en Emacs >= 20.3 please remove Emacs.bat, 
-echo * it isn't needed anymore.
-echo ***************************************************************************
-echo.
-goto emacs
-
-:eexe
-set EMACS=emacs.exe
-echo.
-echo ***************************************************************************
-echo * Using emacs.exe
-echo ***************************************************************************
-echo.
-goto emacs
-
-:emacs
-if not "%2" == "/copy" goto emacsnocopy
-if not exist %1\..\site-lisp mkdir %1\..\site-lisp
-if not exist %1\..\site-lisp\gnus mkdir %1\..\site-lisp\gnus
-if not exist %1\..\site-lisp\subdirs.el set subdirwarning=yes
-:emacsnocopy
-set EMACS_ARGS=-batch -q -no-site-file
-set GNUS_INFO_DIR=%1\..\info
-set GNUS_LISP_DIR=%1\..\site-lisp\gnus\lisp
-set GNUS_ETC_DIR=%1\..\site-lisp\gnus\etc
-goto lisp
-      
-:xemacs      
-set EMACS=xemacs.exe
-if not "%2" == "/copy" goto xemacsnocopy
-if not exist %1\..\..\site-packages\ mkdir %1\..\..\site-packages\
-if not exist %1\..\..\site-packages\info mkdir %1\..\..\site-packages\info
-if not exist %1\..\..\site-packages\lisp mkdir %1\..\..\site-packages\lisp
-if not exist %1\..\..\site-packages\etc mkdir %1\..\..\site-packages\etc
-:xemacsnocopy
-set EMACS_ARGS=-batch -no-autoloads
-set GNUS_INFO_DIR=%1\..\..\site-packages\info
-set GNUS_LISP_DIR=%1\..\..\site-packages\lisp\gnus
-set GNUS_ETC_DIR=%1\..\..\site-packages\etc
-echo.
-echo ***************************************************************************
-echo * Using xemacs.exe
-echo ***************************************************************************
-echo.
-goto lisp
-
-:lisp
-set EMACSBATCH=call %1\%EMACS% %EMACS_ARGS%
-cd lisp
-if exist gnus-load.el del gnus-load.el
-echo.
-echo Stand by while generating autoloads.
-echo.
-%EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-cus-load .
-if ErrorLevel 1 set ERROR=make-cus-load
-%EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-auto-load .
-if ErrorLevel 1 set ERROR=%ERROR%,make-auto-load
-%EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-load
-if ErrorLevel 1 set ERROR=%ERROR%,make-load
-echo.
-echo Stand by while compiling lisp files.
-echo.
-%EMACSBATCH% -l ./dgnushack.el -f dgnushack-compile
-if ErrorLevel 1 set ERROR=%ERROR%,compile
-
-if not "%2" == "/copy" goto infotest
-echo.
-echo Stand by while copying lisp files.
-echo.
-if not exist %GNUS_LISP_DIR% mkdir %GNUS_LISP_DIR%
-xcopy /R /Q /Y *.el* %GNUS_LISP_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-lisp
-goto infotest
-
-:infotest
-cd ..\texi
-if exist sieve del sieve
-makeinfo sieve.texi
-if exist sieve goto minfo 
-REM It seems that makeinfo isn't available
-set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
-echo.
-echo ***************************************************************************
-echo * Using infohack.el, if you've got makeinfo.exe put it in PATH.
-echo ***************************************************************************
-echo.
-goto info
-
-:minfo
-set EMACSINFO=makeinfo  
-echo.
-echo ***************************************************************************
-echo * Using makeinfo
-echo ***************************************************************************
-echo.
-goto info
-
-:info
-echo.
-echo Stand by while generating info files.
-echo.
-%EMACSINFO% emacs-mime.texi
-if ErrorLevel 1 set ERROR=%ERROR%,emacs-mime.texi
-%EMACSINFO% gnus.texi
-if ErrorLevel 1 set ERROR=%ERROR%,gnus.texi
-%EMACSINFO% sieve.texi
-if ErrorLevel 1 set ERROR=%ERROR%,sieve.texi
-%EMACSINFO% pgg.texi
-if ErrorLevel 1 set ERROR=%ERROR%,pgg.texi
-%EMACSINFO% message.texi
-if ErrorLevel 1 set ERROR=%ERROR%,message.texi
-
-if not "%2" == "/copy" goto nocopy
-if not exist %GNUS_INFO_DIR% mkdir %GNUS_INFO_DIR%
-
-echo.
-echo Stand by while copying info files.
-echo.
-xcopy /R /Q /Y gnus       %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-gnus-info
-xcopy /R /Q /Y gnus-?     %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-gnus-x-info
-xcopy /R /Q /Y gnus-??    %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-gnus-xx-info
-xcopy /R /Q /Y message    %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-message-info
-if exist message-1 xcopy /R /Q /Y message-?  %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-message-x-info
-xcopy /R /Q /Y emacs-mime %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-emacs-mime-info
-xcopy /R /Q /Y sieve      %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-sieve-info
-xcopy /R /Q /Y pgg        %GNUS_INFO_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-pgg-info
-
-echo.
-echo ***************************************************************************
-echo * You should add the following lines to 
-echo * %GNUS_INFO_DIR%\dir 
-echo * if they aren't already there:
-echo *
-echo * * PGG: (pgg).   Emacs interface to various PGP implementations.
-echo * * Sieve: (sieve).       Managing Sieve scripts in Emacs.
-echo ***************************************************************************
-echo.
-
-:etc
-cd ..\etc
-echo.
-echo Stand by while copying etc files.
-echo.
-if not exist %GNUS_ETC_DIR% mkdir %GNUS_ETC_DIR%
-xcopy /R /Q /Y gnus-tut.txt %GNUS_ETC_DIR%
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-tut-txt
-if not exist %GNUS_ETC_DIR%\gnus mkdir %GNUS_ETC_DIR%\gnus
-xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-*
-if not exist %GNUS_ETC_DIR%\smilies mkdir %GNUS_ETC_DIR%\smilies
-xcopy /R /Q /Y .\smilies\* %GNUS_ETC_DIR%\smilies\
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-smilies-*
-goto warnings
-
-:nocopy
-echo.
-echo ***************************************************************************
-echo * You chose not to copy the files, therefore you should add the 
-echo * following lines to the TOP of your [X]emacs customization file:
-echo *
-echo * (add-to-list 'load-path "/Path/to/gnus/lisp")
-echo * (if (featurep 'xemacs)
-echo *     (add-to-list 'Info-directory-list "c:/Path/to/gnus/texi/")
-echo *   (add-to-list 'Info-default-directory-list "c:/Path/to/gnus/texi/")
-echo * (require 'gnus-load)
-echo *
-echo * Replace c:/Path/to/gnus with the Path where your new Gnus is (that's here
-echo * and yes, you've got to use forward slashes).
-echo ***************************************************************************
-echo.
-
-:warnings
-if not "%subdirwarning%" == "yes" goto warngnusload
-echo.
-echo ***************************************************************************
-echo * There's no subdirs.el file in your site-lisp directory, you should
-echo * therefor add the following line to the TOP of your Emacs
-echo * customization file:
-echo *
-echo * (add-to-list 'load-path "/Path/to/emacs-site-lisp-directory/gnus/lisp")
-echo * (require 'gnus-load)
-echo * Yes, it must be forward slashes.
-echo ***************************************************************************
-echo.
-goto warnerrors
-
-:warngnusload
-echo.
-echo ***************************************************************************
-echo * You should add the following line to the TOP of your Emacs
-echo * customization file:
-echo *
-echo * (require 'gnus-load)
-echo ***************************************************************************
-echo.
-
-:warnerrors
-if "%ERROR%"==":" goto noerrors
-set errorlevel=1
-echo.
-echo ***************************************************************************
-echo * WARNING ERRORS OCCURRED!
-echo * You should look for error messages in the output of the called programs
-echo * and try to find out what exactly went wrong.
-echo * Errors occured in the following modules:
-echo * %ERROR%
-echo ***************************************************************************
-echo.
-goto done
-
-:noerrors
-set errorlevel=0
-
-:done
-cd ..
-goto end
-
-:noemacs
-echo.
-echo ***************************************************************************
-echo * Unable to find emacs.exe or xemacs.exe on the path you specified!
-echo * STOP!
-echo ***************************************************************************
-echo.
-goto usage
-
-:usage
-echo.
-echo ***************************************************************************
-echo * Usage: make.bat :[X]Emacs-exe-dir: [/copy]
-echo *
-echo * where: :[X]Emacs-exe-dir: is the directory your 
-echo *           emacs.exe respectively xemacs.exe resides in, 
-echo *           e.g. G:\Programme\XEmacs\XEmacs-21.4.11\i586-pc-win32\
-echo *           or G:\Emacs\bin
-echo *        /copy indicates that the compiled files should be copied to your
-echo *           emacs lisp, info, and etc site directories.
-echo *
-echo * Note: If you have Emacs/w3 you should set the environment variable 
-echo *       W3DIR to the directory where w3 is installed eg.
-echo *                set W3DIR=d:\lisp\w3-4.0pre46\lisp
-echo ***************************************************************************
-echo.
-
-:end
-rem Restore environment variables
-set PWD=%GNUS_PWD_SAVE%
-set GNUS_PWD_SAVE=
-set EMACSBATCH=
-set GNUS_LISP_DIR=
-set GNUS_INFO_DIR=
-set GNUS_ETC_DIR=
-set subdirwarning=
-set ERROR=
+@echo off\r
+\r
+rem Written by Frank Schmitt <ich@frank-schmitt.net>\r
+rem based on the work by David Charlap (shamino@writeme.com)\r
+rem .\r
+rem Clear PWD so emacs doesn't get confused\r
+set GNUS_PWD_SAVE=%PWD%\r
+set PWD=\r
+set ERROR=:\r
+\r
+if "%1" == "" goto usage\r
+\r
+rem Emacs 20.7 no longer includes emacs.bat. Use emacs.exe if the batch file is\r
+rem not present -- this also fixes the problem about too many parameters on Win9x.\r
+if exist %1\emacs.bat goto ebat\r
+if exist %1\emacs.exe goto eexe\r
+if exist %1\xemacs.exe goto xemacs\r
+goto noemacs\r
+\r
+:ebat\r
+set EMACS=emacs.bat\r
+echo.\r
+echo ***************************************************************************\r
+echo * Using emacs.bat (If you've got en Emacs >= 20.3 please remove Emacs.bat,\r
+echo * it isn't needed anymore.\r
+echo ***************************************************************************\r
+echo.\r
+goto emacs\r
+\r
+:eexe\r
+set EMACS=emacs.exe\r
+echo.\r
+echo ***************************************************************************\r
+echo * Using emacs.exe\r
+echo ***************************************************************************\r
+echo.\r
+goto emacs\r
+\r
+:emacs\r
+if not "%2" == "/copy" goto emacsnocopy\r
+if not exist %1\..\site-lisp mkdir %1\..\site-lisp\r
+if not exist %1\..\site-lisp\gnus mkdir %1\..\site-lisp\gnus\r
+if not exist %1\..\site-lisp\subdirs.el set subdirwarning=yes\r
+:emacsnocopy\r
+set EMACS_ARGS=-batch -q -no-site-file\r
+set GNUS_INFO_DIR=%1\..\info\r
+set GNUS_LISP_DIR=%1\..\site-lisp\gnus\lisp\r
+set GNUS_ETC_DIR=%1\..\site-lisp\gnus\etc\r
+goto lisp\r
+\r
+:xemacs\r
+set EMACS=xemacs.exe\r
+if not "%2" == "/copy" goto xemacsnocopy\r
+if not exist %1\..\..\site-packages\ mkdir %1\..\..\site-packages\\r
+if not exist %1\..\..\site-packages\info mkdir %1\..\..\site-packages\info\r
+if not exist %1\..\..\site-packages\lisp mkdir %1\..\..\site-packages\lisp\r
+if not exist %1\..\..\site-packages\etc mkdir %1\..\..\site-packages\etc\r
+:xemacsnocopy\r
+set EMACS_ARGS=-batch -no-autoloads\r
+set GNUS_INFO_DIR=%1\..\..\site-packages\info\r
+set GNUS_LISP_DIR=%1\..\..\site-packages\lisp\gnus\r
+set GNUS_ETC_DIR=%1\..\..\site-packages\etc\r
+echo.\r
+echo ***************************************************************************\r
+echo * Using xemacs.exe\r
+echo ***************************************************************************\r
+echo.\r
+goto lisp\r
+\r
+:lisp\r
+set EMACSBATCH=call %1\%EMACS% %EMACS_ARGS%\r
+cd lisp\r
+if exist gnus-load.el del gnus-load.el\r
+echo.\r
+echo Stand by while generating autoloads.\r
+echo.\r
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-cus-load .\r
+if ErrorLevel 1 set ERROR=make-cus-load\r
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-auto-load .\r
+if ErrorLevel 1 set ERROR=%ERROR%,make-auto-load\r
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-load\r
+if ErrorLevel 1 set ERROR=%ERROR%,make-load\r
+echo.\r
+echo Stand by while compiling lisp files.\r
+echo.\r
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-compile\r
+if ErrorLevel 1 set ERROR=%ERROR%,compile\r
+\r
+if not "%2" == "/copy" goto infotest\r
+echo.\r
+echo Stand by while copying lisp files.\r
+echo.\r
+if not exist %GNUS_LISP_DIR% mkdir %GNUS_LISP_DIR%\r
+xcopy /R /Q /Y *.el* %GNUS_LISP_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-lisp\r
+goto infotest\r
+\r
+:infotest\r
+cd ..\texi\r
+if exist sieve del sieve\r
+makeinfo sieve.texi\r
+if exist sieve goto minfo\r
+REM It seems that makeinfo isn't available\r
+set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo\r
+echo.\r
+echo ***************************************************************************\r
+echo * Using infohack.el, if you've got makeinfo.exe put it in PATH.\r
+echo ***************************************************************************\r
+echo.\r
+goto info\r
+\r
+:minfo\r
+set EMACSINFO=makeinfo\r
+echo.\r
+echo ***************************************************************************\r
+echo * Using makeinfo\r
+echo ***************************************************************************\r
+echo.\r
+goto info\r
+\r
+:info\r
+echo.\r
+echo Stand by while generating info files.\r
+echo.\r
+%EMACSINFO% emacs-mime.texi\r
+if ErrorLevel 1 set ERROR=%ERROR%,emacs-mime.texi\r
+%EMACSINFO% gnus.texi\r
+if ErrorLevel 1 set ERROR=%ERROR%,gnus.texi\r
+%EMACSINFO% sieve.texi\r
+if ErrorLevel 1 set ERROR=%ERROR%,sieve.texi\r
+%EMACSINFO% pgg.texi\r
+if ErrorLevel 1 set ERROR=%ERROR%,pgg.texi\r
+%EMACSINFO% message.texi\r
+if ErrorLevel 1 set ERROR=%ERROR%,message.texi\r
+\r
+if not "%2" == "/copy" goto nocopy\r
+if not exist %GNUS_INFO_DIR% mkdir %GNUS_INFO_DIR%\r
+\r
+echo.\r
+echo Stand by while copying info files.\r
+echo.\r
+xcopy /R /Q /Y gnus       %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-gnus-info\r
+xcopy /R /Q /Y gnus-?     %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-gnus-x-info\r
+xcopy /R /Q /Y gnus-??    %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-gnus-xx-info\r
+xcopy /R /Q /Y message    %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-message-info\r
+if exist message-1 xcopy /R /Q /Y message-?  %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-message-x-info\r
+xcopy /R /Q /Y emacs-mime %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-emacs-mime-info\r
+xcopy /R /Q /Y sieve      %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-sieve-info\r
+xcopy /R /Q /Y pgg        %GNUS_INFO_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-pgg-info\r
+\r
+echo.\r
+echo ***************************************************************************\r
+echo * You should add the following lines to\r
+echo * %GNUS_INFO_DIR%\dir\r
+echo * if they aren't already there:\r
+echo *\r
+echo * * PGG: (pgg).   Emacs interface to various PGP implementations.\r
+echo * * Sieve: (sieve).       Managing Sieve scripts in Emacs.\r
+echo ***************************************************************************\r
+echo.\r
+\r
+:etc\r
+cd ..\etc\r
+echo.\r
+echo Stand by while copying etc files.\r
+echo.\r
+if not exist %GNUS_ETC_DIR% mkdir %GNUS_ETC_DIR%\r
+xcopy /R /Q /Y gnus-tut.txt %GNUS_ETC_DIR%\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-tut-txt\r
+if not exist %GNUS_ETC_DIR%\gnus mkdir %GNUS_ETC_DIR%\gnus\r
+xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-*\r
+if not exist %GNUS_ETC_DIR%\smilies mkdir %GNUS_ETC_DIR%\smilies\r
+xcopy /R /Q /Y .\smilies\* %GNUS_ETC_DIR%\smilies\\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-smilies-*\r
+goto warnings\r
+\r
+:nocopy\r
+echo.\r
+echo ***************************************************************************\r
+echo * You chose not to copy the files, therefore you should add the\r
+echo * following lines to the TOP of your [X]emacs customization file:\r
+echo *\r
+echo * (add-to-list 'load-path "/Path/to/gnus/lisp")\r
+echo * (if (featurep 'xemacs)\r
+echo *     (add-to-list 'Info-directory-list "c:/Path/to/gnus/texi/")\r
+echo *   (add-to-list 'Info-default-directory-list "c:/Path/to/gnus/texi/")\r
+echo * (require 'gnus-load)\r
+echo *\r
+echo * Replace c:/Path/to/gnus with the Path where your new Gnus is (that's here\r
+echo * and yes, you've got to use forward slashes).\r
+echo ***************************************************************************\r
+echo.\r
+\r
+:warnings\r
+if not "%subdirwarning%" == "yes" goto warngnusload\r
+echo.\r
+echo ***************************************************************************\r
+echo * There's no subdirs.el file in your site-lisp directory, you should\r
+echo * therefor add the following line to the TOP of your Emacs\r
+echo * customization file:\r
+echo *\r
+echo * (add-to-list 'load-path "/Path/to/emacs-site-lisp-directory/gnus/lisp")\r
+echo * (require 'gnus-load)\r
+echo * Yes, it must be forward slashes.\r
+echo ***************************************************************************\r
+echo.\r
+goto warnerrors\r
+\r
+:warngnusload\r
+echo.\r
+echo ***************************************************************************\r
+echo * You should add the following line to the TOP of your Emacs\r
+echo * customization file:\r
+echo *\r
+echo * (require 'gnus-load)\r
+echo ***************************************************************************\r
+echo.\r
+\r
+:warnerrors\r
+if "%ERROR%"==":" goto noerrors\r
+set errorlevel=1\r
+echo.\r
+echo ***************************************************************************\r
+echo * WARNING ERRORS OCCURRED!\r
+echo * You should look for error messages in the output of the called programs\r
+echo * and try to find out what exactly went wrong.\r
+echo * Errors occured in the following modules:\r
+echo * %ERROR%\r
+echo ***************************************************************************\r
+echo.\r
+goto done\r
+\r
+:noerrors\r
+set errorlevel=0\r
+\r
+:done\r
+cd ..\r
+goto end\r
+\r
+:noemacs\r
+echo.\r
+echo ***************************************************************************\r
+echo * Unable to find emacs.exe or xemacs.exe on the path you specified!\r
+echo * STOP!\r
+echo ***************************************************************************\r
+echo.\r
+goto usage\r
+\r
+:usage\r
+echo.\r
+echo ***************************************************************************\r
+echo * Usage: make.bat :[X]Emacs-exe-dir: [/copy]\r
+echo *\r
+echo * where: :[X]Emacs-exe-dir: is the directory your\r
+echo *           emacs.exe respectively xemacs.exe resides in,\r
+echo *           e.g. G:\Programme\XEmacs\XEmacs-21.4.11\i586-pc-win32\\r
+echo *           or G:\Emacs\bin\r
+echo *        /copy indicates that the compiled files should be copied to your\r
+echo *           emacs lisp, info, and etc site directories.\r
+echo *\r
+echo * Note: If you have Emacs/w3 you should set the environment variable\r
+echo *       W3DIR to the directory where w3 is installed eg.\r
+echo *                set W3DIR=d:\lisp\w3-4.0pre46\lisp\r
+echo ***************************************************************************\r
+echo.\r
+\r
+:end\r
+rem Restore environment variables\r
+set PWD=%GNUS_PWD_SAVE%\r
+set GNUS_PWD_SAVE=\r
+set EMACSBATCH=\r
+set GNUS_LISP_DIR=\r
+set GNUS_INFO_DIR=\r
+set GNUS_ETC_DIR=\r
+set subdirwarning=\r
+set ERROR=\r