*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a90fc7ad4ca8071dbeb0d017738332077c170764..e2ecdd192eab09a17cec84935aafdb18994e5710 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-18  Ben North  <ben@redfrontdoor.org>  (tiny change)
+
+       * isearch.el (isearch-other-meta-char): Handle user bindings for
+       shifted control characters.
+
 2006-03-18  Agustin Martin  <agustin.martin@hispalinux.es>
 
        * textmodes/ispell.el (ispell-skip-region-alist): Add "_+" to the

diff --git a/src/ChangeLog b/src/ChangeLog
index bde601c2e81fad027144223221ce60146a9888e3..bc4dd8130237abb79f6d792c820fa3d69135dc84 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2006-03-18  Nozomu Ando  <nand@mac.com>
+
+       * m/pmax.h (BROKEN_NOCOMBRELOC) [__NetBSD__]: Define.
+       (LIB_STANDARD, START_FILES) [__NetBSD__]: Don't define.
+       (START_FILES, RUN_TIME_REMAP, UNEXEC) [__NetBSD__, __OpenBSD__]:
+       Don't redefine.
+
+       * m/mips.h: Don't use unexmips on NetBSD.
+       (LIBS_MACHINE): Move definition lower, so it doesn't use
+       LD_SWITCH_MACHINE, START_FILES, LIB_STANDARD, LIBS_TERMCAP,
+       C_SWITCH_MACHINE, and C_DEBUG_SWITCH.
+
+       * unexelf.c [BROKEN_NOCOMBRELOC]: Include assert.h.
+       (unexec) [BROKEN_NOCOMBRELOC]: Handle platforms whose nocombreloc
+       option is broken (e.g., MIPS/NetBSD).
+
 2006-03-18  Craig McDaniel  <craigmcd@gmail.com>  (tiny change)
 
        * sheap.c (STATIC_HEAP_SIZE): Enlarge STATIC_HEAP_SIZE to 12MB.