# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1225495033 0
# Node ID 4069e1395eca487e7c5cd4401e1984f5a3352d2b
# Parent  83b76f085b713d6c445bfa54dfbc75f4ce9d42ca
(main): Don't force sending tty when in eval mode.

diff -r 83b76f085b71 -r 4069e1395eca lib-src/ChangeLog
--- 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
diff -r 83b76f085b71 -r 4069e1395eca lib-src/emacsclient.c
--- 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;