1 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cf690be2c43..dc6b0a5ed2f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-18  Richard M. Stallman  <rms@gnu.org>
+
+        * dired.c (scmp): Function moved from minibuf.c.
+        Delete multibyte handling--used only on encoded strings.
+
+        * minibuf.c (scmp): Function moved to dired.c.
+
+        * fns.c (merge): Add QUIT call.
+
 2001-12-18  Dave Love  <fx@gnu.org>
 
         * Makefile.in (lisp, shortlisp): Add language/utf-8-lang.el,