Unbreak starting an X11 frame from a non-X11 Emacs daemon

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 096e9a529167140e61f113b24ff15425d3896e9e..690aaa70eacc9d7cc24121fd14c29ca49ce3d542 100644 (file)
--- 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 b7b61bcc5762bd3a7d5cf0a4d30cce3284124137..7a54efc23e7c5fffba49fb2ac535ad0322e218b6 100644 (file)
--- 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))