summaryrefslogtreecommitdiff
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
authorDaniel Colascione <dancol@dancol.org>2012-09-17 03:55:05 -0800
committerDaniel Colascione <dancol@dancol.org>2012-09-17 03:55:05 -0800
commitefc3dd3ccceae28db0a3fde54ed00478ff77c2e2 (patch)
tree19d4077c435c3fcc678c30fccbd2aa18b2f60ce1 /lib-src/emacsclient.c
parentce9f00e4e53c3a55cb78fa3dd1043d8f59ed47e3 (diff)
downloademacs-efc3dd3ccceae28db0a3fde54ed00478ff77c2e2.tar.gz
Detect window-system from display name
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 9c222b6be66..8d60d7961da 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -597,7 +597,7 @@ decode_options (int argc, char **argv)
#if defined (NS_IMPL_COCOA)
alt_display = "ns";
#elif defined (HAVE_NTGUI)
- alt_display = "windows";
+ alt_display = "w32";
#endif
display = egetenv ("DISPLAY");
@@ -1599,7 +1599,7 @@ main (int argc, char **argv)
}
#ifdef HAVE_NTGUI
- if (display && !strcmp (display, "windows"))
+ if (display && !strcmp (display, "w32"))
w32_give_focus ();
#endif /* HAVE_NTGUI */