diff options
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cbfb6ed2254..92625428b2e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2009-01-23 Adrian Robert <Adrian.B.Robert@gmail.com> + + * emacsclient.c (decode_options): Use a dummy display name under + NS/Cocoa. + 2009-01-14 Lars Rasmusson <lars.rasmusson@gmail.com> (tiny change) * ebrowse.c (matching_regexp): Fix OB1 error. 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) |