# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1102469260 0
# Node ID c4eebac5c15813069014892534a0873dd1a3a176
# Parent  50d6654dfa79754f41a8de531e47a4bae5fc7c42
*** empty log message ***

diff -r 50d6654dfa79 -r c4eebac5c158 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 08 01:26:10 2004 +0000
+++ b/lisp/ChangeLog	Wed Dec 08 01:27:40 2004 +0000
@@ -1,3 +1,14 @@
+2004-12-07  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* mouse.el (mouse-set-font): Handle the case where the command was
+	not invoked using the mouse.
+
+	* edmacro.el: `edit-kbd-macro' is now bound to `C-x C-k e'.
+	(edmacro-finish-edit): Further update for keyboard macros that are
+	lambda forms.
+	(edmacro-sanitize-for-string): Correctly remove Meta modifier
+	(as suggested by Kim Storm).
+
 2004-12-06  Stefan  <monnier@iro.umontreal.ca>
 
 	* font-lock.el (font-lock-unfontify-region): Save buffer state.
diff -r 50d6654dfa79 -r c4eebac5c158 man/ChangeLog
--- a/man/ChangeLog	Wed Dec 08 01:26:10 2004 +0000
+++ b/man/ChangeLog	Wed Dec 08 01:27:40 2004 +0000
@@ -1,3 +1,8 @@
+2004-12-07  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* frames.texi (Scroll Bars): The option `scroll-bar-mode' has to
+	be set through Custom.  Otherwise, it has no effect.
+
 2004-12-07  Stefan  <monnier@iro.umontreal.ca>
 
 	* url.texi: New file.