diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-10-06 18:45:03 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-10-06 18:45:03 -0700 |
| commit | 2255788d775663c13f57fc0617b6d27398ae769d (patch) | |
| tree | 4adc7f861baff54c3527a154fa8ef1293de1fefc | |
| parent | 1bac999506468ca481c118b87893c44ec54afc4b (diff) | |
| download | emacs-2255788d775663c13f57fc0617b6d27398ae769d.tar.gz | |
* lisp/erc/erc-button.el (erc-button-alist): Remove "finger".
Fixes: debbugs:4443
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-button.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 6906430eb7b..7fad769bdc6 100644 --- 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 687d11d144e..433ffc05340 100644 --- 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" |