diff options
| -rw-r--r-- | lisp/erc/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/erc/erc-button.el | 21 |
2 files changed, 18 insertions, 10 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index cf170809ee3..c2e83911e0c 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,10 @@ +2009-09-26 Johan Bockgård <bojohan@gnu.org> + + * erc-button.el (erc-button-add-button): Only call + `widget-convert-button' in XEmacs. For Emacs (at least), it + doesn't seem to have any purpose except creating lots of overlays, + slowing everything down. + 2009-09-19 Glenn Morris <rgm@gnu.org> * erc-lang.el (line): Define for compiler. diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index f0fa72f45b5..8eee1ce278f 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -367,16 +367,17 @@ REGEXP is the regular expression which matched for this button." (list 'keymap erc-button-keymap) (list 'rear-nonsticky t) (and data (list 'erc-data data)))) - (widget-convert-button 'link from to :action 'erc-button-press-button - :suppress-face t - ;; Make XEmacs use our faces. - :button-face (if nick-p - erc-button-nickname-face - erc-button-face) - ;; Make XEmacs behave with mouse-clicks, for - ;; some reason, widget stuff overrides the - ;; 'keymap text-property. - :mouse-down-action 'erc-button-click-button)) + (when (featurep 'xemacs) + (widget-convert-button 'link from to :action 'erc-button-press-button + :suppress-face t + ;; Make XEmacs use our faces. + :button-face (if nick-p + erc-button-nickname-face + erc-button-face) + ;; Make XEmacs behave with mouse-clicks, for + ;; some reason, widget stuff overrides the + ;; 'keymap text-property. + :mouse-down-action 'erc-button-click-button))) (defun erc-button-add-face (from to face) "Add FACE to the region between FROM and TO." |