From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: Re: Possible change to startup.el Date: Sun, 03 Apr 2005 12:31:15 +0200 Message-ID: Reply-To: ttn@glug.org NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1112524557 20458 80.91.229.2 (3 Apr 2005 10:35:57 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2005 10:35:57 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 12:35:55 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DI2SA-00056O-Di for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2005 12:35:38 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DI2To-0006lf-Us for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2005 06:37:20 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DI2T7-00068T-L3 for emacs-devel@gnu.org; Sun, 03 Apr 2005 06:36:39 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DI2T2-00064p-Ci for emacs-devel@gnu.org; Sun, 03 Apr 2005 06:36:32 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DI2Sz-0005yV-UN for emacs-devel@gnu.org; Sun, 03 Apr 2005 06:36:29 -0400 Original-Received: from [151.37.241.134] (helo=surf.glug.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DI2IY-0002rs-AW; Sun, 03 Apr 2005 06:25:53 -0400 Original-Received: from ttn by surf.glug.org with local (Exim 3.35 #1 (Debian)) id 1DI2Nv-0003hS-00; Sun, 03 Apr 2005 12:31:15 +0200 Original-To: Richard Stallman In-reply-to: message from Richard Stallman on Thu, 31 Mar 2005 23:11:17 -0500 Original-References: X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:35528 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:35528 From: Richard Stallman Date: Thu, 31 Mar 2005 23:11:17 -0500 That needs to be done in order for this patch to be installed. please find below a revised patch, including two files (lisp/startup.el and etc/TUTORIAL.jp). here is a suitable ChangeLog entry for the code: * startup.el (fancy-splash-text): Shorten default text of "Emacs Tutorial" line. Also, if the current language env indicates an available tutorial file other than TUTORIAL, extract its title and append it to the line in parentheses. (fancy-splash-insert): If an arg is a thunk, funcall it. i have completely dropped LIST-OF-AVAILABLE-TUTORIALS, and furthermore, in consideration that all these are menu items, used the English text "Emacs Tutorial" unconditionally since that is what is on the menu. in other words, the design has changed from substitutive to additive. thi ___________________________________________________________ cvs -f diff -c lisp/startup.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 3 Apr 2005 10:15:25 -0000 *************** *** 1004,1011 **** 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 " --- 1004,1030 ---- using the mouse.\n\n" :face (variable-pitch :weight bold) "Important Help menu items:\n" ! :face variable-pitch ! (lambda () ! (let* ((en "TUTORIAL") ! (tut (or (get-language-info current-language-environment ! 'tutorial) ! en)) ! (title (with-temp-buffer ! (insert-file-contents ! (expand-file-name tut data-directory) ! nil 0 256) ! (search-forward ".") ! (buffer-substring (point-min) (1- (point)))))) ! ;; If there is a specific tutorial for the current language ! ;; environment and it is not English, append its title. ! (concat ! "Emacs Tutorial\tLearn how to use Emacs efficiently" ! (if (string= en tut) ! "" ! (concat " (" title ")")) ! "\n"))) ! :face variable-pitch "\ Emacs FAQ\tFrequently asked questions and answers Read the Emacs Manual\tView the Emacs manual using Info \(Non)Warranty\tGNU Emacs comes with " *************** *** 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))))) --- 1088,1105 ---- (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: etc/TUTORIAL.ja =================================================================== RCS file: /cvsroot/emacs/emacs/etc/TUTORIAL.ja,v retrieving revision 1.11 diff -c -r1.11 TUTORIAL.ja *** etc/TUTORIAL.ja 2 Apr 2005 18:29:00 -0000 1.11 --- etc/TUTORIAL.ja 3 Apr 2005 10:15:26 -0000 *************** *** 1,4 **** ! Emacs 入門ガイドです. Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation. Emacs のコマンドを入力するには、一般にコントロールキー（キートップに --- 1,4 ---- ! Emacs 入門ガイド. Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation. Emacs のコマンドを入力するには、一般にコントロールキー（キートップに Compilation exited abnormally with code 1 at Sun Apr 3 12:21:30