2 files changed, 7 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9bae32a8a98..abd373dbc3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * keymap.c (syms_of_keymap): Clarify that "modifier" is "modifier
+        key" (bug#4257).
+
         * window.c (Fset_window_start): Doc fix (bug#4199).
         (Fset_window_hscroll): Ditto.
 
diff --git a/src/keymap.c b/src/keymap.c
index d33af68be48..0169276bef9 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3712,11 +3712,11 @@ the same way.  The "active" keymaps in each alist are used before
   Vemulation_mode_map_alists = Qnil;
 
   DEFVAR_LISP ("where-is-preferred-modifier", Vwhere_is_preferred_modifier,
-               doc: /* Preferred modifier to use for `where-is'.
+               doc: /* Preferred modifier key to use for `where-is'.
 When a single binding is requested, `where-is' will return one that
-uses this modifier if possible.  If nil, or if no such binding exists,
-bindings using keys without modifiers (or only with meta) will be
-preferred.  */);
+uses this modifier key if possible.  If nil, or if no such binding
+exists, bindings using keys without modifiers (or only with meta) will
+be preferred.  */);
   Vwhere_is_preferred_modifier = Qnil;
   where_is_preferred_modifier = 0;