maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regressions

Browse source 
(exwm-init): Do not signal an error on startup.

* exwm-floating.el (exwm-floating-toggle-floating):
* exwm-input (exwm-input-send-next-key)
(exwm-input-send-simulation-key):
* exwm-layout (exwm-layout-set-fullscreen)
(exwm-layout-unset-fullscreen, exwm-layout-toggle-fullscreen): Fix
incorrect use of `cl-return-from'.
This commit is contained in:
Chris Feng 2018-03-10 17:28:43 +08:00
parent cb8706f91c
commit 3f6c609a2b
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
exwm.el
View file

@ -757,7 +757,7 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'."
(setq exwm--wmsn-window new-owner))))
;;;###autoload
(defun exwm-init (&optional frame)
(cl-defun exwm-init (&optional frame)
"Initialize EXWM."
(interactive)
(if frame
@ -765,9 +765,11 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'."
(select-frame-set-input-focus frame)
(setq frame (selected-frame)))
(when (not (eq 'x (framep frame)))
(user-error "Not running under X environment"))
(message "[EXWM] Not running under X environment")
(cl-return-from exwm-init))
(when exwm--connection
(user-error "EXWM already running"))
(exwm--log "EXWM already running")
(cl-return-from exwm-init))
(condition-case err
(progn
(exwm-enable 'undo) ;never initialize again
@ -809,7 +811,7 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'."
((quit error)
(exwm-exit)
;; Rethrow error
(signal (car err) (cdr err)))))
(warn "[EXWM] EXWM fails to start (%s: %s)" (car err) (cdr err)))))
;;;###autoload