diff options
| author | Karoly Lorentey <karoly@lorentey.hu> | 2007-02-24 19:26:54 +0000 |
|---|---|---|
| committer | Karoly Lorentey <karoly@lorentey.hu> | 2007-02-24 19:26:54 +0000 |
| commit | f65f7603312547e51230192daf34349b8ac569a0 (patch) | |
| tree | cbc5877854d00bbdd5ecd4906d130ab8fbb44430 /lisp/tutorial.el | |
| parent | 9440b75fccbf763e3fb23a31a128d97eb4debdf5 (diff) | |
| parent | 735895f1fa28f88c559e73910ea0ff0bda0f228c (diff) | |
| download | emacs-f65f7603312547e51230192daf34349b8ac569a0.tar.gz | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-619
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-620
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-621
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-622
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-623
Remove RCS keywords
* emacs@sv.gnu.org/emacs--devo--0--patch-624
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-625
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-626
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-627
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-628
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-629
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-630
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-631
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-632
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-633
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-634
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-635
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-636
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-637
Remove RCS keywords
* emacs@sv.gnu.org/emacs--devo--0--patch-638
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-639
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-640
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-641
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-642
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-643
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-644
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-645
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-646
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-647
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-648
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-649
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-197
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-198
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-199
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-200
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-201
Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-202
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-596
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el index c446400d906..f1da71a8e5d 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -334,10 +334,11 @@ LEFT and RIGHT are the elements to compare." 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"))) + "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,25 +355,20 @@ from the Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) (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)) + (indent-to 18) ;; Insert a link describing the old binding: (insert-button def-fun-txt 'value def-fun 'action - (lambda(button) (interactive) + (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))) + (indent-to 45) (when (listp where) (setq where "list")) ;; Tell where the old binding is now: - (insert (format " %-11s " + (insert (format " %-16s " (if (string= "" where) (format "M-x %s" def-fun-txt) where))) @@ -381,7 +377,7 @@ from the Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) ;; cua-mode replacements: (insert-button (car remark) 'action - (lambda(b) (interactive) + (lambda (b) (interactive) (let ((value (button-get b 'value))) (tutorial--describe-nonstandard-key value))) 'value (cdr remark) |