From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 15 Jul 2007 18:40:19 +0000 (+0000)
Subject: (tutorial--find-changed-keys): Handle C-x specially like ESC.
X-Git-Tag: emacs-pretest-22.1.90~1262
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e01e4afb99f8d278de0fea3270649e7ab46d652;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc755882a6b..322c00b6660 100644
--- 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 4856d178056..feaabbbb19e 100644
--- 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)))