Mercurial > emacs

changeset 83628:7a881fda2c3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* emacsclient.c (main): Avoid having a declaration after a statement. * sysdep.c: Comment out text after #endif.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 26 May 2007 17:28:45 +0000
parents 422451dd396a
children 4c726a40604c
files lib-src/ChangeLog.multi-tty lib-src/emacsclient.c src/ChangeLog.multi-tty src/sysdep.c
diffstat 4 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/ChangeLog.multi-tty	Fri May 25 02:47:22 2007 +0000
+++ b/lib-src/ChangeLog.multi-tty	Sat May 26 17:28:45 2007 +0000
@@ -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
--- a/lib-src/emacsclient.c	Fri May 25 02:47:22 2007 +0000
+++ b/lib-src/emacsclient.c	Sat May 26 17:28:45 2007 +0000
@@ -1347,11 +1347,11 @@
 
   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)
         {
--- a/src/ChangeLog.multi-tty	Fri May 25 02:47:22 2007 +0000
+++ b/src/ChangeLog.multi-tty	Sat May 26 17:28:45 2007 +0000
@@ -1,3 +1,7 @@
+2007-05-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* sysdep.c: Comment out text after #endif.
+
 2007-05-20  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
 
 	* emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Revert to
--- a/src/sysdep.c	Fri May 25 02:47:22 2007 +0000
+++ b/src/sysdep.c	Sat May 26 17:28:45 2007 +0000
@@ -2791,7 +2791,7 @@
     }
   return ravail;
 }
-#endif not WINDOWSNT
+#endif /* not WINDOWSNT */
 
 /* Read keyboard input into the standard buffer,
    waiting for at least one character.  */