Mercurial > emacs

changeset 105209:53bc42d507c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Johan Bockgård <bojohan@gnu.org>
date Sat, 26 Sep 2009 14:16:33 +0000
parents bf36d53a4b8f
children b040364df558
files lisp/erc/ChangeLog lisp/erc/erc-button.el
diffstat 2 files changed, 18 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/erc/ChangeLog	Sat Sep 26 09:41:02 2009 +0000
+++ b/lisp/erc/ChangeLog	Sat Sep 26 14:16:33 2009 +0000
@@ -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.
--- a/lisp/erc/erc-button.el	Sat Sep 26 09:41:02 2009 +0000
+++ b/lisp/erc/erc-button.el	Sat Sep 26 14:16:33 2009 +0000
@@ -367,16 +367,17 @@
           (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."