Mercurial > emacs
changeset 99297:4069e1395eca
(main): Don't force sending tty when in eval mode.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Fri, 31 Oct 2008 23:17:13 +0000 |
| parents | 83b76f085b71 |
| children | 225286546090 |
| files | lib-src/ChangeLog lib-src/emacsclient.c |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Fri Oct 31 22:45:53 2008 +0000 +++ b/lib-src/ChangeLog Fri Oct 31 23:17:13 2008 +0000 @@ -1,3 +1,7 @@ +2008-10-31 Andreas Schwab <schwab@suse.de> + + * emacsclient.c (main): Don't force sending tty when in eval mode. + 2008-10-30 Chong Yidong <cyd@stupidchicken.com> * emacsclient.c (main): If using the current frame, send tty
--- a/lib-src/emacsclient.c Fri Oct 31 22:45:53 2008 +0000 +++ b/lib-src/emacsclient.c Fri Oct 31 23:17:13 2008 +0000 @@ -1440,7 +1440,7 @@ /* If using the current frame, send tty information to Emacs anyway. In daemon mode, Emacs may need to occupy this tty if no other frame is available. */ - if (tty || current_frame) + if (tty || (current_frame && !eval)) { char *type = egetenv ("TERM"); char *tty_name = NULL;