diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 1998-10-27 17:32:57 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 1998-10-27 17:32:57 +0000 |
| commit | 448c9d5c1913947876dc8d3f6c2ebf079f572b6f (patch) | |
| tree | 762687453ec2d84b02a22fcbb565ea79f52105e7 | |
| parent | a7bace497992954e808de69847fd53345d6c3c0b (diff) | |
Splash screen added back. Put in Xemacs test for noninteractive to
fix odd arithmetic error during byte compile.
| -rw-r--r-- | generic/proof-splash.el | 13 | ||||
| -rw-r--r-- | generic/proof.el | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/generic/proof-splash.el b/generic/proof-splash.el index 9f83e936..85a349e6 100644 --- a/generic/proof-splash.el +++ b/generic/proof-splash.el @@ -10,6 +10,9 @@ ;; ;; NB: try not to use cl or other autoloaded macro sets here, ;; to minimise delay before splash screen is shown. +;; + +(require 'proof-site) (defconst proof-splash-welcome "*Proof General Welcome*" "Name of the Proof General splash buffer.") @@ -106,7 +109,11 @@ Borrowed from startup-center-spaces." (defun proof-splash-display-screen () "Save window config and display Proof General splash screen. Only do it if proof-splash-display is nil." - (if (not proof-splash-inhibit) + (if (and + ;; Next check avoids XEmacs giving "Arithmetic Error" + ;; during byte compilation. + (if (fboundp 'noninteractive) (not (noninteractive)) t) + (not proof-splash-inhibit)) (let ;; Keep win config explicitly instead of pushing/popping because ;; if the user switches windows by hand in some way, we want @@ -157,9 +164,7 @@ Only do it if proof-splash-display is nil." ;; redisplay until proof-internal-display-splash-time has elapsed. ;; Display the screen ASAP... -;; FIXME: don't want this to display during compilation! -(eval-when (load) - (proof-splash-display-screen)) +(proof-splash-display-screen) (defun proof-splash-timeout-waiter () "Wait for proof-splash-timeout, then remove self from hook." diff --git a/generic/proof.el b/generic/proof.el index 06af87dc..62b9489a 100644 --- a/generic/proof.el +++ b/generic/proof.el @@ -17,7 +17,7 @@ (require 'proof-config) ; configuration variables -;(require 'proof-splash) ; splash screen +(require 'proof-splash) ; splash screen ;; FIXME da: I think these should all be autoloaded!! ;; (require 'cl) |