# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1010008501 0
# Node ID 88fb2c8602aac580021a68bd4211d7e4f339f738
# Parent  488ddda9d397b39efbf81f2e306b10c9196b0888
*** empty log message ***

diff -r 488ddda9d397 -r 88fb2c8602aa etc/NEWS
--- a/etc/NEWS	Wed Jan 02 21:54:11 2002 +0000
+++ b/etc/NEWS	Wed Jan 02 21:55:01 2002 +0000
@@ -280,6 +280,9 @@
 
 * 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 -r 488ddda9d397 -r 88fb2c8602aa src/ChangeLog
--- a/src/ChangeLog	Wed Jan 02 21:54:11 2002 +0000
+++ b/src/ChangeLog	Wed Jan 02 21:55:01 2002 +0000
@@ -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.