aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-19 15:00:29 +0000
committerGerd Moellmann2000-09-19 15:00:29 +0000
commita01bb1db13758f6fb457a506fbd0ab4a02d6615a (patch)
treebe5c7b9b5e21b1ea83056b46198351a62d418c4c
parent8f4ca9a5e45f8ac3e52d23e3ef1fdcc0d084a7fa (diff)
downloademacs-a01bb1db13758f6fb457a506fbd0ab4a02d6615a.tar.gz
emacs-a01bb1db13758f6fb457a506fbd0ab4a02d6615a.zip
(fancy-splash-delay, fancy-splash-image): Add
version. (fancy-splash-screen): Defgroup.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/startup.el11
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5598ff181f3..15486ebc471 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12000-09-19 Gerd Moellmann <gerd@gnu.org> 12000-09-19 Gerd Moellmann <gerd@gnu.org>
2 2
3 * startup.el (fancy-splash-delay, fancy-splash-image): Add
4 :version.
5 (fancy-splash-screen): Defgroup.
6
3 * add-log.el (change-log-font-lock-keywords): Match names 7 * add-log.el (change-log-font-lock-keywords): Match names
4 more exactly for the case that font-lock-constant-face is 8 more exactly for the case that font-lock-constant-face is
5 underlined. 9 underlined.
diff --git a/lisp/startup.el b/lisp/startup.el
index bb2bb667be3..8d7f62319a1 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -873,15 +873,22 @@ Each element in the list should be a list of strings or pairs
873`:face FACE', like `fancy-splash-insert' accepts them.") 873`:face FACE', like `fancy-splash-insert' accepts them.")
874 874
875 875
876(defgroup 'fancy-splash-screen
877 "Fancy splash screen when Emacs starts."
878 :group 'initialization)
879
880
876(defcustom fancy-splash-delay 5 881(defcustom fancy-splash-delay 5
877 "Delay in seconds between splash screens." 882 "Delay in seconds between splash screens."
878 :group 'splash-screen 883 :group 'fancy-splash-screen
884 :version "21.1"
879 :type 'integer) 885 :type 'integer)
880 886
881 887
882(defcustom fancy-splash-image "splash.xpm" 888(defcustom fancy-splash-image "splash.xpm"
883 "The image to show in the splash screens." 889 "The image to show in the splash screens."
884 :group 'splash-screen 890 :group 'fancy-splash-screen
891 :version "21.1"
885 :type 'file) 892 :type 'file)
886 893
887 894