merge with 1.9.1k1

diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index eb37654f1ec3cab6c34f5e7aea273fd8f6f61d0e..cf5cb396ffeb2c2bd65c068720ec4350aee8c9b4 100644 (file)
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 03 23:23:08 1994  Jim Meyering  (meyering@comco.com)
+
+       * linebuffer.h: Use __P instead of _P since the latter conflicts
+       with a definition in some <ctype.h>.  From Kaveh Ghazi.
+
 Wed Nov 02 17:36:34 1994  Jim Meyering  (meyering@comco.com)
 
        * tr.c: Add const attribute where appropriate.