[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el,v
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el,v |
Date: |
Sun, 09 Sep 2007 12:10:14 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juri Linkov <jurta> 07/09/09 12:10:14
Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -b -r1.454 -r1.455
--- startup.el 5 Sep 2007 19:58:50 -0000 1.454
+++ startup.el 9 Sep 2007 12:10:14 -0000 1.455
@@ -49,18 +49,18 @@
(defcustom initial-buffer-choice nil
"Buffer to show after starting Emacs.
-If the value is nil and `inhibit-splash-screen' is nil, show the
+If the value is nil and `inhibit-startup-screen' is nil, show the
startup screen. If the value is string, visit the specified file or
directory using `find-file'. If t, open the `*scratch*' buffer."
:type '(choice
- (const :tag "Splash screen" nil)
+ (const :tag "Startup screen" nil)
(directory :tag "Directory" :value "~/")
(file :tag "File" :value "~/file.txt")
(const :tag "Lisp scratch buffer" t))
:version "23.1"
:group 'initialization)
-(defcustom inhibit-splash-screen nil
+(defcustom inhibit-startup-screen nil
"Non-nil inhibits the startup screen.
It also inhibits display of the initial message in the `*scratch*' buffer.
@@ -69,7 +69,8 @@
:type 'boolean
:group 'initialization)
-(defvaralias 'inhibit-startup-message 'inhibit-splash-screen)
+(defvaralias 'inhibit-splash-screen 'inhibit-startup-screen)
+(defvaralias 'inhibit-startup-message 'inhibit-startup-screen)
(defcustom inhibit-startup-echo-area-message nil
"*Non-nil inhibits the initial startup echo area message.
@@ -1123,7 +1124,7 @@
")
"Initial message displayed in *scratch* buffer at startup.
If this is nil, no message will be displayed.
-If `inhibit-splash-screen' is non-nil, then no message is displayed,
+If `inhibit-startup-screen' is non-nil, then no message is displayed,
regardless of the value of this variable."
:type '(choice (text :tag "Message")
(const :tag "none" nil))
@@ -1156,11 +1157,11 @@
(concat " (" title ")"))))
"\n"
:face variable-pitch
- :link ("View Emacs Manual" (lambda (button) (info-emacs-manual)))
- "\tView the Emacs manual using Info\n"
:link ("Emacs Guided Tour"
(lambda (button) (browse-url
"http://www.gnu.org/software/emacs/tour/")))
"\tOverview of Emacs features\n"
+ :link ("View Emacs Manual" (lambda (button) (info-emacs-manual)))
+ "\tView the Emacs manual using Info\n"
:link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
"\tGNU Emacs comes with "
:face (variable-pitch :slant oblique)
@@ -1174,9 +1175,12 @@
"To start... "
:link ("Open a File"
(lambda (button) (call-interactively 'find-file)))
- "\t"
+ " "
:link ("Open Home Directory"
(lambda (button) (dired "~")))
+ " "
+ :link ("Customize Startup"
+ (lambda (button) (customize-group 'initialization)))
"\n"))
"A list of texts to show in the middle part of splash screens.
Each element in the list should be a list of strings or pairs
@@ -1184,6 +1188,17 @@
(defvar fancy-about-text
'((:face variable-pitch
+ :link ("Authors"
+ (lambda (button)
+ (view-file (expand-file-name "AUTHORS" data-directory))
+ (goto-char (point-min))))
+ "\tMany people have contributed code included in GNU Emacs\n"
+ :link ("Contributing"
+ (lambda (button)
+ (view-file (expand-file-name "CONTRIBUTE" data-directory))
+ (goto-char (point-min))))
+ "\tHow to contribute improvements to Emacs\n"
+ "\n"
:link ("GNU and Freedom" (lambda (button) (describe-project)))
"\tWhy we developed GNU Emacs, and the GNU operating system\n"
:link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
@@ -1314,13 +1329,15 @@
(insert "\n")
(fancy-splash-insert
:face '(variable-pitch :foreground "red")
- "GNU Emacs is one component of the "
+ (if startup "Welcome to " "This is ")
+ :link
+ '("GNU Emacs" (lambda (button) (browse-url
"http://www.gnu.org/software/emacs/")))
+ ", one component of the "
:link
(if (eq system-type 'gnu/linux)
'("GNU/Linux" (lambda (button) (browse-url
"http://www.gnu.org/gnu/linux-and-gnu.html")))
'("GNU" (lambda (button) (describe-project))))
- " operating system.")
- (insert "\n")
+ " operating system.\n")
(if startup
(fancy-splash-insert
:face 'variable-pitch
@@ -1332,20 +1349,29 @@
"Control-g"
:face 'variable-pitch
"."
- "\n\n"))
- )
+ "\n\n")
+ (let ((fg (if (eq (frame-parameter nil 'background-mode) 'dark)
+ "cyan" "darkblue")))
+ (fancy-splash-insert :face `(variable-pitch :foreground ,fg)
+ "\n"
+ (emacs-version)
+ "\n"
+ :face '(variable-pitch :height 0.5)
+ emacs-copyright
+ "\n\n"))))
(defun fancy-splash-tail (&optional startup)
"Insert the tail part of the splash screen into the current buffer."
(let ((fg (if (eq (frame-parameter nil 'background-mode) 'dark)
"cyan" "darkblue")))
+ (if startup
(fancy-splash-insert :face `(variable-pitch :foreground ,fg)
"\nThis is "
(emacs-version)
"\n"
:face '(variable-pitch :height 0.5)
emacs-copyright
- "\n")
+ "\n"))
(and startup
auto-save-list-file-prefix
;; Don't signal an error if the
@@ -1497,8 +1523,6 @@
", one component of the GNU/Linux operating system.\n"
", a part of the GNU operating system.\n"))
- (insert "\n")
-
(if startup
(if (display-mouse-p)
;; The user can use the mouse to activate menus
@@ -1696,7 +1720,7 @@
(eq (key-binding "\C-h\C-w") 'describe-no-warranty))
(progn
(insert
- "\n
+ "
GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for ")
(insert-button "full details"
'action (lambda (button) (describe-no-warranty))
@@ -1714,7 +1738,7 @@
'follow-link t)
(insert "."))
(insert (substitute-command-keys
- "\n
+ "
GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for
"))
(insert-button "full details"
'action (lambda (button) (describe-no-warranty))
@@ -1737,6 +1761,22 @@
(insert "To follow a link, click Mouse-1 on it, or move to it and type
RET.\n\n")
+ (insert-button "Authors"
+ 'action
+ (lambda (button)
+ (view-file (expand-file-name "AUTHORS" data-directory))
+ (goto-char (point-min)))
+ 'follow-link t)
+ (insert "\t\tMany people have contributed code included in GNU Emacs\n")
+
+ (insert-button "Contributing"
+ 'action
+ (lambda (button)
+ (view-file (expand-file-name "CONTRIBUTE" data-directory))
+ (goto-char (point-min)))
+ 'follow-link t)
+ (insert "\tHow to contribute improvements to Emacs\n\n")
+
(insert-button "GNU and Freedom"
'action (lambda (button) (describe-project))
'follow-link t)
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juri Linkov, 2007/09/04
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Richard M. Stallman, 2007/09/05
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v,
Juri Linkov <=
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Chong Yidong, 2007/09/10
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Glenn Morris, 2007/09/14
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Stefan Monnier, 2007/09/21
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Stefan Monnier, 2007/09/21
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juri Linkov, 2007/09/22
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juri Linkov, 2007/09/22
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juanma Barranquero, 2007/09/25
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, David Kastrup, 2007/09/30