[Erc-commit] [commit][master] erc-button: Only highlight nicks in the current channel, not whole server.

[mwolson]

commit d4c54e6e73f98f32e52fcba7332c60d8034375ca
Author: Michael W. Olson <address@hidden>
Date:   Mon Jan 21 22:48:27 2008 -0500

    erc-button: Only highlight nicks in the current channel, not whole server.

diff --git a/ChangeLog b/ChangeLog
index fe9ca3b..0d189d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-22  Michael Olson  <address@hidden>
+
+       * erc-button.el (erc-button-add-nickname-buttons): When in a
+       channel buffer, only look at nicks from the current channel.
+       Thanks to e1f for the report.
+
 2008-01-21  Michael Olson  <address@hidden>
 
        * erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): Remove,
diff --git a/erc-button.el b/erc-button.el
index 748d19b..7e45c6c 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -302,9 +302,10 @@ specified by `erc-button-alist'."
         (setq bounds (bounds-of-thing-at-point 'word))
         (setq word (buffer-substring-no-properties
                     (car bounds) (cdr bounds)))
-        (if (erc-get-server-user word)
-            (erc-button-add-button (car bounds) (cdr bounds)
-                                   fun t (list word)))))))
+        (when (or (and (erc-server-buffer-p) (erc-get-server-user word))
+                  (and erc-channel-users (erc-get-channel-user word)))
+          (erc-button-add-button (car bounds) (cdr bounds)
+                                 fun t (list word)))))))
 
 (defun erc-button-add-buttons-1 (regexp entry)
   "Search through the buffer for matches to ENTRY and add buttons."