summaryrefslogtreecommitdiff
path: root/lisp/tutorial.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2007-01-09 13:09:44 +0000
committerChong Yidong <cyd@stupidchicken.com>2007-01-09 13:09:44 +0000
commitcec8b27d065e80d21c8f6d16ce699eb9d9609444 (patch)
tree12aa1cf8f59f0bd1993ae0146291874f45cd4ea0 /lisp/tutorial.el
parent5c1e7dacc7bb55ff8622d1f40fe6bc2291c53675 (diff)
downloademacs-cec8b27d065e80d21c8f6d16ce699eb9d9609444.tar.gz
(tutorial--display-changes): Show M-x sequence if no
keybinding is found. (tutorial--find-changed-keys): Never treat null keybinding as a remapping.
Diffstat (limited to 'lisp/tutorial.el')
-rw-r--r--lisp/tutorial.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index cf9a391e5a6..53f41c95646 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -446,7 +446,8 @@ where
(cond ((eq key-fun def-fun)
;; No rebinding, return t
t)
- ((eq key-fun (command-remapping def-fun))
+ ((and key-fun
+ (eq key-fun (command-remapping def-fun)))
;; Just a remapping, return t
t)
;; cua-mode specials:
@@ -571,6 +572,8 @@ with some explanatory links."
(where (nth 3 ck))
s1 s2 help-string)
(unless (string= where "Same key")
+ (when (string= where "")
+ (setq where (format "M-x %s" def-fun)))
(setq tutorial--point-after-chkeys (point-marker)
s1 (get-lang-string tutorial--lang 'tut-chgdkey)
s2 (get-lang-string tutorial--lang 'tut-chgdkey2)