[Emacs-diffs] emacs/lisp ChangeLog tutorial.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/07/08 02:37:14

Modified files:
        lisp           : ChangeLog tutorial.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15783&r2=1.15784
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/tutorial.el?cvsroot=emacs&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15783
retrieving revision 1.15784
diff -u -b -r1.15783 -r1.15784
--- ChangeLog   8 Jul 2009 02:34:55 -0000       1.15783
+++ ChangeLog   8 Jul 2009 02:37:11 -0000       1.15784
@@ -1,3 +1,9 @@
+2009-07-08  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * language/japanese.el (japanese-shift-jis-2004): Fix typo in the

Index: tutorial.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/tutorial.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- tutorial.el 12 May 2009 16:42:22 -0000      1.33
+++ tutorial.el 8 Jul 2009 02:37:14 -0000       1.34
@@ -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)