[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110819: * server.el (server-create-window-system-frame): Handle Nextstep

[Jan D.]

------------------------------------------------------------
revno: 110819
fixes bug: http://debbugs.gnu.org/12780
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-11-08 20:25:39 +0100
message:
  * server.el (server-create-window-system-frame): Handle Nextstep
  specially.
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-08 18:35:08 +0000
+++ b/lisp/ChangeLog    2012-11-08 19:25:39 +0000
@@ -1,3 +1,8 @@
+2012-11-08  Jan Djärv  <address@hidden>
+
+       * server.el (server-create-window-system-frame): Handle Nextstep
+       specially (Bug#12780).
+
 2012-11-08  Glenn Morris  <address@hidden>
 
        * mail/emacsbug.el (report-emacs-bug-query-existing-bugs):

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2012-10-07 22:31:58 +0000
+++ b/lisp/server.el    2012-11-08 19:25:39 +0000
@@ -842,6 +842,10 @@
     (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