diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-03 13:57:16 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-06 22:43:59 -0600 |
| commit | 8f6e4798459a881b0a1602a1a0e30f0b73d49d22 (patch) | |
| tree | 3e8960e9d1a1e7642bad7b2402fbc10a0303ca44 /lisp/window.el | |
| parent | 08235af38c92e95d8ec9d268916d8910ea50ab2d (diff) | |
| download | emacs-8f6e4798459a881b0a1602a1a0e30f0b73d49d22.tar.gz | |
Use display-graphic-p and display-multi-frame-p in more cases
* lisp/disp-table.el:
* lisp/faces.el:
* lisp/frame.el:
* lisp/info.el (Info-fontify-node):
* lisp/window.el (handle-select-window): Use display-graphic-p and
display-multi-frame-p instead of explicit memq calls.
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el index b769be06337..b4f5ac5cc44 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -9314,6 +9314,8 @@ is active. This function is run by `mouse-autoselect-window-timer'." ;; autoselection. (mouse-autoselect-window-start mouse-position window))))) +(declare-function display-multi-frame-p "frame" (&optional display)) + (defun handle-select-window (event) "Handle select-window events." (interactive "^e") @@ -9351,7 +9353,7 @@ is active. This function is run by `mouse-autoselect-window-timer'." ;; we might get two windows with an active cursor. (select-window window) (cond - ((or (not (memq (window-system frame) '(x w32 ns))) + ((or (not (display-multi-frame-p)) (not focus-follows-mouse) ;; Focus FRAME if it's either a child frame or an ancestor ;; of the frame switched from. |