summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2021-12-01 15:20:08 +0800
committerPo Lu <luangruo@yahoo.com>2021-12-01 15:20:08 +0800
commit5477b929da886c1aea70e1b2ac17b80df8d0015b (patch)
tree62a98b0bc2532fe9e06fab3dca0d5caaec369e8a /lib-src
parentb463dc8921aaebb429192fcb5b54743660483505 (diff)
parent9fa15463bd849f1ae34812183b2bf5285b8b0a67 (diff)
downloademacs-5477b929da886c1aea70e1b2ac17b80df8d0015b.tar.gz
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index bdf228aeaa9..11485a229d3 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -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 */