* server.el (server-create-window-system-frame): Improved comment.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bbc36cdf4c3960bc8d73ab4b2f43cadc0095616b..c5dd2eca746b8e6154b76ddb4b355843809492c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * server.el (server-create-window-system-frame): Improved comment.
+
 2012-11-08  Jan Djärv  <jan.h.d@swipnet.se>
 
        * server.el (server-create-window-system-frame): Handle Nextstep

diff --git a/lisp/server.el b/lisp/server.el
index ab0dc95a43fb1f24472b4c6f26e85eee31787455..c78e3e376aa49ab57312afec68f9c96ed37de6ee 100644 (file)
--- 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"))