diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-13 10:29:44 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-13 10:29:44 +0200 |
| commit | 804a0e82f2672db7cabddd99958cc97d5679beeb (patch) | |
| tree | 797288352ada238d56ca3360932c53ac620658e3 /lib-src/emacsclient.c | |
| parent | 991e145450ec8b02865597bc80fd797e39e81f07 (diff) | |
| download | emacs-804a0e82f2672db7cabddd99958cc97d5679beeb.tar.gz | |
Don't output emacsclient warning if both -a and --quiet
* lib-src/emacsclient.c (set_local_socket): Don't output the
warning if both -a and --quiet are specified (bug#16117).
Inspired by a patch from Scott Turner <srt19170@gmail.com>.
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 380be95222b..871fa7a8d3c 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1504,11 +1504,17 @@ set_local_socket (char const *server_name) "%s: (Be careful: XDG_RUNTIME_DIR is security-related.)\n"), progname, sockdirname, progname); } - message (true, - ("%s: can't find socket; have you started the server?\n" - "%s: To start the server in Emacs," - " type \"M-x server-start\".\n"), - progname, progname); + + /* If there's an alternate editor and the user has requested + --quiet, don't output the warning. */ + if (!quiet || !alternate_editor) + { + message (true, + ("%s: can't find socket; have you started the server?\n" + "%s: To start the server in Emacs," + " type \"M-x server-start\".\n"), + progname, progname); + } } else message (true, "%s: can't stat %s: %s\n", |