diff --git a/Makefile b/Makefile
index 21a0dd2..7c13391 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# makefile for emacs, updated Fri, Jun 14, 2013  5:12:57 PM
+# makefile for emacs, updated Sat, Sep 14, 2013 12:02:10 PM
 
 SRC=ansi.c basic.c bind.c bindable.c buffer.c crypt.c display.c ebind.c eval.c exec.c execute.c file.c fileio.c flook.c globals.c ibmpc.c input.c isearch.c line.c lock.c log.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c
 OBJ=ansi.o basic.o bind.o bindable.o buffer.o crypt.o display.o ebind.o eval.o exec.o execute.o file.o fileio.o flook.o globals.o ibmpc.o input.o isearch.o line.o lock.o log.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o
@@ -41,6 +41,9 @@ endif
 ifeq ($(uname_S),CYGWIN_NT-6.1-WOW64)
  DEFINES=-DAUTOCONF -DCYGWIN -DPROGRAM=$(PROGRAM)
 endif
+ifeq ($(uname_S),CYGWIN_NT-6.1)
+ DEFINES=-DAUTOCONF -DCYGWIN -DPROGRAM=$(PROGRAM)
+endif
 #DEFINES=-DAUTOCONF
 #LIBS=-ltermcap			# BSD
 LIBS=-lcurses			# SYSV
@@ -125,63 +128,63 @@ depend: ${SRC}
 
 ansi.o: ansi.c estruct.h line.h utf8.h edef.h
 basic.o: basic.c basic.h display.h estruct.h line.h utf8.h edef.h input.h \
-  random.h word.h
+ random.h word.h
 bind.o: bind.c bind.h edef.h estruct.h line.h utf8.h bindable.h buffer.h \
-  display.h ebind.h exec.h file.h flook.h input.h names.h window.h
+ display.h ebind.h exec.h file.h flook.h input.h names.h window.h
 bindable.o: bindable.c bindable.h buffer.h estruct.h line.h utf8.h \
-  display.h edef.h file.h input.h
+ display.h edef.h file.h input.h
 buffer.o: buffer.c buffer.h estruct.h line.h utf8.h display.h edef.h \
-  file.h input.h window.h
+ file.h input.h window.h
 crypt.o: crypt.c crypt.h estruct.h line.h utf8.h
 display.o: display.c display.h estruct.h line.h utf8.h edef.h termio.h \
-  version.h wrapper.h window.h
+ version.h wrapper.h window.h
 ebind.o: ebind.c ebind.h basic.h bind.h edef.h estruct.h line.h utf8.h \
-  bindable.h buffer.h eval.h exec.h file.h isearch.h random.h region.h \
-  search.h spawn.h window.h word.h
+ bindable.h buffer.h eval.h exec.h file.h isearch.h random.h region.h \
+ search.h spawn.h window.h word.h
 eval.o: eval.c eval.h estruct.h line.h utf8.h basic.h bind.h edef.h \
-  buffer.h display.h exec.h flook.h input.h random.h search.h termio.h \
-  version.h window.h
+ buffer.h display.h exec.h flook.h input.h random.h search.h termio.h \
+ version.h window.h
 exec.o: exec.c exec.h estruct.h line.h utf8.h buffer.h bind.h edef.h \
-  display.h eval.h file.h flook.h input.h
+ display.h eval.h file.h flook.h input.h
 execute.o: execute.c edef.h estruct.h line.h utf8.h bind.h random.h \
-  display.h file.h
+ display.h file.h
 file.o: file.c file.h buffer.h estruct.h line.h utf8.h crypt.h display.h \
-  edef.h execute.h fileio.h input.h lock.h window.h
+ edef.h execute.h fileio.h input.h lock.h window.h
 fileio.o: fileio.c fileio.h estruct.h line.h utf8.h crypt.h
 flook.o: flook.c flook.h estruct.h line.h utf8.h fileio.h
 globals.o: globals.c estruct.h line.h utf8.h edef.h
 ibmpc.o: ibmpc.c estruct.h line.h utf8.h edef.h
 input.o: input.c input.h edef.h estruct.h line.h utf8.h bind.h bindable.h \
-  display.h exec.h names.h wrapper.h
+ display.h exec.h names.h wrapper.h
 isearch.o: isearch.c isearch.h basic.h display.h estruct.h line.h utf8.h \
-  edef.h input.h search.h
+ edef.h input.h search.h
 line.o: line.c line.h utf8.h display.h estruct.h edef.h log.h
 lock.o: lock.c lock.h estruct.h line.h utf8.h display.h edef.h input.h
 log.o: log.c log.h
 main.o: main.c basic.h bind.h edef.h estruct.h line.h utf8.h bindable.h \
-  buffer.h display.h eval.h execute.h file.h input.h lock.h log.h \
-  random.h search.h termio.h version.h
+ buffer.h display.h eval.h execute.h file.h input.h lock.h log.h random.h \
+ search.h termio.h version.h
 names.o: names.c names.h basic.h bind.h edef.h estruct.h line.h utf8.h \
-  bindable.h buffer.h display.h eval.h exec.h file.h isearch.h region.h \
-  random.h search.h spawn.h window.h word.h
+ bindable.h buffer.h display.h eval.h exec.h file.h isearch.h region.h \
+ random.h search.h spawn.h window.h word.h
 pklock.o: pklock.c pklock.h estruct.h line.h utf8.h edef.h
 posix.o: posix.c termio.h
 random.o: random.c random.h basic.h display.h estruct.h line.h utf8.h \
-  edef.h execute.h input.h search.h
+ edef.h execute.h input.h search.h
 region.o: region.c region.h estruct.h line.h utf8.h display.h edef.h
 search.o: search.c search.h estruct.h line.h utf8.h basic.h display.h \
-  edef.h input.h
+ edef.h input.h
 spawn.o: spawn.c spawn.h buffer.h estruct.h line.h utf8.h display.h \
-  edef.h file.h input.h window.h
+ edef.h file.h input.h window.h
 tcap.o: tcap.c display.h estruct.h line.h utf8.h edef.h termio.h
 termio.o: termio.c termio.h estruct.h line.h utf8.h edef.h
 utf8.o: utf8.c utf8.h
 vmsvt.o: vmsvt.c estruct.h line.h utf8.h edef.h
 vt52.o: vt52.c estruct.h line.h utf8.h edef.h
 window.o: window.c window.h estruct.h line.h utf8.h basic.h display.h \
-  edef.h execute.h wrapper.h
+ edef.h execute.h wrapper.h
 word.o: word.c word.h basic.h display.h estruct.h line.h utf8.h edef.h \
-  random.h region.h
+ random.h region.h
 wrapper.o: wrapper.c wrapper.h
 
 # DEPENDENCIES MUST END AT END OF FILE
diff --git a/display.c b/display.c
index 2fc1eb8..274db40 100644
--- a/display.c
+++ b/display.c
@@ -56,6 +56,8 @@ static int displaying = TRUE;
 #include <sys/ioctl.h>
 /* for window size changes */
 int chg_width, chg_height;
+
+static int newscreensize(int h, int w);
 #endif
 
 static int reframe(struct window *wp);
@@ -71,7 +73,6 @@ static void modeline(struct window *wp);
 static void mlputi(int i, int r);
 static void mlputli(long l, int r);
 static void mlputf(int s);
-static int newscreensize(int h, int w);
 
 #if RAINBOW
 static void putline(int row, int col, char *buf);
diff --git a/estruct.h b/estruct.h
index 82f4f5d..e443557 100644
--- a/estruct.h
+++ b/estruct.h
@@ -54,7 +54,7 @@
 #undef BSD
 #endif
 
-#if defined(SYSV) || defined(u3b2) || defined(_AIX) || (defined(i386) && defined(unix)) || defined(__hpux)
+#if defined(SYSV) || defined(u3b2) || defined(_AIX) || (defined(i386) && defined(unix)) || defined(__hpux) || defined( CYGWIN)
 #define	USG 1 /* System V UNIX */
 #else
 #define	USG 0
diff --git a/flook.c b/flook.c
index 0524816..cde4fb5 100644
--- a/flook.c
+++ b/flook.c
@@ -75,15 +75,15 @@ boolean fexist( const char *fname)
  */
 char *flook( const char *fname, int hflag)
 {
-	char *home;	/* path to home directory */
-	char *path;	/* environmental PATH variable */
-	char *sp;	/* pointer into path spec */
 	int i;		/* index */
 	static char fspec[NSTRING];	/* full path spec to search */
 
 #if	ENVFUNC
+	char *path;	/* environmental PATH variable */
 
 	if (hflag) {
+		char *home;	/* path to home directory */
+
 		home = getenv("HOME");
 		if (home != NULL) {
 			/* build home dir file spec */
@@ -108,6 +108,7 @@ char *flook( const char *fname, int hflag)
 	path = getenv("PATH");
 	if (path != NULL)
 		while (*path) {
+			char *sp;	/* pointer into path spec */
 
 			/* build next possible file spec */
 			sp = fspec;
diff --git a/input.c b/input.c
index 1bd797d..8979157 100644
--- a/input.c
+++ b/input.c
@@ -345,9 +345,9 @@ int getcmd(void)
 
 #if VT220
       proc_metac:
-#endif
 	if (c == 128+27)		/* CSI */
 		goto handle_CSI;
+#endif
 	/* process META prefix */
 	if (c == (CONTROL | '[')) {
 		c = get1key();