Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-694
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-695
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-696
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-697
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-698
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-699
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-700
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-701
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-702
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-703
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-704
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-705
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-706
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-707
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-708
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
   Update from CVS: src/indent.c (Fvertical_motion): Fix last change.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-711
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-712
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-713
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-72
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-73
   Merge from emacs--cvs-trunk--0


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-268

1 files changed, 8 insertions, 4 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 891e41f0b58..a5e5fbd3f93 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -729,19 +729,23 @@ map_keymap_call (key, val, fun, dummy)
   call2 (fun, key, val);
 }
 
-DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 2, 0,
+DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 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;
+grandparent's bindings are also included and so on.
+usage: (map-keymap FUNCTION KEYMAP)  */)
+     (function, keymap, sort_first)
+     Lisp_Object function, keymap, sort_first;
 {
   if (INTEGERP (function))
     /* We have to stop integers early since map_keymap gives them special
        significance.  */
     Fsignal (Qinvalid_function, Fcons (function, Qnil));
+  if (! NILP (sort_first))
+    return call3 (intern ("map-keymap-internal"), function, keymap, Qt);
+      
   map_keymap (keymap, map_keymap_call, function, NULL, 1);
   return Qnil;
 }