issue6855: better patch to disable double-click edition on <return>