From 30790a37efea5c6fed87ee0dd0d54c31ac9eea11 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 26 May 2007 17:28:45 +0000 Subject: [PATCH] * emacsclient.c (main): Avoid having a declaration after a statement. * sysdep.c: Comment out text after #endif. --- lib-src/ChangeLog.multi-tty | 5 +++++ lib-src/emacsclient.c | 2 +- src/ChangeLog.multi-tty | 4 ++++ src/sysdep.c | 2 +- 4 files changed, 11 insertions(+), 2 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 + + * emacsclient.c (main): Avoid having a declaration after a + statement. + 2007-05-21 Juanma Barranquero * 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) { diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty index 94cf0cb50a7..dd349cf9b24 100644 --- a/src/ChangeLog.multi-tty +++ b/src/ChangeLog.multi-tty @@ -1,3 +1,7 @@ +2007-05-26 Dan Nicolaescu + + * sysdep.c: Comment out text after #endif. + 2007-05-20 L$,1 q(Brentey K,Aa(Broly * emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Revert to diff --git a/src/sysdep.c b/src/sysdep.c index ba55d2361bb..32efd7a056d 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2791,7 +2791,7 @@ sys_select (nfds, rfds, wfds, efds, timeout) } return ravail; } -#endif not WINDOWSNT +#endif /* not WINDOWSNT */ /* Read keyboard input into the standard buffer, waiting for at least one character. */ -- 2.39.5