From 5ebfaa6e61a1cac1473da768470f1ba298c3de3a Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 6 Jun 2022 01:04:24 -0700
Subject: implement updating Lisp image env vars & refactor

---
 bin/emacsclient | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin/emacsclient')

diff --git a/bin/emacsclient b/bin/emacsclient
index 91cef0aa..e11cbe9c 100755
--- a/bin/emacsclient
+++ b/bin/emacsclient
@@ -77,10 +77,11 @@ if [ "$update" = true \
 	eval isset=\${$var+x}
 	if [ "$isset" = "x" ]; then
 	    eval val=\$$var
-	    args="$args"' (setenv "'$var'" "'$val'")'
+	    args="$args"' "'$var'" "'$val'"'
 	fi
     done
-    "$emacsclient" --eval "(progn$args (spw/propagate-new-environment))"
+    [ -n "$args" ] \
+	&& "$emacsclient" --eval "(spw/update-environment$args))"
 fi
 
 # emacsclient(1) requires an argument.  As a special case, if there are no
-- 
cgit v1.2.3