procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.

Browse source
This commit is contained in:
Adrian Robert 2009-01-23 09:08:03 +00:00
parent 87248b4462
commit e7534fc4ed
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib-src/ChangeLog
View file

@ -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.

10
lib-src/emacsclient.c
View file

@ -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)