mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Daniel Colascione 2012-10-19 19:42:02 -08:00
parent f0a8017501
commit 1a6e7e3807
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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> 2012-10-19 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (minibuffer-force-complete): Make the next completion use * minibuffer.el (minibuffer-force-complete): Make the next completion use

2
lisp/frame.el
View File

@ -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)) (error "Don't know how to create a frame on window system %s" w))
(unless (get w 'window-system-initialized) (unless (get w 'window-system-initialized)
(unless x-display-name
(setq x-display-name display))
(funcall (cdr (assq w window-system-initialization-alist))) (funcall (cdr (assq w window-system-initialization-alist)))
(put w 'window-system-initialized t)) (put w 'window-system-initialized t))