From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 2 Jan 2002 21:55:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~17353
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=edde72f6c6a14bf388d5005495793f9c3d60dbdf;p=emacs.git

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

diff --git a/etc/NEWS b/etc/NEWS
index 57e39ddc3d8..1d9ed979aba 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -280,6 +280,9 @@ SQL buffer.
 
 * Lisp Changes in Emacs 21.3
 
+** If text has a `keymap' property, that keymap takes precedence
+over minor mode keymaps.
+
 ** A hex escape in a string forces the string to be multibyte.
 An octal escape makes it unibyte.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index e0ffe90c594..2693da95d88 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-02  Richard M. Stallman  <rms@gnu.org>
 
+	* keyboard.c (read_key_sequence): Handle the keymap property
+	before minor mode maps.
+
 	* editfns.c (Fformat): Update thissize from field_width
 	based on the actual width, in the string case.