From 531bdce69da4206e8c050bac3b65d991be7f934f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Thu, 8 Nov 2012 20:25:39 +0100
Subject: [PATCH] * server.el (server-create-window-system-frame): Handle
 Nextstep specially.

Fixes: debbugs:12780
---
 lisp/ChangeLog | 5 +++++
 lisp/server.el | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd5acb56d13..bbc36cdf4c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* server.el (server-create-window-system-frame): Handle Nextstep
+	specially (Bug#12780).
+
 2012-11-08  Glenn Morris  <rgm@gnu.org>
 
 	* mail/emacsbug.el (report-emacs-bug-query-existing-bugs):
diff --git a/lisp/server.el b/lisp/server.el
index 7a356a90378..ab0dc95a43f 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -842,6 +842,10 @@ 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.
+    (if (featurep 'ns-win)
+	(setq w 'ns display "ns"))
+
     (cond (w
            ;; Flag frame as client-created, but use a dummy client.
            ;; This will prevent the frame from being deleted when