[Emacs-diffs] /srv/bzr/emacs/trunk r110595: Unbreak starting an X11 frame from a non-X11 Emacs daemon

[Daniel Colascione]

------------------------------------------------------------
revno: 110595
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-19 19:42:02 -0800
message:
  Unbreak starting an X11 frame from a non-X11 Emacs daemon
modified:
  lisp/ChangeLog
  lisp/frame.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-19 18:59:36 +0000
+++ b/lisp/ChangeLog    2012-10-20 03:42:02 +0000
@@ -1,3 +1,9 @@
+2012-10-20  Daniel Colascione  <address@hidden>
+
+       * 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  <address@hidden>
 
        * minibuffer.el (minibuffer-force-complete): Make the next completion 
use

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2012-09-17 12:07:36 +0000
+++ b/lisp/frame.el     2012-10-20 03:42:02 +0000
@@ -655,6 +655,8 @@
       (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))