Merge from emacs--devo--0

[gnu-emacs] / src / keymap.c

diff --git a/src/keymap.c b/src/keymap.c
index 7a1fc99875804cc40dcfa92739c41ca0abd52f2b..bfc8161424515a3590323f2c67acd07e6e3de5d4 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3898,7 +3898,7 @@ don't alter it yourself.  */);
   DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,
               doc: /* Alist of keymaps to use for minor modes.
 Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read
-key sequences and look up bindings iff VARIABLE's value is non-nil.
+key sequences and look up bindings if VARIABLE's value is non-nil.
 If two active keymaps bind the same key, the keymap appearing earlier
 in the list takes precedence.  */);
   Vminor_mode_map_alist = Qnil;