diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:21:32 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:21:32 +0000 |
| commit | 1e8995158740b15936887264a3d7183beb5c51d9 (patch) | |
| tree | cd8fc3c6fde54564cd5dbe15fccfc3c57b9ad270 /lisp/tutorial.el | |
| parent | 26cc71affcdc326491cfd936c43eb90522a06ca0 (diff) | |
| parent | f931ce84da6a9515dc99f88beb0de3a4138cc1cd (diff) | |
| download | emacs-1e8995158740b15936887264a3d7183beb5c51d9.tar.gz emacs-1e8995158740b15936887264a3d7183beb5c51d9.tar.bz2 emacs-1e8995158740b15936887264a3d7183beb5c51d9.zip | |
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 M. 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 M. 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
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 8 |
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) |