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

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index dc25a4c..ba3096b 100644 (file)
--- 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))
 
@@ -416,6 +416,8 @@
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
+(setq ediff-split-window-function 'split-window-horizontally)
+
 (setq rfcview-rfc-location-pattern
       "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/rfc%s.txt"
       rfcview-std-location-pattern
@@ -536,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))))