The attached patch seems to fix the Isearch problem generally, restoring the
original position of point within the window.