[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110820: * server.el (server-create-window-system-frame): Improved comment.

[Jan D.]

------------------------------------------------------------
revno: 110820
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-11-09 07:27:01 +0100
message:
  * server.el (server-create-window-system-frame): Improved comment.
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-08 19:25:39 +0000
+++ b/lisp/ChangeLog    2012-11-09 06:27:01 +0000
@@ -1,3 +1,7 @@
+2012-11-09  Jan Djärv  <address@hidden>
+
+       * server.el (server-create-window-system-frame): Improved comment.
+
 2012-11-08  Jan Djärv  <address@hidden>
 
        * server.el (server-create-window-system-frame): Handle Nextstep

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2012-11-08 19:25:39 +0000
+++ b/lisp/server.el    2012-11-09 06:27:01 +0000
@@ -842,7 +842,11 @@
     (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.
+    ;; 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"))