From 55cec760ca3cee21e735bff9a9a5229b222b97ff Mon Sep 17 00:00:00 2001 From: Chris Feng Date: Sun, 21 Feb 2016 20:19:45 +0800 Subject: Fix emacsclient related issues * exwm-systemtray.el (exwm-systemtray-height): The value is not available when emacsclient has just loaded the library (and it crashes emacsclient). * exwm-workspace.el (exwm-workspace--init): Set `default-minibuffer-frame' later to prevent it from being modified when using emacsclient. * exwm-floating.el: * exwm-randr.el: * exwm-systemtray.el: * exwm-workspace.el: * exwm.el: Use `exwm-workspace--minibuffer-own-frame-p' instead of the raw variable. --- exwm-floating.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'exwm-floating.el') diff --git a/exwm-floating.el b/exwm-floating.el index 97d673c15bd7..b56201914e60 100644 --- a/exwm-floating.el +++ b/exwm-floating.el @@ -53,7 +53,6 @@ (defvar exwm-workspace--list) (defvar exwm-workspace-current-index) (defvar exwm-workspace--switch-history-outdated) -(defvar exwm-workspace-minibuffer-position) (declare-function exwm-layout--refresh "exwm-layout.el") (declare-function exwm-layout--show "exwm-layout.el") @@ -104,7 +103,7 @@ ;; FIXME: check normal hints restrictions (let* ((display-width (frame-pixel-width original-frame)) (display-height (- (frame-pixel-height original-frame) - (if exwm-workspace-minibuffer-position + (if (exwm-workspace--minibuffer-own-frame-p) 0 (window-pixel-height (minibuffer-window original-frame))) -- cgit 1.4.1