merge trunk

2 files changed, 11 insertions, 5 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 41a88c57bb6..d36e6979dc3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+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)
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