Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 814-823)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 59-69)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 7c97579ab6e..6a52d751c5b 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -431,11 +431,17 @@ where
                (def-fun (nth 0 kdf))
                (def-fun-txt (format "%s" def-fun))
                (rem-fun (command-remapping def-fun))
+               ;; Handle prefix definitions specially
+               ;; so that a mode that rebinds some subcommands
+               ;; won't make it appear that the whole prefix is gone.
                (key-fun (if (eq def-fun 'ESC-prefix)
                             (lookup-key global-map [27])
-                          (key-binding key)))
+                          (if (eq def-fun 'Control-X-prefix)
+                              (lookup-key global-map [24])
+                            (key-binding key))))
                (where (where-is-internal (if rem-fun rem-fun def-fun)))
                cwhere)
+
           (if where
               (progn
                 (setq cwhere (car where)