diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index 2c44b3133fbac8938a9c2d0e399b5ec8462278ba..87855b5051dd387972c64701aabb36e28e02a2c9 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.21 2004/08/29 05:06:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.22 2004/11/17 18:32:31 tgl Exp $
  */
 #ifndef SETTINGS_H
 #define SETTINGS_H
@@ -15,7 +15,12 @@
 
 #define DEFAULT_FIELD_SEP "|"
 #define DEFAULT_RECORD_SEP "\n"
+
+#if defined(WIN32) || defined(__CYGWIN__)
+#define DEFAULT_EDITOR	"notepad.exe"
+#else
 #define DEFAULT_EDITOR	"vi"
+#endif
 
 #define DEFAULT_PROMPT1 "%/%R%# "
 #define DEFAULT_PROMPT2 "%/%R%# "