diff lisp/ChangeLog @ 69310:270a2959d019

* help.el (describe-key): Properly handle the return value of read-key-sequence when grabbing an up-event. Cleanup mouse-1 remaps.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 06 Mar 2006 20:27:06 +0000
parents f0678aafb24e
children 86ebde8d0adc
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Mar 06 20:09:17 2006 +0000
+++ b/lisp/ChangeLog	Mon Mar 06 20:27:06 2006 +0000
@@ -1,8 +1,15 @@
+2006-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+	* 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  <monnier@iro.umontreal.ca>
 
 	* complete.el (PC-expand-many-files): Try be more careful when parsing
 	the shell's output.
 
+>>>>>>> 1.9228
 2006-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* outline.el (hide-sublevels): Provide better interactive default.