diff options
| author | Daniel Colascione | 2012-09-17 03:55:05 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-09-17 03:55:05 -0800 |
| commit | efc3dd3ccceae28db0a3fde54ed00478ff77c2e2 (patch) | |
| tree | 19d4077c435c3fcc678c30fccbd2aa18b2f60ce1 /lib-src | |
| parent | ce9f00e4e53c3a55cb78fa3dd1043d8f59ed47e3 (diff) | |
| download | emacs-efc3dd3ccceae28db0a3fde54ed00478ff77c2e2.tar.gz emacs-efc3dd3ccceae28db0a3fde54ed00478ff77c2e2.zip | |
Detect window-system from display name
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 4 |
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) | |||
| 597 | #if defined (NS_IMPL_COCOA) | 597 | #if defined (NS_IMPL_COCOA) |
| 598 | alt_display = "ns"; | 598 | alt_display = "ns"; |
| 599 | #elif defined (HAVE_NTGUI) | 599 | #elif defined (HAVE_NTGUI) |
| 600 | alt_display = "windows"; | 600 | alt_display = "w32"; |
| 601 | #endif | 601 | #endif |
| 602 | 602 | ||
| 603 | display = egetenv ("DISPLAY"); | 603 | display = egetenv ("DISPLAY"); |
| @@ -1599,7 +1599,7 @@ main (int argc, char **argv) | |||
| 1599 | } | 1599 | } |
| 1600 | 1600 | ||
| 1601 | #ifdef HAVE_NTGUI | 1601 | #ifdef HAVE_NTGUI |
| 1602 | if (display && !strcmp (display, "windows")) | 1602 | if (display && !strcmp (display, "w32")) |
| 1603 | w32_give_focus (); | 1603 | w32_give_focus (); |
| 1604 | #endif /* HAVE_NTGUI */ | 1604 | #endif /* HAVE_NTGUI */ |
| 1605 | 1605 | ||