*** empty log message ***

3 files changed, 62 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 95454e078c0..bbdf8a59e7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-30  Dave Love  <fx@gnu.org>
+
+        * configure.in:  Require autoconf 2.53.  Test for pty.h,
+        sys/mman.h, sys/param.h, mremap, memmove.
+        (AH_BOTTOM): Maybe include strings.h.  Add local variables for
+        mode.
+        (AC_PROG_YACC): Deleted.
+        (size_t): Use AC_CHECK_TYPES.
+        (AH_TOP): Up-date copyright.
+
 2002-10-01  Juanma Barranquero  <lektu@terra.es>
 
         * update-subdirs: Add "no-byte-compile: t" to subdirs.el.
@@ -518,15 +528,9 @@
         * mkinstalldirs (errstatus): Chmod a+rx directories we create.
 
         * Makefile.in (uninstall): Ignore exit code of `rm'.
-<<<<<<< ChangeLog
-
-        * Makefile.in (uninstall): Remove more info files.
-        Remove ${libexecdir}/emacs/${version}.  Remove ${archlibdir}/fns-*.
-=======
 
         * Makefile.in (uninstall): Remove more info files.  Remove
         ${libexecdir}/emacs/${version}.  Remove ${archlibdir}/fns-*.
->>>>>>> 1.214
 
 2001-01-31  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cdbf78e5eaa..528e61d3787 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-30  Dave Love  <fx@gnu.org>
+
+        * textmodes/po.el (po-content-type-charset-alist): Delete most
+        entries.
+        (po-find-charset): Doc fix.  Remove interactive spec.
+        (po): Provide.
+        (po-find-file-coding-system-guts): Re-written to use
+        coding-system-alist, and code-pages, not codepage stuff.
+
+        * term/x-win.el: Remove some ancient compatibility code.  Populate
+        x-keysym-table.
+
 2002-10-30  Andreas Schwab  <schwab@suse.de>
 
         * subr.el (replace-regexp-in-string): Doc fix.
diff --git a/src/ChangeLog b/src/ChangeLog
index 2bd8a75ffaf..edb3b6ac1c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,43 @@
+2002-10-30  Dave Love  <fx@gnu.org>
+
+        * process.c [HAVE_SYS_WAIT]: Include sys/wait.h.
+        [HAVE_PTY_H]; Include pty.h.
+
+        * lread.c (Fload) <!load_dangerous_libraries>: Close fd.
+
+        * xterm.c (Qeql): Declare.
+        (Vx_keysym_table): New.
+        (syms_of_xterm): Initialize it.
+        (XTread_socket): Use it.  Deal with ASCII keysyms.
+        (XSetIMValues) [HAVE_X11R6]: Prototype.
+
+        * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extended.
+        (lispy_kana_keys): Comment out.
+        (make_lispy_event) [XK_kana_A]: Comment out.
+        (modify_event_symbol) <sizeof (long) == sizeof (EMACS_INT)>: Fix
+        sprintf call.
+
+        * s/osf5-0.h (C_SWITCH_SYSTEM): Revert last change (fixed by
+        regexp.h change).
+        (TERMINFO, LIBS_TERMCAP): Define.
+
+        * s/usg5-4.h (bcopy, bzero): Define conditional on HAVE_BCOPY.
+        (bcmp): Define conditional on HAVE_BCMP.
+        (NO_SIOCTL_H): Don't define.
+        (TIOCSIGSEND): Don't make conditional on IRIX6.
+
+        * s/sol2-5.h: Don't include strings.h.
+        (bcopy, bzero, bcmp) [HAVE_BCOPY]: Don't undef.
+
+        * s/irix6-0.h (IRIX6): Don't define.
+        (bcopy, bcmp, bzero): Don't undef.
+
+        * s/irix6-5.h: Don't include strings.h.
+        (IRIX6): Don't define.
+        (bcopy, bcmp, bzero): Don't undef.
+
+        * syntax.c (Fforward_comment): Doc fix.
+
 2002-10-29  Kim F. Storm  <storm@cua.dk>
 
         * process.c (Fsignal_process): Allow PROCESS to be specified by