# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1266962285 0
# Node ID 9e97e6c8e8a20b0bae3c18fd4837d0d188550977
# Parent  edfde380e83ed1e3ab8c04109c285ac10770f1ad# Parent  e547a98225c5bd6f63f648f0aa39b4d9ad280e89
Merge from mainline.

diff -r edfde380e83e -r 9e97e6c8e8a2 lisp/nxml/TODO
--- a/lisp/nxml/TODO	Mon Feb 22 21:54:01 2010 +0000
+++ b/lisp/nxml/TODO	Tue Feb 23 21:58:05 2010 +0000
@@ -450,7 +450,7 @@
 
 ** Investigate performance on large files all on one line.
 
-* CVS emacs issues
+* Issues for Emacs versions >= 22
 
 ** Take advantage of UTF-8 CJK support.