further improve magit-with-emacsclient