summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/frame.el19
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index ff07999f804..e965007c8b0 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -698,16 +698,15 @@ setup is for focus to follow the pointer."
(run-hooks 'before-make-frame-hook)
(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 'environment and 'client parameters, if needed.
- (when (eq (frame-terminal frame) (frame-terminal oldframe))
- (let ((env (frame-parameter oldframe 'environment))
- (client (frame-parameter oldframe 'client)))
- (if (not (framep env))
- (setq env oldframe))
- (if (and env (not (assq 'environment parameters)))
- (set-frame-parameter frame 'environment env))
- (if (and client (not (assq 'client parameters)))
- (set-frame-parameter frame 'client client))))
+ ;; Inherit the 'environment and 'client parameters.
+ (let ((env (frame-parameter oldframe 'environment))
+ (client (frame-parameter oldframe 'client)))
+ (if (not (framep env))
+ (setq env oldframe))
+ (if (and env (not (assq 'environment parameters)))
+ (set-frame-parameter frame 'environment env))
+ (if (and client (not (assq 'client parameters)))
+ (set-frame-parameter frame 'client client)))
(run-hook-with-args 'after-make-frame-functions frame)
frame))