aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-09-19 17:05:18 +0000
committerDave Love2000-09-19 17:05:18 +0000
commitfb275c02f5ffa0bb928d0d42b5e16a3000295b9b (patch)
tree579c14cc7f6d1714c4560d25c82d97662e504edc
parent7b91e0f272ce9ca0c040b6681dc710791a45e975 (diff)
downloademacs-fb275c02f5ffa0bb928d0d42b5e16a3000295b9b.tar.gz
emacs-fb275c02f5ffa0bb928d0d42b5e16a3000295b9b.zip
(fancy-splash-screen) <defgroup>: Fix syntax. Add
:version here. (fancy-splash-delay, fancy-splash-image): Remove :version here.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/startup.el7
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a730d58f89d..8a59d57101c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12000-09-19 Dave Love <fx@gnu.org>
2
3 * startup.el (fancy-splash-screen) <defgroup>: Fix syntax. Add
4 :version here.
5 (fancy-splash-delay, fancy-splash-image): Remove :version here.
6
12000-09-19 Gerd Moellmann <gerd@gnu.org> 72000-09-19 Gerd Moellmann <gerd@gnu.org>
2 8
3 * progmodes/sh-script.el (sh-search-word): Remove call to 9 * progmodes/sh-script.el (sh-search-word): Remove call to
diff --git a/lisp/startup.el b/lisp/startup.el
index 8d7f62319a1..cacde7396d7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,6 +1,6 @@
1;;; startup.el --- process Emacs shell arguments 1;;; startup.el --- process Emacs shell arguments
2 2
3;; Copyright (C) 1985, 86, 92, 94, 95, 96, 97, 1998, 1999 Free Software Foundation, Inc. 3;; Copyright (C) 1985, 86, 92, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6;; Keywords: internal 6;; Keywords: internal
@@ -873,22 +873,21 @@ 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 876(defgroup fancy-splash-screen ()
877 "Fancy splash screen when Emacs starts." 877 "Fancy splash screen when Emacs starts."
878 :version "21.1"
878 :group 'initialization) 879 :group 'initialization)
879 880
880 881
881(defcustom fancy-splash-delay 5 882(defcustom fancy-splash-delay 5
882 "Delay in seconds between splash screens." 883 "Delay in seconds between splash screens."
883 :group 'fancy-splash-screen 884 :group 'fancy-splash-screen
884 :version "21.1"
885 :type 'integer) 885 :type 'integer)
886 886
887 887
888(defcustom fancy-splash-image "splash.xpm" 888(defcustom fancy-splash-image "splash.xpm"
889 "The image to show in the splash screens." 889 "The image to show in the splash screens."
890 :group 'fancy-splash-screen 890 :group 'fancy-splash-screen
891 :version "21.1"
892 :type 'file) 891 :type 'file)
893 892
894 893