[Emacs-diffs] Changes to emacs/src/keymap.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.282.4.10 emacs/src/keymap.c:1.282.4.11
*** emacs/src/keymap.c:1.282.4.10       Tue Aug  3 00:03:00 2004
--- emacs/src/keymap.c  Tue Aug 10 07:46:40 2004
***************
*** 131,140 ****
  
  DEFUN ("make-keymap", Fmake_keymap, Smake_keymap, 0, 1, 0,
         doc: /* Construct and return a new keymap, of the form (keymap 
CHARTABLE . ALIST).
! CHARTABLE is a char-table that holds the bindings for the ASCII
! characters.  ALIST is an assoc-list which holds bindings for function keys,
! mouse events, and any other things that appear in the input stream.
! All entries in it are initially nil, meaning "command undefined".
  
  The optional arg STRING supplies a menu name for the keymap
  in case you use it as a menu with `x-popup-menu'.  */)
--- 131,141 ----
  
  DEFUN ("make-keymap", Fmake_keymap, Smake_keymap, 0, 1, 0,
         doc: /* Construct and return a new keymap, of the form (keymap 
CHARTABLE . ALIST).
! CHARTABLE is a char-table that holds the bindings for all characters
! without modifiers.  All entries in it are initially nil, meaning
! "command undefined".  ALIST is an assoc-list which holds bindings for
! function keys, mouse events, and any other things that appear in the
! input stream.  Initially, ALIST is nil.
  
  The optional arg STRING supplies a menu name for the keymap
  in case you use it as a menu with `x-popup-menu'.  */)
***************
*** 703,709 ****
  
  DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 2, 0,
         doc: /* Call FUNCTION for every binding in KEYMAP.
! FUNCTION is called with two arguments: the event and its binding.  */)
       (function, keymap)
       Lisp_Object function, keymap;
  {
--- 704,713 ----
  
  DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 2, 0,
         doc: /* Call FUNCTION for every binding in KEYMAP.
! FUNCTION is called with two arguments: the event and its binding.
! If KEYMAP has a parent, the parent's bindings are included as well.
! This works recursively: if the parent has itself a parent, then the
! grandparent's bindings are also included and so on.  */)
       (function, keymap)
       Lisp_Object function, keymap;
  {
***************
*** 1635,1641 ****
  
  DEFUN ("local-key-binding", Flocal_key_binding, Slocal_key_binding, 1, 2, 0,
         doc: /* Return the binding for command KEYS in current local keymap 
only.
! KEYS is a string, a sequence of keystrokes.
  The binding is probably a symbol with a function definition.
  
  If optional argument ACCEPT-DEFAULT is non-nil, recognize default
--- 1639,1645 ----
  
  DEFUN ("local-key-binding", Flocal_key_binding, Slocal_key_binding, 1, 2, 0,
         doc: /* Return the binding for command KEYS in current local keymap 
only.
! KEYS is a string or vector, a sequence of keystrokes.
  The binding is probably a symbol with a function definition.
  
  If optional argument ACCEPT-DEFAULT is non-nil, recognize default
***************
*** 1654,1660 ****
  
  DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 
0,
         doc: /* Return the binding for command KEYS in current global keymap 
only.
! KEYS is a string, a sequence of keystrokes.
  The binding is probably a symbol with a function definition.
  This function's return values are the same as those of `lookup-key'
  \(which see).
--- 1658,1664 ----
  
  DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 
0,
         doc: /* Return the binding for command KEYS in current global keymap 
only.
! KEYS is a string or vector, a sequence of keystrokes.
  The binding is probably a symbol with a function definition.
  This function's return values are the same as those of `lookup-key'
  \(which see).
***************
*** 2561,2567 ****
  
  DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0,
         doc: /* Return list of keys that invoke DEFINITION.
! If KEYMAP is non-nil, search only KEYMAP and the global keymap.
  If KEYMAP is nil, search all the currently active keymaps.
  If KEYMAP is a list of keymaps, search only those keymaps.
  
--- 2565,2571 ----
  
  DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0,
         doc: /* Return list of keys that invoke DEFINITION.
! If KEYMAP is a keymap, search only KEYMAP and the global keymap.
  If KEYMAP is nil, search all the currently active keymaps.
  If KEYMAP is a list of keymaps, search only those keymaps.
  
***************
*** 2569,2576 ****
  rather than a list of all possible key sequences.
  If FIRSTONLY is the symbol `non-ascii', return the first binding found,
  no matter what it is.
! If FIRSTONLY has another non-nil value, prefer sequences of ASCII characters,
! and entirely reject menu bindings.
  
  If optional 4th arg NOINDIRECT is non-nil, don't follow indirections
  to other keymaps or slots.  This makes it possible to search for an
--- 2573,2580 ----
  rather than a list of all possible key sequences.
  If FIRSTONLY is the symbol `non-ascii', return the first binding found,
  no matter what it is.
! If FIRSTONLY has another non-nil value, prefer sequences of ASCII characters
! \(or their meta variants) and entirely reject menu bindings.
  
  If optional 4th arg NOINDIRECT is non-nil, don't follow indirections
  to other keymaps or slots.  This makes it possible to search for an
***************
*** 3593,3599 ****
    DEFVAR_LISP ("key-translation-map", &Vkey_translation_map,
               doc: /* Keymap of key translations that can override keymaps.
  This keymap works like `function-key-map', but comes after that,
! and applies even for keys that have ordinary bindings.  */);
    Vkey_translation_map = Qnil;
  
    staticpro (&Vmouse_events);
--- 3597,3603 ----
    DEFVAR_LISP ("key-translation-map", &Vkey_translation_map,
               doc: /* Keymap of key translations that can override keymaps.
  This keymap works like `function-key-map', but comes after that,
! and its non-prefix bindings override ordinary bindings.  */);
    Vkey_translation_map = Qnil;
  
    staticpro (&Vmouse_events);