From: Daniel Colascione Date: Sat, 20 Oct 2012 03:42:02 +0000 (-0800) Subject: Unbreak starting an X11 frame from a non-X11 Emacs daemon X-Git-Tag: emacs-24.2.90~211^2~35 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a6e7e3807367b94c144d06fc2bdd1eb195731f7;p=emacs.git Unbreak starting an X11 frame from a non-X11 Emacs daemon --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 096e9a52916..690aaa70eac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-10-20 Daniel Colascione + + * frame.el (make-frame): Set x-display-name as we used to in order + to unbreak creating an X11 frame from an Emacs daemon started + without a display. + 2012-10-19 Stefan Monnier * minibuffer.el (minibuffer-force-complete): Make the next completion use diff --git a/lisp/frame.el b/lisp/frame.el index b7b61bcc576..7a54efc23e7 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -655,6 +655,8 @@ the new frame according to its own rules." (error "Don't know how to create a frame on window system %s" w)) (unless (get w 'window-system-initialized) + (unless x-display-name + (setq x-display-name display)) (funcall (cdr (assq w window-system-initialization-alist))) (put w 'window-system-initialized t))