only restore errorformat
Merge branch 'setlocal' into combined