Author: Martin Pitt <mpitt@debian.org>
Description: Use Debian alternatives for external tools instead of hardcoded programs
Forwarded: No, Debian specific

--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -19,8 +19,8 @@
 #define DEFAULT_EDITOR	"notepad.exe"
 /* no DEFAULT_EDITOR_LINENUMBER_ARG for Notepad */
 #else
-#define DEFAULT_EDITOR	"vi"
-#define DEFAULT_EDITOR_LINENUMBER_ARG "+"
+#define DEFAULT_EDITOR	"sensible-editor"
+/*#define DEFAULT_EDITOR_LINENUMBER_ARG "+"*/
 #endif
 
 #define DEFAULT_PROMPT1 "%/%R%x%# "
--- a/src/include/fe_utils/print.h
+++ b/src/include/fe_utils/print.h
@@ -20,7 +20,7 @@
 
 /* This is not a particularly great place for this ... */
 #ifndef __CYGWIN__
-#define DEFAULT_PAGER "more"
+#define DEFAULT_PAGER "pager"
 #else
 #define DEFAULT_PAGER "less"
 #endif
