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

[Luc Teirlinck]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.293 emacs/src/keymap.c:1.294
*** emacs/src/keymap.c:1.293    Sun Aug  8 00:33:40 2004
--- emacs/src/keymap.c  Mon Aug  9 18:42:04 2004
***************
*** 130,139 ****
  
  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'.  */)
--- 130,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 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'.  */)
***************
*** 728,734 ****
  
  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;
  {
--- 729,738 ----
  
  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;
  {
***************
*** 2572,2578 ****
  
  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.
  
--- 2576,2582 ----
  
  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.
  
***************
*** 2580,2587 ****
  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
--- 2584,2591 ----
  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