diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:23:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:23:55 +0000 |
| commit | 40f9398cdba874aa72fd1828534110caa34702be (patch) | |
| tree | ba7af35a2e0a913ccb78095d130ec695e6bfeb97 /lisp/tutorial.el | |
| parent | 22110b82771c73e38e4c637b90c5d01da3671c24 (diff) | |
| parent | ccb0797a191047816dae47b2e0e7e751027bd0e8 (diff) | |
| download | emacs-unicode-xft-base.tar.gz | |
Merge from emacs--devo--0unicode-xft-base
Patches applied:
* emacs--devo--0 (patch 816-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--unicode--0--patch-235
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) |