diff options
| author | Glenn Morris <[email protected]> | 2012-04-13 18:46:06 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-04-13 18:46:06 -0700 |
| commit | 35dc09a19c606f9e7a078df32d030451c7c90ba1 (patch) | |
| tree | 8df2ade99ad8620568094d61bba9dd4ac8856c43 /lib-src | |
| parent | 327732d994c98849c765659aa2164a7482b6beab (diff) | |
| parent | ad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7 (diff) | |
Merge from emacs-24, up to 2012-04-10T02:06:[email protected]
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index aad382de6d..9ebe8a177a 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-04-14 Juanma Barranquero <[email protected]> + + * emacsclient.c (decode_options) [WINDOWSNT]: + Call ttyname instead of passing its address (typo in 2011-12-04T17:13:[email protected]). + 2012-04-07 Eli Zaretskii <[email protected]> * makefile.w32-in (obj): Add xml.o. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 049886ed2b..05fd0f3515 100644 --- 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; } |