[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Chong Yidong]

Index: emacs/lisp/ChangeLog
diff -u emacs/lisp/ChangeLog:1.9228 emacs/lisp/ChangeLog:1.9229
--- emacs/lisp/ChangeLog:1.9228 Mon Mar  6 20:09:17 2006
+++ emacs/lisp/ChangeLog        Mon Mar  6 20:27:06 2006
@@ -1,8 +1,15 @@
+2006-03-06  Chong Yidong  <address@hidden>
+
+       * help.el (describe-key): Properly handle the return value of
+       read-key-sequence when grabbing an up-event.  Cleanup mouse-1
+       remaps.
+
 2006-03-06  Stefan Monnier  <address@hidden>
 
        * complete.el (PC-expand-many-files): Try be more careful when parsing
        the shell's output.
 
+>>>>>>> 1.9228
 2006-03-05  Stefan Monnier  <address@hidden>
 
        * outline.el (hide-sublevels): Provide better interactive default.