From 58390a943f84af99725a11e8ccb8841032b322d5 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Wed, 24 Mar 2021 12:09:24 +0100
Subject: [PATCH] Make sure arguments are quoted correctly in emacs wrappers

---
 modules/emacs.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/emacs.nix b/modules/emacs.nix
index dd633461..4599b129 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -41,9 +41,8 @@ in
           ".emacs.d/init.el".source = ./emacs/init.el;
         };
         packages = [
-          (pkgs.writeShellScriptBin "emacs" ''
-            ${emacsPkg}/bin/emacsclient -c $@
-          '')
+          (pkgs.writeShellScriptBin "emacs" ''${emacsPkg}/bin/emacsclient -c "$@"'')
+          (pkgs.writeShellScriptBin "emacsclient" ''${emacsPkg}/bin/emacsclient "$@"'')
         ];
         sessionVariables = { EDITOR = "emacs"; };
       };