master 804a0e8: Don't output emacsclient warning if both -a and --quiet

[Lars Ingebrigtsen]

branch: master
commit 804a0e82f2672db7cabddd99958cc97d5679beeb
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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>.
---
 lib-src/emacsclient.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 380be95..871fa7a 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",