# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1142694758 0
# Node ID 0ab713e3e8124060bf480730d381ac292959fc39
# Parent  30b0fe844c710f817ff9b5b08baae003979ceacf
*** empty log message ***

diff -r 30b0fe844c71 -r 0ab713e3e812 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 18 15:11:48 2006 +0000
+++ b/lisp/ChangeLog	Sat Mar 18 15:12:38 2006 +0000
@@ -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 -r 30b0fe844c71 -r 0ab713e3e812 src/ChangeLog
--- a/src/ChangeLog	Sat Mar 18 15:11:48 2006 +0000
+++ b/src/ChangeLog	Sat Mar 18 15:12:38 2006 +0000
@@ -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.