dot/emacs, dot/xinitrc, el/dot-emacs.el: Flag for Emacs splash screen.

It turns out to be rather annoying when used from the command line, so
add an option to inhibit it and other related cruft.

diff --git a/dot/emacs b/dot/emacs
index bd9c448a2f9ef848432d111c3383995089a71f75..ba3096b350e449a5c1fc0ac5e3700012de425fb8 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -313,7 +313,7 @@
 
 ;; Splash screen stuff.
 
 
 ;; Splash screen stuff.
 

-(or window-system
+(if (not mdw-splashy-startup)

     (setq inhibit-splash-screen t
          inhibit-startup-message t))
 
     (setq inhibit-splash-screen t
          inhibit-startup-message t))
 


@@ -538,7 +538,7 @@
 (display-time)
 (column-number-mode 1)
 (trap
 (display-time)
 (column-number-mode 1)
 (trap

-  (if (and window-system (not mdw-fast-startup))
+  (if mdw-splashy-startup

       (let ((calendar-view-diary-initially-flag t))
        (calendar))))
 
       (let ((calendar-view-diary-initially-flag t))
        (calendar))))
 

diff --git a/dot/xinitrc b/dot/xinitrc
index cdb09ce167b17f626c0cc5357d423eacd795103e..5b7cd61735948293479d9169c38e42cb85da6f9f 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -296,7 +296,8 @@ declare -i \
 
 start-emacs () {
   GDK_NATIVE_WINDOWS=1 run bgclients noip \
 
 start-emacs () {
   GDK_NATIVE_WINDOWS=1 run bgclients noip \

-    $emacs -bg black -geometry ${emacsx}x${emacsy}+${XSCR0_X}+${XSCR0_Y}
+    $emacs -bg black -geometry ${emacsx}x${emacsy}+${XSCR0_X}+${XSCR0_Y} \
+    --mdw-splashy-startup

 }
 
 ## Now place some xterms.
 }
 
 ## Now place some xterms.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 70d3b7a426056e59e16207df33709139e092e240..a3bc6f3427607d1c43c1e497adc2a9ededd52be8 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -42,6 +42,11 @@ (defvar mdw-fast-startup nil
 (setq mdw-fast-startup
       (mdw-check-command-line-switch "--mdw-fast-startup"))
 
 (setq mdw-fast-startup
       (mdw-check-command-line-switch "--mdw-fast-startup"))
 

+(defvar mdw-splashy-startup nil
+  "Whether to show a splash screen and related frippery.")
+(setq mdw-splashy-startup
+      (mdw-check-command-line-switch "--mdw-splashy-startup"))
+

 ;;;--------------------------------------------------------------------------
 ;;; Some general utilities.
 
 ;;;--------------------------------------------------------------------------
 ;;; Some general utilities.