Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 50c332f..ec7a541 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * make-x.bat: Code cleanup.  Fix a bug with "/copy".  From Frank
+       Schmitt <ich@Frank-Schmitt.net>.
+
 2001-12-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
        * lisp/gnus-namazu.el (gnus-namazu-summary-buffer-name): Changed

diff --git a/make-x.bat b/make-x.bat
index d79340d..05d565c 100644 (file)
--- a/make-x.bat
+++ b/make-x.bat
@@ -11,13 +11,14 @@ set PWD=
 if "%1" == "" goto usage\r
 \r
 set emacs=xemacs.exe\r
+if "%2" == "copy" set copy=true\r
+if "%2" == "/copy" set copy=true\r
 \r
 cd lisp\r
 call %1\%emacs% -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile\r
-if not "%2" == "copy" goto info\r
-if not "%2" == "/copy" goto info\r
+if not %copy%==true goto info\r
 attrib -r %1\..\..\xemacs-packages\lisp\gnus\*.*\r
-copy *.el* %1\..\..\xemacs-packages\lisp\gnus\r
+copy *.el? %1\..\..\xemacs-packages\lisp\gnus\r
 \r
 :info\r
 set EMACSINFO=call %1\%emacs% -no-site-file -no-init-file -batch -q -l infohack.el -f batch-makeinfo\r
@@ -25,8 +26,7 @@ cd ..\texi
 %EMACSINFO% message.texi\r
 %EMACSINFO% emacs-mime.texi\r
 %EMACSINFO% gnus.texi\r
-if not "%2" == "copy" goto done\r
-if not "%2" == "/copy" goto done\r
+if not %copy%==true goto done\r
 copy gnus %1\..\..\xemacs-packages\info\r
 copy gnus-?? %1\..\..\xemacs-packages\info\r
 copy message %1\..\..\xemacs-packages\info\r

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b102969..6ab618a 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus.texi (Advanced Scoring Examples): Clarify that the
+       examples are rules, not complete score files.
+
 2001-12-09  Nevin Kapur  <nevin@jhu.edu>
 
        * gnus.texi (Expiring Mail): Add.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index ebc17d8..eb3a467 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -17619,6 +17619,9 @@ bbbd \e$B%5!<%P!<$,<B9T$5$l$F$$$k%[%9%H$N%]!<%H$G$9!#=i4|CM$O\e(B 9000 \e$B$G$9!#\e(
 @node Advanced Scoring Examples
 @subsection \e$B>e5i%9%3%"IU$1$NNc\e(B
 
+\e$B0J2<$NNc$O%9%3%"%U%!%$%k$N5,B'$G$"$k$3$H$K$4Cm0U2<$5$$!#40`z$J%9%3%"%U%!\e(B
+\e$B%$%k$r:n$k$K$O!"JL$N3g8L$NAH$G$=$l$i$r0O$s$G2<$5$$!#\e(B
+
 Lars \e$B$,\e(B Gnus \e$B$K4X$7$FOC$r$7$F$$$k$H$-$KH`$K$h$C$F=q$+$l$?5-;v$N%9%3%"$r\e(B
 \e$BA}$d$7$?$$$H$7$^$7$g$&\e(B:
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index ca0e1c6..59ee56a 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -17981,6 +17981,10 @@ simple scoring, and the match types are also the same.
 @node Advanced Scoring Examples
 @subsection Advanced Scoring Examples
 
+Please note that the following examples are score file rules.  To
+make a complete score file from them, surround them with another pair
+of parentheses.
+
 Let's say you want to increase the score of articles written by Lars
 when he's talking about Gnus: