* lisp/erc/erc-button.el (erc-button-alist): Remove "finger".

Fixes: debbugs:4443

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 6906430eb7be7673b183cb142c40414fbd31811f..7fad769bdc6d8b5535e1fd1f12536bed2722e08d 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+       * erc-button.el (erc-button-alist): Remove "finger".  (Bug#4443)
+
 2012-10-07  Antoine Levitt  <antoine.levitt@gmail.com>
 
        * erc-stamp.el (erc-format-timestamp): Don't apply intangible

diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 687d11d144e5939cf739d52a742e6d72392d69f2..433ffc053402ba74b7033fcad407b55955a8f2cd 100644 (file)
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -135,7 +135,7 @@ longer than `erc-fill-column'."
   '(('nicknames 0 erc-button-buttonize-nicks erc-nick-popup 0)
     (erc-button-url-regexp 0 t browse-url 0)
     ("<URL: *\\([^<> ]+\\) *>" 0 t browse-url 1)
-    ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3)
+;;; ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3)
     ;; emacs internal
     ("[`]\\([a-zA-Z][-a-zA-Z_0-9]+\\)[']" 1 t erc-button-describe-symbol 1)
     ;; pseudo links
@@ -183,6 +183,7 @@ PAR is a number of a regexp grouping whose text will be passed to
   'nicknames, these are ignored, and CALLBACK will be called with
   the nickname matched as the argument."
   :group 'erc-button
+  :version "24.3"                       ; remove finger (bug#4443)
   :type '(repeat
           (list :tag "Button"
                 (choice :tag "Matches"