branch: externals/exwm commit 506f80e8fcf579a0beabf24b0f74a58824455bd2 Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
; Use unless --- exwm-workspace.el | 2 +- exwm.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exwm-workspace.el b/exwm-workspace.el index b6cc882753..a294d32689 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -980,7 +980,7 @@ INDEX must not exceed the current number of workspaces." (unless (exwm-workspace--active-p frame) (exwm-layout--hide id))))) ;; Update the 'exwm-selected-window' frame parameter. - (when (not (eq frame exwm-workspace--current)) + (unless (eq frame exwm-workspace--current) (with-current-buffer (exwm--id->buffer id) (set-frame-parameter frame 'exwm-selected-window (frame-root-window diff --git a/exwm.el b/exwm.el index 7e7605978f..7c95e53654 100644 --- a/exwm.el +++ b/exwm.el @@ -846,7 +846,7 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'." (when (/= owner xcb:Window:None) (when (eq replace 'ask) (setq replace (yes-or-no-p "Replace existing window manager? "))) - (when (not replace) + (unless replace (user-error "Other window manager detected"))) (let ((new-owner (xcb:generate-id exwm--connection))) (xcb:+request exwm--connection @@ -883,7 +883,7 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'." (cl-dotimes (i exwm--wmsn-acquire-timeout) (setq reply (xcb:+request-unchecked+reply exwm--connection (make-instance 'xcb:GetGeometry :drawable owner))) - (when (not reply) + (unless reply (cl-return)) (message "Waiting for other window manager to quit... %ds" i) (sleep-for 1))