The 1.1.8 cursors patch attached to bug 10708 applies perfectly if you back out commit 7f5b4ab15d535f48b846b8187213345c3eb323b0 first. Code: $ git show 7f5b4ab15d535f48b846b8187213345c3eb323b0 | patch -p1 -R $ patch -p1 < cursor-patches-1.1.8.patch