info.el patch to open node in new window [was: generate 3) S-mouse-2: follow link in new window]

["Drew Adams" <drew.adams@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 1738 bytes --]

> > > (defun Info-mouse-follow-nearest-node-new-window (click)
> > >     "Open the link at the mouse pointer in a new window."
> > >     (interactive "e")
> > >     (Info-mouse-follow-nearest-node click t)) ; t no good now
> > >
> > > But that particular implementation no longer works, because
> > > someone over the course of Emacs 22 development removed the
> > > optional FORK argument to `Info-follow-nearest-node' and
> > > `Info-mouse-follow-nearest-node'. (Why?)
> >
> > `Info-mouse-follow-nearest-node' never had the FORK argument.
> > `Info-follow-nearest-node' still has it, but there were plans to
> > remove it.
>
> You're right, on both counts. I think I left in the above code hoping that
> FORK would be added in response to my request for it: 2006-01-08, Subject
> "Info-mouse-follow-nearest-node should take prefix arg to fork". I had
> forgotten that thread. Richard's response was to wait until after the
> release (22). Your response was that FORK was a deprecated feature
> (presumably you were referring to the non-mouse command).

I was wrong. I had forgotten that I had (trivially) redefined
`Info-mouse-follow-nearest-node' to accept the optional FORK arg and pass it
to `Info-try-follow-nearest-node'. The reason my code was no longer working
was that I had made another, conflicting mouse binding elsewhere - my bad.

It works fine now. Attached are patches for info.el and etc/NEWS to add
these two commands:

* Info-follow-nearest-node-other-window
* Info-mouse-follow-nearest-node-other-window

It binds the former to `S-RET' and the latter to `S-down-mouse-2'.

Change log entry:

* info.el (Info-follow-nearest-node)
  (Info-mouse-follow-nearest-node): New commands,
  bound to S-RET, S-down-mouse-2.





[-- Attachment #2: info-2007-09-25.patch --]
[-- Type: application/octet-stream, Size: 3337 bytes --]

*** info-CVS-2007-09-25.el	Tue Sep 25 16:07:54 2007
--- info-patched-2007-09-25.el	Tue Sep 25 16:14:40 2007
***************
*** 3079,3094 ****
  		(t
  		 (error "No %s around position %d" errorstring pos))))))))
  
! (defun Info-mouse-follow-nearest-node (click)
    "\\<Info-mode-map>Follow a node reference near point.
! Like \\[Info-menu], \\[Info-follow-reference], \\[Info-next], \\[Info-prev] or \\[Info-up] command, depending on where you click.
! At end of the node's text, moves to the next node, or up if none."
!   (interactive "e")
    (mouse-set-point click)
!   (and (not (Info-try-follow-nearest-node))
         (save-excursion (forward-line 1) (eobp))
         (Info-next-preorder)))
  
  (defun Info-follow-nearest-node (&optional fork)
    "Follow a node reference near point.
  If point is on a reference, follow that reference.  Otherwise,
--- 3079,3102 ----
  		(t
  		 (error "No %s around position %d" errorstring pos))))))))
  
! (defun Info-mouse-follow-nearest-node (click &optional fork)
    "\\<Info-mode-map>Follow a node reference near point.
! Like \\[Info-menu], \\[Info-follow-reference], \\[Info-next], \\[Info-prev] or \\[Info-up] \
! command, depending on where you click.
! At end of the node's text, moves to the next node, or up if none.
! 
! With a prefix argument, open the node in a separate window."
!   (interactive "e\nP")
    (mouse-set-point click)
!   (and (not (Info-try-follow-nearest-node fork))
         (save-excursion (forward-line 1) (eobp))
         (Info-next-preorder)))
  
+ (defun Info-mouse-follow-nearest-node-new-window (click)
+   "Open the link at the mouse pointer in a new window."
+   (interactive "e")
+   (Info-mouse-follow-nearest-node click t))
+ 
  (defun Info-follow-nearest-node (&optional fork)
    "Follow a node reference near point.
  If point is on a reference, follow that reference.  Otherwise,
***************
*** 3111,3116 ****
--- 3119,3129 ----
  	    t)))
        (error "Point neither on reference nor in menu item description")))
  
+ (defun Info-follow-nearest-node-new-window ()
+   "Open the link near the text cursor in a new window."
+   (interactive)
+   (Info-follow-nearest-node t))
+ 
  ;; Common subroutine.
  (defun Info-try-follow-nearest-node (&optional fork)
    "Follow a node reference near point.  Return non-nil if successful.
***************
*** 3151,3156 ****
--- 3164,3170 ----
    (define-key Info-mode-map "." 'beginning-of-buffer)
    (define-key Info-mode-map " " 'Info-scroll-up)
    (define-key Info-mode-map "\C-m" 'Info-follow-nearest-node)
+   (define-key Info-mode-map [S-return] 'Info-follow-nearest-node-new-window)
    (define-key Info-mode-map "\t" 'Info-next-reference)
    (define-key Info-mode-map "\e\t" 'Info-prev-reference)
    (define-key Info-mode-map [(shift tab)] 'Info-prev-reference)
***************
*** 3200,3205 ****
--- 3214,3220 ----
    (define-key Info-mode-map "," 'Info-index-next)
    (define-key Info-mode-map "\177" 'Info-scroll-down)
    (define-key Info-mode-map [mouse-2] 'Info-mouse-follow-nearest-node)
+   (define-key Info-mode-map [S-down-mouse-2]  'Info-mouse-follow-nearest-node-new-window)
    (define-key Info-mode-map [follow-link] 'mouse-face)
    )
  

Diff finished.  Tue Sep 25 16:17:34 2007

[-- Attachment #3: NEWS-23-2007-09-25.patch --]
[-- Type: application/octet-stream, Size: 624 bytes --]

*** NEWS-23-2007-09-25.txt	Tue Sep 25 16:30:12 2007
--- NEWS-23-2007-09-25-patched.txt	Tue Sep 25 16:35:12 2007
***************
*** 97,102 ****
--- 97,107 ----
  ** The new command `display-time-world' starts an updating time display
  using several time zones, in a buffer.
  
+ ** Info mode has new commands
+ Info-follow-nearest-node-other-window and
+ Info-mouse-follow-nearest-node-other-window, bound to S-RET and
+ S-down-mouse-2, respectively.
+ \f
  * Startup Changes in Emacs 23.1
  
  ** New user option `initial-buffer-choice' specifies what to display

Diff finished.  Tue Sep 25 16:35:43 2007

[-- Attachment #4: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel