diff options
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 1c11829475b..df3ed16f574 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -292,8 +292,9 @@ there (in decreasing order of priority)." ;; the buffer of the selected window, which fails when the selected ;; window is the minibuffer. (let ((old-buffer (current-buffer)) - (window-system-frame-alist (cdr (assq initial-window-system - window-system-default-frame-alist)))) + (window-system-frame-alist + (cdr (assq initial-window-system + window-system-default-frame-alist)))) (when (and frame-notice-user-settings (null frame-initial-frame)) @@ -599,6 +600,8 @@ is not considered (see `next-frame')." 0)) (select-frame-set-input-focus (selected-frame))) +(declare-function x-initialize-window-system "term/x-win" ()) + (defun make-frame-on-display (display &optional parameters) "Make a frame on X display DISPLAY. The optional second argument PARAMETERS specifies additional frame parameters." @@ -714,7 +717,8 @@ setup is for focus to follow the pointer." (let ((type (terminal-live-p (cdr (assq 'terminal parameters))))) (cond ((eq type t) nil) - ((eq type nil) (error "Terminal %s does not exist" (cdr (assq 'terminal parameters)))) + ((eq type nil) (error "Terminal %s does not exist" + (cdr (assq 'terminal parameters)))) (t type)))) ((assq 'window-system parameters) (cdr (assq 'window-system parameters))) @@ -725,7 +729,10 @@ setup is for focus to follow the pointer." (unless frame-creation-function (error "Don't know how to create a frame on window system %s" w)) (run-hooks 'before-make-frame-hook) - (setq frame (funcall frame-creation-function (append parameters (cdr (assq w window-system-default-frame-alist))))) + (setq frame + (funcall frame-creation-function + (append parameters + (cdr (assq w window-system-default-frame-alist))))) (normal-erase-is-backspace-setup-frame frame) ;; Inherit the original frame's parameters. (dolist (param frame-inherited-parameters) @@ -1126,6 +1133,8 @@ bars (top, bottom, or nil)." "Return the terminal that is now selected." (frame-terminal (selected-frame))) +(declare-function msdos-mouse-p "dosfns.c") + (defun display-mouse-p (&optional display) "Return non-nil if DISPLAY has a mouse available. DISPLAY can be a display name, a frame, or nil (meaning the selected |