procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.

Browse source 
(w32_getenv): Treat $TERM specially: if not found in the environment and in
the Registry, return "w32console".
(ttyname) [WINDOWSNT]: New function.
This commit is contained in:
Eli Zaretskii 2008-11-01 13:49:23 +00:00
parent 662bea29a5
commit d41784eef4
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib-src/ChangeLog
View file

@ -1,3 +1,11 @@
2008-11-01 Eli Zaretskii <eliz@gnu.org>
* emacsclient.c (main) [WINDOWSNT]: Don't ifdef away the call to
`ttyname'.
(w32_getenv): Treat $TERM specially: if not found in the
environment and in the Registry, return "w32console".
(ttyname) [WINDOWSNT]: New function.
2008-10-31 Andreas Schwab <schwab@suse.de>
* emacsclient.c (main): Don't force sending tty when in eval mode.

21
lib-src/emacsclient.c
View file

@ -353,8 +353,13 @@ w32_getenv (envvar)
if (! (value = w32_get_resource (HKEY_CURRENT_USER, envvar, &dwType)) &&
! (value = w32_get_resource (HKEY_LOCAL_MACHINE, envvar, &dwType)))
/* Not found in the registry. */
return NULL;
{
/* "w32console" is what Emacs on Windows uses for tty-type under -nw. */
if (strcmp (envvar, "TERM") == 0)
return xstrdup ("w32console");
/* Found neither in the environment nor in the registry. */
return NULL;
}
if (dwType == REG_SZ)
/* Registry; no need to expand. */
@ -435,6 +440,13 @@ w32_execvp (path, argv)
#undef execvp
#define execvp w32_execvp
/* Emulation of ttyname for Windows. */
char *
ttyname (int fd)
{
return "CONOUT$";
}
#endif /* WINDOWSNT */
/* Display a normal or error message.
@ -570,10 +582,8 @@ decode_options (argc, argv)
if (!tty && display)
window_system = 1;
#if !defined (WINDOWSNT)
else if (!current_frame)
tty = 1;
#endif
/* --no-wait implies --current-frame on ttys when there are file
arguments or expressions given. */
@ -1444,9 +1454,8 @@ main (argc, argv)
{
char *type = egetenv ("TERM");
char *tty_name = NULL;
#ifndef WINDOWSNT
tty_name = ttyname (fileno (stdout));
#endif
if (! tty_name)
{