[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107818: lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Fix typo in revno:106608.

[Juanma Barranquero]

------------------------------------------------------------
revno: 107818
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-04-12 20:22:06 +0200
message:
  lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Fix typo in revno:106608.
  Call ttyname instead of passing its address.
modified:
  lib-src/ChangeLog
  lib-src/emacsclient.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-03-11 17:53:07 +0000
+++ b/lib-src/ChangeLog 2012-04-12 18:22:06 +0000
@@ -1,3 +1,8 @@
+2012-04-12  Juanma Barranquero  <address@hidden>
+
+       * emacsclient.c (decode_options) [WINDOWSNT]:
+       Call ttyname instead of passing its address (typo in revno:106608).
+
 2012-03-11  Andreas Schwab  <address@hidden>
 
        * emacsclient.c (main): Handle -print-nonl command.

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2012-03-11 17:53:07 +0000
+++ b/lib-src/emacsclient.c     2012-04-12 18:22:06 +0000
@@ -648,7 +648,7 @@
      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;
     }