From 9eed52ee2b5a1366dfa5fdd3ad45328c554b356c Mon Sep 17 00:00:00 2001 From: Chris Feng Date: Wed, 2 Oct 2019 00:00:00 +0000 Subject: Avoid calling `x-focus-frame' on non-graphical frames * exwm-workspace.el (exwm-workspace--client-p): Also account for non-graphical frames. * exwm-input.el (exwm-input--on-minibuffer-setup) (exwm-input--on-minibuffer-exit): Exclude emacsclient frames. --- exwm-input.el | 2 ++ 1 file changed, 2 insertions(+) (limited to 'exwm-input.el') diff --git a/exwm-input.el b/exwm-input.el index 7833130d7811..2d3b48189826 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -1046,6 +1046,7 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences." (with-current-buffer (window-buffer (frame-selected-window exwm-workspace--current)) (when (and (derived-mode-p 'exwm-mode) + (not (exwm-workspace--client-p)) (eq exwm--selected-input-mode 'char-mode)) (exwm-input--grab-keyboard exwm--id)))) @@ -1055,6 +1056,7 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences." (with-current-buffer (window-buffer (frame-selected-window exwm-workspace--current)) (when (and (derived-mode-p 'exwm-mode) + (not (exwm-workspace--client-p)) (eq exwm--selected-input-mode 'char-mode) (eq exwm--input-mode 'line-mode)) (exwm-input--release-keyboard exwm--id)))) -- cgit 1.4.1