Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.

[gnu-emacs] / nt / cmdproxy.c

diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 7c68f868658463551f4d0f7261d32a68af01783e..b9572570c5f5f7bc24798356bcf3b4abc12d2ff2 100644 (file)
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,6 +1,5 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-     2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatibility
    with elisp code written for Unix.  When possible, executes external
@@ -34,6 +33,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <malloc.h>  /* alloca */
 #include <stdlib.h>  /* getenv */
 #include <string.h>  /* strlen */
+#include <ctype.h>   /* isspace, isalpha */
 
 /* We don't want to include stdio.h because we are already duplicating
    lots of it here */
@@ -252,7 +252,6 @@ make_absolute (const char *prog)
   char curdir[MAX_PATH];
   char *p, *path;
   const char *fname;
-  int i;
 
   /* At least partial absolute path specified; search there.  */
   if ((isalpha (prog[0]) && prog[1] == ':') ||
@@ -718,5 +717,3 @@ main (int argc, char ** argv)
   return 0;
 }
 
-/* arch-tag: 88678d93-07ac-4e2f-ad63-d4a740ca69ac
-   (do not change this comment) */