From: Thien-Thi Nguyen <ttn@surf.glug.org>
Cc: emacs-devel@gnu.org
Subject: Re: Possible change to startup.el
Date: Sun, 03 Apr 2005 12:31:15 +0200 [thread overview]
Message-ID: <E1DI2Nv-0003hS-00@surf.glug.org> (raw)
In-Reply-To: message from Richard Stallman on Thu, 31 Mar 2005 23:11:17 -0500
From: Richard Stallman <rms@gnu.org>
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 ^[$BF~Lg%,%$%I$G$9^[(B.
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
Emacs ^[$B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K^[(B
--- 1,4 ----
! Emacs ^[$BF~Lg%,%$%I^[(B.
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
Emacs ^[$B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K^[(B
Compilation exited abnormally with code 1 at Sun Apr 3 12:21:30
next reply other threads:[~2005-04-03 10:31 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-03 10:31 Thien-Thi Nguyen [this message]
2005-04-07 6:55 ` Possible change to startup.el Juri Linkov
2005-04-08 3:22 ` Richard Stallman
2005-04-08 6:31 ` Marcelo Toledo
2005-04-08 7:27 ` Kenichi Handa
2005-04-08 18:32 ` Juri Linkov
2005-04-08 18:43 ` Marcelo Toledo
2005-04-10 1:54 ` Richard Stallman
2005-04-08 10:44 ` Eli Zaretskii
2005-04-08 18:32 ` Juri Linkov
2005-04-09 8:00 ` Eli Zaretskii
2005-04-13 23:58 ` David Kastrup
2005-04-14 4:02 ` Eli Zaretskii
2005-04-14 9:46 ` David Kastrup
2005-04-15 8:15 ` Eli Zaretskii
2005-04-14 19:03 ` Richard Stallman
2005-04-14 23:40 ` David Kastrup
2005-04-17 1:49 ` Richard Stallman
2005-04-17 9:31 ` David Kastrup
2005-04-17 19:20 ` Richard Stallman
2005-04-17 19:51 ` David Kastrup
2005-04-10 1:54 ` Richard Stallman
-- strict thread matches above, loose matches on Subject: below --
2005-03-31 12:01 Thien-Thi Nguyen
2005-03-31 12:59 ` Kim F. Storm
2005-03-31 13:43 ` David Kastrup
2005-03-31 22:19 ` Kim F. Storm
2005-04-01 4:10 ` Richard Stallman
2005-04-01 4:03 ` Juri Linkov
2005-04-03 5:20 ` Richard Stallman
2005-03-31 11:37 Thien-Thi Nguyen
2005-03-31 12:05 ` Miles Bader
2005-03-31 13:32 ` Thien-Thi Nguyen
2005-03-31 14:29 ` Miles Bader
2005-03-31 16:15 ` Thien-Thi Nguyen
2005-03-31 22:23 ` Miles Bader
2005-04-01 4:10 ` Richard Stallman
2005-03-30 22:47 Thien-Thi Nguyen
2005-03-30 23:38 ` David Kastrup
2005-04-01 4:11 ` Richard Stallman
2005-03-31 1:40 ` Miles Bader
2005-03-31 1:02 ` Marcelo Toledo
2005-03-31 3:20 ` Miles Bader
2005-03-31 2:21 ` Marcelo Toledo
2005-03-31 6:59 ` Juri Linkov
2005-04-01 4:11 ` Richard Stallman
2005-03-25 18:07 Thien-Thi Nguyen
2005-03-27 3:52 ` Richard Stallman
2005-03-27 23:15 ` Juri Linkov
2005-03-28 22:53 ` Richard Stallman
2005-03-29 20:19 ` Thien-Thi Nguyen
2005-03-30 4:08 ` Marcelo Toledo
2005-03-30 9:42 ` Thien-Thi Nguyen
2005-03-24 10:49 Thien-Thi Nguyen
2005-03-24 19:05 ` Miles Bader
2005-03-25 6:43 ` Richard Stallman
2005-03-21 18:44 David Kastrup
2005-03-21 20:50 ` Thien-Thi Nguyen
2005-03-21 21:10 ` David Kastrup
2005-03-21 21:25 ` Andreas Schwab
2005-03-21 22:14 ` David Kastrup
2005-03-22 0:03 ` Andreas Schwab
2005-03-22 1:38 ` David Hansen
2005-03-23 18:25 ` James Cloos
2005-03-27 3:53 ` Richard Stallman
2005-03-22 4:55 ` Eli Zaretskii
2005-03-22 6:24 ` Miles Bader
2005-03-22 8:15 ` Kenichi Handa
2005-03-22 8:27 ` Miles Bader
2005-03-22 10:40 ` David Kastrup
2005-03-22 12:44 ` Jason Rumney
2005-03-22 20:31 ` Werner LEMBERG
2005-03-22 11:23 ` Kenichi Handa
2005-03-22 12:33 ` Juri Linkov
2005-03-22 19:32 ` Eli Zaretskii
2005-03-22 10:18 ` David Kastrup
2005-03-22 19:34 ` Eli Zaretskii
2005-03-22 22:24 ` David Kastrup
2005-03-22 20:44 ` Richard Stallman
2005-03-22 22:32 ` Thien-Thi Nguyen
2005-03-23 6:21 ` Richard Stallman
2005-03-23 13:55 ` Juri Linkov
2005-03-23 18:01 ` Werner LEMBERG
2005-03-25 12:51 ` Kenichi Handa
2005-03-23 20:25 ` Richard Stallman
2005-03-22 13:57 ` Richard Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1DI2Nv-0003hS-00@surf.glug.org \
--to=ttn@surf.glug.org \
--cc=emacs-devel@gnu.org \
--cc=ttn@glug.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.