summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2007-05-26 17:28:45 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2007-05-26 17:28:45 +0000
commit30790a37efea5c6fed87ee0dd0d54c31ac9eea11 (patch)
tree8dff3a7d4eeffd47233240ee672838a0f32609a0 /lib-src
parent98db66cac2e07862a43014b57ebcc2f0fbfc07e6 (diff)
downloademacs-30790a37efea5c6fed87ee0dd0d54c31ac9eea11.tar.gz
* emacsclient.c (main): Avoid having a declaration after a
statement. * sysdep.c: Comment out text after #endif.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog.multi-tty5
-rw-r--r--lib-src/emacsclient.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty
index 6812eeef847..dcd1713294c 100644
--- a/lib-src/ChangeLog.multi-tty
+++ b/lib-src/ChangeLog.multi-tty
@@ -1,3 +1,8 @@
+2007-05-26 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * emacsclient.c (main): Avoid having a declaration after a
+ statement.
+
2007-05-21 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (print_help_and_exit): Restore and adapt trunk
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 0356735ab6d..0dc662dabef 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1347,11 +1347,11 @@ main (argc, argv)
if (tty)
{
+ char *type = getenv ("TERM");
char *tty_name = NULL;
#ifndef WINDOWSNT
tty_name = ttyname (fileno (stdin));
#endif
- char *type = getenv ("TERM");
if (! tty_name)
{