Mercurial > emacs

diff lisp/tutorial.el @ 82073:38a46faaf8c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Patches applied: * 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 2007-07-23 Stefan Monnier <monnier@iro.umontreal.ca> * lisp/ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the underlying file is uptodate. 2007-07-17 Dan Nicolaescu <dann@ics.uci.edu> * lisp/vc.el: Add more info about the vc-registered function. 2007-07-15 Richard Stallman <rms@gnu.org> * lisp/kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys. * lisp/tutorial.el (tutorial--find-changed-keys): Handle C-x specially like ESC. 2007-07-15 Aaron Hawley <aaronh@garden.org> * lisp/tar-mode.el (tar-get-descriptor): No error for zero-length file. 2007-07-21 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc string. 2007-07-16 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces. 2007-07-16 Richard Stallman <rms@gnu.org> * lispref/display.texi (Defining Faces): Fix previous change. 2007-07-20 Eli Zaretskii <eliz@gnu.org> * src/w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define if not defined. 2007-07-18 Jason Rumney <jasonr@gnu.org> * src/w32proc.c (w32_executable_type): Handle 64 bit executables. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-823
author Miles Bader <miles@gnu.org>
date Tue, 24 Jul 2007 01:21:32 +0000
parents e345103787bc 35849fc29fa6
children b98604865ea0
line wrap: on
line diff
--- a/lisp/tutorial.el	Mon Jul 23 21:32:32 2007 +0000
+++ b/lisp/tutorial.el	Tue Jul 24 01:21:32 2007 +0000
@@ -431,11 +431,17 @@
 	       (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)