diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-23 09:08:03 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-23 09:08:03 +0000 |
| commit | e7534fc4ed352b0d11dc3426d42f46482ed1353a (patch) | |
| tree | e94ed1548383edd649b53b6ceb90fd21898bbb25 /lib-src/emacsclient.c | |
| parent | 87248b44629da6aee00deb9d85e344e6fa27a2a6 (diff) | |
| download | emacs-e7534fc4ed352b0d11dc3426d42f46482ed1353a.tar.gz | |
* emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 668be6ce11d..559664f0d45 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -574,7 +574,15 @@ decode_options (argc, argv) 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) |