[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-art.el
diff -c emacs/lisp/gnus/gnus-art.el:1.88 emacs/lisp/gnus/gnus-art.el:1.89
*** emacs/lisp/gnus/gnus-art.el:1.88    Sun Jul 31 00:12:23 2005
--- emacs/lisp/gnus/gnus-art.el Fri Aug  5 08:37:44 2005
***************
*** 842,848 ****
    :type '(choice (item :tag "None" :value nil)
                 string))
  
! (defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces")
    "Defines the location of the faces database.
  For information on obtaining this database of pretty pictures, please
  see http://www.cs.indiana.edu/picons/ftp/index.html";
--- 842,849 ----
    :type '(choice (item :tag "None" :value nil)
                 string))
  
! (defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces"
!                                 "/usr/share/picons")
    "Defines the location of the faces database.
  For information on obtaining this database of pretty pictures, please
  see http://www.cs.indiana.edu/picons/ftp/index.html";
***************
*** 2428,2434 ****
      (let ((inhibit-read-only t))
        (goto-char (point-min))
        (while (re-search-forward
!             "^\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
        (replace-match "\\1\\3" t)))
      (when (interactive-p)
        (gnus-treat-article nil))))
--- 2429,2435 ----
      (let ((inhibit-read-only t))
        (goto-char (point-min))
        (while (re-search-forward
!             "\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
        (replace-match "\\1\\3" t)))
      (when (interactive-p)
        (gnus-treat-article nil))))
***************
*** 5886,5891 ****
--- 5887,5900 ----
    :group 'gnus-article-buttons
    :type 'regexp)
  
+ ;; Regexp suggested by Felix Wiemann in <address@hidden>
+ (defcustom gnus-button-valid-localpart-regexp
+   "[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*"
+   "Regular expression that matches a localpart of mail addresses or MIDs."
+   :version "22.1"
+   :group 'gnus-article-buttons
+   :type 'regexp)
+ 
  (defcustom gnus-button-man-handler 'manual-entry
    "Function to use for displaying man pages.
  The function must take at least one argument with a string naming the
***************
*** 5925,5936 ****
                 (regexp :tag "Other")))
  
  (defcustom gnus-button-ctan-directory-regexp
!   (concat
!    "\\("; Cannot use `\(?: ... \)' (compatibility with Emacs 20).
!    "biblio\\|digests\\|dviware\\|fonts\\|graphics\\|help\\|"
!    "indexing\\|info\\|language\\|macros\\|support\\|systems\\|"
!    "tds\\|tools\\|usergrps\\|web\\|nonfree\\|obsolete"
!    "\\)")
    "Regular expression for ctan directories.
  It should match all directories in the top level of `gnus-ctan-url'."
    :version "22.1"
--- 5934,5944 ----
                 (regexp :tag "Other")))
  
  (defcustom gnus-button-ctan-directory-regexp
!   (regexp-opt
!    (list "archive-tools" "biblio" "bibliography" "digests" "documentation"
!        "dviware" "fonts" "graphics" "help" "indexing" "info" "language"
!        "languages" "macros" "nonfree" "obsolete" "support" "systems"
!        "tds" "tools" "usergrps" "web") t)
    "Regular expression for ctan directories.
  It should match all directories in the top level of `gnus-ctan-url'."
    :version "22.1"
***************
*** 5938,5945 ****
    :type 'regexp)
  
  (defcustom gnus-button-mid-or-mail-regexp
!   (concat "\\b\\(<?[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*@"
!         ;; Felix Wiemann in <address@hidden>
          gnus-button-valid-fqdn-regexp
          ">?\\)\\b")
    "Regular expression that matches a message ID or a mail address."
--- 5946,5952 ----
    :type 'regexp)
  
  (defcustom gnus-button-mid-or-mail-regexp
!   (concat "\\b\\(<?" gnus-button-valid-localpart-regexp "@"
          gnus-button-valid-fqdn-regexp
          ">?\\)\\b")
    "Regular expression that matches a message ID or a mail address."
***************
*** 6254,6261 ****
  (defcustom gnus-button-alist
    '(("<\\(url:[>\n\t ]*?\\)?\\(nntp\\|news\\):[>\n\t ]*\\([^>\n\t 
address@hidden>\n\t ]*\\)>"
       0 (>= gnus-button-message-level 0) gnus-button-handle-news 3)
!     ("\\b\\(nntp\\|news\\):\\([^>\n\t address@hidden>)!;:,\n\t ]*\\)" 0 t
!      gnus-button-handle-news 2)
      ("\\(\\b<\\(url:[>\n\t ]*\\)?\\(nntp\\|news\\):[>\n\t 
]*\\(//\\)?\\([^>\n\t ]*\\)>\\)"
       1 (>= gnus-button-message-level 0) gnus-button-fetch-group 5)
      ("\\b\\(nntp\\|news\\):\\(//\\)?\\([^'\">\n\t ]+\\)"
--- 6261,6269 ----
  (defcustom gnus-button-alist
    '(("<\\(url:[>\n\t ]*?\\)?\\(nntp\\|news\\):[>\n\t ]*\\([^>\n\t 
address@hidden>\n\t ]*\\)>"
       0 (>= gnus-button-message-level 0) gnus-button-handle-news 3)
!     ((concat "\\b\\(nntp\\|news\\):\\("
!            gnus-button-valid-localpart-regexp "@[a-z0-9.-]+[a-z]\\)")
!      0 t gnus-button-handle-news 2)
      ("\\(\\b<\\(url:[>\n\t ]*\\)?\\(nntp\\|news\\):[>\n\t 
]*\\(//\\)?\\([^>\n\t ]*\\)>\\)"
       1 (>= gnus-button-message-level 0) gnus-button-fetch-group 5)
      ("\\b\\(nntp\\|news\\):\\(//\\)?\\([^'\">\n\t ]+\\)"