On Wed, Nov 22, 2017 at 11:53 AM, Lars Schneider <larsxschneider@xxxxxxxxx> wrote: >> On 17 Nov 2017, at 20:41, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: >> * emacsclient already prints its own message ("Waiting for Emacs...", >> which runs together with Git's message). Perhaps treat emacsclient as >> a special case and skip printing this message if emacsclient is in >> use: if (strstr(...,"emacsclient")) > > If Junio et al. are ok with the special handling of emacs, then I am happy > to add this change in v3. If we look for "emacsclient", then would this > cover emacs on Linux and Windows, too? (I am no emacs user) Yes, searching for "emacsclient" should work on all platforms (Linux, MacOS, Windows, BSD). Most of the time, the full value of EDITOR is just "emacsclient", but sometimes emacsclient is located at an out-of-the-way location, not in PATH, such as in my example (/long/path/to/emacsclient). On Windows, it's actually called "emacsclientw", but that should be matched just fine when searching for "emacsclient".