# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1168348184 0
# Node ID 4ad75aa56c4004aa09b2a8ec91153a9cd3d4b9d4
# Parent  65588c449c5c4a44259176da77ddaa3ebafa4ab5
(tutorial--display-changes): Show M-x sequence if no
keybinding is found.
(tutorial--find-changed-keys): Never treat null keybinding as a
remapping.

diff -r 65588c449c5c -r 4ad75aa56c40 lisp/tutorial.el
--- a/lisp/tutorial.el	Tue Jan 09 13:09:02 2007 +0000
+++ b/lisp/tutorial.el	Tue Jan 09 13:09:44 2007 +0000
@@ -446,7 +446,8 @@
             (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 @@
 		  (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)