3 files changed, 21 insertions, 20 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 4425b79edeb..b647370a781 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -60,10 +60,8 @@ NARROWPROTO
 SEPCHAR
 SIGTYPE
 SYSTEM_TYPE
-USE_MMAP_FOR_BUFFERS
 
 ** Machine specific macros, decribed in detail in src/m/template.h
-CANNOT_DUMP
 EXPLICIT_SIGN_EXTEND
 LOAD_AVE_CVT
 LOAD_AVE_TYPE
@@ -81,8 +79,6 @@ USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at t
 
 AIX
 AMPERSAND_FULL_NAME
-BCOPY_DOWNWARD_SAFE
-BCOPY_UPWARD_SAFE
 BITS_PER_EMACS_INT
 BITS_PER_LONG
 BITS_PER_CHAR
@@ -120,7 +116,6 @@ EMACS_UINT
 FILE_SYSTEM_CASE
 FLOAT_CHECK_DOMAIN
 FSCALE
-GAP_USE_BCOPY
 GC_LISP_OBJECT_ALIGNMENT
 GC_MARK_SECONDARY_STACK
 GC_MARK_STACK
@@ -130,8 +125,6 @@ GNU_LIBRARY_PENDING_OUTPUT_COUNT
 GNU_LINUX
 GNU_MALLOC
 HAVE_AIX_SMT_EXP
-HAVE_BCMP
-HAVE_BCOPY
 HAVE_CBRT
 HAVE_CLOSEDIR
 HAVE_DUP2
@@ -150,7 +143,6 @@ HAVE_GETPT
 HAVE_GETTIMEOFDAY
 HAVE_GETWD
 HAVE_H_ERRNO
-HAVE_INDEX
 HAVE_INET_SOCKETS
 HAVE_INVERSE_HYPERBOLIC
 HAVE_LIBKSTAT
@@ -169,7 +161,6 @@ HAVE_PWD_H
 HAVE_RANDOM
 HAVE_RENAME
 HAVE_RES_INIT
-HAVE_RINDEX
 HAVE_RINT
 HAVE_RMDIR
 HAVE_SELECT
@@ -193,7 +184,6 @@ HAVE_SYS_TIMEB_H
 HAVE_SYS_TIME_H
 HAVE_TCATTR
 HAVE_TERMIOS_H
-HAVE_TEXT_START
 HAVE_TIMEVAL
 HAVE_TM_ZONE
 HAVE_TZSET
@@ -205,7 +195,6 @@ HAVE_WINDOW_SYSTEM
 HAVE_WORKING_VFORK
 HAVE_XRMSETDATABASE
 HPUX
-INHIBIT_X11R6_XIM
 INTERNAL_TERMINAL
 IS_ANY_SEP
 IS_DIRECTORY_SEP
@@ -270,7 +259,6 @@ SYSV_SYSTEM_DIR
 TAB3
 TABDLY
 TERM
-TEXT_START
 THIS_IS_CONFIGURE
 TIME_WITH_SYS_TIME
 TIOCSIGSEND
@@ -322,10 +310,7 @@ _start
 abort
 access
 alloca
-bcmp
-bcopy
 brk
-bzero
 calloc
 chdir
 chmod
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 2b73c72f20e..7a3104c9c40 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
+
+2010-07-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * MAINTAINERS: Update my responsibilities.
+
+2010-07-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (BCOPY_DOWNWARD_SAFE, BCOPY_UPWARD_SAFE)
+        (GAP_USE_BCOPY, HAVE_BCMP, HAVE_BCOPY, bcmp, bcopy, bzero):
+        Remove.
+
 2010-06-12  Eli Zaretskii  <eliz@gnu.org>
 
         * unidata/bidimirror.awk: New file.
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 0e8c9b32325..ee51e162b3b 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -23,6 +23,11 @@ Jason Rumney
         W32
 
 Eli Zaretskii
+
+        src/bidi.c
+        bidirectional editing support in xdisp.c and elsewhere
+        lisp/term/tty-colors.el
+
         The MS-DOS (a.k.a. DJGPP) port:
             config.bat
             msdos/*
@@ -35,11 +40,7 @@ Eli Zaretskii
             lisp/dos-fns.el
             lisp/dos-w32.el
             lisp/dos-vars.el
-
-        lisp/term/tty-colors.el
-        lisp/international/codepage.el
-
-        doc/emacs/msdog.texi
+            doc/emacs/msdog.texi
 
 Kenichi Handa
         Mule
@@ -91,6 +92,7 @@ Eli Zaretskii
         info/dir
 
         src/xfaces.c
+        src/xdisp.c
         src/term.c
         src/frame.c
         src/dired.c