From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 17 Apr 2005 16:00:20 +0000 (+0000)
Subject: (fancy-splash-max-time): Just 30 seconds.
X-Git-Tag: ttn-vms-21-2-B4~949
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ef0ffc603eb56533d3f6755c51009065a4ebba5;p=emacs.git

(fancy-splash-max-time): Just 30 seconds.
(fancy-splash-delay): Just 7.
(fancy-splash-screens): No time limit other than fancy-splash-max-time.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 224158e9a37..1919c2837f8 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1085,15 +1085,15 @@ Each element in the list should be a list of strings or pairs
   :group 'initialization)
 
 
-(defcustom fancy-splash-delay 10
+(defcustom fancy-splash-delay 7
   "*Delay in seconds between splash screens."
   :group 'fancy-splash-screen
   :type 'integer)
 
 
-(defcustom fancy-splash-max-time 60
+(defcustom fancy-splash-max-time 30
   "*Show splash screens for at most this number of seconds.
-Values less than 60 seconds are ignored."
+Values less than twice `fancy-splash-delay' are ignored."
   :group 'fancy-splash-screen
   :type 'integer)
 
@@ -1271,7 +1271,7 @@ mouse."
 		    mode-line-format (propertize "---- %b %-"
 						 'face '(:weight bold))
 		    fancy-splash-stop-time (+ (float-time)
-					      (max 60 fancy-splash-max-time))
+					      fancy-splash-max-time)
 		    timer (run-with-timer 0 fancy-splash-delay
 					  #'fancy-splash-screens-1
 					  splash-buffer))