From: Jan Djärv Date: Fri, 9 Nov 2012 06:28:27 +0000 (+0100) Subject: * server.el (server-create-window-system-frame): Improved comment. X-Git-Tag: emacs-24.2.90~131 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d743088dc22da4b04000d22cb5a6c9b6e7d40c12;p=emacs.git * server.el (server-create-window-system-frame): Improved comment. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bbc36cdf4c3..c5dd2eca746 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-11-09 Jan Djärv + + * server.el (server-create-window-system-frame): Improved comment. + 2012-11-08 Jan Djärv * server.el (server-create-window-system-frame): Handle Nextstep diff --git a/lisp/server.el b/lisp/server.el index ab0dc95a43f..c78e3e376aa 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -842,7 +842,12 @@ This handles splitting the command if it would be bigger than (unless (assq w window-system-initialization-alist) (setq w nil)) - ;; Special case for ns. + ;; Special case for ns. This is because DISPLAY may not be set at all + ;; which in the ns case isn't an error. The variable display then becomes + ;; the fully qualified hostname, which make-frame-on-display below + ;; does not understand and throws an error. + ;; It may also be a valid X display, but if Emacs is compiled for ns, it + ;; can not make X frames. (if (featurep 'ns-win) (setq w 'ns display "ns"))