Wrap 'pick -subject foobar 13' test with set +e/-e.

[nmh] / h / nmh.h

diff --git a/h/nmh.h b/h/nmh.h
index 00c408ffa883293b40d651ce60d99e9f77441f57..3b91e2c3ad6e5e76acf06863dad240af52896c92 100644 (file)
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -3,7 +3,9 @@
  * nmh.h -- system configuration header file
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <unistd.h>
 #include <stdio.h>
@@ -59,9 +61,11 @@
 # endif
 #endif
 
+/*
+ * Defaults for programs if they aren't configured in a user's profile
+ */
+
+#define DEFAULT_PAGER "more"
+#define DEFAULT_EDITOR "vi"
+
 #include <signal.h>
- 
-#define bcmp(b1,b2,length)      memcmp(b1, b2, length)
-#define bcopy(b1,b2,length)     memcpy (b2, b1, length)
-#define bcpy(b1,b2,length)      memcmp (b1, b2, length)
-#define bzero(b,length)         memset (b, 0, length)