diff options
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el index be50d793f0f..18fa2f0d4cd 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -1,6 +1,6 @@ ;;; tutorial.el --- tutorial for Emacs -;; Copyright (C) 2006 Free Software Foundation, Inc. +;; Copyright (C) 2006, 2007 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, internal @@ -153,7 +153,7 @@ options: (insert "\n\nYou can use M-x " (format "%s" db) " RET instead.")) - (insert "\n\nWith you current key bindings" + (insert "\n\nWith your current key bindings" " you can use the key " where " to get the function `" @@ -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) |