From: Richard Stallman <[EMAIL PROTECTED]>
Date: Mon, 28 Mar 2005 17:53:33 -0500
Let's add the feature now
ok, please find below a patch for startup.el and help-fns.el, as
well as each TUTORIAL file. the title line was taken from the
text of the tutorial file instead of from the email, in case there
were changes during transport that i may be incapable of noticing.
i have lightly tested with language environments: Latin-1, English,
Thai, Ethiopic, Russian, Italian, Chinese-GB, Czech, and others i
cannot remember at the moment.
this patch does not add clickability; that's something i'll gladly
leave for someone else to add. (i don't have a mouse to test it.)
the change to `help-with-tutorial' in help-fns.el is to provide
continuity in user experience from older versions of emacs, which
saves local wizards a bit of extra explaining (a Good Thing).
thi
_____________________________________________________________________
cvs -f diff -c lisp/startup.el lisp/help-fns.el etc/TUTORIAL*
Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.340
diff -c -r1.340 startup.el
*** lisp/startup.el 6 Mar 2005 00:48:45 -0000 1.340
--- lisp/startup.el 29 Mar 2005 19:52:28 -0000
***************
*** 1004,1012 ****
using the mouse.\n\n"
:face (variable-pitch :weight bold)
"Important Help menu items:\n"
! :face variable-pitch "\
! Emacs Tutorial\tLearn-by-doing tutorial for using Emacs efficiently
! Emacs FAQ\tFrequently asked questions and answers
Read the Emacs Manual\tView the Emacs manual using Info
\(Non)Warranty\tGNU Emacs comes with "
:face (variable-pitch :slant oblique)
--- 1004,1045 ----
using the mouse.\n\n"
:face (variable-pitch :weight bold)
"Important Help menu items:\n"
! :face variable-pitch
! (lambda ()
! (concat
! (let ((tut (expand-file-name
! (or (get-language-info current-language-environment
! 'tutorial)
! "TUTORIAL")
! data-directory)))
! (with-temp-buffer
! (insert-file-contents tut nil 0 80)
! (buffer-substring (point-min) (progn (end-of-line)
(point)))))
! "\t"))
! :face (variable-pitch :weight bold)
! (lambda ()
! (if (not data-directory)
! "Learn-by-doing tutorial for using Emacs efficiently."
! (let* ((tut (get-language-info current-language-environment
! 'tutorial))
! (en-prefix (if (or (not tut) (string= "TUTORIAL" tut))
! ""
! "(Emacs Tutorial) "))
! (break (- (length en-prefix)))
! langs s len)
! (dolist (filename (directory-files data-directory))
! (when (string-match
"TUTORIAL.\\([a-z][a-z]\\(_[A-Z]+\\)*$\\)"
! filename)
! (push (match-string 1 filename) langs)))
! (setq s (mapconcat 'identity (sort (cons "en" langs)
'string<)
! ", ")
! len (length s))
! (while (and (< (setq break (+ 50 break)) len)
! (setq break (string-match ", " s break)))
! (aset s break ?\n)
! (aset s (1+ break) ?\t))
! (concat en-prefix s "\n"))))
! :face variable-pitch "\
Read the Emacs Manual\tView the Emacs manual using Info
\(Non)Warranty\tGNU Emacs comes with "
:face (variable-pitch :slant oblique)
***************
*** 1069,1082 ****
(defun fancy-splash-insert (&rest args)
"Insert text into the current buffer, with faces.
! Arguments from ARGS should be either strings or pairs `:face FACE',
where FACE is a valid face specification, as it can be used with
`put-text-properties'."
(let ((current-face nil))
(while args
(if (eq (car args) :face)
(setq args (cdr args) current-face (car args))
! (insert (propertize (car args)
'face current-face
'help-echo fancy-splash-help-echo)))
(setq args (cdr args)))))
--- 1102,1119 ----
(defun fancy-splash-insert (&rest args)
"Insert text into the current buffer, with faces.
! Arguments from ARGS should be either strings, functions called
! with no args that return a string, or pairs `:face FACE',
where FACE is a valid face specification, as it can be used with
`put-text-properties'."
(let ((current-face nil))
(while args
(if (eq (car args) :face)
(setq args (cdr args) current-face (car args))
! (insert (propertize (let ((it (car args)))
! (if (functionp it)
! (funcall it)
! it))
'face current-face
'help-echo fancy-splash-help-echo)))
(setq args (cdr args)))))
Index: lisp/help-fns.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.64
diff -c -r1.64 help-fns.el
*** lisp/help-fns.el 3 Feb 2005 19:41:14 -0000 1.64
--- lisp/help-fns.el 29 Mar 2005 19:52:29 -0000
***************
*** 65,70 ****
--- 65,72 ----
(insert-file-contents (expand-file-name filename data-directory))
(hack-local-variables)
(goto-char (point-min))
+ ;; The first line conventionally contains the title.
+ (delete-region (point) (progn (forward-line 1) (point)))
(search-forward "\n<<")
(beginning-of-line)
;; Convert the <<...>> line to the proper [...] line,
Index: etc/TUTORIAL
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL,v
retrieving revision 1.59
diff -c -r1.59 TUTORIAL
*** etc/TUTORIAL 8 Feb 2005 14:20:01 -0000 1.59
--- etc/TUTORIAL 29 Mar 2005 19:52:33 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Emacs Tutorial
You are looking at the Emacs tutorial. See end for copying conditions.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
Index: etc/TUTORIAL.bg
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.bg,v
retrieving revision 1.3
diff -c -r1.3 TUTORIAL.bg
*** etc/TUTORIAL.bg 29 Dec 2003 12:49:21 -0000 1.3
--- etc/TUTORIAL.bg 29 Mar 2005 19:52:33 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ ����������� �� �����
��� ������� ����������� �� �����. ��������� �� �������� �� � ���� �� ������.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2003 Free Software Foundation.
Index: etc/TUTORIAL.cn
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.cn,v
retrieving revision 1.4
diff -c -r1.4 TUTORIAL.cn
*** etc/TUTORIAL.cn 1 Sep 2003 15:44:59 -0000 1.4
--- etc/TUTORIAL.cn 29 Mar 2005 19:52:33 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Emacs ����ָ��
�������Ķ� Emacs ����ָ�ϣ� Emacs tutorial �������ҳβ�йظ���������
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
Index: etc/TUTORIAL.cs
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.cs,v
retrieving revision 1.9
diff -c -r1.9 TUTORIAL.cs
*** etc/TUTORIAL.cs 1 Sep 2003 15:44:59 -0000 1.9
--- etc/TUTORIAL.cs 29 Mar 2005 19:52:33 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ tutori�l k Emacsu
Copyright (c) 1985 Free Software Foundation, Inc; podm�nky viz na konci.
Do �e�tiny p�elo�il Milan Zamazal <[EMAIL PROTECTED]>.
Index: etc/TUTORIAL.de
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.de,v
retrieving revision 1.9
diff -c -r1.9 TUTORIAL.de
*** etc/TUTORIAL.de 29 Sep 2003 22:56:46 -0000 1.9
--- etc/TUTORIAL.de 29 Mar 2005 19:52:33 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Einf�hrung in Emacs
Einf�hrung in Emacs. (c) 2002, 2003 Free Software Foundation, Inc.
Emacs-Befehle beinhalten im allgemeinen die CONTROL-Taste (manchmal
Index: etc/TUTORIAL.es
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.es,v
retrieving revision 1.9
diff -c -r1.9 TUTORIAL.es
*** etc/TUTORIAL.es 14 Aug 2004 12:01:01 -0000 1.9
--- etc/TUTORIAL.es 29 Mar 2005 19:52:34 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ tutorial de Emacs
Usted esta viendo el tutorial de Emacs. Vea al final las condiciones
de copiado. Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software
Foundation.
Index: etc/TUTORIAL.fr
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.fr,v
retrieving revision 1.11
diff -c -r1.11 TUTORIAL.fr
*** etc/TUTORIAL.fr 8 Oct 2004 18:10:51 -0000 1.11
--- etc/TUTORIAL.fr 29 Mar 2005 19:52:34 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Didacticiel d'Emacs
Didacticiel d'Emacs. Voir la fin de ce document pour les conditions.
Copyright (c) 1985, 2001, 2002 Free Software Foundation, Inc.
Index: etc/TUTORIAL.it
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.it,v
retrieving revision 1.3
diff -c -r1.3 TUTORIAL.it
*** etc/TUTORIAL.it 17 Apr 2004 22:54:09 -0000 1.3
--- etc/TUTORIAL.it 29 Mar 2005 19:52:34 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Esercitazione di Emacs
Esercitazione di Emacs. Copyright (c) 2003 Free Software Foundation, Inc.
Condizioni d'uso alla fine del file.
Index: etc/TUTORIAL.ja
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.ja,v
retrieving revision 1.8
diff -c -r1.8 TUTORIAL.ja
*** etc/TUTORIAL.ja 1 Sep 2003 15:44:59 -0000 1.8
--- etc/TUTORIAL.ja 29 Mar 2005 19:52:35 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Emacs $BF~Lg%,%$%I$G$9(B
$B$"$J$?$,8=:_8+$F$$$k$N$O(B Emacs
$BF~Lg%,%$%I$G$9!#%U%!%$%k:G8e$r;2>H$N$3$H!#(B
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
Index: etc/TUTORIAL.ko
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.ko,v
retrieving revision 1.4
diff -c -r1.4 TUTORIAL.ko
*** etc/TUTORIAL.ko 1 Sep 2003 15:44:59 -0000 1.4
--- etc/TUTORIAL.ko 29 Mar 2005 19:52:36 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ $([EMAIL PROTECTED]:(B(Emacs) $(CAvD'<[EMAIL PROTECTED](B
$([EMAIL PROTECTED]@[1G(B (c) 1985, 2001 Free Software Foundation, Inc;
$(C3!?!4B(B $(C:9;g(B $([EMAIL PROTECTED](B
$([EMAIL PROTECTED]@4O4Y(B. $(CAv1](B $([EMAIL PROTECTED](B $([EMAIL
PROTECTED](B $([EMAIL PROTECTED](B $(C1[@:(B $([EMAIL PROTECTED]:(B(Emacs)
$(CAvD'<[EMAIL PROTECTED](B.
Index: etc/TUTORIAL.nl
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.nl,v
retrieving revision 1.11
diff -c -r1.11 TUTORIAL.nl
*** etc/TUTORIAL.nl 14 Feb 2005 10:46:16 -0000 1.11
--- etc/TUTORIAL.nl 29 Mar 2005 19:52:36 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Emacs-inleiding
Je leest nu de Emacs-inleiding. De kopieervoorwaarden staan onderaan.
Copyright (c) 1985, 1996, 1997, 2003, 2004, 2005 Free Software Foundation
Index: etc/TUTORIAL.pl
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.pl,v
retrieving revision 1.7
diff -c -r1.7 TUTORIAL.pl
*** etc/TUTORIAL.pl 17 Apr 2004 23:08:01 -0000 1.7
--- etc/TUTORIAL.pl 29 Mar 2005 19:52:37 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ kr�tki samouczek Emacsa
Czytasz w�a�nie kr�tki samouczek Emacsa. Copyright (c) 1985, 2001
Free Software Foundation, Inc. Szczeg�y na ko�cu pliku.
Index: etc/TUTORIAL.pt_BR
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.pt_BR,v
retrieving revision 1.3
diff -c -r1.3 TUTORIAL.pt_BR
*** etc/TUTORIAL.pt_BR 16 May 2004 06:33:00 -0000 1.3
--- etc/TUTORIAL.pt_BR 29 Mar 2005 19:52:37 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ tutorial do Emacs
Copyright (c) 2004 Free Software Foundation, Inc; Veja no fim as
condi��es.
Index: etc/TUTORIAL.ro
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.ro,v
retrieving revision 1.3
diff -c -r1.3 TUTORIAL.ro
*** etc/TUTORIAL.ro 1 Sep 2003 15:44:59 -0000 1.3
--- etc/TUTORIAL.ro 29 Mar 2005 19:52:38 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ tutorialului de Emacs
Copyright (c) 1998 Free Software Foundation -*-coding: latin-2;-*-
Traducere din englez�de Tudor Hulubei <[EMAIL PROTECTED]>.
Mul�umiri Aidei Hulubei <[EMAIL PROTECTED]> pentru corecturi �i sugestii.
Index: etc/TUTORIAL.ru
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.ru,v
retrieving revision 1.7
diff -c -r1.7 TUTORIAL.ru
*** etc/TUTORIAL.ru 17 Apr 2004 22:40:52 -0000 1.7
--- etc/TUTORIAL.ru 29 Mar 2005 19:52:39 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ ������� Emacs
�� ������� ������� Emacs. ������� ����������� � ����� �����.
Copyright (c) 1985, 1996, 2004 Free Software Foundation, Inc.
Index: etc/TUTORIAL.sk
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.sk,v
retrieving revision 1.8
diff -c -r1.8 TUTORIAL.sk
*** etc/TUTORIAL.sk 1 Sep 2003 15:44:59 -0000 1.8
--- etc/TUTORIAL.sk 29 Mar 2005 19:52:40 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ t�torial k Emacsu
Copyright (c) 1985 Free Software Foundation, Inc; podmienky pozri na konci.
Do �e�tiny prelo�il Milan Zamazal <[EMAIL PROTECTED]>, do sloven�iny Miroslav
Va�ko <[EMAIL PROTECTED]>.
Index: etc/TUTORIAL.sl
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.sl,v
retrieving revision 1.7
diff -c -r1.7 TUTORIAL.sl
*** etc/TUTORIAL.sl 17 Apr 2004 23:09:47 -0000 1.7
--- etc/TUTORIAL.sl 29 Mar 2005 19:52:40 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Prvo berilo za Emacs
Prvo berilo za Emacs. Pogoji uporabe in raz�irjanja so navedeni na koncu.
Copyright (c) 1985, 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
Index: etc/TUTORIAL.sv
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.sv,v
retrieving revision 1.4
diff -c -r1.4 TUTORIAL.sv
*** etc/TUTORIAL.sv 17 Apr 2004 23:11:22 -0000 1.4
--- etc/TUTORIAL.sv 29 Mar 2005 19:52:40 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ anv�ndarhandledningen till Emacs
Detta �r den Svenska anv�ndarhandledningen till Emacs. I slutet finns
kopieringsvillkoren. Copyright (c) 1985, 1996, 1998, 2001, 2002 Free
Software Foundation, Inc.
Index: etc/TUTORIAL.th
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.th,v
retrieving revision 1.4
diff -c -r1.4 TUTORIAL.th
*** etc/TUTORIAL.th 17 Apr 2004 23:15:16 -0000 1.4
--- etc/TUTORIAL.th 29 Mar 2005 19:52:41 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ 0,T7h1R9!S0EQ1'0HV1!IR0$Yh10AW1M!RCc0*i10MU1aA!0Jl1(B
,TJ'G90ET1"0JT1708Tl1(B ,T>(B.,TH(B. 2528
,Tb4B:0CT10IQ17?0CU1+M?05l1aG0Cl1?RG09l1`40*Q19(B (Free Software
Foundation, Inc); ,T!0CX13R0HV1!IR`0'Wh1M9d"5M907i1RB:7(B.
0,T7h1R9!S0EQ1'0HV1!IR0$Yh10AW1M!RCc0*i10MU1aA!0Jl1(B
(Emacs tutorial) ,TM0BYh1c9"3P09Ui1(B.
Index: etc/TUTORIAL.zh
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.zh,v
retrieving revision 1.4
diff -c -r1.4 TUTORIAL.zh
*** etc/TUTORIAL.zh 1 Sep 2003 15:44:59 -0000 1.4
--- etc/TUTORIAL.zh 29 Mar 2005 19:52:42 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ Emacs �ֳt���n�]
�z���b�\Ū Emacs �ֳt���n�] Emacs tutorial �^�C�Ш����������ƻs����C
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
_______________________________________________
Emacs-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-devel
