From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 25 Oct 2000 03:02:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~604
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39e776cd974b44f79ea6cc12dd3a6da43bfbacc8;p=emacs.git

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

diff --git a/etc/NEWS b/etc/NEWS
index e0ddcee7156..b1af035d63d 100644
--- 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 f46f95882ca..e9778013345 100644
--- 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.