summaryrefslogtreecommitdiff
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c33
1 files changed, 13 insertions, 20 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 85415eba44a..b6d33c9c2c2 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -695,26 +695,19 @@ To start the server in Emacs, type \"M-x server-start\".\n",
fprintf (out, "-version %s ", VERSION);
/* Send over our environment. */
- {
- extern char **environ;
- int i;
- for (i = 0; environ[i]; i++)
- {
- char *name = xstrdup (environ[i]);
- char *value = strchr (name, '=');
- if (value && strlen (value) > 1)
- {
- *value++ = 0;
- fprintf (out, "-env ");
- quote_argument (name, out);
- fprintf (out, " ");
- quote_argument (value, out);
- fprintf (out, " ");
- fflush (out);
- }
- free (name);
- }
- }
+ if (!current_frame)
+ {
+ extern char **environ;
+ int i;
+ for (i = 0; environ[i]; i++)
+ {
+ char *name = xstrdup (environ[i]);
+ char *value = strchr (name, '=');
+ fprintf (out, "-env ");
+ quote_argument (environ[i], out);
+ fprintf (out, " ");
+ }
+ }
retry:
if (nowait)