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

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index d8f73edf37f4ba8677f5bb37197954e4ee099a19..44ef2b2ceb3c120591545e353c6bbc3834504cbe 100644 (file)
--- 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 d4c7eb52f7b56fde23da8aee94b2d30e99c3dc8a..7c77938c4c4d370005d9c8c26ddec3e94ae92504 100644 (file)
--- 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