From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 21 Sep 2007 03:21:54 +0000 (+0000)
Subject: (decode_options): -t implies -c.
X-Git-Tag: emacs-pretest-23.0.90~10787
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1b8e8966d550f11fc14aeffe59fbed73ae1cbd8;p=emacs.git

(decode_options): -t implies -c.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9bb80585f47..62c6b6766aa 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacsclient.c (decode_options): -t implies -c.
+
 2007-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 4788c010bf8..02935941b02 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -436,6 +436,7 @@ decode_options (argc, argv)
 
         case 't':
           tty = 1;
+	  current_frame = 0;
           break;
 
         case 'c':