ensure to restore the settings
add spec for 64ce4d5 and fix spec for cursor marking