mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

Browse source
This commit is contained in:
Glenn Morris 2012-04-13 18:46:06 -07:00
commit 35dc09a19c
96 changed files with 1226 additions and 694 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib-src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-14 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-04-07 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (obj): Add xml.o.

2
lib-src/emacsclient.c
View file

@ -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;
}