diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-11-09 07:28:27 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-11-09 07:28:27 +0100 |
| commit | d743088dc22da4b04000d22cb5a6c9b6e7d40c12 (patch) | |
| tree | 0f1e2a9c5e0c1c28826a02a56fb6d16166dd61a9 | |
| parent | 531bdce69da4206e8c050bac3b65d991be7f934f (diff) | |
| download | emacs-d743088dc22da4b04000d22cb5a6c9b6e7d40c12.tar.gz | |
* server.el (server-create-window-system-frame): Improved comment.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/server.el | 7 |
2 files changed, 10 insertions, 1 deletions
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 <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 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")) |