diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-10-19 19:42:02 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-10-19 19:42:02 -0800 |
| commit | 1a6e7e3807367b94c144d06fc2bdd1eb195731f7 (patch) | |
| tree | 91a1db9d0fc9e6726433419b4ad6c1365b2dc9c5 | |
| parent | f0a801750151bee7fdcf96dff272986e627fb3e3 (diff) | |
| download | emacs-1a6e7e3807367b94c144d06fc2bdd1eb195731f7.tar.gz | |
Unbreak starting an X11 frame from a non-X11 Emacs daemon
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/frame.el | 2 |
2 files changed, 8 insertions, 0 deletions
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 <dancol@dancol.org> + + * 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 <monnier@iro.umontreal.ca> * 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)) |