From 3a87e7efbc7e021c68b08dddb52523144027ebef Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 13 Sep 2019 17:06:04 +0100
Subject: [PATCH] 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.
---
 dot/emacs       | 4 ++--
 dot/xinitrc     | 3 ++-
 el/dot-emacs.el | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dot/emacs b/dot/emacs
index bd9c448..ba3096b 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -313,7 +313,7 @@
 
 ;; Splash screen stuff.
 
-(or window-system
+(if (not mdw-splashy-startup)
     (setq inhibit-splash-screen t
 	  inhibit-startup-message t))
 
@@ -538,7 +538,7 @@
 (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))))
 
diff --git a/dot/xinitrc b/dot/xinitrc
index cdb09ce..5b7cd61 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -296,7 +296,8 @@ declare -i \
 
 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.
diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 70d3b7a..a3bc6f3 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -42,6 +42,11 @@ This may be at the expense of cool features.")
 (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.
 
-- 
2.11.0