[Emacs-diffs] /srv/bzr/emacs/trunk r105141: (syms_of_keymap): Clarify that "modifier" is "modifier key"

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105141
fixes bug(s): http://debbugs.gnu.org/4257
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-12 23:12:36 +0200
message:
  (syms_of_keymap): Clarify that "modifier" is "modifier key"
modified:
  src/ChangeLog
  src/keymap.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-12 21:09:01 +0000
+++ b/src/ChangeLog     2011-07-12 21:12:36 +0000
@@ -1,5 +1,8 @@
 2011-07-12  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.
 

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2011-07-07 17:19:10 +0000
+++ b/src/keymap.c      2011-07-12 21:12:36 +0000
@@ -3712,11 +3712,11 @@
   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;