branch: externals/exwm
commit f0d924bcf610cf3adcd89ae0ab129199a6b1cab9
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Assert (not exwm--connection) in exwm--init
* exwm.el (exwm--init): exwm--init is only called when exwm--connection is
nil.
---
exwm.el | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/exwm.el b/exwm.el
index 73f18424e7..5c20c95025 100644
--- a/exwm.el
+++ b/exwm.el
@@ -913,16 +913,14 @@ manager. If t, replace it, if nil, abort and ask the
user if `ask'."
"Initialize EXWM.
FRAME, if given, indicates the X display EXWM should manage."
(exwm--log "%s" frame)
+ (cl-assert (not exwm--connection))
(if frame
- ;; The frame might not be selected if it's created by emacslicnet.
+ ;; The frame might not be selected if it's created by emacsclient.
(select-frame-set-input-focus frame)
(setq frame (selected-frame)))
(when (not (eq 'x (framep frame)))
(message "[EXWM] Not running under X environment")
(cl-return-from exwm--init))
- (when exwm--connection
- (exwm--log "EXWM already running")
- (cl-return-from exwm--init))
(condition-case err
(progn
;; Never initialize again
