# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1247020631 0
# Node ID ed7c4b27122a889c7531f37fb8f02c96c599acdd
# Parent  eafa232e7162b01041f2aa576dbf0e7cd4701574
(tutorial--describe-nonstandard-key):
Adjust the message for when a key has been unbound.
(help-with-tutorial): Hide the arch-tag.

diff -r eafa232e7162 -r ed7c4b27122a lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jul 08 02:34:55 2009 +0000
+++ b/lisp/ChangeLog	Wed Jul 08 02:37:11 2009 +0000
@@ -1,3 +1,9 @@
+2009-07-08  Glenn Morris  <rgm@gnu.org>
+
+	* 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  <handa@m17n.org>
 
 	* language/japanese.el (japanese-shift-jis-2004): Fix typo in the
diff -r eafa232e7162 -r ed7c4b27122a lisp/tutorial.el
--- a/lisp/tutorial.el	Wed Jul 08 02:34:55 2009 +0000
+++ b/lisp/tutorial.el	Wed Jul 08 02:37:11 2009 +0000
@@ -138,9 +138,11 @@
                     " 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 @@
               (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)