From: Luc Teirlinck <teirllm@auburn.edu>
Date: Wed, 8 Dec 2004 01:27:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~3374
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a27c5d8f88eaf2fb29695d927b3be7a0825cf8b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0dcb40fc4a..e881509068f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 24c322facd1..b601faef550 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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.