*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index e0ddcee71560fb404b25710167f3208829a1bd14..b1af035d63d0011bedbc42cfd2cd6fd1b35b648d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1797,6 +1797,8 @@ functionality with aliases for the mldrag functions.
 * Lisp changes made after edition 2.6 of the Emacs Lisp Manual,
 (Display-related features are described in a page of their own below.)
 
+** `add-hook' now makes the hook local if called with a non-nil LOCAL arg.
+
 +++
 ** The treatment of non-ASCII characters in search ranges has changed.
 If a range in a regular expression or the arg of

diff --git a/src/ChangeLog b/src/ChangeLog
index f46f95882cace583fdb2e94fed4698aaefdb36ed..e9778013345eed5ed50c41211e54e318e3587d6f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-24  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * keymap.c (fix_submap_inheritance): Use get_keymap_1 on parent_entry
+       rather than KEYMAPP, to allow EQ to work correctly if parent_entry is
+       a symbol.
+
 2000-10-24  Andrew Innes  <andrewi@gnu.org>
 
        * dired.c (directory_files_internal_unwind): New function.