diff options
| author | Juanma Barranquero | 2008-12-10 22:18:21 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-12-10 22:18:21 +0000 |
| commit | 5201664703b80b3c013e3e113d4e7ee6a4d91e03 (patch) | |
| tree | dcbfbd239569c6aa10f520924580212b9c6873c4 | |
| parent | ecc69b6579121e5e2e64ace69a53953a19f2f38e (diff) | |
| download | emacs-5201664703b80b3c013e3e113d4e7ee6a4d91e03.tar.gz emacs-5201664703b80b3c013e3e113d4e7ee6a4d91e03.zip | |
* emacsclient.c (main): Fix mindless breakage where emacsclient
does not work *at all* on Windows, even if it *can* connect.
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f58c5d04b50..d54f8adaac5 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-12-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacsclient.c (main): Fix mindless breakage where emacsclient | ||
| 4 | does not work *at all* on Windows, even if it *can* connect. | ||
| 5 | |||
| 1 | 2008-12-10 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2008-12-10 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | * emacsclient.c (EMACS_DAEMON): Remove definition. | 8 | * emacsclient.c (EMACS_DAEMON): Remove definition. |
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 56e8b5b9859..19812784a7b 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -1519,8 +1519,10 @@ main (argc, argv) | |||
| 1519 | } | 1519 | } |
| 1520 | else | 1520 | else |
| 1521 | fail (); | 1521 | fail (); |
| 1522 | #ifndef WINDOWSNT | ||
| 1522 | else | 1523 | else |
| 1523 | fail (); | 1524 | fail (); |
| 1525 | #endif | ||
| 1524 | 1526 | ||
| 1525 | cwd = get_current_dir_name (); | 1527 | cwd = get_current_dir_name (); |
| 1526 | if (cwd == 0) | 1528 | if (cwd == 0) |