Merge branch 'medranocalvo/abort-recursive-edit-on-workspace-switch' into externals/exwm

This commit is contained in:
Chris Feng 2020-05-05 00:00:00 +00:00
commit 21a7341972

View file

@ -635,12 +635,6 @@ for internal use only."
(select-window window) (select-window window)
(x-focus-frame (window-frame window)) ;The real input focus. (x-focus-frame (window-frame window)) ;The real input focus.
(set-frame-parameter frame 'exwm-selected-window nil) (set-frame-parameter frame 'exwm-selected-window nil)
;; Close the (possible) active minibuffer
(when (active-minibuffer-window)
(exwm--defer 0 (lambda ()
;; Might be aborted by then.
(when (active-minibuffer-window)
(abort-recursive-edit)))))
(if (exwm-workspace--minibuffer-own-frame-p) (if (exwm-workspace--minibuffer-own-frame-p)
;; Resize the minibuffer frame. ;; Resize the minibuffer frame.
(exwm-workspace--resize-minibuffer-frame) (exwm-workspace--resize-minibuffer-frame)