summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-09-21 03:21:54 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-09-21 03:21:54 +0000
commitc1b8e8966d550f11fc14aeffe59fbed73ae1cbd8 (patch)
treecaace471888659247d385da5421517390467279f /lib-src
parentdf3c9fe76a35f0bd541d49eabdd94bde4b4ec46a (diff)
downloademacs-c1b8e8966d550f11fc14aeffe59fbed73ae1cbd8.tar.gz
(decode_options): -t implies -c.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/emacsclient.c1
2 files changed, 5 insertions, 0 deletions
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':