*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0dcb40fc4ad4dd25b02175b096867a6c4ad5bd3..e881509068f2b50b5a18169ed8c4c63b6963b70d 100644 (file)
--- 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 24c322facd124d2e1f8f97a3bab0fbdf050ee6c5..b601faef550774eb84cc28bac826a0821c811a30 100644 (file)
--- 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.