From: ueno <ueno>
Date: Tue, 12 Sep 2000 03:20:14 +0000 (+0000)
Subject: (liece-inhibit-startup-message): New user option.
X-Git-Tag: liece-1_4_4-1~15
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=22ea72ad425f4d819ca0686bab60aa449bb3aaf5;p=elisp%2Fliece.git

(liece-inhibit-startup-message): New user option.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 863270f..fd7d285 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-12   Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-vars.el (liece-inhibit-startup-message): New user option.
+
 2000-09-11   Daiki Ueno  <ueno@unixuser.org>
 
 	* liece-xemacs.el (liece-xemacs-splash-at-point): Don't check `console-type'.
diff --git a/lisp/liece-emacs.el b/lisp/liece-emacs.el
index 675bfeb..09a9b64 100644
--- a/lisp/liece-emacs.el
+++ b/lisp/liece-emacs.el
@@ -263,8 +263,9 @@
 (add-hook 'liece-nick-insert-hook 'liece-emacs-nick-image-region)
 (add-hook 'liece-nick-replace-hook 'liece-emacs-nick-image-region)
        
-(and liece-splash-image window-system
-     (liece-emacs-splash))
+(when (and (not liece-inhibit-startup-message)
+	   liece-splash-image window-system)
+  (liece-emacs-splash))
 
 (fset 'liece-redisplay-unread-mark 'liece-emacs-redisplay-unread-mark)
 (add-hook 'liece-channel-unread-hook 'liece-emacs-unread-mark)
diff --git a/lisp/liece-vars.el b/lisp/liece-vars.el
index 28ecff9..0f15e44 100644
--- a/lisp/liece-vars.el
+++ b/lisp/liece-vars.el
@@ -110,6 +110,13 @@ list buffer."
 		       (string :tag "Image")))
   :group 'liece-look)
 
+(defcustom liece-inhibit-startup-message nil
+  "If non-nil, the startup message will not be displayed.
+This variable is used before `.liece/init.el' is loaded, so it should
+be set in `.emacs' instead."
+  :group 'liece-look
+  :type 'boolean)
+
 (defcustom liece-want-traditional nil
   "Do we want /commands."
   :type 'boolean
diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el
index c5e73bf..bdc114f 100644
--- a/lisp/liece-xemacs.el
+++ b/lisp/liece-xemacs.el
@@ -550,8 +550,9 @@ If ARG is given, don't hide splash buffer."
                   (set-window-configuration config)
                   (redisplay-frame frame)))))))
 
-(or (eq 'stream (device-type))
-    (liece-xemacs-splash))
+(unless (or liece-inhibit-startup-message
+	    (eq 'stream (device-type)))
+  (liece-xemacs-splash))
 
 ;;; @ unread mark
 ;;;