diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-04-06 18:06:39 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-04-06 18:06:39 +0400 |
| commit | ebb19708e7c76af8eee5534e25de5fa0949c14b4 (patch) | |
| tree | 28a573147e83305bf16256fc6bf58af61408432c /lisp/term/w32-win.el | |
| parent | 33bb237a73a4ba97f21e673dac36b1f8c1299289 (diff) | |
| download | emacs-ebb19708e7c76af8eee5534e25de5fa0949c14b4.tar.gz | |
Do not set x-display-name until X connection is established.
This is needed to prevent from weird situation described at
<http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00212.html>.
* frame.el (make-frame): Set x-display-name after call to
window system initialization function, not before.
* term/x-win.el (x-initialize-window-system): Add optional
display argument and use it.
* term/w32-win.el (w32-initialize-window-system):
* term/ns-win.el (ns-initialize-window-system):
* term/pc-win.el (msdos-initialize-window-system):
Add compatible optional display argument.
Diffstat (limited to 'lisp/term/w32-win.el')
| -rw-r--r-- | lisp/term/w32-win.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index cbd08e68a39..b0f65812eab 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -246,7 +246,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (declare-function x-parse-geometry "frame.c" (string)) (defvar x-command-line-resources) -(defun w32-initialize-window-system () +(defun w32-initialize-window-system (&optional display) "Initialize Emacs for W32 GUI frames." (cl-assert (not w32-initialized)) |