]> git.eshelyaron.com Git - emacs.git/commitdiff
(tutorial--display-changes): Show M-x sequence if no
authorChong Yidong <cyd@stupidchicken.com>
Tue, 9 Jan 2007 13:09:44 +0000 (13:09 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 9 Jan 2007 13:09:44 +0000 (13:09 +0000)
keybinding is found.
(tutorial--find-changed-keys): Never treat null keybinding as a
remapping.

lisp/tutorial.el

index cf9a391e5a65f6827d036b2d7b28e4c42c6b531f..53f41c9564625ab872c2c3dba30e289cfe2253a0 100644 (file)
@@ -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)