about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Feng <chris.w.feng@gmail.com>2017-05-29T17·25+0800
committerChris Feng <chris.w.feng@gmail.com>2017-05-29T17·25+0800
commit851ed8c280cb9fe47f388773f3ee0ab90815fa99 (patch)
tree8789fd6889b3cd3b90cac678493b0b8f0cf5f14b
parent2babc8d070fdd1bc95391f66d49db33d6102cffb (diff)
Fix X display name comparison
* exwm-workspace--add-frame-as-workspace
(exwm-workspace--add-frame-as-workspace): Manually compare X display
names as there's no built-in function handles this correctly.
-rw-r--r--exwm-workspace.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/exwm-workspace.el b/exwm-workspace.el
index 3efd084525e1..302e82e6dfbe 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -1164,8 +1164,11 @@ Please check `exwm-workspace--minibuffer-own-frame-p' first."
     (exwm--log "Frame `%s' is already a workspace" frame))
    ((not (display-graphic-p frame))
     (exwm--log "Frame `%s' is not graphical" frame))
-   ((not (memq frame (frames-on-display-list (slot-value exwm--connection
-                                                         'display))))
+   ((not (string-equal
+          (replace-regexp-in-string "\\.0$" ""
+                                    (slot-value exwm--connection 'display))
+          (replace-regexp-in-string "\\.0$" ""
+                                    (frame-parameter frame 'display))))
     (exwm--log "Frame `%s' is on a different DISPLAY (%S instead of %S)"
                frame
                (frame-parameter frame 'display)