merge with 1.10n

diff --git a/lib/strftime.c b/lib/strftime.c
index 6d8ca0c53e8b57995a32fa5ea06533a048bcd90e..e73cb6f7530665c1b43909008979c871d47692f7 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -74,6 +74,10 @@
 
    David MacKenzie <djm@gnu.ai.mit.edu> */
 
+#ifdef emacs
+#define CONFIG_BROKETS
+#endif
+
 #ifdef HAVE_CONFIG_H
 #if defined (CONFIG_BROKETS)
 /* We use <config.h> instead of "config.h" so that a compilation