diff options
| author | Paul Eggert <[email protected]> | 2012-04-13 21:37:44 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2012-04-13 21:37:44 -0700 |
| commit | bdf35b6a6a78e444563a8e321ccb42b4b4a419bd (patch) | |
| tree | e96324ace186c7acc92182a255c3aa7ff315b82f /lib-src | |
| parent | 1530927cb9a3dca7c0f41975f2e9e62ef8be92a2 (diff) | |
| parent | d5e6342ed5e408014019c478ce16a47a2aad418b (diff) | |
Merge from trunk.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a9ad2a97ea..6c2d23bbf4 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,10 +1,14 @@ -2012-04-09 Paul Eggert <[email protected]> +2012-04-14 Paul Eggert <[email protected]> configure: new option --enable-gcc-warnings (Bug#11207) * Makefile.in (C_WARNINGS_SWITCH): Remove. (WARN_CFLAGS, WERROR_CFLAGS): New macros. (BASE_CFLAGS): Use new macros rather than old. +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; } |