diff options
| author | Richard M. Stallman <rms@gnu.org> | 2007-07-15 18:40:19 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2007-07-15 18:40:19 +0000 |
| commit | 0e01e4afb99f8d278de0fea3270649e7ab46d652 (patch) | |
| tree | d1ed2e19e61645b56dce4ead2d38716e835244b6 | |
| parent | f9b9868496ff25dabafcd3c35b6bb5600dbdd2fd (diff) | |
| download | emacs-0e01e4afb99f8d278de0fea3270649e7ab46d652.tar.gz | |
(tutorial--find-changed-keys): Handle C-x specially like ESC.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/tutorial.el | 8 |
2 files changed, 12 insertions, 1 deletions
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))) |