From 1091aba3a8b838870b290540164e7dc1b6756043 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Mon, 27 Dec 2021 18:56:54 +0100
Subject: [PATCH] [Emacs] Fix moving windows in EXWM

---
 org/config/emacs.org | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/org/config/emacs.org b/org/config/emacs.org
index 55cc8a0..a7105c3 100644
--- a/org/config/emacs.org
+++ b/org/config/emacs.org
@@ -3398,7 +3398,11 @@ workspaces 0 to 9.
                     `(,(kbd (format "s-%d" i)) .
                       (lambda ()
                         (interactive)
-                        (exwm-workspace-move-window ,i))))
+                        (exwm-workspace-move-window ,(let ((index (1- i)))
+                                                       (if (< index 0)
+                                                           (- 10 index)
+                                                         ;; FIXME: does not work with s-0
+                                                         index))))))
                   (number-sequence 0 9))))
 #+end_src