[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107893: Fix last fix.

[Chong Yidong]

------------------------------------------------------------
revno: 107893
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-04-23 11:44:13 +0800
message:
  Fix last fix.
modified:
  doc/lispref/keymaps.texi
  src/keymap.c

=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi  2012-04-23 03:11:28 +0000
+++ b/doc/lispref/keymaps.texi  2012-04-23 03:44:13 +0000
@@ -1888,9 +1888,9 @@
 is a list of keymaps, only those keymaps are searched.
 
 Usually it's best to use @code{overriding-local-map} as the expression
-for @var{keymap}.  Then @code{where-is-internal} searches precisely the
-keymaps that are active.  To search only the global map, pass
address@hidden(keymap)} (an empty keymap) as @var{keymap}.
+for @var{keymap}.  Then @code{where-is-internal} searches precisely
+the keymaps that are active.  To search only the global map, pass the
+value @code{(keymap)} (an empty keymap) as @var{keymap}.
 
 If @var{firstonly} is @code{non-ascii}, then the value is a single
 vector representing the first key sequence found, rather than a list of
@@ -1904,27 +1904,24 @@
 follow indirect keymap bindings.  This makes it possible to search for
 an indirect definition itself.
 
-If another command @var{other-command} is remapped to @var{command}
-(@pxref{Remapping Commands}), this function searches for the bindings
-of @var{other-command} and treats them as though they are also
-bindings for @var{command}.  But if the @var{no-remap} argument is
address@hidden, this function instead includes the vector @code{[remap
address@hidden in the list of possible key sequences, without
-searching for the bindings of @var{other-command}.
-
-On the other hand, if @var{command} is remapped to another command,
-this function still returns the original bindings of @var{command},
-even though those keys would actually invoke the other command.  To
-determine the remapping status of @var{command}, use the function
address@hidden (@pxref{Remapping Commands}).
-
address@hidden
address@hidden
-(where-is-internal 'describe-function)
-    @result{} ([8 102] [f1 102] [help 102]
-         [menu-bar help-menu describe describe-function])
address@hidden group
address@hidden smallexample
+The fifth argument, @var{no-remap}, determines how this function
+treats command remappings (@pxref{Remapping Commands}).  There are two
+cases of interest:
+
address@hidden @asis
address@hidden If a command @var{other-command} is remapped to @var{command}:
+If @var{no-remap} is @code{nil}, find the bindings for
address@hidden and treat them as though they are also bindings
+for @var{command}.  If @var{no-remap} is address@hidden, include the
+vector @code{[remap @var{other-command}]} in the list of possible key
+sequences, instead of finding those bindings.
+
address@hidden If @var{command} is remapped to @var{other-command}:
+If @var{no-remap} is @code{nil}, return the bindings for
address@hidden rather than @var{command}.  If @var{no-remap} is
address@hidden, return the bindings for @var{command}, ignoring the
+fact that it is remapped.
address@hidden table
 @end defun
 
 @deffn Command describe-bindings &optional prefix buffer-or-name

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2012-04-23 03:11:28 +0000
+++ b/src/keymap.c      2012-04-23 03:44:13 +0000
@@ -2569,16 +2569,17 @@
 to other keymaps or slots.  This makes it possible to search for an
 indirect definition itself.
 
-If another command OTHER-COMMAND is remapped to DEFINITION, search for
-the bindings of OTHER-COMMAND and include them in the returned list.
-But if optional 5th arg NO-REMAP is non-nil, just include the vector
-[remap OTHER-COMMAND] in the returned list, without searching for
-those other bindings.
-
-If DEFINITION is remapped to another command, this function still
-returns its bindings, even though those key sequences actually invoke
-the other command.  Use `command-remapping' to find the remapping
-status of DEFINITION.  */)
+The optional 5th arg NO-REMAP alters how command remapping is handled:
+
+- If another command OTHER-COMMAND is remapped to DEFINITION, normally
+  search for the bindings of OTHER-COMMAND and include them in the
+  returned list.  But if NO-REMAP is non-nil, include the vector
+  [remap OTHER-COMMAND] in the returned list instead, without
+  searching for those other bindings.
+
+- If DEFINITION is remapped to OTHER-COMMAND, normally return the
+  bindings for OTHER-COMMAND.  But if NO-REMAP is non-nil, return the
+  bindings for DEFINITION instead, ignoring its remapping.  */)
   (Lisp_Object definition, Lisp_Object keymap, Lisp_Object firstonly, 
Lisp_Object noindirect, Lisp_Object no_remap)
 {
   /* The keymaps in which to search.  */