mirror of
https://github.com/ch11ng/exwm.git
synced 2024-11-27 13:07:59 +01:00
Minor fixes for past few commits
* exwm-input.el (exwm-input--unread-event): Temporarily disable it due to bug#23980. * exwm-workspace.el (exwm-workspace--init): Set the default frame internal border to 0. * exwm-workspace.el (exwm-workspace--remove-frame-as-workspace): Fix a typo.
This commit is contained in:
parent
5529790b03
commit
f4d89d7e2f
2 changed files with 4 additions and 5 deletions
|
@ -323,7 +323,7 @@ This value should always be overwritten.")
|
||||||
;; add it into (this-command-keys) there, we use `unread-command-events'
|
;; add it into (this-command-keys) there, we use `unread-command-events'
|
||||||
;; differently on Emacs 24 and 25.
|
;; differently on Emacs 24 and 25.
|
||||||
(eval-and-compile
|
(eval-and-compile
|
||||||
(if (< emacs-major-version 25)
|
(if (< emacs-major-version 26)
|
||||||
(defsubst exwm-input--unread-event (event)
|
(defsubst exwm-input--unread-event (event)
|
||||||
(setq unread-command-events
|
(setq unread-command-events
|
||||||
(append unread-command-events (list event))))
|
(append unread-command-events (list event))))
|
||||||
|
|
|
@ -1203,7 +1203,7 @@ Please check `exwm-workspace--minibuffer-own-frame-p' first."
|
||||||
(exwm--log "Removing frame `%s' as workspace" frame)
|
(exwm--log "Removing frame `%s' as workspace" frame)
|
||||||
(when (= 1 (exwm-workspace--count))
|
(when (= 1 (exwm-workspace--count))
|
||||||
;; The user managed to delete the last workspace, so create a new one.
|
;; The user managed to delete the last workspace, so create a new one.
|
||||||
(exwm--log "Last worksapce deleted; create a new one")
|
(exwm--log "Last workspace deleted; create a new one")
|
||||||
(let ((exwm-workspace--create-silently t))
|
(let ((exwm-workspace--create-silently t))
|
||||||
(make-frame)))
|
(make-frame)))
|
||||||
(let* ((index (exwm-workspace--position frame))
|
(let* ((index (exwm-workspace--position frame))
|
||||||
|
@ -1289,6 +1289,8 @@ applied to all subsequently created X frames."
|
||||||
"Initialize workspace module."
|
"Initialize workspace module."
|
||||||
;; Prevent unexpected exit
|
;; Prevent unexpected exit
|
||||||
(setq confirm-kill-emacs #'exwm-workspace--confirm-kill-emacs)
|
(setq confirm-kill-emacs #'exwm-workspace--confirm-kill-emacs)
|
||||||
|
(exwm-workspace--modify-all-x-frames-parameters
|
||||||
|
'((internal-border-width . 0)))
|
||||||
(let ((initial-workspaces (frame-list)))
|
(let ((initial-workspaces (frame-list)))
|
||||||
(if (not (exwm-workspace--minibuffer-own-frame-p))
|
(if (not (exwm-workspace--minibuffer-own-frame-p))
|
||||||
;; Initialize workspaces with minibuffers.
|
;; Initialize workspaces with minibuffers.
|
||||||
|
@ -1309,7 +1311,6 @@ applied to all subsequently created X frames."
|
||||||
(make-frame '((window-system . x) (minibuffer . only)
|
(make-frame '((window-system . x) (minibuffer . only)
|
||||||
(left . 10000) (right . 10000)
|
(left . 10000) (right . 10000)
|
||||||
(width . 1) (height . 1)
|
(width . 1) (height . 1)
|
||||||
(internal-border-width . 0)
|
|
||||||
(client . nil))))
|
(client . nil))))
|
||||||
;; Remove/hide existing frames.
|
;; Remove/hide existing frames.
|
||||||
(dolist (f initial-workspaces)
|
(dolist (f initial-workspaces)
|
||||||
|
@ -1370,7 +1371,6 @@ applied to all subsequently created X frames."
|
||||||
(add-hook 'echo-area-clear-hook #'exwm-workspace--on-echo-area-clear)
|
(add-hook 'echo-area-clear-hook #'exwm-workspace--on-echo-area-clear)
|
||||||
;; Recreate one frame with the external minibuffer set.
|
;; Recreate one frame with the external minibuffer set.
|
||||||
(setq initial-workspaces (list (make-frame '((window-system . x)
|
(setq initial-workspaces (list (make-frame '((window-system . x)
|
||||||
(internal-border-width . 0)
|
|
||||||
(client . nil)))))
|
(client . nil)))))
|
||||||
;; The default behavior of `display-buffer' (indirectly called by
|
;; The default behavior of `display-buffer' (indirectly called by
|
||||||
;; `minibuffer-completion-help') is not correct here.
|
;; `minibuffer-completion-help') is not correct here.
|
||||||
|
@ -1384,7 +1384,6 @@ applied to all subsequently created X frames."
|
||||||
;; Create remaining workspaces.
|
;; Create remaining workspaces.
|
||||||
(dotimes (_ (- exwm-workspace-number (length initial-workspaces)))
|
(dotimes (_ (- exwm-workspace-number (length initial-workspaces)))
|
||||||
(nconc initial-workspaces (list (make-frame '((window-system . x)
|
(nconc initial-workspaces (list (make-frame '((window-system . x)
|
||||||
(internal-border-width . 0)
|
|
||||||
(client . nil))))))
|
(client . nil))))))
|
||||||
;; Configure workspaces
|
;; Configure workspaces
|
||||||
(dolist (i initial-workspaces)
|
(dolist (i initial-workspaces)
|
||||||
|
|
Loading…
Reference in a new issue