*** empty log message ***

diff --git a/etc/TODO b/etc/TODO
index cb8c841863f220b2945384dae3cb10270f4a137b..600d3d04857963e2d4f5d0be9a9e90b1cff923f1 100644 (file)
--- a/etc/TODO
+++ b/etc/TODO
@@ -67,6 +67,9 @@ Other features we would like:
 * Save undo information in files, and reload it when needed
   for undoing.
 
+* Merge the Emacs regex.c with the Glibc regex.c.
+  They split off a few years ago through negligance.
+
 * Change the Windows NT menu code
   so that it handles the deep_p argument and avoids
   regenerating the whole menu bar menu tree except

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6efe5003920b3c04b13983278297e34aafb88f5b..ae85e3e799f30f96e29663123d1e6743e548d61e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-18  Richard M. Stallman  <rms@gnu.org>
+
+       * menu-bar.el (menu-bar-options-menu): Cope if
+       text-mode-hook is not a list.
+
 2002-03-17  Richard M. Stallman  <rms@gnu.org>
 
        * emulation/pc-select.el (pc-selection-mode):