lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Fix typo in 2011-12-04T17:13...

Call ttyname instead of passing its address.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2384599caf23c3c42fffe365d3302a4e1a78e0a1..dd10026447fd7ff781fe7a9b91e91dc9c2207999 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-12  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacsclient.c (decode_options) [WINDOWSNT]:
+       Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com).
+
 2012-03-11  Andreas Schwab  <schwab@linux-m68k.org>
 
        * emacsclient.c (main): Handle -print-nonl command.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 049886ed2badac18c415fbe916c034c11d9757ef..05fd0f3515e718564d0e8ba84096b77d0b3dc231 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -648,7 +648,7 @@ decode_options (int argc, char **argv)
      server.el check whether it makes sense.  */
   if (tty || !current_frame)
     {
-      display = (const char *) ttyname;
+      display = (const char *) ttyname (0);  /* Arg is ignored.  */
       current_frame = 0;
       tty = 1;
     }