Merge branch 'jk/add-e-kill-editor' into maint

"git add -e" did not allow the user to abort the operation by killing the editor. * jk/add-e-kill-editor: add: check return value of launch_editor