Synch to Oort Gnus 200304032200.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54c8261..d28fa30 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
 2003-04-03  Jesper Harder  <harder@ifa.au.dk>
 
+       * earcon.el (earcon-regexp-alist): catmeow is a wav file.
+
+2003-04-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-art.el (gnus-button-ctan-directory-regexp): Changed meaning
+       and value.
+       (gnus-button-alist): Use it.
+
+2003-04-03  Jesper Harder  <harder@ifa.au.dk>
+
        * pgg-gpg.el (pgg-gpg-process-region): do.
 
        * pgg-pgp.el (pgg-pgp-process-region, pgg-pgp-verify-region)

diff --git a/lisp/earcon.el b/lisp/earcon.el
index faa38c5..e9691e1 100644 (file)
--- a/lisp/earcon.el
+++ b/lisp/earcon.el
@@ -1,6 +1,6 @@
 ;;; earcon.el --- Sound effects for messages
 
-;; Copyright (C) 1996, 2000, 2001 Free Software Foundation
+;; Copyright (C) 1996, 2000, 2001, 2003 Free Software Foundation
 
 ;; Author: Steven L. Baur <steve@miranova.com>
 
@@ -50,7 +50,7 @@
     ("evil[ \t]+laugh" 1 "Evil_Laugh.au")
     ("gag\\|puke" 1 "Puke.au")
     ("snicker" 1 "Snicker.au")
-    ("meow" 1 "catmeow.au")
+    ("meow" 1 "catmeow.wav")
     ("sob\\|boohoo" 1 "cry.wav")
     ("drum[ \t]*roll" 1 "drumroll.au")
     ("blast" 1 "explosion.au")

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index fe6abff..362bc08 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6118,16 +6118,13 @@ The function must take one argument, the string naming the URL."
 
 (defcustom gnus-button-ctan-directory-regexp
   (concat
-   "\\b\\(\\("
+   "\\("; Cannot use `\(?: ... \)' (compatibility with Emacs 20).
    "biblio\\|digests\\|dviware\\|fonts\\|graphics\\|help\\|"
    "indexing\\|info\\|language\\|macros\\|support\\|systems\\|"
    "tds\\|tools\\|usergrps\\|web\\|nonfree\\|obsolete"
-   "\\)"
-   ;; Require at least one subdirectory to avoid false positives.
-   "/[-a-z0-9]+/[/-a-z0-9]+\\)")
-  "Regular expression that matches ctan directories.
-The first regexp group has to match the directory relative to
-`gnus-ctan-url'."
+   "\\)")
+  "Regular expression for ctan directories.
+It should match all directories in the top level of `gnus-ctan-url'."
   :group 'gnus-article-buttons
   :type 'regexp)
 
@@ -6453,10 +6450,15 @@ positives are possible."
     ;; CTAN
     ("\\bCTAN:[ \t\n]*\\([^>)!;:,'\n\t ]*\\)"
      0 (>= gnus-button-tex-level 1) gnus-button-handle-ctan 1)
-    ("\\btex-archive/\\([-/a-z0-9]+\\)"
-     1 (>= gnus-button-tex-level 7) gnus-button-handle-ctan 1)
-    (gnus-button-ctan-directory-regexp
-     1 (>= gnus-button-tex-level 9) gnus-button-handle-ctan 1)
+    ((concat "\\btex-archive/\\("
+            gnus-button-ctan-directory-regexp
+            "/[-_.a-z0-9/]+[-_./a-z0-9]+[/a-z0-9]\\)")
+     1 (>= gnus-button-tex-level 6) gnus-button-handle-ctan 1)
+    ((concat
+      "\\b\\("
+      gnus-button-ctan-directory-regexp
+      "/[-_.a-z0-9]+/[-_./a-z0-9]+[/a-z0-9]\\)")
+     1 (>= gnus-button-tex-level 8) gnus-button-handle-ctan 1)
     ;; This is info
     ("\\binfo:\\(//\\)?\\([^'\">\n\t ]+\\)"
      0 (>= gnus-button-emacs-level 1) gnus-button-handle-info-url 2)