(tutorial--find-changed-keys): Handle C-x specially like ESC.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc755882a6b00e198ba9f8dd8b7e6099cf1d611c..322c00b6660e2abb07a92f15cb302bba4185ff81 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-15  Richard Stallman  <rms@gnu.org>
+
+       * tutorial.el (tutorial--find-changed-keys):
+       Handle C-x specially like ESC.
+
 2007-07-15  Roland McGrath  <roland@frob.com>
 
        * add-log.el (add-change-log-entry): Check add-log-full-name

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 4856d178056c5c0320674618aaf7bc4e7556499b..feaabbbb19ea079e817d4380f67f76ce5ff8a860 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -431,10 +431,16 @@ 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))))
+
          (if where
              (progn
                (setq where (key-description (car where)))