* erc/erc-button.el (erc-nick-popup): Make `nick' available in the eval

environment.

Fixes: debbugs:15969

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 5856a59..f7a998c 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-25  Glenn Morris  <rgm@gnu.org>
+
+       * erc-button.el (erc-nick-popup): Make `nick' available in the
+       eval environment.  (Bug#15969)
+
 2013-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc-pcomplete.el (erc-pcomplete): Set this-command.

diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 751a35d..a124954 100644 (file)
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -514,7 +514,7 @@ Examples:
          (code (cdr (assoc action erc-nick-popup-alist))))
     (when code
       (erc-set-active-buffer (current-buffer))
-      (eval code))))
+      (eval code `((nick . ,nick))))))
 
 ;;; Callback functions
 (defun erc-button-describe-symbol (symbol-name)