Use @ interactive spec for Info-mouse-follow-link.

Fixes: debbugs:11672

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 122013463dc1885ef68209fe227075d204229409..22e8c23c142dcf98630760b8003e7440d3f64cf8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2012-06-23  Chong Yidong  <cyd@gnu.org>
 
-       * info.el (Info-mouse-follow-link): Accept symbol values of the
-       link-args property.  Select the window (Bug#11672).
+       * info.el (Info-mouse-follow-link): Accept symbol values of
+       link-args.  Select window; suggested by Gerhard Kahl (Bug#11672).
        (Info-fontify-node): Use Info-link-keymap for all navigation
        buttons, with link-args property to perform the desired action.
        (Info-link-keymap): Doc fix.

diff --git a/lisp/info.el b/lisp/info.el
index b3fb7917c7ddb13b9654971dcb01800ced6f5344..cc86370d2510e954a1b05df46ad6aadf35002cc1 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3692,7 +3692,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
 
 (defun Info-mouse-follow-link (click)
   "Follow a link where you click."
-  (interactive "e")
+  (interactive "@e")
   (let* ((position (event-start click))
         (posn-string (and position (posn-string position)))
         (link-args (if posn-string
@@ -3701,7 +3701,6 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
                                           (car posn-string))
                      (get-char-property (posn-point position)
                                         'link-args))))
-    (select-window (posn-window position))
     (cond ((stringp link-args)
           (Info-goto-node link-args))
          ;; These special values of the `link-args' property are used