mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 06:50:23 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/pgtk

Browse source
This commit is contained in:
Po Lu 2021-12-01 15:20:08 +08:00
commit 5477b929da
17 changed files with 88834 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib-src/emacsclient.c
View file

@ -1763,8 +1763,9 @@ start_daemon_and_retry_set_socket (void)
}
/* Try connecting, the daemon should have started by now. */
message (true,
"Emacs daemon should have started, trying to connect again\n");
if (!quiet)
message (true,
"Emacs daemon should have started, trying to connect again\n");
}
else if (dpid < 0)
{
@ -1855,7 +1856,7 @@ start_daemon_and_retry_set_socket (void)
/* Try connecting, the daemon should have started by now. */
/* It's just a progress message, so don't pop a dialog if this is
emacsclientw. */
if (!w32_window_app ())
if (!quiet && !w32_window_app ())
message (true,
"Emacs daemon should have started, trying to connect again\n");
#endif /* WINDOWSNT */