Mercurial > emacs

diff lib-src/emacsclient.c @ 101397:b4aa70dece55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
author Adrian Robert <Adrian.B.Robert@gmail.com>
date Fri, 23 Jan 2009 09:08:03 +0000
parents a9f7e446141d
children 02f766280fad
line wrap: on
line diff
--- a/lib-src/emacsclient.c	Fri Jan 23 08:00:23 2009 +0000
+++ b/lib-src/emacsclient.c	Fri Jan 23 09:08:03 2009 +0000
@@ -574,7 +574,15 @@
      inconvenient.  So we force users to use "--display $DISPLAY" if
      they want Emacs to connect to their current display.  */
   if (!current_frame && !tty && !display)
-    display = egetenv ("DISPLAY");
+    {
+      display = egetenv ("DISPLAY");
+#ifdef NS_IMPL_COCOA
+      /* Under Cocoa, we don't really use displays the same way as in X,
+         so provide a dummy. */
+      if (!display || strlen (display) == 0)
+        display = "ns";
+#endif
+    }
 
   /* A null-string display is invalid.  */
   if (display && strlen (display) == 0)