> All I did was this:
> 
> 1. Save the relative window line number of point, before searching, in
> `isearch-mode'.
> 
> 2. Restore that, in `isearch-cancel'.

That patch did not fix the problem when searching across Info nodes.
The attached patch does.  AFAICT, it works generally.