(tutorial--describe-nonstandard-key):

Adjust the message for when a key has been unbound.
(help-with-tutorial): Hide the arch-tag.

2 files changed, 15 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c45c1e99f8..27d9f28702 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-08  Glenn Morris  <[email protected]>
+
+	* tutorial.el (tutorial--describe-nonstandard-key):
+	Adjust the message for when a key has been unbound.
+	(help-with-tutorial): Hide the arch-tag.
+
 2009-07-08  Kenichi Handa  <[email protected]>
 
 	* language/japanese.el (japanese-shift-jis-2004): Fix typo in the
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 7df71e02af..96aec65f38 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -138,9 +138,11 @@ options:
                     " is the command `")
             (insert (format "%s" db))
             (insert "'.  "
-                    "However, your customizations have rebound it to the command `")
-            (insert (format "%s" cb))
-            (insert "'.")
+                    "However, your customizations have "
+                    (if cb
+                        (format "rebound it to the command `%s'" cb)
+                      "unbound it"))
+            (insert ".")
             (when mapsym
               (insert "  (For the more advanced user:"
                       " This binding is in the keymap `"
@@ -862,6 +864,10 @@ Run the Viper tutorial? "))
               (when (< old-point 1)
                 (setq old-point 1))
               (goto-char old-point))
+          ;; Delete the arch-tag line, so as not to confuse readers.
+          (goto-char (point-max))
+          (if (search-backward ";;; arch-tag: " nil t)
+              (delete-region (point) (point-max)))
           (goto-char (point-min))
           (search-forward "\n<<")
           (beginning-of-line)