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: Thu, 31 Mar 2005 00:47:44 +0200 Message-ID: Reply-To: ttn@glug.org NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1112222506 16938 80.91.229.2 (30 Mar 2005 22:41:46 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 30 Mar 2005 22:41:46 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 31 00:41:43 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DGlsb-0005dJ-PG for ged-emacs-devel@m.gmane.org; Thu, 31 Mar 2005 00:41:42 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DGm9B-0003nP-Kl for ged-emacs-devel@m.gmane.org; Wed, 30 Mar 2005 17:58:49 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DGm8m-0003jW-S8 for emacs-devel@gnu.org; Wed, 30 Mar 2005 17:58:25 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DGm8j-0003hI-O4 for emacs-devel@gnu.org; Wed, 30 Mar 2005 17:58:22 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DGm8j-0003gu-G2 for emacs-devel@gnu.org; Wed, 30 Mar 2005 17:58:21 -0500 Original-Received: from [151.37.162.125] (helo=surf.glug.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DGlss-0007uZ-EU; Wed, 30 Mar 2005 17:41:59 -0500 Original-Received: from ttn by surf.glug.org with local (Exim 3.35 #1 (Debian)) id 1DGlyS-0003Is-00; Thu, 31 Mar 2005 00:47:44 +0200 Original-To: Richard Stallman In-reply-to: message from Richard Stallman on Fri, 25 Mar 2005 01:43:07 -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:35388 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:35388 From: Richard Stallman Date: Fri, 25 Mar 2005 01:43:07 -0500 We could make that a general rule: every tutorial translation must start with a sentence that translates "Emacs tutorial". sorry, i misunderstood this simple sentence and implemented the wrong thing (gotta slow down sometimes and be more careful). please find below a revised patch that uses the first sentence of the file as the text for the splash screen. unfortunately, i prematurely committed changes to the actual TUTORIAL files due to concerns that translators might not see the proposed changes. i think it's best that i stick w/ the code and let Marcelo and others handle updates to those files. :-( thi _____________________________________________ cvs -f diff -c startup.el diff -c -r1.340 startup.el *** startup.el 6 Mar 2005 00:48:45 -0000 1.340 --- startup.el 30 Mar 2005 22:33:59 -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,1046 ---- 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) ! (search-forward ".") ! (buffer-substring (point-min) (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))))) --- 1103,1120 ---- (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)))))