Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index faabeb5..dec07eb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-09  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-art.el (gnus-button-man-handler): New variable.
+       (gnus-button-alist): Use g-b-handle-man.
+       (gnus-button-handle-man): New, call g-b-man-handler.
+
 2002-09-08  Simon Josefsson  <jas@extundo.com>
 
        * gnus-art.el (gnus-button-alist): Buttonize man page links.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 1e0c4f9..e22fde7 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5729,6 +5729,15 @@ after replacing with the original article."
   :group 'gnus-article-buttons
   :type 'regexp)
 
+(defcustom gnus-button-man-handler 'man
+  "Function to use for displaying man pages.
+The function must take at least one argument with a string naming the
+man page."
+  :type '(choice (function-item :tag "Man" man)
+                (function-item :tag "Woman" woman)
+                (function :tag "Other"))
+  :group 'gnus-article-buttons)
+
 (defcustom gnus-button-alist
   '(("<\\(url:[>\n\t ]*?\\)?\\(nntp\\|news\\):[>\n\t ]*\\([^>\n\t ]*@[^>\n\t ]*\\)>"
      0 t gnus-button-handle-news 3)
@@ -5751,7 +5760,7 @@ after replacing with the original article."
     ;; Raw URLs.
     (gnus-button-url-regexp 0 t browse-url 0)
     ;; man pages
-    ("\\b\\([a-z]+\\)([0-9])\\W" 0 t man 1))
+    ("\\b\\([a-z]+\\)([0-9])\\W" 0 t gnus-button-handle-man 1))
   "*Alist of regexps matching buttons in article bodies.
 
 Each entry has the form (REGEXP BUTTON FORM CALLBACK PAR...), where
@@ -6170,6 +6179,10 @@ specified by `gnus-button-alist'."
      (group
       (gnus-button-fetch-group url)))))
 
+(defun gnus-button-handle-man (url)
+  "Fetch a man page."
+  (funcall gnus-button-man-handler url))
+
 (defun gnus-button-handle-info (url)
   "Fetch an info URL."
   (if (string-match

diff --git a/texi/ChangeLog b/texi/ChangeLog
index ccd5d19..f814141 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,19 @@
+2002-09-09  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus.texi (Splitting Mail): Typo.
+
+2002-09-09  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Article Buttons): Add.
+
+2002-09-09  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus.texi (Splitting Mail): Document nnmail-resplit-incoming,
+       xref to Mail Source Specifiers.
+       (Mail Source Specifiers): Add index entry for
+       nnmail-scan-directory-mail-source-once.  Add index entry for
+       nnmail-resplit-incoming, with xref to Splitting Mail.
+
 2002-09-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Browse Foreign Server): Addition.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 427fddd..1826c0f 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -8272,10 +8272,11 @@ html2text (\e$B%7%s%W%k$J\e(B @sc{html} \e$B%3%s%P!<%?!<!"\e(Bgnus \e$B$K4^$^$l$F$$$k
 \e$B$=$l$K4X$9$k;v$r!"$=$l$i$N;2>H$N>e$G\e(B @kbd{RET} \e$B$rBG$D$+!"%^%&%9$N??Cf$N\e(B
 \e$B%\%?%s$r;H$&;v$K$h$C$F!":G>.8B$NEXNO$G<hF@$9$k;v$,$G$-$l$PAGE($G$7$g$&!#\e(B
 
+@vindex gnus-button-man-handler
 Gnus \e$B$O%G%#%U%)%k%H$GFCDj$NI8=`$N;2>H$K\e(B@dfn{\e$B%\%?%s\e(B}\e$B$rIU$1$^$9\e(B: \e$B$A$c$s$H\e(B
-\e$B$7$?\e(B URL\e$B!"%a!<%k%"%I%l%9!"\e(BMessage-ID \e$B$G$9!#$3$l$OFs$D$NJQ?t$K$h$C$F@)8f\e(B
-\e$B$5$l$F$$$F!"$=$N0l$D$O5-;v$NK\BN$r07$$!"$b$&0l$D$O5-;v$N%X%C%@!<$r07$$$^\e(B
-\e$B$9!#\e(B
+\e$B$7$?\e(B URL\e$B!"%a!<%k%"%I%l%9!"\e(BMessage-ID\e$B!"\e(BInfo \e$B$X$N%j%s%/!"$=$l$K\e(B man \e$B%Z!<%8\e(B
+\e$B$G$9!#$3$l$OFs$D$NJQ?t$K$h$C$F@)8f$5$l$F$$$F!"$=$N0l$D$O5-;v$NK\BN$r07$$!"\e(B
+\e$B$b$&0l$D$O5-;v$N%X%C%@!<$r07$$$^$9!#\e(B
 
 @table @code
 @item gnus-button-alist
@@ -11983,6 +11984,14 @@ nnmail-split-history} \e$B$r;H$&;v$,$G$-$^$9!#$3$l$+$i%9%W!<%k$7D>$=$&$H$9$k\e(B
 \e$B$3$H$K$h$C$F40A4$K;_$a$k$3$H$,$G$-!"@8$N%X%C%@!<$N%G!<%?$r85$K5-;v$K%^%C\e(B
 \e$B%A$5$;$?$$>l9g$K$OM-8z$G$7$g$&!#\e(B
 
+@vindex nnmail-resplit-incoming
+\e$B%G%#%U%)%k%H$G$OF~$C$F$/$k$9$Y$F$N%a%C%;!<%8$KBP$7$FJ,3d$OF/$-$^$;$s!#$b\e(B
+\e$B$7\e(B @code{mail-sources} \e$BJQ\e(B
+\e$B?t\e(B (@pxref{Mail Source Specifiers}) \e$B$K\e(B @code{directory} \e$B$N9`$r@_Dj$7$F$b!"\e(B
+\e$B%G%#%U%)%k%H$G$O$7$+$7J,3d$O\e(B @emph{\e$B5/$3$j$^$;$s\e(B}\e$B!#JQ\e(B
+\e$B?t\e(B @code{nnmail-resplit-incoming} \e$B$rHs\e(B-@code{nil} \e$B$JCM$K@_Dj$9$k$3$H$K$h$C\e(B
+\e$B$F!"$3$N>l9g$G$bJ,3d$r5/$3$5$;$k$3$H$,$G$-$^$9!#\e(B
+
 Gnus \e$B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$kA4$F$N5!2q$rDs\e(B
 \e$B6!$7$^$9!#Nc$($P!"$"$J$?$N>e;J$+$i$/$kA4$F$N%a!<%k$r4^$s$@%0%k!<%W$r:n$C\e(B
 \e$B$?$H$7$^$7$g$&!#$=$l$+$i!"6vH/E*$K$=$N%0%k!<%W$N9XFI<h$j;_$a$,5/$3$C$?$H\e(B
@@ -12082,6 +12091,7 @@ rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 \e$B$($F$/$@$5$$!#\e(B
 
 @item directory
+@vindex nnmail-scan-directory-mail-source-once
 \e$B%G%#%l%/%H%j!<Cf$NJ#?t$N%U%!%$%k$+$i%a!<%k$r<hF@$7$^$9!#$3$l$OIaDL\e(B
 \e$B$O\e(B procmail \e$B$K?7$7$$%a!<%k$r$$$/$D$+$N%U%!%$%k$KJ,3d$5$;$F$$$k$H$-$K;HMQ\e(B
 \e$B$5$l$^$9!#$9$J$o$A%U%!%$%k\e(B @file{foo.bar.spool} \e$B$K$"$k%a!<%k$O!"%0%k!<\e(B
@@ -12090,9 +12100,10 @@ rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 \e$B$9$k$H!"\e(Bgnus \e$B$O?7$7$$%a!<%k%=!<%9$r0l2s$@$1D4$Y$k$h$&$K$J$j$^$9!#$3$l$O!"\e(B
 \e$B;XDj$7$?%l%Y%k$N%a!<%k%0%k!<%W$@$1$rD4$Y$?$$$H$-$K!"$H$j$o$1JXMx$G$9!#\e(B
 
+@vindex nnmail-resplit-incoming
 @code{nnmail-resplit-incoming} \e$B$H$$$&JQ?t$b$"$j!"$3$l$rHs\e(B-@code{nil} \e$B$K\e(B
 \e$B$9$k$HDL>o$NJ,3d=hM}$,%G%#%l%/%H%j!<Cf$N$9$Y$F$N%U%!%$%k$KBP$7$F9T$J$o$l\e(B
-\e$B$^$9!#\e(B
+\e$B$^$9\e(B (@pxref{Splitting Mail})\e$B!#\e(B
 
 \e$B%-!<%o!<%I\e(B:
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 881a832..0fc52bc 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -8416,10 +8416,11 @@ be nice if Gnus could just fetch whatever it is that people talk about
 with the minimum of fuzz when you hit @kbd{RET} or use the middle mouse
 button on these references.
 
+@vindex gnus-button-man-handler
 Gnus adds @dfn{buttons} to certain standard references by default:
-Well-formed URLs, mail addresses and Message-IDs.  This is controlled by
-two variables, one that handles article bodies and one that handles
-article heads:
+Well-formed URLs, mail addresses, Message-IDs, Info links and man pages.
+This is controlled by two variables, one that handles article bodies and
+one that handles article heads:
 
 @table @code
 
@@ -12538,6 +12539,14 @@ can be turned off completely by binding
 @code{nnmail-mail-splitting-decodes} to nil, which is useful if you
 want to match articles based on the raw header data.
 
+@vindex nnmail-resplit-incoming
+By default, splitting is not performed on all incoming messages.  If
+you specify a @code{directory} entry for the variable
+@code{mail-sources} @pxref{Mail Source Specifiers}, however, then
+splitting does @emph{not} happen by default.  You can set the variable
+@code{nnmail-resplit-incoming} to a non-nil value to make splitting
+happen even in this case.
+
 Gnus gives you all the opportunity you could possibly want for shooting
 yourself in the foot.  Let's say you create a group that will contain
 all the mail you get from your boss.  And then you accidentally
@@ -12640,6 +12649,7 @@ Alter this script to fit find the @samp{movemail} you want to use.
 
 
 @item directory
+@vindex nnmail-scan-directory-mail-source-once
 Get mail from several files in a directory.  This is typically used
 when you have procmail split the incoming mail into several files.
 That is, mail from the file @file{foo.bar.spool} will be put in the
@@ -12649,9 +12659,10 @@ of @code{.spool}.)  Setting
 to scan the mail source only once.  This is particularly useful if you
 want to scan mail groups at a specified level.
 
+@vindex nnmail-resplit-incoming
 There is also the variable @code{nnmail-resplit-incoming}, if you set
 that to a non-nil value, then the normal splitting process is applied
-to all the files from the directory.
+to all the files from the directory, @ref{Splitting Mail}.
 
 Keywords: