summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1994-09-25 03:12:38 +0000
committerJim Meyering <jim@meyering.net>1994-09-25 03:12:38 +0000
commit649d081fee5142b2d1f6626e654761c1add40951 (patch)
tree54cb4e3e9777b24cc9d474baf039e6560f17f2b8
parent4bac19f0bff5d16d226b4e6b7fd6b17a3f036d6e (diff)
downloadcoreutils-649d081fee5142b2d1f6626e654761c1add40951.tar.xz
merge with 1.10n
-rw-r--r--lib/strftime.c4
-rw-r--r--old/sh-utils/ChangeLog15
-rw-r--r--src/expr.c2
3 files changed, 20 insertions, 1 deletions
diff --git a/lib/strftime.c b/lib/strftime.c
index 6d8ca0c53..e73cb6f75 100644
--- 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
diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index d8f73edf3..44ef2b2ce 100644
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -32,6 +32,21 @@ Sat Sep 24 10:13:00 1994 Jim Meyering (meyering@comco.com)
* src/Makefile.in: Add dependencies on long-options.h.
+ * configure.in: Make having autoconf-1.120 a prerequisite.
+
+ * sh-utils.texi [INFO-DIR-ENTRY]: Add an entry for each `invoking'
+ node. Regularize punctuation, indexing, and xrefs.
+ From Franc,ois Pinard.
+
+ * date.c (usage): Tweak the usage message a little.
+ Add `const' to more dcls.
+
+ * stty.c: Add `const' to more dcls.
+ * su.c: Ditto.
+ * who.c: Ditto.
+
+ * tee.c (main): Use _POSIX_SOURCE, not _POSIX_VERSION.
+
Sat Sep 17 15:48:10 1994 Jim Meyering (meyering@comco.com)
* (doc): New subdirectory with texinfo documentation.
diff --git a/src/expr.c b/src/expr.c
index d4c7eb52f..7c77938c4 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1,5 +1,5 @@
/* expr -- evaluate expressions.
- Copyright (C) 1986, 1991 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by