Re: Tutorial incorrectly thinks emacs -Q uses customizations. Alarmist and confusing tutorial intro.

[Richard Stallman]

I've made a few minor fixes to a few of these details.
What do you think of them?


*** tutorial.el 28 Jan 2007 02:11:20 -0500      1.13
--- tutorial.el 28 Jan 2007 22:05:09 -0500      
***************
*** 334,343 ****
                                tutorial--default-keys)))))
          (when changed-keys
            (insert
!            "The following key bindings used in the tutorial had been changed
! from the Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" )
!           (let ((frm "   %-9s %-27s %-11s %s\n"))
!             (insert (format frm "Key" "Standard Binding" "Is Now On" 
"Remark")))
            (dolist (tk changed-keys)
              (let* ((def-fun     (nth 1 tk))
                     (key         (nth 0 tk))
--- 334,344 ----
                                tutorial--default-keys)))))
          (when changed-keys
            (insert
!            "The following key bindings used in the tutorial have been changed
! from the Emacs default:\n\n" )
!           (let ((frm "   %-14s %-27s %-16s\n"))
!             (insert (format frm
!                           "Standard Key" "Command" "In Your Emacs")))
            (dolist (tk changed-keys)
              (let* ((def-fun     (nth 1 tk))
                     (key         (nth 0 tk))
***************
*** 354,378 ****
                    (put-text-property 0 (length key-txt)
                                     'face 'tutorial-warning-face key-txt))
                  (insert "   " key-txt " ")
!                 (setq tot-len (length key-txt))
!                 (when (> 9 tot-len)
!                   (insert (make-string (- 9 tot-len) ?\s))
!                   (setq tot-len 9))
                  ;; Insert a link describing the old binding:
                  (insert-button def-fun-txt
                                 'value def-fun
                                 'action
!                                (lambda(button) (interactive)
                                   (describe-function
                                    (button-get button 'value)))
                                 'follow-link t)
!                 (setq tot-len (+ tot-len (length def-fun-txt)))
!                 (when (> 36 tot-len)
!                   (insert (make-string (- 36 tot-len) ?\s)))
                  (when (listp where)
                    (setq where "list"))
                  ;; Tell where the old binding is now:
!                 (insert (format " %-11s "
                                  (if (string= "" where)
                                      (format "M-x %s" def-fun-txt)
                                    where)))
--- 355,374 ----
                    (put-text-property 0 (length key-txt)
                                     'face 'tutorial-warning-face key-txt))
                  (insert "   " key-txt " ")
!               (indent-to 18)
                  ;; Insert a link describing the old binding:
                  (insert-button def-fun-txt
                                 'value def-fun
                                 'action
!                                (lambda (button) (interactive)
                                   (describe-function
                                    (button-get button 'value)))
                                 'follow-link t)
!               (indent-to 45)
                  (when (listp where)
                    (setq where "list"))
                  ;; Tell where the old binding is now:
!                 (insert (format " %-16s "
                                  (if (string= "" where)
                                      (format "M-x %s" def-fun-txt)
                                    where)))
***************
*** 381,387 ****
                  ;; cua-mode replacements:
                  (insert-button (car remark)
                                 'action
!                                (lambda(b) (interactive)
                                   (let ((value (button-get b 'value)))
                                     (tutorial--describe-nonstandard-key 
value)))
                                 'value (cdr remark)
--- 377,383 ----
                  ;; cua-mode replacements:
                  (insert-button (car remark)
                                 'action
!                                (lambda (b) (interactive)
                                   (let ((value (button-get b 'value)))
                                     (tutorial--describe-nonstandard-key 
value)))
                                 'value (cdr remark)